ChangeLogTag:Wed Mar 21 12:12:26 CDT 2007 Chad Elliott <elliott_c@ociweb.com>ACE+TAO+CIAO-5_5_7

4792 files changed, 93321 insertions, 110922 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 61b94f3ef26..a1eacffa8f0 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -2400,13 +2400,43 @@ perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO
       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
-      library configurations are available for PharLap at this time.
-      For an example of how to build
-      binaries, see the tests directory. The tests_pharlap_msvc.lnk
-      file is a LinkLoc commands file that the ACE tests are built
-      with. It is likely that local sites may need to adjust this file
-      for their target environment.</p><p>
+      ETS configurations to build within Visual Studio.
+      For an example of how to build binaries, see the tests directory.
+      The tests_pharlap_msvc.lnk file is a LinkLoc commands file that the
+      ACE tests are built with. It is likely that local sites may need
+      to adjust this file for their target environment.
+      </p><p>
+      When executing programs on the target system, it is possible that not
+      all of the VC++ support DLLs are resident on the target. In particular,
+      the debug-supporting DLLs may not be present. If you require these, be
+      sure to add those needed. For example, on the standard LabVIEW RT 8.2
+      distribution using Pharlap ETS, the following DLLs must be copied to
+      the target before being able to run Debug programs:
+      <ul>
+        <li>msvcp71d.dll</li>
+        <li>msvcr71d.dll</li>
+      </ul>
+      </p><p>
+      <note>To build ACE for National Instruments' LabVIEW RT, use
+      the Pharlap ETS information above, but add the following line to your
+      config.h file:
+      <pre>
+      #define ACE_PHARLAP_LABVIEW_RT
+      </pre>
+      This setting makes the necessary adjustments for LabVIEW's implementation
+      of Pharlap ETS.</note>
+
+      <note>By default, the ACE tests log their output/results to the
+      system console on Pharlap ETS. To change this behavior and make the
+      test output log to a file in the <code>log</code> directory under the
+      current working directory while executing, add the following line to
+      your config.h file:
+      <pre>
+      #define ACE_PHARLAP_TESTLOG_TO_FILE
+      </pre>
+      This setting has no affect on TAO tests which always write test output
+      to stdout.
+      </note>
 
 </p></li><li><strong>Mac OS X (10.2.x)</strong><p>
 
diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog
index a75cf4f65a1..57fcfe845d4 100644
--- a/ACE/ACEXML/ChangeLog
+++ b/ACE/ACEXML/ChangeLog
@@ -1,3 +1,24 @@
+Tue Feb 27 21:15:23 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * common/FileCharStream.cpp (open):
+
+          s/ACE_Utils::Truncate/ACE_Utils::truncate_cast/g.  The former is
+          deprecated.
+
+Tue Feb 20 17:26:28 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * common/InputSource.cpp:
+        * parser/parser/ParserContext.h:
+        * parser/parser/ParserContext.inl:
+          Use std::swap instead of ACE_Swap
+
+Tue Feb 13 20:17:28 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * apps/svcconf/Svcconf_Handler.cpp:  Fixed a problem with
+          ACE_Module getting unloaded prematurely due to
+          ACEXML_Svcconf_Handler failing to register it with the service
+          repository.  Thanks to gzeleniy@gmail.com for providing the fix.
+
 Wed Jan 03 14:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
 
         * common/XML_Macros.h:
@@ -278,7 +299,7 @@ Tue Aug 17 19:07:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
           used with the "new (std::nothrow)" version of ACE_NEW_RETURN.
           Fortunately, the "struct" is unnecessary.
 
-Sat Feb 21 23:51:25 2004  .  <.@isis.vanderbilt.edu>
+Sat Feb 21 23:51:25 2004  Krishnakumar B  <kitty@isis.vanderbilt.edu>
 
         * common/Exception.h:
         * common/Exception.cpp:
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 2b0d9d39718..d592c5f743c 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -147,6 +147,11 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                               mp->name ()));
                   mp->name (active_info->name ());
                 }
+              ACE_Service_Type *stype
+                = ACE_Service_Config::create_service_type (active_info->name (),
+                                                           stp,
+                                                           svc_dll,
+                                                           active_info->active ());
 
               if (mt->init (args.argc (), args.argv ()) == -1
                   || this->stream_->push (mt) == -1)
diff --git a/ACE/ACEXML/common/Exception.cpp b/ACE/ACEXML/common/Exception.cpp
index 5aec3654b36..5ad6b9b1b7e 100644
--- a/ACE/ACEXML/common/Exception.cpp
+++ b/ACE/ACEXML/common/Exception.cpp
@@ -28,7 +28,7 @@ ACEXML_Exception::is_a (const ACEXML_Char *name)
 }
 
 void
-ACEXML_Exception::print (void)
+ACEXML_Exception::print (void) const
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("ACEXML: (%P|%t) EXCEPTION : %s\n"),
diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h
index bfa5b0ace62..48572e24c73 100644
--- a/ACE/ACEXML/common/Exception.h
+++ b/ACE/ACEXML/common/Exception.h
@@ -64,7 +64,7 @@ public:
   virtual int is_a (const ACEXML_Char *name);
 
   /// Print out exception using ACE_DEBUG.
-  virtual void print (void) = 0;
+  virtual void print (void) const = 0;
 
 protected:
   /// Default contructor.
diff --git a/ACE/ACEXML/common/FileCharStream.cpp b/ACE/ACEXML/common/FileCharStream.cpp
index 1491f454d01..a7a3894f3cd 100644
--- a/ACE/ACEXML/common/FileCharStream.cpp
+++ b/ACE/ACEXML/common/FileCharStream.cpp
@@ -38,7 +38,7 @@ ACEXML_FileCharStream::open (const ACEXML_Char *name)
   if (ACE_OS::stat (name, &statbuf) < 0)
     return -1;
 
-  this->size_ = ACE_Utils::Truncate<ACE_OFF_T> (statbuf.st_size);
+  this->size_ = ACE_Utils::truncate_cast<ACE_OFF_T> (statbuf.st_size);
   this->filename_ = ACE::strnew (name);
   return this->determine_encoding();
 }
diff --git a/ACE/ACEXML/common/InputSource.cpp b/ACE/ACEXML/common/InputSource.cpp
index 8673420d732..a871c9296e4 100644
--- a/ACE/ACEXML/common/InputSource.cpp
+++ b/ACE/ACEXML/common/InputSource.cpp
@@ -3,7 +3,6 @@
 #include "ACEXML/common/InputSource.h"
 #include "ACEXML/common/StreamFactory.h"
 #include "ace/ACE.h"
-#include "ace/Swap.h"
 
 ACEXML_InputSource::ACEXML_InputSource (void)
   : charStream_ (0),
diff --git a/ACE/ACEXML/common/NamespaceSupport.cpp b/ACE/ACEXML/common/NamespaceSupport.cpp
index 5f337eca2ba..194b805c882 100644
--- a/ACE/ACEXML/common/NamespaceSupport.cpp
+++ b/ACE/ACEXML/common/NamespaceSupport.cpp
@@ -86,8 +86,8 @@ ACEXML_NamespaceSupport::init (void)
   // @@ No way to tell if the new fails.
   ACE_NEW_RETURN (effective_context_, ACEXML_NS_CONTEXT(), -1);
 
-  ACEXML_String prefix (ACEXML_TABOO_NS_PREFIX, 0, 0);
-  ACEXML_String uri (ACEXML_XMLNS_URI_name, 0, 0);
+  ACEXML_String prefix (ACEXML_TABOO_NS_PREFIX, 0, false);
+  ACEXML_String uri (ACEXML_XMLNS_URI_name, 0, false);
   return this->effective_context_->bind (prefix, uri);
 }
 
@@ -109,8 +109,8 @@ ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix,
   if (ACE_OS::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0)
     return -1;
 
-  ACEXML_String ns_prefix (prefix, 0, 0);
-  ACEXML_String ns_uri (uri, 0, 0);
+  ACEXML_String ns_prefix (prefix, 0, false);
+  ACEXML_String ns_uri (uri, 0, false);
 
   return this->effective_context_->rebind (ns_prefix, ns_uri);
 }
@@ -141,7 +141,7 @@ ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
        iter.advance ())
-    if (entry->int_id_ == ACEXML_String (uri, 0, 0))
+    if (entry->int_id_ == ACEXML_String (uri, 0, false))
       return entry->ext_id_.c_str ();
 
   return 0;                     // Nothing found.
@@ -173,8 +173,8 @@ ACEXML_NamespaceSupport::getPrefixes (const ACEXML_Char *uri,
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
        iter.advance ())
-    if (entry->int_id_ == ACEXML_String (uri, 0, 0) &&
-        entry->ext_id_ != ACEXML_String (ACEXML_DEFAULT_NS_PREFIX, 0, 0))
+    if (entry->int_id_ == ACEXML_String (uri, 0, false) &&
+        entry->ext_id_ != ACEXML_String (ACEXML_DEFAULT_NS_PREFIX, 0, false))
       prefixes.enqueue_tail (entry->ext_id_.c_str ());
     else
       continue;
@@ -190,7 +190,7 @@ ACEXML_NamespaceSupport::getURI (const ACEXML_Char *prefix) const
 
   ACEXML_NS_CONTEXT_ENTRY *entry = 0;
 
-  if (this->effective_context_->find (ACEXML_String (prefix, 0, 0),
+  if (this->effective_context_->find (ACEXML_String (prefix, 0, false),
                                       entry) == 0)
     return entry->int_id_.c_str ();
   return 0;
@@ -211,7 +211,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
         break;
       }
 
-  ACEXML_String prefix (ACE_TEXT(""),0,0);
+  ACEXML_String prefix (ACE_TEXT (""), 0, false);
   if (len == -1)
       name = qName;
   else
diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp
index acf9199789a..8ded0c069fc 100644
--- a/ACE/ACEXML/common/SAXExceptions.cpp
+++ b/ACE/ACEXML/common/SAXExceptions.cpp
@@ -72,7 +72,7 @@ ACEXML_SAXException::is_a (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXException::print (void)
+ACEXML_SAXException::print (void) const
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"),
@@ -130,7 +130,7 @@ ACEXML_SAXNotSupportedException::is_a (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXNotSupportedException::print (void)
+ACEXML_SAXNotSupportedException::print (void) const
 {
   ACE_DEBUG ((LM_ERROR,
               ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"),
@@ -185,7 +185,7 @@ ACEXML_SAXNotRecognizedException::is_a (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXNotRecognizedException::print (void)
+ACEXML_SAXNotRecognizedException::print (void) const
 {
   ACE_DEBUG ((LM_ERROR,
               ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"),
@@ -240,7 +240,7 @@ ACEXML_SAXParseException::is_a (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXParseException::print (void)
+ACEXML_SAXParseException::print (void) const
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"),
diff --git a/ACE/ACEXML/common/SAXExceptions.h b/ACE/ACEXML/common/SAXExceptions.h
index 24bab396440..ae117ff7bc5 100644
--- a/ACE/ACEXML/common/SAXExceptions.h
+++ b/ACE/ACEXML/common/SAXExceptions.h
@@ -57,13 +57,13 @@ public:
   virtual const ACEXML_Char *id (void) const;
 
   /// Return the extra message accompanying the exception.
-  const ACEXML_Char *message (void);
+  const ACEXML_Char *message (void) const;
 
   virtual ACEXML_Exception *duplicate (void) const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void);
+  virtual void print (void) const;
 
 protected:
   static const ACEXML_Char * exception_name_;
@@ -108,7 +108,7 @@ public:
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void);
+  virtual void print (void) const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -150,7 +150,7 @@ public:
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void);
+  virtual void print (void) const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -193,7 +193,7 @@ public:
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void);
+  virtual void print (void) const;
 
 protected:
   static const ACEXML_Char exception_name_[];
diff --git a/ACE/ACEXML/common/SAXExceptions.inl b/ACE/ACEXML/common/SAXExceptions.inl
index 3aee40632b5..f184fcf077c 100644
--- a/ACE/ACEXML/common/SAXExceptions.inl
+++ b/ACE/ACEXML/common/SAXExceptions.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*- $Id$
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXException::message (void)
+ACEXML_SAXException::message (void) const
 {
   return (this->message_ == 0 ?
           ACEXML_Exception::null_ :
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.inl b/ACE/ACEXML/parser/parser/Entity_Manager.inl
index 05b258e980e..ca859a0b0d5 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.inl
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.inl
@@ -6,8 +6,8 @@ ACEXML_Entity_Manager::add_entity (const ACEXML_Char *ref,
 {
   if (!this->entities_ )
     ACE_NEW_RETURN (this->entities_, ACEXML_ENTITIES_MANAGER, -1);
-  ACEXML_String name (ref, 0, 0);
-  ACEXML_String value  (v, 0, 0);
+  ACEXML_String name (ref, 0, false);
+  ACEXML_String value  (v, 0, false);
   return this->entities_->bind (name, value);
 }
 
@@ -19,7 +19,7 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char *ref)
 
   ACEXML_ENTITY_ENTRY *entry = 0;
 
-  if (this->entities_->find (ACEXML_String (ref, 0, 0),
+  if (this->entities_->find (ACEXML_String (ref, 0, false),
                             entry) == 0)
     return entry->int_id_.c_str();
   return 0;
diff --git a/ACE/ACEXML/parser/parser/ParserContext.h b/ACE/ACEXML/parser/parser/ParserContext.h
index 6bb7c4122ad..34b1edbba78 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.h
+++ b/ACE/ACEXML/parser/parser/ParserContext.h
@@ -26,7 +26,6 @@
 #include "ACEXML/common/LocatorImpl.h"
 #include "ace/Functor.h"
 #include "ace/Containers_T.h"
-#include "ace/Swap.h"
 
 class ACEXML_PARSER_Export ACEXML_Parser_Context
 {
diff --git a/ACE/ACEXML/parser/parser/ParserContext.inl b/ACE/ACEXML/parser/parser/ParserContext.inl
index 2814cf63476..b8f30ea248d 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.inl
+++ b/ACE/ACEXML/parser/parser/ParserContext.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+#include <algorithm>
 
 ACEXML_INLINE
 ACEXML_Parser_Context::ACEXML_Parser_Context()
@@ -38,8 +39,8 @@ ACEXML_INLINE ACEXML_Parser_Context&
 ACEXML_Parser_Context::operator= (const ACEXML_Parser_Context& src)
 {
   ACEXML_Parser_Context tmp (src);
-  ACE_Swap<ACEXML_InputSource*>::swap (this->instream_, tmp.instream_);
-  ACE_Swap<ACEXML_LocatorImpl*>::swap (this->locator_, tmp.locator_);
+  std::swap (this->instream_, tmp.instream_);
+  std::swap (this->locator_, tmp.locator_);
   return *this;
 }
 
diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp
index 8a3b6f9c088..b5a80d626b0 100644
--- a/ACE/ASNMP/asnmp/asn1.cpp
+++ b/ACE/ASNMP/asnmp/asn1.cpp
@@ -485,7 +485,7 @@ u_char * asn1::parse_length( u_char *data,
     }
     // fixed
     ACE_OS::memcpy((char *)length, (char *)data + 1, (int)lengthbyte);
-    *length = ntohl(*length);
+    *length = ACE_NTOHL(*length);
     *length >>= (8 * ((sizeof *length) - lengthbyte));
     return data + lengthbyte + 1;
   } else { /* short asnlength */
diff --git a/ACE/ASNMP/asnmp/pdu.cpp b/ACE/ASNMP/asnmp/pdu.cpp
index cbe67dcbbab..fe7b175b7c2 100644
--- a/ACE/ASNMP/asnmp/pdu.cpp
+++ b/ACE/ASNMP/asnmp/pdu.cpp
@@ -98,6 +98,9 @@ Pdu::~Pdu()
 //=====================[ assignment to another Pdu object overloaded ]===
 Pdu& Pdu::operator=( const Pdu &pdu)
 {
+   if (this == &pdu)
+     return *this;
+
    int z;   // looping variable
 
    // Initialize all mv's
diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h
index a0d2bab7aa8..e1e3912c347 100644
--- a/ACE/ASNMP/tests/test_config.h
+++ b/ACE/ASNMP/tests/test_config.h
@@ -160,7 +160,7 @@ randomize (int array[], size_t size)
   for (i = 0; i < size; i++)
     array [i] = static_cast<int> (i);
 
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
   // Generate an array of random numbers from 0 .. size - 1.
 
diff --git a/ACE/COPYING b/ACE/COPYING
index 2a8822bc2a8..4296f4649cf 100644
--- a/ACE/COPYING
+++ b/ACE/COPYING
@@ -1,21 +1,22 @@
 
      _________________________________________________________________
-
+   
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
   CoSMIC(TM)
-
+  
    [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
    [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-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
    and distribute modified versions of this software. You must, however,
-   include this copyright statement along with code built using DOC
-   software.
-
+   include this copyright statement along with any code built using DOC
+   software that you release. No copyright statement needs to be provided
+   if you just ship binary executables of your software products.
+   
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not do
@@ -26,7 +27,7 @@
    software in your software, though we encourage you to let [10]us know
    so we can promote your project in the [11]DOC software success
    stories.
-
+   
    The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
@@ -44,7 +45,7 @@
    modification of such Submissions is entirely at the discretion of the
    moderators of the open-source DOC software projects or their
    designees.
-
+   
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -62,13 +63,13 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-
+   
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
    world provide commercial support for DOC software, however.
-
+   
    DOC software is Y2K-compliant, as long as the underlying OS platform
    is Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
@@ -77,7 +78,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-
+   
    The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
@@ -88,13 +89,13 @@
    Vanderbilt University appear in their names, without express written
    permission from Washington University, UC Irvine, and Vanderbilt
    University.
-
+   
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
-
+   
    [21]Douglas C. Schmidt
      _________________________________________________________________
-
+   
    Back to the [22]ACE home page.
 
 References
@@ -120,4 +121,4 @@ References
   19. http://www.cs.wustl.edu/~schmidt/commercial-support.html
   20. mailto:d.schmidt@vanderbilt.edu
   21. http://www.dre.vanderbilt.edu/~schmidt/
-  22. http://www.cs.wustl.edu/~schmidt/ACE.html
+  22. http://www.cs.wustl.edu/ACE.html
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index eac65d27ca5..7354bcd6be2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,3017 @@
+
+Wed Mar 21 12:12:26 CDT 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+	* ACE version 5.5.7 released.
+
+Tue Mar 20 12:42:13 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/diff-builds.pl:
+
+          Sort the builds so that the output is in order and comparable
+          between multiple runs of the same date.
+
+Mon Mar 19 19:16:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Disabled several tests for CORBA/e micro
+
+Mon Mar 19 16:37:21 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * docs/Download.html: Updated the comments about commercial
+          support so they point to www.dre.vanderbilt.edu/support.html.
+          Thanks to Hans van't Hag <hans dot vanthag at prismtech dot com>
+          for motivating this.
+
+Mon Mar 12 16:19:49 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Future_Test.cpp: Updated this example to point to the
+          right Active Object location.  Thanks to Joe French <JFrench at
+          Soneticom dot com> for motivating this.
+
+Mon Mar 19 07:53:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/vc8_warnings.mpb:
+          Made vc8 and nmake more the same so that also with nmake the
+          crt warnings are suppressed
+
+Sun Mar 18 02:09:31 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * ace/OS_NS_stdlib.cpp:  Fixed a race condition in
+          ACE_OS::mkstemp_emulation() where the value from
+          ACE_OS::gettimeofday() was truncated due to the use of
+          ACE_Time_Value::msec(void) as opposed to
+          ACE_Time_Value::msec(ACE_UINT64&) to convert it to milliseconds.
+          This resulted in seed value passed to ACE_OS::rand_r() returning
+          the same sequence of numbers when ACE_OS::mkstemp() was called
+          successively from the same process.  As a result, the filenames
+          returned from ACE_OS::mkstemp() ended up being the same, if the
+          template passed in was the same between multiple successive
+          calls to ACE_OS::mkstemp().
+
+Thu Mar 15 14:44:21 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Select_Reactor_Base.cpp:
+          The close() operation was trying to read from the notification
+          pipe event if the notification pipe was not open.  I did not
+          notice this could happen, but the reactor constructor has a flag
+          for it.
+
+Thu Mar 15 12:06:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted the change below, the test stats show that after adding
+        the functions the Atomic_Op test does fail when these optimized
+        functions are enabled.
+
+        Mon Mar 5 09:21:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Atomic_Op_Sparc.c:
+        * ace/Atomic_Op.{h,cpp}:
+          Added optimized functions for SunCC on x86. Thanks to
+          Dennis Chernoivanov <cdi at tbricks dot com> for reporting this.
+          If you want to enable these, add atomic_ops_sparc=1 to your
+          platform_macros.GNU file
+
+Thu Mar 15 11:20:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Reactor_Notify_Test.cpp:
+
+          Removed the auto_ptr that deleted the Reactor instance.  It is
+          managed by the ACE library and doesn't need to be deleted.
+
+Wed Mar 14 21:34:03 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/ciao_tests.lst
+
+          Added requirement for the RT-CCM test called RT_CAPABLE, used to
+          indicate systems which are able to successfully run a test
+          involving RT policies.
+
+Wed Mar 14 12:32:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Silly me, I forgot the script name when I added the
+          CORBA_e_compact_Implicit_Activation test.
+
+Wed Mar 14 09:09:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Set ACE_HAS_VSWPRINTF independent of the compiler used
+
+Wed Mar 14 08:09:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-linux-common.h:
+        * ace/config-lite.h:
+        * include/makeinclude/platform_linux_suncc.GNU:
+          Changes for the Sun Studio 12 Early Access compiler on linux
+
+Tue Mar 13 22:04:35 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tests/unload_libace.mpb: Squish the VC8 warning about deprecated
+          fopen().
+
+Tue Mar 13 19:36:09 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_stdio.cpp (snprintf): Back off use of _vsnwprintf_s() in
+          the wide-char version as was done in the narrow-char version (see
+          Mon Mar 12 17:55:18 UTC 2007  Steve Huston  <shuston@riverace.com>).
+          Also, in sprintf(), correct the selection of 3 vs 4 arg call for
+          WinCE.
+
+Tue Mar 13 18:43:28 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Added a new test that only runs when the CORBA_E_COMPACT
+          configuration is enabled.
+
+Tue Mar 13 13:21:49 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Removed unnecessary PLATFORM_SSL_* settings.
+
+Tue Mar 13 12:13:37 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/vc8_warnings.mpb: For the
+          vc8_avoid_crt_secure_warnings feature, add /wd4996 to the nmake
+          case since it seems to not pay attention to _CRT_NONSTDC_NO_WARNINGS.
+          Also, reversed the default for VC8 SCL secure warnings - they're on
+          by default since Ossama implemented the checked STL iterator stuff.
+
+Tue Mar 13 09:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added new DynUnion_Test
+
+Tue Mar 13 00:24:22 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * bin/MakeProjectCreator/config/vc8nmake.mpb:
+
+          Subtract /EHsc from the compiler flags instead of /EHs.  MPC now
+          uses /EHsc as the correct replacement for /GX.
+
+Mon Mar 12 23:44:25 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/checked_iterator.h (ACE_make_checked_array_iterator):
+
+          Added documentation for this header.
+
+          Changed length type from ptrdiff_t to size_t.  The length refers
+          to the length of an array, not a pointer difference.
+
+Mon Mar 12 21:47:51 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * ace/OS_NS_stdio.inl:
+
+          Fixed compilation errors on WinCE 5.0 builds.
+
+Mon Mar 12 22:26:08 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/checked_iterator.h (ACE_make_checked_array_iterator):
+
+          New function template that returns a checked iterator if
+          supported by the platform (currently VC8 or better), and a
+          pointer otherwise.
+
+        * ace/Array_Map.cpp (ACE_Array_Map, grow, operator==):
+
+          Call new ACE_make_checked_array_iterator<>() iterator factory
+          function to generate destination iterator.  Addresses VC8
+          "C4996" warnings when security related warnings are enabled.
+
+        * ace/Makefile.am:
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+
+          Added new ace/checked_iterator.h header to the appropriate
+          header lists.
+
+Mon Mar 12 21:15:46 UTC 2007  Carlos O'Ryan  <coryan@atdeesk.com>
+
+        * tests/Reactor_Notify_Test.cpp:
+          The test was verifying the behavior described in bug 2845.  I
+          neglected to fix the test when we fixed the bug.  Mostly because
+          I am stupid, but also because the test only worked as expected
+          in a limited number of builds.
+          This change should fix the test problems we are seeing on the
+          scoreboard, but the only thing I can say for sure is:
+          + I managed to reproduce the crash on my machine.
+          + I understand why the test was crashing.
+          + I believe the test was wrong and not the library.
+          + I fixed the test and now valgrind is happy with it.
+
+Mon Mar 12 17:55:18 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_stdio.inl (vsnprintf): Back out the attempt to use the
+          new _vsnprintf_s() - it doesn't report the required string length
+          when it exceeds maxlen and we need this info.
+
+Mon Mar 12 17:38:26 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/vc8_warnings.mpb:
+        * bin/MakeProjectCreator/config/vc8nmake.mpb:
+          Moved the _CRT_NONSTDC_NO_WARNINGS, _CRT_SECURE_NO_DEPRECATE, and
+          _SCL_SECURE_NO_WARNINGS defs from vc8nmake.mpb to vc8_warnings.mpb
+          so they're all in one place for easy maintenance and also can be
+          switched on and off via MPC features.
+
+          This effectively reverts the changes to vc8nmake.mpb since:
+          Fri Mar  9 21:04:22 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-win32-msvc-8.h: Deleted the pragma disable for warning
+          4355 (this used in base member initializer list). Added it to
+          bin/MakeProjectCreator/config/vc8_warnings.mpb. This should both
+          unblock it for regular users and block it for the CIDLC build.
+
+Mon Mar 12 16:39:25 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Note that LabVIEW RT targets may require
+          the user to copy Windows DLLs to the target for Debug mode.
+
+Mon Mar 12 14:15:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/INET_Addr.cpp:
+          Removed not needed return
+
+Mon Mar 12 13:54:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Don't run bug 2800 regression tests in a ST configuration
+
+Mon Mar 12 13:12:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Only when building a static rtp we enable aio by default. For
+          building shared we need an optional library, see the file below
+          how to enable this
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          If you build rtp with shared library and want to use aio then you
+          need to build the custom AioPx library first, then add aio=1
+          to your platform_macros.GNU file to enable aio in ACE and link
+          the needed additonal library
+
+Mon Mar 12 12:35:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          VxWorks 6.4 does deliver strings.h in kernel mode and strcasecmp/
+          strncasecmp can't be used in rtp mode, but can be used in kernel
+          mode
+
+Mon Mar 12 10:51:38 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/vc8nmake.mpb: Added /D for
+          _CRT_SECURE_NO_DEPRECATE and _SCL_SECURE_NO_WARNINGS to silence
+          those compile warnings; added /wd4290 to silence the warnings
+          "C++ exception specification ignored except to indicate a function
+          is not __declspec(nothrow)". Note that the latter warning can also
+          be remedied by using ACE_THROW_SPEC; this has been done for ACE
+          but not in TAO.
+
+Mon Mar 12 01:31:16 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/DLL/test_dll.cpp:
+
+          This example was not working under Windows XP when compiled with
+          Visual Studio 2003.NET. The culprit was the following line of code:
+
+          dll.open (ACE_TEXT("./") ACE_DLL_PREFIX ACE_TEXT("DLL_Today"));
+
+          We don't need to supply "./" to the open method, since $ACE_ROOT/lib
+          is in DLL search path environment variable (PATH for Windows and
+          LD_LIBRARY_PATH for unix-like systems).
+
+Fri Mar  9 21:04:22 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/vc8nmake.mpb: Added /wd4250
+          (to disable inheritance via dominance warning) and
+          /D _CRT_SECURE_NO_DEPRECATE to disable the warnings about
+          deprecated CRT functions.
+
+Fri Mar  9 16:49:03 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_string.inl (strncat): Disable the TR24731/2005 calls to
+          strncat_s() and wcsncat_s() for now. The dest length includes the
+          characters that were already in dest before appending src. To really
+          use the safer functions, the dest max length is needed from the
+          caller. So, we'll either need a new method or an added arg to the
+          current methods.
+
+Fri Mar  9 16:27:23 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_stdio.cpp (snprintf):
+        * ace/OS_NS_string.inl (strncat): When using the "safe" calls from
+          TR24731/2005, specify the dest count as the user-specified source
+          length + 1 for the null. This assumes the caller knows the dest
+          buffer is long enough to hold what's specified. Specifying
+          _TRUNCATE as the src count gets the behavior we expect - the
+          specified number of bytes are copied with the assurance a nul
+          terminator is added. This avoids the CRT error handler.
+
+Fri Mar  9 16:10:09 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Log_Msg_NT_Event_Log.{h cpp}: Changed return type of log() from
+          int to ssize_t. Matches changes from:
+          Fri Mar  9 00:53:43 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+Thu Mar  9 09:44:14 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Time_Value.cpp (operator *=):
+
+          Reverted bulk of the changes.  New implementation will be
+          revisited as time permits.
+
+Fri Mar 9 09:42:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          No need to explicitly link dl when building shared
+
+Thu Mar  9 07:44:14 UTC 2007  Ossama Othman  <ossama_othman@symantec.com>
+
+        * tests/Time_Value_Test.cpp (run_main):
+
+          Simplified assertions.  Rather than test equality of sec() and
+          usec() components separately, just test equality of the
+          ACE_Time_Value objects as a whole.
+
+Fri Mar  9 00:53:43 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        Changes to resolve or quiet warnings from Visual Studio .NET 2005:
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/vc8_warnings.mpb: Removed the
+          default addition of _CRT_SECURE_NO_DEPRECATE from the MPC VC8
+          project templates. Many of the places where the changes recommended
+          by Microsoft could be made have been made (see further below). There
+          are still a number of places where the warnings are generated,
+          mostly because ACE wraps "unsafe" methods such as strcpy(), printf(),
+          etc. These can't legitimately be changed. So most of what can (and
+          should) be changed in ACE has been. To keep the warnings quiet
+          without removing them from any user application that includes ACE
+          headers, the acedefaults.mpb base project now inherits from
+          vc8_warnings - vc8_warnings will, by default, silence the warnings
+          we don't really need to see, but users of ACE will still get the
+          warnings when building their apps, unless they take similar steps
+          to silence them (or if they generate projects using the acedefaults
+          base project with MPC).
+          We can still elect to enable all the warnings by setting MPC features
+          to 0 (see vc8_warnings.mpb for features). And this is a good thing
+          to do still since we can improve the security situation by reviewing
+          things flagged as warnings and repair what's needed (not everything
+          flagged will be in need of a fix).
+
+        * ace/config-win32-msvc-8.h: Removed most of the pragmas that silenced
+          legit warnings from VC8. Added ACE_HAS_TR24731_2005_CRT indicating
+          that there's a C Run-Time implementing C99 draft TR 24731 dated
+          October 2005 detailing security improvements to the C run-time.
+          This macros indicates that the more secure versions of the calls
+          can be used where desireable.
+          Also added a macro, ACE_WIN32_VC8, to easily tell where we need to
+          selectively disable a warning that we can tell by inspection is
+          irrelevant. Such as use of 'this' in an initializer list and we can
+          tell by inspecting the code in question to be sure that the passed
+          pointer isn't used to call a method on an object that's not fully
+          constructed yet.
+
+        * ace/config-macros.h: When ACE_HAS_TR24731_2005_CRT is defined,
+          define ACE_SECURECRTCALL to make a call and adjust the returned
+          error value to the ACE return value convention.
+
+        * ace/README: Describe ACE_HAS_TR24731_2005_CRT.
+
+        * NEWS: Described the removing of the warning preventers and that
+          user code may trigger warnings that weren't showing up in previous
+          ACE versions.
+
+        * ace/Global_Macros.h: For VC8 with ACE_HAS_EXCEPTIONS, define
+          ACE_THROW_SPEC as throw(...) always. VC8 always treats any throw
+          spec as throw(...) and issues a warning to this effect. This change
+          silences the warnings. The #if intends to set this for VC8 only,
+          guessing that any VC9 will be _MSC_VER 1500.
+
+        * ace/os_includes/sys/os_types.h: For non-Borland, non-Mingw ACE_WIN32
+          change mode_t from u_short to int. Matches CRT docs.
+
+        * ace/Local_Tokens.cpp:
+        * ace/Select_Reactor_Base.inl:
+        * ace/WFMO_Reactor.cpp:
+        * apps/Gateway/Gateway/Event_Channel.cpp:
+          Disable VC8's C4355 warning that 'this' is used in an initializer
+          list; we know, and it's ok.
+
+        * ace/Select_Reactor_T.cpp (ctor): Rather than pass a reference to
+          'this' incompletely constructed object to token_, call token_'s
+          reactor() method to set the reactor impl pointer.
+
+        * ace/Registry.{h cpp}: Rearranged setting of Binding_Iterator in the
+          inherited Iteration_State object. Instead of passing a reference to
+          an object that's not yet fully constructed, call a new iterator()
+          method to set that pointer.
+
+        * ace/Service_Config.cpp (ctor): Rather than set the TSS pointer in
+          the initializer list before it's complete, call ts_object() to set
+          it within the constructor body. We could also catch a setup error
+          here and throw an exception if ACE ever goes that way.
+
+        * ace/OS_NS_time.h (ace_timezone): Use the GetTimeZoneInformation()
+          system call to get timezone bias for all Windows platforms and
+          compilers. Much easier and faster than going through the C run-time
+          and will work with new US daylight savings changes automatically.
+
+        * ace/OS_NS_sys_stat.inl: (umask):
+        * ace/OS_NS_stdio.inl (vsnprintf):
+        * ace/OS_NS_stdio.cpp (sprintf, snprintf):
+        * ace/OS_NS_string.inl (strtok_r, strncat):
+        * ace/OS_NS_string.cpp (strerror):
+          Use "safer" functions when ACE_HAS_TR24731_2005_CRT.
+
+        * ace/OS_NS_time.{inl cpp}: (asctime_r, ctime_r, gmtime_r,
+          localtime_r): Use new functions when ACE_HAS_TR24731_2005_CRT.
+          NOTE - I purposely did not substitute the secure version for the
+          non _r methods (asctime, ctime, etc.) since that would have to use
+          a local static variable. That defeats the purpose of being able to
+          use a caller-supplied destination. Thus, the places that can
+          substitute a secure function are, and those that can't don't. This
+          will notify users of code that's potentially unsafe and allow them to
+          switch to the safer _r version. We can set the
+          _CRT_SECURE_NO_WARNINGS macro for non-inline builds (where the unsafe
+          versions will be compiled in) and leave the warning in place for
+          inlined builds to put the user on notice that a potentially unsafe
+          method is being used.
+
+        * ace/UUID.cpp (from_string_i): Use sscanf_s for VC8.
+
+        * ace/Atomic_Op_T.{cpp inl}:
+        * ace/INET_Addr.cpp:
+        * ace/Filecache.cpp:
+        * ace/Future.cpp:
+        * ace/Map_Manager.inl:
+        * ace/Message_Queue_T.cpp:
+        * ace/Process_Mutex.cpp:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Stream.cpp: Don't use 'this' in initializer list. Quiets
+          VC8's warnings.
+
+        * protocols/ace/TMCast/Group.{hpp cpp}: Change 'throw' to
+          ACE_THROW_SPEC to quiet the VC8 warnings.
+
+        * tests/unload_libace.mpb: Add _CRT_SECURE_NO_WARNINGS for VC8. Else
+          VC8 warns about fopen() and we don't care.
+
+        * ace/README: Added ACE_LACKS_WIN32_GETPROCESSTIMES.
+
+        * ace/config-WinCE.h: Added ACE_LACKS_WIN32_SECURITY_DESCRIPTORS and
+          ACE_LACKS_WIN32_GETPROCESSTIMES.
+
+        * ace/OS_NS_dirent.cpp (opendir_emulation): WinCE offers
+          GetFileAttributes() but documents a failing return value as
+          0xFFFFFFFF whereas on desktop/server Windows a failed call returns
+          INVALID_FILE_ATTRIBUTES. So on WinCE, define INVALID_FILE_ATTRIBUTES.
+
+        * ace/OS_NS_sys_resource.inl (getrusage): Don't try GetProcessTimes()
+          on Win32 if ACE_LACKS_WIN32_GETPROCESSTIMES is set.
+
+        * ace/OS_NS_stdio.inl (cuserid): WinCE returns ENOTSUP for these.
+
+        * ace/OS_NS_unistd.inl (chdir): If ACE_HAS_WINCE, return ENOTSUP.
+
+        * ace/Log_Record.cpp (operator<<): Truncate the message data length
+          down to 32 bits (ACE_CDR::ULong) size since that's all the
+          CDR ops and header field can handle.
+
+        * ace/Log_Msg_Backend.h:
+        * ace/Log_msg_UNIX_Syslog.{h cpp}:
+        * ace/Log_Msg_IPC.h:
+        * ace/Log_Msg_IPC.cpp (log): Changed the return type of log() from int
+          to ssize_t to match what it's returning (byte count or error).
+          Corrected the max_payload_size calculation
+          to match the header that operator<< (above) writes. The MAXLOGMSGLEN
+          isn't always enough now that ACE_Log_Record's data can be extended.
+
+Fri Mar  9 00:57:26 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Event_Handler.cpp:
+          Fixed bug 2845, the event handler destructor no longer calls
+          purge_pending_notifications.  More details about the rationale
+          can be found in the bug report.
+
+        * NEWS:
+        * docs/ACE-FMM.html:
+          Prominently document the change, since it may catch people
+          unawares.
+
+Thu Mar  8 21:27:54 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/String_Base.{h cpp}: Change ACE_String_Base::release_ from int
+          to bool. Thanks to Kelly Hickel for this change. This changes the
+          signatures of the following methods:
+            ACE_String_Base (const CHAR *s,
+                             ACE_Allocator *the_allocator = 0,
+                             int release = 1);
+          to
+            ACE_String_Base (const CHAR *s,
+                             ACE_Allocator *the_allocator = 0,
+                             bool release = true);
+
+            ACE_String_Base (const CHAR *s,
+                             size_type len,
+                             ACE_Allocator *the_allocator = 0,
+                             int release = 1);
+          to
+            ACE_String_Base (const CHAR *s,
+                             size_type len,
+                             ACE_Allocator *the_allocator = 0,
+                             bool release = true);
+
+            void set (const CHAR * s, int release = 1);
+          to
+            void set (const CHAR * s, bool release = true);
+
+            void set (const CHAR * s, size_type len, int release);
+          to
+            void set (const CHAR * s, size_type len, bool release);
+
+            void clear (int release = 0);
+          to
+            void clear (bool release = false);
+
+        * ace/Configuration.cpp:
+        * ACEXML/common/NamespaceSupport.cpp:
+        * ACEXML/parser/parser/Entity_Manager.inl:
+        * tests/SString_Test.cpp: Changes to string usage to
+          reflect the above signature changes. Changed '0' args to 'false'.
+
+        * NEWS: Added a description of the above changed methods.
+
+Thu Mar  8 21:24:38 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tests/Cached_Conn_Test.cpp:
+        * tests/Cached_Accept_Conn_Test.cpp: Replace use of ACE_ASSERT with
+          ACE_ERROR. ACE_ASSERTS on single-process targets do really bad
+          things...
+
+Thu Mar 8 20:29:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          More changes to build with shared library support using VxWorks 6.x
+
+Thu Mar 8 19:06:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Only add dl to LDLIBS when building shared
+
+Thu Mar  8 18:06:14 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Time_Value.cpp (operator *=):
+
+          Removed vestigial time value saturation code that does not work
+          correctly with latest implementation.
+
+Thu Mar 8 14:21:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Don't set ACE_HAS_SVR4_DYNAMIC_LINKING when we do a static
+          rtp build.
+
+Thu Mar 8 13:04:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Added some initial support for building shared libraries
+          with vxworks 6.3, this is not ready yet, in progress
+
+Thu Mar  8 12:17:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ace_openssl.mpb:
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Moved the addition of SSL related macros out of wrapper_macros.GNU
+          and into a specific section in ace_openssl.mpb.  The result is
+          that the SSL related information is only added to the projects
+          that inherit from ace_openssl (instead of every single project).
+
+Thu Mar  8 02:59:02 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Notification_Queue.cpp:
+          Fixed implementation of reset() make sure the code works right
+          when there are null event handlers in the queue.  This should
+          have been part of the original fixes for bug 2820.
+
+        * tests/Notification_Queue_Unit_Test.cpp:
+          Add new test cases for the reset() operation, in particular
+          check for null event handlers in the queue.
+
+Wed Mar  7 19:07:58 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Message_Block.cpp:
+
+          Fixing a problem caused by inadvertently overwriting an external
+          buffer passed in the constructor. It happens when
+          ACE_INITIALIZE_MEMORY_BEFORE_USE is set (as result of setting
+          ACE_HAS_VALGRIND). Thanks to Johnny Willemsen for reporting it.
+
+Wed Mar  7 18:44:10 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Fixed an issue where if ssl wasn't set to zero, it was assumed to
+          be set to non-zero (ignoring the case where it could be set to
+          empty).
+
+Wed Mar  7 17:32:51 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Time_Value.cpp (operator*=):
+
+          Altered implementation to avoid converting the microseconds
+          component of the ACE_Time_Value to a fraction of a second.  In
+          the case were the floating point type's mantissa width is the
+          same as the width of the time_t (seconds) value, a maxed out
+          ACE_Time_Value seconds component would utilize all bits in the
+          mantissa, leaving no room for a fraction.  The microseconds
+          component would end up not contributing to the multiplication.
+          Multiply the seconds and microseconds components separately
+          instead.  This also saves us a floating point division, which
+          can be expensive.
+
+Wed Mar  7 16:35:04 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ace_openssl.mpb:
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Removed the addition of $(SSL_ROOT)/include and $(SSL_ROOT)/lib
+          from the includes and libpaths project variables and ssl and
+          crypto from the lit_libs settings for gnuace (as was done for
+          automake).
+
+          This functionality will now come from wrapper_macros.GNU in the
+          form of PLATFORM_SSL_CPPFLAGS, PLATFORM_SSL_LDFLAGS and
+          PLATFORM_SSL_LIBS.  If these variables are not set, they will be
+          given defaults based on the SSL_ROOT variable, as long as SSL_ROOT
+          is set and is not set to /usr.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Added support for the compile_flags and linkflags template
+          variables.
+
+Wed Mar 7 13:12:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+        * include/makeinclude/platform_vxworks6.2.GNU:
+          Simplified these files
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Added support to use a windows host system for the cross build
+
+Wed Mar 7 12:34:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Removed setting of ACELIB, in the generated makefiles it is
+          always cleared again
+
+        * bin/MakeProjectCreator/templates.gnu.mpb:
+          Removed clearing of ACELIB and setting of tao_dont_use_idl_make_rule
+
+Wed Mar 7 12:20:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/rules.local.GNU:
+          Removed check for TAO_IDL_DEP, the generated GNUmakefiles do
+          check for this
+
+Wed Mar  7 11:46:46 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Bug_2820_Regression_Test.cpp:
+          Use the standard ACE workaround for platforms with a broken
+          std::auto_ptr<>.
+
+Wed Mar 7 09:56:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Atomic_Op.cpp:
+          Implemented the single_cpu_* methods for PPC, because of the lack
+          of a multi cpu ppc board we don't have these methods implemented
+          and we don't enable this by default. If you want to use the PPC
+          optimized operations for a single cpu board add
+          ACE_HAS_BUILTIN_ATOMIC_OP to your config.h
+
+Wed Mar  7 02:51:50 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/bczar/bczar.html
+
+          Updated bczar documentation to reflect change in release script.
+
+        * bin/make_release
+        * bin/make_release.py
+
+          Removed the old release script and added the new one.
+
+Tue Mar  6 23:06:15 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Time_Value.cpp (operator*=):
+
+          Use long double for internal computations if double is not large
+          enough to retain precision of the time_t/suseconds_t values.
+          This will only provide improved behavior with compilers that
+          support double-extended precision floating numbers, i.e. >= 79
+          bits.
+
+          Added comments to explain what is being done in the
+          implementation.
+
+Tue Mar 6 07:47:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS.inl:
+          Fixed compile error with VxWorks 6.x using a Windows host
+
+Tue Mar  6 15:27:52 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * NEWS:
+
+          Noted removal of eVC3/4 projects.
+
+Tue Mar  6 15:00:00 UTC 2007  Ciju John  <johnc@ociweb.com>
+
+        * tests/INET_Addr_Test.cpp:
+          Add test for ACE_INET_Addr::is_loopback () API. This tests a
+          selected set of addresses to validate API's conformance with RFC
+          3330.
+
+Tue Mar  6 13:21:24 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Updated this file to clarify that the ACE license need
+          not be shipped with binary-only releases.  Thanks to Michael
+          Kircher <michael dot kircher at siemens dot com> and Werner
+          Burger <werner dot burger at siemens dot com> for motivating
+          this.
+
+Tue Mar  6 12:43:01 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Date_Time_Test.cpp:
+
+          Handle the rare case where the minute rolls over during the test.
+
+Tue Mar  6 04:41:36 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/DLL/README:
+
+          README was referring to files (dsp/dsw) used by Visual Studio C++ 6.
+          Updated to refer to files (sln/vcproj) used by VC++ 7.1 or later.
+
+Tue Mar  6 02:37:53 UTC 2007  Carlos O'Ryan  <coryan@atdeesk.com>
+
+        * Merged changes from the fix_bug_2820 branch.  From revision
+          77533 to revision 77546.
+
+        Tue Mar  6 02:07:43 UTC 2007  Carlos O'Ryan  <coryan@atdeesk.com>
+
+        * ace/Select_Reactor_Base.cpp:
+          Fixed bugs in loop to extract event handlers from notification
+          pipe.
+
+        * tests/Bug_2820_Regression_Test.cpp:
+          Fixed several problems in the test:
+          - The Event_Handler called on the Reactor on its destructor, but
+            by then the reactor was already destroyed.
+          - Improved debugging messages.
+          - Fixed memory management problems, valgrind is happy now.
+
+        Mon Mar  5 18:01:36 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Notification_Queue.cpp:
+          When deleting the queue we must decrease the reference count on
+          all the event handlers stored there.
+
+        * ace/Select_Reactor_Base.cpp:
+          When the notification pipe is destroyed we must read the data
+          stored there and release all the event handlers.  Otherwise the
+          reference counts are broken.
+
+        * tests/run_test.lst:
+          Add Bug_2820_Regression_Test to the list.
+
+        Mon Mar  5 17:16:16 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Bug_2820_Regression_Test.cpp:
+          The test was broken, it did not delete the Reactor, so it failed
+          to test what we wanted.
+
+Tue Mar  6 00:10:36 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * examples/ASX/UPIPE_Event_Server/event_server.cpp: Use ACE_DEBUG
+          to display the message containing a time_t. Use of the standard
+          iostream operator<< with time_t gives the Intel90 compiler fits.
+
+Mon Mar  5 23:09:59 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Log_Msg.{h cpp}: Added new format specifiers:
+          %b to format ssize_t values
+          %B to format size_t values
+          %: to format time_t values
+
+          Note that these use, when necessary, printf format specifiers such
+          as ACE_SIZE_T_FORMAT_SPECIFIER and ACE_INT64_FORMAT_SPECIFIER.
+          The printf formatters can't be used portably in ACE_Log_Msg format
+          strings because 1) some of them use %I, which has a different meaning
+          in ACE_Log_Msg already and 2) some of the new printf formats are
+          more complicated that ACE_Log_Msg knows how to deal with in its
+          existing logic to use format modifiers. The new ACE_Log_Msg format
+          specifiers make it easy to portably log these types that can change
+          sizes across platforms.
+
+        * ace/Log_Record.cpp (dump):
+        * tests/Cached_Allocator_Test.cpp:
+        * tests/High_Res_Timer_Test.cpp: Use the new ACE_Log_Msg format
+          specifiers for size_t and time_t logged values.
+
+Mon Mar  5 22:23:01 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/clean_sems.sh:
+
+          s/xargs/xargs -r/  The -r switch to xargs prevents the command from
+          being executed when there are no arguments.  This will prevent the
+          extra scoreboard output on Linux (when rem_sems is used):
+            usage: ipcrm [ [-q msqid] [-m shmid] [-s semid]
+            [-Q msgkey] [-M shmkey] [-S semkey] ... ]
+            deprecated usage: ipcrm {shm | msg | sem} id ...
+
+Mon Mar  5 18:02:42 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h (ACE_UINT64_MAX):
+
+          Simplified preprocessor conditionals.
+
+        * ace/RB_Tree.h (ACE_RB_Tree_Iterator_Base):
+
+          Made copy constructor public instead of private.  The assignment
+          operator was already public so there was nothing to be gained by
+          making the copy constructor protected.  Addresses Sun Studio 10
+          warnings.
+
+        * ace/Time_Value.inl (to_usec):
+
+          Added support for ACE_LACKS_UNSIGNEDLONGLONG_T case.
+
+        * ace/UUID.cpp (get_systemtime):
+
+          In the ACE_LACKS_UNSIGNEDLONGLONG_T case, wrap 64-bit integer
+          constant with ACE_INT64_LITERAL macro.  Addresses potential
+          problem where the constant is intepreted as a "long", instead of
+          "long long".
+
+Mon Mar  5 17:22:26 UTC 2007  Ciju John  <johnc@ociweb.com>
+
+        * ace/INET_Addr.inl:
+        * ace/INET_Addr.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+          RFC 3330 defines loopback as any address with 127.x.x.x. The
+          is_loopback API currently simply compares against the
+          INADDR_LOOPBACK macro. Doing so restricts loopback definition to
+          127.0.0.1 which is inconsistent with the RFC definition. This
+          change will include any address with 127.x.x.x as loopback.
+
+Mon Mar  5 14:16:49 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * tests/run_test.lst:
+          Updated for LynxOS.
+
+Mon Mar 5 11:25:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Enabled ACE_HAS_VSFWPRINTF for aCC compiler
+
+Mon Mar 5 09:21:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Atomic_Op_Sparc.c:
+        * ace/Atomic_Op.{h,cpp}:
+          Added optimized functions for SunCC on x86. Thanks to
+          Dennis Chernoivanov <cdi at tbricks dot com> for reporting this.
+          If you want to enable these, add atomic_ops_sparc=1 to your
+          platform_macros.GNU file
+
+Sat Mar  3 17:35:52 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h (ACE_UINT64_MAX):
+
+          Re-wrap the integer constant with the ACE_UINT64_LITERAL macro
+          to ensure the appropriate type specifier is used.
+
+Fri Mar  3 5:01:19 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h (ACE_UINT64_MAX):
+
+          Reintroduced this constant for the case where 64 bit integers
+          are natively supported.  It was inadvertently removed.
+
+          Removed stray semi-colon in ACE_LACKS_{UNSIGNED}LONGLONG_T
+          case.
+
+Fri Mar  2 21:42:54 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Basic_Types.h (ACE_UINT64_MAX):
+
+          Corrected value for the ACE_LACKS_{UNSIGNED}LONG_LONG_T case.
+
+          (ACE_U64_TO_U32, ACE_CU64_TO_CU32):
+
+          Converted these macros to inlined functions.
+
+          (ACE_LONGLONG_TO_PTR):
+
+          Cast pointer to intptr_t instead of ptrdiff_t before casting
+          to the pointer type.  The ptrdiff_t type  is meant for pointer
+          differences.
+
+        * ace/High_Res_Timer.cpp (dump):
+
+          Drop ACE_CU64_TO_CU32 macro in favor of standard static_cast<>.
+          There was no real use for that macro in this case.
+
+        * ace/Numeric_Limits.h (ACE_Numeric_Limits):
+
+          Added a specialization for ACE_U_LongLong.
+
+        * ace/Sample_History.cpp (dump_samples):
+
+          Removed unnecessary cast to 32 bit value.
+
+          Corrected Log_Msg format specifier for unsigned type.
+
+        * ace/Time_Value.cpp (operator*=):
+        * tests/Time_Value_Test.cpp (run_main):
+
+          Removed ACE_LACKS_NUMERIC_LIMITS preprocessor conditional.  Use
+          ACE_Numeric_Limits<> instead.  It is always available.
+
+        * ace/Time_Value.h (to_usec):
+        * ace/Time_Value.inl (to_usec):
+
+          Enabled support for this method when ACE_LACKS_LONGLONG_T is
+          defined.
+
+        * ace/UUID.cpp (get_systemtime):
+
+          Fixed support for ACE_U_LongLong type.
+
+Fri Mar  2 20:48:45 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Improved the description of using Pharlap ETS and
+          described the ACE_PHARLAP_TESTLOG_TO_FILE config setting.
+
+        * ace/config-pharlap.h: Add a IN_CLASSD(i) macro that always reports
+          false. Although Pharlap is supposed to support multicast, the
+          IN_CLASSD macro is only added at WinSock 2.
+
+        * tests/Test_Output.cpp: Allow Pharlap to log to a file by setting
+          ACE_PHARLAP_TESTLOG_TO_FILE in config.h. The default behavior of
+          logging to the system console still stands.
+
+Fri Mar  2 18:18:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
+
+          Override the targets method to supply a list of targets that can
+          be used with Eclipse.
+
+Fri Mar  2 17:48:09 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h (Truncator):
+
+          Fixed one more typo in the ACE_U_LongLong partial specialization
+          of this functor.  Also corrected truncation logic.
+
+Thu Mar  1 16:30:13 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Msg.h (ACE_Log_Msg): Updated the document to remove the
+          claim that stdout can be used.  Thanks to Ian C White
+          <Ian_C_White at raytheon dot com> for reporting this.
+
+Thu Mar 1 13:15:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Removed ACE_HAS_VSWPRINTF, there are dependencies on this
+          define and no time to handle this fully.
+
+Thu Mar 1 12:28:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Fixed sun warning
+
+Thu Mar 1 12:18:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Misc/test_signals_2.cpp:
+          Removed HPUX disabling, compiles fine on our system
+
+Thu Mar 1 9:42:12 UTC 2007  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/ProcessVX_Unix.pm:
+          Some fixes for running VxWorks 6.x RTP tests.
+
+Thu Mar  1 08:51:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stdio.{cpp,inl}:
+          Introduced new ACE_HAS_VSWPRINTF that we can set when a platform
+          has this method
+
+        * ace/config-hpux-11.00.h:
+          Added ACE_HAS_VSWPRINTF
+
+Wed Feb 28 21:34:45 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Added two new TAO tests.
+
+Wed Feb 28 19:16:12 UTC 2007  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/DLL_Manager.cpp:
+        * ace/Parse_Node.cpp:
+          Fixed pointer conversion warnings on OpenVMS.
+
+Wed Feb 28 17:44:20 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h (Truncator):
+
+          Fixed typo in the ACE_LACKS_UNSIGNEDLONGLONG_T case.
+          s/ACE_UIN32/ACE_UINT32/.
+
+Wed Feb 28 13:32:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Moved ACE_HAS_SSIZE_T outside of the compiler specific part, gcc
+          and aCC do have ssize_t. Also moved ACE_HAS_XPG4_MULTIBYTE_CHAR
+          outside of the compiler part.
+
+Wed Feb 28 11:09:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.cpp (num_processors):
+          Implemented for HPUX
+
+Wed Feb 28 09:58:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ADDIDL.DSM:
+          Moved to TAO
+
+        * bin/msvc_cidlc.pl:
+          Moved to CIAO
+
+        * indent_macros.perl:
+        * indent_macros.pl:
+          Renamed extension to .pl
+
+Wed Feb 28 09:44:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/corba-boolean.perl:
+        * bin/rm_exception_macros.pl:
+        * bin/subst_env.pl:
+        * bin/tao_env.pl:
+        * bin/tao_svcconf.pl:
+          Moved to TAO/bin, no need to ship these with ACE
+
+Wed Feb 28 08:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/DLL_Manager.cpp:
+          Fixed a deadlock that could occur when a dll is loaded which itselfs
+          also loads a dll in its static initialisation. This fixes bugzilla bug
+          2830.
+
+Tue Feb 27 21:18:07 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * netsvcs/lib/Time_Request_Reply.cpp:
+        * tests/Integer_Truncate_Test.cpp:
+        * tests/CDR_File_Test.cpp:
+
+          s/ACE_Utils::Truncate/ACE_Utils::truncate_cast/g.  The former is
+          deprecated.
+
+        * tests/High_Res_Timer_Test.cpp:
+
+          Improved variable types to make use of
+          ACE_Utils::truncate_cast<> unnecessary.
+
+Tue Feb 27 18:55:12 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/CDR_Stream.cpp:
+        * ace/Message_Block.cpp:
+
+          The intent of the change is to better detect (and be able to
+          recover from) a situation when memory allocation fails in
+          constructing or initializing an ACE_Data_Block. It fixes a
+          problem with the change from "Mon Feb 26 19:06:36 UTC 2007"
+          which wasn't accounting for the new datablock size correctly.
+
+Tue Feb 27 19:33:13 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Truncate.h:
+
+          Added specializations for ACE_U_LongLong.
+
+          Added yet another const specialization for BCB6 to work around
+          its inability to use valid specializations with template
+          parameters that are not const.
+
+          Removed ACE_Utils::Truncate<> altogether.  Use
+          ACE_Utils::truncate_cast<> instead.
+
+Tue Feb 27 15:18:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/docs/templates/gnu.txt:
+
+          Added documentation for template variables used by the gnuace
+          project type.  This is used by document_template.pl found in
+          MPC/devtools.
+
+Tue Feb 27 14:59:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Process_Manager_Test.cpp:
+          Fixed incorrect initialized variable
+
+Tue Feb 27 14:20:26 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/CDR_Stream.cpp:
+        * ace/Message_Block.cpp:
+
+          Reverting my patch from "Mon Feb 26 19:06:36 UTC 2007". It needs
+          more work.
+
+Tue Feb 27 13:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/High_Res_Timer.cpp:
+        * ace/DLL_Test.cpp:
+          Removed check for KCC, that compiler is not supported anymore
+
+Tue Feb 27 11:45:06 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Notification_Queue_Unit_Test.cpp:
+          Fixed compilation error in Redhat_Enterprise_Linux_3_Debug_WChar
+          build.  Thanks to Johnny Willemsen for letting me know.
+
+Tue Feb 27 03:34:40 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Notification_Queue_Unit_Test.cpp:
+          Use functions instead of macros to workaround compiler warnings
+          in the HP-UX_11iv2_IA64_aCC_wchar build.
+          The warnings were harmless, but the code is more readable this
+          way in any case.  Thanks to Johnny Willemsen for bringing the
+          warnings to my attention.
+
+Mon Feb 26 20:58:05 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp (insert):
+
+          Removed the usage of fprintf to print messages about service
+          descriptors, inserted using static initializers. It is the only
+          way if you want to see what is being inserted before ACE_Log_Msg
+          gets initialized but because it uses stderr directly, it may
+          affect some aplications' expected output.
+
+        * ace/Service_Repository.cpp (insert):
+
+          Fixing a defective debug statement.
+
+Mon Feb 26 19:06:36 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/CDR_Stream.cpp (grow_and_adjust, clone_nocopy):
+
+          For large sizes the message block constructor may fail to
+          allocate and/or initialize the necessary ACE_Data_Block
+          instances. The failure to initialize can go unnoticed and may
+          cause an unlimited number of recursive invocations of
+          grow_and_adjust. The change adds a test for the invariant of the
+          newly allocated ACE_Message_Block instance.
+
+        * ace/Message_Block.cpp (clone_nocopy):
+
+          When memory is scarce the allocation of ACE_Data_Block may
+          succeed while the initialization can fail.  Adding a test,
+          before the message block is declared good.
+
+Mon Feb 26 17:17:08 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/PerlACE/Run_Test.pm:
+
+          Set up the $PerlACE::CIAO_ROOT variable, just like $PerlACE::TAO_ROOT
+          except for CIAO.
+
+        * bin/auto_run_tests.pl:
+
+          Find CIAO tests relative to the $CIAO_ROOT directory.
+
+Mon Feb 26 13:56:42 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ACETAOCIAO.style:
+          Updated to version 1.12 of StyleManager
+
+Mon Feb 26 13:03:19 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Added code to surround all libraries with a -Wl,--start-group and
+          -Wl,--end-group only if the compiler is g++, we're linking static
+          libraries, it's an executable and the 'link_groups' template
+          variable is set.
+
+Mon Feb 26 10:08:19 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * tests/SOCK_Dgram_Bcast_Test.cpp:
+          Pass correct buffer length to ACE_OS::vsnprintf().
+          Thanks to Yves Alloyer <alloyer at ipanematech dot com> for
+          reporting this and providing initial patch.
+
+Mon Feb 26 08:50:13 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/Process.cpp (command_line):
+          Pass correct buffer length to ACE_OS::vsnprintf().
+          Thanks to Yves Alloyer <alloyer at ipanematech dot com> for
+          reporting this and providing initial patch.
+
+Sun Feb 25 17:26:37 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * bin/tao_orb_tests.lst:
+
+          Added the DiffServ policy test's run_test.pl.
+
+Sat Feb 24 23:01:16 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Added ACE_CHECK_LACKS_FUNCS(alphasort)
+
+Sat Feb 24 22:51:09 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-sunos5.5.h:
+        * ace/config-sunos5.10.h: Add ACE_LACKS_ALPHASORT at Solaris 2.5 and
+          remove it at Solaris 10. Solaris 8 and 9 have an alphasort() but
+          only for use with the BSD cc compiler and with disclaimer that it's
+          not supported for use with system libraries nor with multiple
+          threads. Solaris 10 brings it into supported use.
+
+Sat Feb 24 17:03:47 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * examples/NT_Service/main.cpp:
+        * examples/NT_Service/nt_svc.{h cpp}: Don't check for disabling
+          macros until a config file has been included, else it never builds
+          anywhere. Thanks to Johnny Willemsen for pointing this out.
+
+Sat Feb 24 09:01:19 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/config-linux.h:
+
+          AIO support pulls in the rt library, which pulls in the pthread
+          library.  Disable AIO in single-threaded builds.
+
+        * tests/Recursive_Mutex_Test.cpp:
+
+          Check if ACE_Recursive_Thread_Mutex::get_nesting_level() is
+          supported before attempting to use it.
+
+Sat Feb 24 08:34:08 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/config-openvms.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-qnx-rtp-pre62x.h:
+          Added ACE_LACKS_ALPHASORT.
+
+Fri Feb 23 23:10:17 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tests/Recursive_Mutex_Test.cpp (test_recursion_depth):
+
+          Issue error messages instead of assert()ing.  VxWorks builds
+          will hang on a crash.  Thanks to Johnny for pointing this out.
+
+Fri Feb 23 19:24:30 USMST 2007  Yan Dai  <dai_y@ociweb.com>
+
+        * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp:
+
+          Made run_server() and other functions and structures only compiled
+          when ACE_HAS_SCTP is defined. This should resolve the warning that the
+          run_server() is defined but not used on some platforms.
+
+Fri Feb 23 17:47:28 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Bug_2815_Regression_Test.cpp:
+          The test should be enabled only if the notification queue is
+          also enabled.  Basically purge_pending_notifications() is not
+          supported without the notification queue, and that is the
+          operation we want to test.
+
+Fri Feb 23 15:37:03 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_dirent.inl (alphasort): Use a bigger hammer on the casts.
+
+Fri Feb 23 10:50:41 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_dirent.inl:
+          Fixed casts again. Hopefully now I got it right.
+
+Fri Feb 23 08:56:15 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_dirent.inl:
+          Added casts to fix compile errors.
+
+        * ace/config-rtems.h:
+        * ace/config-vxworks5.x.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Added ACE_LACKS_ALPHASORT.
+
+Thu Feb 22 18:37:00 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.h:
+        * ace/Service_Config.inl:
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Fixing build troubles caused by the different ACE_TSS interface
+          for single-threaded builds. Eliminated the intermediary class
+          (TSS_Resources) and now storing the actual service gestalt
+          pointer in TSS, thus reducig the memory allocation overhead.
+
+Thu Feb 22 16:45:30 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tests/MT_SOCK_Test.cpp: Document the actual cause of what's been
+          observed for some time with some Windows systems exhibiting a
+          "delayed rejection" of connections in excess of the listener's
+          backlog. Thank you to Aleksandar Vukajlovic <vukajlo at finsoft
+          dot co dot yu> for citing the full cause with its supporting
+          documentation and explanation.
+
+Thu Feb 22 15:59:12 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-win32-common.h: Change the comments around ACE_HAS_PENTIUM
+          to more accurately reflect its use and setting. With the switch to
+          QueryPerformanceCounter() for high-res timers on Windows, this
+          setting doesn't have any affect on timers, but it is used in
+          some CDR operations. This resolves Bugzilla #1410.
+
+        * ace/OS_NS_time.inl (gethrtime):
+        * ace/gethrtime.cpp: Remove the comments directing the reader to a
+          description of using RDTSC on Windows. The comment is long gone, and
+          RDTSC isn't used on Windows/VC any longer anyway.
+
+Thu Feb 22 15:07:22 UTC 2007  Ciju John  <johnc@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Additions to support DDS specific build rules and versioning.
+
+Thu Feb 22 13:56:42 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Makefile.am:
+          Added Notification_Queue.{h,cpp,inl}:
+
+        * ace/OS_NS_dirent.inl:
+          Added include when ACE_LACKS_ALPHASORT is defined
+
+Thu Feb 22 13:03:01 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * Merged changes from the bug_2815 branch.  From revision 77182 to
+          revision 77315.
+
+        Tue Feb 20 18:17:00 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/ace_for_tao.mpc:
+          Add Notification_Queue.cpp to this file too.  Thanks to Johnny
+          Willemsen for pointing this out.
+
+          Mon Feb 19 21:53:58 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Intrusive_List.inl:
+          I learned a minute ago that std::swap() was kosher.  Use it in
+          favor of ACE_Swap<>.
+
+          Mon Feb 19 21:47:48 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/run_test.lst:
+        * tests/Bug_2815_Regression_Test.cpp:
+          Adjusted the number of iterations so the test would pass on my
+          G4-based laptop without optimizations or inlining.  The previous
+          numbers were just guesses anyway and I hope the new numbers will
+          result in no failures for the scoreboard.
+
+          Mon Feb 19 21:29:32 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Notification_Queue.cpp:
+          Modified the purging algorithm.  The algorithm used a temporary
+          list to store the elements not purged, so basically all nodes
+          were either moved to the free list or to the temporary list.
+          The new algorithm only removes the nodes that needs purging.
+          In the vast majority of the cases this is more efficient because
+          most nodes are not purged.
+          This resulted in a factor of 2 improvement for
+          tests/Bug_2815_Regression_Test, keep in mind that in this
+          program 1/16th of the nodes are purged.  So in practice I would
+          expect even better results.
+          I also changed the order in which the free nodes are re-used, I
+          think LIFO order has a better chance of re-using the cache, but
+          I have no evidence or experiments to prove this.
+
+        * ace/Intrusive_List.h:
+        * ace/Intrusive_List.cpp:
+          Renamed the remove_i() function to unsafe_remove() and promoted
+          its access to "public".  The function is not safe to use in
+          general, thus the name, but it resulted in a factor of 2
+          performance improvement for ACE_Notification_Queue.
+
+        * tests/Bug_2815_Regression_Test.cpp:
+          Fixed memory leaks (in the test not the library)
+
+          Mon Feb 19 20:32:34 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * ace/Notification_Queue.h:
+        * ace/Notification_Queue.inl:
+        * ace/Notification_Queue.cpp:
+          Re-factored to use ACE_Intrusive_List in the implementation.
+          This eliminates memory allocations during additions and removal
+          of elements.  Also, many of the operations cannot fail, so the
+          code became smaller.
+
+        * ace/Intrusive_List.h:
+        * ace/Intrusive_List.inl:
+          Add a swap() member function.
+
+          Mon Feb 19 04:49:35 UTC 2007  coryan  <coryan@atdesk.com>
+
+        * ace/Notification_Queue.h:
+        * ace/Notification_Queue.cpp:
+        * ace/ace.mpc:
+          New class to encapsulate the implementation of a user-space
+          based notification queue.  The code was duplicated in both
+          Select_Reactor.{h,cpp} and Dev_Poll_Reactor.{h,cpp}
+
+        * tests/tests.mpc:
+        * tests/run_test.lst:
+        * tests/Notification_Queue_Unit_Test.cpp:
+          New unit test for the notification queue class.
+
+        * ace/Dev_Poll_Reactor.h:
+        * ace/Dev_Poll_Reactor.cpp:
+        * ace/Select_Reactor_Base.h:
+        * ace/Select_Reactor_Base.cpp:
+          Refactored notification queue code to a new class
+          (ACE_Notification_Queue)
+
+        * tests/Bug_2815_Regression_Test.cpp:
+          Add code to help with debugging.  Basically my refactoring above
+          had at least one bug, and this test uncovered it.  But it was
+          hard to debug because there was no single breakpoint to detect
+          when the failure condition was triggered.
+
+        * tests:
+          Add new files to svn:ignore property.  Also added some old
+          files.
+
+        * tests/SSL:
+        * include/makeinclude:
+          Add missing files to svn:ignore
+
+          Sun Feb 18 21:13:41 UTC 2007  coryan  <coryan@atdesk.com>
+
+        * tests/tests.mpc:
+        * tests/Bug_2815_Regression_Test.cpp:
+          Add new regression test for bug 2815.  I have not added the test
+          to the automated test suite because (1) it fails, and (2) it is
+          a test to reproduce performance
+
+Thu Feb 22 12:58:42 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/compiler.bor:
+          Removed BCB4/5 support
+
+Thu Feb 22 11:19:59 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_dirent.h:
+        * ace/OS_NS_dirent.inl:
+          Added ACE_OS::alphasort(). alphasort() is a BSD extension found
+          on Linux as well.
+
+        * ace/config-lynxos.h:
+          Added ACE_LACKS_ALPHASORT_PROTOTYPE.
+
+        * ace/config-win32-common.h:
+          Added ACE_LACKS_ALPHASORT.
+
+        * ace/os_include/os_dirent.h:
+          Added alphasort prototype.
+
+        * tests/Dirent_Test.cpp:
+          Chaged to use use ACE_OS::alphasort().
+
+Thu Feb 22 09:24:42 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Truncate.h (Truncate, truncate_cast):
+          Also renamed the Borland part
+
+Thu Feb 22 04:57:42 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tests/NonBlocking_Conn_Test.cpp (test_connect):
+
+          Fixed syntax error.  s/sizeof ACE_TCHAR/sizeof (ACE_TCHAR)/.
+
+Wed Feb 21 21:46:18 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-pharlap.h:
+        * ace/config-WinCE.h:
+        * ace/OS_NS_stdio.inl:
+        * ace/OS_NS_unistd.inl: Changed ACE_LACKS_SETFILEPOINTEREX to
+          ACE_LACKS_WIN32_SETFILEPOINTEREX to be consistent with the other
+          ACE_*_WIN32_*things.
+
+        * ace/config-pharlap.h:
+        * ace/config-WinCE.h:
+        * ace/NT_Service.{h cpp}:
+        * examples/NT_Service/nt_svc.h:
+        * examples/NT_Service/main.cpp:
+          Also added ACE_LACKS_WIN32_SERVICES for Pharlap and CE. This marks
+          a platform that is Windows, but doesn't have Windows services.
+
+        * ace/Configuration.{h cpp}:
+        * ace/Registry.{h cpp}: Rather than exclude registry-using code using
+          ACE_HAS_PHARLAP, use a new setting ACE_LACKS_WIN32_REGISTRY.
+
+        * ace/config-pharlap.h: Added ACE_LACKS_WIN32_REGISTRY.
+
+        * protocols/ace/HTBP/HTBP_Environment.cpp:
+        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
+        * examples/Registry/test_registry_update.cpp:
+        * examples/Registry/test_registry_iterator.cpp:
+        * tests/Config_Test.cpp: Don't try registry stuff
+          if ACE_LACKS_WIN32_REGISTRY is set.
+
+        * examples/Reactor/WFMO_Reactor/Window_Messages.cpp: Don't try this if
+          ACE_LACKS_MSG_WFMO is set.
+
+        * apps/JAWS/server/IO.{h cpp}:
+        * apps/JAWS/server/HTTP_Handler.{h cpp}:
+        * apps/JAWS/server/HTTP_Server.{h cpp}:
+        * apps/JAWS2/JAWS/IO.{h cpp}:
+        * apps/JAWS2/JAWS/IO_Acceptor.{h cpp}:
+        * apps/JAWS2/JAWS/IO_Handler.{h cpp}:
+        * apps/JAWS3/jaws3/Asynch_IO.cpp:
+        * examples/APG/Proactor/HA_Proactive_Status.{h cpp}:
+        * examples/Connection/blocking/SPIPE-acceptor.{h cpp}:
+        * examples/Connection/blocking/test_spipe_acceptor.cpp:
+        * examples/Reactor/Proactor/post_completions.cpp:
+        * examples/Reactor/Proactor/simple_test_proactor.cpp:
+        * examples/Reactor/Proactor/test_cancel.cpp:
+        * examples/Reactor/Proactor/test_end_event_loop.cpp:
+        * examples/Reactor/Proactor/test_multiple_loops.cpp:
+        * examples/Reactor/Proactor/test_proactor.cpp:
+        * examples/Reactor/Proactor/test_proactor2.cpp:
+        * examples/Reactor/Proactor/test_proactor3.cpp:
+        * examples/Reactor/Proactor/test_timeout.cpp:
+        * examples/Reactor/Proactor/test_timeout_st.cpp:
+        * examples/Reactor/Proactor/test_udp_proactor.cpp:
+        * examples/Reactor/WFMO_Reactor/Talker.cpp:
+          Decide on whether or not to compile the asynch support classes
+          based on ACE_HAS_WIN32_OVERLAPPED_IO, not ACE_WIN32. ACE_WIN32
+          is broader than that overlapped I/O-capable ones; Pharlap ETS
+          doesn't do overlapped I/O, for instance.
+
+Wed Feb 21 19:27:14 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Array_Base.cpp (size):
+
+          Simplified return value logic.
+
+        * ace/Auto_Ptr.h (ACE_auto_ptr_reset):
+
+          Added missing "brief" documentation.
+
+        * ace/Caching_Strategies_T.inl:
+        * ace/Svc_Handler.cpp (init):
+
+          Removed unnecessary uses of ACE_UNUSED_ARG macro.  Just comment
+          out the parameter name instead.
+
+        * ace/DLL_Manager.cpp (unload_all):
+        * ace/Functor.inl (operator()):
+        * ace/OS_NS_unistd.h (sbrk):
+        * ace/OS_NS_unistd.inl (sbrk):
+        * ace/Parse_Node.cpp:
+        * ace/Timer_Hash_T.cpp:
+
+          Corrected type used to store pointer value.
+          s/ptrdiff_t/{u}intptr_t/.
+
+        * ace/SOCK_Dgram.cpp:
+
+          Fixed unused argument warning.
+
+        * ace/String_Base_Const.cpp:
+
+          Workaround npos constant run-time initialization problem in some
+          mixed shared/static linking conditions by making it easy for the
+          compiler to embed the value of the constant in the object file
+          at compile-time.
+
+        * ace/Truncate.h (Truncate, truncate_cast):
+
+          Deprecated ACE_Utils::Truncate() function name in favor of
+          ACE_Utils::truncate_cast().  The latter better reflects what the
+          function template actually does.
+
+        * ace/Unbounded_Set.cpp:
+        * ace/Unbounded_Set.h:
+        * ace/Unbounded_Set.inl:
+
+          Implement find() method in terms of begin/end iterators to prevent
+          search from looping indefinitely under some race condition
+          scenarios.
+
+          Added missing const_iterator factory methods.
+
+          Added missing const_iterator equality and inequality operators.
+
+        * ace/OS_NS_unistd.inl:
+        * ace/Time_Value.inl:
+        * ace/Token_Request_Reply.inl:
+        * ace/FILE_IO.cpp:
+        * ace/Filecache.cpp:
+        * ace/High_Res_Timer.cpp:
+        * ace/Log_Record.cpp:
+        * ace/MMAP_Memory_Pool.cpp:
+        * ace/Mem_Map.cpp:
+        * ace/Message_Queue.cpp:
+        * ace/Message_Queue_T.cpp:
+        * ace/Name_Request_Reply.cpp:
+        * ace/Process.cpp:
+        * ace/SOCK_Dgram.cpp:
+        * ace/SOCK_IO.cpp:
+        * ace/Timer_Hash_T.cpp:
+
+          s/ACE_Utils::Truncate/ACE_Utils::truncate_cast/g.  The former is
+          deprecated.
+
+        From Andrew Schnable
+        * ace/os_include/os_unistd.h (X_OK):
+
+          Windows has no access() test for X_OK.  Use R_OK instead.
+
+        From Russell Mora
+        * ace/ACE.inl (hex2byte):
+        * ace/Capabilities.h (is_line, is_empty):
+        * ace/Capabilities.cpp (parse, fillent, is_entry, is_empty, is_line):
+        * ace/Get_Opt.cpp (long_option):
+        * ace/OS_NS_ctype.inl (ace_isalnum):
+
+          Added ACE::ace_isalnum, ACE::ace_isdigit and ACE::ace_islower
+          and changed to use them where appropriate.  This prevents the
+          narrow char versions being called with wide chars.
+
+        * ace/Asynch_IO.cpp:
+
+          Fixed preprocessor scoping issue in builds where
+          ACE_HAS_AIO_CALLS is undefined and versioned namspaces are
+          enabled.   ACE_END_VERSIONED_NAMESPACE_DECL ended up being
+          preprocessed when it should not have.
+
+        * ace/Configuration_Import_Export.cpp (export_config):
+
+          Check the return value of fclose() is required because data may
+          have been buffered and will be fflush()d with the fclose().
+
+        * ace/Log_Msg.h:
+        * ace/Log_Msg.cpp:
+
+          Changed message offset to correct type, ptrdiff_t, since it
+          contains a pointer difference value.
+
+        * ace/Null_Semaphore.h:
+
+          Added include to get definition of size_t.  This is required for
+          static single-threaded builds on Darwin.
+
+        * ace/OS_NS_stdio.inl (cuserid):
+
+          Check for unexpected failure of getpwuid function; don't
+          dereference null pointer.
+
+        * ace/Process.cpp (spawn):
+
+          On Windows platforms a process handle is a pointer, not an int.
+          Corrected format specifiers accordingly.
+
+        * ace/RB_Tree.cpp (remove_i):
+
+         Fixes for Coverity REVERSE_INULL issues.  Check for null pointer
+         before dereferencing.
+
+        * ace/Recursive_Thread_Mutex.cpp (get_nesting_level):
+
+          Reverted change that altered implementation for IA64 Windows
+          builds.  The returned nesting level was incorrect.  Use the
+          implementation used by both 32-bit and AMD 64 bit builds.
+
+        * tests/Recursive_Mutex_Test.cpp (test_recursion_depth):
+
+          Added test cases for the above problem.
+
+        * ace/SOCK_Connector.cpp (shared_connect_finish):
+
+          On Windows, in order to detect when the socket that has been
+          bound to is in TIME_WAIT we need to do the connect (which will
+          always return EWOULDBLOCK) and then do an
+          ACE::handle_timed_complete() (with timeout==0, i.e. poll).  This
+          will do a select() on the handle which will immediately return
+          with the handle in an error state.  The error code is then
+          retrieved with getsockopt().
+
+          Good sockets however will return from the select() with ETIME -
+          in this case return EWOULDBLOCK so the wait strategy can
+          complete the connection.
+
+        * ace/Service_Manager.cpp (list_services):
+
+          Type conversion - it is unlikely the name of the service is a
+          string bigger than 2GB (on 32-bit systems) so a static_cast<> is
+          safe here.
+
+        * ace/Svc_Conf_Lexer.cpp (scan):
+
+          Changed the loop indexing to allow loop variable to be the same
+          type as variable used to initialise the loop.  This avoids
+          conversion warnings.
+
+          (yylex):
+
+          Fixed unused variable warning.
+
+        * ace/UNIX_Addr.inl (set):
+
+          Correct wide string to narrow string conversion.
+
+        * ace/config-cxx-common.h:
+
+          Eliminated copious amounts of warnings.
+
+        * ace/config-linux.h (ACE_HAS_CLOCK_GETTIME):
+        * ace/config-linux-common.h (ACE_HAS_CLOCK_GETTIME):
+
+          On linux clock_gettime/clock_settime are not available for
+          single-threaded builds.
+
+        * ace/os_include/os_dlfcn.h (ACE_DEFAULT_SHLIB_MODE):
+
+          Added DYNAMIC_PATH to the default flags used to call shl_load()
+          on HP 11.00 (PARISC1.1/32-bit) so that RPATH and SHLIB_PATH are
+          searched to find the requested .sl.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd (FORCED_IDL_STUBS):
+
+          PCH source files are also dependent on the IDL compiler
+          generated files.
+
+        * include/makeinclude/platform_hpux_aCC.GNU (SONAME):
+
+          HP platform (non-g++) was missing the appropriate LDFLAGS for
+          building versioned shared libraries.  Copied from the hpux
+          section of platform_g++_common.GNU.
+
+          Disable warnings when 64 bit file offsets are enabled in HP
+          11.11 builds.
+
+        * include/makeinclude/platform_irix6.x_sgic++.GNU (AR, ARFLAGS):
+
+          By default IRIX uses a prelinker to instantiate templates, thus
+          archives need to be created via CC (using the -ar option) so
+          that the required templates can be instantiated.  This was the
+          cause of the missing symbols problems reported by users of the
+          static libraries.
+
+        * include/makeinclude/platform_tru64_cxx.GNU:
+
+          It seems that the default debug level in the Compaq C++ compiler
+          really goes to town when a template is instantiated - it seems
+          to add debug information for every scrap of code that the
+          template instantiation ever see resulting in debug template
+          instantiations that are up to 1000x bigger than their release
+          counterparts.  Dialing the level back down to -g1 (-g2 is the
+          default) seems to avoid this issue and we still get debug
+          symbols for the template instantiation itself.
+
+        * tests/NonBlocking_Conn_Test.cpp (test_connect):
+
+          Fixed potential buffer overrun error.
+
+        From Duane Binder
+        * ace/ace_wchar.h:
+
+          Added ACE_TEXT_ macros needed by some apps.
+
+        * ace/Process.inl (creation_flags):
+        * ace/Naming_Context.cpp:
+        * ace/Registry_Name_Space.cpp:
+        * ace/Registry_Name_Space.h:
+
+          Use ACE_USES_WCHAR not UNICODE.  Whether ACE uses Windows
+          wchar_t APIs is controlled by ACE_USES_WCHAR and not UNICODE.
+
+        * include/makeinclude/platform_freebsd.GNU:
+
+          Remove pthread and semaphore references for singled threaded
+          FreeBSD builds.
+
+        * include/makeinclude/platform_linux.GNU (LIBS):
+
+          Prevent single threaded linux builds from linking libpthread
+          (via librt).
+
+        * include/makeinclude/rules.lib.GNU:
+
+          Not all static libraries have template instantiations.  Test if
+          $(TEMPINCDIR) exists before trying to add objects in an archive
+          library (was a problem on Tru64 with debug builds).
+
+Wed Feb 21 14:23:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added bug 1592 regression
+
+Tue Feb 20 17:56:25 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Clarified how the COPYING file need to be included with
+          any code released.  Thanks to Scott Mark <sjm at pobox dot com>
+          for helping clarify this.
+
+Wed Feb 21 08:35:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Swap.{h,cpp,inl}:
+          Removed, use std::swap instead of ACE_Swap
+
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+        * ace/Makefile.am:
+          Removed Swap.{h,cpp,inl}
+
+Wed Feb 21 08:13:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp:
+        * examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp:
+        * examples/IPC_SAP/SSL_SAP/SSL-server.cpp:
+          Fixed compile problems when wchar is enabled
+
+Tue Feb 20 19:15:30 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/run_test.lst:
+
+          Adding Object_Manager_Flipping_Test to the list of running
+          tests.
+
+Tue Feb 20 18:08:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Object_Manager_Flipping_Test.cpp:
+        * tests/tests.mpc:
+
+          Adding new test verifying that after ACE::fini has been called,
+          the correct pointer value has been stored in TSS for the Service
+          Config.  A subsequent call to ACE::init may SEGV
+          otherwise. Thanks to Bjoern Rasmussen <bjoern.d.rasmussen at
+          gmail dot com> for reporting it.
+
+Tue Feb 20 17:15:37 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/config-qnx-rtp.h:
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+
+          Moved the version detection from the platform_macros file to the
+          config file.  This allows us to use the QNX system-defined macro
+          _NTO_VERSION, which works in cross-compile environments.  The old
+          method of reading the version number from the "uname -a" output is
+          not compatible with cross-compilation.
+
+Tue Feb 20 16:38:24 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd
+        * bin/MakeProjectCreator/config/global.features
+
+          Added logic in gnu template for new XSC custom type in CIAO,
+          and disabled xsc by default in global.features.
+
+Tue Feb 20 16:12:57 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tests/Bug_2820_Regression_Test.cpp: ACEify use of auto_ptr.
+
+Tue Feb 20 16:06:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_stdlib.h:
+          Simplified the ACE_RANDR_TYPE define setting
+
+        * ace/OS_NS_stdio.inl:
+        * ace/SOCK_Dgram.cpp:
+        * ace/WFMO_Reactor.cpp:
+          Simplified Borland C++ checks, no need to check for the version
+          number
+
+Tue Feb 20 15:54:20 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS_NS_Thread.cpp:
+
+          Reverted my change to check PTHREAD_STACK_MIN.  I just realized
+          that it may not be defined as an integral value (i.e., Solaris).
+
+Tue Feb 20 15:46:06 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS_NS_Thread.cpp:
+
+          Added ACE_UNUSED_ARG(id) for RTEMS and modified code to check
+          that size (which is of type size_t) is less than PTHREAD_STACK_MIN
+          only if PTHREAD_STACK_MIN is greater than zero.
+
+        * ace/OS_NS_stdlib.cpp:
+
+          Fixed a compile error on VxWorks where an attempt to cast
+          ACE_thread_t to ACE_RANDR_TYPE failed (since ACE_thread_t is char*
+          on VxWorks).
+
+        * ace/SOCK_Dgram.cpp:
+
+          The iov_len element of the iovec struct is unsigned on RTEMS (as
+          it is with Linux and Borland C++), so use the same #if check to
+          avoid code that causes warnings.
+
+Tue Feb 20 15:06:04 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/SOCK_Dgram.cpp:
+
+          The iov_len element of the iovec struct is unsigned on Linux (as
+          it is with Borland C++), so use the same #if check to avoid code
+          that causes warnings.
+
+        * ace/Containers_T.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/UPIPE_Stream.cpp:
+        * ace/UUID.cpp:
+
+          Added static_cast<> to avoid conversion warnings.
+
+Tue Feb 20 15:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * m4/compiler.m4:
+          Fixed support for --enable-symbol-visibility. This fixes bugzilla
+          bug 2771, thanks to Waba <waba-ace at waba dot be> for reporting
+          this.
+
+Tue Feb 20 14:43:00 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ASNMP/asnmp/pdu.cpp:
+        * apps/JAWS2/JAWS/Cache_Manager.cpp:
+
+          Added a check for self assignment.
+
+        * ace/INET_Addr.cpp:
+        * tests/Multicast_Test_IPV6.cpp:
+        * examples/Web_Crawler/Command_Processor.cpp:
+
+          Removed redundant code to avoid "statement is unreachable"
+          warnings.
+
+        * examples/APG/Naming/Temperature_Monitor.cpp:
+        * examples/APG/Naming/Temperature_Monitor2.cpp:
+        * examples/APG/Streams/Answerer.cpp:
+        * examples/C++NPv1/Logging_Server.cpp:
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/Thread_Per_Connection_Logging_Server.h:
+
+          Added ACE_NOTREACHED around unreachable code to avoid "statement
+          is unreachable" warnings.
+
+        * examples/Connection/blocking/SPIPE-acceptor.cpp:
+
+          Reverted a bug that was introduced many years ago where threads
+          would be spawned and then the main thread would exit.
+
+        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
+        * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp:
+        * performance-tests/SCTP/SOCK_STREAM_srv.cpp:
+
+          Modified to only compile code if ACE_HAS_SCTP is defined.
+
+        * tests/INET_Addr_Test.cpp:
+
+          Check addr.get_host_addr() for non-zero before passing it to
+          ACE_OS::strcmp().
+
+Tue Feb 20 03:08:26 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/tests.mpc:
+        * tests/Bug_2820_Regression_Test.cpp:
+          A new test to demonstrate the problems in bug 2820.
+
+Mon Feb 19 23:13:07 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/WFMO_Reactor.h: Clarify description of ok_to_wait().
+
+        * ace/WFMO_Reactor.cpp (ok_to_wait): Since WinCE can't use the
+          waitAll arg to atomically wait for both the lock and ok_to_wait
+          event, use a 2-step process to get both individually. This avoids
+          entering wfmo either without the ok_to_wait event or without
+          the lock. Thanks to Craig Johnson for reporting this. Also see:
+          Mon Oct 16 14:24:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+Mon Feb 19 21:02:55 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Atomic_Op.inl:
+        * ace/OS_NS_unistd.inl: Adjust code for less-than-modern Win32 systems
+          such as Pharlap ETS to work with 64 bit file offsets and the lack
+          of interlocked exchange-add.
+
+Mon Feb 19 18:33:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/SSL/SSL_Context.h:
+          Layout change
+
+        * ace/SSL/SSL_Context.inl (check_context):
+          Set the verify mode correctly, fixes bugzilla bug 2819
+
+Mon Feb 19 12:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Added Secure_Invocation test, this tests basic functionality but
+          seems to fail at this moment because of some broken support in
+          TAO
+
+Fri Feb 16 23:48:55 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.cpp:
+
+          ACE_INLINE makes sense in .inl files (thanks Steve)
+
+Fri Feb 16 13:38:04 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
+        * ace/Service_Config.h:
+        * ace/Service_Config.inl:
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.inl:
+        * ace/Service_Gestalt.cpp:
+
+          Reverting my changes since "Tue Feb 13 15:35:54 UTC 2007" as it
+          has been causing problems, in particular with borland and
+          no-threads builds.
+
+Fri Feb 16 12:47:03 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Service_Config.cpp (global): Removed the ACE_INLINE qualifier
+          from global() - if it's in the .cpp file, it shouldn't be marked
+          as inline, and isn't marked thusly in the .h file. Fixes unsats.
+
+        * ace/Service_Config.h: Fixed spelling error.
+
+Thu Feb 15 20:04:01 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/OS_NS_stdlib.cpp (mkstemp_emulation):
+
+          Include process and thread ID in random number generator seed
+          value.  Addresses problems where the same seed value would end
+          up being used for different processes and/or threads, resulting
+          in identical filenames being generated.
+
+          Addressed potential race condition on platforms that do not
+          inline the value of ACE_Numeric_Limits<>::max().
+
+Thu Feb 15 17:53:53 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * THANKS: Check-in rules 101: Check-in files that you have
+          modified.  Don't ever forget this basic rule.
+
+Thu Feb 15 13:50:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Stream.h:
+        * ace/Connector.h:
+        * ace/DEV_IO.h:
+        * ace/FIFO_Recv.h:
+        * ace/FIFO_Send.h:
+        * ace/FIFO_Send_Msg.h:
+        * ace/FILE_IO.h:
+        * ace/INET_Addr.h:
+        * ace/Local_Memory_Pool.h:
+        * ace/Malloc_Base.h:
+        * ace/MEM_IO.h:
+        * ace/Mem_Map.h:
+        * ace/MEM_SAP.h:
+        * ace/MEM_Stream.h:
+        * ace/Message_Block.h:
+        * ace/MMAP_Memory_Pool.h:
+        * ace/OS_NS_unistd.h:
+        * ace/Pipe.h:
+        * ace/Process_Manager.h:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.h:
+        * ace/Service_Types.h:
+        * ace/Shared_Memory_Pool.h:
+        * ace/SOCK_Dgram.h:
+        * ace/SOCK_Dgram_Mcast.h:
+        * ace/SOCK_IO.h:
+        * ace/SOCK_SEQPACK_Association.h:
+        * ace/SPIPE_Stream.h:
+        * ace/Stream.h:
+        * ace/Task.h:
+        * ace/Thread.h:
+        * ace/Thread_Manager.h:
+        * ace/UPIPE_Stream.h:
+          Doxygen improvements
+
+Thu Feb 15 13:38:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ATM_Connector.h:
+        * ace/DEV_Connector.h:
+        * ace/DEV_IO.h:
+        * ace/Dev_Poll_Reactor.h:
+        * ace/FILE_Connector.h:
+        * ace/Hash_Map_Manager_T.h:
+        * ace/IOStream_T.h:
+        * ace/LOCK_SOCK_Acceptor.h:
+        * ace/Map_Manager.h:
+        * ace/MEM_IO.h:
+        * ace/MEM_SAP.h:
+        * ace/MEM_Stream.h:
+        * ace/Message_Block.h:
+        * ace/Message_Queue.h:
+        * ace/Message_Queue_T.h:
+        * ace/Module.h:
+        * ace/Proactor.h:
+        * ace/Reactor.h:
+        * ace/Reactor_Impl.h:
+        * ace/Select_Reactor_T.h:
+        * ace/Sig_Handler.h:
+        * ace/Signal.h:
+        * ace/SOCK.h:
+        * ace/SOCK_Acceptor.h:
+        * ace/SOCK_Dgram.h:
+        * ace/SOCK_IO.h:
+        * ace/SOCK_SEQPACK_Acceptor.h:
+        * ace/SOCK_SEQPACK_Association.h:
+        * ace/SPIPE_Connector.h:
+        * ace/Stream.h:
+        * ace/Svc_Handler.h:
+        * ace/Task_Ex_T.h:
+        * ace/Task_T.h:
+        * ace/Thread_Manager.h:
+        * ace/TLI_Acceptor.h:
+        * ace/TLI_Connector.h:
+        * ace/Token.h:
+        * ace/WFMO_Reactor.h:
+        * ace/XTI_ATM_Mcast.h:
+          Doxygen improvements
+
+Thu Feb 15 13:12:01 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/OS/Process/imore.cpp:
+
+          Removed an enclosing block around code that caused issue with
+          SunCC 5.8.  There was a comment claiming that the block was needed
+          so that the ACE_Process_Options could elegantly close the file
+          handlers that it kept, however the ACE_Process_Options object does
+          not close the file handlers.  The ACE_Process does the handle
+          closing.
+
+Thu Feb 15 05:41:11 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.inl:
+        * ace/Service_Gestalt.cpp:
+
+          Moved find off-line because it requires a full declaration of
+          ACE_Service_Repository, which is unavailable when the inl file
+          is compiled (inlining on)
+
+Wed Feb 14 23:05:16 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.h:
+        * ace/Service_Config.inl:
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.h:
+        * ace/Service_Gestalt.cpp:
+
+          Moved the ACE_Unmanaged_Singleton usage to the implementation
+          file and eliminated the unnecesary #includes, aiming to reduce
+          the footprint.
+
+Wed Feb 14 19:56:14 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/Service_Config.h:
+          s/TAO_Export/ACE_Export/
+
+Wed Feb 14 19:21:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added bug 2809 regression
+
+Wed Feb 14 17:33:22 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.h:
+          Fixing a compile problem with g++ and borland compiler, which
+          treat members of private nested classes as "hidden" even when
+          the enclosing type has been exported.
+
+Wed Feb 14 12:59:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Acceptor.h:
+          Doxygen improvement
+
+Wed Feb 14 11:31:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_stdio.h:
+        * ace/os_include/os_unistd.h:
+          Move ACE_STDIN, ACE_STDOUT and ACE_STDERR from stdio to unistd
+          file and use STDIN_FILENO, STDOUT_FILENO and STDERROR_FILENO if
+          these are defined yet, this way we use the same defines and header
+          files as in the posix specification. This fixes bugzilla bug 2731.
+          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
+          for reporting this.
+
+        * ace/Truncate.h:
+          Added another const specialization for Borland C++
+
+Wed Feb 14 11:03:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Process_Manager_Test.cpp:
+          Added test code from bugzilla 2797, thanks to Yves Alloyer
+          <alloyer at ipanematech dot com> for reporting this.
+
+Wed Feb 14 10:06:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Added TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
+
+Wed Feb 14 08:53:58 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Active_Map_Manager_T.h:
+        * ace/Cache_Map_Manager_T.h:
+        * ace/CDR_Size.h:
+        * ace/CDR_Stream.h:
+        * ace/Configuration.h:
+        * ace/Dev_Poll_Reactor.h:
+        * ace/Future.h:
+        * ace/Future_Set.h:
+        * ace/Hash_Cache_Map_Manager_T.h:
+        * ace/High_Res_Timer.h:
+        * ace/INET_Addr.h:
+        * ace/IO_SAP.h:
+        * ace/IPC_SAP.h:
+        * ace/Map_T.h:
+        * ace/MEM_SAP.h:
+        * ace/Message_Block.h:
+        * ace/Msg_WFMO_Reactor.h:
+        * ace/Multihomed_INET_Addr.h:
+        * ace/Priority_Reactor.h:
+        * ace/Reactor.h:
+        * ace/Reactor_Impl.h:
+        * ace/Recursive_Thread_Mutex.h:
+        * ace/Registry.h:
+        * ace/Semaphore.h:
+        * ace/Shared_Memory_MM.h:
+        * ace/Shared_Memory_SV.h:
+        * ace/SOCK_SEQPACK_Association.h:
+        * ace/Thread_Mutex.h:
+        * ace/Timeprobe_T.h:
+        * ace/WFMO_Reactor.h:
+          Doxygen improvements
+
+        * ace/Truncate.h:
+          Fixed compile problems with Borland C++, thanks to Ossama for
+          giving a solution.
+
+Tue Feb 13 20:33:58 UTC 2007  Krishnakumar B  <kitty@dre.vanderbilt.edu>
+
+        * THANKS: Added gzeleniy@gmail.com to the THANKS list.
+
+Tue Feb 13 15:35:54 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.{h,inl,cpp}:
+
+          Refactoring to simplify the TSS usage, reduce overhead and
+          eliminate a memory leak.
+
+        * ace/Service_Gestalt.cpp:
+
+          Fixed a memory leak in Service_Type_Dynamic_Guard dtor. Updated
+          logging.
+
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Dependency.cpp:
+
+          Updated to use SC::instance () to better express the contract
+          for these classes. They simply don't need to be aware whether
+          they are using a global, or a TSS-local gestalt .
+
+Tue Feb 13 14:44:06 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks5.x.h:
+          Removed VxWorks 5.4.2 support, we haven't build for it in years
+
+Tue Feb 13 12:58:13 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ACEXML/common/Exception.h:
+        * ACEXML/common/Exception.cpp:
+        * ACEXML/common/SAXExceptions.h:
+        * ACEXML/common/SAXExceptions.inl:
+        * ACEXML/common/SAXExceptions.cpp:
+
+          Changed the print() and message() methods to const.  There was no
+          reason for thease to be non-const and it makes it possible to
+          catch const references of the ACEXML exception types.
+
+Mon Feb 12 20:24:04 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * examples/Logger/Acceptor-server/server_loggerd.cpp (handle_input):
+        * examples/Logger/simple-server/Logging_Handler.cpp (handle_input):
+          Log the host name of the peer, not "<localhost>", as previous code
+          did; also make sure to put it in ACE_TCHAR form. See also
+          Thu Feb  8 23:09:59 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+Mon Feb 12 19:20:06 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CORBA_macros.h:
+          Fixed several macros which where using () around the exception
+          to be thrown
+
+Mon Feb 12 18:10:42 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Name_Request_Reply.cpp (timeout):
+        * netsvcs/lib/Time_Request_Reply.cpp (timeout, decode):
+          Truncate 64-bit time value down to the platform's time_t size.
+
+Mon Feb 12 15:18:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/fuzz.pl:
+
+          Check for the use of ACE_THROW_SPEC in TAO or CIAO code only.
+          It's usage within ACE is still ok in some situations.
+
+Mon Feb 12 14:44:06 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Removed old todo's, extended msvc ver check
+
+        * ace/Codeset_IBM1047.cpp:
+        * ace/Functor.cpp:
+        * ace/Functor.inl:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Hash_Multi_Map_Manager_T.cpp:
+        * ace/Sched_Params.cpp:
+        * ace/Sched_Params.inl:
+          Converted to doxygen style documentation
+
+        * bin/doxygen-convert-h.pl:
+          Only handle source files
+
+Mon Feb 12 14:38:06 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CORBA_macros.h:
+          Use ACE_LACKS_DEPRECATED_MACROS to make it possible to build without
+          all the emulated exception macros. Will make sure people can't use them
+          anymore in core code without noticing that
+
+        * ace/Global_Macros.h:
+          Just define ACE_THROW_SPEC again as about a week ago, we need a fuzz check
+          to make sure people don't use this anymore in TAO
+
+        * ace/Reactor.h:
+          Layout change
+
+        * tests/Thread_Manager_Test.cpp:
+          Layout change to debug message
+
+Mon Feb 12 14:35:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/doxygen-convert-h.pl:
+
+          Allow filenames or directories.  If a directory is passed, it is
+          recursively searched for any file.
+
+Mon Feb 12 13:57:06 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Removed ACE_THROW_SPEC
+
+Sat Feb 10 23:13:06 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Svc_Conf_Lexer.cpp (ace_yy_buffer_state): Disable VC8 warning
+          C4351 (input_ elements will be default-initialized) for this
+          block. The new behavior is good and desireable, so the warning
+          noise can be silenced in this case.
+
+        * ace/Timer_Hash_T.cpp (reschedule, schedule_i): When calculating the
+          hash value, truncate the seconds value down to size_t range because
+          the modulo value used to hash is a size_t. Avoids a compile warning
+          about losing data when time_t is larger than size_t.
+
+Fri Feb  9 21:40:02 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * ace/High_Res_Timer.inl:
+        * ace/High_Res_Timer.cpp:
+
+          Removed ACE_WIN32 specific code in ACE_High_Res_Timer to reflect
+          the change in the default value of ACE_HR_SCALE_CONVERSION.
+          Removed uses of ACE_HRTIME_CONVERSION and use
+          ACE_Utils::Truncate instead.
+
+        * ace/OS_NS_time.h:
+
+          Changed the check for defining ACE_HRTIME_CONVERSION and
+          ACE_HRTIME_TO_U64 from ACE_HRTIME_T_IS_BASIC_TYPE to
+          ACE_LACKS_UNSIGNEDLONGLONG_T.
+
+        * tests/High_Res_Timer_Test.cpp:
+
+          Updated the test to use ACE_Utils::Truncate instead of
+          static_cast which caused 0 to be output when time_t is 64-bit.
+
+Fri Feb  9 12:19:57 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/rm_exception_macros.pl:
+
+          Fixed a bug where the end of the ACE_THROW_SPEC would not be
+          recognized.
+
+Thu Feb  8 23:09:59 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/Logger/Acceptor-server/server_loggerd.cpp (handle_input):
+        * examples/Logger/simple-server/Logging_Handler.cpp (handle_input):
+        * examples/Logger/client/logging_app.cpp (ACE_TMAIN): Fixed these
+          programs to use the proper (new) formatting for ACE_Log_Record.
+          Thanks to Mouna Seri <seri at crhc dot uiuc dot edu> for
+          reporting this.
+
+Thu Feb  8 19:40:30 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Makefile.am:
+        * ace/ace.mpc:
+        * ace/Time_Request_Reply.{h cpp}:
+        * netsvcs/lib/Makefile.am:
+        * netsvcs/lib/lib.mpc:
+        * netsvcs/lib/Time_Request_Reply.{h cpp}: Moved Time_Request_Reply
+          from ace to netsvcs; it's only used from netsvcs and is only useful
+          as an example of some ACE usage. Real time synch needs should be
+          met using NTP.
+
+        * ace/Name_Request_Reply.{h cpp}: Changed the sec_timeout_ transfer
+          member from ACE_UINT32 to ACE_UINT64 to accomodate 64-bit time_t.
+
+        * netsvcs/lib/TS_Clerk_Handler.h:
+        * netsvcs/lib/TS_Server_Handler.h: Time_Request_Reply.h now is included
+          from netsvcs/lib, not ace.
+
+        * netsvcs/lib/Time_Request_Reply.{h cpp}: Changed the time-passing
+          API arguments in the constructor and time() methods from ACE_UINT32
+          to time_t. The on-wire protocol buffer fields that carry seconds
+          values between clerk and server were changed from ACE_UINT32 to
+          ACE_UINT64 to accomodate 64-bit time_t values.
+
+        * NEWS: Explained the user-visible ramifications of these changes.
+
+Thu Feb  8 09:23:50 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/MMAP_Memory_Pool.cpp:
+          Removed empty else statement.
+
+        * include/makeinclude/platform_linux.GNU:
+          Fixed TCL/TK settings
+
+Thu Feb  8 08:03:57 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/config-openbsd.h:
+          Removed ACE_LACKS_CLEARERR and added ACE_HAS_3_PARAM_READDIR_R.
+
+Wed Feb  7 23:04:49 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Added two existing Notify Service examples into the autotest list.
+
+Wed Feb  7 21:01:39 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Added a bit of info about building for National
+          Instruments' LabVIEW RT which uses Pharlap ETS. In particular, if
+          building for LabVIEW's Pharlap, add #define ACE_PHARLAP_LABVIEW_RT
+          to your config.h file along with #include "ace/config-pharlap.h"
+          to adjust for slight differences between stock Pharlap and
+          LabVIEW RT's variant.
+
+        * ace/config-pharlap.h: Pharlap doesn't supply InterlockedExchangeAdd
+          and doesn't do SetFilePointerEx (needs ACE_LACKS_SETFILEPOINTEREX).
+
+        * ace/OS_NS_Thread.cpp (sched_params): Don't attempt SetPriorityClass
+          on Pharlap - it's not defined.
+
+        * ace/OS_NS_Thread.inl (thr_getprio): For Pharlap ETS, use
+          EtsGetTimeSlice() to determine the scheduling policy; if the time
+          slice is anything other than 0, it's multitasking ACE_SCHED_OTHER.
+
+        * ace/OS_NS_stdio.inl (cuserid): Pharlap doesn't go GetUserName() so
+          make it ACE_NOTSUP_RETURN.
+          (adjust_flock_params): Use SetFilePointer() instead of
+          SetFilePointerEx(), even with 64 bit offsets, if
+          ACE_LACKS_SETFILEPOINTEREX is set.
+
+        * ace/OS_NS_unistd.inl (pwrite): For Windows platforms without
+          overlapped I/O, don't rely on availability of SetFilePointerEx -
+          platforms that have it also have overlapped I/O. In this case, use
+          SetFilePointer with appropriate call differences for 32/64 bit
+          file offsets.
+
+        * ace/Pagefile_Memory_Pool.{h inl cpp}: Pharlap doesn't do this class.
+
+        * ace/Configuration.{h cpp}:
+        * ace/Registry.{h cpp}: The Windows registry is not available in
+          Pharlap.
+
+Wed Feb  7 14:44:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/rm_exception_macros.pl:
+
+          Added the ability to remove the ACE_THROW_SPEC's completely.
+
+Tue Feb  6 16:44:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Global_Macros.h:
+          For the moment expand ACE_THROW_SPEC to nothing, we want to deprecate
+          this in TAO and want to see the impact of this on the tests
+
+Tue Feb  6 15:36:00 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Time_Value.inl: Remove the #if around #include "ace/Truncate.h"
+          because ACE_Utils::Truncate is needed in a case that's not in a
+          ACE_HAS_TIME_T_LONG_MISMATCH block.
+
+Mon Feb  5 19:58:39 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Log_Record.cpp (operator>>): Use ACE_Utils::Truncate to truncate
+          the received 64-bit time seconds to time_t.
+
+Mon Feb  5 17:16:20 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-win32-msvc-8.h: Added a new setting for Windows VC8,
+          ACE_HAS_TIME_T_LONG_MISMATCH, to capture the case that requires
+          a replacement timeval def. See the following for details:
+          Thu Feb  1 23:46:27 UTC 2007  Steve Huston  <shuston@riverace.com>
+          This change isolates just the desktop VC8 compiler for the change,
+          avoiding compilers that don't need it and/or can't deal with
+          the code.
+
+        * ace/Time_Value.{h inl}: Change code that uses a replacement timeval
+          from ACE_WIN32 to ACE_HAS_TIME_T_LONG_MISMATCH.
+
+Fri Feb  2 14:45:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Dynamic_Service_Base.cpp:
+          Fixed compile error
+
+Fri Feb  2 14:32:06 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/auto_run_tests.pl:
+          Modified default behavior (if no -a, -o, -t, -C options are given)
+          so that the script looks for TAO in $TAO_ROOT as well as
+          $ACE_ROOT/TAO and similarly for CIAO.  This change supports the peer
+          style layout.
+
+Fri Feb  2 14:08:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/rm_exception_macros.pl:
+          Also zap ACE_THROW_RETURN from application code, that is also
+          deprecated now
+
+Fri Feb  2 12:03:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/TSS_T.cpp:
+          Fixed merge error
+
+Fri Feb  2 11:43:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU:
+          Supress 3.xx warnings about non-return from functions
+          (Anoyingly it doesn't seem to think that a throw
+          terminates the execution flow of a function.)
+
+Fri Feb  2 10:47:55 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/Proactor.cpp:
+          Layout change.
+
+        * ace/config-lynxos.h:
+          Enabled POSIX_SIG_PROACTOR and made some cleanups.
+
+        * ace/os_include/net/os_if.h:
+          Removed LynxOS specific include.
+
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp:
+          Enabled these tests again even if ACE_HAS_BROKEN_SIGEVENT_STRUCT
+          is defined.
+
+Fri Feb  2 10:31:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CORBA_macros.h:
+          Removed workaround for ACE_THROW_RETURN for HP aCC compiler. This is
+          only needed for the HP 3.x compiler and we can suppress just this
+          warning. When this has been build on the scoreboard we will
+          zap the usage of this macro.
+
+        * ace/Dynamic_Service.cpp:
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Service_Config.{h,cpp}:
+        * ace/Service_Gestalt.cpp:
+        * ace/TSS_T.cpp:
+          Layout changes
+
+        * ace/Thread_Manager.cpp:
+          Const improvement
+
+Fri Feb  2 06:56:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ACETAOCIAO.style:
+          Configuration file for profactor (see www.profactor.co.uk), a
+          code beautifier tool that we want to use to reformat the code
+          in ACE/TAO/CIAO.
+
+Fri Feb  2 06:48:40 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/POSIX_CB_Proactor.h:
+        * ace/config-aix-5.x.h:
+        * ace/config-freebsd.h:
+        * ace/config-integritySCA.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+        * 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:
+
+          Removed unnecessary sigval_t typedef and feature test macro
+          ACE_LACKS_SIGVAL_T
+
+Thu Feb  1 23:46:27 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * NEWS: Note change to ACE_Log_Record constructor.
+
+        * ace/Log_Record.h (constructor): The "long time_stamp" argument was
+          changed from long to time_t to correspond with what's expected.
+
+        * ace/Log_Record.{h inl cpp}: The secs_ value was changed from
+          ACE_UINT32 to time_t and is handled as a ACE_CDR::LongLong in the
+          CDR insertion and extraction operators. The encode() and decode()
+          methods are deprecated and will be removed in a future version of
+          ACE.
+
+        * ace/Message_Block.cpp (priority_status): Cast sec() value to
+          suseconds_t size to avoid truncation warnings.
+
+        * ace/Time_Value.{h inl cpp}: Use a private struct to manage time
+          internally for Windows since Windows' struct timeval uses long
+          values internally instead of the standard time_t/suseconds_t
+          that the class API uses (and POSIX uses in timeval). When a
+          real OS-defined timeval is needed, build it on the fly for Windows.
+
+        * tests/High_Res_Timer_Test.cpp: When logging ACE_Time_Value-obtained
+          sec/usec values, truncate them down to u_int size. Avoids passing
+          64-bit values to ACE_Log_Msg when only 32 bits will be taken from
+          the arg vector for a %u format spec. Fixes crashing of this test
+          on Win/VC8.
+
+        * examples/APG/Naming/Temperature_Monitor.cpp:
+        * examples/APG/Naming/Temperature_Monitor2.cpp: Treat time as an int
+          instead of a time_t; makes the logic easier even though it'll break
+          sometime in 2038.
+
+        * examples/ASX/UPIPE_Event_Server/event_server.cpp: Unify use of time_t
+          to hold time values from ACE_OS::time().
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: When measuring messages
+          per second, truncate seconds down to a 'long' to avoid truncation
+          warnings at compile time from converting to double.
+
+        * examples/Reactor/Misc/notification.cpp (svc): Initialize an
+          ACE_Time_Value with secs / 2 instead of getting the seconds,
+          multiplying into usecs, then dividing by 2. Avoids data truncation
+          issues.
+
+        * examples/Reactor/Multicast/Log_Wrapper.cpp (log_message): Cast
+          result of time() to long to insert in the multicast buffer. Avoids
+          truncation warning. Will stop recording a legit result sometime in
+          2038 but the receiver isn't looking at the time field.
+
+        * apps/gperf/src/Gen_Perf.cpp:
+        * ASNMP/tests/test_config.h (randomize):
+        * examples/Reactor/WFMO_Reactor/Multithreading.cpp:
+        * protocols/ace/RMCast/Link.cpp:
+        * protocols/ace/RMCast/Simulator.cpp:
+        * protocols/examples/TMCast/Member/member.cpp:
+        * tests/Auto_Event_Test.cpp:
+        * tests/Handle_Set_Test.cpp:
+        * tests/Recursive_Mutex_Test.cpp:
+        * tests/Semaphore_Test.cpp:
+        * tests/Thread_Mutex_Test.cpp:
+        * tests/Timer_Queue_Test.cpp: Cast time_t to u_int for use as an
+          ACE_OS::srand() seed - we just want some bits, not to fit it back in
+          range with ACE_Utils::Truncate.
+
+Thu Feb  1 11:21:32 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/POSIX_CB_Proactor.h:
+        * ace/POSIX_CB_Proactor.cpp:
+        * ace/Proactor.cpp:
+        * ace/config-freebsd.h:
+        * ace/config-lynxos.h:
+
+          Introduced a new feature test macro ACE_HAS_BROKEN_SIGEVENT_STRUCT
+          to make POSIX_CB_Proactor compile on FreeBSD 7.0-CURRENT.
+
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp:
+
+          Modified due to changes above.
+
+Thu Feb  1 08:05:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Message_Queue.{h,cpp,inl}:
+          Fixed compile errors in the NT Message Queue when build without
+          threading under windows
+
+        * ace/OS_NS_Thread.cpp:
+          Layout changes
+
+Wed Jan 31 23:06:42 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/config-qnx-rtp-62x.h:
+
+          Replaced ACE_LACKS_CUSERID with ACE_HAS_ALT_CUSERID to get the ACE
+          library to provide us with a cuserid() function.
+
+        * ASNMP/asnmp/asn1.cpp:
+        * apps/drwho/global.h:
+        * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
+        * examples/Logger/Acceptor-server/server_loggerd.cpp:
+        * examples/Logger/client/logging_app.cpp:
+        * examples/Logger/simple-server/Logging_Handler.cpp:
+        * examples/Reactor/Multicast/Log_Wrapper.cpp:
+        * examples/Reactor/Multicast/server.cpp:
+        * netsvcs/lib/Name_Handler.cpp:
+
+          Replaced htonl, htons, ntohl, and ntohs with the appropriate
+          ACE_XTOYZ macro (ACE_HTONL, for example).  QNX doesn't have htonl and
+          friends without adding extra #includes.
+
+Wed Jan 31 19:03:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.h:
+
+          Added constants ACE_FLT_MIN and ACE_DBL_MIN to provide consistency
+          with ACE_FLT_MAX AND ACE_DBL_MAX.
+
+        * ace/CDR_Base.h:
+        * ace/CDR_Base.cpp:
+
+          Enhanced the ACE_CDR::LongDouble class which is used on platforms
+          where the native long double is not 16 bytes.
+
+          Provided operators to support multiplication, division, addition
+          and subtraction as well as conversion to the native long double.
+
+          An assign() method is also provided to set the value of the
+          ACE_CDR::LongDouble.  Since this class will be stored in a union
+          (if used as an IDL type), it can not have a non-trivial constructor
+          or assignment operator.  The existing
+          ACE_CDR_LONG_DOUBLE_INITIALIZER macro is used to initialize the
+          LongDouble and a new macro, ACE_CDR_LONG_DOUBLE_ASSIGNMENT, is
+          used to assign to the LongDouble in a portable fashion.
+
+        * bin/tao_orb_tests.lst:
+
+          Added the new TAO LongDouble test.
+
+Wed Jan 31 17:30:46 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-hpux-11.00.h:
+        * include/makeinclude/platform_hpux_aCC.GNU: If stdcpplib=0 is
+          selected at build time, explicitly set -AP compile option to use
+          old C++ libraries and no std namespace. Also set
+          ACE_LACKS_NUMERIC_LIMITS when -AP is set - there is a numeric_limits
+          but not in std. Note that ACE_Array_Map won't build with stdcpplib=0
+          but pre-ACE-5.5 legacy code will still build.
+
+          Also removed the HP-UX 10.x remnants and pre-3.0 aC++ support
+          from platform_hpux_aCC.GNU. Could probably safely remove more old
+          compiler support (anything older than 3.56 probably) but I played
+          it a little conservative for now.
+
+Wed Jan 31 17:22:11 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * protocols/examples/examples.mwc:
+
+          Removed the implicit usage.  It is not necessary since each
+          example has a .mpc file.
+
+        * protocols/examples/example_base.mpb:
+
+          Removed this file.  It was not needed.
+
+Wed Jan 31 16:55:23 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/config-qnx-rtp-62x.h:
+
+          Removed #define ACE_HAS_INLINED_OSCALLS as it seems to be both rarely
+          used (only oddball platforms like unixware and other QNX versions
+          have it) and also incompatible with inline=0 builds.
+          Also added new config macros ACE_LACKS_STRPTIME (June 2006) and
+          ACE_HAS_3_PARAM_READDIR_R (December 2006).
+          These modifications have been tested with QNX 6.3 but from the docs
+          on the QNX web site I believe they apply to QNX 6.2 as well.
+
+Wed Jan 31 15:44:54 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * ace/POSIX_CB_Proactor.h:
+        * ace/POSIX_CB_Proactor.cpp:
+          Use sigval (which is SUS defined) instead of sigval_t. If this
+          change doesn't break on any platform I'll remove unnecessary
+          typedef and related stuff.
+
+Wed Jan 31 13:31:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Removed obsolete checks for environment macros
+
+        * ace/Recycable.h:
+          Removed empty brief doxygen tag
+
+        * ace/OS_NS_unistd.inl:
+        * ace/config-rtems.h:
+          Renamed ACE_HAS_BROKEN_SZ_PAGESIZE to ACE_HAS_NOTSUP_SC_PAGESIZE
+
+Wed Jan 31 13:21:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_hpux_gcc.GNU:
+          Added improvement for GCC on HPUX IA64
+
+Wed Jan 31 10:17:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_hpux_gcc.GNU:
+          Improved support for GCC on HPUX IA64
+
+Wed Jan 31 07:50:44 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * ace/OS_NS_Thread.cpp (ACE_OS::sched_params):  Check if the
+          ACE_id_t id that is being passed in is equal to ACE_SELF.  If
+          so, pass ::GetCurrentProcessId() to ::OpenProcess() instead of
+          id.  ACE_SELF is defined to be 0 on ACE_WIN32; process id 0 is
+          the zero-page process, and we certainly don't want to attempt to
+          set it to REALTIME_PRIORITY_CLASS :-)
+
+Wed Jan 31 03:25:51 UTC 2007  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * ace/High_Res_Timer.h:
+
+          Removed the special case default definition of
+          ACE_HR_SCALE_CONVERSION to ACE_ONE_SECOND_IN_MSECS on Windows;
+          added a #ifndef around the default definition in case the user
+          wishes to change it.  This was done to prevent useless values
+          like 0 showing up in calculations using ACE_Basic_Stats when the
+          time intervals are of the order of a few microseconds.  Most of
+          the current machines have a QueryPerformanceCounter()
+          implementation that returns a value of atleast 3 MHz.  So it
+          should be completely safe to use the definition of
+          ACE_ONE_SECOND_IN_USECS as the default value for
+          ACE_HR_SCALE_CONVERSION on contemporary x86 machines running
+          Windows.
+
+        * ace/Message_Block.inl:
+        * ace/Message_Block.cpp:
+
+          Moved the definition of
+          ACE_Dynamic_Message_Strategy::priority_status() from
+          Message_Block.inl to Message_Block.cpp.  It was a big function
+          and it currently has code that causes a warning with VC8 on
+          Windows.
+
+Tue Jan 30 19:21:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Module.h:
+
+          Removed the trailing comma from the last element of the enum.
+
+Tue Jan 30 16:26:43 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/sets-manager.py:
+
+          Modified to pin the version of MPC at the time of branching/tagging
+          under modules/ACE/MPC.  Note:  This does not branch OR tag MPC,
+          it simply causes the branch/tag to check out a specific
+          revision of MPC.
+
+Tue Jan 30 13:51:32 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Module.h:
+        * ace/Module.cpp:
+
+          There was no way to distinguish between flags not being set and
+          flags to indicate that tasks should not be deleted.  I have
+          changed the M_DELETE_NONE enum value to 4 and added a new enum
+          value for use in flag initialization.  With this change, the
+          close() method can determine if it needs to use the flags passed
+          in or the internal flags.  This fixes Bugzilla #2497.
+
+Tue Jan 30 11:35:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Countdown_Time.{h,cpp}:
+          Readded destructor, missed that it updates the max_wait_time
+          passed to the constructor
+
+Tue Jan 30 10:44:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/wrapper_macros.GNU:
+          When pipes is set to 1, also add -pipe to the CCFLAGS
+
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+          Set pipes to 1, set DCCFLAGS
+
+Tue Jan 30 10:14:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Unbounded_Set.cpp:
+          Initialise pointer with 0.
+
+        * ace/OS_NS_unistd.inl (getpagesize):
+        * ace/config-rtems.h:
+          RTEMS does define _SC_PAGESIZE, but using sysconf with _SC_PAGESIZE
+          results in -1. Added a new define ACE_HAS_BROKEN_SC_PAGESIZE to be
+          able to disable the usage of sysconf (_SC_PAGESIZE) for rtems 4.6,
+          the ::getpagesize() function returns a correct value.
+
+Tue Jan 30 09:46:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OS_Test.cpp:
+          Added a test for ACE_OS::getpagesize(), it should return a value
+          bigger then 0 else the memory pools don't work
+
+Tue Jan 30 00:25:00 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-hpux-11.00.h: If the user sets RWSTD_NO_NAMESPACE to
+          keep a lot of the standard C++ library out of the std namespace,
+          avoid setting ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB, and also
+          hoist everything else from std into the global namespace. This is
+          necessary because RW wasn't consistent with using their internal
+          _RWSTD_NO_NAMESPACE and the user-settable RWSTD_NO_NAMESPACE and
+          some things end up in std and some not; so get the ones that ended
+          up in std out to global with the rest of them.
+
+Mon Jan 29 19:48:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Based_Pointer_Repository.cpp:
+        * ace/Basic_Stats.cpp:
+        * ace/Codeset_Registry.cpp:
+        * ace/FILE.cpp:
+        * ace/FILE_Addr.cpp:
+          Layout improvements
+
+Mon Jan 29 19:07:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/ciao.doxygen:
+        * etc/ciao_config_handlers.doxygen:
+        * etc/ciao_DAnCE.doxygen:
+          Removed CIAO_NAMESPACE
+
+Mon Jan 29 18:58:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Argv_Type_Converter.cpp:
+        * ace/Asynch_Pseudo_Task.cpp:
+        * ace/Cached_Connect_Strategy_T.cpp:
+          Layout changes, result of experimenting with a code
+          beautifier
+
+        * ace/config-rtems.h:
+          Improved rtems port, added support for building with
+          threads=0
+
+        * ace/config-sco-5.0.0.h:
+          Removed commented out define
+
+        * ace/config-vxworks6.4.h:
+          putenv fails with VxWorks 6.4 with a pentium target
+
+        * ace/Countdown_Time.{h,cpp}:
+          Use bool, removed return value from most methods, it was
+          meaningless, removed destructor, not needed to update members
+          in a destructor
+
+        * ace/Dev_Poll_Reactor.h:
+          Export Token_Guard, fixes bugzilla 2786, thanks to
+          <sailzeng at tencent dot com> for reporting this
+
+        * OS_NS_pwd.inl (getpwnam_r):
+          Initialize pointer with 0, simplified this a little
+
+        * docs/ACE-guidelines.html:
+          Updated example with doxygen style of documentation
+
 Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * ACE version 5.5.6 released.
diff --git a/ACE/NEWS b/ACE/NEWS
index b8ab049dcb0..d8d773144a0 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -12,6 +12,112 @@ PLANNED CHANGES FOR "ACE-5.5.7"
 
 . (Riverace) Pharlap ETS 13 qualification.
 
+USER VISIBLE CHANGES BETWEEN ACE-5.5.6 and ACE-5.5.7
+====================================================
+
+. ACE 5.5 contained a set of pragmas which prevented Visual Studio 2005 (VC8)
+  from issuing warnings where C run-time functions are used but a more
+  secure alternative is available. For more information on the C run-time
+  issues and Microsoft's response, please see the following MSDN page:
+  http://msdn2.microsoft.com/en-us/library/8ef0s5kh(VS.80).aspx.
+  In this beta, the pragmas which prevented the warnings have been removed.
+  The ACE library has been reviewed and most of the use of "unsafe" functions
+  has been fixed where possible. Since not all of the warnings emanating from
+  ACE are situations that can or should be fixed, the ACE VC8 projects will
+  prevent the warnings while building the ACE kit and its contained examples,
+  tests, etc. The warnings are disabled by adding Microsoft-specified macros
+  to the compile line via MPC. If desired, the warnings can be re-enabled by
+  regenerating the project files with different MPC features. Note, however,
+  that while ACE without warnings caused by the new C run-time functions, your
+  application builds may trigger these warnings either by use of the "unsafe"
+  C run-time functions or via use of an inlined ACE_OS method which uses it.
+  If the warning is caused by an ACE_OS method, there is a more safe alternate
+  available, probably located by appending _r to the method name (e.g.,
+  instead of using ACE_OS::ctime(), use ACE_OS::ctime_r()).
+  There are other cases where the compiler may have issued warnings and ACE
+  prevented this via a #pragma. These #pragmas have been removed as well.
+  This may cause your application builds to trigger more warnings from VC8
+  than past ACE versions. You should review your code and either correct
+  the code or disable the warnings locally, as appropriate.
+
+. The "release" argument to a number of ACE_String_Base<> methods was changed
+  from int to bool to more accurately reflect its purpose. The following
+  methods were changed:
+
+            ACE_String_Base (const CHAR *s,
+                             ACE_Allocator *the_allocator = 0,
+                             int release = 1);
+          to
+            ACE_String_Base (const CHAR *s,
+                             ACE_Allocator *the_allocator = 0,
+                             bool release = true);
+
+            ACE_String_Base (const CHAR *s,
+                             size_type len,
+                             ACE_Allocator *the_allocator = 0,
+                             int release = 1);
+          to
+            ACE_String_Base (const CHAR *s,
+                             size_type len,
+                             ACE_Allocator *the_allocator = 0,
+                             bool release = true);
+
+            void set (const CHAR * s, int release = 1);
+          to
+            void set (const CHAR * s, bool release = true);
+
+            void set (const CHAR * s, size_type len, int release);
+          to
+            void set (const CHAR * s, size_type len, bool release);
+
+            void clear (int release = 0);
+          to
+            void clear (bool release = false);
+
+  Since ACE_String_Base forms the basis of the ACE_CString and ACE_TString
+  classes, this may ripple out to user application code. If you encounter
+  errors in this area while building your applications, replace the
+  int argument you are passing to the method now with either true or false.
+
+. Solutions for the eVC3/4 platform have been removed from this
+  release.  Note that we package WinCE projects/workspaces for use
+  with VC8.
+
+. There were 3 new ACE_Log_Msg logging format specifiers added to make logging
+  easier for types that may change sizes across platforms. These all take one
+  argument, and the new formats are:
+    %b - format a ssize_t value
+    %B - format a size_t value
+    %: - format a time_t value
+
+. The ace/Time_Request_Reply.h and ace/Time_Request_Reply.cpp files were
+  moved from $ACE_ROOT/ace to $ACE_ROOT/netsvcs/lib. The time arguments in
+  the public API to ACE_Time_Request were changed from ACE_UINT32 to time_t
+  and the portions of the on-wire protocol that contains time was changed from
+  ACE_UINT32 to ACE_UINT64. Thus, code that uses the ACE_Time_Request class
+  to transfer time information will not interoperate properly with prior
+  ACE versions. This will affect uses of the netsvcs time clerk/server.
+
+. The portion of the ACE_Name_Request class that carries the on-wire seconds
+  portion of a timeout value was changed from ACE_UINT32 to ACE_UINT64. This
+  means that Name server/clients at ACE 5.5.7 and higher will not interoperate
+  properly with previous ACE versions' name servers/clients.
+
+. In the ACE_Log_Record (ACE_Log_Priority, long, long) constructor, the
+  second argument, long time_stamp, was changed to be of type time_t. This
+  aligns the type with the expected value, a time stamp such as that returned
+  from ACE_OS::time().
+
+. Added support for VxWorks 6.x cross compilation using a Windows host
+  system
+
+. Added support for VxWorks 6.x using the diab compiler
+
+. The destructor of ACE_Event_Handler no longer calls
+  purge_pending_notifications().  Please see bugzilla #2845 for the full
+  rationale.
+  (http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2845)
+
 USER VISIBLE CHANGES BETWEEN ACE-5.5.5 and ACE-5.5.6
 ====================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index cca00b4130e..821c7571b3e 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.6
+    ACE VERSION: 5.5.7
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/THANKS b/ACE/THANKS
index eab28e75749..b7274266e1a 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -110,7 +110,7 @@ Giang Hoang Nguyen <yang at titan dot com>
 Carlos Garcia Braschi <cgarcia at caramba dot tid dot es>
 Jam Hamidi <jh1 at osi dot com>
 Eric Vaughan <evaughan at arinc dot com>
-Karlheinz Dorn <Karlheinz dot Dorn at med dot siemens dot de>,
+Karlheinz Dorn <Karlheinz dot Dorn at med dot siemens dot de>
 Gerhard Lenzer <Gerhard dot Lenzer at med dot siemens dot de>
 Steve Ritter <ritter at titan dot com>
 Chandra Venkatapathy <cvenkat at develop dot bsis dot com>
@@ -854,7 +854,7 @@ Miroslav Koncar <mkoncar at mail dot com>
 Extern Chatterji <Extern dot Chatterji at kmweg dot de>
 Zach Frey <zfrey at bright dot net>
 Ruibiao Qiu <ruibiao at arl dot wustl dot edu>
-Marcelo Matus <mmatus at dinha dot acms dot arizona dot edu>
+Marcelo Matus <mmatus at atdesk dot com>
 R Seshardi <rseshadri at lucent dot com>
 Stephan Kulow <coolo at kde dot org>
 Alexander Belopolsky <belopolsky at my-deja dot com>
@@ -915,7 +915,7 @@ Alex Chachanashvili <achacha at panix dot com>
 Gilbert Grosdidier <Gilbert dot Grosdidier at in2p3 dot fr>
 James Briggs <James dot Briggs at dsto dot defence dot gov dot au>
 Herbert Wang <herb at nowsol dot com>
-Anders Olsson <epkanol at s1 dot epk dot ericsson dot se>x
+Anders Olsson <epkanol at s1 dot epk dot ericsson dot se>
 Sergey Gnilitsky <SGnilitsky at telesens dot com dot ua>
 David Wicks <wicks at swbell dot net>
 Girish Birajdar <birajdar at lucent dot com>
@@ -1346,7 +1346,7 @@ Alain Totouom <atotouom at gmx dot de>
 Tushar Nair <ntushar at yahoo dot com>
 Sunny Leung <sleung at opentext dot com>
 Bonifides Bautista <earlboy at my-deja dot com>
-Brad Hoskins <BHoskins at slo dot newport dot com
+Brad Hoskins <BHoskins at slo dot newport dot com>
 Donald Acton <acton at opentext dot com>
 Hagen Ulrich <ulrich dot hagen at siemens dot com>
 Adrian Mercieca <adrian at anvilmalta dot com>
@@ -1597,7 +1597,7 @@ Yuanfang Zhang <yfzhang at cse dot wustl dot edu>
 Jonathan Franklin <jfranklin at dctd dot saic dot com>
 Cristian Ungureanu <cristian dot ungureanu at amdocs dot com>
 Tommy Persson <tpe at ida dot lie dot se>
-Christian Barheine <cbarheine at sympatec dot com
+Christian Barheine <cbarheine at sympatec dot com>
 Ole Husgaard <osh at sparre dot dk>
 Victor Kirk <vkirk at technology dot serco dot com>
 Sandeep Neema <neemask at corvette dot vuse dot vanderbilt dot edu>
@@ -2055,7 +2055,7 @@ Alan Stokes <alan at alanstokes dot org dot uk>
 Rick Taylor <rick at tropicalstormsoftware dot com>
 Tobias Herzke <tobias dot herzke at uni-oldenburg dot de>
 Paul Felix <pef at fluent dot com>
-Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>.
+Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>
 Eric Tiangang <tgliu at utstar dot com>
 David Hawkins <dwh at ovro dot caltech dot edu>
 Michael Klein <michael dot klein at fazi dot de>
@@ -2104,7 +2104,7 @@ David White <david dot white dot 7 at gmail dot com>
 Jason Zhang <zzm9981 at 163.com>
 Mark Paulus <mark dot paulus at mci dot com>
 Willie Chen <wchen12 at ucla dot edu>
-Martin Cornelius <Martin at Cornelius at smiths-heimann dot com>
+Martin Cornelius <Martin dot Cornelius at smiths-heimann dot com>
 Mohit Kapoor <Mohit dot Kapoor at siemens dot com>
 David Gibbs <David dot Gibbs at igindex dot co do uk>
 Gary Fernandez <gary dot fernandez at ironmountain dot com>
@@ -2170,7 +2170,22 @@ Pavel Zaichenko <zpf at ivl dot ua>
 Paul Riley <paul at riley dot net>
 Nelson Filipe Ferreira Gonçalves <ngoncalves at isr dot ist dot utl dot pt>
 Harry Goldschmitt <harry at hgac dot com>
-<sailzeng at tencent dot com>
+Sail Zeng <sailzeng at tencent dot com>
+Markus Henschel <m dot henschel at bally-wulff dot de>
+Asif Lodhi <asif dot lodhi at gmail dot com>
+Andrew Schnable <andrew_schnable at symantec dot com>
+Grigoriy Zeleniy <gzeleniy at gmail dot com>
+Yves Alloyer <alloyer at ipanematech dot com>
+Waba <waba-ace at waba dot be>
+Scott Mark <sjm at pobox dot com>
+Bjoern Rasmussen <bjoern.d.rasmussen at gmail dot com>
+Ian C White <Ian_C_White at raytheond dot com>
+Dennis Chernoivanov <cdi at tbricks dot com>
+Werner Burger <werner dot burger at siemens dot com>
+Andres Hurtis <andrej100 at gmail dot com>
+Joe French <JFrench at Soneticom dot com>
+M. Arshad Khan <khan dot m dot arshad at gmail dot com>
+Hans van't Hag <hans dot vanthag at prismtech dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
@@ -2197,3 +2212,4 @@ for instructions on submitting suggestions or fixes.
 
                 Douglas C. Schmidt
                 d.schmidt at vanderbilt.edu
+
diff --git a/ACE/VERSION b/ACE/VERSION
index db938626298..d1adeac1462 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.5.6, released Sun Jan 28 19:59:14 2007.
+This is ACE version 5.5.7, released Wed Mar 21 12:12:26 CDT 2007
 
 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.inl b/ACE/ace/ACE.inl
index 704941a5b20..92ab4418bed 100644
--- a/ACE/ace/ACE.inl
+++ b/ACE/ace/ACE.inl
@@ -4,7 +4,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_Thread.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_sys_socket.h"
 
 // Open versioned namespace, if enabled by the user.
@@ -324,9 +324,9 @@ ACE::nibble2hex (u_int n)
 ACE_INLINE u_char
 ACE::hex2byte (ACE_TCHAR c)
 {
-  if (isdigit (c))
+  if (ACE_OS::ace_isdigit (c))
     return (u_char) (c - ACE_LIB_TEXT ('0'));
-  else if (islower (c))
+  else if (ACE_OS::ace_islower (c))
     return (u_char) (10 + c - ACE_LIB_TEXT ('a'));
   else
     return (u_char) (10 + c - ACE_LIB_TEXT ('A'));
diff --git a/ACE/ace/ATM_Connector.h b/ACE/ace/ATM_Connector.h
index 3212eb20be3..db4ec2d0cd1 100644
--- a/ACE/ace/ATM_Connector.h
+++ b/ACE/ace/ATM_Connector.h
@@ -59,7 +59,7 @@ public:
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The <params> are the parameters needed for either socket
-   * or XTI/ATM connections.  The <timeout> is the amount of time to
+   * or XTI/ATM connections.  The @a timeout is the amount of time to
    * wait to connect. If it's 0 then we block indefinitely.  If
    * *timeout == {0, 0} then the connection is done using non-blocking
    * mode.  In this case, if the connection can't be made immediately
@@ -89,7 +89,7 @@ public:
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The <params> are the parameters needed for either socket
-   * or XTI/ATM connections.  The <timeout> is the amount of time to
+   * or XTI/ATM connections.  The @a timeout is the amount of time to
    * wait to connect. If it's 0 then we block indefinitely.  If
    * *timeout == {0, 0} then the connection is done using non-blocking
    * mode.  In this case, if the connection can't be made immediately
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index df71f9fead6..a33c99f87aa 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -98,7 +98,7 @@ public:
    *                   OS allow reuse of the listen port.  The default is 1.
    */
   ACE_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                ACE_Reactor * = ACE_Reactor::instance (),
+                ACE_Reactor *reactor = ACE_Reactor::instance (),
                 int flags = 0,
                 int use_select = 1,
                 int reuse_addr = 1);
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 2194f8194de..ddec2d1f9bc 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -56,7 +56,7 @@ public:
   /// Initialize a <Active_Map_Manager> with the <ACE_DEFAULT_MAP_SIZE>.
   ACE_Active_Map_Manager (ACE_Allocator *alloc = 0);
 
-  /// Initialize a <Active_Map_Manager> with <size> entries.
+  /// Initialize a <Active_Map_Manager> with @a size entries.
   ACE_Active_Map_Manager (size_t size,
                           ACE_Allocator *alloc = 0);
 
@@ -64,7 +64,7 @@ public:
   /// allocated resources.
   ~ACE_Active_Map_Manager (void);
 
-  /// Initialize a <Active_Map_Manager> with size <length>.
+  /// Initialize a <Active_Map_Manager> with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
             ACE_Allocator *alloc = 0);
 
@@ -72,18 +72,18 @@ public:
   /// allocated resources.
   int close (void);
 
-  /// Add <value> to the map, and the corresponding key produced by the
-  /// Active_Map_Manager is returned through <key>.
+  /// Add @a value to the map, and the corresponding key produced by the
+  /// Active_Map_Manager is returned through @a key.
   int bind (const T &value,
             ACE_Active_Map_Manager_Key &key);
 
-  /// Add <value> to the map.  The user does not care about the
+  /// Add @a value to the map.  The user does not care about the
   /// corresponding key produced by the Active_Map_Manager.
   int bind (const T &value);
 
   /**
    * Reserves a slot in the internal structure and returns the key and
-   * a pointer to the value.  User should place their <value> into
+   * a pointer to the value.  User should place their @a value into
    * <*internal_value>.  This method is useful in reducing the number
    * of copies required in some cases.  Note that <internal_value> is
    * only a temporary pointer and will change when the map resizes.
@@ -93,14 +93,14 @@ public:
   int bind (ACE_Active_Map_Manager_Key &key,
             T *&internal_value);
 
-  /// Reassociate <key> with <value>. The function fails if <key> is
+  /// Reassociate @a key with @a value. The function fails if @a key is
   /// not in the map.
   int rebind (const ACE_Active_Map_Manager_Key &key,
               const T &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map.
    */
   int rebind (const ACE_Active_Map_Manager_Key &key,
@@ -108,24 +108,24 @@ public:
               T &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameter <old_key> and <old_value>.  The function
-   * fails if <key> is not in the map.
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameter @a old_key and @a old_value.  The function
+   * fails if @a key is not in the map.
    */
   int rebind (const ACE_Active_Map_Manager_Key &key,
               const T &value,
               ACE_Active_Map_Manager_Key &old_key,
               T &old_value);
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   int find (const ACE_Active_Map_Manager_Key &key,
             T &value) const;
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   int find (const ACE_Active_Map_Manager_Key &key) const;
 
   /**
-   * Locate <value> associated with <key>.  The value is returned via
+   * Locate @a value associated with @a key.  The value is returned via
    * <internal_value> and hence a copy is saved.  Note that
    * <internal_value> is only a temporary pointer and will change when
    * the map resizes.  Therefore, the user should use the pointer
@@ -134,20 +134,20 @@ public:
   int find (const ACE_Active_Map_Manager_Key &key,
             T *&internal_value) const;
 
-  // Creates a key.  User should place their <value> into
+  // Creates a key.  User should place their @a value into
   // <*internal_value>.  This method is useful in reducing the number
   // of copies required in some cases.
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   int unbind (const ACE_Active_Map_Manager_Key &key);
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   int unbind (const ACE_Active_Map_Manager_Key &key,
               T &value);
 
   /**
-   * Locate <value> associated with <key>.  The value is returned via
+   * Locate @a value associated with @a key.  The value is returned via
    * <internal_value> and hence a copy is saved.  Note that
    * <internal_value> is only a temporary pointer and will change when
    * the map resizes or when this slot is reused.  Therefore, the user
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp
index e12bda80ff3..2f18574a0a2 100644
--- a/ACE/ace/Argv_Type_Converter.cpp
+++ b/ACE/ace/Argv_Type_Converter.cpp
@@ -33,7 +33,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv)
 #endif  // ACE_USES_WCHAR
 
 
-ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char** argv)
+ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char **argv)
   : saved_argc_(argc),
     char_argv_(argv)
 #if defined (ACE_USES_WCHAR)
@@ -71,7 +71,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
   else
     {
       // if original type is char
-      if (this->wchar_passed_) 
+      if (this->wchar_passed_)
         this->align_char_with_wchar ();
 
       for (int i = 0; i < this->before_pass_argc_; ++i)
@@ -87,7 +87,7 @@ void
 ACE_Argv_Type_Converter::initialize (void)
 {
   if (this->original_type_)
-    {  
+    {
       // Make a copy of argv in 'char'. type Create one more argv entry
       // than original argc for the NULL.
       ACE_NEW (char_argv_,
@@ -96,9 +96,9 @@ ACE_Argv_Type_Converter::initialize (void)
                                           // always a NULL
     }
   else
-    {  
+    {
       // make a copy of argv in 'wchar_t' type
-      ACE_NEW (this->wchar_argv_, 
+      ACE_NEW (this->wchar_argv_,
                wchar_t*[this->saved_argc_ + 1]);
       this->wchar_argv_[saved_argc_] = 0;
     }
diff --git a/ACE/ace/Array_Base.cpp b/ACE/ace/Array_Base.cpp
index 4e3253483bf..280a12d8e17 100644
--- a/ACE/ace/Array_Base.cpp
+++ b/ACE/ace/Array_Base.cpp
@@ -194,10 +194,11 @@ template<class T> int
 ACE_Array_Base<T>::size (typename ACE_Array_Base<T>::size_type new_size)
 {
   int const r = this->max_size (new_size);
-  if (r != 0)
-    return r;
-  this->cur_size_ = new_size;
-  return 0;
+
+  if (r == 0)
+    this->cur_size_ = new_size;
+
+  return r;
 }
 
 template<class T>
diff --git a/ACE/ace/Array_Map.cpp b/ACE/ace/Array_Map.cpp
index 3db24968a63..62c6f553292 100644
--- a/ACE/ace/Array_Map.cpp
+++ b/ACE/ace/Array_Map.cpp
@@ -9,6 +9,8 @@
 # include "ace/Array_Map.inl"
 #endif  /* !__ACE_INLINE__ */
 
+#include "ace/checked_iterator.h"
+
 #include <algorithm>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,7 +24,10 @@ ACE_Array_Map<Key, Value, EqualTo>::ACE_Array_Map (InputIterator f,
   , capacity_ (size_)
   , nodes_ (size_ == 0 ? 0 : new value_type[size_])
 {
-  (void) std::copy (f, l, this->begin ());
+  (void) std::copy (f,
+                    l,
+                    ACE_make_checked_array_iterator (this->begin (),
+                                                     this->size_));
 
 //   iterator n = this->begin ();
 
@@ -38,7 +43,10 @@ ACE_Array_Map<Key, Value, EqualTo>::ACE_Array_Map (
   , capacity_ (size_)
   , nodes_ (size_ == 0 ? 0 : new value_type[size_])
 {
-  (void) std::copy (f, l, this->begin ());
+  (void) std::copy (f,
+                    l,
+                    ACE_make_checked_array_iterator (this->begin (),
+                                                     this->size_));
 
 //   iterator n = this->begin ();
 
@@ -54,7 +62,10 @@ ACE_Array_Map<Key, Value, EqualTo>::ACE_Array_Map (
   , capacity_ (map.size_)
   , nodes_ (size_ == 0 ? 0 : new value_type[size_])
 {
-  std::copy (map.begin (), map.end (), this->begin ());
+  std::copy (map.begin (),
+             map.end (),
+             ACE_make_checked_array_iterator (this->begin (),
+                                              this->size_));
 
 //   iterator f = map.begin ();
 //   iterator l = map.end ();
@@ -242,7 +253,10 @@ ACE_Array_Map<Key, Value, EqualTo>::grow (
 
       ACE_Array_Map<Key, Value, EqualTo> temp (this->size () + s);
 
-      std::copy (this->begin (), this->end (), temp.begin ());
+      std::copy (this->begin (),
+                 this->end (),
+                 ACE_make_checked_array_iterator (temp.begin (),
+                                                  temp.capacity_));
 
       size_type const n = this->size ();  // Do not swap out the size
                                           // since we bypassed the
@@ -265,7 +279,10 @@ operator== (ACE_Array_Map<Key, Value, EqualTo> const & lhs,
   // in this case.
 
   return (lhs.size () == rhs.size ()
-          && std::equal (lhs.begin (), lhs.end (), rhs.begin ()));
+          && std::equal (lhs.begin (),
+                         lhs.end (),
+                         ACE_make_checked_array_iterator (rhs.begin (),
+                                                          rhs.size ())));
 }
 
 template <typename Key, typename Value, class EqualTo>
diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp
index 07027962100..1e5bf2a70e6 100644
--- a/ACE/ace/Asynch_IO.cpp
+++ b/ACE/ace/Asynch_IO.cpp
@@ -1330,6 +1330,6 @@ ACE_Asynch_Write_Dgram::Result::~Result (void)
 {
 }
 
-#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp
index b3e25ef0298..b9dd61a1f5f 100644
--- a/ACE/ace/Asynch_Pseudo_Task.cpp
+++ b/ACE/ace/Asynch_Pseudo_Task.cpp
@@ -9,15 +9,15 @@ ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id$")
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task()
+ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task ()
   : select_reactor_ (),               // should be initialized before reactor_
     reactor_ (&select_reactor_, 0)    // don't delete implementation
 {
 }
 
-ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task()
+ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task ()
 {
-  this->stop();
+  this->stop ();
 }
 
 int
@@ -63,7 +63,7 @@ ACE_Asynch_Pseudo_Task::svc (void)
                 ACE_LIB_TEXT ("pthread_sigmask")));
 #endif
 
-  reactor_.owner (ACE_Thread::self());
+  reactor_.owner (ACE_Thread::self ());
   reactor_.run_reactor_event_loop ();
 
   return 0;
@@ -92,8 +92,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
         ((LM_ERROR,
           ACE_LIB_TEXT ("%N:%l:%p\n"),
           ACE_LIB_TEXT ("register_io_handler (suspended)")));
-      this->reactor_.remove_handler (handle,
-                                     ACE_Event_Handler::ALL_EVENTS_MASK
+      this->reactor_.remove_handler (handle, ACE_Event_Handler::ALL_EVENTS_MASK
                                      | ACE_Event_Handler::DONT_CALL);
       return -1;
     }
@@ -104,7 +103,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
 int
 ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_HANDLE handle)
 {
-  return this->reactor_.remove_handler (handle ,
+  return this->reactor_.remove_handler (handle,
                                         ACE_Event_Handler::ALL_EVENTS_MASK
                                         | ACE_Event_Handler::DONT_CALL);
 }
@@ -112,8 +111,7 @@ ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_HANDLE handle)
 int
 ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_Handle_Set &set)
 {
-  return this->reactor_.remove_handler (set,
-                                        ACE_Event_Handler::ALL_EVENTS_MASK
+  return this->reactor_.remove_handler (set, ACE_Event_Handler::ALL_EVENTS_MASK
                                         | ACE_Event_Handler::DONT_CALL);
 }
 
diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp
index 84dd1763565..634b89d4bfa 100644
--- a/ACE/ace/Atomic_Op.cpp
+++ b/ACE/ace/Atomic_Op.cpp
@@ -37,6 +37,12 @@ single_cpu_increment (volatile long *value)
 #elif defined (sun)
   return ace_atomic_add_long (
            reinterpret_cast<volatile unsigned long*> (value), 1);
+#elif defined(__GNUC__) && defined(PPC)
+  long tmp;
+  asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) );
+  asm("addi %0,%0,1" : "+r" (tmp) );
+  asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
+  return tmp;
 #else /* __GNUC__ && ACE_HAS_PENTIUM */
   ACE_UNUSED_ARG (value);
   ACE_NOTSUP_RETURN (-1);
@@ -54,6 +60,12 @@ single_cpu_decrement (volatile long *value)
 #elif defined (sun)
   return ace_atomic_add_long (
             reinterpret_cast<volatile unsigned long*> (value), -1);
+#elif defined(__GNUC__) && defined(PPC)
+  long tmp;
+  asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) );
+  asm("addi %0,%0,-1" : "+r" (tmp) );
+  asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
+  return tmp;
 #else /* __GNUC__ && ACE_HAS_PENTIUM */
   ACE_UNUSED_ARG (value);
   ACE_NOTSUP_RETURN (-1);
@@ -70,6 +82,11 @@ single_cpu_exchange (volatile long *value, long rhs)
 #elif defined (sun)
   return ace_atomic_swap_long (
            reinterpret_cast<volatile unsigned long*> (value), rhs);
+#elif defined(__GNUC__) && defined(PPC)
+  long tmp;
+  asm("lwz %0,%1" : "=r" (tmp) : "m" (rhs) );
+  asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
+  return tmp;
 #else /* __GNUC__ && ACE_HAS_PENTIUM */
   ACE_UNUSED_ARG (value);
   ACE_UNUSED_ARG (rhs);
@@ -87,6 +104,11 @@ single_cpu_exchange_add (volatile long *value, long rhs)
 #elif defined (sun)
   return ace_atomic_swap_add_long (
            reinterpret_cast<volatile unsigned long*> (value), rhs);
+#elif defined(__GNUC__) && defined(PPC)
+  long tmp;
+  asm("add %0,%1,%2" : "=r" (tmp) : "r" (*value), "r" (rhs) );
+  asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
+  return tmp;
 #elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD)
 # if defined (_MSC_VER)
   __asm
diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl
index 81bf9d8a9f3..3e361f1940c 100644
--- a/ACE/ace/Atomic_Op.inl
+++ b/ACE/ace/Atomic_Op.inl
@@ -221,7 +221,8 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator-= (unsigned long rhs)
   return static_cast<unsigned long> (::InterlockedExchangeAdd (const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_)),
                                    -static_cast<long>(rhs))) - rhs;
 #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
-  return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), -rhs)) - rhs;
+  long l_rhs = static_cast<long> (rhs);
+  return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), -l_rhs)) - rhs;
 #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
 }
 
diff --git a/ACE/ace/Atomic_Op_Sparc.c b/ACE/ace/Atomic_Op_Sparc.c
index f301de5b85f..df9565fc653 100644
--- a/ACE/ace/Atomic_Op_Sparc.c
+++ b/ACE/ace/Atomic_Op_Sparc.c
@@ -9,7 +9,7 @@
 
 #if defined (ACE_INCLUDE_ATOMIC_OP_SPARC)
 
-# if defined (__sparcv9)
+#if defined (__sparcv9)
 
 unsigned long
 ace_atomic_add_long (volatile unsigned long *dest, long rhs)
diff --git a/ACE/ace/Atomic_Op_T.cpp b/ACE/ace/Atomic_Op_T.cpp
index d31e49e081a..2fffdd0b060 100644
--- a/ACE/ace/Atomic_Op_T.cpp
+++ b/ACE/ace/Atomic_Op_T.cpp
@@ -67,7 +67,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (void)
 
 template <class ACE_LOCK, class TYPE>
 ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (const TYPE &c)
-  : impl_ (this->own_mutex_, c)
+  : impl_ (own_mutex_, c)
 {
   // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
 }
diff --git a/ACE/ace/Atomic_Op_T.inl b/ACE/ace/Atomic_Op_T.inl
index 41b7ccd2af0..d41be1cbd15 100644
--- a/ACE/ace/Atomic_Op_T.inl
+++ b/ACE/ace/Atomic_Op_T.inl
@@ -161,7 +161,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (const TYPE &rhs)
 template <class ACE_LOCK, class TYPE> ACE_INLINE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op
   (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs)
-  : impl_ (this->own_mutex_, rhs.value ())
+  : impl_ (own_mutex_, rhs.value ())
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
 }
diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h
index 7360ab22234..ec955d30b21 100644
--- a/ACE/ace/Auto_Ptr.h
+++ b/ACE/ace/Auto_Ptr.h
@@ -181,9 +181,7 @@ public:
 
 
 /**
- * @function
- *
- * @brief
+ * @brief Reset given @c auto_ptr element to new element.
  *
  * Some platforms have an older version of auto_ptr support, which
  * lacks reset, and cannot be disabled easily.  Portability to these
diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 74ea8994c6d..a76d3dbcbd3 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -23,7 +23,7 @@ class ACE_Based_Pointer_Repository_Rep
 public:
   // Useful typedefs.
   typedef ACE_Map_Manager <void *, size_t, ACE_Null_Mutex> MAP_MANAGER;
-  typedef ACE_Map_Iterator < void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
+  typedef ACE_Map_Iterator <void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
   typedef ACE_Map_Entry <void *, size_t> MAP_ENTRY;
 
   /// Keeps track of the mapping between addresses and their associated
@@ -50,8 +50,7 @@ ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void)
 // Search for appropriate base address in repository
 
 int
-ACE_Based_Pointer_Repository::find (void *addr,
-                                    void *&base_addr)
+ACE_Based_Pointer_Repository::find (void *addr, void *&base_addr)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::find");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -62,7 +61,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
        iter.advance ())
     // Check to see if <addr> is within any of the regions.
     if (addr >= ce->ext_id_
-        && addr < ((char *) ce->ext_id_ + ce->int_id_))
+        && addr < ((char *)ce->ext_id_ + ce->int_id_))
       {
         // Assign the base address.
         base_addr = ce->ext_id_;
@@ -78,8 +77,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
 // existing entry.
 
 int
-ACE_Based_Pointer_Repository::bind (void *addr,
-                                    size_t size)
+ACE_Based_Pointer_Repository::bind (void *addr, size_t size)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::bind");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -105,7 +103,7 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
       // Check to see if <addr> is within any of the regions and if
       // so, unbind the key from the map.
       if (addr >= ce->ext_id_
-          && addr < ((char *) ce->ext_id_ + ce->int_id_))
+          && addr < ((char *)ce->ext_id_ + ce->int_id_))
         // Unbind base address.
         return this->rep_->addr_map_.unbind (ce->ext_id_);
     }
diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp
index 0f00f5b7332..cfe8ca320b0 100644
--- a/ACE/ace/Basic_Stats.cpp
+++ b/ACE/ace/Basic_Stats.cpp
@@ -46,8 +46,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
 }
 
 void
-ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
-                               ACE_UINT32 sf) const
+ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const
 {
 #ifndef ACE_NLOGGING
   if (this->samples_count () == 0u)
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 48a0becdb12..36737a480ad 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -440,7 +440,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   reinterpret_cast<PTR_TYPE> (L.lo ())
 #else  /* ! ACE_LACKS_LONGLONG_T */
 # define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
-  reinterpret_cast<PTR_TYPE> (static_cast<ptrdiff_t> (L))
+  reinterpret_cast<PTR_TYPE> (static_cast<intptr_t> (L))
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
 // If the platform lacks an unsigned long long, define one.
@@ -613,7 +613,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
     // @note  the above four accessors are inlined here in
     // order to minimize the extent of the data_ struct.  It's
-    // only used here; the .i and .cpp files use the accessors.
+    // only used here; the .inl and .cpp files use the accessors.
 
     /// These functions are used to implement multiplication.
     ACE_UINT32 ul_shift (ACE_UINT32 a,
@@ -641,17 +641,43 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 # endif /* ACE_LACKS_LONGLONG_T */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Conversions from ACE_UINT64 to ACE_UINT32.  ACE_CU64_TO_CU32 should
 // be used on const ACE_UINT64's.
 # if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-#   define ACE_U64_TO_U32(n) ((n).lo ())
-#   define ACE_CU64_TO_CU32(n) ((n).lo ())
+inline ACE_UINT32
+ACE_U64_TO_U32 (ACE_U_LongLong const & n)
+{
+  /**
+   * @note We could add a cast operator to ACE_U_LongLong but that may
+   *       cause more problems than it solves.  Force users to perform
+   *       an explicit cast via ACE_{C}U64_TO_{C}U32.
+   */
+  return n.lo ();
+}
+
+inline ACE_UINT32
+ACE_CU64_TO_CU32 (ACE_U_LongLong const & n)
+{
+  return ACE_U64_TO_U32 (n);
+}
 # else  /* ! ACE_LACKS_LONGLONG_T */
-#   define ACE_U64_TO_U32(n) (static_cast<ACE_UINT32> (n))
-#   define ACE_CU64_TO_CU32(n) \
-     (static_cast<ACE_CAST_CONST ACE_UINT32> (n))
+inline ACE_UINT32
+ACE_U64_TO_U32 (ACE_UINT64 n)
+{
+  return static_cast<ACE_UINT32> (n);
+}
+
+inline ACE_UINT32
+ACE_CU64_TO_CU32 (ACE_UINT64 n)
+{
+  return static_cast<ACE_UINT32> (n);
+}
 # endif /* ! ACE_LACKS_LONGLONG_T */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // 64-bit literals require special marking on some platforms.
 # if defined (ACE_LACKS_LONGLONG_T)
     // Can only specify 32-bit arguments.
@@ -836,10 +862,25 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_UINT32_MAX 0xFFFFFFFF
 #define ACE_INT64_MAX ACE_INT64_LITERAL(0x7FFFFFFFFFFFFFFF)
 #define ACE_INT64_MIN -(ACE_INT64_MAX)-1
-#define ACE_UINT64_MAX ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF)
+
+#if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+// ACE_U_LongLong's constructor accepts a "long long" in this
+// case.  Set it to ACE_U_LongLong (-1) since the bit pattern for long
+// long (-1) is the same as the maximum unsigned long long value.
+# define ACE_UINT64_MAX ACE_U_LongLong (ACE_INT64_LITERAL (0xFFFFFFFFFFFFFFFF))
+#elif defined (ACE_LACKS_LONGLONG_T)
+// ACE_U_LongLong's constructor accepts an ACE_UINT32 low and high
+// pair of parameters.
+# define ACE_UINT64_MAX ACE_U_LongLong (0xFFFFFFFFu, 0xFFFFFFFFu)
+#else
+# define ACE_UINT64_MAX ACE_UINT64_LITERAL (0xFFFFFFFFFFFFFFFF)
+#endif  /* ACE_LACKS_UNSIGNEDLONGLONG_T */
+
 // These use ANSI/IEEE format.
 #define ACE_FLT_MAX 3.402823466e+38F
+#define ACE_FLT_MIN 1.175494351e-38F
 #define ACE_DBL_MAX 1.7976931348623158e+308
+#define ACE_DBL_MIN 2.2250738585072014e-308
 
 # if defined (__ACE_INLINE__)
 #   include "ace/Basic_Types.inl"
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index 8b051985eba..6be30a21b8c 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -14,6 +14,11 @@ ACE_RCSID (ace,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+#if defined (NONNATIVE_LONGDOUBLE)
+static const ACE_INT16 max_eleven_bit = 0x3ff;
+static const ACE_INT16 max_fifteen_bit = 0x3fff;
+#endif /* NONNATIVE_LONGDOUBLE */
+
 //
 // See comments in CDR_Base.inl about optimization cases for swap_XX_array.
 //
@@ -599,6 +604,85 @@ ACE_CDR::LongLong::operator!= (const ACE_CDR::LongLong &rhs) const
 #endif /* NONNATIVE_LONGLONG */
 
 #if defined (NONNATIVE_LONGDOUBLE)
+ACE_CDR::LongDouble&
+ACE_CDR::LongDouble::assign (const ACE_CDR::LongDouble::NativeImpl& rhs)
+{
+  ACE_OS::memset (this->ld, 0, sizeof (this->ld));
+
+  if (sizeof (rhs) == 8)
+    {
+#if defined (ACE_LITTLE_ENDIAN)
+      static const size_t byte_zero = 1;
+      static const size_t byte_one = 0;
+      char rhs_ptr[16];
+      ACE_CDR::swap_8 (reinterpret_cast<const char*> (&rhs), rhs_ptr);
+#else
+      static const size_t byte_zero = 0;
+      static const size_t byte_one = 1;
+      const char* rhs_ptr = reinterpret_cast<const char*> (&rhs);
+#endif
+      ACE_INT16 sign  = static_cast<ACE_INT16> (
+                          static_cast<signed char> (rhs_ptr[0])) & 0x8000;
+      ACE_INT16 exponent = ((rhs_ptr[0] & 0x7f) << 4) |
+                           ((rhs_ptr[1] >> 4) & 0xf);
+      const char* exp_ptr = reinterpret_cast<const char*> (&exponent);
+
+      // Infinity and NaN have an exponent of 0x7ff in 64-bit IEEE
+      if (exponent == 0x7ff)
+        {
+          exponent = 0x7fff;
+        }
+      else
+        {
+          exponent = (exponent - max_eleven_bit) + max_fifteen_bit;
+        }
+      exponent |= sign;
+
+      // Store the sign bit and exponent
+      this->ld[0] = exp_ptr[byte_zero];
+      this->ld[1] = exp_ptr[byte_one];
+
+      // Store the mantissa.  In an 8 byte double, it is split by
+      // 4 bits (because of the 12 bits for sign and exponent), so
+      // we have to shift and or the rhs to get the right bytes.
+      size_t li = 2;
+      bool direction = true;
+      for (size_t ri = 1; ri < sizeof (rhs);)
+        {
+          if (direction)
+            {
+              this->ld[li] |= ((rhs_ptr[ri] << 4) & 0xf0);
+              direction = false;
+              ri++;
+            }
+          else
+            {
+              this->ld[li] |= ((rhs_ptr[ri] >> 4) & 0xf);
+              direction = true;
+              li++;
+            }
+        }
+#if defined (ACE_LITTLE_ENDIAN)
+      ACE_OS::memcpy (rhs_ptr, this->ld, sizeof (this->ld));
+      ACE_CDR::swap_16 (rhs_ptr, this->ld);
+#endif
+    }
+  else
+    {
+      ACE_OS::memcpy(this->ld,
+                     reinterpret_cast<const char*> (&rhs), sizeof (rhs));
+    }
+  return *this;
+}
+
+ACE_CDR::LongDouble&
+ACE_CDR::LongDouble::assign (const ACE_CDR::LongDouble& rhs)
+{
+  if (this != &rhs)
+    *this = rhs;
+  return *this;
+}
+
 bool
 ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
 {
@@ -611,6 +695,82 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
   return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0;
 }
 
+ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const
+{
+  ACE_CDR::LongDouble::NativeImpl ret = 0.0;
+  char* lhs_ptr = reinterpret_cast<char*> (&ret);
+
+  if (sizeof (ret) == 8)
+    {
+#if defined (ACE_LITTLE_ENDIAN)
+      static const size_t byte_zero = 1;
+      static const size_t byte_one = 0;
+      char copy[16];
+      ACE_CDR::swap_16 (this->ld, copy);
+#else
+      static const size_t byte_zero = 0;
+      static const size_t byte_one = 1;
+      const char* copy = this->ld;
+#endif
+      ACE_INT16 exponent = 0;
+      char* exp_ptr = reinterpret_cast<char*> (&exponent);
+      exp_ptr[byte_zero] = copy[0];
+      exp_ptr[byte_one] = copy[1];
+
+      ACE_INT16 sign = (exponent & 0x8000);
+      exponent &= 0x7fff;
+
+      // Infinity and NaN have an exponent of 0x7fff in 128-bit IEEE
+      if (exponent == 0x7fff)
+        {
+          exponent = 0x7ff;
+        }
+      else
+        {
+          exponent = (exponent - max_fifteen_bit) + max_eleven_bit;
+        }
+      exponent = (exponent << 4) | sign;
+
+      // Store the sign and exponent
+      lhs_ptr[0] = exp_ptr[byte_zero];
+      lhs_ptr[1] = exp_ptr[byte_one];
+
+      // Store the mantissa.  In an 8 byte double, it is split by
+      // 4 bits (because of the 12 bits for sign and exponent), so
+      // we have to shift and or the rhs to get the right bytes.
+      size_t li = 1;
+      bool direction = true;
+      for (size_t ri = 2; li < sizeof (ret);) {
+        if (direction)
+          {
+            lhs_ptr[li] |= ((copy[ri] >> 4) & 0xf);
+            direction = false;
+            li++;
+          }
+        else
+          {
+            lhs_ptr[li] |= ((copy[ri] & 0xf) << 4);
+            direction = true;
+            ri++;
+          }
+      }
+
+#if defined (ACE_LITTLE_ENDIAN)
+      ACE_CDR::swap_8 (lhs_ptr, lhs_ptr);
+#endif
+    }
+  else
+    {
+      ACE_OS::memcpy(lhs_ptr, this->ld, sizeof (ret));
+    }
+
+  // This bit of code is unnecessary.  However, this code is
+  // necessary to work around a bug in the gcc 4.1.1 optimizer.
+  ACE_CDR::LongDouble tmp;
+  tmp.assign (ret);
+
+  return ret;
+}
 #endif /* NONNATIVE_LONGDOUBLE */
 
 #if defined(_UNICOS) && !defined(_CRAYMPP)
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 42541504934..3507b21c4ae 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -267,15 +267,66 @@ public:
 #    if   ACE_SIZEOF_LONG_DOUBLE == 16
        typedef long double      LongDouble;
 #      define   ACE_CDR_LONG_DOUBLE_INITIALIZER 0
+#      define   ACE_CDR_LONG_DOUBLE_ASSIGNMENT(LHS, RHS) LHS = RHS
 #    else
 #      define NONNATIVE_LONGDOUBLE
 #      define   ACE_CDR_LONG_DOUBLE_INITIALIZER {{0}}
+#      define   ACE_CDR_LONG_DOUBLE_ASSIGNMENT(LHS, RHS) LHS.assign (RHS)
        struct ACE_Export LongDouble
        {
+       // VxWorks' compiler (gcc 2.96) gets confused by the operator long
+       // double, so we avoid using long double as the NativeImpl.
+       // Linux's x86 long double format (12 or 16 bytes) is incompatible
+       // with Windows, Solaris, AIX, MacOS X and HP-UX (and probably others)
+       // long double format (8 or 16 bytes).  If you need 32-bit Linux to
+       // inter-operate with 64-bit Linux you will want to define this
+       // macro so that "long double" is used.  Otherwise, do not define
+       // this macro.
+#      if defined (ACE_IMPLEMENT_WITH_NATIVE_LONGDOUBLE) || \
+          (!defined (linux) && !defined (VXWORKS))
+         typedef long double NativeImpl;
+#      else
+         typedef double NativeImpl;
+#      endif /* ACE_IMPLEMENT_WITH_NATIVE_LONGDOUBLE || (!linux && !VXWORKS) */
+
          char ld[16];
+
+         LongDouble& assign (const NativeImpl& rhs);
+         LongDouble& assign (const LongDouble& rhs);
+
          bool operator== (const LongDouble &rhs) const;
          bool operator!= (const LongDouble &rhs) const;
-         // @@ also need other comparison operators.
+
+         LongDouble& operator*= (const NativeImpl rhs) {
+           return this->assign (static_cast<NativeImpl> (*this) * rhs);
+         }
+         LongDouble& operator/= (const NativeImpl rhs) {
+           return this->assign (static_cast<NativeImpl> (*this) / rhs);
+         }
+         LongDouble& operator+= (const NativeImpl rhs) {
+           return this->assign (static_cast<NativeImpl> (*this) + rhs);
+         }
+         LongDouble& operator-= (const NativeImpl rhs) {
+           return this->assign (static_cast<NativeImpl> (*this) - rhs);
+         }
+         LongDouble& operator++ () {
+           return this->assign (static_cast<NativeImpl> (*this) + 1);
+         }
+         LongDouble& operator-- () {
+           return this->assign (static_cast<NativeImpl> (*this) - 1);
+         }
+         LongDouble operator++ (int) {
+           LongDouble ldv = *this;
+           this->assign (static_cast<NativeImpl> (*this) + 1);
+           return ldv;
+         }
+         LongDouble operator-- (int) {
+           LongDouble ldv = *this;
+           this->assign (static_cast<NativeImpl> (*this) - 1);
+           return ldv;
+         }
+
+         operator NativeImpl () const;
        };
 #    endif /* ACE_SIZEOF_LONG_DOUBLE != 16 */
 
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index f2bf59ce98c..a7ff689479b 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -121,7 +121,7 @@ public:
                                            ACE_CDR::ULong length);
 
   ///
-  /// Adjust to <size> and count <size> octets.
+  /// Adjust to @a size and count <size> octets.
   void adjust (size_t size);
 
   /// As above, but now the size and alignment requirements may be
@@ -141,7 +141,7 @@ private:
   ACE_CDR::Boolean write_16 (const ACE_CDR::LongDouble *x);
 
   /**
-   * write an array of <length> elements, each of <size> bytes and the
+   * write an array of @a length elements, each of @a size bytes and the
    * start aligned at a multiple of <align>. The elements are assumed
    * to be packed with the right alignment restrictions.  It is mostly
    * designed for buffers of the basic types.
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index b033d8a1587..126d9929884 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -188,6 +188,17 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
                                          ACE_Time_Value::max_time,
                                          this->current_->data_block ()->data_block_allocator ()),
                       -1);
+
+      // Message block initialization may fail while the construction
+      // succeds.  Since as a matter of policy, ACE may throw no
+      // exceptions, we have to do a separate check like this.
+      if (tmp != 0 && tmp->size () < newsize)
+        {
+          delete tmp;
+          errno = ENOMEM;
+          return -1;
+        }
+
       this->good_bit_ = true;
 
 #if !defined (ACE_LACKS_CDR_ALIGNMENT)
@@ -677,7 +688,7 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
   return this->good_bit ();
 }
 
- 
+
 int
 ACE_OutputCDR::consolidate (void)
 {
@@ -710,7 +721,7 @@ ACE_OutputCDR::consolidate (void)
         {
           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);
@@ -718,7 +729,7 @@ ACE_OutputCDR::consolidate (void)
       this->current_ = &this->start_;
       this->current_is_writable_ = true;
     }
-  
+
   return 0;
 }
 
@@ -1701,8 +1712,8 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
       db =
         cdr.start_.data_block ()->clone_nocopy ();
 
-      if (db->size ((wr_bytes) +
-                    ACE_CDR::MAX_ALIGNMENT) == -1)
+      if (db == 0 || db->size ((wr_bytes) +
+                               ACE_CDR::MAX_ALIGNMENT) == -1)
         return 0;
 
       // Replace our data block by using the incoming CDR stream.
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index ce0d9b91e65..b189fbd6d28 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -94,8 +94,8 @@ public:
   friend class ACE_WChar_Codeset_Translator;
   friend class ACE_InputCDR;
 
-  /// Default constructor, allocates <size> bytes in the internal
-  /// buffer, if <size> == 0 it allocates the default size.
+  /// Default constructor, allocates @a size bytes in the internal
+  /// buffer, if @a size == 0 it allocates the default size.
   ACE_OutputCDR (size_t size = 0,
                  int byte_order = ACE_CDR_BYTE_ORDER,
                  ACE_Allocator* buffer_allocator = 0,
@@ -393,9 +393,9 @@ public:
   size_t current_alignment (void) const;
 
   /**
-   * Returns (in <buf>) the next position in the buffer aligned to
-   * <size>, it advances the Message_Block wr_ptr past the data
-   * (i.e., <buf> + <size>). If necessary it grows the Message_Block
+   * Returns (in @a buf) the next position in the buffer aligned to
+   * @a size, it advances the Message_Block wr_ptr past the data
+   * (i.e., @a buf + @a size). If necessary it grows the Message_Block
    * buffer.  Sets the good_bit to false and returns a -1 on failure.
    */
   int adjust (size_t size,
@@ -446,7 +446,7 @@ private:
   ACE_CDR::Boolean write_16 (const ACE_CDR::LongDouble *x);
 
   /**
-   * write an array of <length> elements, each of <size> bytes and the
+   * write an array of @a length elements, each of @a size bytes and the
    * start aligned at a multiple of <align>. The elements are assumed
    * to be packed with the right alignment restrictions.  It is mostly
    * designed for buffers of the basic types.
@@ -468,8 +468,8 @@ private:
 
 
   /**
-   * Grow the CDR stream. When it returns <buf> contains a pointer to
-   * memory in the CDR stream, with at least <size> bytes ahead of it
+   * Grow the CDR stream. When it returns @a buf contains a pointer to
+   * memory in the CDR stream, with at least @a size bytes ahead of it
    * and aligned to an <align> boundary. It moved the <wr_ptr> to <buf
    * + size>.
    */
@@ -974,7 +974,7 @@ private:
   // operations using asignment.
 
   /**
-   * Read an array of <length> elements, each of <size> bytes and the
+   * Read an array of @a length elements, each of @a size bytes and the
    * start aligned at a multiple of <align>. The elements are assumed
    * to be packed with the right alignment restrictions.  It is mostly
    * designed for buffers of the basic types.
@@ -1070,7 +1070,7 @@ protected:
   ACE_CDR::Boolean write_1 (ACE_OutputCDR& output,
                             const ACE_CDR::Octet *x);
 
-  /// Efficiently read <length> elements of size <size> each from
+  /// Efficiently read @a length elements of size @a size each from
   /// <input> into <x>; the data must be aligned to <align>.
   ACE_CDR::Boolean read_array (ACE_InputCDR& input,
                                void* x,
@@ -1079,7 +1079,7 @@ protected:
                                ACE_CDR::ULong length);
 
   /**
-   * Efficiently write <length> elements of size <size> from <x> into
+   * Efficiently write @a length elements of size @a size from <x> into
    * <output>. Before inserting the elements enough padding is added
    * to ensure that the elements will be aligned to <align> in the
    * stream.
@@ -1093,8 +1093,8 @@ protected:
   /**
    * Exposes the stream implementation of <adjust>, this is useful in
    * many cases to minimize memory allocations during marshaling.
-   * On success <buf> will contain a contiguous area in the CDR stream
-   * that can hold <size> bytes aligned to <align>.
+   * On success @a buf will contain a contiguous area in the CDR stream
+   * that can hold @a size bytes aligned to <align>.
    * Results
    */
   int adjust (ACE_OutputCDR& out,
@@ -1163,7 +1163,7 @@ protected:
   ACE_CDR::Boolean write_4 (ACE_OutputCDR& output,
                             const ACE_CDR::ULong *x);
 
-  /// Efficiently read <length> elements of size <size> each from
+  /// Efficiently read @a length elements of size @a size each from
   /// <input> into <x>; the data must be aligned to <align>.
   ACE_CDR::Boolean read_array (ACE_InputCDR& input,
                                void* x,
@@ -1172,7 +1172,7 @@ protected:
                                ACE_CDR::ULong length);
 
   /**
-   * Efficiently write <length> elements of size <size> from <x> into
+   * Efficiently write @a length elements of size @a size from <x> into
    * <output>. Before inserting the elements enough padding is added
    * to ensure that the elements will be aligned to <align> in the
    * stream.
@@ -1186,8 +1186,8 @@ protected:
   /**
    * Exposes the stream implementation of <adjust>, this is useful in
    * many cases to minimize memory allocations during marshaling.
-   * On success <buf> will contain a contiguous area in the CDR stream
-   * that can hold <size> bytes aligned to <align>.
+   * On success @a buf will contain a contiguous area in the CDR stream
+   * that can hold @a size bytes aligned to <align>.
    * Results
    */
   int adjust (ACE_OutputCDR& out,
diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h
index b7a3d1c01a9..e852754b99a 100644
--- a/ACE/ace/CORBA_macros.h
+++ b/ACE/ace/CORBA_macros.h
@@ -47,6 +47,8 @@
 #  define ACE_del_bad_alloc
 #endif
 
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+
 // If you wish to you use these macros for emulating exceptions on
 // platforms which lack native exception support, you need to do the
 // following:
@@ -165,17 +167,8 @@
       throw EXCEPTION
 
 // Throwing an exception when the function requires a return value.
-# if defined (__HP_aCC)
-#   define ACE_THROW_RETURN(EXCEPTION, RETV) \
-       do \
-         { \
-           throw EXCEPTION; \
-           return RETV; \
-         } while (0)
-# else
-#   define ACE_THROW_RETURN(EXCEPTION,RETV) \
+# define ACE_THROW_RETURN(EXCEPTION,RETV) \
       throw EXCEPTION
-# endif
 
 // For compilers with native exceptions, we can simply use try to try. ;-)
 // do {} while (0) is required to avoid compilation warnings.
@@ -415,34 +408,38 @@
 
 #endif /* ! ACE_USES_NATIVE_EXCEPTIONS */
 
+#endif /* !ACE_LACKS_DEPRECATED_MACROS */
+
 // ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS.
 #if defined(ACE_NEW_THROWS_EXCEPTIONS)
 
 #   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) { ACE_del_bad_alloc errno = ENOMEM; throw EXCEPTION; } \
      } while (0)
 
 #else /* ! ACE_NEW_THROWS_EXCEPTIONS */
 
 #   define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
      do { POINTER = new CONSTRUCTOR; \
-       if (POINTER == 0) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
+       if (POINTER == 0) { errno = ENOMEM; throw EXCEPTION; } \
      } while (0)
 
 #endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
 # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
+    if (OBJ.locked () == 0) throw EXCEPTION;
 
 # define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Read_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
+    if (OBJ.locked () == 0) throw EXCEPTION;
 
 # define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Write_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
+    if (OBJ.locked () == 0) throw EXCEPTION;
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
 
 //@{
 /**
@@ -560,6 +557,8 @@
 #   define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO)
 # endif /* ACE_PRINT_EXCEPTION */
 
+#endif /* !ACE_LACKS_DEPRECATED_MACROS */
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CORBA_MACROS_H */
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index 28914fd5379..c75e602fb25 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -96,7 +96,7 @@ public:
   // = Initialization and termination methods.
 
   /// Initialize a <Cache_Map_Manager> with <caching_strategy> and
-  /// <size> entries.
+  /// @a size entries.
   ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy,
                          size_t size = ACE_DEFAULT_MAP_SIZE,
                          ACE_Allocator *alloc = 0);
@@ -105,7 +105,7 @@ public:
   /// resources.
   virtual ~ACE_Cache_Map_Manager (void);
 
-  /// Initialize a cache with size <length>.
+  /// Initialize a cache with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
             ACE_Allocator *alloc = 0);
 
@@ -113,7 +113,7 @@ public:
   int close (void);
 
   /**
-   * Associate <key> with <value>.  If <key> is already in the CMAP_TYPE
+   * Associate @a key with @a value.  If @a key is already in the CMAP_TYPE
    * then the ENTRY is not changed.  Returns 0 if a new entry is bound
    * successfully, returns 1 if an attempt is made to bind an existing
    * entry, and returns -1 if failures occur.
@@ -123,17 +123,17 @@ public:
 
   /**
    * Lookup entry<key,value> in the cache. If it is not found, returns -1.
-   * If the <key> is located in the CMAP_TYPE object, the CACHING_STRATEGY is
+   * If the @a key is located in the CMAP_TYPE object, the CACHING_STRATEGY is
    * notified of it via notify_find (int result, ATTRIBUTES &attribute).
    * If notify_find also returns 0 (success), then this function returns
-   * 0 (success) and sets the cached value in <value>.
+   * 0 (success) and sets the cached value in @a value.
    */
   int find (const KEY &key,
             VALUE &value);
 
   /**
    * Lookup entry<key,value> in the cache. If it is not found, returns -1.
-   * If the <key> is located in the CMAP_TYPE object, the CACHING_STRATEGY is
+   * If the @a key is located in the CMAP_TYPE object, the CACHING_STRATEGY is
    * notified of it via notify_find (int result, ATTRIBUTES &attribute).
    * If notify_find also returns 0 (success), then this function returns
    * 0 (success).
@@ -141,7 +141,7 @@ public:
   int find (const KEY &key);
 
   /**
-   * Reassociate the <key> with <value>. If the <key> already exists
+   * Reassociate the @a key with @a value. If the @a key already exists
    * in the cache then returns 1, on a new bind returns 0 and returns
    * -1 in case of any failures.
    */
@@ -149,23 +149,23 @@ public:
               const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the cache for caches that do not allow user specified keys.
    * However, for caches that allow user specified keys, if the key is
-   * not in the cache, a new <key>/<value> association is created.
+   * not in the cache, a new @a key / @a value association is created.
    */
   int rebind (const KEY &key,
               const VALUE &value,
               VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the cache for caches that do
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the cache for caches that do
    * not allow user specified keys.  However, for caches that allow
    * user specified keys, if the key is not in the cache, a new
-   * <key>/<value> association is created.
+   * @a key / @a value association is created.
    */
   int rebind (const KEY &key,
               const VALUE &value,
@@ -173,21 +173,21 @@ public:
               VALUE &old_value);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * cache.  If <key> is already in the cache, then the <value>
+   * Associate @a key with @a value if and only if @a key is not in the
+   * cache.  If @a key is already in the cache, then the @a value
    * parameter is overwritten with the existing value in the
-   * cache. Returns 0 if a new <key>/<value> association is created.
+   * cache. Returns 0 if a new @a key / @a value association is created.
    * Returns 1 if an attempt is made to bind an existing entry.  This
    * function fails for maps that do not allow user specified keys.
    */
   int trybind (const KEY &key,
                VALUE &value);
 
-  /// Remove <key> from the cache.
+  /// Remove @a key from the cache.
   int unbind (const KEY &key);
 
-  /// Remove <key> from the cache, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the cache, and return the @a value associated with
+  /// @a key.
   int unbind (const KEY &key,
               VALUE &value);
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index f9c1cb6a3a2..9906cd0a2f5 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -67,7 +67,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   found = 0;
 
   // Get the recycling act for the svc_handler
-  CONNECTION_CACHE_ENTRY *possible_entry = (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
+  CONNECTION_CACHE_ENTRY *possible_entry =
+    (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
   if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
@@ -529,8 +530,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup (void)
   ACE_GUARD (MUTEX, ace_mon, *this->lock_);
 
   // Close down all cached service handlers.
-  typename CONNECTION_CACHE::ITERATOR iter =
-    this->connection_cache_.begin ();
+  typename CONNECTION_CACHE::ITERATOR iter = this->connection_cache_.begin ();
   while (iter != this->connection_cache_.end ())
     {
       if ((*iter).second () != 0)
diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl
index cbe5f9c35ff..d846b66b13a 100644
--- a/ACE/ace/Caching_Strategies_T.inl
+++ b/ACE/ace/Caching_Strategies_T.inl
@@ -135,11 +135,10 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double per
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (
+  int result,
+  const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   if (result == 0)
     ++this->timer_;
 
@@ -147,8 +146,9 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                    ATTRIBUTES &attr)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (
+  int result,
+  ATTRIBUTES &attr)
 {
   if (result == 0)
     {
@@ -160,28 +160,26 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (
+  int result,
+  const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
   return result;
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (
+  int result,
+  ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   return result;
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (
+  int result,
+  const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   if (result == 0)
     ++this->timer_;
 
@@ -228,9 +226,8 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double per
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
 ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+                                                                    const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
 
   return result;
 }
@@ -247,28 +244,22 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
 ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+                                                                       ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   return result;
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
 ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+                                                                      const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   return result;
 }
 
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
 ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+                                                                      const ATTRIBUTES & /* attr */)
 {
-  ACE_UNUSED_ARG (attr);
-
   return result;
 }
 
diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp
index 24a650ef1ff..f0c641cc692 100644
--- a/ACE/ace/Capabilities.cpp
+++ b/ACE/ace/Capabilities.cpp
@@ -1,5 +1,5 @@
 #include "ace/Capabilities.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
@@ -69,12 +69,12 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap)
               cap += *buf++;
               continue;
             }
-          if (isdigit(*buf))
+          if (ACE_OS::ace_isdigit(*buf))
             {
               // @@ UNICODE Does this work with unicode?
               int oc = 0;
               for (int i = 0;
-                   i < 3 && *buf && isdigit (*buf);
+                   i < 3 && *buf && ACE_OS::ace_isdigit (*buf);
                    i++)
                 oc = oc * 8 + (*buf++ - ACE_LIB_TEXT ('0'));
 
@@ -92,7 +92,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap)
 {
   int n = 0;
 
-  while (*buf && isdigit (*buf))
+  while (*buf && ACE_OS::ace_isdigit (*buf))
     n = n * 10 + (*buf++ - ACE_LIB_TEXT ('0'));
 
   cap = n;
@@ -128,7 +128,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf)
       ACE_CapEntry *ce;
 
       // Skip blanks
-      while (*buf && isspace(*buf)) buf++;
+      while (*buf && ACE_OS::ace_isspace(*buf)) buf++;
       // If we get end of line return
 
       if (*buf == ACE_LIB_TEXT ('\0'))
@@ -202,7 +202,7 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line)
   for (;;)
     {
       // Skip blanks or irrelevant characters
-      while (*line && isspace(*line))
+      while (*line && ACE_OS::ace_isspace(*line))
         ++line;
 
       // End of line reached
@@ -292,7 +292,7 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val)
 static int
 is_empty (const ACE_TCHAR *line)
 {
-  while (*line && isspace (*line))
+  while (*line && ACE_OS::ace_isspace (*line))
     ++line;
 
   return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#');
@@ -301,7 +301,7 @@ is_empty (const ACE_TCHAR *line)
 static int
 is_line (const ACE_TCHAR *line)
 {
-  while (*line && isspace (*line))
+  while (*line && ACE_OS::ace_isspace (*line))
     ++line;
 
   return *line != ACE_LIB_TEXT ('\0');
diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h
index 9fe870b8fe5..f4183f22986 100644
--- a/ACE/ace/Capabilities.h
+++ b/ACE/ace/Capabilities.h
@@ -27,6 +27,11 @@
 #include "ace/SString.h"
 #include "ace/Functor_String.h"
 
+#if defined (ACE_IS_SPLITTING)
+# include "ace/OS_NS_ctype.h"
+#endif  /* ACE_IS_SPLITTING */
+
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -190,7 +195,7 @@ private:
 int
 is_empty (const ACE_TCHAR *line)
 {
-  while (*line && isspace (*line))
+  while (*line && ACE_OS::ace_isspace (*line))
     ++line;
 
   return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#');
@@ -199,7 +204,7 @@ is_empty (const ACE_TCHAR *line)
 int
 is_line (const ACE_TCHAR *line)
 {
-  while (*line && isspace (*line))
+  while (*line && ACE_OS::ace_isspace (*line))
     ++line;
 
   return *line != ACE_LIB_TEXT ('\0');
diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp
index d69857c558c..5e208fd373f 100644
--- a/ACE/ace/Codeset_IBM1047.cpp
+++ b/ACE/ace/Codeset_IBM1047.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Codeset_IBM1047.cpp
-//
-// = DESCRIPTION
-//    Defines the arrays required to convert between ISO8859 (aka
-//    Latin/1) and IBM1047 (aka EBCDIC).
-//
-// = AUTHOR
-//    Jim Rogers (jrogers@viasoft.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Codeset_IBM1047.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the arrays required to convert between ISO8859 (aka
+ *  Latin/1) and IBM1047 (aka EBCDIC).
+ *
+ *
+ *  @author Jim Rogers (jrogers@viasoft.com)
+ */
+//=============================================================================
+
 
 #include "ace/Codeset_IBM1047.h"
 
diff --git a/ACE/ace/Codeset_Registry.cpp b/ACE/ace/Codeset_Registry.cpp
index 5d3c6abb59b..b98a1dd7e89 100644
--- a/ACE/ace/Codeset_Registry.cpp
+++ b/ACE/ace/Codeset_Registry.cpp
@@ -33,9 +33,9 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
-    if (ACE_OS::strcmp(registry_db_[i].loc_name_,locale.c_str()) == 0)
+    if (ACE_OS::strcmp (registry_db_[i].loc_name_, locale.c_str ()) == 0)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
@@ -45,8 +45,7 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -58,20 +57,19 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
     if (codeset_id == registry_db_[i].codeset_id_)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
-  locale.set(element->loc_name_);
+  locale.set (element->loc_name_);
   if (num_sets != 0)
     *num_sets = element->num_sets_;
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -81,8 +79,8 @@ int
 ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id,
                                        ACE_CDR::ULong other)
 {
-  registry_entry const * lhs = 0;
-  registry_entry const * rhs = 0;
+  registry_entry const *lhs = 0;
+  registry_entry const *rhs = 0;
   for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++)
     {
       if (codeset_id == registry_db_[i].codeset_id_)
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 039c2a1c192..49c2696217f 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -428,7 +428,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const
 
 //////////////////////////////////////////////////////////////////////////////
 
-#if defined (WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 static const int ACE_DEFAULT_BUFSIZE = 256;
 
@@ -1062,7 +1062,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
   return result;
 }
 
-#endif /* WIN_32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
 ///////////////////////////////////////////////////////////////
 
@@ -1167,7 +1167,7 @@ ACE_Configuration_ExtId::operator!= (const ACE_Configuration_ExtId& rhs) const
 u_long
 ACE_Configuration_ExtId::hash (void) const
 {
-  ACE_TString temp (name_, 0, 0);
+  ACE_TString temp (name_, 0, false);
   return temp.hash ();
 }
 
@@ -1366,7 +1366,7 @@ ACE_Configuration_Heap::load_key (const ACE_Configuration_Section_Key& key,
       return -1;
     }
 
-  ACE_TString temp (pKey->path_, 0, 0);
+  ACE_TString temp (pKey->path_, 0, false);
   name.assign_nocopy (temp);
   return 0;
 }
@@ -1552,7 +1552,7 @@ ACE_Configuration_Heap::open_simple_section (const ACE_Configuration_Section_Key
                                              int create,
                                              ACE_Configuration_Section_Key& result)
 {
-  ACE_TString section (0, 0, 0);
+  ACE_TString section (0, 0, false);
 
   if (load_key (base, section))
     {
@@ -1994,7 +1994,7 @@ ACE_Configuration_Heap::get_integer_value (const ACE_Configuration_Section_Key&
     return -1;
 
   // Get the section name from the key
-  ACE_TString section (0, 0, 0);
+  ACE_TString section (0, 0, false);
 
   if (this->load_key (key, section) != 0)
     {
diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h
index b1ca0f6a9d9..bba0cf4ae6a 100644
--- a/ACE/ace/Configuration.h
+++ b/ACE/ace/Configuration.h
@@ -349,7 +349,7 @@ public:
                             const ACE_TCHAR* name) = 0;
 
   /**
-   * Expands <path_in> to <key_out> from <key>.  If create is true,
+   * Expands <path_in> to <key_out> from @a key.  If create is true,
    * the subsections are created.  Returns 0 on success, non zero on
    * error The path consists of sections separated by the backslash
    * '\' or forward slash '/'.
@@ -429,7 +429,7 @@ protected:
   ACE_Configuration_Section_Key root_;
 };
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 /**
  * @class ACE_Section_Key_Win32
@@ -554,7 +554,7 @@ protected:
   ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs);
   ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs);
 };
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
 // ACE_Allocator version
 
@@ -848,7 +848,7 @@ public:
                          const ACE_TCHAR* name,
                          VALUETYPE& type);
 
-  /// Removes the the value <name> from <key>.  returns non zero on error
+  /// Removes the the value <name> from @a key.  returns non zero on error
   virtual int remove_value (const ACE_Configuration_Section_Key& key,
                             const ACE_TCHAR* name);
 
diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp
index 335be965247..d0440f6182e 100644
--- a/ACE/ace/Configuration_Import_Export.cpp
+++ b/ACE/ace/Configuration_Import_Export.cpp
@@ -230,7 +230,10 @@ ACE_Registry_ImpExp::export_config (const ACE_TCHAR* filename)
       result = this->export_section (config_.root_section (),
                                      ACE_LIB_TEXT (""),
                                      out);
-      ACE_OS::fclose (out);
+      // The data may have been buffered and will be flush on close,
+      // so we need to check that the close succeeds.
+      if (ACE_OS::fclose (out) < 0)
+        result = -7;
     }
   return result;
 }
@@ -512,7 +515,10 @@ ACE_Ini_ImpExp::export_config (const ACE_TCHAR* filename)
       result = this->export_section (config_.root_section (),
                                      ACE_LIB_TEXT (""),
                                      out);
-      ACE_OS::fclose (out);
+      // The data may have been buffered and will be flush on close,
+      // so we need to check that the close succeeds.
+      if (ACE_OS::fclose (out) < 0)
+        result = -7;
     }
   return result;
 }
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index f92ebea99a9..427679c1673 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -349,7 +349,7 @@ protected:
   /// Calls <handle_close> to shutdown the Connector gracefully.
   virtual int fini (void);
 
-  /// Default version returns address info in <buf>.
+  /// Default version returns address info in @a buf.
   virtual int info (ACE_TCHAR **strp, size_t length) const;
 
   // = Service management hooks.
diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp
index 5c2dd1da01f..dd4fc10acbc 100644
--- a/ACE/ace/Containers_T.cpp
+++ b/ACE/ace/Containers_T.cpp
@@ -1000,7 +1000,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::insert (const T &item)
           return 1;
       }
     else
-      first_free = i;
+      first_free = static_cast<ssize_t> (i);
 
   // If we found a free spot let's reuse it.
 
diff --git a/ACE/ace/Countdown_Time.cpp b/ACE/ace/Countdown_Time.cpp
index fb03f0465e0..4c95e2acfa1 100644
--- a/ACE/ace/Countdown_Time.cpp
+++ b/ACE/ace/Countdown_Time.cpp
@@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
   : max_wait_time_ (max_wait_time),
-    stopped_ (0)
+    stopped_ (false)
 {
   this->start ();
 }
@@ -19,48 +19,48 @@ ACE_Countdown_Time::~ACE_Countdown_Time (void)
   this->stop ();
 }
 
-int
+void
 ACE_Countdown_Time::start (void)
 {
   if (this->max_wait_time_ != 0)
     {
       this->start_time_ = ACE_OS::gettimeofday ();
-      this->stopped_ = 0;
+      this->stopped_ = false;
     }
-  return 0;
 }
 
-int
+bool
 ACE_Countdown_Time::stopped (void) const
 {
   return stopped_;
 }
 
-int
+void
 ACE_Countdown_Time::stop (void)
 {
-  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
+  if (this->max_wait_time_ != 0 && this->stopped_ == false)
     {
-      ACE_Time_Value elapsed_time =
-        ACE_OS::gettimeofday () - this->start_time_;
+      ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - this->start_time_;
 
       if (*this->max_wait_time_ > elapsed_time)
-        *this->max_wait_time_ -= elapsed_time;
+        {
+          *this->max_wait_time_ -= elapsed_time;
+        }
       else
         {
           // Used all of timeout.
           *this->max_wait_time_ = ACE_Time_Value::zero;
           // errno = ETIME;
         }
-      this->stopped_ = 1;
+      this->stopped_ = true;
     }
-  return 0;
 }
 
-int
+void
 ACE_Countdown_Time::update (void)
 {
-  return this->stop () == 0 && this->start ();
+  this->stop ();
+  this->start ();
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Countdown_Time.h b/ACE/ace/Countdown_Time.h
index bb7dff364d7..58f74c235e9 100644
--- a/ACE/ace/Countdown_Time.h
+++ b/ACE/ace/Countdown_Time.h
@@ -30,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Keeps track of the amount of elapsed time.
  *
- * This class has a side-effect on the <max_wait_time> -- every
+ * This class has a side-effect on the @c max_wait_time -- every
  * time the <stop> method is called the <max_wait_time> is
  * updated.
  */
@@ -38,25 +38,26 @@ class ACE_Export ACE_Countdown_Time
 {
 public:
   // = Initialization and termination methods.
-  /// Cache the <max_wait_time> and call <start>.
+  /// Cache the @a max_wait_time and call @c start().
   ACE_Countdown_Time (ACE_Time_Value *max_wait_time);
 
-  /// Call <stop>.
+  /// Destructor, makes sure the max_wait_time that got passed as pointer
+  /// to the constructor is updated with the time elapsed.
   ~ACE_Countdown_Time (void);
 
   /// Cache the current time and enter a start state.
-  int start (void);
+  void start (void);
 
   /// Subtract the elapsed time from max_wait_time_ and enter a stopped
   /// state.
-  int stop (void);
+  void stop (void);
 
   /// Calls stop and then start.  max_wait_time_ is modified by the
   /// call to stop.
-  int update (void);
+  void update (void);
 
-  /// Returns 1 if we've already been stopped, else 0.
-  int stopped (void) const;
+  /// Returns true if we've already been stopped, else false.
+  bool stopped (void) const;
 
 private:
   /// Maximum time we were willing to wait.
@@ -66,7 +67,7 @@ private:
   ACE_Time_Value start_time_;
 
   /// Keeps track of whether we've already been stopped.
-  int stopped_;
+  bool stopped_;
 
   // Prevent copying
   ACE_Countdown_Time (const ACE_Countdown_Time &);
diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h
index 2d57f836b24..11e2216b9ce 100644
--- a/ACE/ace/DEV_Connector.h
+++ b/ACE/ace/DEV_Connector.h
@@ -39,7 +39,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
@@ -64,7 +64,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
diff --git a/ACE/ace/DEV_IO.h b/ACE/ace/DEV_IO.h
index fd2a0e2c5b8..9a5d30e3217 100644
--- a/ACE/ace/DEV_IO.h
+++ b/ACE/ace/DEV_IO.h
@@ -46,10 +46,10 @@ public:
   ACE_DEV_IO (void);
 
   // = Various send operations.
-  /// send upto <n> bytes in <buf>.
+  /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
 
-  /// Recv upto <n> bytes in <buf>.
+  /// Recv upto @a n bytes in @a buf.
   ssize_t recv (void *buf, size_t n) const;
 
   /// Send n bytes, keep trying until n are sent.
@@ -61,23 +61,23 @@ public:
    *
    * Notes on common parameters:
    *
-   * <buf> is the buffer to write from or receive into.
+   * @a buf is the buffer to write from or receive into.
    *
-   * <len> is the number of bytes to transfer.
+   * @a len is the number of bytes to transfer.
    *
-   * The <timeout> parameter in the following methods indicates how
-   * long to blocking trying to transfer data.  If <timeout> == 0,
+   * The @a timeout parameter in the following methods indicates how
+   * long to blocking trying to transfer data.  If @a timeout == 0,
    * then the call behaves as a normal send/recv call, i.e., for
    * blocking sockets, the call will block until action is possible;
    * for non-blocking sockets, EWOULDBLOCK will be returned if no
    * action is immediately possible.
    *
-   * If <timeout> != 0, the call will wait until the relative time
-   * specified in *<timeout> elapses.
+   * If @a timeout != 0, the call will wait until the relative time
+   * specified in *@a timeout elapses.
    *
    * The "_n()" I/O methods keep looping until all the data has been
    * transferred.  These methods also work for sockets in non-blocking
-   * mode i.e., they keep looping on EWOULDBLOCK.  <timeout> is used
+   * mode i.e., they keep looping on EWOULDBLOCK.  @a timeout is used
    * to make sure we keep making progress, i.e., the same timeout
    * value is used for every I/O operation in the loop and the timeout
    * is not counted down.
@@ -146,10 +146,10 @@ public:
    */
   ssize_t recv (size_t n, ...) const;
 
-  /// Send <n> bytes via Win32 WriteFile using overlapped I/O.
+  /// Send @a n bytes via Win32 WriteFile using overlapped I/O.
   ssize_t send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
 
-  /// Recv <n> bytes via Win32 ReadFile using overlapped I/O.
+  /// Recv @a n bytes via Win32 ReadFile using overlapped I/O.
   ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
 
   /// Dump the state of an object.
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 4290700b55e..9f7edb0ad05 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -546,27 +546,30 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name,
                            ACE_SHLIB_HANDLE handle)
 {
   ACE_TRACE ("ACE_DLL_Manager::open_dll");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
 
   ACE_DLL_Handle *temp_handle = 0;
-  ACE_DLL_Handle *dll_handle = this->find_dll (dll_name);
-  if (!dll_handle)
-    {
-      if (this->current_size_ < this->total_size_)
-        {
-          ACE_NEW_RETURN (temp_handle,
-                          ACE_DLL_Handle,
-                          0);
+  ACE_DLL_Handle *dll_handle = 0;
+  {
+    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
+    dll_handle = this->find_dll (dll_name);
+    if (!dll_handle)
+      {
+        if (this->current_size_ < this->total_size_)
+          {
+            ACE_NEW_RETURN (temp_handle,
+                            ACE_DLL_Handle,
+                            0);
 
-          dll_handle = temp_handle;
-        }
-    }
+            dll_handle = temp_handle;
+          }
+      }
+  }
 
   if (dll_handle)
     {
       if (dll_handle->open (dll_name, open_mode, handle) != 0)
         {
-          // Error while openind dll. Free temp handle
+          // Error while opening dll. Free temp handle
           if (ACE::debug ())
             ACE_ERROR ((LM_ERROR,
                         ACE_LIB_TEXT ("ACE_DLL_Manager::open_dll: Could not ")
@@ -579,10 +582,11 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name,
 
       // Add the handle to the vector only if the dll is successfully
       // opened.
-      if (temp_handle != NULL)
+      if (temp_handle != 0)
         {
+          ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
           this->handle_vector_[this->current_size_] = dll_handle;
-          this->current_size_++;
+          ++this->current_size_;
         }
     }
 
@@ -593,9 +597,13 @@ int
 ACE_DLL_Manager::close_dll (const ACE_TCHAR *dll_name)
 {
   ACE_TRACE ("ACE_DLL_Manager::close_dll");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
+  ACE_DLL_Handle *handle = 0;
+
+  {
+    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
+    handle = this->find_dll (dll_name);
+  }
 
-  ACE_DLL_Handle *handle = this->find_dll (dll_name);
   if (handle)
     {
       return this->unload_dll (handle, 0);
@@ -689,8 +697,7 @@ ACE_DLL_Manager::find_dll (const ACE_TCHAR *dll_name) const
 {
   ACE_TRACE ("ACE_DLL_Manager::find_dll");
 
-  int i;
-  for (i = 0; i < this->current_size_; i++)
+  for (int i = 0; i < this->current_size_; i++)
     if (this->handle_vector_[i] &&
         ACE_OS::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0)
       {
@@ -721,13 +728,20 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
             {
               // Declare the type of the symbol:
               typedef int (*dll_unload_policy)(void);
-              dll_unload_policy the_policy = 0;
-              void *unload_policy_ptr =
+
+              void * const unload_policy_ptr =
                 dll_handle->symbol (ACE_LIB_TEXT ("_get_dll_unload_policy"), 1);
-              ptrdiff_t temp_p =
-                reinterpret_cast<ptrdiff_t> (unload_policy_ptr);
-              the_policy =
+#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
+              int const temp_p =
+                reinterpret_cast<int> (unload_policy_ptr);
+#else
+              intptr_t const temp_p =
+                reinterpret_cast<intptr_t> (unload_policy_ptr);
+#endif
+
+              dll_unload_policy const the_policy =
                 reinterpret_cast<dll_unload_policy> (temp_p);
+
               if (the_policy != 0)
                 unload = ACE_BIT_DISABLED (the_policy (),
                                            ACE_DLL_UNLOAD_POLICY_LAZY);
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 8bf63534735..abf3a432c31 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -50,10 +50,7 @@ ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void)
   , notification_pipe_ ()
   , max_notify_iterations_ (-1)
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-  , alloc_queue_ ()
-  , notify_queue_ ()
-  , free_queue_ ()
-  , notify_queue_lock_ ()
+  , notification_queue_ ()
 #endif  /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 {
 }
@@ -85,18 +82,10 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
 #endif /* F_SETFD */
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-      ACE_Notification_Buffer *temp;
-
-      ACE_NEW_RETURN (temp,
-                      ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
-                      -1);
-
-      if (this->alloc_queue_.enqueue_head (temp) == -1)
-        return -1;
-
-      for (size_t i = 0; i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; ++i)
-        if (free_queue_.enqueue_head (temp + i) == -1)
-          return -1;
+      if (notification_queue_.open() == -1)
+	{
+	  return -1;
+	}
 
       if (ACE::set_flags (this->notification_pipe_.write_handle (),
                           ACE_NONBLOCK) == -1)
@@ -120,20 +109,7 @@ ACE_Dev_Poll_Reactor_Notify::close (void)
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::close");
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-  // Free up the dynamically allocated resources.
-  ACE_Notification_Buffer **b;
-
-  for (ACE_Unbounded_Queue_Iterator<ACE_Notification_Buffer *> alloc_iter (this->alloc_queue_);
-       alloc_iter.next (b) != 0;
-       alloc_iter.advance ())
-    {
-      delete [] *b;
-      *b = 0;
-    }
-
-  this->alloc_queue_.reset ();
-  this->notify_queue_.reset ();
-  this->free_queue_.reset ();
+  notification_queue_.reset();
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   return this->notification_pipe_.close ();
@@ -154,42 +130,22 @@ ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh,
   ACE_Notification_Buffer buffer (eh, mask);
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
+  ACE_Dev_Poll_Handler_Guard eh_guard (eh);
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
-
-  // Locate a free buffer in the queue. Enlarge the queue if needed.
-  ACE_Notification_Buffer *temp = 0;
-
-  if (free_queue_.dequeue_head (temp) == -1)
-    {
-      // Grow the queue of available buffers.
-      ACE_Notification_Buffer *temp1;
-
-      ACE_NEW_RETURN (temp1,
-                      ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
-                      -1);
-
-      if (this->alloc_queue_.enqueue_head (temp1) == -1)
-        return -1;
-
-      // Start at 1 and enqueue only
-      // (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE - 1) elements since
-      // the first one will be used right now.
-      for (size_t i = 1;
-           i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE;
-           ++i)
-        this->free_queue_.enqueue_head (temp1 + i);
-
-      temp = temp1;
-    }
+  int notification_required = 
+    notification_queue_.push_new_notification(buffer);
 
-  ACE_ASSERT (temp != 0);
-  *temp = buffer;
+  if (notification_required == -1)
+  {
+    return -1;
+  }
 
-  ACE_Dev_Poll_Handler_Guard eh_guard (eh);
+  if (notification_required == 0)
+  {
+    eh_guard.release ();
 
-  if (notify_queue_.enqueue_tail (temp) == -1)
-    return -1;
+    return 0;
+  }
 
   // Now pop the pipe to force the callback for dispatching when ready. If
   // the send fails due to a full pipe, don't fail - assume the already-sent
@@ -239,26 +195,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notifications (
   // also serves to slow down event dispatching particularly with this
   // ACE_Dev_Poll_Reactor.
 
-#if 0
-  ACE_HANDLE read_handle =
-    this->notification_pipe_.read_handle ();
-
-  // Note that we do not check if the handle has received any events.
-  // Instead a non-blocking "speculative" read is performed.  If the
-  // read returns with errno == EWOULDBLOCK then no notifications are
-  // dispatched.  See ACE_Dev_Poll_Reactor_Notify::read_notify_pipe()
-  // for details.
-  if (read_handle != ACE_INVALID_HANDLE)
-    {
-      --number_of_active_handles;
-
-      return this->handle_input (read_handle);
-    }
-  else
-    return 0;
-#else
   ACE_NOTSUP_RETURN (-1);
-#endif  /* 0 */
 }
 
 int
@@ -286,26 +223,31 @@ ACE_Dev_Poll_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle,
   char b;
   read_p = &b;
   to_read = 1;
-  ACE_Notification_Buffer *temp;
 
-  // New scope to release the guard before trying the recv().
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+  // Before reading the byte, pop a message from the queue and queue a
+  // new message unless the queue is now empty.  The protocol is to
+  // keep a byte in the pipe as long as the queue is not empty.
+  bool more_messages_queued = false;
+  ACE_Notification_Buffer next;
 
-    if (notify_queue_.is_empty ())
+  int result = notification_queue_.pop_next_notification(
+	     buffer, more_messages_queued, next);
+
+  if (result == 0)
+    {
       return 0;
-    else if (notify_queue_.dequeue_head (temp) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("read_notify_pipe: dequeue_head")),
-                        -1);
-    buffer = *temp;
-    have_one = true;
-    if (free_queue_.enqueue_head (temp) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("%p\n"),
-                  ACE_LIB_TEXT ("read_notify_pipe: enqueue_head")));
-  }
+    }
+  
+  if (result == -1)
+    {
+      return -1;
+    }
+
+  if(more_messages_queued)
+    {
+      (void) ACE::send(this->notification_pipe_.write_handle(),
+		       (char *)&next, 1 /* one byte is enough */);
+    }
 
 #else
   to_read = sizeof buffer;
@@ -475,83 +417,7 @@ ACE_Dev_Poll_Reactor_Notify::purge_pending_notifications (
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
-
-  if (this->notify_queue_.is_empty ())
-    return 0;
-
-  ACE_Notification_Buffer *temp;
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> local_queue;
-
-  size_t queue_size = this->notify_queue_.size ();
-  int number_purged = 0;
-  size_t i;
-  for (i = 0; i < queue_size; ++i)
-    {
-      if (-1 == this->notify_queue_.dequeue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("dequeue_head")),
-                          -1);
-
-      // If this is not a Reactor notify (it is for a particular
-      // handler), and it matches the specified handler (or purging
-      // all), and applying the mask would totally eliminate the
-      // notification, then release it and count the number purged.
-      if ((0 != temp->eh_) &&
-          (0 == eh || eh == temp->eh_) &&
-          ACE_BIT_DISABLED (temp->mask_, ~mask)) // The existing
-                                                 // notification mask
-                                                 // is left with
-                                                 // nothing when
-                                                 // applying the mask.
-        {
-          if (this->free_queue_.enqueue_head (temp) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_LIB_TEXT ("%p\n"),
-                               ACE_LIB_TEXT ("enqueue_head")),
-                              -1);
-          ++number_purged;
-        }
-      else
-        {
-          // To preserve it, move it to the local_queue.
-          // But first, if this is not a Reactor notify (it is for a
-          // particular handler), and it matches the specified handler
-          // (or purging all), then apply the mask.
-          if ((0 != temp->eh_) &&
-              (0 == eh || eh == temp->eh_))
-            ACE_CLR_BITS(temp->mask_, mask);
-          if (-1 == local_queue.enqueue_head (temp))
-            return -1;
-        }
-    }
-
-  if (this->notify_queue_.size ())
-    {
-      // Should be empty!
-      ACE_ASSERT (0);
-      return -1;
-    }
-
-  // Now put it back in the notify queue.
-  queue_size = local_queue.size ();
-  for (i = 0; i < queue_size; ++i)
-    {
-      if (-1 == local_queue.dequeue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("dequeue_head")),
-                          -1);
-
-      if (-1 == this->notify_queue_.enqueue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("enqueue_head")),
-                          -1);
-    }
-
-  return number_purged;
+  return notification_queue_.purge_pending_notifications(eh, mask);
 
 #else /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */
   ACE_UNUSED_ARG (eh);
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 41132201f01..f82283a70b7 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -53,7 +53,7 @@
 #include "ace/Token.h"
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-# include "ace/Unbounded_Queue.h"
+# include "ace/Notification_Queue.h"
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
 #if defined (ACE_HAS_DEV_POLL)
@@ -283,30 +283,17 @@ protected:
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
   /**
-   * @name Reactor Notification Attributes
+   * @brief A user-space queue to store the notifications.
    *
-   * This configuration queues up notifications in separate buffers
-   * that are in user-space, rather than stored in a pipe in the OS
-   * kernel.  The kernel-level notifications are used only to trigger
-   * the Reactor to check its notification queue.  This enables many
-   * more notifications to be stored than would otherwise be the
-   * case.
+   * The notification pipe has OS-specific size restrictions.  That
+   * is, no more than a certain number of bytes may be stored in the
+   * pipe without blocking.  This limit may be too small for certain
+   * applications.  In this case, ACE can be configured to store all
+   * the events in user-space.  The pipe is still needed to wake up
+   * the reactor thread, but only one event is sent through the pipe
+   * at a time.
    */
-  //@{
-
-  /// ACE_Notification_Buffers are allocated in chunks. Each time a chunk is
-  /// allocated, the chunk is added to alloc_queue_ so it can be freed later.
-  /// Each individual ACE_Notification_Buffer is added to the free_queue_
-  /// when it's free. Those in use for queued notifications are placed on the
-  /// notify_queue_.
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> alloc_queue_;
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> notify_queue_;
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> free_queue_;
-
-  /// Synchronization for handling of queues.
-  ACE_SYNCH_MUTEX notify_queue_lock_;
-
-  //@}
+  ACE_Notification_Queue notification_queue_;
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
 };
@@ -333,7 +320,7 @@ public:
   /// Constructor.
   ACE_Dev_Poll_Reactor_Handler_Repository (void);
 
-  /// Initialize a repository of the appropriate <size>.
+  /// Initialize a repository of the appropriate @a size.
   int open (size_t size);
 
   /// Close down the repository.
@@ -684,10 +671,10 @@ public:
                               ACE_Reactor_Mask mask);
 
   /**
-   * Remove the ACE_Event_Handler currently associated with <signum>.
+   * Remove the ACE_Event_Handler currently associated with @a signum.
    * Install the new disposition (if given) and return the previous
    * disposition (if desired by the caller).  Returns 0 on success and
-   * -1 if <signum> is invalid.
+   * -1 if @a signum is invalid.
    */
   virtual int remove_handler (int signum,
                               ACE_Sig_Action *new_disp,
@@ -811,10 +798,10 @@ public:
   // = Notification methods.
 
   /**
-   * Notify <event_handler> of <mask> event.  The <ACE_Time_Value>
-   * indicates how long to blocking trying to notify.  If <timeout> ==
+   * Notify <event_handler> of <mask> event.  The ACE_Time_Value
+   * indicates how long to blocking trying to notify.  If @a timeout ==
    * 0, the caller will block until action is possible, else will wait
-   * until the relative time specified in <timeout> elapses).
+   * until the relative time specified in @a timeout elapses).
    */
   virtual int notify (ACE_Event_Handler *event_handler = 0,
                       ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
@@ -864,7 +851,7 @@ public:
                        ACE_Event_Handler **event_handler = 0);
 
   /**
-   * Check to see if <signum> is associated with a valid Event_Handler
+   * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the <event_handler> associated with
    * this <handler> if <event_handler> != 0.
    */
@@ -1171,7 +1158,7 @@ protected:
    * @brief A helper class that helps grabbing, releasing and waiting
    * on tokens for a thread that needs access to the reactor's token.
    */
-  class Token_Guard
+  class ACE_Export Token_Guard
   {
   public:
 
diff --git a/ACE/ace/Dynamic_Service.cpp b/ACE/ace/Dynamic_Service.cpp
index 3c968ba7b9e..53d762dc364 100644
--- a/ACE/ace/Dynamic_Service.cpp
+++ b/ACE/ace/Dynamic_Service.cpp
@@ -33,7 +33,7 @@ ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name,
 {
   ACE_Service_Object * svc_obj =
     static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (name,no_global));
+    (ACE_Dynamic_Service_Base::instance (name, no_global));
   return dynamic_cast<TYPE *> (svc_obj);
 }
 
@@ -43,7 +43,7 @@ ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* conf,
 {
   ACE_Service_Object * svc_obj =
     static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (conf, name,false));
+    (ACE_Dynamic_Service_Base::instance (conf, name, false));
   return dynamic_cast<TYPE *> (svc_obj);
 }
 
@@ -54,7 +54,7 @@ ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* conf,
 {
   ACE_Service_Object * svc_obj =
     static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (conf, name,no_global));
+    (ACE_Dynamic_Service_Base::instance (conf, name, no_global));
   return dynamic_cast<TYPE *> (svc_obj);
 }
 
diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp
index 301361a0b2d..cc5e9114871 100644
--- a/ACE/ace/Dynamic_Service_Base.cpp
+++ b/ACE/ace/Dynamic_Service_Base.cpp
@@ -68,7 +68,6 @@ ACE_Dynamic_Service_Base::find_i (const ACE_Service_Gestalt* &repo,
 
 
 // Get the instance using <name> for specific configuration repository.
-
 void *
 ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
                                     const ACE_TCHAR *name,
@@ -98,7 +97,8 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
                   repo->repo_, name, type, obj));
 
       if (repo->repo_ != repo_found->repo_)
-        ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" [in repo=%@]\n"),
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_LIB_TEXT (" [in repo=%@]\n"),
                     repo_found->repo_));
       else
         ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
@@ -114,7 +114,7 @@ void *
 ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
                                     const ACE_TCHAR *name)
 {
-  return instance(repo,name,false);
+  return instance (repo, name, false);
 }
 
 
diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp
index 11bdc023436..266f4984aa6 100644
--- a/ACE/ace/Event_Handler.cpp
+++ b/ACE/ace/Event_Handler.cpp
@@ -34,11 +34,6 @@ ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r,
 ACE_Event_Handler::~ACE_Event_Handler (void)
 {
   // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
-  if (this->reactor_ != 0)
-    {
-      ACE_Errno_Guard guard (errno);     // purge may get ENOTSUP
-      this->reactor_->purge_pending_notifications (this);
-    }
 }
 
 // Gets the file descriptor associated with this I/O device.
diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h
index fc4ec2222f3..fa18cf291a5 100644
--- a/ACE/ace/FIFO_Recv.h
+++ b/ACE/ace/FIFO_Recv.h
@@ -57,10 +57,10 @@ public:
   /// Close down the named pipe.
   int close (void);
 
-  /// Recv <buf> of up to <len> bytes.
+  /// Recv @a buf of up to @a len bytes.
   ssize_t recv (void *buf, size_t len);
 
-  /// Recv <buf> of exactly <len> bytes (block until done).
+  /// Recv @a buf of exactly @a len bytes (block until done).
   ssize_t recv_n (void *buf, size_t len);
 
   /// Dump the state of an object.
diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h
index 45e02c87c38..51a14508114 100644
--- a/ACE/ace/FIFO_Send.h
+++ b/ACE/ace/FIFO_Send.h
@@ -51,10 +51,10 @@ public:
             mode_t perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
 
-  /// Send <buf> of up to <len> bytes.
+  /// Send @a buf of up to @a len bytes.
   ssize_t send (const void *buf, size_t len);
 
-  /// Send <buf> of exactly <len> bytes (block until done).
+  /// Send @a buf of exactly @a len bytes (block until done).
   ssize_t send_n (const void *buf, size_t len);
 
   /// Dump the state of an object.
diff --git a/ACE/ace/FIFO_Send_Msg.h b/ACE/ace/FIFO_Send_Msg.h
index 8272ec6c819..a2e0affce8a 100644
--- a/ACE/ace/FIFO_Send_Msg.h
+++ b/ACE/ace/FIFO_Send_Msg.h
@@ -55,10 +55,10 @@ public:
             mode_t perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
 
-  /// Send <buf> of up to <len> bytes.
+  /// Send @a buf of up to @a len bytes.
   ssize_t send (const ACE_Str_Buf &msg);
 
-  /// Send <buf> of exactly <len> bytes (block until done).
+  /// Send @a buf of exactly @a len bytes (block until done).
   ssize_t send (const void *buf, size_t len);
 
 #if defined (ACE_HAS_STREAM_PIPES)
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index 91ed5511e08..93fa7e417cd 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -57,8 +57,7 @@ ACE_FILE::get_info (ACE_FILE_Info *finfo)
   ACE_TRACE ("ACE_FILE::get_info");
   ACE_stat filestatus;
 
-  int const result = ACE_OS::fstat (this->get_handle (),
-                                    &filestatus);
+  int const result = ACE_OS::fstat (this->get_handle (), &filestatus);
 
   if (result == 0)
     {
@@ -82,15 +81,13 @@ int
 ACE_FILE::truncate (ACE_OFF_T length)
 {
   ACE_TRACE ("ACE_FILE::truncate");
-  return ACE_OS::ftruncate (this->get_handle(), length);
+  return ACE_OS::ftruncate (this->get_handle (), length);
 }
 
 ACE_OFF_T
 ACE_FILE::seek (ACE_OFF_T offset, int startpos)
 {
-  return ACE_OS::lseek (this->get_handle (),
-                        offset,
-                        startpos);
+  return ACE_OS::lseek (this->get_handle (), offset, startpos);
 }
 
 ACE_OFF_T
diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp
index 09d87c0d9b1..79d92c49ad9 100644
--- a/ACE/ace/FILE_Addr.cpp
+++ b/ACE/ace/FILE_Addr.cpp
@@ -33,8 +33,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
 #else /* ACE_DEFAULT_TEMP_FILE */
-      if (ACE::get_temp_dir (this->filename_,
-                                      MAXPATHLEN - 15) == -1)
+      if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 15) == -1)
         // -15 for ace-file-XXXXXX
         {
           ACE_ERROR ((LM_ERROR,
@@ -55,12 +54,9 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
     }
   else
     {
-      (void) ACE_OS::strsncpy (this->filename_,
-                               sa.filename_,
-                               sa.get_size ());
+      (void)ACE_OS::strsncpy (this->filename_, sa.filename_, sa.get_size ());
 
-      this->base_set (sa.get_type (),
-                      sa.get_size ());
+      this->base_set (sa.get_type (), sa.get_size ());
     }
   return 0;
 }
@@ -111,7 +107,7 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 void *
 ACE_FILE_Addr::get_addr (void) const
 {
-  return (void *) &this->filename_;
+  return (void *)&this->filename_;
 }
 
 void
diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h
index 54352f1e066..3bf5e675d93 100644
--- a/ACE/ace/FILE_Connector.h
+++ b/ACE/ace/FILE_Connector.h
@@ -48,7 +48,7 @@ public:
    * if things go well.  The <remote_sap> is the file that we are
    * trying to create/open.  If it's the default value of
    * <ACE_Addr::sap_any> then the user is letting the OS create the
-   * filename (via <ACE_OS::mkstemp>).  The <timeout> is the amount of
+   * filename (via <ACE_OS::mkstemp>).  The @a timeout is the amount of
    * time to wait to create/open the file.  If it's 0 then we block
    * indefinitely.  If *timeout == {0, 0} then the file is created
    * using non-blocking mode.  If *timeout > {0, 0} then this is the
@@ -70,7 +70,7 @@ public:
    * if things go well.  The <remote_sap> is the file that we are
    * trying to create/open.  If it's the default value of
    * <ACE_Addr::sap_any> then the user is letting the OS create the
-   * filename (via <ACE_OS::mkstemp>).  The <timeout> is the amount of
+   * filename (via <ACE_OS::mkstemp>).  The @a timeout is the amount of
    * time to wait to create/open the file.  If it's 0 then we block
    * indefinitely.  If *timeout == {0, 0} then the file is created
    * using non-blocking mode.  In this case, if the create/open can't
diff --git a/ACE/ace/FILE_IO.cpp b/ACE/ace/FILE_IO.cpp
index 3197591265e..bf0c41bf418 100644
--- a/ACE/ace/FILE_IO.cpp
+++ b/ACE/ace/FILE_IO.cpp
@@ -46,7 +46,7 @@ ACE_FILE_IO::send (size_t n, ...) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   va_list argp;
-  int total_tuples = ACE_Utils::Truncate<int> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -85,7 +85,7 @@ ACE_FILE_IO::recv (size_t n, ...) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
   va_list argp;
-  int total_tuples = ACE_Utils::Truncate<int> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
diff --git a/ACE/ace/FILE_IO.h b/ACE/ace/FILE_IO.h
index ada2266c618..8fc0a068942 100644
--- a/ACE/ace/FILE_IO.h
+++ b/ACE/ace/FILE_IO.h
@@ -50,10 +50,10 @@ public:
   /// Default constructor.
   ACE_FILE_IO (void);
 
-  /// send upto <n> bytes in <buf>.
+  /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
 
-  /// Recv upto <n> bytes in <buf>.
+  /// Recv upto @a n bytes in @a buf.
   ssize_t recv (void *buf, size_t n) const;
 
   /// Send n bytes, keep trying until n are sent.
@@ -117,17 +117,17 @@ public:
    */
   ssize_t recv (size_t n, ...) const;
 
-  /// Send <n> bytes via Win32 WriteFile using overlapped I/O.
+  /// Send @a n bytes via Win32 WriteFile using overlapped I/O.
   ssize_t send (const void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
 
-  /// Recv <n> bytes via Win32 ReadFile using overlapped I/O.
+  /// Recv @a n bytes via Win32 ReadFile using overlapped I/O.
   ssize_t recv (void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
 
-  /// Send an <iovec> of size <n> to the file.
+  /// Send an <iovec> of size @a n to the file.
   ssize_t sendv (const iovec iov[],
                  int n) const;
 
@@ -141,12 +141,12 @@ public:
    */
   ssize_t recvv (iovec *io_vec);
 
-  /// Send an <iovec> of size <n> to the file.  Will block until all
+  /// Send an <iovec> of size @a n to the file.  Will block until all
   /// bytes are sent or an error occurs.
   ssize_t sendv_n (const iovec iov[],
                    int n) const;
 
-  /// Receive an <iovec> of size <n> to the file.
+  /// Receive an <iovec> of size @a n to the file.
   ssize_t recvv_n (iovec iov[],
                    int n) const;
 
diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp
index 39b0478ea65..f00d34b888f 100644
--- a/ACE/ace/Filecache.cpp
+++ b/ACE/ace/Filecache.cpp
@@ -229,7 +229,7 @@ ACE_Filecache::instance (void)
 
 ACE_Filecache::ACE_Filecache (void)
   : size_ (ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE),
-    hash_ (this->size_)
+    hash_ (size_)
 {
 }
 
@@ -524,7 +524,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename,
       return;
     }
 
-  this->size_ = ACE_Utils::Truncate<ACE_OFF_T> (this->stat_.st_size);
+  this->size_ = ACE_Utils::truncate_cast<ACE_OFF_T> (this->stat_.st_size);
   this->tempname_ = this->filename_;
 
   // Can we open the file?
diff --git a/ACE/ace/Functor.cpp b/ACE/ace/Functor.cpp
index 3e943fe3d54..9fc3b3400c0 100644
--- a/ACE/ace/Functor.cpp
+++ b/ACE/ace/Functor.cpp
@@ -1,32 +1,29 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Functor.cpp
-//
-// = DESCRIPTION
-//    Non-inlinable method definitions for non-templatized classes
-//    and template specializations implementing the GOF Command Pattern,
-//    and STL-style functors.
-//
-// = AUTHOR
-//    Chris Gill           <cdgill@cs.wustl.edu>
-//
-//    Based on Command Pattern implementations originally done by
-//
-//    Carlos O'Ryan        <coryan@cs.wustl.edu>  and
-//    Douglas C. Schmidt   <schmidt@cs.wustl.edu> and
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-//    and on STL-style functor implementations originally done by
-//
-//    Irfan Pyarali  <irfan@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Functor.cpp
+ *
+ *  $Id$
+ *
+ *  Non-inlinable method definitions for non-templatized classes
+ *  and template specializations implementing the GOF Command Pattern,
+ *  and STL-style functors.
+ *
+ *
+ *  @author Chris Gill           <cdgill@cs.wustl.edu>
+ *
+ * Based on Command Pattern implementations originally done by
+ *
+ * Carlos O'Ryan        <coryan@cs.wustl.edu>
+ * Douglas C. Schmidt   <schmidt@cs.wustl.edu>
+ * Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *
+ * and on STL-style functor implementations originally done by
+ *
+ * Irfan Pyarali  <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Functor_T.h"
 #include "ace/Functor.h"
diff --git a/ACE/ace/Functor.inl b/ACE/ace/Functor.inl
index 84e38313b02..65da8feec6d 100644
--- a/ACE/ace/Functor.inl
+++ b/ACE/ace/Functor.inl
@@ -1,34 +1,29 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Functor.inl
-//
-// = DESCRIPTION
-//    Inlinable method definitions for non-templatized classes
-//    and template specializations implementing the GOF Command Pattern,
-//    and STL-style functors.
-//
-// = AUTHOR
-//    Chris Gill           <cdgill@cs.wustl.edu>
-//
-//    Based on Command Pattern implementations originally done by
-//
-//    Carlos O'Ryan        <coryan@cs.wustl.edu>  and
-//    Douglas C. Schmidt   <schmidt@cs.wustl.edu> and
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-//    and on STL-style functor implementations originally done by
-//
-//    Irfan Pyarali  <irfan@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Functor.inl
+ *
+ *  $Id$
+ *
+ *  Inlinable method definitions for non-templatized classes
+ *  and template specializations implementing the GOF Command Pattern,
+ *  and STL-style functors.
+ *
+ *
+ *  @author Chris Gill           <cdgill@cs.wustl.edu>
+ *
+ * Based on Command Pattern implementations originally done by
+ *
+ * Carlos O'Ryan        <coryan@cs.wustl.edu>
+ * Douglas C. Schmidt   <schmidt@cs.wustl.edu>
+ * Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *
+ * and on STL-style functor implementations originally done by
+ * Irfan Pyarali  <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -184,7 +179,7 @@ ACE_Hash<char *>::operator () (const char *t) const
 ACE_INLINE unsigned long
 ACE_Hash<void *>::operator () (const void *t) const
 {
-  return (unsigned long)((ptrdiff_t) t);
+  return static_cast<unsigned long> (reinterpret_cast<uintptr_t> (t));
 }
 
 /***********************************************************************/
diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp
index ae8bdeed457..730d17ebf9d 100644
--- a/ACE/ace/Future.cpp
+++ b/ACE/ace/Future.cpp
@@ -146,7 +146,7 @@ template <class T>
 ACE_Future_Rep<T>::ACE_Future_Rep (void)
   : value_ (0),
     ref_count_ (0),
-    value_ready_ (this->value_ready_mutex_)
+    value_ready_ (value_ready_mutex_)
 {
 }
 
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index 607ac6e8d75..8c4d15f133b 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -116,7 +116,7 @@ private:
   int set (const T &r,
            ACE_Future<T> &caller);
 
-  /// Wait up to <tv> time to get the <value>.  Note that <tv> must be
+  /// Wait up to @a tv time to get the @a value.  Note that @a tv must be
   /// specified in absolute time rather than relative time.
   int get (T &value,
            ACE_Time_Value *tv) const;
diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h
index b51d1958c8b..316a2840a19 100644
--- a/ACE/ace/Future_Set.h
+++ b/ACE/ace/Future_Set.h
@@ -74,9 +74,9 @@ public:
   int insert (ACE_Future<T> &future);
 
   /**
-   * Wait up to <tv> time to get the <value>.  Note that <tv> must be
+   * Wait up to @a tv time to get the @a value.  Note that @a tv must be
    * specified in absolute time rather than relative time.); get the
-   * next ACE_Future that is readable.  If <tv> = 0, the will block
+   * next ACE_Future that is readable.  If @a tv = 0, the will block
    * forever.
    *
    * If a readable future becomes available, then the input
diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp
index db472fbbdd6..7377d48ef4f 100644
--- a/ACE/ace/Get_Opt.cpp
+++ b/ACE/ace/Get_Opt.cpp
@@ -489,15 +489,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
   // when the long option is found, but won't allow the caller to pass it on
   // the command line (how could they?).  The special case is 0, but since
   // we always return it, we let the caller worry about that.
-#if defined (_MSC_VER) && (_MSC_VER >= 1300)
-  // For MSVC 7.x, we need to prevent "illegal" character getting into
-  // isalnum, otherwise, it will crash the program.
-  if (short_option > 0 &&
-      short_option < 256 &&
-      ACE_OS::ace_isalnum (static_cast<char> (short_option)) != 0)
-#else
   if (ACE_OS::ace_isalnum (short_option) != 0)
-#endif /* _MSC_VER && _MSC_VER >= 1300 */
     {
       // If the short_option already exists, make sure it matches, otherwise
       // add it.
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 754e31f2a42..dace42b36c3 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -116,15 +116,20 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ----------------------------------------------------------------
 
-# if defined (ACE_HAS_NO_THROW_SPEC)
-#   define ACE_THROW_SPEC(X)
-# else
+#if defined (ACE_HAS_NO_THROW_SPEC)
+#  define ACE_THROW_SPEC(X)
+#else
 #  if defined (ACE_HAS_EXCEPTIONS)
-#    define ACE_THROW_SPEC(X) throw X
+#    if defined (ACE_WIN32) && defined (_MSC_VER) && \
+        (_MSC_VER >= 1400) && (_MSC_VER < 1500)
+#      define ACE_THROW_SPEC(X) throw(...)
+#    else
+#      define ACE_THROW_SPEC(X) throw X
+#    endif /* ACE_WIN32 && VC8 */
 #  else  /* ! ACE_HAS_EXCEPTIONS */
 #    define ACE_THROW_SPEC(X)
 #  endif /* ! ACE_HAS_EXCEPTIONS */
-# endif /*ACE_HAS_NO_THROW_SPEC*/
+#endif /*ACE_HAS_NO_THROW_SPEC*/
 
 // ----------------------------------------------------------------
 
diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h
index 023e9d17568..66cc3b83b53 100644
--- a/ACE/ace/Hash_Cache_Map_Manager_T.h
+++ b/ACE/ace/Hash_Cache_Map_Manager_T.h
@@ -78,7 +78,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
   typedef VALUE mapped_type;
 
   // = Initialization and termination methods.
-  /// Initialize a <Hash_Cache_Map_Manager> with <size> entries.
+  /// Initialize a <Hash_Cache_Map_Manager> with @a size entries.
   ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
                               size_t size = ACE_DEFAULT_MAP_SIZE,
                               ACE_Allocator *alloc = 0);
@@ -88,7 +88,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
   ~ACE_Hash_Cache_Map_Manager (void);
 
   /**
-   * Associate <key> with <value>.  If <key> is already in the
+   * Associate @a key with @a value.  If @a key is already in the
    * MAP then the ENTRY is not changed.  Returns 0 if a new entry is
    * bound successfully, returns 1 if an attempt is made to bind an
    * existing entry, and returns -1 if failures occur.
@@ -109,7 +109,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
   int find (const KEY &key,
             VALUE &value);
 
-  /// Is <key> in the cache?
+  /// Is @a key in the cache?
   int find (const KEY &key);
 
   /// Obtain the entry when the find succeeds.
@@ -117,7 +117,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
             CACHE_ENTRY *&entry);
 
   /**
-   * Reassociate the <key> with <value>. If the <key> already exists
+   * Reassociate the @a key with @a value. If the @a key already exists
    * in the cache then returns 1, on a new bind returns 0 and returns
    * -1 in case of any failures.
    */
@@ -125,22 +125,22 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
               const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the cache for caches that do not allow user specified keys.
    * However, for caches that allow user specified keys, if the key is
-   * not in the cache, a new <key>/<value> association is created.
+   * not in the cache, a new @a key / @a value association is created.
    */
   int rebind (const KEY &key,
               const VALUE &value,
               VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the cache for caches that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the cache for caches that do not
    * allow user specified keys.  However, for caches that allow user
-   * specified keys, if the key is not in the cache, a new <key>/<value>
+   * specified keys, if the key is not in the cache, a new @a key / @a value
    * association is created.
    */
   int rebind (const KEY &key,
@@ -158,10 +158,10 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
               CACHE_ENTRY *&entry);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * cache.  If <key> is already in the cache, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * cache.  If @a key is already in the cache, then the @a value parameter
    * is overwritten with the existing value in the cache. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
@@ -177,11 +177,11 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
                VALUE &value,
                CACHE_ENTRY *&entry);
 
-  /// Remove <key> from the cache.
+  /// Remove @a key from the cache.
   int unbind (const KEY &key);
 
-  /// Remove <key> from the cache, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the cache, and return the @a value associated with
+  /// @a key.
   int unbind (const KEY &key,
               VALUE &value);
 
diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp
index 9a80270b8d8..74473305067 100644
--- a/ACE/ace/Hash_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Map_Manager_T.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Hash_Map_Manager_T.cpp
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cse.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Hash_Map_Manager_T.cpp
+ *
+ *  $Id$
+ *
+ *  @author Douglas C. Schmidt <schmidt@cse.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACE_HASH_MAP_MANAGER_T_CPP
 #define ACE_HASH_MAP_MANAGER_T_CPP
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 252af6ec00a..ae9d41c2ae4 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -159,7 +159,7 @@ public:
   typedef value_type const *                 const_pointer;
 //   typedef ptrdiff_t                          difference_type;
   typedef size_t                             size_type;
-  
+
   // = Initialization and termination methods.
 
   /**
@@ -219,7 +219,7 @@ public:
   ~ACE_Hash_Map_Manager_Ex (void);
 
   /**
-   * Associate <ext_id> with <int_id>.  If <ext_id> is already in the
+   * Associate @a ext_id with @a int_id.  If @a ext_id is already in the
    * map then the <ACE_Hash_Map_Entry> is not changed.  Returns 0 if a
    * new entry is bound successfully, returns 1 if an attempt is made
    * to bind an existing entry, and returns -1 if failures occur.
@@ -237,8 +237,8 @@ public:
             ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Associate <ext_id> with <int_id> if and only if <ext_id> is not
-   * in the map.  If <ext_id> is already in the map then the <int_id>
+   * Associate @a ext_id with @a int_id if and only if @a ext_id is not
+   * in the map.  If @a ext_id is already in the map then the @a int_id
    * parameter is assigned the existing value in the map.  Returns 0
    * if a new entry is bound successfully, returns 1 if an attempt is
    * made to bind an existing entry, and returns -1 if failures occur.
@@ -256,7 +256,7 @@ public:
                ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Reassociate <ext_id> with <int_id>.  If <ext_id> is not in the
+   * Reassociate @a ext_id with @a int_id.  If @a ext_id is not in the
    * map then behaves just like <bind>.  Returns 0 if a new entry is
    * bound successfully, returns 1 if an existing entry was rebound,
    * and returns -1 if failures occur.
@@ -274,9 +274,9 @@ public:
               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Associate <ext_id> with <int_id>.  If <ext_id> is not in the map
+   * Associate @a ext_id with @a int_id.  If @a ext_id is not in the map
    * then behaves just like <bind>.  Otherwise, store the old value of
-   * <int_id> into the "out" parameter and rebind the new parameters.
+   * @a int_id into the "out" parameter and rebind the new parameters.
    * Returns 0 if a new entry is bound successfully, returns 1 if an
    * existing entry was rebound, and returns -1 if failures occur.
    */
@@ -295,9 +295,9 @@ public:
               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Associate <ext_id> with <int_id>.  If <ext_id> is not in the map
+   * Associate @a ext_id with @a int_id.  If @a ext_id is not in the map
    * then behaves just like <bind>.  Otherwise, store the old values
-   * of <ext_id> and <int_id> into the "out" parameters and rebind the
+   * of @a ext_id and @a int_id into the "out" parameters and rebind the
    * new parameters.  This is very useful if you need to have an
    * atomic way of updating <ACE_Hash_Map_Entrys> and you also need
    * full control over memory allocation.  Returns 0 if a new entry is
@@ -320,20 +320,20 @@ public:
               INT_ID &old_int_id,
               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
-  /// Locate <ext_id> and pass out parameter via <int_id>.
+  /// Locate @a ext_id and pass out parameter via @a int_id.
   /// Return 0 if found, returns -1 if not found.
   int find (const EXT_ID &ext_id,
             INT_ID &int_id) const;
 
-  /// Returns 0 if the <ext_id> is in the mapping, otherwise -1.
+  /// Returns 0 if the @a ext_id is in the mapping, otherwise -1.
   int find (const EXT_ID &ext_id) const;
 
-  /// Locate <ext_id> and pass out parameter via <entry>.  If found,
+  /// Locate @a ext_id and pass out parameter via <entry>.  If found,
   /// return 0, returns -1 if not found.
   int find (const EXT_ID &ext_id,
             ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry) const;
 
-  /// Locate <ext_id> and pass out an iterator that points to its
+  /// Locate @a ext_id and pass out an iterator that points to its
   /// corresponding value.
   /**
    * @param pos @a pos will be set to @c end() if not found.
@@ -341,13 +341,13 @@ public:
   void find (EXT_ID const & ext_id, iterator & pos) const;
 
   /**
-   * Unbind (remove) the <ext_id> from the map.  Don't return the
-   * <int_id> to the caller (this is useful for collections where the
-   * <int_id>s are *not* dynamically allocated...)
+   * Unbind (remove) the @a ext_id from the map.  Don't return the
+   * @a int_id to the caller (this is useful for collections where the
+   * @a int_ids are *not* dynamically allocated...)
    */
   int unbind (const EXT_ID &ext_id);
 
-  /// Break any association of <ext_id>.  Returns the value of <int_id>
+  /// Break any association of @a ext_id.  Returns the value of @a int_id
   /// in case the caller needs to deallocate memory. Return 0 if the
   /// unbind was successfully, and returns -1 if failures occur.
   int unbind (const EXT_ID &ext_id,
@@ -372,7 +372,7 @@ public:
    *         occur.
    */
   int unbind (iterator pos);
-  
+
   /// Returns the current number of ACE_Hash_Map_Entry objects in the
   /// hash table.
   size_t current_size (void) const;
@@ -401,7 +401,7 @@ public:
   iterator end (void);
   const_iterator begin (void) const;
   const_iterator end (void) const;
-  
+
   /// Return reverse iterator.
   reverse_iterator rbegin (void);
   reverse_iterator rend (void);
@@ -415,7 +415,7 @@ protected:
   /// separate method to facilitate template specialization.
   int equal (const EXT_ID &id1, const EXT_ID &id2);
 
-  /// Compute the hash value of the <ext_id>.  This is defined as a
+  /// Compute the hash value of the @a ext_id.  This is defined as a
   /// separate method to facilitate template specialization.
   u_long hash (const EXT_ID &ext_id);
 
@@ -472,16 +472,16 @@ protected:
                 INT_ID &old_int_id,
                 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
 
-  /// Performs a find of <int_id> using <ext_id> as the key.  Must be
+  /// Performs a find of @a int_id using @a ext_id as the key.  Must be
   /// called with locks held.
   int find_i (const EXT_ID &ext_id,
               INT_ID &int_id);
 
-  /// Performs a find using <ext_id> as the key.  Must be called with
+  /// Performs a find using @a ext_id as the key.  Must be called with
   /// locks held.
   int find_i (const EXT_ID &ext_id);
 
-  /// Performs a find using <ext_id> as the key.  Must be called with
+  /// Performs a find using @a ext_id as the key.  Must be called with
   /// locks held.
   int find_i (const EXT_ID &ext_id,
               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry);
@@ -531,7 +531,7 @@ protected:
   COMPARE_KEYS compare_keys_;
 
 protected:
-  /// Returns the <ACE_Hash_Map_Entry> that corresponds to <ext_id>.
+  /// Returns the <ACE_Hash_Map_Entry> that corresponds to @a ext_id.
   int shared_find (const EXT_ID &ext_id,
                    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry,
                    size_t &loc);
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp
index 544383d0ad0..24cb2c8d3ea 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Hash_Multi_Map_Manager_T.cpp
-//
-// = AUTHOR
-//    Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Hash_Multi_Map_Manager_T.cpp
+ *
+ *  $Id$
+ *
+ *  @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACE_Hash_Multi_Map_Manager_T_CPP
 #define ACE_Hash_Multi_Map_Manager_T_CPP
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp
index 7bfd15db279..832da28c8ca 100644
--- a/ACE/ace/High_Res_Timer.cpp
+++ b/ACE/ace/High_Res_Timer.cpp
@@ -20,6 +20,7 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdlib.h"
+#include "ace/Truncate.h"
 
 ACE_RCSID(ace, High_Res_Timer, "$Id$")
 
@@ -195,7 +196,7 @@ ACE_High_Res_Timer::global_scale_factor (void)
      defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \
     !defined (ACE_HAS_HI_RES_TIMER) && \
     ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     defined (ghs) || defined (__GNUG__) || defined (__KCC) || \
+     defined (ghs) || defined (__GNUG__) || \
      defined (__INTEL_COMPILER))
   // Check if the global scale factor needs to be set, and do if so.
   if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
@@ -285,7 +286,7 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
         ACE_OS::gettimeofday () - actual_start;
 
       // Store the sample.
-      delta_hrtime.sample (ACE_HRTIME_CONVERSION (stop - start));
+      delta_hrtime.sample (ACE_Utils::truncate_cast<ACE_INT32> (stop - start));
       actual_sleeps.sample (actual_delta.msec () * 100u);
     }
 
@@ -327,18 +328,18 @@ ACE_High_Res_Timer::dump (void) const
              start_incr_.hi (), start_incr_.lo ()));
 #else  /* ! ACE_LACKS_LONGLONG_T */
   ACE_DEBUG ((LM_DEBUG,
-             ACE_LIB_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n")
-             ACE_LIB_TEXT ("end_.hi ():       %8x; end_.lo ():        %8x;\n")
-             ACE_LIB_TEXT ("total_.hi ():     %8x; total_.lo ():      %8x;\n")
-             ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
-             ACE_CU64_TO_CU32 (start_ >> 32),
-             ACE_CU64_TO_CU32 (start_ & 0xfffffffful),
-             ACE_CU64_TO_CU32 (end_ >> 32),
-             ACE_CU64_TO_CU32 (end_ & 0xfffffffful),
-             ACE_CU64_TO_CU32 (total_ >> 32),
-             ACE_CU64_TO_CU32 (total_ & 0xfffffffful),
-             ACE_CU64_TO_CU32 (start_incr_ >> 32),
-             ACE_CU64_TO_CU32 (start_incr_ & 0xfffffffful)));
+              ACE_LIB_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n")
+              ACE_LIB_TEXT ("end_.hi ():       %8x; end_.lo ():        %8x;\n")
+              ACE_LIB_TEXT ("total_.hi ():     %8x; total_.lo ():      %8x;\n")
+              ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
+              static_cast<ACE_UINT32> (start_ >> 32),
+              static_cast<ACE_UINT32> (start_ & 0xfffffffful),
+              static_cast<ACE_UINT32> (end_ >> 32),
+              static_cast<ACE_UINT32> (end_ & 0xfffffffful),
+              static_cast<ACE_UINT32> (total_ >> 32),
+              static_cast<ACE_UINT32> (total_ & 0xfffffffful),
+              static_cast<ACE_UINT32> (start_incr_ >> 32),
+              static_cast<ACE_UINT32> (start_incr_ & 0xfffffffful)));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
@@ -405,13 +406,8 @@ ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanoseconds) const
   // designed and tested to avoid overflow on machines that don't have
   // native 64-bit ints. In particular, division can be a problem.
   // For more background on this, please see bugzilla #1024.
-#if defined (ACE_WIN32)
-  nanoseconds = ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_)
-            * (1024000000u / ACE_High_Res_Timer::global_scale_factor());
-#else
   nanoseconds = ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_)
             * (1024000u / ACE_High_Res_Timer::global_scale_factor ());
-#endif /* ACE_WIN32 */
   // Caution - Borland has a problem with >>=, so resist the temptation.
   nanoseconds = nanoseconds >> 10;
   // Right shift is implemented for non native 64-bit ints
@@ -422,13 +418,8 @@ void
 ACE_High_Res_Timer::elapsed_time_incr (ACE_hrtime_t &nanoseconds) const
 {
   // Same as above.
-#if defined (ACE_WIN32)
-  nanoseconds = this->total_
-            * (1024000000u / ACE_High_Res_Timer::global_scale_factor());
-#else
   nanoseconds = this->total_
             * (1024000u / ACE_High_Res_Timer::global_scale_factor ());
-#endif
   // Caution - Borland has a problem with >>=, so resist the temptation.
   nanoseconds = nanoseconds >> 10;
 }
diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h
index 9fdbf87cf89..831236f1642 100644
--- a/ACE/ace/High_Res_Timer.h
+++ b/ACE/ace/High_Res_Timer.h
@@ -120,16 +120,9 @@ public:
   /// Returns the global_scale_factor.
   static ACE_UINT32 global_scale_factor (void);
 
-  // On Win32, QueryPerformanceFrequency is used as a base for the global
-  // scale factor. The value this returns is often too small to be usefully
-  // converted to "ticks"/second - it loses unacceptably high levels of
-  // precision. So on Win32, global_scale_factor_ is in ticks/msec, not
-  // ticks/usec as on all others.
-#if defined (ACE_WIN32)
-#  define ACE_HR_SCALE_CONVERSION (ACE_ONE_SECOND_IN_MSECS)
-#else
+#ifndef  ACE_HR_SCALE_CONVERSION
 #  define ACE_HR_SCALE_CONVERSION (ACE_ONE_SECOND_IN_USECS)
-#endif /* ACE_WIN32 */
+#endif /* ACE_HR_SCALE_CONVERSION */
 
   /**
    * Sets the global_scale_factor to the value in the <env>
@@ -257,7 +250,7 @@ public:
   static ACE_Time_Value gettimeofday (const ACE_OS::ACE_HRTimer_Op =
                                         ACE_OS::ACE_HRTIMER_GETTIME);
 
-  /// Converts an <hrt> to <tv> using global_scale_factor_.
+  /// Converts an <hrt> to @a tv using global_scale_factor_.
   static void hrtime_to_tv (ACE_Time_Value &tv,
                             const ACE_hrtime_t hrt);
 
diff --git a/ACE/ace/High_Res_Timer.inl b/ACE/ace/High_Res_Timer.inl
index 1b37f522439..2d089d1520c 100644
--- a/ACE/ace/High_Res_Timer.inl
+++ b/ACE/ace/High_Res_Timer.inl
@@ -35,22 +35,7 @@ ACE_High_Res_Timer::hrtime_to_tv (ACE_Time_Value &tv,
   //           global_scale_factor
   ACE_hrtime_t tmp = tv.sec ();
   tmp *= ((ACE_UINT32) ACE_HR_SCALE_CONVERSION * global_scale_factor ());
-#if defined (ACE_WIN32)
-  // Win32's scale factor is in ticks/msec, so multiply up to usec.
-  ACE_hrtime_t subsec = hrt - tmp;         // Remainder of ticks < 1sec
-  ACE_UINT32 msec = (ACE_UINT32) (subsec / global_scale_factor ());  // #msec
-  ACE_hrtime_t usec64 = subsec - (msec * global_scale_factor ());
-#  if defined (ACE_LACKS_LONGLONG_T)
-  ACE_UINT32 usec = usec64.lo();
-#  else
-  ACE_UINT32 usec = (ACE_UINT32) usec64;
-#  endif // ACE_LACKS_LONGLONG_T
-  //     (tick * usec/msec) / tick/msec     = usec
-  usec = (usec * 1000)      / (ACE_UINT32) global_scale_factor ();
-  tv.usec ((msec * 1000) + usec);
-#else
   tv.usec ((long) ((hrt - tmp) / global_scale_factor ()));
-#endif
 }
 
 
@@ -157,15 +142,7 @@ ACE_High_Res_Timer::elapsed_microseconds (ACE_hrtime_t &usecs) const
 {
   ACE_hrtime_t elapsed = ACE_High_Res_Timer::elapsed_hrtime (this->end_,
                                                              this->start_);
-#if defined (ACE_WIN32)
-  // Win32 scale factor is in msec
-  // This could give overflow when measuring a long time with a
-  // big global_scale_factor() (> 48 days with a 4Ghz tick freq.)
-  // To be looked after in the future.
-  usecs = (ACE_hrtime_t) ((elapsed * 1000) / global_scale_factor ());
-#else
   usecs = (ACE_hrtime_t) (elapsed / global_scale_factor ());
-#endif
 }
 
 ACE_INLINE void
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index b32fe9ddfb5..6ed1a0b3183 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -124,7 +124,7 @@ ACE_INET_Addr::hash (void) const
 }
 
 ACE_INET_Addr::ACE_INET_Addr (void)
-  : ACE_Addr (this->determine_type (), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   // ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -223,7 +223,7 @@ ACE_INET_Addr::set (const char address[])
 }
 
 ACE_INET_Addr::ACE_INET_Addr (const char address[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -232,7 +232,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char address[])
 
 #if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -456,7 +456,7 @@ ACE_INET_Addr::set (const char port_name[],
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               const char host_name[],
                               int address_family)
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
@@ -474,7 +474,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               const wchar_t host_name[],
                               int address_family)
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
@@ -573,7 +573,7 @@ ACE_INET_Addr::set_addr (void *addr, int /* len */, int map)
 // Creates a ACE_INET_Addr from a sockaddr_in structure.
 
 ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -584,7 +584,7 @@ ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
 
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               ACE_UINT32 inet_address)
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -600,7 +600,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                               const char host_name[],
                               const char protocol[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -615,7 +615,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
                               const wchar_t host_name[],
                               const wchar_t protocol[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -632,7 +632,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
 ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                               ACE_UINT32 inet_address,
                               const char protocol[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
 #if !defined (ACE_LACKS_HTONL)
@@ -653,7 +653,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
                               ACE_UINT32 inet_address,
                               const wchar_t protocol[])
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
 #if !defined (ACE_LACKS_HTONL)
@@ -905,7 +905,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
                               sizeof (ip6));
               return 0;
             }
-          if (ip4 == INADDR_LOOPBACK)
+
+          // RFC 3330 defines loopback as any address with 127.x.x.x
+          if ((ip4 & 0XFF000000) == (INADDR_LOOPBACK & 0XFF000000))
             {
               in6_addr ip6 = in6addr_loopback;
               ACE_OS::memcpy (&this->inet_addr_.in6_.sin6_addr,
@@ -941,13 +943,6 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
 
       return 0;
     } /* end len == 16 */
-  else
-    {
-      /* unknown or unsupported address length */
-      errno = EAFNOSUPPORT;
-      return -1;
-    }
-
 #endif /* ACE_HAS_IPV6 */
 
   // Here with an unrecognized length.
@@ -1106,7 +1101,6 @@ ACE_INET_Addr::get_ip_address (void) const
     }
 #endif /* ACE_HAS_IPV6 */
   return ACE_NTOHL (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr));
-  return 0;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h
index 9d66e4b5418..e0fdd8c4001 100644
--- a/ACE/ace/INET_Addr.h
+++ b/ACE/ace/INET_Addr.h
@@ -204,7 +204,7 @@ public:
    * If <ipaddr_format> is non-0 this produces "ip-number:port-number"
    * (e.g., "128.252.166.57:1234"), whereas if <ipaddr_format> is 0
    * this produces "ip-name:port-number" (e.g.,
-   * "tango.cs.wustl.edu:1234").  Returns -1 if the <size> of the
+   * "tango.cs.wustl.edu:1234").  Returns -1 if the @a size of the
    * <buffer> is too small, else 0.
    */
   virtual int addr_to_string (ACE_TCHAR buffer[],
@@ -242,7 +242,7 @@ public:
    * <encode> is enabled then <ip_addr> is converted into network
    * byte order, otherwise it is assumed to be in network byte order
    * already and are passed straight through.  The size of the address
-   * is specified in the <len> parameter.
+   * is specified in the @a len parameter.
    * If <map> is non-zero, IPv6 support has been compiled in, and
    * <ip_addr> is an IPv4 address, then this address is set to the IPv4-mapped
    * IPv6 address of it.
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 50b5e5dcdb1..9e40443fade 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -205,7 +205,8 @@ ACE_INET_Addr::is_loopback (void) const
       return IN6_IS_ADDR_LOOPBACK (&this->inet_addr_.in6_.sin6_addr);
 #endif /* ACE_HAS_IPV6 */
 
-  return (this->get_ip_address () == INADDR_LOOPBACK);
+  // RFC 3330 defines loopback as any address with 127.x.x.x
+  return ((this->get_ip_address () & 0XFF000000) == (INADDR_LOOPBACK & 0XFF000000));
 }
 
 // Return @c true if the IP address is IPv4/IPv6 multicast address.
diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h
index 4460ef4be9e..0992bdc131d 100644
--- a/ACE/ace/IOStream_T.h
+++ b/ACE/ace/IOStream_T.h
@@ -133,7 +133,7 @@ public:
   /**
    * Returns 1 if we're at the end of the <STREAM>, i.e., if the
    * connection has closed down or an error has occurred, else 0.
-   * Under the covers, <eof> calls the streambuf's <timeout> function
+   * Under the covers, <eof> calls the streambuf's @a timeout function
    * which will reset the timeout flag.  As as result, you should save
    * the return of <eof> and check it instead of calling <eof>
    * successively.
diff --git a/ACE/ace/IO_SAP.h b/ACE/ace/IO_SAP.h
index d6f4f1bf044..5e2e00b6e5e 100644
--- a/ACE/ace/IO_SAP.h
+++ b/ACE/ace/IO_SAP.h
@@ -51,14 +51,14 @@ public:
   /**
    * Enable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG),
    * non-blocking I/O (ACE_NONBLOCK), or close-on-exec (ACE_CLOEXEC),
-   * which is passed as the <value>.
+   * which is passed as the @a value.
    */
   int enable (int value) const;
 
   /**
    * Disable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG),
    * non-blocking I/O (ACE_NONBLOCK), or close-on-exec (ACE_CLOEXEC),
-   * which is passed as the <value>.
+   * which is passed as the @a value.
    */
   int disable (int value) const;
 
diff --git a/ACE/ace/IPC_SAP.h b/ACE/ace/IPC_SAP.h
index 98aa2bbf450..1fd38007e43 100644
--- a/ACE/ace/IPC_SAP.h
+++ b/ACE/ace/IPC_SAP.h
@@ -41,14 +41,14 @@ public:
   /**
    * Enable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG),
    * non-blocking I/O (ACE_NONBLOCK), or close-on-exec (ACE_CLOEXEC),
-   * which is passed as the <value>.
+   * which is passed as the @a value.
    */
   int enable (int value) const;
 
   /**
    * Disable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG),
    * non-blocking I/O (ACE_NONBLOCK), or close-on-exec (ACE_CLOEXEC),
-   * which is passed as the <value>.
+   * which is passed as the @a value.
    */
   int disable (int value) const;
 
diff --git a/ACE/ace/Intrusive_List.cpp b/ACE/ace/Intrusive_List.cpp
index 4a374c9b045..c0006792ce4 100644
--- a/ACE/ace/Intrusive_List.cpp
+++ b/ACE/ace/Intrusive_List.cpp
@@ -69,7 +69,7 @@ ACE_Intrusive_List<T>::pop_front (void)
   T *node = this->head_;
   if (node == 0)
     return 0;
-  this->remove_i (node);
+  this->unsafe_remove (node);
   return node;
 }
 
@@ -79,7 +79,7 @@ ACE_Intrusive_List<T>::pop_back (void)
   T *node = this->tail_;
   if (node == 0)
     return 0;
-  this->remove_i (node);
+  this->unsafe_remove (node);
   return node;
 }
 
@@ -90,14 +90,14 @@ ACE_Intrusive_List<T>::remove (T *node)
     {
       if (node == i)
         {
-          this->remove_i (node);
+          this->unsafe_remove (node);
           return;
         }
     }
 }
 
 template<class T> void
-ACE_Intrusive_List<T>::remove_i (T *node)
+ACE_Intrusive_List<T>::unsafe_remove (T *node)
 {
   if (node->prev () != 0)
     node->prev ()->next (node->next ());
diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h
index 82789110cfa..59d0c9054a8 100644
--- a/ACE/ace/Intrusive_List.h
+++ b/ACE/ace/Intrusive_List.h
@@ -99,14 +99,17 @@ public:
    */
   void remove (T *node);
 
-private:
-  /// Remove a element from the list
+  /// Swap two lists
+  void swap(ACE_Intrusive_List<T> & rhs);
+
+  /// Remove a element from the list without checking
   /**
    * No attempts are performed to check if T* really belongs to the
    * list.  The effects of removing an invalid element are unspecified
    */
-  void remove_i (T *node);
+  void unsafe_remove (T *node);
 
+private:
   /** @name Disallow copying
    *
    */
diff --git a/ACE/ace/Intrusive_List.inl b/ACE/ace/Intrusive_List.inl
index cc3ffc70109..f76370917e9 100644
--- a/ACE/ace/Intrusive_List.inl
+++ b/ACE/ace/Intrusive_List.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+#include <algorithm>
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> ACE_INLINE int
@@ -28,4 +30,11 @@ ACE_Intrusive_List<T>::tail (void) const
   return this->tail_;
 }
 
+template<class T> ACE_INLINE void
+ACE_Intrusive_List<T>::swap(ACE_Intrusive_List<T> & rhs)
+{
+  std::swap(head_, rhs.head_);
+  std::swap(tail_, rhs.tail_);
+}
+
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h
index ae7775d3039..cfca422e8d7 100644
--- a/ACE/ace/LOCK_SOCK_Acceptor.h
+++ b/ACE/ace/LOCK_SOCK_Acceptor.h
@@ -26,7 +26,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class ACE_LOCK_SOCK_Acceptor
  *
- * @brief Specialize <ACE_SOCK_Acceptor> to lock around <accept>;
+ * @brief Specialize ACE_SOCK_Acceptor to lock around <accept>;
  *
  * This class is necessary since some OS platforms (e.g.,
  * Solaris 2.5) do not allow multiple threads/processes to
diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h
index caf22055273..d6862553eb4 100644
--- a/ACE/ace/Local_Memory_Pool.h
+++ b/ACE/ace/Local_Memory_Pool.h
@@ -82,13 +82,13 @@ public:
 
   /**
    * Change the protection of the pages of the mapped region to <prot>
-   * starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
+   * starting at <this->base_addr_> up to @a len bytes.  If @a len == -1
    * then change protection of all pages in the mapped region.
    */
   virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
 
   /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
+  /// starting at <addr> up to @a len bytes.
   virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
 #if defined (ACE_WIN32)
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index dc8dec8d85f..d8317df464c 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -1141,6 +1141,10 @@ ACE_Token_Proxy::name (void) const
   return this->token_->name ();
 }
 
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (push)
+#  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
+#endif
 ACE_Token_Proxy::ACE_Token_Proxy (void)
 : token_ (0),
   waiter_ (this, 0)
@@ -1158,6 +1162,9 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
 {
   ACE_TRACE ("ACE_Token_Proxy::ACE_Token_Proxy");
 }
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (pop)
+#endif
 
 // @@ should I do a mutex_->release ()?
 ACE_Token_Proxy::~ACE_Token_Proxy (void)
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 98042117a80..72cdb2ac399 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -439,7 +439,7 @@ u_long ACE_Log_Msg::flags_ = ACE_Log_Msg::STDERR;
 pid_t ACE_Log_Msg::pid_ = -1;
 
 /// Current offset of msg_[].
-long ACE_Log_Msg::msg_off_ = 0;
+ptrdiff_t ACE_Log_Msg::msg_off_ = 0;
 
 /// Default per-thread priority mask
 /// By default, no priorities are enabled.
@@ -903,6 +903,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
  * Valid Options (prefixed by '%', as in printf format strings) include:
  *   'A': print an ACE_timer_t value
  *   'a': exit the program at this point (var-argument is the exit status!)
+ *   'b': print a ssize_t value
+ *   'B': print a size_t value
  *   'c': print a character
  *   'C': print a character string
  *   'i', 'd': print a decimal number
@@ -933,6 +935,7 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
  *   'W': print out a wide character string.
  *   'z': print an ACE_OS::WChar character
  *   'Z': print an ACE_OS::WChar character string
+ *   ':': print a time_t value as an integral number
  *   '%': format a single percent sign, '%'
  */
 ssize_t
@@ -1494,7 +1497,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 
                 case 'r': // Run (invoke) this subroutine.
                   {
-                    long osave = ACE_Log_Msg::msg_off_;
+                    ptrdiff_t const osave = ACE_Log_Msg::msg_off_;
 
                     if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
                                          ACE_Log_Msg::SILENT) &&
@@ -1925,6 +1928,58 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                    ACE_UPDATE_COUNT (bspace, this_len);
                    break;
 
+                case 'b':
+                  {
+                    const ACE_TCHAR *fmt = ACE_SSIZE_T_FORMAT_SPECIFIER;
+                    ACE_OS::strcpy (fp, &fmt[1]);    // Skip leading %
+                  }
+                  if (can_check)
+                    this_len = ACE_OS::snprintf (bp, bspace,
+                                                 format,
+                                                 va_arg (argp, ssize_t));
+                  else
+                    this_len = ACE_OS::sprintf (bp,
+                                                format,
+                                                va_arg (argp, ssize_t));
+                  ACE_UPDATE_COUNT (bspace, this_len);
+                  break;
+
+                case 'B':
+                  {
+                    const ACE_TCHAR *fmt = ACE_SIZE_T_FORMAT_SPECIFIER;
+                    ACE_OS::strcpy (fp, &fmt[1]);    // Skip leading %
+                  }
+                  if (can_check)
+                    this_len = ACE_OS::snprintf (bp, bspace,
+                                                 format,
+                                                 va_arg (argp, size_t));
+                  else
+                    this_len = ACE_OS::sprintf (bp,
+                                                format,
+                                                va_arg (argp, size_t));
+                  ACE_UPDATE_COUNT (bspace, this_len);
+                  break;
+
+                case ':':
+                  {
+                    // Assume a 32 bit time_t and change if needed.
+                    const ACE_TCHAR *fmt = ACE_LIB_TEXT ("%d");
+                    if (sizeof (time_t) == 8)
+                      fmt = ACE_INT64_FORMAT_SPECIFIER;
+
+                    ACE_OS::strcpy (fp, &fmt[1]);    // Skip leading %
+                  }
+                  if (can_check)
+                    this_len = ACE_OS::snprintf (bp, bspace,
+                                                 format,
+                                                 va_arg (argp, time_t));
+                  else
+                    this_len = ACE_OS::sprintf (bp,
+                                                format,
+                                                va_arg (argp, time_t));
+                  ACE_UPDATE_COUNT (bspace, this_len);
+                  break;
+
                 case '@':
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("p"));
                     if (can_check)
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 7b8a1ecd4b6..5bc62f1e097 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -123,12 +123,12 @@ class ACE_Log_Record;
  *
  * This class is very flexible since it allows formatted error
  * messages to be printed in a thread-safe manner to various
- * locations, such as stdout, stderr, cerr, a distributed logger, etc.
- * The current message is also kept in a thread-specific storage
- * location (threads spawned using ACE_Thread_Manager automatically get
- * an ACE_Log_Msg object that inherits the spawning thread's settings), which
- * can be used to communicate errors between framework methods and
- * callers.  A message is logged by the log() method, only if the
+ * locations, such as stderr, cerr, a distributed logger, etc.  The
+ * current message is also kept in a thread-specific storage location
+ * (threads spawned using ACE_Thread_Manager automatically get an
+ * ACE_Log_Msg object that inherits the spawning thread's settings),
+ * which can be used to communicate errors between framework methods
+ * and callers.  A message is logged by the log() method, only if the
  * message priority is currently enabled.  Moreover, only the current
  * log message is stored here -- it will be overwritten by the
  * subsequent call to log().
@@ -472,6 +472,8 @@ public:
    *  - 'A': print an ACE_timer_t value (which could be either double
    *         or ACE_UINT32.)
    *  - 'a': abort the program at this point abruptly.
+   *  - 'b': print a ssize_t value
+   *  - 'B': print a size_t value
    *  - 'c': print a character
    *  - 'C': print a character string
    *  - 'i', 'd': print a decimal number
@@ -506,6 +508,7 @@ public:
    *  - 'X': print as a hex number
    *  - 'z': print an ACE_OS::WChar character
    *  - 'Z': print an ACE_OS::WChar character string
+   *  - ':': print a time_t value as an integral number
    *  - '%': print out a single percent sign, '%'
    */
   ssize_t log (ACE_Log_Priority priority, const ACE_TCHAR *format, ...);
@@ -647,7 +650,7 @@ private:
   static u_long flags_;
 
   /// Offset of msg_[].
-  static long msg_off_;
+  static ptrdiff_t msg_off_;
 
   /**
    * Number of existing ACE_Log_Msg instances; when 0, delete program/host
diff --git a/ACE/ace/Log_Msg_Backend.h b/ACE/ace/Log_Msg_Backend.h
index 9e872305705..58e6089d8af 100644
--- a/ACE/ace/Log_Msg_Backend.h
+++ b/ACE/ace/Log_Msg_Backend.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/os_include/sys/os_types.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Log_Record;
@@ -57,9 +59,9 @@ public:
   virtual int close (void) = 0;
 
   /// Backend routine.  This is called when we want to log a message.
-  /// Since this routine is pure virtual, it must be overwritten by the
+  /// Since this routine is pure virtual, it must be implemented by the
   /// subclass.
-  virtual int log (ACE_Log_Record &log_record) = 0;
+  virtual ssize_t log (ACE_Log_Record &log_record) = 0;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index ca213f1580b..6c80dce2297 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -43,18 +43,19 @@ ACE_Log_Msg_IPC::close (void)
   return this->message_queue_.close ();
 }
 
-int
+ssize_t
 ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record)
 {
   // Serialize the log record using a CDR stream, allocate enough
   // space for the complete <ACE_Log_Record>.
-  const size_t max_payload_size =
-    4 // type()
-    + 8 // timestamp
-    + 4 // process id
-    + 4 // data length
-    + ACE_Log_Record::MAXLOGMSGLEN // data
-    + ACE_CDR::MAX_ALIGNMENT; // padding;
+  size_t max_payload_size =
+    4    // type
+    + 4  // pid
+    + 12 // timestamp
+    + 4  // process id
+    + 4  // data length
+    + log_record.msg_data_len ()  // message
+    + ACE_CDR::MAX_ALIGNMENT;     // padding;
 
   // Insert contents of <log_record> into payload stream.
   ACE_OutputCDR payload (max_payload_size);
diff --git a/ACE/ace/Log_Msg_IPC.h b/ACE/ace/Log_Msg_IPC.h
index b50b04c05ce..80865ccda02 100644
--- a/ACE/ace/Log_Msg_IPC.h
+++ b/ACE/ace/Log_Msg_IPC.h
@@ -59,7 +59,7 @@ public:
   virtual int open (const ACE_TCHAR *logger_key);
   virtual int reset (void);
   virtual int close (void);
-  virtual int log (ACE_Log_Record &log_record);
+  virtual ssize_t log (ACE_Log_Record &log_record);
 
 private:
   ACE_LOG_MSG_IPC_STREAM message_queue_;
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp
index fc1844a81ce..a78bf9c58e0 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp
@@ -99,7 +99,7 @@ ACE_Log_Msg_NT_Event_Log::close (void)
     return -1;
 }
 
-int
+ssize_t
 ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
 {
   // Make a copy of the log text and replace any newlines with
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.h b/ACE/ace/Log_Msg_NT_Event_Log.h
index 7b953e1cc0c..4bca6adaa20 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.h
+++ b/ACE/ace/Log_Msg_NT_Event_Log.h
@@ -58,7 +58,7 @@ public:
   virtual int close (void);
 
   /// This is called when we want to log a message.
-  virtual int log (ACE_Log_Record &log_record);
+  virtual ssize_t log (ACE_Log_Record &log_record);
 
 private:
   HANDLE evlog_handle_;
diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.cpp b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
index 23b90ef3c34..265c24db71e 100644
--- a/ACE/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
@@ -79,7 +79,7 @@ ACE_Log_Msg_UNIX_Syslog::close (void)
   return 0;
 }
 
-int
+ssize_t
 ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record)
 {
   int syslog_priority = this->convert_log_priority (log_record.type ());
diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.h b/ACE/ace/Log_Msg_UNIX_Syslog.h
index f6ce18af310..01d5476360d 100644
--- a/ACE/ace/Log_Msg_UNIX_Syslog.h
+++ b/ACE/ace/Log_Msg_UNIX_Syslog.h
@@ -58,7 +58,7 @@ public:
   virtual int close (void);
 
   /// This is called when we want to log a message.
-  virtual int log (ACE_Log_Record &log_record);
+  virtual ssize_t log (ACE_Log_Record &log_record);
 
 private:
   /// Convert an ACE_Log_Priority value to the corresponding syslog priority.
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index a78e258aff8..1d6aea09359 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -8,6 +8,7 @@
 #include "ace/OS_NS_time.h"
 #include "ace/CDR_Stream.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/Truncate.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ace/Log_Record.inl"
@@ -110,11 +111,13 @@ ACE_Log_Record::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("length_ = %d\n"), this->length_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntype_ = %u\n"), this->type_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%d, %d)\n"), this->secs_, this->usecs_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%:, %d)\n"),
+              this->secs_, this->usecs_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %u\n"), this->pid_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_ (0x%@) = %s\n"),
               this->msg_data_, this->msg_data_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_size_ = ") ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n"), this->msg_data_size_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_size_ = %B\n"),
+              this->msg_data_size_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
@@ -138,7 +141,7 @@ ACE_Log_Record::msg_data (const ACE_TCHAR *data)
 }
 
 ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
-                                long ts_sec,
+                                time_t ts_sec,
                                 long p)
   : length_ (0),
     type_ (ACE_UINT32 (lp)),
@@ -162,7 +165,7 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
                                 long p)
   : length_ (0),
     type_ (ACE_UINT32 (lp)),
-    secs_ ((ACE_UINT32) ts.sec ()),
+    secs_ (ts.sec ()),
     usecs_ ((ACE_UINT32) ts.usec ()),
     pid_ (ACE_UINT32 (p)),
     msg_data_ (0),
@@ -321,17 +324,21 @@ int
 operator<< (ACE_OutputCDR &cdr,
             const ACE_Log_Record &log_record)
 {
-  size_t msglen = log_record.msg_data_len ();
+  // The written message length can't be more than 32 bits (ACE_CDR::ULong)
+  // so reduce it here if needed.
+  ACE_CDR::ULong u_msglen =
+    ACE_Utils::truncate_cast<ACE_CDR::ULong> (log_record.msg_data_len ());
+
   // Insert each field from <log_record> into the output CDR stream.
   cdr << ACE_CDR::Long (log_record.type ());
   cdr << ACE_CDR::Long (log_record.pid ());
-  cdr << ACE_CDR::Long (log_record.time_stamp ().sec ());
+  cdr << ACE_CDR::LongLong (log_record.time_stamp ().sec ());
   cdr << ACE_CDR::Long (log_record.time_stamp ().usec ());
-  cdr << ACE_CDR::ULong (msglen);
+  cdr << u_msglen;
 #if defined (ACE_USES_WCHAR)
-  cdr.write_wchar_array (log_record.msg_data (), msglen);
+  cdr.write_wchar_array (log_record.msg_data (), u_msglen);
 #else
-  cdr.write_char_array (log_record.msg_data (), msglen);
+  cdr.write_char_array (log_record.msg_data (), u_msglen);
 #endif /* ACE_USES_WCHAR */
   return cdr.good_bit ();
 }
@@ -342,7 +349,8 @@ operator>> (ACE_InputCDR &cdr,
 {
   ACE_CDR::Long type;
   ACE_CDR::Long pid;
-  ACE_CDR::Long sec, usec;
+  ACE_CDR::LongLong sec;
+  ACE_CDR::Long usec;
   ACE_CDR::ULong buffer_len;
 
   // Extract each field from input CDR stream into <log_record>.
@@ -353,7 +361,8 @@ operator>> (ACE_InputCDR &cdr,
     auto_ptr<ACE_TCHAR> log_msg_p (log_msg);
     log_record.type (type);
     log_record.pid (pid);
-    log_record.time_stamp (ACE_Time_Value (sec, usec));
+    log_record.time_stamp (ACE_Time_Value (ACE_Utils::truncate_cast<time_t> (sec),
+                                           usec));
 #if defined (ACE_USES_WCHAR)
     cdr.read_wchar_array (log_msg, buffer_len);
 #else
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index 978f2ade5ae..4b8aa552a62 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -61,7 +61,7 @@ public:
    */
   ACE_Log_Record (void);
   ACE_Log_Record (ACE_Log_Priority lp,
-                  long time_stamp,
+                  time_t time_stamp,
                   long pid);
   ACE_Log_Record (ACE_Log_Priority lp,
                   const ACE_Time_Value &time_stamp,
@@ -106,9 +106,15 @@ public:
 
   // = Marshall/demarshall
   /// Encode the <Log_Record> for transmission on the network.
+  /// @deprecated The encode() and decode() metods are deprecated; please use
+  /// the CDR insertion and extraction operators to properly encode and decode
+  /// ACE_Log_Record objects.
   void encode (void);
 
   /// Decode the <Log_Record> received from the network.
+  /// @deprecated The encode() and decode() metods are deprecated; please use
+  /// the CDR insertion and extraction operators to properly encode and decode
+  /// ACE_Log_Record objects.
   void decode (void);
 
   // = Set/get methods
@@ -184,7 +190,7 @@ private:
   ACE_UINT32 type_;
 
   /// Time that the logging record was generated.
-  ACE_UINT32 secs_;
+  time_t secs_;
   ACE_UINT32 usecs_;
 
   /// Id of process that generated the logging record.
diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl
index 5824a038373..aba217d93ef 100644
--- a/ACE/ace/Log_Record.inl
+++ b/ACE/ace/Log_Record.inl
@@ -13,7 +13,7 @@ ACE_INLINE
 ACE_Log_Record::~ACE_Log_Record (void)
 {
   if (this->msg_data_)
-    delete[] this->msg_data_;
+    delete [] this->msg_data_;
 }
 
 ACE_INLINE void
@@ -25,7 +25,9 @@ ACE_Log_Record::encode (void)
   this->type_ = htonl (this->type_);
   // Make sure we don't enclose the sec() and usec() fields until
   // they've been normalized.
-  this->secs_ = htonl (this->secs_);
+  // secs_ is commented out because it can be 64 bits. This method is
+  // deprecated; use the CDR operations instead.
+  //  this->secs_ = htonl (this->secs_);
   this->usecs_ = htonl (this->usecs_);
   this->pid_ = htonl (this->pid_);
 #endif /* ACE_LACKS_HTONL */
@@ -36,7 +38,7 @@ ACE_Log_Record::decode (void)
 {
   ACE_TRACE ("ACE_Log_Record::decode");
 #if !defined (ACE_LACKS_NTOHL)
-  ACE_Time_Value tv (ntohl (this->secs_),
+  ACE_Time_Value tv (this->secs_,
                      ntohl (this->usecs_));
 
   this->secs_ = tv.sec ();
@@ -79,14 +81,14 @@ ACE_INLINE ACE_Time_Value
 ACE_Log_Record::time_stamp (void) const
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
-  return ACE_Time_Value ((long) this->secs_, (long) this->usecs_);
+  return ACE_Time_Value (this->secs_, (long) this->usecs_);
 }
 
 ACE_INLINE void
 ACE_Log_Record::time_stamp (const ACE_Time_Value &ts)
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
-  this->secs_ = (ACE_UINT32) ts.sec ();
+  this->secs_ = ts.sec ();
   this->usecs_ = (ACE_UINT32) ts.usec ();
 }
 
diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h
index 9f3cd67a05a..687c421443c 100644
--- a/ACE/ace/MEM_Addr.h
+++ b/ACE/ace/MEM_Addr.h
@@ -68,8 +68,7 @@ public:
    * otherwise it is assumed to be in network byte order already and
    * are passed straight through.
    */
-  int set (u_short port_number,
-           int encode = 1);
+  int set (u_short port_number, int encode = 1);
 
   /// Uses <getservbyname> to initialize an ACE_MEM_Addr from a
   /// <port_name>, the remote <host_name>, and the <protocol>.
diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h
index f294de2a94d..79d63f8bd5d 100644
--- a/ACE/ace/MEM_IO.h
+++ b/ACE/ace/MEM_IO.h
@@ -59,7 +59,7 @@ public:
                             const ACE_Time_Value *timeout);
 
   /**
-   * Wait to to <timeout> amount of time to send <buf>.  If <send>
+   * Wait to to @a timeout amount of time to send @a buf.  If <send>
    * times out a -1 is returned with <errno == ETIME>.  If it succeeds
    * the number of bytes sent is returned.  */
   virtual ssize_t send_buf (ACE_MEM_SAP_Node *buf,
@@ -67,8 +67,8 @@ public:
                             const ACE_Time_Value *timeout);
 
   /**
-   * Convert the buffer offset <off> to absolute address to <buf>.
-   * Return the size of valid information containing in the <buf>,
+   * Convert the buffer offset <off> to absolute address to @a buf.
+   * Return the size of valid information containing in the @a buf,
    * -1 if <shm_malloc_> is not initialized.
    */
   ssize_t get_buf_len (const ACE_OFF_T off, ACE_MEM_SAP_Node *&buf);
@@ -121,14 +121,14 @@ public:
   /**
    * Fetch location of next available data into <recv_buffer_>.
    * As this operation read the address of the data off the socket
-   * using ACE::recv, <timeout> only applies to ACE::recv.
+   * using ACE::recv, @a timeout only applies to ACE::recv.
    */
   virtual ssize_t recv_buf (ACE_MEM_SAP_Node *&buf,
                             int flags,
                             const ACE_Time_Value *timeout);
 
   /**
-   * Wait to to <timeout> amount of time to send <buf>.  If <send>
+   * Wait to to @a timeout amount of time to send @a buf.  If <send>
    * times out a -1 is returned with <errno == ETIME>.  If it succeeds
    * the number of bytes sent is returned.  */
   virtual ssize_t send_buf (ACE_MEM_SAP_Node *buf,
@@ -196,29 +196,29 @@ public:
    */
   int fini (void);
 
-  /// Send an <n> byte buffer to the other process using shm_malloc_
+  /// Send an @a n byte buffer to the other process using shm_malloc_
   /// connected thru the socket.
   ssize_t send (const void *buf,
                 size_t n,
                 int flags) ;
 
-  /// Recv an <n> byte buffer from the shm_malloc_ thru connected socket.
+  /// Recv an @a n byte buffer from the shm_malloc_ thru connected socket.
   ssize_t recv (void *buf,
                 size_t n,
                 int flags) ;
 
-  /// Send an <n> byte buffer to the other process using shm_malloc_
+  /// Send an @a n byte buffer to the other process using shm_malloc_
   /// connected thru the socket.
   ssize_t send (const void *buf,
                 size_t n) ;
 
-  /// Recv an <n> byte buffer from the shm_malloc_ thru connected socket.
+  /// Recv an @a n byte buffer from the shm_malloc_ thru connected socket.
   ssize_t recv (void *buf,
                 size_t n) ;
 
   /**
-   * Wait to to <timeout> amount of time to send up to <n> bytes into
-   * <buf> from <handle> (uses the <send> call).  If <send> times out
+   * Wait to to @a timeout amount of time to send up to @a n bytes into
+   * @a buf from <handle> (uses the <send> call).  If <send> times out
    * a -1 is returned with <errno == ETIME>.  If it succeeds the
    * number of bytes sent is returned.
    */
@@ -227,8 +227,8 @@ public:
                 const ACE_Time_Value *timeout);
 
   /**
-   * Wait to to <timeout> amount of time to send up to <n> bytes into
-   * <buf> from <handle> (uses the <send> call).  If <send> times out
+   * Wait to to @a timeout amount of time to send up to @a n bytes into
+   * @a buf from <handle> (uses the <send> call).  If <send> times out
    * a -1 is returned with <errno == ETIME>.  If it succeeds the
    * number of bytes sent is returned.
    */
@@ -238,7 +238,7 @@ public:
                 const ACE_Time_Value *timeout);
 
   /**
-   * Wait to to <timeout> amount of time to send the <message_block>.
+   * Wait to to @a timeout amount of time to send the <message_block>.
    * If <send> times out a -1 is returned with <errno == ETIME>.  If
    * it succeeds the number of bytes sent is returned.
    */
@@ -246,8 +246,8 @@ public:
                 const ACE_Time_Value *timeout);
 
   /**
-   * Wait up to <timeout> amount of time to receive up to <n> bytes
-   * into <buf> from <handle> (uses the <recv> call).  If <recv> times
+   * Wait up to @a timeout amount of time to receive up to @a n bytes
+   * into @a buf from <handle> (uses the <recv> call).  If <recv> times
    * out a -1 is returned with <errno == ETIME>.  If it succeeds the
    * number of bytes received is returned.
    */
@@ -256,8 +256,8 @@ public:
                 const ACE_Time_Value *timeout);
 
   /**
-   * Wait up to <timeout> amount of time to receive up to <n> bytes
-   * into <buf> from <handle> (uses the <recv> call).  If <recv> times
+   * Wait up to @a timeout amount of time to receive up to @a n bytes
+   * into @a buf from <handle> (uses the <recv> call).  If <recv> times
    * out a -1 is returned with <errno == ETIME>.  If it succeeds the
    * number of bytes received is returned.
    */
diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h
index 69e8dc9cd5a..f9b8f1c7d8e 100644
--- a/ACE/ace/MEM_SAP.h
+++ b/ACE/ace/MEM_SAP.h
@@ -110,18 +110,18 @@ public:
                             const ACE_Time_Value *timeout) = 0;
 
   /**
-   * Wait to to <timeout> amount of time to send <buf>.  If <send>
+   * Wait to to @a timeout amount of time to send @a buf.  If <send>
    * times out a -1 is returned with <errno == ETIME>.  If it succeeds
    * the number of bytes sent is returned.  */
   virtual ssize_t send_buf (ACE_MEM_SAP_Node *buf,
                             int flags,
                             const ACE_Time_Value *timeout) = 0;
 
-  /// request a buffer of size <size>.  Return 0 if the <shm_malloc_> is
+  /// request a buffer of size @a size.  Return 0 if the <shm_malloc_> is
   /// not initialized.
   ACE_MEM_SAP_Node *acquire_buffer (const ssize_t size);
 
-  /// release a buffer pointed by <buf>.  Return -1 if the <shm_malloc_>
+  /// release a buffer pointed by @a buf.  Return -1 if the <shm_malloc_>
   /// is not initialized.
   int release_buffer (ACE_MEM_SAP_Node *buf);
 
diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h
index 6b4ff4cdd41..6bb3e6fa9e7 100644
--- a/ACE/ace/MEM_Stream.h
+++ b/ACE/ace/MEM_Stream.h
@@ -81,10 +81,10 @@ public:
 
 #if 0
   /**
-   * Try to send exactly <len> bytes into <buf> from <handle> (uses
-   * the <send> call).  If <send> blocks for longer than <timeout> the
+   * Try to send exactly @a len bytes into @a buf from <handle> (uses
+   * the <send> call).  If <send> blocks for longer than @a timeout the
    * number of bytes actually sent is returned with <errno == ETIME>.
-   * If a timeout does not occur, <send_n> return <len> (i.e., the
+   * If a timeout does not occur, <send_n> return @a len (i.e., the
    * number of bytes requested to be sent).
    */
   ssize_t send_n (const void *buf,
@@ -93,14 +93,14 @@ public:
                   const ACE_Time_Value *timeout);
 
   /**
-   * Try to recv exactly <len> bytes into <buf> from <handle> (uses
-   * the <ACE::recv_n> call).  The <ACE_Time_Value> indicates how long
-   * to blocking trying to receive.  If <timeout> == 0, the caller
+   * Try to recv exactly @a len bytes into @a buf from <handle> (uses
+   * the <ACE::recv_n> call).  The ACE_Time_Value indicates how long
+   * to blocking trying to receive.  If @a timeout == 0, the caller
    * will block until action is possible, else will wait until the
-   * relative time specified in *<timeout> elapses).  If <recv> blocks
-   * for longer than <timeout> the number of bytes actually read is
+   * relative time specified in *@a timeout elapses).  If <recv> blocks
+   * for longer than @a timeout the number of bytes actually read is
    * returned with <errno == ETIME>.  If a timeout does not occur,
-   * <recv_n> return <len> (i.e., the number of bytes requested to be
+   * <recv_n> return @a len (i.e., the number of bytes requested to be
    * read).
    */
   ssize_t recv_n (void *buf,
@@ -109,14 +109,14 @@ public:
                   const ACE_Time_Value *timeout);
 
   /**
-   * Send an <iovec> of size <n> to the connected socket (uses
+   * Send an <iovec> of size @a n to the connected socket (uses
    * <ACE::sendv_n>).  Will block until all bytes are sent or an error
    * occurs.
    */
   ssize_t sendv_n (const iovec iov[],
                    size_t n) const;
 
-  /// Receive an <iovec> of size <n> to the connected socket.
+  /// Receive an <iovec> of size @a n to the connected socket.
   ssize_t recvv_n (iovec iov[],
                    size_t n) const;
 #endif /* 0 */
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index 2be726393e4..020468f0936 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -63,7 +63,7 @@ ACE_MMAP_Memory_Pool::sync (int flags)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::sync");
 
-  size_t const len = ACE_Utils::Truncate<size_t> (
+  size_t const len = ACE_Utils::truncate_cast<size_t> (
     ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END));
 
   return this->mmap_.sync (len, flags);
@@ -96,7 +96,7 @@ ACE_MMAP_Memory_Pool::protect (int prot)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::protect");
 
-  size_t const len = ACE_Utils::Truncate<size_t> (
+  size_t const len = ACE_Utils::truncate_cast<size_t> (
     ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END));
 
   return this->mmap_.protect (len, prot);
@@ -229,7 +229,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
        cur_block += seek_len)
     {
       map_size =
-        ACE_Utils::Truncate<size_t> (
+        ACE_Utils::truncate_cast<size_t> (
           ACE_OS::lseek (this->mmap_.handle (),
                          static_cast<ACE_OFF_T> (seek_len - 1),
                          SEEK_END));
@@ -418,7 +418,7 @@ ACE_MMAP_Memory_Pool::remap (void *addr)
   ACE_TRACE ("ACE_MMAP_Memory_Pool::remap");
   //  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("Remapping with fault address at: %X\n"), addr));
   size_t const current_map_size =
-    ACE_Utils::Truncate<size_t> (ACE_OS::filesize (this->mmap_.handle ()));
+    ACE_Utils::truncate_cast<size_t> (ACE_OS::filesize (this->mmap_.handle ()));
   // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END);
 
   if (!(addr < (void *) ((char *) this->mmap_.addr () + current_map_size)
@@ -470,9 +470,10 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
 {
   if (signum != SIGSEGV)
     return -1;
+#if 0
   else
-    ; // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum));
-
+    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum));
+#endif
   // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size));
 
 #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)
@@ -501,7 +502,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
     {
       // Check if the current mapping is up to date.
       size_t const current_map_size =
-        ACE_Utils::Truncate<size_t> (ACE_OS::filesize (this->mmap_.handle ()));
+        ACE_Utils::truncate_cast<size_t> (ACE_OS::filesize (this->mmap_.handle ()));
 
       if (static_cast<size_t> (current_map_size) == this->mmap_.size ())
         {
diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h
index 5b9cc3f3186..aac103f1728 100644
--- a/ACE/ace/MMAP_Memory_Pool.h
+++ b/ACE/ace/MMAP_Memory_Pool.h
@@ -166,15 +166,15 @@ public:
 
   /// Sync the memory region to the backing store starting at
   /// @c this->base_addr_.  Will sync as much as the backing file
-  /// allows. 
+  /// allows.
   virtual int sync (int flags = MS_SYNC);
-  
+
   /// Sync the memory region to the backing store starting at @a addr.
   virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
 
   /**
    * Change the protection of the pages of the mapped region to <prot>
-   * starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
+   * starting at <this->base_addr_> up to @a len bytes.  If @a len == -1
    * then change protection of all pages in the mapped region.
    */
   virtual int protect (size_t len, int prot = PROT_RDWR);
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 955b88be851..00d2a4e3aa2 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -166,6 +166,7 @@ libACE_la_SOURCES = \
   Naming_Context.cpp \
   Netlink_Addr.cpp \
   Notification_Strategy.cpp \
+  Notification_Queue.cpp \
   OS_Errno.cpp \
   OS_Log_Msg_Attributes.cpp \
   OS_NS_Thread.cpp \
@@ -307,7 +308,6 @@ libACE_la_SOURCES = \
   Thread_Manager.cpp \
   Thread_Mutex.cpp \
   Thread_Semaphore.cpp \
-  Time_Request_Reply.cpp \
   Time_Value.cpp \
   Timeprobe.cpp \
   Timer_Hash.cpp \
@@ -700,6 +700,8 @@ nobase_include_HEADERS += \
   Node.h \
   Notification_Strategy.h \
   Notification_Strategy.inl \
+  Notification_Queue.h \
+  Notification_Queue.inl \
   Null_Barrier.h \
   Null_Condition.h \
   Null_Mutex.h \
@@ -970,8 +972,6 @@ nobase_include_HEADERS += \
   Svc_Conf_Tokens.h \
   Svc_Handler.cpp \
   Svc_Handler.h \
-  Swap.h \
-  Swap.inl \
   Synch.h \
   Synch_Options.h \
   Synch_T.cpp \
@@ -1016,7 +1016,6 @@ nobase_include_HEADERS += \
   Thread_Mutex.inl \
   Thread_Semaphore.h \
   Thread_Semaphore.inl \
-  Time_Request_Reply.h \
   Time_Value.h \
   Time_Value.inl \
   Timeprobe.h \
@@ -1096,6 +1095,7 @@ nobase_include_HEADERS += \
   XTI_ATM_Mcast.inl \
   ace_wchar.h \
   ace_wchar.inl \
+  checked_iterator.h \
   config-WinCE.h \
   config-all.h \
   config-borland-common.h \
diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h
index 0104acdda4b..eb992bdd26a 100644
--- a/ACE/ace/Malloc_Base.h
+++ b/ACE/ace/Malloc_Base.h
@@ -135,13 +135,13 @@ public:
 
   /**
    * Change the protection of the pages of the mapped region to <prot>
-   * starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
+   * starting at <this->base_addr_> up to @a len bytes.  If @a len == -1
    * then change protection of all pages in the mapped region.
    */
   virtual int protect (ssize_t len = -1, int prot = PROT_RDWR) = 0;
 
   /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
+  /// starting at <addr> up to @a len bytes.
   virtual int protect (void *addr, size_type len, int prot = PROT_RDWR) = 0;
 
 #if defined (ACE_HAS_MALLOC_STATS)
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index 2c3f800c6bc..0e34d6b30c7 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -180,7 +180,7 @@ public:
   /**
    * Reassociate @a ext_id with @a int_id.  If @a ext_id is not in the
    * map then behaves just like bind().  Otherwise, store the old
-   * values of <ext_id> and <int_id> into the "out" parameters and
+   * values of @a ext_id and @a int_id into the "out" parameters and
    * rebind the new parameters.  This is very useful if you need to
    * have an atomic way of updating <Map_Entries> and you also need
    * full control over memory allocation.
@@ -194,9 +194,9 @@ public:
               INT_ID &old_int_id);
 
   /**
-   * Reassociate @a ext_id with @a int_id.  If <ext_id> is not in the
+   * Reassociate @a ext_id with @a int_id.  If @a ext_id is not in the
    * map then behaves just like <bind>.  Otherwise, store the old
-   * values of <int_id> into the "out" parameter and rebind the new
+   * values of @a int_id into the "out" parameter and rebind the new
    * parameters.
    * @retval 0 If a new entry is bound successfully.
    * @retval 1 If an existing entry was rebound.
@@ -212,8 +212,8 @@ public:
               const INT_ID &int_id);
 
   /**
-   * Associate <ext_id> with <int_id> if and only if <ext_id> is not
-   * in the map.  If <ext_id> is already in the map then the <int_id>
+   * Associate @a ext_id with @a int_id if and only if @a ext_id is not
+   * in the map.  If @a ext_id is already in the map then the @a int_id
    * parameter is overwritten with the existing value in the map
    * @retval 0 If a new entry is bound successfully.
    * @retval 1 If an attempt is made to bind an existing entry.
@@ -223,26 +223,26 @@ public:
                INT_ID &int_id);
 
   /**
-   * Locate <ext_id> and pass out parameter via <int_id>.
+   * Locate @a ext_id and pass out parameter via @a int_id.
    * @retval 0 If found.
    * @retval -1 If not found.
    */
   int find (const EXT_ID &ext_id,
             INT_ID &int_id) const;
 
-  /// Returns 0 if the <ext_id> is in the mapping, otherwise -1.
+  /// Returns 0 if the @a ext_id is in the mapping, otherwise -1.
   int find (const EXT_ID &ext_id) const;
 
   /**
-   * Unbind (remove) the <ext_id> from the map.  Don't return the
-   * <int_id> to the caller (this is useful for collections where the
-   * <int_id>s are *not* dynamically allocated...)  Returns 0 if
+   * Unbind (remove) the @a ext_id from the map.  Don't return the
+   * @a int_id to the caller (this is useful for collections where the
+   * @a int_ids are *not* dynamically allocated...)  Returns 0 if
    * successful, else -1.
    */
   int unbind (const EXT_ID &ext_id);
 
   /**
-   * Break any association of <ext_id>.  Returns the value of <int_id>
+   * Break any association of @a ext_id.  Returns the value of @a int_id
    * in case the caller needs to deallocate memory.  Returns 0 if
    * successful, else -1.
    */
@@ -293,7 +293,7 @@ protected:
   // These methods assume that the locks are held by the private
   // methods.
 
-  /// Performs the binding of <ext_id> to <int_id>.  Must be called
+  /// Performs the binding of @a ext_id to @a int_id.  Must be called
   /// with locks held.
   int bind_i (const EXT_ID &ext_id,
               const INT_ID &int_id);
@@ -303,49 +303,49 @@ protected:
   int shared_bind (const EXT_ID &ext_id,
                    const INT_ID &int_id);
 
-  /// Performs a rebinding of <ext_it> to <int_id>.  Also, recovers old
+  /// Performs a rebinding of <ext_it> to @a int_id.  Also, recovers old
   /// values.  Must be called with locks held.
   int rebind_i (const EXT_ID &ext_id,
                 const INT_ID &int_id,
                 EXT_ID &old_ext_id,
                 INT_ID &old_int_id);
 
-  /// Performs a rebinding of <ext_it> to <int_id>.  Also, recovers old
+  /// Performs a rebinding of <ext_it> to @a int_id.  Also, recovers old
   /// values.  Must be called with locks held.
   int rebind_i (const EXT_ID &ext_id,
                 const INT_ID &int_id,
                 INT_ID &old_int_id);
 
-  /// Performs a rebinding of <ext_it> to <int_id>.  Must be called
+  /// Performs a rebinding of <ext_it> to @a int_id.  Must be called
   /// with locks held.
   int rebind_i (const EXT_ID &ext_id,
                 const INT_ID &int_id);
 
-  /// Performs a conditional bind of <int_id> using <ext_id> as the
+  /// Performs a conditional bind of @a int_id using @a ext_id as the
   /// key.  Must be called with locks held.
   int trybind_i (const EXT_ID &ext_id,
                  INT_ID &int_id);
 
-  /// Performs a find of <int_id> using <ext_id> as the key.  Must be
+  /// Performs a find of @a int_id using @a ext_id as the key.  Must be
   /// called with locks held.
   int find_i (const EXT_ID &ext_id,
               INT_ID &int_id);
 
-  /// Performs a find using <ext_id> as the key.  Must be called with
+  /// Performs a find using @a ext_id as the key.  Must be called with
   /// locks held.
   int find_and_return_index (const EXT_ID &ext_id,
                              ACE_UINT32 &slot);
 
-  /// Performs an unbind of <int_id> using <ext_id> as the key.  Must
+  /// Performs an unbind of @a int_id using @a ext_id as the key.  Must
   /// be called with locks held.
   int unbind_i (const EXT_ID &ext_id,
                 INT_ID &int_id);
 
-  /// Performs an unbind using <ext_id> as the key.  Must be called
+  /// Performs an unbind using @a ext_id as the key.  Must be called
   /// with locks held.
   int unbind_i (const EXT_ID &ext_id);
 
-  /// Performs an unbind using <ext_id> as the key.  Must be called
+  /// Performs an unbind using @a ext_id as the key.  Must be called
   /// with locks held.
   int unbind_and_return_index (const EXT_ID &ext_id,
                                ACE_UINT32 &slot);
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index a3718734763..bf9a19c4949 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -281,7 +281,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend (void)
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator_Base (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm)
   : map_man_ (&mm),
-    next_ (this->map_man_->occupied_list_id ())
+    next_ (map_man_->occupied_list_id ())
 {
 }
 
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h
index 3f4e14cf70d..2dd8f0b0f60 100644
--- a/ACE/ace/Map_T.h
+++ b/ACE/ace/Map_T.h
@@ -283,7 +283,7 @@ public:
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Map (void);
 
-  /// Initialize a <Map> with size <length>.
+  /// Initialize a map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0) = 0;
 
@@ -291,16 +291,16 @@ public:
   virtual int close (void) = 0;
 
   /**
-   * Add <key>/<value> pair to the map.  If <key> is already in the
+   * Add @a key / @a value pair to the map.  If @a key is already in the
    * map then no changes are made and 1 is returned.  Returns 0 on a
    * successful addition.  This function fails for maps that do not
-   * allow user specified keys. <key> is an "in" parameter.
+   * allow user specified keys. @a key is an "in" parameter.
    */
   virtual int bind (const KEY &key,
                     const VALUE &value) = 0;
 
   /**
-   * Add <key>/<value> pair to the map.  <key> is an "inout" parameter
+   * Add @a key / @a value pair to the map.  @a key is an "inout" parameter
    * and maybe modified/extended by the map to add additional
    * information.  To recover original key, call the <recover_key>
    * method.
@@ -309,9 +309,9 @@ public:
                                KEY &key) = 0;
 
   /**
-   * Produce a key and return it through <key> which is an "out"
+   * Produce a key and return it through @a key which is an "out"
    * parameter.  For maps that do not naturally produce keys, the map
-   * adapters will use the <KEY_GENERATOR> class to produce a key.
+   * adapters will use the @c KEY_GENERATOR class to produce a key.
    * However, the users are responsible for not jeopardizing this key
    * production scheme by using user specified keys with keys produced
    * by the key generator.
@@ -319,10 +319,10 @@ public:
   virtual int create_key (KEY &key) = 0;
 
   /**
-   * Add <value> to the map, and the corresponding key produced by the
-   * Map is returned through <key> which is an "out" parameter.  For
+   * Add @a value to the map, and the corresponding key produced by the
+   * Map is returned through @a key which is an "out" parameter.  For
    * maps that do not naturally produce keys, the map adapters will
-   * use the <KEY_GENERATOR> class to produce a key.  However, the
+   * use the @c KEY_GENERATOR class to produce a key.  However, the
    * users are responsible for not jeopardizing this key production
    * scheme by using user specified keys with keys produced by the key
    * generator.
@@ -331,10 +331,10 @@ public:
                                KEY &key) = 0;
 
   /**
-   * Add <value> to the map.  The user does not care about the
+   * Add @a value to the map.  The user does not care about the
    * corresponding key produced by the Map. For maps that do not
    * naturally produce keys, the map adapters will use the
-   * <KEY_GENERATOR> class to produce a key.  However, the users are
+   * @c KEY_GENERATOR class to produce a key.  However, the users are
    * responsible for not jeopardizing this key production scheme by
    * using user specified keys with keys produced by the key
    * generator.
@@ -347,31 +347,31 @@ public:
                            KEY &original_key) = 0;
 
   /**
-   * Reassociate <key> with <value>. The function fails if <key> is
+   * Reassociate @a key with @a value. The function fails if @a key is
    * not in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value) = 0;
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value,
                       VALUE &old_value) = 0;
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the map for maps that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the map for maps that do not
    * allow user specified keys.  However, for maps that allow user
-   * specified keys, if the key is not in the map, a new <key>/<value>
+   * specified keys, if the key is not in the map, a new @a key / @a value
    * association is created.
    */
   virtual int rebind (const KEY &key,
@@ -380,28 +380,28 @@ public:
                       VALUE &old_value) = 0;
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * map.  If <key> is already in the map, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * map.  If @a key is already in the map, then the @a value parameter
    * is overwritten with the existing value in the map. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
   virtual int trybind (const KEY &key,
                        VALUE &value) = 0;
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   virtual int find (const KEY &key,
                     VALUE &value) = 0;
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   virtual int find (const KEY &key) = 0;
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   virtual int unbind (const KEY &key) = 0;
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   virtual int unbind (const KEY &key,
                       VALUE &value) = 0;
 
@@ -561,7 +561,7 @@ public:
   /// Initialize with the <ACE_DEFAULT_MAP_SIZE>.
   ACE_Map_Impl (ACE_Allocator *alloc = 0);
 
-  /// Initialize with <size> entries.  The <size> parameter is ignored
+  /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Map_Impl (size_t size,
                 ACE_Allocator *alloc = 0);
@@ -569,7 +569,7 @@ public:
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Map_Impl (void);
 
-  /// Initialize a <Map> with size <length>.
+  /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
@@ -577,16 +577,16 @@ public:
   virtual int close (void);
 
   /**
-   * Add <key>/<value> pair to the map.  If <key> is already in the
+   * Add @a key / @a value pair to the map.  If @a key is already in the
    * map then no changes are made and 1 is returned.  Returns 0 on a
    * successful addition.  This function fails for maps that do not
-   * allow user specified keys. <key> is an "in" parameter.
+   * allow user specified keys. @a key is an "in" parameter.
    */
   virtual int bind (const KEY &key,
                     const VALUE &value);
 
   /**
-   * Add <key>/<value> pair to the map.  <key> is an "inout" parameter
+   * Add @a key / @a value pair to the map.  @a key is an "inout" parameter
    * and maybe modified/extended by the map to add additional
    * information.  To recover original key, call the <recover_key>
    * method.
@@ -595,9 +595,9 @@ public:
                                KEY &key);
 
   /**
-   * Produce a key and return it through <key> which is an "out"
+   * Produce a key and return it through @a key which is an "out"
    * parameter.  For maps that do not naturally produce keys, the map
-   * adapters will use the <KEY_GENERATOR> class to produce a key.
+   * adapters will use the @c KEY_GENERATOR class to produce a key.
    * However, the users are responsible for not jeopardizing this key
    * production scheme by using user specified keys with keys produced
    * by the key generator.
@@ -605,10 +605,10 @@ public:
   virtual int create_key (KEY &key);
 
   /**
-   * Add <value> to the map, and the corresponding key produced by the
-   * Map is returned through <key> which is an "out" parameter.  For
+   * Add @a value to the map, and the corresponding key produced by the
+   * Map is returned through @a key which is an "out" parameter.  For
    * maps that do not naturally produce keys, the map adapters will
-   * use the <KEY_GENERATOR> class to produce a key.  However, the
+   * use the @c KEY_GENERATOR class to produce a key.  However, the
    * users are responsible for not jeopardizing this key production
    * scheme by using user specified keys with keys produced by the key
    * generator.
@@ -617,10 +617,10 @@ public:
                                KEY &key);
 
   /**
-   * Add <value> to the map.  The user does not care about the
+   * Add @a value to the map.  The user does not care about the
    * corresponding key produced by the Map. For maps that do not
    * naturally produce keys, the map adapters will use the
-   * <KEY_GENERATOR> class to produce a key.  However, the users are
+   * @c KEY_GENERATOR class to produce a key.  However, the users are
    * responsible for not jeopardizing this key production scheme by
    * using user specified keys with keys produced by the key
    * generator.
@@ -633,31 +633,31 @@ public:
                            KEY &original_key);
 
   /**
-   * Reassociate <key> with <value>. The function fails if <key> is
+   * Reassociate @a key with @a value. The function fails if @a key is
    * not in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value,
                       VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the map for maps that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the map for maps that do not
    * allow user specified keys.  However, for maps that allow user
-   * specified keys, if the key is not in the map, a new <key>/<value>
+   * specified keys, if the key is not in the map, a new @a key / @a value
    * association is created.
    */
   virtual int rebind (const KEY &key,
@@ -666,28 +666,28 @@ public:
                       VALUE &old_value);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * map.  If <key> is already in the map, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * map.  If @a key is already in the map, then the @a value parameter
    * is overwritten with the existing value in the map. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
   virtual int trybind (const KEY &key,
                        VALUE &value);
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   virtual int find (const KEY &key,
                     VALUE &value);
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   virtual int find (const KEY &key);
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   virtual int unbind (const KEY &key);
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   virtual int unbind (const KEY &key,
                       VALUE &value);
 
@@ -843,7 +843,7 @@ public:
   /// Initialize with the <ACE_DEFAULT_MAP_SIZE>.
   ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
 
-  /// Initialize with <size> entries.  The <size> parameter is ignored
+  /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Active_Map_Manager_Adapter (size_t size,
                                   ACE_Allocator *alloc = 0);
@@ -851,7 +851,7 @@ public:
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Active_Map_Manager_Adapter (void);
 
-  /// Initialize a <Map> with size <length>.
+  /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
@@ -859,16 +859,16 @@ public:
   virtual int close (void);
 
   /**
-   * Add <key>/<value> pair to the map.  If <key> is already in the
+   * Add @a key / @a value pair to the map.  If @a key is already in the
    * map then no changes are made and 1 is returned.  Returns 0 on a
    * successful addition.  This function fails for maps that do not
-   * allow user specified keys. <key> is an "in" parameter.
+   * allow user specified keys. @a key is an "in" parameter.
    */
   virtual int bind (const KEY &key,
                     const VALUE &value);
 
   /**
-   * Add <key>/<value> pair to the map.  <key> is an "inout" parameter
+   * Add @a key / @a value pair to the map.  @a key is an "inout" parameter
    * and maybe modified/extended by the map to add additional
    * information.  To recover original key, call the <recover_key>
    * method.
@@ -877,9 +877,9 @@ public:
                                KEY &key);
 
   /**
-   * Produce a key and return it through <key> which is an "out"
+   * Produce a key and return it through @a key which is an "out"
    * parameter.  For maps that do not naturally produce keys, the map
-   * adapters will use the <KEY_GENERATOR> class to produce a key.
+   * adapters will use the @c KEY_GENERATOR class to produce a key.
    * However, the users are responsible for not jeopardizing this key
    * production scheme by using user specified keys with keys produced
    * by the key generator.
@@ -887,10 +887,10 @@ public:
   virtual int create_key (KEY &key);
 
   /**
-   * Add <value> to the map, and the corresponding key produced by the
-   * Map is returned through <key> which is an "out" parameter.  For
+   * Add @a value to the map, and the corresponding key produced by the
+   * Map is returned through @a key which is an "out" parameter.  For
    * maps that do not naturally produce keys, the map adapters will
-   * use the <KEY_GENERATOR> class to produce a key.  However, the
+   * use the @c KEY_GENERATOR class to produce a key.  However, the
    * users are responsible for not jeopardizing this key production
    * scheme by using user specified keys with keys produced by the key
    * generator.
@@ -899,10 +899,10 @@ public:
                                KEY &key);
 
   /**
-   * Add <value> to the map.  The user does not care about the
+   * Add @a value to the map.  The user does not care about the
    * corresponding key produced by the Map. For maps that do not
    * naturally produce keys, the map adapters will use the
-   * <KEY_GENERATOR> class to produce a key.  However, the users are
+   * @c KEY_GENERATOR class to produce a key.  However, the users are
    * responsible for not jeopardizing this key production scheme by
    * using user specified keys with keys produced by the key
    * generator.
@@ -915,31 +915,31 @@ public:
                            KEY &original_key);
 
   /**
-   * Reassociate <key> with <value>. The function fails if <key> is
+   * Reassociate @a key with @a value. The function fails if @a key is
    * not in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value,
                       VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the map for maps that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the map for maps that do not
    * allow user specified keys.  However, for maps that allow user
-   * specified keys, if the key is not in the map, a new <key>/<value>
+   * specified keys, if the key is not in the map, a new @a key / @a value
    * association is created.
    */
   virtual int rebind (const KEY &key,
@@ -948,28 +948,28 @@ public:
                       VALUE &old_value);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * map.  If <key> is already in the map, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * map.  If @a key is already in the map, then the @a value parameter
    * is overwritten with the existing value in the map. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
   virtual int trybind (const KEY &key,
                        VALUE &value);
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   virtual int find (const KEY &key,
                     VALUE &value);
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   virtual int find (const KEY &key);
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   virtual int unbind (const KEY &key);
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   virtual int unbind (const KEY &key,
                       VALUE &value);
 
@@ -1137,7 +1137,7 @@ public:
   /// Initialize with the <ACE_DEFAULT_MAP_SIZE>.
   ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0);
 
-  /// Initialize with <size> entries.  The <size> parameter is ignored
+  /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Hash_Map_Manager_Ex_Adapter (size_t size,
                                    ACE_Allocator *alloc = 0);
@@ -1145,7 +1145,7 @@ public:
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Hash_Map_Manager_Ex_Adapter (void);
 
-  /// Initialize a <Map> with size <length>.
+  /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
@@ -1153,16 +1153,16 @@ public:
   virtual int close (void);
 
   /**
-   * Add <key>/<value> pair to the map.  If <key> is already in the
+   * Add @a key / @a value pair to the map.  If @a key is already in the
    * map then no changes are made and 1 is returned.  Returns 0 on a
    * successful addition.  This function fails for maps that do not
-   * allow user specified keys. <key> is an "in" parameter.
+   * allow user specified keys. @a key is an "in" parameter.
    */
   virtual int bind (const KEY &key,
                     const VALUE &value);
 
   /**
-   * Add <key>/<value> pair to the map.  <key> is an "inout" parameter
+   * Add @a key / @a value pair to the map.  @a key is an "inout" parameter
    * and maybe modified/extended by the map to add additional
    * information.  To recover original key, call the <recover_key>
    * method.
@@ -1171,9 +1171,9 @@ public:
                                KEY &key);
 
   /**
-   * Produce a key and return it through <key> which is an "out"
+   * Produce a key and return it through @a key which is an "out"
    * parameter.  For maps that do not naturally produce keys, the map
-   * adapters will use the <KEY_GENERATOR> class to produce a key.
+   * adapters will use the @c KEY_GENERATOR class to produce a key.
    * However, the users are responsible for not jeopardizing this key
    * production scheme by using user specified keys with keys produced
    * by the key generator.
@@ -1181,10 +1181,10 @@ public:
   virtual int create_key (KEY &key);
 
   /**
-   * Add <value> to the map, and the corresponding key produced by the
-   * Map is returned through <key> which is an "out" parameter.  For
+   * Add @a value to the map, and the corresponding key produced by the
+   * Map is returned through @a key which is an "out" parameter.  For
    * maps that do not naturally produce keys, the map adapters will
-   * use the <KEY_GENERATOR> class to produce a key.  However, the
+   * use the @c KEY_GENERATOR class to produce a key.  However, the
    * users are responsible for not jeopardizing this key production
    * scheme by using user specified keys with keys produced by the key
    * generator.
@@ -1193,10 +1193,10 @@ public:
                                KEY &key);
 
   /**
-   * Add <value> to the map.  The user does not care about the
+   * Add @a value to the map.  The user does not care about the
    * corresponding key produced by the Map. For maps that do not
    * naturally produce keys, the map adapters will use the
-   * <KEY_GENERATOR> class to produce a key.  However, the users are
+   * @c KEY_GENERATOR class to produce a key.  However, the users are
    * responsible for not jeopardizing this key production scheme by
    * using user specified keys with keys produced by the key
    * generator.
@@ -1209,31 +1209,31 @@ public:
                            KEY &original_key);
 
   /**
-   * Reassociate <key> with <value>. The function fails if <key> is
+   * Reassociate @a key with @a value. The function fails if @a key is
    * not in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value,
                       VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the map for maps that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the map for maps that do not
    * allow user specified keys.  However, for maps that allow user
-   * specified keys, if the key is not in the map, a new <key>/<value>
+   * specified keys, if the key is not in the map, a new @a key / @a value
    * association is created.
    */
   virtual int rebind (const KEY &key,
@@ -1242,28 +1242,28 @@ public:
                       VALUE &old_value);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * map.  If <key> is already in the map, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * map.  If @a key is already in the map, then the @a value parameter
    * is overwritten with the existing value in the map. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
   virtual int trybind (const KEY &key,
                        VALUE &value);
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   virtual int find (const KEY &key,
                     VALUE &value);
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   virtual int find (const KEY &key);
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   virtual int unbind (const KEY &key);
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   virtual int unbind (const KEY &key,
                       VALUE &value);
 
@@ -1423,7 +1423,7 @@ public:
   /// Initialize with the <ACE_DEFAULT_MAP_SIZE>.
   ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
 
-  /// Initialize with <size> entries.  The <size> parameter is ignored
+  /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Map_Manager_Adapter (size_t size,
                            ACE_Allocator *alloc = 0);
@@ -1431,7 +1431,7 @@ public:
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Map_Manager_Adapter (void);
 
-  /// Initialize a <Map> with size <length>.
+  /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
@@ -1439,16 +1439,16 @@ public:
   virtual int close (void);
 
   /**
-   * Add <key>/<value> pair to the map.  If <key> is already in the
+   * Add @a key / @a value pair to the map.  If @a key is already in the
    * map then no changes are made and 1 is returned.  Returns 0 on a
    * successful addition.  This function fails for maps that do not
-   * allow user specified keys. <key> is an "in" parameter.
+   * allow user specified keys. @a key is an "in" parameter.
    */
   virtual int bind (const KEY &key,
                     const VALUE &value);
 
   /**
-   * Add <key>/<value> pair to the map.  <key> is an "inout" parameter
+   * Add @a key / @a value pair to the map.  @a key is an "inout" parameter
    * and maybe modified/extended by the map to add additional
    * information.  To recover original key, call the <recover_key>
    * method.
@@ -1457,9 +1457,9 @@ public:
                                KEY &key);
 
   /**
-   * Produce a key and return it through <key> which is an "out"
+   * Produce a key and return it through @a key which is an "out"
    * parameter.  For maps that do not naturally produce keys, the map
-   * adapters will use the <KEY_GENERATOR> class to produce a key.
+   * adapters will use the @c KEY_GENERATOR class to produce a key.
    * However, the users are responsible for not jeopardizing this key
    * production scheme by using user specified keys with keys produced
    * by the key generator.
@@ -1467,10 +1467,10 @@ public:
   virtual int create_key (KEY &key);
 
   /**
-   * Add <value> to the map, and the corresponding key produced by the
-   * Map is returned through <key> which is an "out" parameter.  For
+   * Add @a value to the map, and the corresponding key produced by the
+   * Map is returned through @a key which is an "out" parameter.  For
    * maps that do not naturally produce keys, the map adapters will
-   * use the <KEY_GENERATOR> class to produce a key.  However, the
+   * use the @c KEY_GENERATOR class to produce a key.  However, the
    * users are responsible for not jeopardizing this key production
    * scheme by using user specified keys with keys produced by the key
    * generator.
@@ -1479,10 +1479,10 @@ public:
                                KEY &key);
 
   /**
-   * Add <value> to the map.  The user does not care about the
+   * Add @a value to the map.  The user does not care about the
    * corresponding key produced by the Map. For maps that do not
    * naturally produce keys, the map adapters will use the
-   * <KEY_GENERATOR> class to produce a key.  However, the users are
+   * @c KEY_GENERATOR class to produce a key.  However, the users are
    * responsible for not jeopardizing this key production scheme by
    * using user specified keys with keys produced by the key
    * generator.
@@ -1495,31 +1495,31 @@ public:
                            KEY &original_key);
 
   /**
-   * Reassociate <key> with <value>. The function fails if <key> is
+   * Reassociate @a key with @a value. The function fails if @a key is
    * not in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value);
 
   /**
-   * Reassociate <key> with <value>, storing the old value into the
-   * "out" parameter <old_value>.  The function fails if <key> is not
+   * Reassociate @a key with @a value, storing the old value into the
+   * "out" parameter @a old_value.  The function fails if @a key is not
    * in the map for maps that do not allow user specified keys.
    * However, for maps that allow user specified keys, if the key is
-   * not in the map, a new <key>/<value> association is created.
+   * not in the map, a new @a key / @a value association is created.
    */
   virtual int rebind (const KEY &key,
                       const VALUE &value,
                       VALUE &old_value);
 
   /**
-   * Reassociate <key> with <value>, storing the old key and value
-   * into the "out" parameters <old_key> and <old_value>.  The
-   * function fails if <key> is not in the map for maps that do not
+   * Reassociate @a key with @a value, storing the old key and value
+   * into the "out" parameters @a old_key and @a old_value.  The
+   * function fails if @a key is not in the map for maps that do not
    * allow user specified keys.  However, for maps that allow user
-   * specified keys, if the key is not in the map, a new <key>/<value>
+   * specified keys, if the key is not in the map, a new @a key / @a value
    * association is created.
    */
   virtual int rebind (const KEY &key,
@@ -1528,28 +1528,28 @@ public:
                       VALUE &old_value);
 
   /**
-   * Associate <key> with <value> if and only if <key> is not in the
-   * map.  If <key> is already in the map, then the <value> parameter
+   * Associate @a key with @a value if and only if @a key is not in the
+   * map.  If @a key is already in the map, then the @a value parameter
    * is overwritten with the existing value in the map. Returns 0 if a
-   * new <key>/<value> association is created.  Returns 1 if an
+   * new @a key / @a value association is created.  Returns 1 if an
    * attempt is made to bind an existing entry.  This function fails
    * for maps that do not allow user specified keys.
    */
   virtual int trybind (const KEY &key,
                        VALUE &value);
 
-  /// Locate <value> associated with <key>.
+  /// Locate @a value associated with @a key.
   virtual int find (const KEY &key,
                     VALUE &value);
 
-  /// Is <key> in the map?
+  /// Is @a key in the map?
   virtual int find (const KEY &key);
 
-  /// Remove <key> from the map.
+  /// Remove @a key from the map.
   virtual int unbind (const KEY &key);
 
-  /// Remove <key> from the map, and return the <value> associated with
-  /// <key>.
+  /// Remove @a key from the map, and return the @a value associated with
+  /// @a key.
   virtual int unbind (const KEY &key,
                       VALUE &value);
 
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index 0f8775018c4..ee9f7b9717e 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -93,7 +93,7 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
   // Check <length_request>
   if (length_request == static_cast<size_t> (-1))
     // Set length to file_request or size_t max.
-    this->length_ = ACE_Utils::Truncate<size_t> (current_file_length - offset);
+    this->length_ = ACE_Utils::truncate_cast<size_t> (current_file_length - offset);
   else
     { 
       // Make sure that we have not been asked to do the impossible.
diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h
index 847568fb53e..157ecf796ac 100644
--- a/ACE/ace/Mem_Map.h
+++ b/ACE/ace/Mem_Map.h
@@ -135,8 +135,8 @@ public:
   int unmap (void *addr, ssize_t len);
 
   /**
-   * Sync <len> bytes of the memory region to the backing store
-   * starting at <base_addr_>.  If <len> == -1 then sync the whole
+   * Sync @a len bytes of the memory region to the backing store
+   * starting at <base_addr_>.  If @a len == -1 then sync the whole
    * region.
    */
   int sync (size_t len, int flags = MS_SYNC);
@@ -147,13 +147,13 @@ public:
    */
   int sync (int flags = MS_SYNC);
 
-  /// Sync <len> bytes of the memory region to the backing store
+  /// Sync @a len bytes of the memory region to the backing store
   /// starting at <addr_>.
   int sync (void *addr, size_t len, int flags = MS_SYNC);
 
   /**
    * Change the protection of the pages of the mapped region to <prot>
-   * starting at <base_addr_> up to <len> bytes.
+   * starting at <base_addr_> up to @a len bytes.
    */
   int protect (size_t len, int prot = PROT_RDWR);
 
@@ -164,7 +164,7 @@ public:
   int protect (int prot = PROT_RDWR);
 
   /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
+  /// starting at <addr> up to @a len bytes.
   int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
   /// Close and remove the file from the file system.
diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp
index be94df6ddeb..64360c69361 100644
--- a/ACE/ace/Message_Block.cpp
+++ b/ACE/ace/Message_Block.cpp
@@ -358,11 +358,25 @@ ACE_Data_Block::ACE_Data_Block (size_t size,
                    ACE_Allocator::instance ());
 
   if (msg_data == 0)
-    ACE_ALLOCATOR (this->base_,
-                   (char *) this->allocator_strategy_->malloc (size));
-    // ACE_ALLOCATOR returns on alloc failure...
+    {
+      ACE_ALLOCATOR (this->base_,
+                     (char *) this->allocator_strategy_->malloc (size));
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
+      (void) ACE_OS::memset (this->base_,
+                             '\0',
+                             size);
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
+    }
+
+  // ACE_ALLOCATOR returns on alloc failure but we cant throw, so setting
+  // the size to 0 (i.e. "bad bit") ...
+  if (this->base_ == 0)
+    {
+      size = 0;
+    }
 
-  // The memory is legit, whether passed in or allocated, so set the size.
+  // The memory is legit, whether passed in or allocated, so set
+  // the size.
   this->cur_size_ = this->max_size_ = size;
 }
 
@@ -716,14 +730,22 @@ ACE_Message_Block::init_i (size_t size,
                                              data_block_allocator),
                              -1);
       ACE_TIMEPROBE (ACE_MESSAGE_BLOCK_INIT_I_DB_CTOR);
+
+      // Message block initialization may fail, while the construction
+      // succeds.  Since ACE may throw no exceptions, we have to do a
+      // separate check and clean up, like this:
+      if (db != 0 && db->size () < size)
+        {
+          db->ACE_Data_Block::~ACE_Data_Block();  // placement destructor ...
+          data_block_allocator->free (db); // free ...
+          errno = ENOMEM;
+          return -1;
+        }
     }
 
   // Reset the data_block_ pointer.
   this->data_block (db);
-  // If the data alloc failed, the ACE_Data_Block ctor can't relay
-  // that directly. Therefore, need to check it explicitly.
-  if (db->size () < size)
-    return -1;
+
   return 0;
 }
 
@@ -1104,13 +1126,15 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask,
   const ACE_Message_Block::Message_Flags always_clear =
     ACE_Message_Block::DONT_DELETE;
 
+  const size_t newsize =
+    max_size == 0 ? this->max_size_ : max_size;
+
   ACE_Data_Block *nb = 0;
 
   ACE_NEW_MALLOC_RETURN (nb,
                          static_cast<ACE_Data_Block*> (
                            this->data_block_allocator_->malloc (sizeof (ACE_Data_Block))),
-                         ACE_Data_Block (max_size == 0 ?
-                                           this->max_size_ : max_size, // size
+                         ACE_Data_Block (newsize, // size
                                          this->type_,     // type
                                          0,               // data
                                          this->allocator_strategy_, // allocator
@@ -1119,6 +1143,17 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask,
                                          this->data_block_allocator_),
                          0);
 
+  // Message block initialization may fail while the construction
+  // succeds.  Since as a matter of policy, ACE may throw no
+  // exceptions, we have to do a separate check like this.
+  if (nb != 0 && nb->size () < newsize)
+    {
+      nb->ACE_Data_Block::~ACE_Data_Block();  // placement destructor ...
+      this->data_block_allocator_->free (nb); // free ...
+      errno = ENOMEM;
+      return 0;
+    }
+
 
   // Set new flags minus the mask...
   nb->clr_flags (mask | always_clear);
@@ -1229,6 +1264,7 @@ ACE_Data_Block::base (char *msg_data,
   this->flags_ = msg_flags;
 }
 
+
 // ctor
 
 ACE_Dynamic_Message_Strategy::ACE_Dynamic_Message_Strategy (unsigned long static_bit_field_mask,
@@ -1251,6 +1287,52 @@ ACE_Dynamic_Message_Strategy::~ACE_Dynamic_Message_Strategy (void)
 {
 }
 
+ACE_Dynamic_Message_Strategy::Priority_Status
+ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
+                                               const ACE_Time_Value & tv)
+{
+  // default the message to have pending priority status
+  Priority_Status status = ACE_Dynamic_Message_Strategy::PENDING;
+
+  // start with the passed absolute time as the message's priority, then
+  // call the polymorphic hook method to (at least partially) convert
+  // the absolute time and message attributes into the message's priority
+  ACE_Time_Value priority (tv);
+  convert_priority (priority, mb);
+
+  // if the priority is negative, the message is pending
+  if (priority < ACE_Time_Value::zero)
+    {
+      // priority for pending messages must be shifted
+      // upward above the late priority range
+      priority += pending_shift_;
+      if (priority < min_pending_)
+        priority = min_pending_;
+    }
+  // otherwise, if the priority is greater than the maximum late
+  // priority value that can be represented, it is beyond late
+  else if (priority > max_late_)
+    {
+      // all messages that are beyond late are assigned lowest priority (zero)
+      mb.msg_priority (0);
+      return ACE_Dynamic_Message_Strategy::BEYOND_LATE;
+    }
+  // otherwise, the message is late, but its priority is correct
+  else
+    status = ACE_Dynamic_Message_Strategy::LATE;
+
+  // use (fast) bitwise operators to isolate and replace
+  // the dynamic portion of the message's priority
+  mb.msg_priority((mb.msg_priority() & static_bit_field_mask_) |
+                  ((priority.usec () +
+                    ACE_ONE_SECOND_IN_USECS * (suseconds_t)(priority.sec())) <<
+                   static_bit_field_shift_));
+
+  // returns the priority status of the message
+  return status;
+}
+
+
 // Dump the state of the strategy.
 
 void
@@ -1284,7 +1366,7 @@ ACE_Dynamic_Message_Strategy::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Deadline_Message_Strategy:: ACE_Deadline_Message_Strategy (unsigned long static_bit_field_mask,
+ACE_Deadline_Message_Strategy::ACE_Deadline_Message_Strategy (unsigned long static_bit_field_mask,
                                                                unsigned long static_bit_field_shift,
                                                                unsigned long dynamic_priority_max,
                                                                unsigned long dynamic_priority_offset)
diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h
index 1588e16dd3a..db52a13bb94 100644
--- a/ACE/ace/Message_Block.h
+++ b/ACE/ace/Message_Block.h
@@ -195,7 +195,7 @@ public:
    * the heap and does a copy of the data from the incoming message
    * block. As a final note, the alignment information is used to
    * align the data block if it is created afresh. If the incoming
-   * <mb> has a data block has a data block allocated from the heap,
+   * @a mb has a data block has a data block allocated from the heap,
    * then this constructor just duplicates (ie. a shallow copy) the
    * data block of the incoming @a mb.
    */
@@ -206,7 +206,7 @@ public:
    * Create a Message Block that assumes it has ownership of @a data,
    * but in reality it doesnt (i.e., cannot delete it since it didn't
    * malloc it!).  Note that the @c size of the Message_Block will
-   * be @a size, but the <length>  will be 0 until <wr_ptr> is set.
+   * be @a size, but the @a length  will be 0 until <wr_ptr> is set.
    */
   int init (const char *data,
             size_t size = 0);
@@ -220,8 +220,8 @@ public:
    * this object ceases to exist  (and don't delete it during
    * destruction).  If @a locking_strategy is non-0 then this is used
    * to protect regions of code that access shared state (e.g.,
-   * reference counting) from race conditions.  Note that the <size>
-   * of the <Message_Block> will be @a size, but the <length> will be 0
+   * reference counting) from race conditions.  Note that the @a size
+   * of the <Message_Block> will be @a size, but the @a length will be 0
    * until  <wr_ptr> is set. The @a data_block_allocator is use to
    * allocate the data blocks while the @a allocator_strategy is used
    * to allocate the buffers contained by those.
@@ -320,7 +320,7 @@ public:
   /**
    * Return a "shallow" copy that increments our reference count by 1.
    * This is similar to CORBA's <_duplicate> method, which is useful
-   * if you want to eliminate lots of checks for NULL <mb> pointers
+   * if you want to eliminate lots of checks for NULL @a mb pointers
    * before calling <_duplicate> on them.
    */
   static ACE_Message_Block *duplicate (const ACE_Message_Block *mb);
@@ -356,9 +356,9 @@ public:
 
   /**
    * This behaves like the non-static method <release>, except that it
-   * checks if <mb> is 0.  This is similar to <CORBA::release>, which
+   * checks if @a mb is 0.  This is similar to <CORBA::release>, which
    * is useful if you want to eliminate lots of checks for NULL
-   * pointers before calling <release> on them.  Returns <mb>.
+   * pointers before calling <release> on them.  Returns @a mb.
    */
   static ACE_Message_Block *release (ACE_Message_Block *mb);
 
@@ -468,7 +468,7 @@ public:
   /// Set the write pointer to @a ptr.
   void wr_ptr (char *ptr);
 
-  /// Set the write pointer ahead <n> bytes.  This is used to compute
+  /// Set the write pointer ahead @a n bytes.  This is used to compute
   /// the <length> of a message.
   void wr_ptr (size_t n);
 
@@ -756,7 +756,7 @@ public:
   /**
    * Decrease the shared reference count by 1.  If the reference count
    * is > 0 then return this; else if reference count == 0 then delete
-   * <this> and <mb> and return 0.  Behavior is undefined if reference
+   * <this> and @a mb and return 0.  Behavior is undefined if reference
    * count < 0.
    */
   ACE_Data_Block *release (ACE_Lock *lock = 0);
@@ -864,7 +864,7 @@ private:
  * @brief An abstract base class which provides dynamic priority
  * evaluation methods for use by the ACE_Dynamic_Message_Queue
  * class or any other class which needs to manage the priorities
- * of a collection of ACE_Message_Block's dynamically.
+ * of a collection of ACE_Message_Blocks dynamically.
  *
  * Methods for deadline and laxity based priority evaluation are
  * provided.  These methods assume a specific partitioning of
diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl
index 2f67cc25078..85261360be6 100644
--- a/ACE/ace/Message_Block.inl
+++ b/ACE/ace/Message_Block.inl
@@ -579,48 +579,5 @@ ACE_Dynamic_Message_Strategy::dynamic_priority_offset (unsigned long ul)
   // set offset for boundary between signed range and unsigned range
 
 
-ACE_INLINE ACE_Dynamic_Message_Strategy::Priority_Status
-ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
-                                               const ACE_Time_Value & tv)
-{
-  // default the message to have pending priority status
-  Priority_Status status = ACE_Dynamic_Message_Strategy::PENDING;
-
-  // start with the passed absolute time as the message's priority, then
-  // call the polymorphic hook method to (at least partially) convert
-  // the absolute time and message attributes into the message's priority
-  ACE_Time_Value priority (tv);
-  convert_priority (priority, mb);
-
-  // if the priority is negative, the message is pending
-  if (priority < ACE_Time_Value::zero)
-    {
-      // priority for pending messages must be shifted
-      // upward above the late priority range
-      priority += pending_shift_;
-      if (priority < min_pending_)
-        priority = min_pending_;
-    }
-  // otherwise, if the priority is greater than the maximum late
-  // priority value that can be represented, it is beyond late
-  else if (priority > max_late_)
-    {
-      // all messages that are beyond late are assigned lowest priority (zero)
-      mb.msg_priority (0);
-      return ACE_Dynamic_Message_Strategy::BEYOND_LATE;
-    }
-  // otherwise, the message is late, but its priority is correct
-  else
-    status = ACE_Dynamic_Message_Strategy::LATE;
-
-  // use (fast) bitwise operators to isolate and replace
-  // the dynamic portion of the message's priority
-  mb.msg_priority((mb.msg_priority() & static_bit_field_mask_) |
-                  ((priority.usec () + ACE_ONE_SECOND_IN_USECS * priority.sec ()) <<
-                   static_bit_field_shift_));
-
-  return status;
-}
-  // returns the priority status of the message
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp
index 7295c2b9c8f..517ce8e2fcb 100644
--- a/ACE/ace/Message_Queue.cpp
+++ b/ACE/ace/Message_Queue.cpp
@@ -409,7 +409,7 @@ int
 ACE_Message_Queue_NT::close (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::close");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
   this->deactivate ();
   return (::CloseHandle (this->completion_port_) ? 0 : -1 );
 }
@@ -425,7 +425,7 @@ ACE_Message_Queue_NT::enqueue (ACE_Message_Block *new_item,
                                ACE_Time_Value *)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::enqueue");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
   if (this->state_ != ACE_Message_Queue_Base::DEACTIVATED)
     {
       size_t const msize = new_item->total_size ();
@@ -442,7 +442,7 @@ ACE_Message_Queue_NT::enqueue (ACE_Message_Block *new_item,
           // Update the states once I succeed.
           this->cur_bytes_ += msize;
           this->cur_length_ += mlength;
-          return ACE_Utils::Truncate<int> (++this->cur_count_);
+          return ACE_Utils::truncate_cast<int> (++this->cur_count_);
         }
     }
   else
@@ -459,7 +459,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
   ACE_TRACE ("ACE_Message_Queue_NT::dequeue_head");
 
   {
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
     // Make sure the MQ is not deactivated before proceeding.
     if (this->state_ == ACE_Message_Queue_Base::DEACTIVATED)
@@ -480,7 +480,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
                                           reinterpret_cast<LPOVERLAPPED *> (&first_item),
                                           (timeout == 0 ? INFINITE : timeout->msec ()));
   {
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
     --this->cur_thrs_;          // Decrease waiting thread count.
     if (retv)
       {
@@ -489,7 +489,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
             --this->cur_count_;
             this->cur_bytes_ -= msize;
             this->cur_length_ -= first_item->total_length ();
-            return ACE_Utils::Truncate<int> (this->cur_count_);
+            return ACE_Utils::truncate_cast<int> (this->cur_count_);
           }
         else                    // Woken up by deactivate () or pulse ().
             errno = ESHUTDOWN;
@@ -502,7 +502,7 @@ int
 ACE_Message_Queue_NT::deactivate (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::deactivate");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   int const previous_state = this->state_;
   if (previous_state != ACE_Message_Queue_Base::DEACTIVATED)
@@ -526,7 +526,7 @@ int
 ACE_Message_Queue_NT::activate (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::activate");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
   int const previous_status = this->state_;
   this->state_ = ACE_Message_Queue_Base::ACTIVATED;
   return previous_status;
@@ -536,7 +536,7 @@ int
 ACE_Message_Queue_NT::pulse (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::pulse");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   int const previous_state = this->state_;
   if (previous_state != ACE_Message_Queue_Base::DEACTIVATED)
diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h
index 5a4b26fbfd6..3e1713ac712 100644
--- a/ACE/ace/Message_Queue.h
+++ b/ACE/ace/Message_Queue.h
@@ -38,9 +38,9 @@ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Reverse_Iterator;
  * @brief Base class for ACE_Message_Queue, which is the central
  * queueing facility for messages in the ACE framework.
  *
- * For all the <ACE_Time_Value> pointer parameters the caller will
- * block until action is possible if <timeout> == 0.  Otherwise, it
- * will wait until the absolute time specified in *<timeout>
+ * For all the ACE_Time_Value pointer parameters the caller will
+ * block until action is possible if @a timeout == 0.  Otherwise, it
+ * will wait until the absolute time specified in *@a timeout
  * elapses.
  *
  * A queue is always in one of three states:
@@ -94,8 +94,8 @@ public:
 
   /**
    * Retrieve the first ACE_Message_Block without removing it.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
-   * time.  If the <timeout> elapses without receiving a message -1 is
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
+   * time.  If the @a timeout elapses without receiving a message -1 is
    * returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
    * deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
    * Otherwise, returns -1 on failure, else the number of items still
@@ -611,7 +611,7 @@ private:
    * but since this class is only supported on NT, it's okay to use
    * ACE_Thread_Mutex here.
    */
-  ACE_Thread_Mutex lock_;
+  ACE_SYNCH_MUTEX lock_;
 
   /// Underlying NT IoCompletionPort.
   ACE_HANDLE completion_port_;
diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl
index 452b33f8e6f..355ae57fdec 100644
--- a/ACE/ace/Message_Queue.inl
+++ b/ACE/ace/Message_Queue.inl
@@ -54,7 +54,7 @@ ACE_INLINE int
 ACE_Message_Queue_NT::is_empty (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::is_empty");
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
 
   return this->cur_bytes_ > 0 || this->cur_count_ > 0 ? 0 : 1;
 }
@@ -87,7 +87,7 @@ ACE_INLINE void
 ACE_Message_Queue_NT::message_bytes (size_t new_value)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::message_bytes");
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
+  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
 
   this->cur_bytes_ = new_value;
 }
@@ -96,7 +96,7 @@ ACE_INLINE void
 ACE_Message_Queue_NT::message_length (size_t new_value)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::message_length");
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
+  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
 
   this->cur_length_ = new_value;
 }
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp
index 4eabd618369..1c083767fe9 100644
--- a/ACE/ace/Message_Queue_T.cpp
+++ b/ACE/ace/Message_Queue_T.cpp
@@ -923,8 +923,8 @@ template <ACE_SYNCH_DECL>
 ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm,
                                                      size_t lwm,
                                                      ACE_Notification_Strategy *ns)
-  : not_empty_cond_ (this->lock_),
-    not_full_cond_ (this->lock_)
+  : not_empty_cond_ (lock_),
+    not_full_cond_ (lock_)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue");
 
@@ -1119,7 +1119,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail_i (ACE_Message_Block *new_item)
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Actually put the node(s) at the head (no locking)
@@ -1163,7 +1163,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head_i (ACE_Message_Block *new_item)
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Actually put the node at its proper position relative to its
@@ -1234,7 +1234,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item)
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Actually put the node at its proper position relative to its
@@ -1350,7 +1350,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Get the earliest (i.e., FIFO) ACE_Message_Block with the lowest
@@ -1426,7 +1426,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_prio_i (ACE_Message_Block *&dequeued)
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Actually get the last ACE_Message_Block (no locking, so must be
@@ -1475,7 +1475,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i (ACE_Message_Block *&dequeued)
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::Truncate<int> (this->cur_count_);
+    return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 // Actually get the ACE_Message_Block with the lowest deadline time
@@ -1571,7 +1571,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_i
     return -1;
 
   first_item = this->head_;
-  return ACE_Utils::Truncate<int> (this->cur_count_);
+  return ACE_Utils::truncate_cast<int> (this->cur_count_);
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h
index b1695c84248..d7973ed4dd7 100644
--- a/ACE/ace/Message_Queue_T.h
+++ b/ACE/ace/Message_Queue_T.h
@@ -1037,17 +1037,17 @@ public:
 
   // = Enqueue and dequeue methods.
 
-  // For the following enqueue and dequeue methods if <timeout> == 0,
+  // For the following enqueue and dequeue methods if @a timeout == 0,
   // the caller will block until action is possible, else will wait
-  // until the absolute time specified in *<timeout> elapses).  These
+  // until the absolute time specified in *@a timeout elapses).  These
   // calls will return, however, when queue is closed, deactivated,
   // when a signal occurs, or if the time specified in timeout
   // elapses, (in which case errno = EWOULDBLOCK).
 
   /**
    * Retrieve the first <ACE_MESSAGE_TYPE> without removing it.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
-   * time.  If the <timeout> elapses without receiving a message -1 is
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
+   * time.  If the @a timeout elapses without receiving a message -1 is
    * returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
    * deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
    * Otherwise, returns -1 on failure, else the number of items still
@@ -1060,8 +1060,8 @@ public:
    * Enqueue an <ACE_MESSAGE_TYPE *> into the <Message_Queue> in
    * accordance with its <msg_priority> (0 is lowest priority).  FIFO
    * order is maintained when messages of the same priority are
-   * inserted consecutively.  Note that <timeout> uses <{absolute}>
-   * time rather than <{relative}> time.  If the <timeout> elapses
+   * inserted consecutively.  Note that @a timeout uses <{absolute}>
+   * time rather than <{relative}> time.  If the @a timeout elapses
    * without receiving a message -1 is returned and <errno> is set to
    * <EWOULDBLOCK>.  If the queue is deactivated -1 is returned and
    * <errno> is set to <ESHUTDOWN>.  Otherwise, returns -1 on failure,
@@ -1074,8 +1074,8 @@ public:
    * Enqueue an <ACE_MESSAGE_TYPE *> into the <Message_Queue> in
    * accordance with its <msg_deadline_time>.  FIFO
    * order is maintained when messages of the same deadline time are
-   * inserted consecutively.  Note that <timeout> uses <{absolute}>
-   * time rather than <{relative}> time.  If the <timeout> elapses
+   * inserted consecutively.  Note that @a timeout uses <{absolute}>
+   * time rather than <{relative}> time.  If the @a timeout elapses
    * without receiving a message -1 is returned and <errno> is set to
    * <EWOULDBLOCK>.  If the queue is deactivated -1 is returned and
    * <errno> is set to <ESHUTDOWN>.  Otherwise, returns -1 on failure,
@@ -1087,7 +1087,7 @@ public:
   /**
    * This is an alias for <enqueue_prio>.  It's only here for
    * backwards compatibility and will go away in a subsequent release.
-   * Please use <enqueue_prio> instead.  Note that <timeout> uses
+   * Please use <enqueue_prio> instead.  Note that @a timeout uses
    * <{absolute}> time rather than <{relative}> time.
    */
   virtual int enqueue (ACE_MESSAGE_TYPE *new_item,
@@ -1095,8 +1095,8 @@ public:
 
   /**
    * Enqueue an <ACE_MESSAGE_TYPE *> at the end of the queue.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
-   * time.  If the <timeout> elapses without receiving a message -1 is
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
+   * time.  If the @a timeout elapses without receiving a message -1 is
    * returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
    * deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
    * Otherwise, returns -1 on failure, else the number of items still
@@ -1107,8 +1107,8 @@ public:
 
   /**
    * Enqueue an <ACE_MESSAGE_TYPE *> at the head of the queue.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
-   * time.  If the <timeout> elapses without receiving a message -1 is
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
+   * time.  If the @a timeout elapses without receiving a message -1 is
    * returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
    * deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
    * Otherwise, returns -1 on failure, else the number of items still
@@ -1124,8 +1124,8 @@ public:
 
   /**
    * Dequeue and return the <ACE_MESSAGE_TYPE *> at the head of the
-   * queue.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <timeout> elapses without receiving a
+   * queue.  Note that @a timeout uses <{absolute}> time rather than
+   * <{relative}> time.  If the @a timeout elapses without receiving a
    * message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
    * the queue is deactivated -1 is returned and <errno> is set to
    * <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
@@ -1136,8 +1136,8 @@ public:
 
   /**
    * Dequeue and return the <ACE_MESSAGE_TYPE *> that has the lowest
-   * priority.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <timeout> elapses without receiving a
+   * priority.  Note that @a timeout uses <{absolute}> time rather than
+   * <{relative}> time.  If the @a timeout elapses without receiving a
    * message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
    * the queue is deactivated -1 is returned and <errno> is set to
    * <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
@@ -1148,8 +1148,8 @@ public:
 
   /**
    * Dequeue and return the <ACE_MESSAGE_TYPE *> at the tail of the
-   * queue.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <timeout> elapses without receiving a
+   * queue.  Note that @a timeout uses <{absolute}> time rather than
+   * <{relative}> time.  If the @a timeout elapses without receiving a
    * message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
    * the queue is deactivated -1 is returned and <errno> is set to
    * <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
@@ -1160,8 +1160,8 @@ public:
 
   /**
    * Dequeue and return the <ACE_MESSAGE_TYPE *> with the lowest
-   * deadline time.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <timeout> elapses without receiving a
+   * deadline time.  Note that @a timeout uses <{absolute}> time rather than
+   * <{relative}> time.  If the @a timeout elapses without receiving a
    * message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
    * the queue is deactivated -1 is returned and <errno> is set to
    * <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
@@ -1308,7 +1308,7 @@ protected:
  * version of the ACE_Message_Queue. If @c ACE_SYNCH_DECL is @c ACE_MT_SYNCH
  * then all operations are thread-safe. Otherwise, if it's @c ACE_NULL_SYNCH
  * then there's no locking overhead.
- * 
+ *
  * The @c ACE_MESSAGE_TYPE messages that are sent to this
  * queue can be chained. Messages are expected to have a
  * @c next method that returns the next message in the chain;
diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp
index 20e5638e367..2a588f1616d 100644
--- a/ACE/ace/Module.cpp
+++ b/ACE/ace/Module.cpp
@@ -158,7 +158,7 @@ ACE_Module<ACE_SYNCH_USE>::sibling (ACE_Task<ACE_SYNCH_USE> *orig)
 
 template <ACE_SYNCH_DECL>
 ACE_Module<ACE_SYNCH_USE>::ACE_Module (void)
-  : flags_ (0)
+  : flags_ (M_FLAGS_NOT_SET)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module");
   this->name (ACE_LIB_TEXT ("<unknown>"));
@@ -183,7 +183,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ACE_TCHAR *mod_name,
                                        ACE_Task<ACE_SYNCH_USE> *reader_q,
                                        void *args,
                                        int flags /* = M_DELETE */)
-  : flags_ (0)
+  : flags_ (M_FLAGS_NOT_SET)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module");
 
@@ -205,7 +205,7 @@ ACE_Module<ACE_SYNCH_USE>::close (int flags /* = M_DELETE_NONE */)
 
   // Only pay attention to the flags parameter if we haven't already
   // set the task delete policies.
-  if (this->flags_ == 0)
+  if (this->flags_ == M_FLAGS_NOT_SET)
     ACE_SET_BITS (flags_, flags);
 
   if (this->close_i (0, flags_) == -1)
diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h
index e1130d25b8b..658f0bffc74 100644
--- a/ACE/ace/Module.h
+++ b/ACE/ace/Module.h
@@ -40,8 +40,8 @@ class ACE_Export ACE_Module_Base
 public:
   enum
   {
-    /// Indicates that <close> should not delete any Tasks.
-    M_DELETE_NONE = 0,
+    /// Indicates that the flags have not been set
+    M_FLAGS_NOT_SET = 0,
 
     /// Indicates that <close> should delete the writer Task.
     M_DELETE_READER = 1,
@@ -56,7 +56,10 @@ public:
      * The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed
      * together.
      */
-    M_DELETE = 3
+    M_DELETE = 3,
+
+    /// Indicates that <close> should not delete any Tasks.
+    M_DELETE_NONE = 4
   };
 };
 
@@ -69,7 +72,7 @@ public:
  * which contains a pair of Tasks, one for handling upstream
  * processing, one for handling downstream processing.  In
  * general, you shouldn't subclass from this class, but instead
- * subclass from the <ACE_Task>.
+ * subclass from the ACE_Task.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Module : public ACE_Module_Base
diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h
index dd969675b1b..d37ebfe93b3 100644
--- a/ACE/ace/Msg_WFMO_Reactor.h
+++ b/ACE/ace/Msg_WFMO_Reactor.h
@@ -48,8 +48,8 @@ public:
                         ACE_Timer_Queue * = 0);
 
   /**
-   * Initialize <ACE_Msg_WFMO_Reactor> with size <size>.  Two slots will be
-   * added to the <size> parameter which will store handles used for
+   * Initialize <ACE_Msg_WFMO_Reactor> with size @a size.  Two slots will be
+   * added to the @a size parameter which will store handles used for
    * internal management purposes.
    */
   ACE_Msg_WFMO_Reactor (size_t size,
diff --git a/ACE/ace/Multihomed_INET_Addr.h b/ACE/ace/Multihomed_INET_Addr.h
index f74beb3ff9d..f256e1401bb 100644
--- a/ACE/ace/Multihomed_INET_Addr.h
+++ b/ACE/ace/Multihomed_INET_Addr.h
@@ -52,7 +52,7 @@ public:
   /**
    * Constructs an <ACE_Multihomed_INET_Addr> from a <port_number>, a
    * <primary_host_name>, and an array of <secondary_host_names>.
-   * <size> is taken to be the length of the array.  If <encode> is
+   * @a size is taken to be the length of the array.  If <encode> is
    * non-zero, then <port_number> is converted into network byte
    * order; otherwise it is assumed to be in network byte order
    * already and is passed straight through.  <address_family> can be
@@ -114,7 +114,7 @@ public:
   /**
    * Initializes an <ACE_Multihomed_INET_Addr> from a <port_number>, a
    * <primary_host_name>, and an array of <secondary_host_names>.
-   * <size> is taken to be the length of the array.  If <encode> is
+   * @a size is taken to be the length of the array.  If <encode> is
    * non-zero, then <port_number> is converted into network byte
    * order; otherwise it is assumed to be in network byte order
    * already and is passed straight through.  <address_family> can be
@@ -163,14 +163,14 @@ public:
 
   /**
    * Initialize user-supplied array <secondary_addrs> with the current
-   * secondary addresses.  <size> is taken as the size of this array.
+   * secondary addresses.  @a size is taken as the size of this array.
    */
   int get_secondary_addresses(ACE_INET_Addr *secondary_addrs,
                               size_t size) const;
 
   /**
    * Initialize user-supplied array <addrs> with the the current
-   * primary and secondary addresses.  <size> is taken as the size of
+   * primary and secondary addresses.  @a size is taken as the size of
    * this array.
    */
   void get_addresses(sockaddr_in *addrs,
diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp
index 0a1e249cb4f..10196007ec9 100644
--- a/ACE/ace/NT_Service.cpp
+++ b/ACE/ace/NT_Service.cpp
@@ -1,8 +1,7 @@
 // $Id$
 
 #include "ace/config-all.h"
-#if defined (ACE_WIN32) && \
-   !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 
@@ -615,4 +614,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state,
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index fc168158101..249afdc3774 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -21,8 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) && \
-   !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/ACE.h"
 #include "ace/OS_Log_Msg_Attributes.h"
@@ -432,7 +431,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                \
 #include "ace/NT_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp
index e066b2ef4ac..21424a42d4b 100644
--- a/ACE/ace/Name_Request_Reply.cpp
+++ b/ACE/ace/Name_Request_Reply.cpp
@@ -1,6 +1,9 @@
 #include "ace/Name_Request_Reply.h"
+#include "ace/Basic_Types.h"
+#include "ace/CDR_Base.h"
 #include "ace/Log_Msg.h"
 #include "ace/Time_Value.h"
+#include "ace/Truncate.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/arpa/os_inet.h"
 
@@ -185,8 +188,8 @@ ACE_Time_Value
 ACE_Name_Request::timeout (void) const
 {
   ACE_TRACE ("ACE_Name_Request::timeout");
-  return ACE_Time_Value (this->transfer_.sec_timeout_,
-                         this->transfer_.usec_timeout_);
+  time_t sec = ACE_Utils::truncate_cast<time_t> (this->transfer_.sec_timeout_);
+  return ACE_Time_Value (sec, this->transfer_.usec_timeout_);
 }
 
 void
@@ -274,7 +277,10 @@ ACE_Name_Request::encode (void *&buf)
   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_);
+#if defined (ACE_LITTLE_ENDIAN)
+  ACE_UINT64 secs = this->transfer_.sec_timeout_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.sec_timeout_);
+#endif
   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_);
@@ -294,7 +300,10 @@ ACE_Name_Request::decode (void)
   // 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_);
+#if defined (ACE_LITTLE_ENDIAN)
+  ACE_UINT64 secs = this->transfer_.sec_timeout_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.sec_timeout_);
+#endif
   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_);
diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h
index 07e4b61d95b..9ab620349d4 100644
--- a/ACE/ace/Name_Request_Reply.h
+++ b/ACE/ace/Name_Request_Reply.h
@@ -152,7 +152,7 @@ private:
     ACE_UINT32 block_forever_;
 
     /// Max seconds willing to wait for name if not blocking forever.
-    ACE_UINT32 sec_timeout_;
+    ACE_UINT64 sec_timeout_;
 
     /// Max micro seconds to wait for name if not blocking forever.
     ACE_UINT32 usec_timeout_;
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index 596d4aa3aed..8d0c03c2ef0 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -71,15 +71,15 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
   // Perform factory operation to select appropriate type of
   // Name_Space subclass.
 
-#if (defined (ACE_WIN32) && defined (UNICODE))
-// This only works on Win32 platforms when UNICODE is turned on
+#if (defined (ACE_WIN32) && defined (ACE_USES_WCHAR))
+// This only works on Win32 platforms when ACE_USES_WCHAR is turned on
 
   if (this->name_options_->use_registry ())
     // Use ACE_Registry
     ACE_NEW_RETURN (this->name_space_,
                     ACE_Registry_Name_Space (this->name_options_),
                     -1);
-#endif /* ACE_WIN32 && UNICODE */
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
   if (!this->name_options_->use_registry ())
     if (scope_in == ACE_Naming_Context::NET_LOCAL && this->local () == 0)
       {
diff --git a/ACE/ace/Notification_Queue.cpp b/ACE/ace/Notification_Queue.cpp
new file mode 100644
index 00000000000..d1a15dc220b
--- /dev/null
+++ b/ACE/ace/Notification_Queue.cpp
@@ -0,0 +1,222 @@
+// $Id$
+
+#include "ace/Notification_Queue.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Notification_Queue.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_Notification_Queue::
+ACE_Notification_Queue()
+  : ACE_Copy_Disabled()
+  , alloc_queue_()
+  , notify_queue_()
+  , free_queue_()
+{
+}
+
+ACE_Notification_Queue::
+~ACE_Notification_Queue()
+{
+  reset();
+}
+
+int
+ACE_Notification_Queue::
+open()
+{
+  ACE_TRACE ("ACE_Notification_Queue::open");
+
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+
+  if (!this->free_queue_.is_empty ())
+    return 0;
+
+  return allocate_more_buffers();
+}
+
+void
+ACE_Notification_Queue::
+reset()
+{
+  ACE_TRACE ("ACE_Notification_Queue::reset");
+
+  // Release all the event handlers still in the queue ...
+  for (ACE_Notification_Queue_Node * node = notify_queue_.head();
+       node != 0;
+       node = node->next())
+    {
+      if (node->get().eh_ == 0)
+        {
+          continue;
+        }
+      (void) node->get().eh_->remove_reference();
+    }
+
+  // ... free up the dynamically allocated resources ...
+  ACE_Notification_Queue_Node **b = 0;
+  for (ACE_Unbounded_Queue_Iterator<ACE_Notification_Queue_Node *> alloc_iter (this->alloc_queue_);
+       alloc_iter.next (b) != 0;
+       alloc_iter.advance ())
+    {
+      delete [] *b;
+      *b = 0;
+    }
+
+  // ... cleanup the list of allocated blocks ...
+  this->alloc_queue_.reset ();
+
+  // ... swap with empty lists to reset the contents ...
+  Buffer_List().swap(notify_queue_);
+  Buffer_List().swap(free_queue_);
+}
+
+int ACE_Notification_Queue::
+allocate_more_buffers()
+{
+  ACE_TRACE ("ACE_Notification_Queue::allocate_more_buffers");
+
+  ACE_Notification_Queue_Node *temp = 0;
+
+  ACE_NEW_RETURN (temp,
+		  ACE_Notification_Queue_Node[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
+		  -1);
+
+  if (this->alloc_queue_.enqueue_head (temp) == -1)
+    {
+      delete [] temp;
+      return -1;
+    }
+
+  for (size_t i = 0; i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; ++i)
+    {
+      free_queue_.push_front(temp + i);
+    }
+
+  return 0;
+}
+
+int
+ACE_Notification_Queue::
+purge_pending_notifications(ACE_Event_Handler * eh,
+			    ACE_Reactor_Mask mask)
+{
+  ACE_TRACE ("ACE_Notification_Queue::purge_pending_notifications");
+
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+
+  if (this->notify_queue_.is_empty ())
+    return 0;
+
+  int number_purged = 0;
+  ACE_Notification_Queue_Node * node = notify_queue_.head();
+  while(node != 0)
+    {
+      if (!node->matches_for_purging(eh))
+	{
+	  // Easy case, skip to the next node
+          node = node->next();
+	  continue;
+	}
+
+      if (!node->mask_disables_all_notifications(mask))
+	{
+          // ... another easy case, skip this node too, but clear the
+          // mask first ...
+	  node->clear_mask(mask);
+          node = node->next();
+	  continue;
+	}
+
+      // ... this is the more complicated case, we want to remove the
+      // node from the notify_queue_ list.  First save the next node
+      // on the list:
+      ACE_Notification_Queue_Node * next = node->next();
+
+      // ... then remove it ...
+      notify_queue_.unsafe_remove(node);
+      ++number_purged;
+
+      // ... release resources ...
+      ACE_Event_Handler *event_handler = node->get().eh_;
+      event_handler->remove_reference ();
+      
+      // ... now this is a free node ...
+      free_queue_.push_front(node);
+
+      // ... go to the next node, if there is one ...
+      node = next;
+    }
+
+  return number_purged;
+}
+
+int ACE_Notification_Queue::
+push_new_notification(
+  ACE_Notification_Buffer const & buffer)
+{
+  ACE_TRACE ("ACE_Notification_Queue::push_new_notification");
+
+  bool notification_required = false;
+
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+
+  // No pending notifications.
+  if (this->notify_queue_.is_empty ())
+    notification_required = true;
+
+  if (free_queue_.is_empty())
+    {
+      if (allocate_more_buffers() == -1)
+	{
+	  return -1;
+	}
+    }
+
+  ACE_Notification_Queue_Node * node =
+    free_queue_.pop_front();
+
+  ACE_ASSERT (node != 0);
+  node->set(buffer);
+
+  notify_queue_.push_back(node);
+
+  if (!notification_required)
+    {
+      return 0;
+    }
+
+  return 1;
+}
+
+int
+ACE_Notification_Queue::pop_next_notification(
+  ACE_Notification_Buffer & current,
+  bool & more_messages_queued,
+  ACE_Notification_Buffer & next)
+{
+  ACE_TRACE ("ACE_Notification_Queue::pop_next_notification");
+
+  more_messages_queued = false;
+
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+
+  if (notify_queue_.is_empty ())
+    {
+      return 0;
+    }
+
+  ACE_Notification_Queue_Node * node =
+    notify_queue_.pop_front();
+
+  current = node->get();
+  free_queue_.push_front(node);
+
+  if(!this->notify_queue_.is_empty())
+    {
+      more_messages_queued = true;
+      next = notify_queue_.head()->get();
+    }
+
+  return 1;
+}
diff --git a/ACE/ace/Notification_Queue.h b/ACE/ace/Notification_Queue.h
new file mode 100644
index 00000000000..a0348822060
--- /dev/null
+++ b/ACE/ace/Notification_Queue.h
@@ -0,0 +1,156 @@
+#ifndef ACE_NOTIFICATION_QUEUE_H
+#define ACE_NOTIFICATION_QUEUE_H
+
+#include /**/ "ace/pre.h"
+
+/**
+ *  @file Notification_Queue.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@atdesk.com>
+ */
+#include "ace/Copy_Disabled.h"
+#include "ace/Event_Handler.h"
+#include "ace/Intrusive_List.h"
+#include "ace/Intrusive_List_Node.h"
+#include "ace/Unbounded_Queue.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_Notification_Queue_Node
+ *
+ * @brief Helper class
+ */
+class ACE_Export ACE_Notification_Queue_Node
+  : public ACE_Intrusive_List_Node<ACE_Notification_Queue_Node>
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ACE_Notification_Queue_Node();
+
+  /**
+   * @brief Modifier change the contained buffer
+   */
+  void set(ACE_Notification_Buffer const & rhs);
+
+  /**
+   * @brief Accessor, fetch the contained buffer
+   */
+  ACE_Notification_Buffer const & get() const;
+
+  /**
+   * @brief Checks if the event handler matches the purge condition
+   */
+  bool matches_for_purging(ACE_Event_Handler * eh) const;
+
+  /**
+   * @brief Return true if clearing the mask would leave no
+   * notifications to deliver.
+   */
+  bool mask_disables_all_notifications(ACE_Reactor_Mask mask);
+
+  /**
+   * @brief Clear the notifications specified by @c mask
+   */
+  void clear_mask(ACE_Reactor_Mask mask);
+
+private:
+  ACE_Notification_Buffer contents_;
+};
+
+/**
+ * @class ACE_Notification_Queue
+ *
+ * @brief Implements a user-space queue to send Reactor notifications.
+ *
+ * The ACE_Reactor uses a pipe to send wake up the thread running the
+ * event loop from other threads.  This pipe can be limited in size
+ * under some operating systems.  For some applications, this limit
+ * presents a problem.  A user-space notification queue is used to
+ * overcome those limitations.  The queue tries to use as few
+ * resources on the pipe as possible, while keeping all the data in
+ * user space.
+ *
+ * This code was refactored from Select_Reactor_Base.
+ */
+class ACE_Export ACE_Notification_Queue : private ACE_Copy_Disabled
+{
+public:
+  ACE_Notification_Queue();
+  ~ACE_Notification_Queue();
+
+  /**
+   * @brief Pre-allocate resources in the queue
+   */
+  int open();
+
+  /**
+   * @brief Release all resources in the queue
+   */
+  void reset();
+
+  /**
+   * @brief Remove all elements in the queue matching @c eh and @c mask
+   *
+   * I suggest reading the documentation in ACE_Reactor to find a more
+   * detailed description.  This is just a helper function.
+   */
+  int purge_pending_notifications(ACE_Event_Handler * eh,
+				  ACE_Reactor_Mask mask);
+
+  /**
+   * @brief Add a new notification to the queue
+   *
+   * @return -1 on failure, 1 if a new message should be sent through
+   * the pipe and 0 otherwise.
+   */
+  int push_new_notification(ACE_Notification_Buffer const & buffer);
+
+  /**
+   * @brief Extract the next notification from the queue
+   *
+   * @return -1 on failure, 1 if a message was popped, 0 otherwise
+   */
+  int pop_next_notification(
+      ACE_Notification_Buffer & current,
+      bool & more_messages_queued,
+      ACE_Notification_Buffer & next);
+
+private:
+  /**
+   * @brief Allocate more memory for the queue
+   */
+  int allocate_more_buffers();
+
+private:
+  /// Keeps track of allocated arrays of type
+  /// ACE_Notification_Buffer.  The idea is to amortize allocation
+  /// costs by allocating multiple ACE_Notification_Buffer objects at
+  /// a time.
+  ACE_Unbounded_Queue <ACE_Notification_Queue_Node*> alloc_queue_;
+
+  typedef ACE_Intrusive_List<ACE_Notification_Queue_Node> Buffer_List;
+
+  /// Keeps track of all pending notifications.
+  Buffer_List notify_queue_;
+
+  /// Keeps track of all free buffers.
+  Buffer_List free_queue_;
+
+  /// Synchronization for handling of queues.
+  ACE_SYNCH_MUTEX notify_queue_lock_;
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "ace/Notification_Queue.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ACE_NOTIFICATION_QUEUE_H */
diff --git a/ACE/ace/Notification_Queue.inl b/ACE/ace/Notification_Queue.inl
new file mode 100644
index 00000000000..b7ef09a820f
--- /dev/null
+++ b/ACE/ace/Notification_Queue.inl
@@ -0,0 +1,47 @@
+// $Id$
+
+ACE_INLINE ACE_Notification_Queue_Node::
+ACE_Notification_Queue_Node()
+  : ACE_Intrusive_List_Node<ACE_Notification_Queue_Node>()
+  , contents_(0, 0)
+{
+}
+
+ACE_INLINE void
+ACE_Notification_Queue_Node::
+set(ACE_Notification_Buffer const & rhs)
+{
+  contents_ = rhs;
+}
+
+ACE_INLINE ACE_Notification_Buffer const &
+ACE_Notification_Queue_Node::
+get() const
+{
+  return contents_;
+}
+
+ACE_INLINE bool
+ACE_Notification_Queue_Node::
+matches_for_purging(ACE_Event_Handler * eh) const
+{
+  return (0 != get().eh_) && (0 == eh || eh == get().eh_);
+}
+
+ACE_INLINE bool
+ACE_Notification_Queue_Node::
+mask_disables_all_notifications(ACE_Reactor_Mask mask)
+{
+  // the existing notification mask is left with nothing when applying
+  // the mask
+  return ACE_BIT_DISABLED (get().mask_, ~mask);
+}
+
+ACE_INLINE void
+ACE_Notification_Queue_Node::
+clear_mask(ACE_Reactor_Mask mask)
+{
+  ACE_CLR_BITS(contents_.mask_, mask);
+}
+
+
diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h
index 9124f46cf73..5a3597b805c 100644
--- a/ACE/ace/Null_Semaphore.h
+++ b/ACE/ace/Null_Semaphore.h
@@ -19,6 +19,7 @@
 // All methods in this class are inline, so there is no
 // need to import or export on Windows. -- CAE 12/18/2003
 #include "ace/os_include/os_errno.h"
+#include "ace/os_include/sys/os_types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h
index 863c576059e..4fbac9d2768 100644
--- a/ACE/ace/Numeric_Limits.h
+++ b/ACE/ace/Numeric_Limits.h
@@ -52,6 +52,11 @@
 #  undef max
 # endif  /* __MINGW32__ */
 
+# if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+// For ACE_U_LongLong.
+#  include "ace/Basic_Types.h"
+# endif  /* ACE_LACKS_LONGLONG_T || ACE_LACKS_UNSIGNEDLONGLONG_T */
+
 # include <limits>
 #endif /* ACE_LACKS_NUMERIC_LIMITS */
 
@@ -234,20 +239,29 @@ struct ACE_Numeric_Limits
 template<>
 struct ACE_Numeric_Limits<LONGLONG>
 {
-   static LONGLONG min (void) { return _I64_MIN; }
-   static LONGLONG max (void) { return _I64_MAX; }
+  static LONGLONG min (void) { return _I64_MIN; }
+  static LONGLONG max (void) { return _I64_MAX; }
 };
 
 template<>
 struct ACE_Numeric_Limits<ULONGLONG>
 {
-   static ULONGLONG min (void) { return 0; }
-   static ULONGLONG max (void) { return _UI64_MAX; }
+  static ULONGLONG min (void) { return 0; }
+  static ULONGLONG max (void) { return _UI64_MAX; }
 };
 # endif  /* ACE_WIN64 && _MSC_VER <= 1310 */
 
 #endif /* ACE_LACKS_NUMERIC_LIMITS */
 
+#if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+template<>
+struct ACE_Numeric_Limits<ACE_U_LongLong>
+{
+  static ACE_U_LongLong min (void) { return ACE_U_LongLong (); /* 0 */ }
+  static ACE_U_LongLong max (void) { return ACE_UINT64_MAX; }
+};
+#endif  /* ACE_LACKS_LONGLONG_T || defined ACE_LACKS_UNSIGNEDLONGLONG_T */
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/OS.inl b/ACE/ace/OS.inl
index 2d71be7e454..e4b063a57f3 100644
--- a/ACE/ace/OS.inl
+++ b/ACE/ace/OS.inl
@@ -75,7 +75,11 @@ using std::strftime;
 # endif /* UNIXWARE */
 
 # if defined (ACE_HAS_GETIFADDRS)
-#   include /**/ <ifaddrs.h>
+#   if defined (ACE_VXWORKS)
+#     include /**/ <net/ifaddrs.h>
+#   else
+#     include /**/ <ifaddrs.h>
+#   endif
 # endif /* ACE_HAS_GETIFADDRS */
 
 
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 014226cbbe2..bf5711d9f33 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -3563,6 +3563,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
   if (sched_params.scope () == ACE_SCOPE_PROCESS)
     {
 # if defined(ACE_TANDEM_T1248_PTHREADS) || defined (ACE_HAS_PTHREAD_SCHEDPARAM)
+      ACE_UNUSED_ARG (id);
       ACE_NOTSUP_RETURN (-1);
 # else  /* ! ACE_TANDEM_T1248_PTHREADS */
       int result = ::sched_setscheduler (id == ACE_SELF ? 0 : id,
@@ -3617,8 +3618,10 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
   if (id != ACE_SELF)
     ACE_NOTSUP_RETURN (-1);
 
+#   if !defined (ACE_PHARLAP_LABVIEW_RT)
   if (sched_params.quantum() != ACE_Time_Value::zero)
     EtsSetTimeSlice (sched_params.quantum().msec());
+#   endif
 
 # else
 
@@ -3637,7 +3640,9 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
       // Setting the REALTIME_PRIORITY_CLASS on Windows is almost always
       // a VERY BAD THING. This include guard will allow people
       // to easily disable this feature in ACE.
-#ifndef ACE_DISABLE_WIN32_INCREASE_PRIORITY
+      // It won't work at all for Pharlap since there's no SetPriorityClass.
+#if !defined (ACE_HAS_PHARLAP) && \
+    !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY)
       // Set the priority class of this process to the REALTIME process class
       // _if_ the policy is ACE_SCHED_FIFO.  Otherwise, set to NORMAL.
       if (!::SetPriorityClass (::GetCurrentProcess (),
@@ -3661,9 +3666,10 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 # if defined (ACE_HAS_PHARLAP_RT)
       ACE_NOTSUP_RETURN (-1);
 # else
-      HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION,
-                                       FALSE,
-                                       id);
+      HANDLE hProcess
+        = ::OpenProcess (PROCESS_SET_INFORMATION,
+                         FALSE,
+                         id == ACE_SELF ? ::GetCurrentProcessId() : id);
       if (!hProcess)
         {
           ACE_OS::set_errno_to_last_error();
@@ -4783,9 +4789,7 @@ ACE_OS::thr_get_affinity (ACE_hthread_t thr_id,
 {
 #if defined (ACE_HAS_PTHREAD_GETAFFINITY_NP)
   // Handle of the thread, which is NPTL thread-id, normally a big number
-  if (::pthread_getaffinity_np (thr_id,
-                                cpu_set_size,
-                                cpu_mask) != 0)
+  if (::pthread_getaffinity_np (thr_id, cpu_set_size, cpu_mask) != 0)
     {
       return -1;
     }
@@ -4796,8 +4800,7 @@ ACE_OS::thr_get_affinity (ACE_hthread_t thr_id,
   // If you are using this flag for NPTL-threads, however, please pass as a
   // thr_id process id obtained by ACE_OS::getpid ()
   ACE_UNUSED_ARG (cpu_set_size);
-  if (::sched_getaffinity(thr_id,
-                          cpu_mask) == -1)
+  if (::sched_getaffinity(thr_id, cpu_mask) == -1)
     {
       return -1;
     }
@@ -4807,9 +4810,7 @@ ACE_OS::thr_get_affinity (ACE_hthread_t thr_id,
   // linux-thread, thus making binding to cpu of that particular thread only.
   // If you are using this flag for NPTL-threads, however, please pass as a
   // thr_id process id obtained by ACE_OS::getpid ()
-  if (::sched_getaffinity(thr_id,
-                          cpu_set_size,
-                          cpu_mask) == -1)
+  if (::sched_getaffinity(thr_id, cpu_set_size, cpu_mask) == -1)
     {
       return -1;
     }
@@ -4828,9 +4829,7 @@ ACE_OS::thr_set_affinity (ACE_hthread_t thr_id,
                           const cpu_set_t * cpu_mask)
 {
 #if defined (ACE_HAS_PTHREAD_SETAFFINITY_NP)
-  if (::pthread_setaffinity_np (thr_id,
-                                cpu_set_size,
-                                cpu_mask) != 0)
+  if (::pthread_setaffinity_np (thr_id, cpu_set_size, cpu_mask) != 0)
     {
       return -1;
     }
@@ -4842,8 +4841,7 @@ ACE_OS::thr_set_affinity (ACE_hthread_t thr_id,
   // thr_id process id obtained by ACE_OS::getpid (), but whole process will bind your CPUs
   //
   ACE_UNUSED_ARG (cpu_set_size);
-  if (::sched_setaffinity (thr_id,
-                           cpu_mask) == -1)
+  if (::sched_setaffinity (thr_id, cpu_mask) == -1)
     {
       return -1;
     }
@@ -4854,9 +4852,7 @@ ACE_OS::thr_set_affinity (ACE_hthread_t thr_id,
   // If you are using this flag for NPTL-threads, however, please pass as a
   // thr_id process id obtained by ACE_OS::getpid (), but whole process will bind your CPUs
   //
-  if (::sched_setaffinity (thr_id,
-                           cpu_set_size,
-                           cpu_mask) == -1)
+  if (::sched_setaffinity (thr_id, cpu_set_size, cpu_mask) == -1)
     {
       return -1;
     }
@@ -5531,4 +5527,3 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...)
   return ret > 0 ? _vx_call_rc : 255;
 }
 #endif /* ACE_VXWORKS && !__RTP__ */
-
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 193a3262f2b..908b7a7087a 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -2755,6 +2755,14 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
 
   priority = ::GetThreadPriority (ht_id);
 
+#   if defined (ACE_HAS_PHARLAP)
+#     if defined (ACE_PHARLAP_LABVIEW_RT)
+  policy = ACE_SCHED_FIFO;
+#     else
+  DWORD timeslice = ::EtsGetTimeSlice ();
+  policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO;
+#     endif /* ACE_PHARLAP_LABVIEW_RT */
+#   else
   DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ());
   if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR)
     ACE_FAIL_RETURN (-1);
@@ -2762,6 +2770,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
   policy =
     (priority_class ==
      REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER;
+#   endif /* ACE_HAS_PHARLAP */
 
   return 0;
 # elif defined (ACE_VXWORKS)
diff --git a/ACE/ace/OS_NS_ctype.inl b/ACE/ace/OS_NS_ctype.inl
index e7199338653..42054b36239 100644
--- a/ACE/ace/OS_NS_ctype.inl
+++ b/ACE/ace/OS_NS_ctype.inl
@@ -13,7 +13,13 @@ ACE_INLINE int
 ACE_OS::ace_isalnum (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
+# if defined (_MSC_VER) && (_MSC_VER >= 1300)
+  // For MSVC 7.x, we need to prevent "illegal" character getting into
+  // isalnum, otherwise, it will crash the program.
+  return c > 0 && c < 256 && iswalnum (c);
+# else
   return iswalnum (c);
+# endif /* _MSC_VER && _MSC_VER >= 1300 */
 #else /* ACE_USES_WCHAR */
   return isalnum ((unsigned char) c);
 #endif /* ACE_USES_WCHAR */
diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp
index b18ddc6928a..0743ef58fa2 100644
--- a/ACE/ace/OS_NS_dirent.cpp
+++ b/ACE/ace/OS_NS_dirent.cpp
@@ -41,6 +41,10 @@ ACE_DIR *
 ACE_OS::opendir_emulation (const ACE_TCHAR *filename)
 {
 #if defined (ACE_WIN32)
+#  if defined (ACE_HAS_WINCE) && !defined (INVALID_FILE_ATTRIBUTES)
+#    define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
+#  endif
+
   ACE_DIR *dir;
   ACE_TCHAR extra[3] = {0,0,0};
 
diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h
index 6f3b9b12435..88c4a4b3e34 100644
--- a/ACE/ace/OS_NS_dirent.h
+++ b/ACE/ace/OS_NS_dirent.h
@@ -82,6 +82,9 @@ namespace ACE_OS {
                ACE_SCANDIR_COMPARATOR comparator);
 
   ACE_NAMESPACE_INLINE_FUNCTION
+  int alphasort (const void *, const void *);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
   void seekdir (ACE_DIR *,
                 long loc);
 
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index a768a914887..7593899196b 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -4,6 +4,10 @@
 
 #include "ace/OS_Memory.h"
 
+#if defined (ACE_LACKS_ALPHASORT)
+# include "ace/OS_NS_string.h"
+#endif /* ACE_LACKS_ALPHASORT */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_OS
@@ -142,6 +146,25 @@ scandir (const ACE_TCHAR *dirname,
 #endif /* ACE_HAS_SCANDIR */
 }
 
+ACE_INLINE int
+alphasort (const void *a, const void *b)
+{
+#if defined (ACE_LACKS_ALPHASORT)
+  return ACE_OS::strcmp ((*static_cast<const struct ACE_DIRENT * const *>(a))->d_name,
+			 (*static_cast<const struct ACE_DIRENT * const *>(b))->d_name);
+#else
+#  if defined (ACE_SCANDIR_CMP_USES_VOIDPTR)
+  return ::alphasort (const_cast<void *>(a),
+		      const_cast<void *>(b));
+#  elif defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR)
+  return ::alphasort (a, b);
+#  else
+  return ::alphasort ((const struct ACE_DIRENT **)a,
+		      (const struct ACE_DIRENT **)b);
+#  endif
+#endif
+}
+
 ACE_INLINE void
 seekdir (ACE_DIR *d, long loc)
 {
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index c0a3d61d3ae..0c05d61d23f 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -42,10 +42,9 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
                     char *buffer, int buflen)
 {
 #if defined (ACE_HAS_POSIX_GETPWNAM_R)
-  struct passwd *result;
-  int status;
+  struct passwd *result = 0;
 
-  status = ::getpwnam_r (name, pwent, buffer, buflen, &result);
+  int const status = ::getpwnam_r (name, pwent, buffer, buflen, &result);
 
   if (status != 0)
   {
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index c4b23cb1904..1d78300260b 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -328,11 +328,16 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
   // ACE_OS_TRACE ("ACE_OS::snprintf");
 # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
      (defined (sun) && !defined (_XPG4) || defined(_XPG5)) || \
-     defined (ACE_WIN32)
+     defined (ACE_WIN32) || defined (ACE_HAS_VSWPRINTF)
   int result;
   va_list ap;
   va_start (ap, format);
-#  if defined (ACE_WIN32)
+#  if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
+  // _vsnwprintf_s() doesn't report the length needed when it truncates. This
+  // info is needed for the API contract return value, so don't use this.
+  // There's adequate protection via the maxlen.
+  result = _vsnwprintf_s (buf, maxlen, _TRUNCATE, format, ap);
+#  elif defined (ACE_WIN32)
   // 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.
@@ -387,7 +392,9 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 
 # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
      (defined (sun) && !defined (_XPG4) || defined(_XPG5)) || \
-     (defined ACE_HAS_DINKUM_STL) || defined (__DMC__)
+      defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \
+      defined (ACE_HAS_VSWPRINTF) || \
+     (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE))
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
@@ -402,7 +409,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
   return result;
 
 # elif defined (ACE_WIN32)
-  // Windows has vswprintf, but the signature is from the older ISO C
+  // Pre-VC8 Windows has vswprintf, but the signature is from the older ISO C
   // standard. Also see ACE_OS::snprintf() for more info on this.
 
   int result;
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 72a13d34b1f..637af5bb7c6 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -33,8 +33,9 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock,
       break;
     case SEEK_CUR:
       {
-# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-        LARGE_INTEGER distance, offset;
+        LARGE_INTEGER offset;
+# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX)
+        LARGE_INTEGER distance;
         distance.QuadPart = 0;
         if (!::SetFilePointerEx (lock->handle_,
                                  distance,
@@ -44,17 +45,24 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock,
             ACE_OS::set_errno_to_last_error ();
             return;
           }
-        start += offset.QuadPart;
 # else
-        DWORD const offset =
-          ::SetFilePointer (lock->handle_, 0, 0, FILE_CURRENT);
-        if (offset == INVALID_SET_FILE_POINTER)
+        offset.LowPart = ::SetFilePointer (lock->handle_,
+                                           0,
+                                           &offset.HighPart,
+                                           FILE_CURRENT);
+        if (offset.LowPart == INVALID_SET_FILE_POINTER &&
+            ::GetLastError() != NO_ERROR)
           {
             ACE_OS::set_errno_to_last_error ();
             return;
           }
-        start += static_cast<ACE_OFF_T> (offset);
-# endif  /* _FILE_OFFSET_BITS == 64 */
+# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */
+
+# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+        start += offset.QuadPart;
+# else
+        start += offset.LowPart;
+# endif /* _FILE_OFFSET_BITS == 64 */
       }
       break;
     case SEEK_END:
@@ -401,6 +409,14 @@ ACE_OS::cuserid (char *user, size_t maxlen)
   ACE_UNUSED_ARG (user);
   ACE_UNUSED_ARG (maxlen);
   ACE_NOTSUP_RETURN (0);
+#elif defined (ACE_HAS_PHARLAP)
+  ACE_UNUSED_ARG (user);
+  ACE_UNUSED_ARG (maxlen);
+  ACE_NOTSUP_RETURN (0);
+#elif defined (ACE_HAS_WINCE)
+  ACE_UNUSED_ARG (user);
+  ACE_UNUSED_ARG (maxlen);
+  ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_WIN32)
   BOOL result = GetUserNameA (user, (u_long *) &maxlen);
   if (result == FALSE)
@@ -436,6 +452,12 @@ ACE_OS::cuserid (char *user, size_t maxlen)
   // Make sure the password file is closed.
   ::endpwent ();
 
+  if (pw == 0)
+    {
+      errno = ENOENT;
+      return 0;
+    }
+
   size_t max_length = 0;
   char *userid = 0;
 
@@ -482,7 +504,11 @@ ACE_OS::cuserid (char *user, size_t maxlen)
 ACE_INLINE wchar_t *
 ACE_OS::cuserid (wchar_t *user, size_t maxlen)
 {
-# if defined (ACE_WIN32)
+# if defined (ACE_HAS_WINCE)
+  ACE_UNUSED_ARG (user);
+  ACE_UNUSED_ARG (maxlen);
+  ACE_NOTSUP_RETURN (0);
+# elif defined (ACE_WIN32)
   BOOL result = GetUserNameW (user, (u_long *) &maxlen);
   if (result == FALSE)
     ACE_FAIL_RETURN (0);
@@ -545,11 +571,11 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
 
       if (!file)
         {
-#   if (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+#   if defined(__BORLANDC__)
           ::_rtl_close (crt_handle);
 #   else
           ::_close (crt_handle);
-#   endif /* (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+#   endif /* defined(__BORLANDC__) */
         }
     }
 
@@ -923,7 +949,12 @@ 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)
+#  if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
+  // _vsnprintf_s() doesn't report the length needed when it truncates. This
+  // info is needed and relied on by others things in ACE+TAO, so don't use
+  // this. There's adequate protection via the maxlen.
+  result = _vsnprintf_s (buffer, maxlen, _TRUNCATE, format, ap);
+#  elif !defined (ACE_WIN32)
   result = ::vsnprintf (buffer, maxlen, format, ap);
 #  else
   result = ::_vsnprintf (buffer, maxlen, format, ap);
@@ -964,7 +995,8 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
 # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
-     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__))
+     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) || \
+      defined (ACE_HAS_VSWPRINTF) || defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE)
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
@@ -974,8 +1006,8 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
   return vswprintf (buffer, 4096, format, argptr);
 
 # elif defined (ACE_WIN32)
-  // Windows has vswprintf, but the signature is from the older ISO C
-  // standard. Also see ACE_OS::snprintf() for more info on this.
+  // Windows has vswprintf, but the pre-VC8 signature is from the older
+  // ISO C standard. Also see ACE_OS::snprintf() for more info on this.
 
   return vswprintf (buffer, format, argptr);
 
@@ -995,16 +1027,21 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
 {
 # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
-     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__))
+     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) || \
+      defined (ACE_HAS_VSWPRINTF)
 
   return vswprintf (buffer, maxlen, format, ap);
 
+# elif defined (ACE_HAS_TR24731_2005_CRT)
+
+  return _vsnwprintf_s (buffer, maxlen, _TRUNCATE, format, ap);
+
 # elif defined (ACE_WIN32)
 
   int result = ::_vsnwprintf (buffer, maxlen, format, ap);
 
   // Win32 doesn't regard a full buffer with no 0-terminate as an
-  // overrun.
+// overrun.
   if (result == static_cast<int> (maxlen))
     result = -1;
 
diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp
index cd2005eb041..622c57642b1 100644
--- a/ACE/ace/OS_NS_stdlib.cpp
+++ b/ACE/ace/OS_NS_stdlib.cpp
@@ -27,6 +27,7 @@ ACE_RCSID (ace,
 # include "ace/OS_NS_fcntl.h"
 # include "ace/OS_NS_ctype.h"
 # include "ace/OS_NS_sys_time.h"
+# include "ace/OS_NS_Thread.h"
 # include "ace/Numeric_Limits.h"
 #endif  /* ACE_LACKS_MKSTEMP */
 
@@ -685,8 +686,23 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
   static unsigned int const NUM_RETRIES = 50;
   static unsigned int const NUM_CHARS   = 6;  // Do not change!
 
-  ACE_RANDR_TYPE seed =
-    static_cast<ACE_RANDR_TYPE> (ACE_OS::gettimeofday ().msec ());
+  // Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to
+  // ACE_Time_Value::msec(void) to avoid truncation.
+  ACE_UINT64 msec;
+
+  // Use a const ACE_Time_Value to resolve ambiguity between
+  // ACE_Time_Value::msec (long) and ACE_Time_Value::msec(ACE_UINT64&) const.
+  const ACE_Time_Value now = ACE_OS::gettimeofday();
+  now.msec (msec);
+
+  // Add the process and thread ids to ensure uniqueness.
+  msec += ACE_OS::getpid();
+  msec += (size_t) ACE_OS::thr_self();
+
+  // ACE_thread_t may be a char* (returned by ACE_OS::thr_self()) so
+  // we need to use a C-style cast as a catch-all in order to use a
+  // static_cast<> to an integral type.
+  ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (msec);
 
   // We only care about UTF-8 / ASCII characters in generated
   // filenames.  A UTF-16 or UTF-32 character could potentially cause
@@ -694,7 +710,12 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
   // greatly slowing down this mkstemp() implementation.  It is more
   // practical to limit the search space to UTF-8 / ASCII characters
   // (i.e. 127 characters).
-  static float const MAX_VAL =
+  //
+  // Note that we can't make this constant static since the compiler
+  // may not inline the return value of ACE_Numeric_Limits::max(),
+  // meaning multiple threads could potentially initialize this value
+  // in parallel.
+  float const MAX_VAL =
     static_cast<float> (ACE_Numeric_Limits<char>::max ());
 
   // Use high-order bits rather than low-order ones (e.g. rand() %
@@ -706,7 +727,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
   // e.g.: MAX_VAL * rand() / (RAND_MAX + 1.0)
 
   // Factor out the constant coefficient.
-  static float const coefficient =
+  float const coefficient =
     static_cast<float> (MAX_VAL / (RAND_MAX + 1.0f));
 
   // @@ These nested loops may be ineffecient.  Improvements are
@@ -721,8 +742,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
           // selection to work for EBCDIC, as well.
           do
             {
-              r =
-                static_cast<ACE_TCHAR> (coefficient * ACE_OS::rand_r (seed));
+              r = static_cast<ACE_TCHAR> (coefficient * ACE_OS::rand_r (seed));
             }
           while (!ACE_OS::ace_isalnum (r));
 
diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp
index 0dd7d0880ba..a5f7248fff8 100644
--- a/ACE/ace/OS_NS_string.cpp
+++ b/ACE/ace/OS_NS_string.cpp
@@ -121,12 +121,17 @@ ACE_OS::strerror (int errnum)
   errno = 0;
   char *errmsg;
 
-#if defined (ACE_WIN32)
-   if (errnum < 0 || errnum >= _sys_nerr)
-      errno = EINVAL;
+#if defined (ACE_HAS_TR24731_2005_CRT)
+  errmsg = ret_errortext;
+  ACE_SECURECRTCALL (strerror_s (ret_errortext, sizeof (ret_errortext), errno),
+                     char *, 0, errmsg);
+  return errmsg;
+#elif defined (ACE_WIN32)
+  if (errnum < 0 || errnum >= _sys_nerr)
+    errno = EINVAL;
 #endif /* ACE_WIN32 */
-   errmsg = ::strerror (errnum);
-
+  errmsg = ::strerror (errnum);
+ 
   if (errno == EINVAL || errmsg == 0 || errmsg[0] == 0)
     {
       ACE_OS::sprintf (ret_errortext, "Unknown error %d", errnum);
@@ -323,7 +328,8 @@ ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
   return dst;
 }
 
-#if !defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_LACKS_STRTOK_R)
+#if (!defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_LACKS_STRTOK_R)) \
+    && !defined (ACE_HAS_TR24731_2005_CRT)
 char *
 ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts)
 {
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index 8f25a46615c..4c57bfc0da3 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -259,7 +259,12 @@ ACE_OS::strlen (const ACE_WCHAR_T *s)
 ACE_INLINE char *
 ACE_OS::strncat (char *s, const char *t, size_t len)
 {
+#if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
+  strncat_s (s, len + 1, t, _TRUNCATE);
+  return s;
+#else
   return ::strncat (s, t, len);
+#endif /* ACE_HAS_TR24731_2005_CRT */
 }
 
 ACE_INLINE ACE_WCHAR_T *
@@ -267,6 +272,9 @@ ACE_OS::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
 {
 #  if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT)
   return ACE_OS::wcsncat_emulation (s, t, len);
+#  elif 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
+  wcsncat_s (s, len + 1, t, _TRUNCATE);
+  return s;
 #  else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */
   return ::wcsncat (s, t, len);
 #  endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */
@@ -521,7 +529,9 @@ ACE_OS::strtok (wchar_t *s, const wchar_t *tokens)
 ACE_INLINE char *
 ACE_OS::strtok_r (char *s, const char *tokens, char **lasts)
 {
-#if defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (ACE_LACKS_STRTOK_R)
+#if defined (ACE_HAS_TR24731_2005_CRT)
+  return strtok_s (s, tokens, lasts);
+#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (ACE_LACKS_STRTOK_R)
   return ::strtok_r (s, tokens, lasts);
 #else
   return ACE_OS::strtok_r_emulation (s, tokens, lasts);
@@ -532,14 +542,16 @@ ACE_OS::strtok_r (char *s, const char *tokens, char **lasts)
 ACE_INLINE wchar_t*
 ACE_OS::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts)
 {
-#if defined (ACE_LACKS_WCSTOK)
-    return ACE_OS::strtok_r_emulation (s, tokens, lasts);
+#if defined (ACE_HAS_TR24731_2005_CRT)
+  return wcstok_s (s, tokens, lasts);
+#elif defined (ACE_LACKS_WCSTOK)
+  return ACE_OS::strtok_r_emulation (s, tokens, lasts);
 #else
 #  if defined (ACE_HAS_3_PARAM_WCSTOK)
-    return ::wcstok (s, tokens, lasts);
+  return ::wcstok (s, tokens, lasts);
 #  else /* ACE_HAS_3_PARAM_WCSTOK */
-    *lasts = ::wcstok (s, tokens);
-    return *lasts;
+  *lasts = ::wcstok (s, tokens);
+  return *lasts;
 #  endif /* ACE_HAS_3_PARAM_WCSTOK */
 #endif  /* ACE_LACKS_WCSTOK */
 }
diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl
index 50d696b2059..b106d97efc1 100644
--- a/ACE/ace/OS_NS_sys_resource.inl
+++ b/ACE/ace/OS_NS_sys_resource.inl
@@ -38,6 +38,10 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 # if defined (ACE_WIN32)
   ACE_UNUSED_ARG (who);
 
+#  if defined (ACE_LACKS_WIN32_GETPROCESSTIMES)
+  ACE_UNUSED_ARG (ru);
+  ACE_NOTSUP_RETURN (-1);
+#  else
   FILETIME dummy_1;
   FILETIME dummy_2;
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(),
@@ -47,6 +51,7 @@ ACE_OS::getrusage (int who, struct rusage *ru)
                                                              &ru->ru_utime),
                                           ace_result_),
                         int, -1);
+#  endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */
 # else
 #   if defined (ACE_HAS_RUSAGE_WHO_ENUM)
   ACE_OSCALL_RETURN (::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru), int, -1);
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index 321f2caf7ae..b8757e5bb8b 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -301,6 +301,10 @@ namespace ACE_OS
 # if defined (ACE_LACKS_UMASK)
     ACE_UNUSED_ARG (cmask);
     ACE_NOTSUP_RETURN ((mode_t)-1);
+# elif defined (ACE_HAS_TR24731_2005_CRT)
+    mode_t old_mode;
+    ACE_SECURECRTCALL (_umask_s (cmask, &old_mode), mode_t, -1, old_mode);
+    return old_mode;
 # elif defined (ACE_WIN32) && !defined (__BORLANDC__)
     ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1);
 # else
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index ad12f69eaee..a7abc3a1b4f 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -231,6 +231,9 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
 # else
   ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0);
 # endif /* DIGITAL_UNIX */
+#elif defined (ACE_HAS_TR24731_2005_CRT)
+  ACE_SECURECRTCALL (localtime_s (res, t), struct tm *, 0, res);
+  return res;
 #elif !defined (ACE_HAS_WINCE)
   ACE_OS_GUARD
 
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index 0e3d72e666d..b29c636d1f8 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -77,17 +77,10 @@ struct tm {
  */
 inline long ace_timezone()
 {
-#if defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32)
   TIME_ZONE_INFORMATION tz;
   GetTimeZoneInformation (&tz);
   return tz.Bias * 60;
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_DINKUM_STL)
-  return _timezone;  // For Win32.
-#elif defined (ACE_WIN32) && defined (ACE_HAS_DINKUM_STL)
-  time_t tod = time(0);   // get current time
-  time_t t1 = mktime(gmtime(&tod));   // convert without timezone
-  time_t t2 = mktime(localtime(&tod));   // convert with timezone
-  return difftime(t1, t2); // compute difference in seconds
 #elif defined (ACE_HAS_TIMEZONE)
   // The XPG/POSIX specification requires that tzset() be called to
   // set the global variable <timezone>.
@@ -148,11 +141,11 @@ typedef long long ACE_hrtime_t;
 #   endif /* ! ACE_HAS_HI_RES_TIMER  ||  ACE_LACKS_LONGLONG_T */
 # endif /* ACE_WIN32 */
 
-# if defined (ACE_HRTIME_T_IS_BASIC_TYPE)
-#   define ACE_HRTIME_CONVERSION(VAL) (VAL)
+# if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+#   define ACE_HRTIME_CONVERSION(VAL) ACE_U64_TO_U32(VAL)
 #   define ACE_HRTIME_TO_U64(VAL) ACE_U_LongLong(VAL)
 # else
-#   define ACE_HRTIME_CONVERSION(VAL) ACE_U64_TO_U32(VAL)
+#   define ACE_HRTIME_CONVERSION(VAL) (VAL)
 #   define ACE_HRTIME_TO_U64(VAL) (VAL)
 # endif
 
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 2e7613cbced..a22ae73bbcd 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -48,6 +48,11 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
   ACE_UNUSED_ARG (buf);
   ACE_UNUSED_ARG (buflen);
   ACE_NOTSUP_RETURN (0);
+#elif defined (ACE_HAS_TR24731_2005_CRT)
+  char *result = buf;
+  ACE_SECURECRTCALL (asctime_s (buf, static_cast<size_t> (buflen), t), \
+                     char*, 0, result);
+  return result;
 #else
   char *result = 0;
   ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, 0, result);
@@ -170,6 +175,20 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
   return bufp;
 #   endif /* ACE_USES_WCHAR */
 
+#elif defined (ACE_HAS_TR24731_2005_CRT)
+  if (buflen < ctime_buf_size)
+    {
+      errno = ERANGE;
+      return 0;
+    }
+  ACE_TCHAR *result = buf;
+#  if defined (ACE_USES_WCHAR)
+  ACE_SECURECRTCALL (_wctime_s (buf, buflen, t), wchar_t *, 0, result);
+#  else
+  ACE_SECURECRTCALL (ctime_s (buf, buflen, t), char *, 0, result);
+#  endif
+  return result;
+
 #else /* ACE_HAS_REENTRANT_FUNCTIONS */
   if (buflen < ctime_buf_size)
     {
@@ -229,9 +248,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
   ACE_hrtime_t now;
 # endif /* ! ACE_LACKS_LONGLONG_T */
 
-  // See comments about the RDTSC Pentium instruction for the ACE_WIN32
-  // version of ACE_OS::gethrtime (), below.
-  //
   // Read the high-res tick counter directly into memory variable "now".
   // The A constraint signifies a 64-bit int.
   asm volatile ("rdtsc" : "=A" (now) : : "memory");
@@ -352,6 +368,10 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 # else
   ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0);
 # endif /* DIGITAL_UNIX */
+#elif defined (ACE_HAS_TR24731_2005_CRT)
+  struct tm *tm_p = res;
+  ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p);
+  return tm_p;
 #elif defined (ACE_LACKS_GMTIME_R)
   ACE_UNUSED_ARG (t);
   ACE_UNUSED_ARG (res);
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index 81b2c9e3aa9..3ef21dacf2a 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -345,6 +345,12 @@ ACE_OS::num_processors (void)
     return num_processors;
   else
     return -1;
+#elif defined (__hpux)
+  struct pst_dynamic psd;
+  if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1)
+    return psd.psd_max_proc_cnt;
+  else
+    return -1;
 #else
   ACE_NOTSUP_RETURN (-1);
 #endif
@@ -594,8 +600,23 @@ ACE_OS::pwrite (ACE_HANDLE handle,
 
 #     else /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
-  // Go to the correct position
-  if (! ::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN))
+  // Go to the correct position; if this is a Windows variant without
+  // overlapped I/O, it probably doesn't have SetFilePointerEx either,
+  // so manage this with SetFilePointer, changing calls based on the use
+  // of 64 bit offsets.
+  DWORD newpos;
+#       if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+  newpos = ::SetFilePointer (handle,
+                             loffset.LowPart,
+                             &loffset.HighPart,
+                             FILE_BEGIN);
+#       else
+  newpos = ::SetFilePointer (handle,
+                             loffset.LowPart,
+                             0,
+                             FILE_BEGIN);
+#       endif /* 64-bit file offsets */
+  if (newpos == 0xFFFFFFFF && ::GetLastError () != NO_ERROR)
     {
       ACE_OS::set_errno_to_last_error ();
       return -1;
diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h
index f076594de80..ba92d248f5d 100644
--- a/ACE/ace/OS_NS_unistd.h
+++ b/ACE/ace/OS_NS_unistd.h
@@ -25,10 +25,12 @@
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/os_include/os_unistd.h"
+#include /**/ "ace/ACE_export.h"
 #include "ace/Time_Value.h"
+#include "ace/Basic_Types.h"
+#include "ace/os_include/os_unistd.h"
 #include "ace/os_include/os_stdio.h"
-#include /**/ "ace/ACE_export.h"
+
 
 #if defined (ACE_EXPORT_MACRO)
 #  undef ACE_EXPORT_MACRO
@@ -245,7 +247,7 @@ namespace ACE_OS
                 ACE_OVERLAPPED *);
 
   /**
-   * Receive <len> bytes into <buf> from <handle> (uses the
+   * Receive @a len bytes into @a buf from <handle> (uses the
    * <ACE_OS::read> call, which uses the <read> system call on UNIX
    * and the <ReadFile> call on Win32). If errors occur, -1 is
    * returned.  If EOF occurs, 0 is returned.  Whatever data has been
@@ -264,7 +266,7 @@ namespace ACE_OS
                     size_t bufsiz);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void *sbrk (ptrdiff_t brk);
+  void *sbrk (intptr_t brk);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int setgid (gid_t);
@@ -346,7 +348,7 @@ namespace ACE_OS
                  ACE_OVERLAPPED *);
 
   /**
-   * Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
+   * Send @a len bytes from @a buf to <handle> (uses the <ACE_OS::write>
    * calls, which is uses the <write> system call on UNIX and the
    * <WriteFile> call on Win32).  If errors occur, -1 is returned.  If
    * EOF occurs, 0 is returned.  Whatever data has been transmitted
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 5883dc4cf6f..53468306746 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -95,7 +95,7 @@ ACE_OS::getpagesize (void)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return (long) sys_info.dwPageSize;
-#elif defined (_SC_PAGESIZE)
+#elif defined (_SC_PAGESIZE) && !defined (ACE_HAS_NOTSUP_SC_PAGESIZE)
   return ::sysconf (_SC_PAGESIZE);
 #elif defined (ACE_HAS_GETPAGESIZE)
   return ::getpagesize ();
@@ -142,7 +142,7 @@ ACE_OS::chdir (const char *path)
 ACE_INLINE int
 ACE_OS::chdir (const wchar_t *path)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::_wchdir (path), int, -1);
 #else /* ACE_WIN32 */
   return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ());
@@ -355,7 +355,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset)
 {
   ACE_OS_TRACE ("ACE_OS::ftruncate");
 #if defined (ACE_WIN32)
-#  if !defined (ACE_LACKS_SETFILEPOINTEREX)
+#  if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX)
   LARGE_INTEGER loff;
   loff.QuadPart = offset;
   if (::SetFilePointerEx (handle, loff, 0, FILE_BEGIN))
@@ -530,7 +530,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 #elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1);
 #elif defined (ACE_WIN32)
-  if (::gethostname (name, ACE_Utils::Truncate<int> (maxnamelen)) == 0)
+  if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0)
   {
     return 0;
   }
@@ -659,7 +659,7 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence)
   ACE_OSCALL_RETURN (::lseek64 (handle, offset, whence), ACE_LOFF_T, -1);
 #elif defined (ACE_HAS_LLSEEK)
 # if defined (ACE_WIN32)
-#  ifndef ACE_LACKS_SETFILEPOINTEREX
+#  ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX
   LARGE_INTEGER distance, new_file_pointer;
 
   distance.QuadPart = offset;
@@ -669,19 +669,21 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence)
      ? new_file_pointer.QuadPart
      : static_cast<ACE_LOFF_T> (-1));
 #  else
-  LONG low_offset = ACE_LOW_PART(offset);
-  LONG high_offset = ACE_HIGH_PART(offset);
-
-  ACE_OFF_T const result = ::SetFilePointer (handle,
-                                             low_offset,
-                                             &high_offset,
-                                             whence);
-
-  return
-    ((result != INVALID_SET_FILE_POINTER || GetLastError () == NO_ERROR)
-     ? result
-     : static_cast<ACE_LOFF_T> (-1));
-#  endif  /* ACE_LACKS_SETFILEPOINTEREX */
+  LARGE_INTEGER l_offset;
+  l_offset.QuadPart = offset;
+  LONG low_offset = l_offset.LowPart;
+  LONG high_offset = l_offset.HighPart;
+
+  l_offset.LowPart = ::SetFilePointer (handle,
+                                       low_offset,
+                                       &high_offset,
+                                       whence);
+  if (l_offset.LowPart == INVALID_SET_FILE_POINTER &&
+      GetLastError () != NO_ERROR)
+    return static_cast<ACE_LOFF_T> (-1);
+  l_offset.HighPart = high_offset;
+  return l_offset.QuadPart;
+#  endif  /* ACE_LACKS_WIN32_SETFILEPOINTEREX */
 # else
     ACE_OSCALL_RETURN (::llseek (handle, offset, whence), ACE_LOFF_T, -1);
 # endif /* WIN32 */
@@ -783,7 +785,7 @@ ACE_OS::pipe (ACE_HANDLE fds[])
 }
 
 ACE_INLINE void *
-ACE_OS::sbrk (ptrdiff_t brk)
+ACE_OS::sbrk (intptr_t brk)
 {
 #if defined (ACE_LACKS_SBRK)
   ACE_UNUSED_ARG (brk);
@@ -1006,7 +1008,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
                                     O_WRONLY,
                                     ACE_DEFAULT_FILE_PERMS);
 
-#  if !defined (ACE_LACKS_SETFILEPOINTEREX)
+#  if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX)
   LARGE_INTEGER loffset;
   loffset.QuadPart = offset;
 #else
@@ -1017,7 +1019,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
   if (handle == ACE_INVALID_HANDLE)
     ACE_FAIL_RETURN (-1);
 
-#  if !defined (ACE_LACKS_SETFILEPOINTEREX)
+#  if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX)
   else if (::SetFilePointerEx (handle,
                                loffset,
                                0,
@@ -1028,7 +1030,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
                              &high_offset,
                              FILE_BEGIN) != INVALID_SET_FILE_POINTER
            || GetLastError () == NO_ERROR)
-#  endif
+#  endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */
     {
       BOOL result = ::SetEndOfFile (handle);
       ::CloseHandle (handle);
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 536045072be..199c1f8f7ee 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -164,6 +164,16 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+/*
+** LabVIEW RT cannot directly use an executable. Need to build the program
+** as a DLL and call it from something else. The ACE test framework knows this
+** trick and uses a LabVIEW RT target-resident control program to load a
+** DLL, look up it's main() entrypoint, and call it.
+*/
+#       if defined (ACE_BUILD_LABVIEW_EXE_AS_DLL)
+extern "C" __declspec (dllexport) int main (int, char *[]);
+#       endif /* ACE_BUILD_LABVIEW_EXE_AS_DLL) */
+
 #       define main \
 ace_main_i (int, char *[]); \
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp
index 708fdcf8b5d..3590c9cc270 100644
--- a/ACE/ace/POSIX_CB_Proactor.cpp
+++ b/ACE/ace/POSIX_CB_Proactor.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/POSIX_CB_Proactor.h"
 
-#if defined (ACE_HAS_AIO_CALLS) && !defined(__Lynx__) && !defined (__FreeBSD__)
+#if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
 
 #include "ace/Task_T.h"
 #include "ace/Log_Msg.h"
@@ -38,7 +38,7 @@ ACE_POSIX_CB_Proactor::get_impl_type (void)
   return PROACTOR_CB;
 }
 
-void ACE_POSIX_CB_Proactor::aio_completion_func (sigval_t cb_data)
+void ACE_POSIX_CB_Proactor::aio_completion_func (sigval cb_data)
 {
   ACE_POSIX_CB_Proactor * impl = static_cast<ACE_POSIX_CB_Proactor *> (cb_data.sival_ptr);
   if ( impl != 0 )
@@ -47,7 +47,7 @@ void ACE_POSIX_CB_Proactor::aio_completion_func (sigval_t cb_data)
 
 #if defined (ACE_HAS_SIG_C_FUNC)
 extern "C" void
-ACE_POSIX_CB_Proactor_aio_completion (sigval_t cb_data)
+ACE_POSIX_CB_Proactor_aio_completion (sigval cb_data)
 {
   ACE_POSIX_CB_Proactor::aio_completion_func (cb_data);
 }
@@ -181,4 +181,4 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__ */
+#endif /* ACE_HAS_AIO_CALLS && !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h
index 2b844c180a8..238b1f5287f 100644
--- a/ACE/ace/POSIX_CB_Proactor.h
+++ b/ACE/ace/POSIX_CB_Proactor.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_AIO_CALLS) && !defined(__Lynx__) && !defined (__FreeBSD__)
+#if defined (ACE_HAS_AIO_CALLS)
 
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Semaphore.h"
@@ -27,9 +27,6 @@
 
 #include "ace/POSIX_Proactor.h"
 
-#if defined (ACE_LACKS_SIGVAL_T)
-typedef union sigval sigval_t;
-#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -54,7 +51,7 @@ public:
 
   // This only public so the "extern C" completion function can see it
   // when needed.
-  static void aio_completion_func (sigval_t cb_data);
+  static void aio_completion_func (sigval cb_data);
 
 protected:
 
@@ -96,5 +93,5 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__  */
+#endif /* ACE_HAS_AIO_CALLS */
 #endif /* ACE_POSIX_CB_PROACTOR_H*/
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index fcad91bfe93..19e4fff9810 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -22,7 +22,7 @@
 
 ACE_RCSID(ace, Pagefile_Memory_Pool, "$Id$")
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
 #if !defined (ACE_HAS_WINCE)
 #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
   MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)
@@ -381,5 +381,4 @@ ACE_Pagefile_Memory_Pool::map (int &first_time,
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 */
-
+#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h
index 5c12968554a..2571755eca1 100644
--- a/ACE/ace/Pagefile_Memory_Pool.h
+++ b/ACE/ace/Pagefile_Memory_Pool.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
 
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_mman.h"
@@ -191,7 +191,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
 
 #if defined (__ACE_INLINE__)
 #include "ace/Pagefile_Memory_Pool.inl"
diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl
index dd8eeb61220..6fd4cf0e8b1 100644
--- a/ACE/ace/Pagefile_Memory_Pool.inl
+++ b/ACE/ace/Pagefile_Memory_Pool.inl
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -51,4 +51,4 @@ ACE_Pagefile_Memory_Pool::base_addr (void) const
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 &7 !ACE_HAS_PHARLAP */
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 110e52f4673..acfd3d71da4 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -587,36 +587,39 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
   ACE_TRACE ("ACE_Function_Node::symbol");
   if (this->open_dll (yyerrno) == 0)
     {
-      ACE_Service_Factory_Ptr func = 0;
       this->symbol_ = 0;
 
       // Locate the factory function <function_name> in the shared
       // object.
-      ACE_TCHAR *function_name = const_cast<ACE_TCHAR *> (this->function_name_);
-      void *func_p = this->dll_.symbol (function_name);
+      ACE_TCHAR * const function_name =
+        const_cast<ACE_TCHAR *> (this->function_name_);
+
+      void * const func_p = this->dll_.symbol (function_name);
       if (func_p == 0)
         {
           ++yyerrno;
 
-          if (this->symbol_ == 0)
-            {
-              ++yyerrno;
-
 #ifndef ACE_NLOGGING
-              ACE_TCHAR *errmsg = this->dll_.error ();
-              ACE_ERROR ((LM_ERROR,
-                          ACE_LIB_TEXT ("DLL::symbol failed for function %s: ")
-                          ACE_LIB_TEXT ("%s\n"),
-                          function_name,
-                          errmsg ? errmsg :
-        ACE_LIB_TEXT ("no error reported")));
+          ACE_TCHAR * const errmsg = this->dll_.error ();
+          ACE_ERROR ((LM_ERROR,
+                      ACE_LIB_TEXT ("DLL::symbol failed for function %s: ")
+                      ACE_LIB_TEXT ("%s\n"),
+                      function_name,
+                      errmsg ? errmsg : ACE_LIB_TEXT ("no error reported")));
 #endif /* ACE_NLOGGING */
 
-              return 0;
-            }
+          return 0;
         }
-      ptrdiff_t temp_p = reinterpret_cast<ptrdiff_t> (func_p);
-      func = reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
+
+#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
+      int const temp_p = reinterpret_cast<int> (func_p);
+#else
+      intptr_t const temp_p = reinterpret_cast<intptr_t> (func_p);
+#endif
+
+      ACE_Service_Factory_Ptr func =
+        reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
+
       // Invoke the factory function and record it's return value.
       this->symbol_ = (*func) (gobbler);
 
diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h
index 1c88ccdc3ed..7e1a891dddf 100644
--- a/ACE/ace/Pipe.h
+++ b/ACE/ace/Pipe.h
@@ -85,10 +85,10 @@ public:
   /// Dump the state of the object.
   void dump (void) const;
 
-  /// send upto <n> bytes in <buf>.
+  /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
 
-  /// Recv upto <n> bytes in <buf>.
+  /// Recv upto @a n bytes in @a buf.
   ssize_t recv (void *buf, size_t n) const;
 
   /// Send n bytes, keep trying until n are sent.
@@ -127,26 +127,26 @@ public:
    */
   ssize_t recv (size_t n, ...) const;
 
-  /// Send <n> bytes via Win32 WriteFile using overlapped I/O.
+  /// Send @a n bytes via Win32 WriteFile using overlapped I/O.
   ssize_t send (const void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
 
-  /// Recv <n> bytes via Win32 ReadFile using overlapped I/O.
+  /// Recv @a n bytes via Win32 ReadFile using overlapped I/O.
   ssize_t recv (void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
 
-  /// Send an <iovec> of size <n> to the file.
+  /// Send an <iovec> of size @a n to the file.
   ssize_t sendv (const iovec iov[],
                  int n) const;
 
-  /// Send an <iovec> of size <n> to the file.  Will block until all
+  /// Send an <iovec> of size @a n to the file.  Will block until all
   /// bytes are sent or an error occurs.
   ssize_t sendv_n (const iovec iov[],
                    int n) const;
 
-  /// Receive an <iovec> of size <n> to the file.
+  /// Receive an <iovec> of size @a n to the file.
   ssize_t recvv_n (iovec iov[],
                    int n) const;
 
diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h
index 6c84ade0e64..9ecfb9d4d26 100644
--- a/ACE/ace/Priority_Reactor.h
+++ b/ACE/ace/Priority_Reactor.h
@@ -43,7 +43,7 @@ public:
   ACE_Priority_Reactor (ACE_Sig_Handler * = 0,
                         ACE_Timer_Queue * = 0);
 
-  /// Initialize <ACE_Priority_Reactor> with size <size>.
+  /// Initialize <ACE_Priority_Reactor> with size @a size.
   ACE_Priority_Reactor (size_t size,
                         int restart = 0,
                         ACE_Sig_Handler * = 0,
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 481c7eef5b5..9d529243604 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -11,9 +11,10 @@
 #include "ace/Proactor_Impl.h"
 #include "ace/Object_Manager.h"
 #include "ace/Task_T.h"
+
 #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF)
 #    include "ace/Service_Config.h"
-#  endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */
+#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */
 
 
 ACE_RCSID (ace,
@@ -318,8 +319,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
       ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
 #  elif defined (ACE_POSIX_SIG_PROACTOR)
       ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
-#  else /* Default order: CB (but not Lynx), SIG, AIOCB */
-#    if !defined (__Lynx) && !defined (__FreeBSD__)
+#  else /* Default order: CB, SIG, AIOCB */
+#    if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
       ACE_NEW (implementation, ACE_POSIX_CB_Proactor);
 #    else
 #      if defined(ACE_HAS_POSIX_REALTIME_SIGNALS)
@@ -327,7 +328,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
 #      else
       ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
 #      endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-#    endif /* !__Lynx && !__FreeBSD__ */
+#    endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
 #  endif /* ACE_POSIX_AIOCB_PROACTOR */
 #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
       // WIN_Proactor.
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h
index bcea10ec0fa..88dd9321c4a 100644
--- a/ACE/ace/Proactor.h
+++ b/ACE/ace/Proactor.h
@@ -221,7 +221,7 @@ public:
   /**
    * Run the event loop until the <ACE_Proactor::handle_events> method
    * returns -1, the <end_event_loop> method is invoked, or the
-   * <ACE_Time_Value> expires, in which case 0 is returned.
+   * ACE_Time_Value expires, in which case 0 is returned.
    */
   static int run_event_loop (ACE_Time_Value &tv);
 
@@ -277,7 +277,7 @@ public:
    * Run the event loop until the <ACE_Proactor::handle_events>
    * method returns -1, the
    * <end_proactor_event_loop> method is invoked,
-   * or the <ACE_Time_Value>
+   * or the ACE_Time_Value
    * expires, in which case a 0 is returned.
    */
   int proactor_run_event_loop (ACE_Time_Value &tv,
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index b79fbcbd0f9..db6bfb1c1e1 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -112,15 +112,21 @@ ACE_Process::spawn (ACE_Process_Options &options)
            h != ACE_INVALID_HANDLE && curr_len + 20 < max_len;
            h = h_iter ())
         {
-#if defined (ACE_WIN64)
+#if defined (ACE_WIN32)
+# if defined (ACE_WIN64)
+          curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
+                                       ACE_LIB_TEXT (" +H %I64p"),
+                                       h);
+# else
           curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
-                                       ACE_LIB_TEXT (" +H %I64d"),
+                                       ACE_LIB_TEXT (" +H %p"),
                                        h);
+# endif  /* ACE_WIN64 */
 #else
           curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
                                        ACE_LIB_TEXT (" +H %d"),
                                        h);
-#endif /* ACE_WIN64 */
+#endif /* ACE_WIN32 */
         }
     }
 
@@ -871,7 +877,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
   do 
     {
       retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp);
-      if (retval > ACE_Utils::Truncate<int> (tmp_buflen))
+      if (retval > ACE_Utils::truncate_cast<int> (tmp_buflen))
         {
           tmp_buflen *= 2;
           ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1);
@@ -1066,10 +1072,10 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
   if (command_line_buf_len_ < 1)
     return -1;
 
-#if !defined (ACE_LACKS_VSNPRINTF)
-  // sprintf the format and args into command_line_buf__.
+#if !defined (ACE_LACKS_VSNPRINTF) || defined (ACE_HAS_TRIO)
+  // vsnprintf the format and args into command_line_buf__.
   ACE_OS::vsnprintf (command_line_buf_,
-                     command_line_buf_len_ - 1,
+                     command_line_buf_len_,
                      format,
                      argp);
 #else
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index 3b9b18f6429..87dfc3994ee 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -101,11 +101,11 @@ ACE_Process::exit_code (ACE_exitcode code)
 ACE_INLINE u_long
 ACE_Process_Options::creation_flags (void) const
 {
-#if defined (UNICODE) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   return creation_flags_ | CREATE_UNICODE_ENVIRONMENT;
 #else
   return creation_flags_;
-#endif /* UNICODE */
+#endif /* ACE_USES_WCHAR */
 }
 
 ACE_INLINE void
diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h
index 806d5ecd438..38026a85fe9 100644
--- a/ACE/ace/Process_Manager.h
+++ b/ACE/ace/Process_Manager.h
@@ -202,7 +202,7 @@ public:
   /**
    * Create @a n new processes by passing @a options to
    * <ACE_Process::spawn>, which is called @a n times.  If <child_pids>
-   * is non-0 it is expected to be an array of <n> <pid_t>'s, which
+   * is non-0 it is expected to be an array of @a n <pid_t>'s, which
    * are filled in with the process ids of each newly created process.
    * Register @a event_handler to be called back when each process exits.
    * Returns 0 on success and -1 on failure.
diff --git a/ACE/ace/Process_Mutex.cpp b/ACE/ace/Process_Mutex.cpp
index 9aba33a7894..b6ac8b51e16 100644
--- a/ACE/ace/Process_Mutex.cpp
+++ b/ACE/ace/Process_Mutex.cpp
@@ -48,7 +48,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode)
 #else
   : lock_ (USYNC_PROCESS,
            name ?
-             ACE_TEXT_CHAR_TO_TCHAR (name) : this->unique_name (),
+             ACE_TEXT_CHAR_TO_TCHAR (name) : unique_name (),
            (ACE_mutexattr_t *) arg,
            mode)
 #endif /* _ACE_USE_SV_SEM */
@@ -73,7 +73,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
 #else
   : lock_ (USYNC_PROCESS,
            name ?
-             ACE_TEXT_WCHAR_TO_TCHAR (name) : this->unique_name (),
+             ACE_TEXT_WCHAR_TO_TCHAR (name) : unique_name (),
            (ACE_mutexattr_t *) arg,
            mode)
 #endif /* _ACE_USE_SV_SEM */
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index e5535ad3951..2aa5ba852e1 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -129,7 +129,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
             --if_cnt;
 
             // Convert to 0-based for indexing, next loop check.
-            if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK)
+            if (if_addrs[if_cnt].is_loopback())
               continue;
             if (this->subscribe (mcast_addr,
                                  qos_params,
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index af799d2d0d8..1bb5f873a8c 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -91,7 +91,7 @@ public:
                 ACE_OVERLAPPED *overlapped,
                 ACE_OVERLAPPED_COMPLETION_FUNC func) const;
 
-  /// Send an <n> byte <buf> to the datagram socket (uses <WSASentTo>).
+  /// Send an @a n byte @a buf to the datagram socket (uses <WSASentTo>).
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp
index a93b6967145..a60190300a8 100644
--- a/ACE/ace/RB_Tree.cpp
+++ b/ACE/ace/RB_Tree.cpp
@@ -1004,6 +1004,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<
   else
     y = z;
 
+  if (!y)
+    return -1;
+
   if (y->left ())
     x = y->left ();
   else
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index 08706910d73..9fc7e5e45eb 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -594,6 +594,9 @@ class ACE_RB_Tree_Iterator_Base
 
 public:
 
+  /// Copy constructor.
+  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
+
   /// Assignment operator: copies both the tree reference and the position in the tree.
   void operator= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
 
@@ -653,9 +656,6 @@ protected:
   ACE_RB_Tree_Iterator_Base (const EXT_ID& key,
                              ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS,ACE_LOCK> &tree);
 
-  /// Copy constructor.
-  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
-
   /// Destructor.
   ~ACE_RB_Tree_Iterator_Base (void);
 
diff --git a/ACE/ace/README b/ACE/ace/README
index c973ff2df66..78fbc3a25dd 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -714,6 +714,9 @@ ACE_HAS_TLI                             Platform supports TLI.  Also
                                         instead of this.
 ACE_HAS_TLI_PROTOTYPES                  Platform provides TLI function
                                         prototypes
+ACE_HAS_TR24731_2005_CRT                The platform provides an implementation
+                                        of C99 draft TR24731 (October 2005),
+                                        C run-time with more secure parameters.
 ACE_HAS_TSS_EMULATION                   ACE provides TSS emulation.
                                         See also
                                         ACE_DEFAULT_THREAD_KEYS.
@@ -1166,7 +1169,9 @@ 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
+ACE_LACKS_WIN32_GETPROCESSTIMES         The Windows platform doesn't have
+                                        GetProcessTimes().
+ACE_LACKS_WIN32_MOVEFILEEX              The Windows platform doesn't have
                                         MoveFileEx().
 ACE_LACKS_WIN32_SECURITY_DESCRIPTORS    The Windows platform doesn't have
                                         security descriptor support.
diff --git a/ACE/ace/RW_Process_Mutex.cpp b/ACE/ace/RW_Process_Mutex.cpp
index f16bf535182..b30e176b8ed 100644
--- a/ACE/ace/RW_Process_Mutex.cpp
+++ b/ACE/ace/RW_Process_Mutex.cpp
@@ -30,7 +30,7 @@ ACE_RW_Process_Mutex::unique_name (void)
 ACE_RW_Process_Mutex::ACE_RW_Process_Mutex (const ACE_TCHAR *name,
                                             int flags,
                                                 mode_t mode )
-  : lock_ (name ? name : this->unique_name (), flags, mode)
+  : lock_ (name ? name : unique_name (), flags, mode)
 {
 // ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex");
 }
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index 987b869160d..492226465af 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -91,8 +91,7 @@ public:
    * pointer.  If <delete_reactor> != 0 then we'll delete the Reactor
    * at destruction time.
    */
-  static ACE_Reactor *instance (ACE_Reactor *,
-                                int delete_reactor = 0);
+  static ACE_Reactor *instance (ACE_Reactor *, int delete_reactor = 0);
 
   /// Delete the dynamically allocated Singleton
   static void close_singleton (void);
@@ -123,7 +122,7 @@ public:
   /**
    * Run the event loop until the <ACE_Reactor::handle_events> or
    * <ACE_Reactor::alertable_handle_events> methods returns -1, the
-   * <end_event_loop> method is invoked, or the <ACE_Time_Value>
+   * <end_event_loop> method is invoked, or the ACE_Time_Value
    * expires.  Note that this method can only be used by the singleton
    * <ACE_Reactor::instance>.  Thus, to run another reactor use
    * <ACE_Reactor::run_reactor_event_loop>.
@@ -187,7 +186,7 @@ public:
   /**
    * Run the event loop until the <ACE_Reactor::handle_events> or
    * <ACE_Reactor::alertable_handle_events> methods returns -1, the
-   * <end_reactor_event_loop> method is invoked, or the <ACE_Time_Value>
+   * <end_reactor_event_loop> method is invoked, or the ACE_Time_Value
    * expires.
    */
   virtual int run_reactor_event_loop (ACE_Time_Value &tv,
@@ -821,7 +820,7 @@ public:
 
   /**
    * Returns 0, if the size of the current message has been put in
-   * <size> returns -1, if not.  ACE_HANDLE allows the reactor to
+   * @a size returns -1, if not.  ACE_HANDLE allows the reactor to
    * check if the caller is valid.  Used for CLASSIX Reactor
    * implementation.
    */
diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h
index 47800975214..94d022b1dbf 100644
--- a/ACE/ace/Reactor_Impl.h
+++ b/ACE/ace/Reactor_Impl.h
@@ -58,10 +58,10 @@ public:
    * This wakeups the <Reactor_Impl> if currently blocked.  Pass over
    * both the <Event_Handler> *and* the <mask> to allow the caller to
    * dictate which <Event_Handler> method the <Reactor_Impl> will
-   * invoke.  The <ACE_Time_Value> indicates how long to blocking
-   * trying to notify the <Reactor_Impl>.  If <timeout> == 0, the
+   * invoke.  The ACE_Time_Value indicates how long to blocking
+   * trying to notify the <Reactor_Impl>.  If @a timeout == 0, the
    * caller will block until action is possible, else will wait until
-   * the relative time specified in *<timeout> elapses).
+   * the relative time specified in *@a timeout elapses).
    */
   virtual int notify (ACE_Event_Handler *eh = 0,
                       ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
@@ -141,7 +141,7 @@ public:
 
   /**
    * Returns 0, if the size of the current message has been put in
-   * <size> Returns -1, if not.  ACE_HANDLE allows the reactor to
+   * @a size Returns -1, if not.  ACE_HANDLE allows the reactor to
    * check if the caller is valid.
    */
   virtual int current_info (ACE_HANDLE, size_t & /* size */) = 0;
@@ -269,7 +269,7 @@ public:
                                 ACE_Reactor_Mask mask) = 0;
 
   /**
-   * Register <new_sh> to handle the signal <signum> using the
+   * Register <new_sh> to handle the signal @a signum using the
    * <new_disp>.  Returns the <old_sh> that was previously registered
    * (if any), along with the <old_disp> of the signal handler.
    */
@@ -311,10 +311,10 @@ public:
                               ACE_Reactor_Mask mask) = 0;
 
   /**
-   * Remove the ACE_Event_Handler currently associated with <signum>.
+   * Remove the ACE_Event_Handler currently associated with @a signum.
    * Install the new disposition (if given) and return the previous
    * disposition (if desired by the caller).  Returns 0 on success and
-   * -1 if <signum> is invalid.
+   * -1 if @a signum is invalid.
    */
   virtual int remove_handler (int signum,
                               ACE_Sig_Action *new_disp,
@@ -438,10 +438,10 @@ public:
   // = Notification methods.
 
   /**
-   * Notify <event_handler> of <mask> event.  The <ACE_Time_Value>
-   * indicates how long to blocking trying to notify.  If <timeout> ==
+   * Notify <event_handler> of <mask> event.  The ACE_Time_Value
+   * indicates how long to blocking trying to notify.  If @a timeout ==
    * 0, the caller will block until action is possible, else will wait
-   * until the relative time specified in <timeout> elapses).
+   * until the relative time specified in @a timeout elapses).
    */
   virtual int notify (ACE_Event_Handler *event_handler = 0,
                       ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
@@ -491,7 +491,7 @@ public:
                        ACE_Event_Handler **event_handler = 0) = 0;
 
   /**
-   * Check to see if <signum> is associated with a valid Event_Handler
+   * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the <event_handler> associated with
    * this <handler> if <event_handler> != 0.
    */
diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp
index 880513a483a..daf28c8a9ab 100644
--- a/ACE/ace/Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Recursive_Thread_Mutex.cpp
@@ -85,20 +85,17 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 #if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS)
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_RECURSIVE_MUTEXES)
+# if defined (ACE_WIN32)
+  // This is really a Win32-ism...
   // Nothing inside of a CRITICAL_SECTION object should ever be
   // accessed directly.  It is documented to change at any time.
-# if defined (ACE_WIN64) && !defined(_M_AMD64)
-  // Things are different on Windows XP 64-bit. However, as of Feb 2006
-  // Windows XP 64-bit edition on Intel EM64T w/ VC8, LockCount is
-  // decremented at first acquire and then doesn't change. RecursionCount,
-  // however, works the same as Win32, below.
-  return this->lock_.LockCount + 1;
-# elif defined (ACE_WIN32)
-  // This is really a Win32-ism...
+  //
+  // It has been reported that this this works for all three
+  // architectures.  However, this does not work on Win64 before SP1.  
   return this->lock_.RecursionCount;
 # else
   ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_RECURSIVE_MUTEXES */
+# endif /* ACE_WIN32 */
 #else
   int nesting_level = 0;
   ACE_OS::mutex_lock (&this->lock_.nesting_mutex_);
diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h
index c24e4425b64..5ce635cac12 100644
--- a/ACE/ace/Recursive_Thread_Mutex.h
+++ b/ACE/ace/Recursive_Thread_Mutex.h
@@ -72,8 +72,8 @@ public:
   int acquire (ACE_Time_Value &tv);
 
   /**
-   * If <tv> == 0 the call <acquire()> directly.  Otherwise, Block the
-   * thread until we acquire the mutex or until <tv> times out, in
+   * If @a tv == 0 the call <acquire()> directly.  Otherwise, Block the
+   * thread until we acquire the mutex or until @a tv times out, in
    * which case -1 is returned with <errno> == <ETIME>.  Note that
    * <*tv> is assumed to be in "absolute" rather than "relative" time.
    * The value of <*tv> is updated upon return to show the actual
diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h
index aba69560d28..18487ab4094 100644
--- a/ACE/ace/Recyclable.h
+++ b/ACE/ace/Recyclable.h
@@ -45,10 +45,6 @@ enum ACE_Recyclable_State
 
 /**
  * @class ACE_Recyclable
- *
- * @brief
- *
- *
  */
 class ACE_Export ACE_Recyclable
 {
diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp
index 2e6803ea8cd..b6907ebec18 100644
--- a/ACE/ace/Registry.cpp
+++ b/ACE/ace/Registry.cpp
@@ -6,7 +6,7 @@ ACE_RCSID (ace,
            Registry,
            "$Id$")
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #  include "ace/os_include/os_netdb.h"
 #  include "ace/OS_NS_unistd.h"
@@ -814,10 +814,10 @@ ACE_Registry::Naming_Context::list (Binding_List &list)
 
 // Default constructor
 ACE_Registry::Binding_Iterator::Binding_Iterator ()
-  : object_iteration_ (*this),
-    context_iteration_ (*this),
-    iteration_complete_ (*this)
 {
+  this->object_iteration_.iterator (this);
+  this->context_iteration_.iterator (this);
+  this->iteration_complete_.iterator (this);
   this->reset ();
 }
 
@@ -839,27 +839,15 @@ ACE_Registry::Binding_Iterator::Iteration_State::reset ()
 }
 
 
-ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (Binding_Iterator &iter)
-  : parent_ (&iter),
-    index_ (0)
-{
-}
-
-
-ACE_Registry::Binding_Iterator::Object_Iteration::Object_Iteration (Binding_Iterator &iter)
-  : Iteration_State (iter)
-{
-}
-
-
-ACE_Registry::Binding_Iterator::Context_Iteration::Context_Iteration (Binding_Iterator &iter)
-  : Iteration_State (iter)
+void
+ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *iter)
 {
+  this->parent_ = iter;
 }
 
 
-ACE_Registry::Binding_Iterator::Iteration_Complete::Iteration_Complete (Binding_Iterator &iter)
-  : Iteration_State (iter)
+ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State ()
+  : index_ (0)
 {
 }
 
@@ -1136,4 +1124,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h
index bb188666ab7..88ffd807d49 100644
--- a/ACE/ace/Registry.h
+++ b/ACE/ace/Registry.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32)
-// This only works on Win32 platforms
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
+// This only works on registry-capable Win32 platforms.
 
 #include "ace/Containers.h"
 #include "ace/SString.h"
@@ -193,7 +193,7 @@ public:
     /// Empty constructor: keys will be NULL
     Naming_Context (void);
 
-    /// Constructor: key_ will be set to <key>
+    /// Constructor: key_ will be set to @a key
     Naming_Context (const HKEY &key);
 
     /// Destructor will call <Naming_Context::close>.
@@ -460,7 +460,10 @@ public:
       {
       public:
         /// Constructor
-        Iteration_State (Binding_Iterator &iterator);
+        Iteration_State ();
+
+        /// Set the iterator reference.
+        void iterator (Binding_Iterator *iterator);
 
         /// Next <how_many> entries
         virtual int next_n (u_long how_many,
@@ -479,9 +482,6 @@ public:
   private:
     class ACE_Export Object_Iteration : public Iteration_State
       {
-      public:
-        Object_Iteration (Binding_Iterator &iterator);
-
         /// Next <how_many> entries
         int next_n (u_long how_many,
                     Binding_List &list);
@@ -490,8 +490,6 @@ public:
     class ACE_Export Context_Iteration : public Iteration_State
       {
       public:
-        Context_Iteration (Binding_Iterator &iterator);
-
         /// Next @a how_many entries
         int next_n (u_long how_many,
                     Binding_List &list);
@@ -500,8 +498,6 @@ public:
     class ACE_Export Iteration_Complete : public Iteration_State
       {
       public:
-        Iteration_Complete (Binding_Iterator &iterator);
-
         /// Next @a how_many entries
         int next_n (u_long how_many,
                     Binding_List &list);
@@ -558,6 +554,6 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 #include /**/ "ace/post.h"
 #endif /* ACE_REGISTRY_H */
diff --git a/ACE/ace/Registry_Name_Space.cpp b/ACE/ace/Registry_Name_Space.cpp
index e382af8482e..c5c5989b789 100644
--- a/ACE/ace/Registry_Name_Space.cpp
+++ b/ACE/ace/Registry_Name_Space.cpp
@@ -4,8 +4,8 @@
 
 ACE_RCSID(ace, Registry_Name_Space, "$Id$")
 
-#if (defined (ACE_WIN32) && defined (UNICODE))
-// This only works on Win32 platforms when UNICODE is turned on
+#if (defined (ACE_WIN32) && defined (ACE_USES_WCHAR))
+// This only works on Win32 platforms when ACE_USES_WCHAR is turned on
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -290,4 +290,4 @@ ACE_Registry_Name_Space::dump (void) const
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && UNICODE */
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
diff --git a/ACE/ace/Registry_Name_Space.h b/ACE/ace/Registry_Name_Space.h
index 52b9158d625..b54f99dc3af 100644
--- a/ACE/ace/Registry_Name_Space.h
+++ b/ACE/ace/Registry_Name_Space.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (defined (ACE_WIN32) && defined (UNICODE))
-// This only works on Win32 platforms when UNICODE is turned on
+#if (defined (ACE_WIN32) && defined (ACE_USES_WCHAR))
+// This only works on Win32 platforms when ACE_USES_WCHAR is turned on
 
 #include "ace/Registry.h"
 #include "ace/Naming_Context.h"
@@ -133,7 +133,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && UNICODE */
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index 05f6c656363..b0c548c4fd3 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -8,7 +8,6 @@
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256
 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 100
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300
diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h
index 8690ac7c08e..4d97aef26a3 100644
--- a/ACE/ace/SOCK.h
+++ b/ACE/ace/SOCK.h
@@ -30,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @class ACE_SOCK
  *
  * @brief An abstract class that forms the basis for more specific
- * classes, such as <ACE_SOCK_Acceptor> and <ACE_SOCK_Stream>.
+ * classes, such as ACE_SOCK_Acceptor and <ACE_SOCK_Stream>.
  * Do not instantiate this class.
  *
  * This class provides functions that are common to all of the
diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h
index 4341698c7c9..35e112c1aa3 100644
--- a/ACE/ace/SOCK_Acceptor.h
+++ b/ACE/ace/SOCK_Acceptor.h
@@ -98,11 +98,11 @@ public:
 
   // = Passive connection <accept> methods.
   /**
-   * Accept a new <ACE_SOCK_Stream> connection.  A <timeout> of 0
-   * means block forever, a <timeout> of {0, 0} means poll.  <restart>
+   * Accept a new <ACE_SOCK_Stream> connection.  A @a timeout of 0
+   * means block forever, a @a timeout of {0, 0} means poll.  <restart>
    * == 1 means "restart if interrupted," i.e., if errno == EINTR.
    * Note that <new_stream> inherits the "blocking mode" of <this>
-   * <ACE_SOCK_Acceptor>, i.e., if <this> acceptor factory is in
+   * ACE_SOCK_Acceptor, i.e., if <this> acceptor factory is in
    * non-blocking mode, the <net_stream> will be in non-blocking mode
    * and vice versa.
    */
@@ -115,11 +115,11 @@ public:
 #if !defined (ACE_HAS_WINCE)
   /**
    * Accept a new <ACE_SOCK_Stream> connection using the QoS
-   * information in <qos_params>.  A <timeout> of 0 means block
-   * forever, a <timeout> of {0, 0} means poll.  <restart> == 1 means
+   * information in <qos_params>.  A @a timeout of 0 means block
+   * forever, a @a timeout of {0, 0} means poll.  <restart> == 1 means
    * "restart if interrupted," i.e., if errno == EINTR.  Note that
    * <new_stream> inherits the "blocking mode" of <this>
-   * <ACE_SOCK_Acceptor>, i.e., if <this> acceptor factory is in
+   * ACE_SOCK_Acceptor, i.e., if <this> acceptor factory is in
    * non-blocking mode, the <net_stream> will be in non-blocking mode
    * and vice versa.
    */
diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp
index dbbe3cb539c..7a0f5b9ec95 100644
--- a/ACE/ace/SOCK_Connector.cpp
+++ b/ACE/ace/SOCK_Connector.cpp
@@ -121,7 +121,36 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
           // This expression checks if we were polling.
           if (timeout->sec () == 0
               && timeout->usec () == 0)
-            error = EWOULDBLOCK;
+            {
+#if defined(ACE_WIN32)
+              // In order to detect when the socket that has been
+              // bound to is in TIME_WAIT we need to do the connect
+              // (which will always return EWOULDBLOCK) and then do an
+              // ACE::handle_timed_complete() (with timeout==0,
+              // i.e. poll). This will do a select() on the handle
+              // which will immediately return with the handle in an
+              // error state. The error code is then retrieved with
+              // getsockopt(). Good sockets however will return from
+              // the select() with ETIME - in this case return
+              // EWOULDBLOCK so the wait strategy can complete the
+              // connection.
+              if(ACE::handle_timed_complete (new_stream.get_handle (),
+                                             timeout) == ACE_INVALID_HANDLE)
+                {
+                  int const tmp = errno;
+                  if (tmp != ETIME)
+                    {
+                      error = tmp;
+                    }
+                  else
+                    error = EWOULDBLOCK;
+                }
+              else
+                result = 0;
+#else  /* ACE_WIN32 */
+              error = EWOULDBLOCK;
+#endif /* ACE_WIN32 */
+            }
           // Wait synchronously using timeout.
           else if (this->complete (new_stream,
                                    0,
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index d2a5e4cf8f3..08c844cea08 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -111,7 +111,7 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
         }
       else
         {
-          io_vec->iov_len = ACE_Utils::Truncate<size_t> (rcv_len);
+          io_vec->iov_len = ACE_Utils::truncate_cast<size_t> (rcv_len);
           addr.set_size (addr_len);
         }
       return rcv_len;
@@ -350,9 +350,9 @@ ACE_SOCK_Dgram::send (const iovec iov[],
 
   // Determine the total length of all the buffers in <iov>.
   for (i = 0; i < n; i++)
-#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530))
-    // The iov_len is unsigned in Borland. If we go ahead and try the
-    // if, it will emit a warning.
+#if ! (defined(__BORLANDC__) || defined(linux) || defined(__RTEMS_MAJOR__))
+    // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go
+    // ahead and try the if, it will emit a warning.
     if (iov[i].iov_len < 0)
       return -1;
     else
@@ -399,9 +399,9 @@ ACE_SOCK_Dgram::recv (iovec iov[],
   int i;
 
   for (i = 0; i < n; i++)
-#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530))
-    // The iov_len is unsigned in Borland. If we go ahead and try the
-    // if, it will emit a warning.
+#if ! (defined(__BORLANDC__) || defined(linux) || defined(__RTEMS_MAJOR__))
+    // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go
+    // ahead and try the if, it will emit a warning.
     if (iov[i].iov_len < 0)
       return -1;
     else
@@ -729,6 +729,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
       delete[] buf; // clean up
     }
   else
+#else  /* ACE_WIN32 */
+    ACE_UNUSED_ARG(net_if);
 #endif /* ACE_WIN32 */
     lmreq.ipv6mr_interface = 0;
 
diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h
index c78b731db40..23dc687eba1 100644
--- a/ACE/ace/SOCK_Dgram.h
+++ b/ACE/ace/SOCK_Dgram.h
@@ -84,13 +84,13 @@ public:
   ~ACE_SOCK_Dgram (void);
 
   // = Data transfer routines.
-  /// Send an <n> byte <buf> to the datagram socket (uses <sendto(3)>).
+  /// Send an @a n byte @a buf to the datagram socket (uses <sendto(3)>).
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
                 int flags = 0) const;
 
-  /// Receive an <n> byte <buf> from the datagram socket (uses
+  /// Receive an @a n byte @a buf from the datagram socket (uses
   /// <recvfrom(3)>).
   ssize_t recv (void *buf,
                 size_t n,
@@ -110,14 +110,14 @@ public:
                 int flags = 0,
                 const ACE_Time_Value *timeout = 0) const;
 
-  /// Send an <iovec> of size <n> to the datagram socket (uses
+  /// Send an <iovec> of size @a n to the datagram socket (uses
   /// <sendmsg(3)>).
   ssize_t send (const iovec iov[],
                 int n,
                 const ACE_Addr &addr,
                 int flags = 0) const;
 
-  /// Recv an <iovec> of size <n> to the datagram socket (uses
+  /// Recv an <iovec> of size @a n to the datagram socket (uses
   /// <recvmsg(3)>).
   ssize_t recv (iovec iov[],
                 int n,
@@ -125,11 +125,11 @@ public:
                 int flags = 0) const;
 
   /**
-   * Wait up to <timeout> amount of time to receive a datagram into
-   * <buf>.  The <ACE_Time_Value> indicates how long to blocking
-   * trying to receive.  If <timeout> == 0, the caller will block
+   * Wait up to @a timeout amount of time to receive a datagram into
+   * @a buf.  The ACE_Time_Value indicates how long to blocking
+   * trying to receive.  If @a timeout == 0, the caller will block
    * until action is possible, else will wait until the relative time
-   * specified in *<timeout> elapses).  If <recv> times out a -1 is
+   * specified in *@a timeout elapses).  If <recv> times out a -1 is
    * returned with <errno == ETIME>.  If it succeeds the number of
    * bytes received is returned.
    */
@@ -140,11 +140,11 @@ public:
                 const ACE_Time_Value *timeout) const;
 
   /**
-   * Wait up to <timeout> amount of time to send a datagram to
-   * <buf>.  The <ACE_Time_Value> indicates how long to blocking
-   * trying to receive.  If <timeout> == 0, the caller will block
+   * Wait up to @a timeout amount of time to send a datagram to
+   * @a buf.  The ACE_Time_Value indicates how long to blocking
+   * trying to receive.  If @a timeout == 0, the caller will block
    * until action is possible, else will wait until the relative time
-   * specified in *<timeout> elapses).  If <send> times out a -1 is
+   * specified in *@a timeout elapses).  If <send> times out a -1 is
    * returned with <errno == ETIME>.  If it succeeds the number of
    * bytes sent is returned.
    */
@@ -174,7 +174,7 @@ public:
                 ACE_OVERLAPPED *overlapped,
                 ACE_OVERLAPPED_COMPLETION_FUNC func) const;
 
-  /// Send an <n> byte <buf> to the datagram socket (uses <WSASendTo>).
+  /// Send an @a n byte @a buf to the datagram socket (uses <WSASendTo>).
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
@@ -182,7 +182,7 @@ public:
                 ACE_OVERLAPPED *overlapped,
                 ACE_OVERLAPPED_COMPLETION_FUNC func) const;
 
-  /// Receive an <n> byte <buf> from the datagram socket (uses
+  /// Receive an @a n byte @a buf from the datagram socket (uses
   /// <WSARecvFrom>).
   ssize_t recv (void *buf,
                 size_t n,
diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h
index 5acb52076fe..2fa166ae097 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.h
+++ b/ACE/ace/SOCK_Dgram_Mcast.h
@@ -312,13 +312,13 @@ public:
 
   // = Data transfer routines.
 
-  /// Send <n> bytes in <buf>, using the multicast address and network interface
+  /// Send @a n bytes in @a buf, using the multicast address and network interface
   /// defined by the first <open> or <subscribe>.
   ssize_t send (const void *buf,
                 size_t n,
                 int flags = 0) const;
 
-  /// Send <n> <iovecs>, using the multicast address and network interface
+  /// Send @a n <iovecs>, using the multicast address and network interface
   /// defined by the first <open> or <subscribe>.
   ssize_t send (const iovec iov[],
                 int n,
diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index b3a1d5de90b..f7530aaf9f0 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -110,7 +110,7 @@ ACE_SOCK_IO::send (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::send");
 
   va_list argp;
-  int total_tuples = ACE_Utils::Truncate<size_t> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<size_t> (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -150,7 +150,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::recv");
 
   va_list argp;
-  int total_tuples = ACE_Utils::Truncate<size_t> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<size_t> (n / 2);
   iovec *iovp;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h
index 252ec68d0cd..4d6d9d22183 100644
--- a/ACE/ace/SOCK_IO.h
+++ b/ACE/ace/SOCK_IO.h
@@ -32,13 +32,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * (e.g., send/recv).
  *
  *
- * If <timeout> == 0, then the call behaves as a normal
+ * If @a timeout == 0, then the call behaves as a normal
  * send/recv call, i.e., for blocking sockets, the call will
  * block until action is possible; for non-blocking sockets,
  * -1 will be returned with errno == EWOULDBLOCK if no action is
  * immediately possible.
- * If <timeout> != 0, the call will wait until the relative time
- * specified in *<timeout> elapses.
+ * If @a timeout != 0, the call will wait until the relative time
+ * specified in *@a timeout elapses.
  * Errors are reported by -1 and 0 return values.  If the
  * operation times out, -1 is returned with <errno == ETIME>.
  * If it succeeds the number of bytes transferred is returned.
@@ -58,18 +58,18 @@ public:
   /// Destructor.
   ~ACE_SOCK_IO (void);
 
-  /// Recv an <n> byte buffer from the connected socket.
+  /// Recv an @a n byte buffer from the connected socket.
   ssize_t recv (void *buf,
                 size_t n,
                 int flags,
                 const ACE_Time_Value *timeout = 0) const;
 
-  /// Recv an <n> byte buffer from the connected socket.
+  /// Recv an @a n byte buffer from the connected socket.
   ssize_t recv (void *buf,
                 size_t n,
                 const ACE_Time_Value *timeout = 0) const;
 
-  /// Recv an <iovec> of size <n> from the connected socket.
+  /// Recv an <iovec> of size @a n from the connected socket.
   ssize_t recvv (iovec iov[],
                  int n,
                  const ACE_Time_Value *timeout = 0) const;
@@ -85,36 +85,36 @@ public:
   ssize_t recvv (iovec *io_vec,
                  const ACE_Time_Value *timeout = 0) const;
 
-  /// Recv <n> varargs messages to the connected socket.
+  /// Recv @a n varargs messages to the connected socket.
   ssize_t recv (size_t n,
                 ...) const;
 
-  /// Recv <n> bytes via Win32 <ReadFile> using overlapped I/O.
+  /// Recv @a n bytes via Win32 <ReadFile> using overlapped I/O.
   ssize_t recv (void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
 
-  /// Send an <n> byte buffer to the connected socket.
+  /// Send an @a n byte buffer to the connected socket.
   ssize_t send (const void *buf,
                 size_t n,
                 int flags,
                 const ACE_Time_Value *timeout = 0) const;
 
-  /// Send an <n> byte buffer to the connected socket.
+  /// Send an @a n byte buffer to the connected socket.
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Time_Value *timeout = 0) const;
 
-  /// Send an <iovec> of size <n> to the connected socket.
+  /// Send an <iovec> of size @a n to the connected socket.
   ssize_t sendv (const iovec iov[],
                  int n,
                  const ACE_Time_Value *timeout = 0) const;
 
-  /// Send <n> varargs messages to the connected socket.
+  /// Send @a n varargs messages to the connected socket.
   ssize_t send (size_t n,
                 ...) const;
 
-  /// Send <n> bytes via Win32 <WriteFile> using overlapped I/O.
+  /// Send @a n bytes via Win32 <WriteFile> using overlapped I/O.
   ssize_t send (const void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h
index ecff29af19c..7455600b985 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h
@@ -122,8 +122,8 @@ public:
 
   // = Passive connection <accept> methods.
   /**
-   * Accept a new <ACE_SOCK_SEQPACK_Association> connection.  A <timeout> of 0
-   * means block forever, a <timeout> of {0, 0} means poll.  <restart>
+   * Accept a new <ACE_SOCK_SEQPACK_Association> connection.  A @a timeout of 0
+   * means block forever, a @a timeout of {0, 0} means poll.  <restart>
    * == 1 means "restart if interrupted," i.e., if errno == EINTR.
    * Note that <new_association> inherits the "blocking mode" of <this>
    * <ACE_SOCK_SEQPACK_Acceptor>, i.e., if <this> acceptor factory is in
diff --git a/ACE/ace/SOCK_SEQPACK_Association.h b/ACE/ace/SOCK_SEQPACK_Association.h
index f279d2899d6..be668d4461d 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.h
+++ b/ACE/ace/SOCK_SEQPACK_Association.h
@@ -42,19 +42,19 @@ class ACE_Message_Block;
  * This adds additional wrapper methods atop the <ACE_SOCK_IO>
  * class.
  *
- * <buf> is the buffer to write from or receive into.
- * <len> is the number of bytes to transfer.
- * The <timeout> parameter in the following methods indicates how
- * long to blocking trying to transfer data.  If <timeout> == 0,
+ * @a buf is the buffer to write from or receive into.
+ * @a len is the number of bytes to transfer.
+ * The @a timeout parameter in the following methods indicates how
+ * long to blocking trying to transfer data.  If @a timeout == 0,
  * then the call behaves as a normal send/recv call, i.e., for
  * blocking sockets, the call will block until action is possible;
  * for non-blocking sockets, EWOULDBLOCK will be returned if no
  * action is immediately possible.
- * If <timeout> != 0, the call will wait for data to arrive no longer
- * than the relative time specified in *<timeout>.
+ * If @a timeout != 0, the call will wait for data to arrive no longer
+ * than the relative time specified in *@a timeout.
  * The "_n()" I/O methods keep looping until all the data has been
  * transferred.  These methods also work for sockets in non-blocking
- * mode i.e., they keep looping on EWOULDBLOCK.  <timeout> is used
+ * mode i.e., they keep looping on EWOULDBLOCK.  @a timeout is used
  * to make sure we keep making progress, i.e., the same timeout
  * value is used for every I/O operation in the loop and the timeout
  * is not counted down.
@@ -90,32 +90,32 @@ public:
 
   /**
    * Return local endpoint addresses in the referenced array of
-   * ACE_INET_Addr, which should have the specified <size>.  If the
-   * number of local endpoint addresses is less than <size>, then
-   * <size> will be set to this number.  If successful, the method
+   * ACE_INET_Addr, which should have the specified @a size.  If the
+   * number of local endpoint addresses is less than @a size, then
+   * @a size will be set to this number.  If successful, the method
    * returns 0, otherwise returns -1.
    */
   int get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const;
 
   /**
    * Return remote endpoint addresses in the referenced array of
-   * ACE_INET_Addr, which should have the specified <size>.  If the
-   * number of remote endpoint addresses is less than <size>, then
-   * <size> will be set to this number.  If successful, the method
+   * ACE_INET_Addr, which should have the specified @a size.  If the
+   * number of remote endpoint addresses is less than @a size, then
+   * @a size will be set to this number.  If successful, the method
    * returns 0, otherwise returns -1.
    */
   int get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const;
 
   // = I/O functions.
 
-  /// Try to recv exactly <len> bytes into <buf> from the connected socket.
+  /// Try to recv exactly @a len bytes into @a buf from the connected socket.
   ssize_t recv_n (void *buf,
                   size_t len,
                   int flags,
                   const ACE_Time_Value *timeout = 0,
                   size_t *bytes_transferred = 0) const;
 
-  /// Try to recv exactly <len> bytes into <buf> from the connected socket.
+  /// Try to recv exactly @a len bytes into @a buf from the connected socket.
   ssize_t recv_n (void *buf,
                   size_t len,
                   const ACE_Time_Value *timeout = 0,
@@ -127,14 +127,14 @@ public:
                    const ACE_Time_Value *timeout = 0,
                    size_t *bytes_transferred = 0) const;
 
-  /// Try to send exactly <len> bytes from <buf> to the connection socket.
+  /// Try to send exactly @a len bytes from @a buf to the connection socket.
   ssize_t send_n (const void *buf,
                   size_t len,
                   int flags,
                   const ACE_Time_Value *timeout = 0,
                   size_t *bytes_transferred = 0) const;
 
-  /// Try to send exactly <len> bytes from <buf> to the connected socket.
+  /// Try to send exactly @a len bytes from @a buf to the connected socket.
   ssize_t send_n (const void *buf,
                   size_t len,
                   const ACE_Time_Value *timeout = 0,
diff --git a/ACE/ace/SPIPE_Connector.h b/ACE/ace/SPIPE_Connector.h
index f9fc2455ecc..a0e1f36a318 100644
--- a/ACE/ace/SPIPE_Connector.h
+++ b/ACE/ace/SPIPE_Connector.h
@@ -41,7 +41,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
@@ -69,7 +69,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
diff --git a/ACE/ace/SPIPE_Stream.h b/ACE/ace/SPIPE_Stream.h
index 9a94216ae40..7e4c90735f4 100644
--- a/ACE/ace/SPIPE_Stream.h
+++ b/ACE/ace/SPIPE_Stream.h
@@ -31,8 +31,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Defines the methods in the <ACE_SPIPE_Stream> abstraction.
  *
- * <buf> is the buffer to write from or receive into.
- * <len> is the number of bytes to transfer.
+ * @a buf is the buffer to write from or receive into.
+ * @a len is the number of bytes to transfer.
  *
  * The "_n()" I/O methods keep looping until all the data has been
  * transferred.  These methods also work for sockets in non-blocking
@@ -72,10 +72,10 @@ public:
   /// Recv an open FD from another process.
   int recv_handle (strrecvfd &recvfd) const;
 
-  /// Send <len> bytes, keep trying until <len> are sent.
+  /// Send @a len bytes, keep trying until @a len are sent.
   ssize_t send_n (const void *buf, size_t len) const;
 
-  /// Recv <len> bytes, keep trying until <len> are received.
+  /// Recv @a len bytes, keep trying until @a len are received.
   ssize_t recv_n (void *buf, size_t len) const;
 
   /// Send bytes via STREAM pipes using "band" mode.
@@ -129,22 +129,22 @@ public:
    */
   ssize_t recv (size_t len, ...) const;
 
-  /// Send <len> bytes via Win32 <WriteFile> using overlapped I/O.
+  /// Send @a len bytes via Win32 <WriteFile> using overlapped I/O.
   ssize_t send (const void *buf, size_t len, ACE_OVERLAPPED *overlapped) const;
 
-  /// Recv <len> bytes via Win32 <ReadFile> using overlapped I/O.
+  /// Recv @a len bytes via Win32 <ReadFile> using overlapped I/O.
   ssize_t recv (void *buf, size_t len, ACE_OVERLAPPED *overlapped) const;
 
-  /// Send an <iovec> of size <len> to the stream.
+  /// Send an <iovec> of size @a len to the stream.
   ssize_t sendv (const iovec iov[],
                  int len) const;
 
-  /// Send an <iovec> of size <len> to the stream.  Will block until all
+  /// Send an <iovec> of size @a len to the stream.  Will block until all
   /// bytes are sent or an error occurs.
   ssize_t sendv_n (const iovec iov[],
                    int len) const;
 
-  /// Receive an <iovec> of size <len> to the stream.
+  /// Receive an <iovec> of size @a len to the stream.
   ssize_t recvv_n (iovec iov[],
                    int len) const;
 
diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h
index 2e5e07dda95..1d7067fa204 100644
--- a/ACE/ace/SSL/SSL_Context.h
+++ b/ACE/ace/SSL/SSL_Context.h
@@ -131,8 +131,7 @@ public:
    *       been set since key verification is performed against the
    *       certificate, among other things.
    */
-  int private_key (const char *file_name,
-                   int type = SSL_FILETYPE_PEM);
+  int private_key (const char *file_name, int type = SSL_FILETYPE_PEM);
 
   /// Verify that the private key is valid.
   /**
@@ -170,11 +169,11 @@ public:
    *  copy of the file and path name of the most recently added
    *  @a ca_file or @a ca_path.
    *
-   *  @param[in] ca_file           CA file pathname. Passed to 
+   *  @param[in] ca_file           CA file pathname. Passed to
    *                               @c SSL_CTX_load_verify_locations() if not
    *                               0. If 0, behavior depends on the value of
    *                               @a use_env_defaults.
-   *  @param[in] ca_dir            CA directory pathname. Passed to 
+   *  @param[in] ca_dir            CA directory pathname. Passed to
    *                               @c SSL_CTX_load_verify_locations() if not
    *                               0. If 0, behavior depends on the value of
    *                               @a use_env_defaults.
@@ -263,9 +262,7 @@ public:
    *  Note that this method overrides the use of the
    *  default_verify_mode() method.
    */
-  void set_verify_peer (int strict = 0,
-                        int once = 1,
-                        int depth = 0);
+  void set_verify_peer (int strict = 0, int once = 1, int depth = 0);
 
 
   /// TODO: a implementation that will lookup the CTX table for the list
@@ -275,8 +272,6 @@ public:
   // const char* ca_file_name(void) const;
   // const char* ca_dir_name(void) const;
 
-
-
   /**
    * Set and query the default verify mode for this context, it is
    * inherited by all the ACE_SSL objects created using the context.
diff --git a/ACE/ace/SSL/SSL_Context.inl b/ACE/ace/SSL/SSL_Context.inl
index 295a0fab8b2..9962ad09bdc 100644
--- a/ACE/ace/SSL/SSL_Context.inl
+++ b/ACE/ace/SSL/SSL_Context.inl
@@ -38,8 +38,9 @@ ACE_SSL_Context::check_context (void)
   if (this->context_ == 0)
     {
       this->set_mode ();
-      ::SSL_CTX_set_verify (this->context_, this->default_verify_mode (), 0);
     }
+
+  ::SSL_CTX_set_verify (this->context_, this->default_verify_mode (), 0);
 }
 
 ACE_INLINE SSL_CTX *
diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp
index 832029e4dde..08639223cb8 100644
--- a/ACE/ace/Sample_History.cpp
+++ b/ACE/ace/Sample_History.cpp
@@ -46,9 +46,14 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg,
 #ifndef ACE_NLOGGING
   for (size_t i = 0; i != this->sample_count_; ++i)
     {
-      const ACE_UINT64 x = this->samples_[i] / scale_factor;
-      const ACE_UINT32 val = ACE_CU64_TO_CU32 (x);
-      ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val));
+      const ACE_UINT64 val = this->samples_[i] / scale_factor;
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_LIB_TEXT ("%s: ")
+                  ACE_SIZE_T_FORMAT_SPECIFIER
+                  ACE_LIB_TEXT ("%Q\n"),
+                  msg,
+                  i,
+                  val));
     }
 #else
   ACE_UNUSED_ARG (msg);
diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp
index 0f048b5b18d..d650a37e18a 100644
--- a/ACE/ace/Sched_Params.cpp
+++ b/ACE/ace/Sched_Params.cpp
@@ -1,20 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    ACE
-//
-// = FILENAME
-//    Sched_Params.cpp
-//
-// = CREATION DATE
-//    28 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Sched_Params.cpp
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 #include "ace/Sched_Params.h"
 
diff --git a/ACE/ace/Sched_Params.inl b/ACE/ace/Sched_Params.inl
index 2917acc691d..043ebbeae1c 100644
--- a/ACE/ace/Sched_Params.inl
+++ b/ACE/ace/Sched_Params.inl
@@ -1,22 +1,15 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ACE
-//
-// = FILENAME
-//    Sched_Params.i
-//
-// = CREATION DATE
-//    28 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Sched_Params.inl
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index 94fa673b84e..c7c6efd20f2 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -561,84 +561,7 @@ ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
-
-  if (this->notify_queue_.is_empty ())
-    return 0;
-
-  ACE_Notification_Buffer *temp = 0;
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> local_queue;
-
-  size_t queue_size = this->notify_queue_.size ();
-  int number_purged = 0;
-  size_t i;
-  for (i = 0; i < queue_size; ++i)
-    {
-      if (-1 == this->notify_queue_.dequeue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("dequeue_head")),
-                          -1);
-
-      // If this is not a Reactor notify (it is for a particular handler),
-      // and it matches the specified handler (or purging all),
-      // and applying the mask would totally eliminate the notification, then
-      // release it and count the number purged.
-      if ((0 != temp->eh_) &&
-          (0 == eh || eh == temp->eh_) &&
-          ACE_BIT_DISABLED (temp->mask_, ~mask)) // the existing notificationmask
-                                                 // is left with nothing when
-                                                 // applying the mask
-      {
-        if (-1 == this->free_queue_.enqueue_head (temp))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_LIB_TEXT ("%p\n"),
-                             ACE_LIB_TEXT ("enqueue_head")),
-                            -1);
-
-        ACE_Event_Handler *event_handler = temp->eh_;
-        event_handler->remove_reference ();
-
-        ++number_purged;
-      }
-      else
-      {
-        // To preserve it, move it to the local_queue.
-        // But first, if this is not a Reactor notify (it is for a particularhandler),
-        // and it matches the specified handler (or purging all), then
-        // apply the mask
-        if ((0 != temp->eh_) &&
-            (0 == eh || eh == temp->eh_))
-          ACE_CLR_BITS(temp->mask_, mask);
-        if (-1 == local_queue.enqueue_head (temp))
-          return -1;
-      }
-    }
-
-  if (this->notify_queue_.size ())
-    { // should be empty!
-      ACE_ASSERT (0);
-      return -1;
-    }
-
-  // now put it back in the notify queue
-  queue_size = local_queue.size ();
-  for (i = 0; i < queue_size; ++i)
-    {
-      if (-1 == local_queue.dequeue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("dequeue_head")),
-                          -1);
-
-      if (-1 == this->notify_queue_.enqueue_head (temp))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("enqueue_head")),
-                          -1);
-    }
-
-  return number_purged;
+  return notification_queue_.purge_pending_notifications(eh, mask);
 
 #else /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */
   ACE_UNUSED_ARG (eh);
@@ -686,22 +609,10 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
 #endif /* F_SETFD */
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-      ACE_Notification_Buffer *temp = 0;
-
-      ACE_NEW_RETURN (temp,
-                      ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
-                      -1);
-
-      if (this->alloc_queue_.enqueue_head (temp) == -1)
-        {
-          delete [] temp;
-          return -1;
-        }
-
-      for (size_t i = 0; i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; ++i)
-        if (free_queue_.enqueue_head (temp + i) == -1)
-          return -1;
-
+      if (notification_queue_.open() == -1)
+	{
+	  return -1;
+	}
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
       // There seems to be a Win32 bug with this...  Set this into
@@ -728,20 +639,24 @@ ACE_Select_Reactor_Notify::close (void)
   ACE_TRACE ("ACE_Select_Reactor_Notify::close");
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-  // Free up the dynamically allocated resources.
-  ACE_Notification_Buffer **b = 0;
-
-  for (ACE_Unbounded_Queue_Iterator<ACE_Notification_Buffer *> alloc_iter (this->alloc_queue_);
-       alloc_iter.next (b) != 0;
-       alloc_iter.advance ())
+  notification_queue_.reset();
+#else
+  if (this->notification_pipe_.read_handle() != ACE_INVALID_HANDLE)
     {
-      delete [] *b;
-      *b = 0;
+      // Please see Bug 2820, if we just close the pipe then we break
+      // the reference counting rules.  Basically, all the event
+      // handlers "stored" in the pipe had their reference counts
+      // increased.  We need to decrease them before closing the
+      // pipe....
+      ACE_Notification_Buffer b;
+      for (int r = read_notify_pipe(notification_pipe_.read_handle(), b);
+	   r > 0;
+	   r = read_notify_pipe(notification_pipe_.read_handle(), b))
+	{
+	  if (b.eh_ == 0) continue;
+	  b.eh_->remove_reference();
+	}
     }
-
-  this->alloc_queue_.reset ();
-  this->notify_queue_.reset ();
-  this->free_queue_.reset ();
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   return this->notification_pipe_.close ();
@@ -767,57 +682,20 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler,
   ACE_Notification_Buffer buffer (event_handler, mask);
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-  // Artificial scope to limit the duration of the mutex.
-  {
-    bool notification_required = false;
-
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
+  int notification_required = 
+    notification_queue_.push_new_notification(buffer);
 
-    // No pending notifications.
-    if (this->notify_queue_.is_empty ())
-      notification_required = true;
-
-    ACE_Notification_Buffer *temp = 0;
-
-    if (free_queue_.dequeue_head (temp) == -1)
-      {
-        // Grow the queue of available buffers.
-        ACE_Notification_Buffer *temp1 = 0;
-
-        ACE_NEW_RETURN (temp1,
-                        ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
-                        -1);
-
-        if (this->alloc_queue_.enqueue_head (temp1) == -1)
-          {
-            delete [] temp1;
-            return -1;
-          }
-
-        // Start at 1 and enqueue only
-        // (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE - 1) elements since
-        // the first one will be used right now.
-        for (size_t i = 1;
-             i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE;
-             ++i)
-          this->free_queue_.enqueue_head (temp1 + i);
-
-        temp = temp1;
-      }
-
-    ACE_ASSERT (temp != 0);
-    *temp = buffer;
-
-    if (notify_queue_.enqueue_tail (temp) == -1)
-      return -1;
+  if (notification_required == -1)
+  {
+    return -1;
+  }
 
-    if (!notification_required)
-      {
-        // No failures.
-        safe_handler.release ();
+  if (notification_required == 0)
+  {
+    // No failures, the handler is now owned by the notification queue
+    safe_handler.release ();
 
-        return 0;
-      }
+    return 0;
   }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
@@ -897,45 +775,28 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
   // Dispatch one message from the notify queue, and put another in
   // the pipe if one is available.  Remember, the idea is to keep
   // exactly one message in the pipe at a time.
-  {
-    // We acquire the lock in a block to make sure we're not
-    // holding the lock while delivering callbacks...
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
 
-    ACE_Notification_Buffer *temp = 0;
+  bool more_messages_queued = false;
+  ACE_Notification_Buffer next;
 
-    if (notify_queue_.is_empty ())
+  result = notification_queue_.pop_next_notification(
+	     buffer, more_messages_queued, next);
+
+  if (result == 0)
+    {
       return 0;
-    else if (notify_queue_.dequeue_head (temp) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("dequeue_head")),
-                        -1);
-    buffer = *temp;
-    if (free_queue_.enqueue_head (temp) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("enqueue_head")),
-                        -1);
-
-    bool write_next_buffer = false;
-    ACE_Notification_Buffer ** next = 0;
-
-    if(!this->notify_queue_.is_empty())
-      {
-        // The queue is not empty, need to queue another message.
-        this->notify_queue_.get (next, 0);
-        write_next_buffer = true;
-      }
-
-    if(write_next_buffer)
-      {
-        (void) ACE::send(
-                         this->notification_pipe_.write_handle(),
-            (char *)*next, sizeof(ACE_Notification_Buffer));
-      }
-  }
+    }
 
+  if (result == -1)
+    {
+      return -1;
+    }
+
+  if(more_messages_queued)
+    {
+      (void) ACE::send(this->notification_pipe_.write_handle(),
+            (char *)&next, sizeof(ACE_Notification_Buffer));
+    }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   // If eh == 0 then another thread is unblocking the
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 9ec4e642210..bb12154ca8c 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -27,7 +27,7 @@
 #include "ace/Reactor_Impl.h"
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-# include "ace/Unbounded_Queue.h"
+# include "ace/Notification_Queue.h"
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
 #ifdef ACE_WIN32
@@ -253,24 +253,18 @@ protected:
   int max_notify_iterations_;
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-  // = This configuration queues up notifications in separate buffers that
-  //   are in user-space, rather than stored in a pipe in the OS
-  //   kernel.  The kernel-level notifications are used only to trigger
-  //   the Reactor to check its notification queue.  This enables many
-  //   more notifications to be stored than would otherwise be the case.
-
-  /// Keeps track of allocated arrays of type
-  /// ACE_Notification_Buffer.
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> alloc_queue_;
-
-  /// Keeps track of all pending notifications.
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> notify_queue_;
-
-  /// Keeps track of all free buffers.
-  ACE_Unbounded_Queue <ACE_Notification_Buffer *> free_queue_;
-
-  /// Synchronization for handling of queues.
-  ACE_SYNCH_MUTEX notify_queue_lock_;
+  /**
+   * @brief A user-space queue to store the notifications.
+   *
+   * The notification pipe has OS-specific size restrictions.  That
+   * is, no more than a certain number of bytes may be stored in the
+   * pipe without blocking.  This limit may be too small for certain
+   * applications.  In this case, ACE can be configured to store all
+   * the events in user-space.  The pipe is still needed to wake up
+   * the reactor thread, but only one event is sent through the pipe
+   * at a time.
+   */
+  ACE_Notification_Queue notification_queue_;
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 };
 
diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl
index 88890778b70..cfcb5349404 100644
--- a/ACE/ace/Select_Reactor_Base.inl
+++ b/ACE/ace/Select_Reactor_Base.inl
@@ -112,6 +112,10 @@ ACE_Event_Tuple::operator!= (const ACE_Event_Tuple &rhs) const
   return !(*this == rhs);
 }
 
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (push)
+#  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
+#endif
 ACE_INLINE
 ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
   : handler_rep_ (*this)
@@ -129,6 +133,9 @@ ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
   , supress_renew_ (0)
 {
 }
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (pop)
+#endif
 
 ACE_INLINE int
 ACE_Select_Reactor_Impl::supress_notify_renew (void)
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index c7cde626b0a..013497dc5f4 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -482,12 +482,13 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    int mask_signals,
    int s_queue)
     : ACE_Select_Reactor_Impl (mask_signals)
-    , token_ (*this, s_queue)
+    , token_ (s_queue)
     , lock_adapter_ (token_)
     , deactivated_ (0)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
+  this->token_.reactor (*this);
   // First try to open the Reactor with the hard-coded default.
   if (this->open (ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::DEFAULT_SIZE,
                   0,
@@ -534,12 +535,13 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    int mask_signals,
    int s_queue)
     : ACE_Select_Reactor_Impl (mask_signals)
-    , token_ (*this, s_queue)
+    , token_ (s_queue)
     , lock_adapter_ (token_)
     , deactivated_ (0)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
+  this->token_.reactor (*this);
   if (this->open (size,
                   rs,
                   sh,
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index 638e71185c5..7573a3ab76b 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -287,11 +287,11 @@ public:
                               ACE_Reactor_Mask);
 
   /**
-   * Remove the ACE_Event_Handler currently associated with <signum>.
+   * Remove the ACE_Event_Handler currently associated with @a signum.
    * <sigkey> is ignored in this implementation since there is only
    * one instance of a signal handler.  Install the new disposition
    * (if given) and return the previous disposition (if desired by the
-   * caller).  Returns 0 on success and -1 if <signum> is invalid.
+   * caller).  Returns 0 on success and -1 if @a signum is invalid.
    */
   virtual int remove_handler (int signum,
                               ACE_Sig_Action *new_disp,
@@ -418,11 +418,11 @@ public:
    * This wakeups the <ACE_Select_Reactor> if currently blocked in
    * <select>/<poll>.  Pass over both the <Event_Handler> *and* the
    * <mask> to allow the caller to dictate which <Event_Handler>
-   * method the <Select_Reactor> will invoke.  The <ACE_Time_Value>
+   * method the <Select_Reactor> will invoke.  The ACE_Time_Value
    * indicates how long to blocking trying to notify the
-   * <Select_Reactor>.  If <timeout> == 0, the caller will block until
+   * <Select_Reactor>.  If @a timeout == 0, the caller will block until
    * action is possible, else will wait until the relative time
-   * specified in *<timeout> elapses).
+   * specified in *@a timeout elapses).
    */
   virtual int notify (ACE_Event_Handler * = 0,
                       ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
@@ -515,7 +515,7 @@ public:
                        ACE_Event_Handler **eh = 0);
 
   /**
-   * Check to see if <signum> is associated with a valid Event_Handler
+   * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the <eh> associated with this
    * <handler> if <eh> != 0.
    */
diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h
index 18924d21543..d0bcc2324a0 100644
--- a/ACE/ace/Semaphore.h
+++ b/ACE/ace/Semaphore.h
@@ -76,9 +76,9 @@ public:
   int acquire (ACE_Time_Value &tv);
 
   /**
-   * If <tv> == 0 then call <acquire()> directly.  Otherwise, Block
+   * If @a tv == 0 then call <acquire()> directly.  Otherwise, Block
    * the thread until the semaphore count becomes greater than 0
-   * (at which point it is decremented) or until <tv> times out (in
+   * (at which point it is decremented) or until @a tv times out (in
    * which case -1 is returned and <errno> == <ETIME>).  Note that
    * <*tv> is assumed to be in "absolute" rather than "relative" time.
    * The value of <*tv> is updated upon return to show the actual
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index a44998d066c..5fb9e4adf63 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -6,11 +6,10 @@
 #include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/ACE.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
 #include "ace/Service_Types.h"
 #include "ace/Reactor.h"
+#include "ace/Singleton.h"
+#include "ace/Service_Repository.h"
 
 #ifndef ACE_LACKS_UNIX_SIGNALS
 # include "ace/Sig_Adapter.h"
@@ -26,19 +25,33 @@ ACE_RCSID (ace,
            Service_Config,
            "$Id$")
 
-  ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+  /**
+   * @c ACE_Service_Config is supposed to be a Singleton. This is the
+   * only Configuration Gestalt available for access from static
+   * initializers at proces start-up time. Using Unmanaged Singleton
+   * is safer because (a) the Object Manager may not yet be fully initialized in the
+   * context of a static initializer that uses SC, and (b) because we
+   * know that upon process exit the SC will still be automaticaly and explicitely closed
+   * by @c ACE_Object_Manager::fini().
+   */
+  typedef ACE_Unmanaged_Singleton<ACE_Service_Config,
+                                  ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON;
+
 
 ///
 ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
-  : saved_ (ACE_Service_Config::current ())
+  : saved_ (ACE_Service_Config::instance ())
 {
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("(%P|%t) SCG::ctor, repo=%@ - guard with %@\n"),
+                ACE_LIB_TEXT ("ACE (%P|%t) Service_Config_Guard:<ctor>")
+                ACE_LIB_TEXT (" - repo=%@ superceded by repo=%@\n"),
                 this->saved_->repo_,
                 psg->repo_));
 
-  // Modify the TSS - no locking needed
+  // Modify the TSS if the repo has changed
   if (saved_ != psg)
       (void)ACE_Service_Config::current (psg);
 }
@@ -50,7 +63,8 @@ ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void)
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("(%P|%t) SCG::dtor, repo=%@ - un-guard\n"),
+                ACE_LIB_TEXT ("ACE (%P|%t) Service_Config_Guard:<dtor>")
+                ACE_LIB_TEXT (" - new repo=%@\n"),
                 this->saved_->repo_));
 }
 
@@ -287,104 +301,6 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
                                       ignore_debug_flag);
 }
 
-/// Return the global configuration instance. Allways returns the same
-/// instance
-ACE_Service_Gestalt *
-ACE_Service_Config::global (void)
-{
-  return ACE_Singleton<ACE_Service_Config, ACE_SYNCH_MUTEX>::instance ();
-}
-
-
-///
-ACE_Service_Gestalt *
-ACE_Service_Config::instance (void)
-{
-  return  ACE_Service_Config::current ();
-}
-
-
-// A thread-specific storage to keep a pointer to the (current) global
-// configuration. Using a pointer to avoid the order of initialization
-// debacle possible when using static class instances. The memory is
-// dynamicaly allocated and leaked from current()
-
-/// Provides access to the static ptr, containing the TSS
-/// accessor. Ensures the desired order of initialization, even when
-/// other static initializers need the value.
-ACE_Service_Config::TSS_Service_Gestalt_Ptr *
-ACE_Service_Config::impl_ (void)
-{
-  /// A "straight" static ptr does not work in static builds, because
-  /// some static initializer may call current() method and assign
-  /// value to instance_ *before* the startup code has had a chance to
-  /// initialize it . This results in instance_ being "zeroed" out
-  /// after it was assigned the correct value. Having a method scoped
-  /// static guarantees that the first time the method is invoked, the
-  /// instance_ will be initialized before returning.
-
-  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));
-
-      if (instance_ == 0)
-        ACE_NEW_RETURN (instance_,
-                        TSS_Service_Gestalt_Ptr,
-                        0);
-    }
-
-  return instance_;
-}
-
-/// Return the configuration instance, considered "global" in the
-/// current thread. This may be the same as instance(), but on some
-/// occasions, it may be a different one. For example,
-/// ACE_Service_Config_Guard provides a way of temporarily replacing
-/// the "current" configuration instance in the context of a thread.
-ACE_Service_Gestalt *
-ACE_Service_Config::current (void)
-{
-  TSS_Service_Gestalt_Ptr * const impl = ACE_Service_Config::impl_ ();
-  if (impl == 0)
-    return 0;
-
-  ACE_Service_Gestalt* & gestalt =
-    ACE_TSS_GET (impl, TSS_Resources)->ptr_;
-
-  if (gestalt == 0)
-    gestalt = ACE_Service_Config::global ();
-
-  return gestalt;
-}
-
-/// A mutator to set the "current" (TSS) gestalt instance.
-ACE_Service_Gestalt*
-ACE_Service_Config::current (ACE_Service_Gestalt *newcurrent)
-{
-  TSS_Service_Gestalt_Ptr * const impl = ACE_Service_Config::impl_ ();
-  if (impl == 0)
-    return 0;
-
-  ACE_Service_Gestalt* & gestalt =
-    ACE_TSS_GET (impl, TSS_Resources)->ptr_;
-
-  gestalt = newcurrent;
-
-  return gestalt;
-}
-
 // This method has changed to return the gestalt instead of the
 // container, underlying the service repository and defined
 // ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor*). This way
@@ -396,14 +312,23 @@ ACE_Service_Config::current (ACE_Service_Gestalt *newcurrent)
 ACE_Service_Gestalt *
 ACE_Service_Config::static_svcs (void)
 {
-  return ACE_Service_Config::current ();
+  return ACE_Service_Config::instance ();
+}
+
+/// Return the global configuration instance. Allways returns the same
+/// instance
+ACE_Service_Config *
+ACE_Service_Config::global (void)
+{
+  return ACE_SERVICE_CONFIG_SINGLETON::instance ();
 }
 
+
 ///
 int
 ACE_Service_Config::insert (ACE_Static_Svc_Descriptor* stsd)
 {
-  return ACE_Service_Config::current ()->insert (stsd);
+  return ACE_Service_Config::instance ()->insert (stsd);
 }
 
 
@@ -451,7 +376,7 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs,
   : ACE_Service_Gestalt (size, false, ignore_static_svcs)
 {
   ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
-
+  this->tss_.ts_object (this);
   ACE_Service_Config::signum_ = signum;
 }
 
@@ -519,6 +444,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[],
 {
   ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
 
+  this->tss_.ts_object (this);
   if (this->open (program_name,
                   logger_key) == -1 && errno != ENOENT)
     {
@@ -576,12 +502,15 @@ ACE_Service_Config::reconfigure (void)
 int
 ACE_Service_Config::close (void)
 {
-  int result1 = ACE_Service_Config::current ()->close ();
+  int result1 = ACE_Service_Config::instance ()->close ();
 
   // Delete the service repository.  All the objects inside the
   // service repository should already have been finalized.
   int result2 = ACE_Service_Config::close_svcs ();
 
+  // Do away with the Singleton
+  ACE_SERVICE_CONFIG_SINGLETON::close ();
+
   return (result1 | result2);
 }
 
@@ -591,7 +520,7 @@ ACE_Service_Config::close_svcs (void)
   ACE_TRACE ("ACE_Service_Config::close_svcs");
 
   ACE_Service_Repository::close_singleton ();
-  ACE_Service_Config::current (0);
+  ACE_Service_Config::current (global ());
   return 0;
 }
 
@@ -619,6 +548,10 @@ ACE_Service_Config::fini_svcs (void)
 ACE_Service_Config::~ACE_Service_Config (void)
 {
   ACE_TRACE ("ACE_Service_Config::~ACE_Service_Config");
+
+  // We do not want ~ACE_TSS<> to delete this again (single-thread
+  // builds)
+  this->tss_.ts_object (0);
 }
 
 // ************************************************************
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 8a9621b90b0..6151f8f4cc1 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -18,12 +18,12 @@
 #include /**/ "ace/config-all.h"
 #include "ace/Default_Constants.h"
 #include "ace/Service_Gestalt.h"
+#include "ace/TSS_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
 #include "ace/OS_NS_signal.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -209,53 +209,50 @@ protected:
    */
   virtual int parse_args_i (int argc, ACE_TCHAR *argv[]);
 
-  /// = Static interfaces
-
-private:
-
-  /// A Wrapper for the TSS-stored pointer.
-  struct TSS_Resources {
-    TSS_Resources (void) : ptr_ (0) {}
-    ACE_Service_Gestalt *ptr_;
-  };
-
-  /// A type for the TSS-stored resources. The typedef helps to
-  /// abstract from the particularities of single-threaded vs
-  /// multi-threaded environments.
-  typedef ACE_TSS_TYPE (ACE_Service_Config::TSS_Resources) TSS_Service_Gestalt_Ptr;
-
-  /// Provides access to the static ptr, containing the TSS
-  /// accessor. Ensures the desired order of initialization, even when
-  /// other static initializers need the value.
-  static TSS_Service_Gestalt_Ptr * impl_ (void);
-
-protected:
+  /**
+   * A Wrapper for the TSS-stored pointer to the "current"
+   * configuration Gestalt. Static initializers from any DLL loaded
+   * through the SC will find the SC instance through the TSS pointer,
+   * instead of the global singleton. This makes it possible to ensure
+   * that the new services are loaded in the correct Gestalt,
+   * independent of which thread is actually using the SC at the time
+   * to do so.
+   */
+  ACE_TSS <ACE_Service_Gestalt> tss_;
 
-  /// Mutator to set the (TSS) global instance. Intended for use by helper
-  /// classes, like ACE_Service_Config_Guard which when instantiated on the
-  /// stack, can temporarily change which gestalt instance is viewed as
-  /// global from the point of view of the static initializers in DLLs.
-  static ACE_Service_Gestalt* current (ACE_Service_Gestalt*);
+  /// = Static interfaces
 
 public:
+  /**
+   * Mutator to set the (TSS) global instance. Intended for use by
+   * helper classes like @see ACE_Service_Config_Guard. Stack-based
+   * instances of it can temporarily change which Gestalt is
+   * considered global by any static initializer (especially those in
+   * DLLs, loaded at run-time).
+   */
+  static ACE_Service_Gestalt* current (ACE_Service_Gestalt*);
 
-  /// If not yet initialized, creates a process-wide instance
-  /// global instance, which is registered with the ACE_Object_Manager,
-  /// via ACE_Singleton. Note that this is allways the same instance,
-  /// in contrast with current (), which may be different instance at
-  /// different times, dependent on the context.
-  static  ACE_Service_Gestalt* global (void);
+  /**
+   * Returns a process-wide global singleton instance in contrast with
+   * current (), which may return a different instance at different
+   * times, dependent on the context. Use of this method is
+   * discouraged as it allows circumvention of the mechanism for
+   * dynamically loading services. Use with extreme caution!
+   */
+  static ACE_Service_Config* global (void);
 
-  /// Accessor for the "current" service repository through a pointer
-  /// held in TSS.
+  /// Accessor for the "current" service gestalt
   static ACE_Service_Gestalt* current (void);
 
-  /// This is what the static service initializators are hard-wired
-  /// to use, so in order to keep interface changes to a minimum this
-  /// method merely forwards to current(). Thus it is possible to
-  /// temporarily replace what those initializers think is the global
-  /// service repository, for instance when dynamically loading a
-  /// service from a DLL, which in turn, contains its own static services.
+  /**
+   * This is what the static service initializators are hard-wired to
+   * use, so in order to avoid interface changes this method merely
+   * forwards to @c ACE_Service_Config::current. This enables us to
+   * enforce which Service Gestalt is used for services registering
+   * through static initializers. Especially important for DLL-based
+   * dynamic services, which can contain their own static services and
+   * static initializers.
+   */
   static  ACE_Service_Gestalt* instance (void);
 
   /**
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl
index 895c2340232..341692c79ea 100644
--- a/ACE/ace/Service_Config.inl
+++ b/ACE/ace/Service_Config.inl
@@ -51,6 +51,38 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
   return ACE_Service_Config::current ()->parse_args (argc, argv);
 }
 
+
+/// Return the configuration instance, considered "global" in the
+/// current thread. This may be the same as instance(), but on some
+/// occasions, it may be a different one. For example,
+/// ACE_Service_Config_Guard provides a way of temporarily replacing
+/// the "current" configuration instance in the context of a thread.
+ACE_INLINE ACE_Service_Gestalt *
+ACE_Service_Config::instance (void)
+{
+  return ACE_Service_Config::global ()->tss_;
+}
+
+
+/// Return the configuration instance, considered "global" in the
+/// current thread. This may be the same as instance(), but on some
+/// occasions, it may be a different one. For example,
+/// ACE_Service_Config_Guard provides a way of temporarily replacing
+/// the "current" configuration instance in the context of a thread.
+ACE_INLINE ACE_Service_Gestalt *
+ACE_Service_Config::current (void)
+{
+  return ACE_Service_Config::global ()->tss_;
+}
+
+/// A mutator to set the "current" (TSS) gestalt instance.
+ACE_INLINE ACE_Service_Gestalt*
+ACE_Service_Config::current (ACE_Service_Gestalt *newcurrent)
+{
+  return ACE_Service_Config::global ()->tss_.ts_object (newcurrent);
+}
+
+
 // Compare two service descriptors for equality.
 
 ACE_INLINE bool
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 8757e54c8b2..5d7242130eb 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -456,42 +456,19 @@ ACE_Service_Gestalt::add_processed_static_svc
 }
 
 
-/// Queues static service object descriptor which, during open() will
-/// be given to process_directive() to create the Service
+/// Queues a static service object descriptor which, during open()
+/// will be given to process_directive() to create the Service
 /// Object. Normally, only called from static initializers, prior to
-/// calling open().
+/// calling open() but loading a service from a DLL can cause it too.
 
 int
 ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd)
 {
-  if (ACE::debug ())
-    {
-      static int pid = ACE_OS::getpid ();
-
-      // If called during static initialization ACE_Log_Msg may not
-      // have been initialized yet, so use printf intead. Using a "//"
-      // prefix in case the executable is a C++ code generator and the
-      // output gets embedded in the generated code.
-      ACE_OS::fprintf (stderr,
-           "// (%d|0) SG::insert"
-           " repo=%p (opened=%d) - enqueue %s,"
-           " active=%d.\n",
-           pid,
-           this->repo_,
-           this->is_opened_,
-           stsd->name_,
-           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);
-
   return this->static_svcs_->insert (stsd);
 }
 
@@ -499,7 +476,7 @@ ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd)
 ACE_ALLOC_HOOK_DEFINE (ACE_Service_Gestalt)
 
 
-  void
+void
 ACE_Service_Gestalt::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
@@ -538,7 +515,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
         ACE_Service_Config::global()->find_processed_static_svc(svc_name);
       if (assd != 0)
         {
-          this->process_directive_i(*assd,0);
+          this->process_directive_i(*assd, 0);
         }
       else
         {
@@ -792,7 +769,7 @@ int
 ACE_Service_Gestalt::process_directive (const ACE_Static_Svc_Descriptor &ssd,
                                         int force_replace)
 {
-  int result = process_directive_i(ssd,force_replace);
+  int const result = process_directive_i (ssd, force_replace);
   if (result == 0)
     {
       this->add_processed_static_svc(&ssd);
@@ -802,7 +779,7 @@ ACE_Service_Gestalt::process_directive (const ACE_Static_Svc_Descriptor &ssd,
 
 int
 ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
-                                        int force_replace)
+                                          int force_replace)
 {
   if (this->repo_ == 0)
     return -1;
@@ -829,8 +806,7 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
   if (stp == 0)
     return 0;
 
-
-  ACE_Service_Type *service_type;
+  ACE_Service_Type *service_type = 0;
 
   // This is just a temporary to force the compiler to use the right
   // constructor in ACE_Service_Type. Note that, in cases where we are
@@ -1299,8 +1275,7 @@ ACE_Service_Gestalt::close (void)
 {
   ACE_TRACE ("ACE_Service_Gestalt::close");
 
-  this->is_opened_--;
-  if (this->is_opened_ > 0)
+  if (!this->is_opened_ || --this->is_opened_ != 0)
     return 0;
 
   // Delete the list fo svc.conf files
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index a5d656a53a5..319ce7a0864 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -83,7 +83,7 @@ public:
   /// Constructor either associates the instance with the process-wide
   /// singleton instance of ACE_Service_Repository, or creates and
   /// manages its own instance of the specified size.
-  ACE_Service_Gestalt (size_t size,
+  ACE_Service_Gestalt (size_t size = 1024,
                        bool svc_repo_is_owned = true,
                        bool no_static_svcs = true);
 
diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp
index 200e505e76e..cf99c39b7aa 100644
--- a/ACE/ace/Service_Manager.cpp
+++ b/ACE/ace/Service_Manager.cpp
@@ -179,7 +179,7 @@ ACE_Service_Manager::list_services (void)
        sri.next (sr) != 0;
        sri.advance ())
     {
-      size_t len = ACE_OS::strlen (sr->name ()) + 11;
+      ssize_t len = static_cast<ssize_t> (ACE_OS::strlen (sr->name ())) + 11;
       ACE_TCHAR buf[BUFSIZ];
       ACE_TCHAR *p = buf + len;
 
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 2c9d6920d78..413d501833f 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -379,10 +379,10 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr)
 #ifndef ACE_NLOGGING
     if (ACE::debug ())
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("ACE (%P|%t) SR::insert, repo=%@ [%d] (%d), ")
-                  ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d\n"),
-                  this, i, this->total_size_, sr->name(),
-                  sr->type (),
+                  ACE_LIB_TEXT ("ACE (%P|%t) SR::insert")
+                  ACE_LIB_TEXT (" - repo=%@ [%d] (%d), name=%s")
+                  ACE_LIB_TEXT (", type=%@, object=%@, active=%d\n"),
+                  this, i, this->total_size_, sr->name(), sr->type (),
                   (sr->type () != 0) ? sr->type ()->object () : 0,
                   sr->active ()));
 #endif
@@ -394,8 +394,9 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr)
 #ifndef ACE_NLOGGING
       if (ACE::debug ())
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_LIB_TEXT ("ACE (%P|%t) SR::insert - destroying (replacing), repo=%@ [%d] (%d), ")
-                    ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d\n"),
+                    ACE_LIB_TEXT ("ACE (%P|%t) SR::insert")
+                    ACE_LIB_TEXT (" - destroying (replacing), repo=%@ [%d] (%d), name=%s")
+                    ACE_LIB_TEXT (", type=%@, object=%@, active=%d\n"),
                     this, i, this->total_size_, s->name(), s->type (),
                     (s->type () != 0) ? s->type ()->object () : 0,
                     s->active ()));
diff --git a/ACE/ace/Service_Types.h b/ACE/ace/Service_Types.h
index 8f7e838f4e3..5888be064e8 100644
--- a/ACE/ace/Service_Types.h
+++ b/ACE/ace/Service_Types.h
@@ -122,7 +122,7 @@ class ACE_Export ACE_Module_Type : public ACE_Service_Type_Impl
 {
 public:
   // = Initialization method.
-  ACE_Module_Type (void *m, // Really an <ACE_Module> *.
+  ACE_Module_Type (void *m, // Really an ACE_Module *.
                    const ACE_TCHAR *identifier,
                    u_int flags = 0);
 
diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h
index ff0d066120d..25f173a2afe 100644
--- a/ACE/ace/Shared_Memory_MM.h
+++ b/ACE/ace/Shared_Memory_MM.h
@@ -86,7 +86,7 @@ public:
   virtual int remove (void);
 
   // = Allocation and deallocation methods.
-  /// Create a new chuck of memory containing <size> bytes.
+  /// Create a new chuck of memory containing @a size bytes.
   virtual void *malloc (size_t size = 0);
 
   /// Free a chuck of memory allocated by
diff --git a/ACE/ace/Shared_Memory_Pool.h b/ACE/ace/Shared_Memory_Pool.h
index a54ef63da58..dfc5786b57f 100644
--- a/ACE/ace/Shared_Memory_Pool.h
+++ b/ACE/ace/Shared_Memory_Pool.h
@@ -122,7 +122,7 @@ public:
   virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
 
   /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
+  /// starting at <addr> up to @a len bytes.
   virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
   /// Return the base address of this memory pool, 0 if base_addr
diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h
index 565d69c14cb..f9097f0b4eb 100644
--- a/ACE/ace/Shared_Memory_SV.h
+++ b/ACE/ace/Shared_Memory_SV.h
@@ -66,7 +66,7 @@ public:
   virtual int remove (void);
 
   // = Allocation and deallocation methods.
-  /// Create a new chuck of memory containing <size> bytes.
+  /// Create a new chuck of memory containing @a size bytes.
   virtual void *malloc (size_t = 0);
 
   /// Free a chuck of memory allocated by <ACE_Shared_Memory_SV::malloc>.
diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h
index 31ca260b7a6..44360301087 100644
--- a/ACE/ace/Sig_Handler.h
+++ b/ACE/ace/Sig_Handler.h
@@ -34,11 +34,11 @@ class ACE_Sig_Action;
  * objects to handle signals in a way that avoids the use of
  * global/static variables and functions.
  *
- * Using this class a program can register an <ACE_Event_Handler>
+ * Using this class a program can register an ACE_Event_Handler
  * with the <ACE_Sig_Handler> in order to handle a designated
- * <signum>.  When a signal occurs that corresponds to this
- * <signum>, the <handle_signal> method of the registered
- * <ACE_Event_Handler> is invoked automatically.
+ * @a signum.  When a signal occurs that corresponds to this
+ * @a signum, the <handle_signal> method of the registered
+ * ACE_Event_Handler is invoked automatically.
  */
 class ACE_Export ACE_Sig_Handler
 {
@@ -49,8 +49,8 @@ public:
 
   // = Registration and removal methods.
   /**
-   * Add a new <ACE_Event_Handler> and a new sigaction associated with
-   * <signum>.  Passes back the existing <ACE_Event_Handler> and its
+   * Add a new ACE_Event_Handler and a new sigaction associated with
+   * @a signum.  Passes back the existing ACE_Event_Handler and its
    * sigaction if pointers are non-zero.  Returns -1 on failure and >=
    * 0 on success.
    */
@@ -61,11 +61,11 @@ public:
                                 ACE_Sig_Action *old_disp = 0);
 
   /**
-   * Remove the <ACE_Event_Handler> currently associated with
-   * <signum>.  <sigkey> is ignored in this implementation since there
+   * Remove the ACE_Event_Handler currently associated with
+   * @a signum.  <sigkey> is ignored in this implementation since there
    * is only one instance of a signal handler.  Install the new
    * disposition (if given) and return the previous disposition (if
-   * desired by the caller).  Returns 0 on success and -1 if <signum>
+   * desired by the caller).  Returns 0 on success and -1 if @a signum
    * is invalid.
    */
   virtual int remove_handler (int signum,
@@ -82,10 +82,10 @@ public:
 
   // = Set/get the handler associated with a particular signal.
 
-  /// Return the <ACE_Sig_Handler> associated with <signum>.
+  /// Return the <ACE_Sig_Handler> associated with @a signum.
   virtual ACE_Event_Handler *handler (int signum);
 
-  /// Set a new <ACE_Event_Handler> that is associated with <signum>.
+  /// Set a new ACE_Event_Handler that is associated with @a signum.
   /// Return the existing handler.
   virtual ACE_Event_Handler *handler (int signum,
                                       ACE_Event_Handler *);
@@ -108,7 +108,7 @@ protected:
   // = These methods and data members are shared by derived classes.
 
   /**
-   * Set a new <ACE_Event_Handler> that is associated with <signum>.
+   * Set a new ACE_Event_Handler that is associated with @a signum.
    * Return the existing handler.  Does not acquire any locks so that
    * it can be called from a signal handler, such as <dispatch>.
    */
@@ -119,8 +119,8 @@ protected:
    * This implementation method is called by <register_handler> and
    * <dispatch>.  It doesn't do any locking so that it can be called
    * within a signal handler, such as <dispatch>.  It adds a new
-   * <ACE_Event_Handler> and a new sigaction associated with <signum>.
-   * Passes back the existing <ACE_Event_Handler> and its sigaction if
+   * ACE_Event_Handler and a new sigaction associated with @a signum.
+   * Passes back the existing ACE_Event_Handler and its sigaction if
    * pointers are non-zero.  Returns -1 on failure and >= 0 on
    * success.
    */
@@ -152,8 +152,8 @@ private:
  *
  * Using this class a program can register one or more
  * ACE_Event_Handler with the ACE_Sig_Handler in order to
- * handle a designated <signum>.  When a signal occurs that
- * corresponds to this <signum>, the <handle_signal> methods of
+ * handle a designated @a signum.  When a signal occurs that
+ * corresponds to this @a signum, the <handle_signal> methods of
  * all the registered ACE_Event_Handlers are invoked
  * automatically.
  */
@@ -163,7 +163,7 @@ public:
   // = Registration and removal methods.
   /**
    * Add a new ACE_Event_Handler and a new sigaction associated with
-   * <signum>.  Passes back the existing ACE_Event_Handler and its
+   * @a signum.  Passes back the existing ACE_Event_Handler and its
    * sigaction if pointers are non-zero.  Returns -1 on failure and
    * a <sigkey> that is >= 0 on success.
    */
@@ -174,12 +174,12 @@ public:
                                 ACE_Sig_Action *old_disp = 0);
 
   /**
-   * Remove an <ACE_Event_Handler> currently associated with <signum>.
+   * Remove an ACE_Event_Handler currently associated with @a signum.
    * We remove the handler if (1) its <sigkey> matches the <sigkey>
    * passed as a parameter or (2) if we've been told to remove all the
    * handlers, i.e., <sigkey> == -1.  If a new disposition is given it
    * is installed and the previous disposition is returned (if desired
-   * by the caller).  Returns 0 on success and -1 if <signum> is
+   * by the caller).  Returns 0 on success and -1 if @a signum is
    * invalid.
    */
   virtual int remove_handler (int signum,
@@ -194,7 +194,7 @@ public:
   virtual ACE_Event_Handler *handler (int signum);
 
   /**
-   * Set a new <ACE_Event_Handler> that is associated with SIGNUM at
+   * Set a new ACE_Event_Handler that is associated with SIGNUM at
    * the head of the list of signals.  Return the existing handler
    * that was at the head.
    */
@@ -204,7 +204,7 @@ public:
   /**
    * Callback routine registered with sigaction(2) that dispatches the
    * <handle_signal> method of all the pre-registered
-   * ACE_Event_Handlers for <signum>
+   * ACE_Event_Handlers for @a signum
    */
   static void dispatch (int signum, siginfo_t *, ucontext_t *);
 
diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h
index edb091c1cbd..188bb770bd9 100644
--- a/ACE/ace/Signal.h
+++ b/ACE/ace/Signal.h
@@ -118,7 +118,7 @@ public:
 
   /**
    * Assigns the various fields of a <sigaction> struct and registers
-   * the <handler> to process signal <signum> via the <sigaction>
+   * the <handler> to process signal @a signum via the <sigaction>
    * function.
    */
   ACE_Sig_Action (ACE_SignalHandler handler,
@@ -128,7 +128,7 @@ public:
 
   /**
    * Assigns the various fields of a <sigaction> struct and registers
-   * the <handler> to process signal <signum> via the <sigaction>
+   * the <handler> to process signal @a signum via the <sigaction>
    * function.
    */
   ACE_Sig_Action (ACE_SignalHandler handler,
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 038e68a85f7..472f4c2e580 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1319,7 +1319,7 @@ ACE::get_ip_interfaces (size_t &count,
         {
 # if !defined(_UNICOS)
           struct sockaddr_in *addr =
-              addr =  reinterpret_cast<sockaddr_in *> (&pcur->IFR_ADDR);
+            reinterpret_cast<sockaddr_in *> (&pcur->IFR_ADDR);
 
           // Sometimes the kernel returns 0.0.0.0 as an IPv4 interface
           // address; skip those...
diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index b44b04ddacc..56fa5a91aeb 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -589,7 +589,7 @@ ACE_Stream<ACE_SYNCH_USE>::ACE_Stream (void * a,
                                        ACE_Module<ACE_SYNCH_USE> *head,
                                        ACE_Module<ACE_SYNCH_USE> *tail)
   : linked_us_ (0),
-    final_close_ (this->lock_)
+    final_close_ (lock_)
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::ACE_Stream");
   if (this->open (a, head, tail) == -1)
diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h
index 13a36b78f2b..b51e3c23880 100644
--- a/ACE/ace/Stream.h
+++ b/ACE/ace/Stream.h
@@ -88,12 +88,12 @@ public:
   // = ACE_Stream plumbing operations
 
   /// Add a new module <mod> right below the Stream head.  The
-  /// <open()> hook methods of the <ACE_Tasks> in this <ACE_Module>
+  /// <open()> hook methods of the <ACE_Tasks> in this ACE_Module
   /// are invoked to initialize the tasks.
   virtual int push (ACE_Module<ACE_SYNCH_USE> *mod);
 
   /// Remove the <mod> right below the Stream head and close it down.
-  //  The <close()> hook methods of the <ACE_Tasks> in this <ACE_Module>
+  //  The <close()> hook methods of the <ACE_Tasks> in this ACE_Module
   /// are invoked to cleanup the tasks.
   virtual int pop (int flags = M_DELETE);
 
@@ -132,18 +132,18 @@ public:
 
   // = Blocking data transfer operations
   /**
-   * Send the message <mb> down the stream, starting at the Module
-   * below the Stream head.  Wait for upto <timeout> amount of
+   * Send the message @a mb down the stream, starting at the Module
+   * below the Stream head.  Wait for upto @a timeout amount of
    * absolute time for the operation to complete (or block forever if
-   * <timeout> == 0).
+   * @a timeout == 0).
    */
   virtual int put (ACE_Message_Block *mb,
                    ACE_Time_Value *timeout = 0);
 
   /**
-   * Read the message <mb> that is stored in the stream head.
-   * Wait for upto <timeout> amount of absolute time for the operation
-   * to complete (or block forever if <timeout> == 0).
+   * Read the message @a mb that is stored in the stream head.
+   * Wait for upto @a timeout amount of absolute time for the operation
+   * to complete (or block forever if @a timeout == 0).
    */
   virtual int get (ACE_Message_Block *&mb,
                    ACE_Time_Value *timeout = 0);
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index 525dcbc2553..ac845437b57 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -30,7 +30,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (ACE_Allocator *the_allocator)
     len_ (0),
     buf_len_ (0),
     rep_ (&ACE_String_Base<CHAR>::NULL_String_),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 }
@@ -40,12 +40,12 @@ ACE_String_Base<CHAR>::ACE_String_Base (ACE_Allocator *the_allocator)
 template <class CHAR>
 ACE_String_Base<CHAR>::ACE_String_Base (const CHAR *s,
                                         ACE_Allocator *the_allocator,
-                                        int release)
+                                        bool release)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
     len_ (0),
     buf_len_ (0),
     rep_ (0),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
   this->set (s, release);
@@ -58,7 +58,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (CHAR c,
     len_ (0),
     buf_len_ (0),
     rep_ (0),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
@@ -72,12 +72,12 @@ ACE_String_Base<CHAR>::ACE_String_Base (
   const CHAR *s,
   typename ACE_String_Base<CHAR>::size_type  len,
   ACE_Allocator *the_allocator,
-  int release)
+  bool release)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
     len_ (0),
     buf_len_ (0),
     rep_ (0),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
@@ -92,7 +92,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (const ACE_String_Base<CHAR> &s)
     len_ (0),
     buf_len_ (0),
     rep_ (0),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
@@ -108,7 +108,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (
     len_ (0),
     buf_len_ (0),
     rep_ (0),
-    release_ (0)
+    release_ (false)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
@@ -120,7 +120,7 @@ ACE_String_Base<CHAR>::~ACE_String_Base (void)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::~ACE_String_Base");
 
-  if (this->buf_len_ != 0 && this->release_ != 0)
+  if (this->buf_len_ != 0 && this->release_)
       this->allocator_->free (this->rep_);
 }
 
@@ -128,7 +128,7 @@ ACE_String_Base<CHAR>::~ACE_String_Base (void)
 template <class CHAR> void
 ACE_String_Base<CHAR>::set (const CHAR *s,
                             typename ACE_String_Base<CHAR>::size_type len,
-                            int release)
+                            bool release)
 {
   // Case 1. Going from memory to more memory
   size_type new_buf_len = len + 1;
@@ -138,25 +138,25 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
       ACE_ALLOCATOR (temp,
                      (CHAR *) this->allocator_->malloc (new_buf_len * sizeof (CHAR)));
 
-    if (this->buf_len_ != 0 && this->release_ != 0)
+      if (this->buf_len_ != 0 && this->release_)
         this->allocator_->free (this->rep_);
 
       this->rep_ = temp;
       this->buf_len_ = new_buf_len;
-      this->release_ = 1;
+      this->release_ = true;
       this->len_ = len;
       ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR));
-    this->rep_[len] = 0;
+      this->rep_[len] = 0;
     }
   else // Case 2. No memory allocation is necessary.
     {
       // Free memory if necessary and figure out future ownership
-    if (release == 0 || s == 0 || len == 0)
+      if (!release || s == 0 || len == 0)
         {
-      if (this->buf_len_ != 0 && this->release_ != 0)
+          if (this->buf_len_ != 0 && this->release_)
             {
               this->allocator_->free (this->rep_);
-              this->release_ = 0;
+              this->release_ = false;
             }
         }
       // Populate data.
@@ -165,14 +165,14 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
           this->buf_len_ = 0;
           this->len_ = 0;
           this->rep_ = &ACE_String_Base<CHAR>::NULL_String_;
-      this->release_ = 0;
+          this->release_ = false;
         }
-    else if (release == 0) // Note: No guarantee that rep_ is null terminated.
+      else if (!release) // Note: No guarantee that rep_ is null terminated.
         {
           this->buf_len_ = len;
           this->len_ = len;
           this->rep_ = const_cast <CHAR *> (s);
-      this->release_ = 0;
+          this->release_ = false;
         }
       else
         {
@@ -237,10 +237,10 @@ ACE_String_Base<CHAR>::append (const CHAR* s,
 
       ACE_OS::memcpy (t + this->len_, s, slen * sizeof (CHAR));
 
-      if (this->buf_len_ != 0 && this->release_ != 0)
+      if (this->buf_len_ != 0 && this->release_)
         this->allocator_->free (this->rep_);
 
-      this->release_ = 1;
+      this->release_ = true;
       this->rep_ = t;
       this->buf_len_ = new_buf_len;
     }
@@ -279,13 +279,13 @@ ACE_String_Base<CHAR>::fast_resize (size_t len)
   // 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_)
         this->allocator_->free (this->rep_);
 
       this->rep_ = static_cast<CHAR*>
                      (this->allocator_->malloc ((len + 1) * sizeof (CHAR)));
       this->buf_len_ = len + 1;
-      this->release_ = 1;
+      this->release_ = true;
     }
   this->len_ = 0;
   if (len > 0)
@@ -293,23 +293,23 @@ ACE_String_Base<CHAR>::fast_resize (size_t len)
 }
 
 template <class CHAR> void
-ACE_String_Base<CHAR>::clear (int release)
+ACE_String_Base<CHAR>::clear (bool release)
 {
-  // This can't use set(), because that would free memory if release=0
-  if (release != 0)
+  // This can't use set(), because that would free memory if release=false
+  if (release)
   {
-    if (this->buf_len_ != 0 && this->release_ != 0)
+    if (this->buf_len_ != 0 && this->release_)
       this->allocator_->free (this->rep_);
 
     this->rep_ = &ACE_String_Base<CHAR>::NULL_String_;
-  this->len_ = 0;
+    this->len_ = 0;
     this->buf_len_ = 0;
-    this->release_ = 0;
-}
-  else
-  {
-    this->fast_clear ();
+    this->release_ = false;
   }
+  else
+    {
+      this->fast_clear ();
+    }
 }
 
 // Assignment operator (does copy memory).
@@ -338,7 +338,7 @@ ACE_String_Base<CHAR>::operator= (const ACE_String_Base<CHAR> &s)
 }
 
 template <class CHAR> void
-ACE_String_Base<CHAR>::set (const CHAR *s, int release)
+ACE_String_Base<CHAR>::set (const CHAR *s, bool release)
 {
   size_t length = 0;
   if (s != 0)
@@ -351,7 +351,7 @@ template <class CHAR> void
 ACE_String_Base<CHAR>::fast_clear (void)
 {
   this->len_ = 0;
-  if (this->release_ != 0)
+  if (this->release_)
     {
       // String retains the original buffer.
       if (this->rep_ != &ACE_String_Base<CHAR>::NULL_String_)
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index 239019b0fae..2525a070ed0 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -41,7 +41,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * is not allocated new space.  Instead, its internal
  * representation is set equal to a global empty string.
  * CAUTION: in cases when ACE_String_Base is constructed from a
- * provided buffer with the release parameter set to 0,
+ * provided buffer with the release parameter set to false,
  * ACE_String_Base is not guaranteed to be '\0' terminated.
  *
  * \li Do not use a "@c -1" magic number to refer to the "no position"
@@ -72,43 +72,43 @@ public:
   /**
    * Constructor that copies @a s into dynamically allocated memory.
    *
-   * if release == 1 then a new buffer is allocated internally, and
+   * if release == true then a new buffer is allocated internally, and
    *   s is copied to the internal buffer.
-   * if release == 0 then the s buffer is used directly. If s == 0
+   * if release == false then the s buffer is used directly. If s == 0
    *   then it will _not_ be used, and instead the internal buffer
    *   is set to NULL_String_.
    *
    * @param s Zero terminated input string
    * @param the_allocator ACE_Allocator associated with string
-   * @param release Allocator responsible(1)/not reponsible(0) for
+   * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    * @return ACE_String_Base containing const CHAR *s
    */
   ACE_String_Base (const CHAR *s,
                    ACE_Allocator *the_allocator = 0,
-                   int release = 1);
+                   bool release = true);
 
   /**
    * Constructor that copies @a len CHARs of @a s into dynamically
    * allocated memory (will zero terminate the result).
    *
-   * if release == 1 then a new buffer is allocated internally.
+   * if release == true then a new buffer is allocated internally.
    *   s is copied to the internal buffer.
-   * if release == 0 then the s buffer is used directly. If s == 0
+   * if release == false then the s buffer is used directly. If s == 0
    *   then it will _not_ be used, and instead the internal buffer
    *   is set to NULL_String_.
    *
    * @param s Non-zero terminated input string
    * @param len Length of non-zero terminated input string
    * @param the_allocator ACE_Allocator associated with string
-   * @param release Allocator responsible(1)/not reponsible(0) for
+   * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    * @return ACE_String_Base containing const CHAR *s
    */
   ACE_String_Base (const CHAR *s,
                    size_type len,
                    ACE_Allocator *the_allocator = 0,
-                   int release = 1);
+                   bool release = true);
 
   /**
    *  Copy constructor.
@@ -194,68 +194,68 @@ public:
   /**
    * Copy @a s into this @a ACE_String_Base.
    *
-   * If release == 1 then a new buffer is allocated internally if the
+   * If release == true then a new buffer is allocated internally if the
    *   existing one is not big enough to hold s. If the existing
    *   buffer is big enough, then it will be used. This means that
    *   set(*, 1) can be illegal when the string is constructed with a
    *   const char*. (e.g. ACE_String_Base("test", 0, 0)).
    *
-   * if release == 0 then the s buffer is used directly, and any
+   * if release == false then the s buffer is used directly, and any
    *   existing buffer is destroyed. If s == 0 then it will _not_ be
    *   used, and instead the internal buffer is set to NULL_String_.
    *
    * @param s Null terminated input string
-   * @param release Allocator responsible(1)/not reponsible(0) for
+   * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    */
-  void set (const CHAR * s, int release = 1);
+  void set (const CHAR * s, bool release = true);
 
   /**
    *  Copy @a len bytes of @a s (will zero terminate the result).
    *
-   * If release == 1 then a new buffer is allocated internally if the
+   * If release == true then a new buffer is allocated internally if the
    *   existing one is not big enough to hold s. If the existing
    *   buffer is big enough, then it will be used. This means that
    *   set(*, *, 1) is illegal when the string is constructed with a
    *   non-owned const char*. (e.g. ACE_String_Base("test", 0, 0))
    *
-   * If release == 0 then the s buffer is used directly, and any
+   * If release == false then the s buffer is used directly, and any
    *   existing buffer is destroyed. If s == 0 then it will _not_ be
    *   used, and instead the internal buffer is set to NULL_String_.
    *
    *  @param s Non-zero terminated input string
    *  @param len Length of input string 's'
-   *  @param release Allocator responsible(1)/not reponsible(0) for
+   *  @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    */
-  void set (const CHAR * s, size_type len, int release);
+  void set (const CHAR * s, size_type len, bool release);
 
   /**
-   * Clear this string. Memory is _not_ freed if <release> is 0.
+   * Clear this string. Memory is _not_ freed if @a release is false.
    *
    * Warning: This method was incorrectly documented in the past, but
    * the current implementation has been changed to match the documented
    * behavior.
    *
-   * Warning: clear(0) behaves like fast_clear() below.
+   * Warning: clear(false) behaves like fast_clear() below.
    *
-   * @param release Memory is freed if 1 or not if 0.
+   * @param release Memory is freed if true, and not freed if false.
    */
-  void clear (int release = 0);
+  void clear (bool release = false);
 
   /**
    * A more specialized version of clear(): "fast clear". fast_clear()
    * resets the string to 0 length. If the string owns the buffer
-   * (@arg release_== 1):
+   * (@arg release_== true):
    *  - the string buffer is not freed
    *  - the first character of the buffer is set to 0.
    *
-   * If @arg release_ is 0 (this object does not own the buffer):
+   * If @arg release_ is false (this object does not own the buffer):
    *  - the buffer pointer is reset to the NULL_String_ and does not
    *    maintain a pointer to the caller-supplied buffer on return
    *  - the maximum string length is reset to 0.
    *
-   * Warning : Calling clear(0) or fast_clear() can have unintended
+   * Warning : Calling clear(false) or fast_clear() can have unintended
    *   side-effects if the string was constructed (or set()) with an
    *   external buffer. The string will be disassociated with the buffer
    *   and the next append() or +=() will cause a new buffer to be
@@ -559,7 +559,7 @@ protected:
   /**
    *  Flag that indicates if we own the memory
    */
-  int release_;
+  bool release_;
 
   /**
    *  Represents the "NULL" string to simplify the internal logic.
diff --git a/ACE/ace/String_Base_Const.cpp b/ACE/ace/String_Base_Const.cpp
index 77dff6db428..7e431a7cb8a 100644
--- a/ACE/ace/String_Base_Const.cpp
+++ b/ACE/ace/String_Base_Const.cpp
@@ -6,6 +6,15 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos =
+#if defined (AIX) //&& (defined (__xlC__) || defined (__IBMCPP__))
+  // Under some mixed shared/static linking conditions, this constant
+  // will not be initialized at run-time if the
+  // std::numeric_limits<>::max() trait is used on AIX/XLC++.
+  // Workaround that problem by making it easier for the compiler to
+  // realize it can set the constant at compile-time.
+  static_cast<ACE_String_Base_Const::size_type> (-1);
+#else
   ACE_Numeric_Limits<ACE_String_Base_Const::size_type>::max ();
+#endif  /* AIX */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Svc_Conf_Lexer.cpp b/ACE/ace/Svc_Conf_Lexer.cpp
index c5298610701..3bcd8d6d559 100644
--- a/ACE/ace/Svc_Conf_Lexer.cpp
+++ b/ACE/ace/Svc_Conf_Lexer.cpp
@@ -49,6 +49,15 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 #define ACE_NO_STATE -1
 #define ACE_COMMENT 0
 
+#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+// Visual Studio .NET 2005 (VC8) issues warning C4351 for input_ in the
+// constructor initializer list below. Since we like the warned-of new
+// behavior (input_ elements will be default-initialized), squash the
+// warning here.
+#  pragma warning (push)
+#  pragma warning (disable:4351)
+#endif /* VC8 */
+
 struct ace_yy_buffer_state
 {
   ace_yy_buffer_state (void)
@@ -65,6 +74,9 @@ struct ace_yy_buffer_state
 #endif /* ACE_USES_WCHAR */
   {
   }
+#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#  pragma warning (pop)
+#endif /* VC8 */
 
   ~ace_yy_buffer_state (void)
   {
@@ -317,13 +329,16 @@ ACE_Svc_Conf_Lexer::scan (ACE_YYSTYPE* ace_yylval,
                 // Now, we need to move back in the string until we find the
                 // same character that started the string
                 bool string_end_found = false;
-                for(ssize_t i = (current - 1) - buffer->index_; i >= 0; i--)
+                if (current > buffer->index_)
                   {
-                    if (source[i] == buffer->string_start_)
+                    for (size_t i = current - buffer->index_; i-- != 0; )
                       {
-                        current = buffer->index_ + i + 1;
-                        string_end_found = true;
-                        break;
+                        if (source[i] == buffer->string_start_)
+                          {
+                            current = buffer->index_ + i + 1;
+                            string_end_found = true;
+                            break;
+                          }
                       }
                   }
 
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp
index bb8ce2bd077..241ed643a06 100644
--- a/ACE/ace/Svc_Handler.cpp
+++ b/ACE/ace/Svc_Handler.cpp
@@ -324,11 +324,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (u_long)
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int argc, ACE_TCHAR *argv[])
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int /* argc */,
+                                               ACE_TCHAR * /* argv */[])
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init");
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
   return -1;
 }
 
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 76027b9e409..9d3dd857de4 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -264,7 +264,7 @@ public:
   // = Initialization and termination methods.
   /**
    * Constructor initializes the <thr_mgr> and <mq> by passing them
-   * down to the <ACE_Task> base class.  The <reactor> is passed to
+   * down to the ACE_Task base class.  The <reactor> is passed to
    * the ACE_Event_Handler.  The <max_buffer_size> and
    * <relative_timeout> are used to determine at what point to flush
    * the <mq>.  By default, there's no buffering at all.  The
@@ -282,7 +282,7 @@ public:
 
   /**
    * Insert the ACE_Message_Block chain rooted at <message_block>
-   * into the ACE_Message_Queue with the designated <timeout>.  The
+   * into the ACE_Message_Queue with the designated @a timeout.  The
    * <flush> method will be called if this <put> causes the number of
    * bytes to exceed the maximum buffer size or if the timeout period
    * has elapsed.
diff --git a/ACE/ace/Swap.cpp b/ACE/ace/Swap.cpp
deleted file mode 100644
index eb14789c3de..00000000000
--- a/ACE/ace/Swap.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Swap.cpp
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
-
-#ifndef ACE_SWAP_CPP
-#define ACE_SWAP_CPP
-
-#include "ace/Swap.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Swap.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_SWAP_CPP */
diff --git a/ACE/ace/Swap.h b/ACE/ace/Swap.h
deleted file mode 100644
index 89bf26a80d9..00000000000
--- a/ACE/ace/Swap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-/**
- *  @file Swap.h
- *
- *  $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
-
-#ifndef ACE_SWAP_H
-#define ACE_SWAP_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_Swap
- *
- * @brief Defines a function to swap two variables.
- *
- * @deprecated This template is deprecated, you can use std::swap without
- * problems on all platforms.
- *
- */
-template<class T> class ACE_Swap
-{
-public:
-  /// Swap two variables
-  static void swap (T &lhs, T &rhs);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/Swap.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Swap.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Swap.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_FUNCTOR_H */
diff --git a/ACE/ace/Swap.inl b/ACE/ace/Swap.inl
deleted file mode 100644
index 195f1559f69..00000000000
--- a/ACE/ace/Swap.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-
-/**
- * @file Swap.inl
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template<class T> ACE_INLINE void
-ACE_Swap<T>::swap (T &lhs, T& rhs)
-{
-  T tmp = lhs;
-  lhs = rhs;
-  rhs = tmp;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/TLI_Acceptor.h b/ACE/ace/TLI_Acceptor.h
index e7855b83c8f..7a6577800ad 100644
--- a/ACE/ace/TLI_Acceptor.h
+++ b/ACE/ace/TLI_Acceptor.h
@@ -73,8 +73,8 @@ public:
   // = Passive connection acceptance method.
 
   /**
-   * Accept a new data transfer connection.  A <timeout> of 0 means
-   * block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
+   * Accept a new data transfer connection.  A @a timeout of 0 means
+   * block forever, a @a timeout of {0, 0} means poll.  <restart> == 1
    * means "restart if interrupted."
    */
   int accept (ACE_TLI_Stream &new_tli_sap,
diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h
index d8e8f381bfb..74e477a7b6b 100644
--- a/ACE/ace/TLI_Connector.h
+++ b/ACE/ace/TLI_Connector.h
@@ -42,7 +42,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
@@ -70,7 +70,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp
index 97490760507..905bcd23202 100644
--- a/ACE/ace/TSS_T.cpp
+++ b/ACE/ace/TSS_T.cpp
@@ -92,7 +92,7 @@ ACE_TSS<TYPE>::cleanup (void *ptr)
 }
 
 template <class TYPE> int
-ACE_TSS<TYPE>::ts_init (void) 
+ACE_TSS<TYPE>::ts_init (void)
 {
   // Ensure that we are serialized!
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);
@@ -338,12 +338,10 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
     }
 #else
   void *temp = ts_obj; // Need this temp to keep G++ from complaining.
-  if (ACE_Thread::getspecific (this->key_,
-                               &temp) == -1)
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
     return 0; // This should not happen!
   ts_obj = static_cast <TYPE *> (temp);
-  if (ACE_Thread::setspecific (this->key_,
-                               (void *) new_ts_obj) == -1)
+  if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) == -1)
     return ts_obj; // This should not happen!
 #endif /* ACE_HAS_THR_C_DEST */
 
diff --git a/ACE/ace/Task.h b/ACE/ace/Task.h
index 8f5336f536e..be7272e246a 100644
--- a/ACE/ace/Task.h
+++ b/ACE/ace/Task.h
@@ -60,7 +60,7 @@ namespace ACE_Task_Flags
  *
  * This class factors out the non-template code in order to
  * reduce template bloat, as well as to make it possible for the
- * <ACE_Thread_Manager> to store <ACE_Task_Base> *'s
+ * <ACE_Thread_Manager> to store ACE_Task_Base *'s
  * polymorphically.
  */
 class ACE_Export ACE_Task_Base : public ACE_Service_Object
@@ -154,7 +154,7 @@ public:
    * EXTREMEMLY implementation-dependent, and are probably best
    * avoided.
    *
-   * If <thread_handles> != 0 it is assumed to be an array of <n>
+   * If <thread_handles> != 0 it is assumed to be an array of @a n
    * thread_handles that will be assigned the values of the thread
    * handles being spawned.  Returns -1 on failure (<errno> will
    * explain...), otherwise returns the group id of the threads.
@@ -168,10 +168,10 @@ public:
    * specified <task> value must therefore be manipulated thru
    * ACE_Thread_Manager directly.
    *
-   * If <stack> != 0 it is assumed to be an array of <n> pointers to
+   * If <stack> != 0 it is assumed to be an array of @a n pointers to
    * the base of the stacks to use for the threads being spawned.
    * Likewise, if <stack_size> != 0 it is assumed to be an array of
-   * <n> values indicating how big each of the corresponding <stack>s
+   * @a n values indicating how big each of the corresponding <stack>s
    * are.
    *
    *
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 79102e4be8f..6c341560818 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -89,38 +89,38 @@ public: // Should be protected:
 
   // = Enqueue and dequeue methods.
 
-  // For the following five method if <timeout> == 0, the caller will
+  // For the following five method if @a timeout == 0, the caller will
   // block until action is possible, else will wait until the
-  // <{absolute}> time specified in *<timeout> elapses).  These calls
+  // <{absolute}> time specified in *@a timeout elapses).  These calls
   // will return, however, when queue is closed, deactivated, when a
   // signal occurs, or if the time specified in timeout elapses, (in
   // which case errno = EWOULDBLOCK).
 
-  /// Insert message into the message queue.  Note that <timeout> uses
+  /// Insert message into the message queue.  Note that @a timeout uses
   /// <{absolute}> time rather than <{relative}> time.
   int putq (ACE_MESSAGE_TYPE *, ACE_Time_Value *timeout = 0);
 
   /**
    * Extract the first message from the queue (blocking).  Note that
-   * <timeout> uses <{absolute}> time rather than <{relative}> time.
+   * @a timeout uses <{absolute}> time rather than <{relative}> time.
    * Returns number of items in queue if the call succeeds or -1 otherwise.
    */
   int getq (ACE_MESSAGE_TYPE *&mb, ACE_Time_Value *timeout = 0);
 
-  /// Return a message to the queue.  Note that <timeout> uses
+  /// Return a message to the queue.  Note that @a timeout uses
   /// <{absolute}> time rather than <{relative}> time.
   int ungetq (ACE_MESSAGE_TYPE *, ACE_Time_Value *timeout = 0);
 
   /**
    * Turn the message around and send it back down the Stream.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
    * time.
    */
   int reply (ACE_MESSAGE_TYPE *, ACE_Time_Value *timeout = 0);
 
   /**
    * Transfer message to the adjacent ACE_Task_Ex in a ACE_Stream.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
    * time.
    */
   int put_next (ACE_MESSAGE_TYPE *msg, ACE_Time_Value *timeout = 0);
diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h
index af029a42ec8..5531e136b0b 100644
--- a/ACE/ace/Task_T.h
+++ b/ACE/ace/Task_T.h
@@ -69,25 +69,25 @@ public: // Should be protected:
 
   // = Enqueue and dequeue methods.
 
-  // For the following five method if <timeout> == 0, the caller will
+  // For the following five method if @a timeout == 0, the caller will
   // block until action is possible, else will wait until the
-  // <{absolute}> time specified in *<timeout> elapses).  These calls
+  // <{absolute}> time specified in *@a timeout elapses).  These calls
   // will return, however, when queue is closed, deactivated, when a
   // signal occurs, or if the time specified in timeout elapses, (in
   // which case errno = EWOULDBLOCK).
 
-  /// Insert message into the message queue.  Note that <timeout> uses
+  /// Insert message into the message queue.  Note that @a timeout uses
   /// <{absolute}> time rather than <{relative}> time.
   int putq (ACE_Message_Block *, ACE_Time_Value *timeout = 0);
 
   /**
    * Extract the first message from the queue (blocking).  Note that
-   * <timeout> uses <{absolute}> time rather than <{relative}> time.
+   * @a timeout uses <{absolute}> time rather than <{relative}> time.
    * Returns number of items in queue if the call succeeds or -1 otherwise.
    */
   int getq (ACE_Message_Block *&mb, ACE_Time_Value *timeout = 0);
 
-  /// Return a message to the queue.  Note that <timeout> uses
+  /// Return a message to the queue.  Note that @a timeout uses
   /// <{absolute}> time rather than <{relative}> time.
   int ungetq (ACE_Message_Block *, ACE_Time_Value *timeout = 0);
 
@@ -106,7 +106,7 @@ public: // Should be protected:
 
   /**
    * Transfer message to the adjacent ACE_Task in a ACE_Stream.  Note
-   * that <timeout> uses <{absolute}> time rather than <{relative}>
+   * that @a timeout uses <{absolute}> time rather than <{relative}>
    * time.
    */
   int put_next (ACE_Message_Block *msg, ACE_Time_Value *timeout = 0);
diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h
index 6a22fb34ee6..ceb6fc9c1fd 100644
--- a/ACE/ace/Thread.h
+++ b/ACE/ace/Thread.h
@@ -115,16 +115,16 @@ public:
                          ACE_Thread_Adapter *thread_adapter = 0);
 
   /**
-   * Spawn <n> new threads, which execute <func> with argument <arg>
+   * Spawn @a n new threads, which execute <func> with argument <arg>
    * (if <thread_adapter> is non-0 then <func> and <args> are ignored
    * and are obtained from <thread_adapter>).  The thread_ids of
    * successfully spawned threads will be placed into the <thread_ids>
-   * buffer (which must be the same size as <n>).  If <stack> != 0 it
-   * is assumed to be an array of <n> pointers to the base of the
+   * buffer (which must be the same size as @a n).  If <stack> != 0 it
+   * is assumed to be an array of @a n pointers to the base of the
    * stacks to use for the threads being spawned.  If <stack_size> !=
-   * 0 it is assumed to be an array of <n> values indicating how big
+   * 0 it is assumed to be an array of @a n values indicating how big
    * each of the corresponding <stack>s are.  If <thread_handles> != 0
-   * it is assumed to be an array of <n> thread_handles that will be
+   * it is assumed to be an array of @a n thread_handles that will be
    * assigned the values of the thread handles being spawned.  Returns
    * the number of threads actually spawned (if this doesn't equal the
    * number requested then something has gone wrong and <errno> will
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 2a6742ce789..8357c42bc22 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -990,7 +990,7 @@ int
 ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int)
 {
   ACE_TRACE ("ACE_Thread_Manager::join_thr");
-  int result = ACE_Thread::join (td->thr_handle_);
+  int const result = ACE_Thread::join (td->thr_handle_);
   if (result != 0)
     {
       // Since the thread are being joined, we should
diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h
index 616e972ecf8..35a09641250 100644
--- a/ACE/ace/Thread_Manager.h
+++ b/ACE/ace/Thread_Manager.h
@@ -190,8 +190,8 @@ public:
   /// Current state of the thread.
   ACE_UINT32 state (void) const;
 
-  /// Return the pointer to an <ACE_Task_Base> or NULL if there's no
-  /// <ACE_Task_Base> associated with this thread.;
+  /// Return the pointer to an ACE_Task_Base or NULL if there's no
+  /// ACE_Task_Base associated with this thread.;
   ACE_Task_Base *task (void) const;
 
 protected:
@@ -210,8 +210,8 @@ protected:
   /// Current state of the thread.
   ACE_UINT32 thr_state_;
 
-  /// Pointer to an <ACE_Task_Base> or NULL if there's no
-  /// <ACE_Task_Base>.
+  /// Pointer to an ACE_Task_Base or NULL if there's no
+  /// ACE_Task_Base.
   ACE_Task_Base *task_;
 
   /// We need these pointers to maintain the double-linked list in a
@@ -494,12 +494,12 @@ public:
    * Spawn N new threads, which execute <func> with argument <arg>.
    * If <thread_ids> != 0 the thread_ids of successfully spawned
    * threads will be placed into the <thread_ids> buffer (which must
-   * be the same size as <n>).  If <stack> != 0 it is assumed to be an
-   * array of <n> pointers to the base of the stacks to use for the
+   * be the same size as @a n).  If <stack> != 0 it is assumed to be an
+   * array of @a n pointers to the base of the stacks to use for the
    * threads being spawned.  If <stack_size> != 0 it is assumed to be
-   * an array of <n> values indicating how big each of the
+   * an array of @a n values indicating how big each of the
    * corresponding <stack>s are.  If <thread_handles> != 0 it is
-   * assumed to be an array of <n> thread_handles that will be
+   * assumed to be an array of @a n thread_handles that will be
    * assigned the values of the thread handles being spawned.
    *
    * Threads in Thread_Manager can be manipulated in groups based on
@@ -507,7 +507,7 @@ public:
    * cancel_task().
    *
    * If <grp_id> is assigned, the newly spawned threads are added into
-   * the group.  Otherwise, the Thread_Manager assigns these <n>
+   * the group.  Otherwise, the Thread_Manager assigns these @a n
    * threads with a grp_id.  You should choose either assigning
    * <grp_id> everytime, or let the Thread_Manager handles it for
    * you consistently.
@@ -534,12 +534,12 @@ public:
    * Spawn N new threads, which execute <func> with argument <arg>.
    * If <thread_ids> != 0 the thread_ids of successfully spawned
    * threads will be placed into the <thread_ids> buffer (which must
-   * be the same size as <n>).  If <stack> != 0 it is assumed to be an
-   * array of <n> pointers to the base of the stacks to use for the
+   * be the same size as @a n).  If <stack> != 0 it is assumed to be an
+   * array of @a n pointers to the base of the stacks to use for the
    * threads being spawned.  If <stack_size> != 0 it is assumed to be
-   * an array of <n> values indicating how big each of the
+   * an array of @a n values indicating how big each of the
    * corresponding <stack>s are.  If <thread_handles> != 0 it is
-   * assumed to be an array of <n> thread_handles that will be
+   * assumed to be an array of @a n thread_handles that will be
    * assigned the values of the thread handles being spawned.
    *
    * Threads in Thread_Manager can be manipulated in groups based on
@@ -547,7 +547,7 @@ public:
    * cancel_task().
    *
    * If <grp_id> is assigned, the newly spawned threads are added into
-   * the group.  Otherwise, the Thread_Manager assigns these <n>
+   * the group.  Otherwise, the Thread_Manager assigns these @a n
    * threads with a grp_id.  You should choose either assigning
    * <grp_id> everytime, or let the Thread_Manager handles it for
    * you consistently.
@@ -648,8 +648,8 @@ public:
   ACE_thread_t thr_self (void);
 
   /**
-   * Returns a pointer to the current <ACE_Task_Base> we're executing
-   * in if this thread is indeed running in an <ACE_Task_Base>, else
+   * Returns a pointer to the current ACE_Task_Base we're executing
+   * in if this thread is indeed running in an ACE_Task_Base, else
    * return 0.
    */
   ACE_Task_Base *task (void);
@@ -688,11 +688,11 @@ public:
 
   // = Send signals to one or more threads without blocking.
   /**
-   * Send <signum> to all stopped threads.  Not supported on platforms
+   * Send @a signum to all stopped threads.  Not supported on platforms
    * that do not have advanced signal support, such as Win32.
-   * Send the <signum> to a single thread.  Not supported on platforms
+   * Send the @a signum to a single thread.  Not supported on platforms
    * that do not have advanced signal support, such as Win32.
-   * Send <signum> to a group of threads, not supported on platforms
+   * Send @a signum to a group of threads, not supported on platforms
    * that do not have advanced signal support, such as Win32.
    */
   int kill_all (int signum);
@@ -771,13 +771,13 @@ public:
   int resume_task (ACE_Task_Base *task);
 
   /**
-   * Send a signal <signum> to all threads in an <ACE_Task>.
+   * Send a signal @a signum to all threads in an ACE_Task.
    */
   int kill_task (ACE_Task_Base *task,
                  int signum);
 
   /**
-   * Cancel all threads in an <ACE_Task>.  If <async_cancel> is non-0,
+   * Cancel all threads in an ACE_Task.  If <async_cancel> is non-0,
    * then asynchronously cancel these threads if the OS platform
    * supports cancellation.  Otherwise, perform a "cooperative"
    * cancellation.
@@ -791,10 +791,10 @@ public:
   int hthread_within (ACE_hthread_t handle);
   int thread_within (ACE_thread_t tid);
 
-  /// Returns the number of <ACE_Task_Base> in a group.
+  /// Returns the number of ACE_Task_Base in a group.
   int num_tasks_in_group (int grp_id);
 
-  /// Returns the number of threads in an <ACE_Task_Base>.
+  /// Returns the number of threads in an ACE_Task_Base.
   int num_threads_in_task (ACE_Task_Base *task);
 
   /**
@@ -825,9 +825,9 @@ public:
                      size_t n);
 
   /**
-   * Returns in <thread_list> a list of up to <n> thread ids in an
-   * <ACE_Task_Base>.  The caller must allocate the memory for
-   * <thread_list>.  In case of an error, -1 is returned. If no
+   * Returns in @a thread_list a list of up to @a n thread ids in an
+   * ACE_Task_Base.  The caller must allocate the memory for
+   * @a thread_list.  In case of an error, -1 is returned. If no
    * requested values are found, 0 is returned, otherwise correct
    * number of retrieved values are returned.
    */
@@ -836,8 +836,8 @@ public:
                        size_t n);
 
   /**
-   * Returns in <hthread_list> a list of up to <n> thread handles in
-   * an <ACE_Task_Base>.  The caller must allocate memory for
+   * Returns in <hthread_list> a list of up to @a n thread handles in
+   * an ACE_Task_Base.  The caller must allocate memory for
    * <hthread_list>.  In case of an error, -1 is returned. If no
    * requested values are found, 0 is returned, otherwise correct
    * number of retrieved values are returned.
@@ -847,9 +847,9 @@ public:
                         size_t n);
 
   /**
-   * Returns in <thread_list> a list of up to <n> thread ids in a
+   * Returns in @a thread_list a list of up to @a n thread ids in a
    * group <grp_id>.  The caller must allocate the memory for
-   * <thread_list>.  In case of an error, -1 is returned. If no
+   * @a thread_list.  In case of an error, -1 is returned. If no
    * requested values are found, 0 is returned, otherwise correct
    * number of retrieved values are returned.
    */
@@ -858,7 +858,7 @@ public:
                            size_t n);
 
   /**
-   * Returns in <hthread_list> a list of up to <n> thread handles in
+   * Returns in <hthread_list> a list of up to @a n thread handles in
    * a group <grp_id>.  The caller must allocate memory for
    * <hthread_list>.
    */
@@ -891,8 +891,8 @@ public:
                          size_t n);
 
   /**
-   * Returns in <thread_list> a list of up to <n> thread ids.  The
-   * caller must allocate the memory for <thread_list>.  In case of an
+   * Returns in @a thread_list a list of up to @a n thread ids.  The
+   * caller must allocate the memory for @a thread_list.  In case of an
    * error, -1 is returned. If no requested values are found, 0 is
    * returned, otherwise correct number of retrieved values are
    * returned.
@@ -1068,7 +1068,7 @@ protected:
   int suspend_thr (ACE_Thread_Descriptor *td,
                    int = 0);
 
-  /// Send signal <signum> to the thread described in <tda>.
+  /// Send signal @a signum to the thread described in <tda>.
   int kill_thr (ACE_Thread_Descriptor *td,
                 int signum);
 
diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h
index b923f905093..9e70cdd3d82 100644
--- a/ACE/ace/Thread_Mutex.h
+++ b/ACE/ace/Thread_Mutex.h
@@ -79,7 +79,7 @@ public:
 
   /**
    * If @a tv == 0 the call <acquire()> directly.  Otherwise, Block the
-   * thread until we acquire the mutex or until <tv> times out, in
+   * thread until we acquire the mutex or until @a tv times out, in
    * which case -1 is returned with <errno> == <ETIME>.  Note that
    * <*tv> is assumed to be in "absolute" rather than "relative" time.
    * The value of <*tv> is updated upon return to show the actual
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index 25841b6cfa9..52d85c78ae8 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -10,6 +10,7 @@ ACE_RCSID (ace,
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Numeric_Limits.h"
+#include "ace/If_Then_Else.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -23,15 +24,8 @@ const ACE_Time_Value ACE_Time_Value::zero;
 // Its primary use is in time computations such as those used by the
 // dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class.
 // Note: this object requires static construction.
-// Note: On Win64, time_t is 64 bits, yet the timeval members used
-// internally to ACE_Time_Value are still long. This makes time values
-// outside the LONG_MAX, LONG_MIN range very broken.
 const ACE_Time_Value ACE_Time_Value::max_time (
-#if !defined (ACE_WIN64)
   ACE_Numeric_Limits<time_t>::max (),
-#else
-  LONG_MAX,
-#endif
   ACE_ONE_SECOND_IN_USECS - 1);
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Time_Value)
@@ -220,19 +214,29 @@ ACE_Time_Value::normalize (void)
 ACE_Time_Value &
 ACE_Time_Value::operator *= (double d)
 {
-  // double is long enough (16 digits) to not lose the accuracy.
-  double time_total =
+  // The floating type to be used in the computations.  It should be
+  // large enough to hold a time_t.  We actually want a floating type
+  // with enough digits in its mantissa to hold a time_t without
+  // losing precision.  For example, if FLT_RADIX is 2 and
+  // LDBL_MANT_DIG is 64, a long double has a 64 bit wide mantissa,
+  // which would be sufficient to hold a 64 bit time_t value without
+  // losing precision.
+  //
+  // For now we'll simply go with long double if it is larger than
+  // time_t.  We're hosed if long double isn't large enough.
+  typedef ACE::If_Then_Else<(sizeof (double) > sizeof (time_t)),
+                            double,
+                            long double>::result_type float_type;
+
+  float_type time_total =
     (this->sec ()
-     + static_cast<double> (this->usec ()) / ACE_ONE_SECOND_IN_USECS) * d;
+     + static_cast<float_type> (this->usec ()) / ACE_ONE_SECOND_IN_USECS) * d;
 
   // shall we saturate the result?
-#if !defined(ACE_LACKS_NUMERIC_LIMITS) && !defined (ACE_WIN64)
-  static const double max_int = std::numeric_limits<time_t>::max () + 0.999999;
-  static const double min_int = std::numeric_limits<time_t>::min () - 0.999999;
-#else
-  static const double max_int = LONG_MAX + 0.999999;
-  static const double min_int = LONG_MIN - 0.999999;
-#endif
+  static const float_type max_int =
+    ACE_Numeric_Limits<time_t>::max () + 0.999999;
+  static const float_type min_int =
+    ACE_Numeric_Limits<time_t>::min () - 0.999999;
 
   if (time_total > max_int)
     time_total = max_int;
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h
index 51746d067eb..eb67dba429c 100644
--- a/ACE/ace/Time_Value.h
+++ b/ACE/ace/Time_Value.h
@@ -193,15 +193,12 @@ public:
   /// Set microseconds.
   void usec (suseconds_t usec);
 
-#if !defined (ACE_LACKS_LONGLONG_T)
   /**
    * @return Sum of second field (in microseconds) and microsecond field
    *         and return them via the @param usec parameter.
    */
   void to_usec (ACE_UINT64 &usec) const;
 
-#endif /*ACE_LACKS_LONGLONG_T */
-
   // = The following arithmetic methods operate on ACE_Time_Value's.
 
   /// Add @a tv to this.
@@ -322,7 +319,23 @@ private:
   void normalize (void);
 
   /// Store the values as a timeval.
+#if defined (ACE_HAS_TIME_T_LONG_MISMATCH)
+  // Windows' timeval is non-conformant, so swap in a struct that conforms
+  // to the proper data types to represent the entire time range that this
+  // class's API can accept.
+  // Also, since this class can supply a pointer to a timeval that things
+  // like select() expect, we need the OS-defined one as well. To make this
+  // available, use a real timeval called ext_tv_ and set it up when needed.
+  // Since this is most often for relative times that don't approach 32 bits
+  // in size, reducing a time_t to fit should be no problem.
+  struct {
+    time_t tv_sec;
+    suseconds_t tv_usec;
+  } tv_;
+  timeval ext_tv_;
+#else
   timeval tv_;
+#endif /* ACE_HAS_TIME_T_LONG_MISMATCH */
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl
index 75c34a2e2cc..70b8f911365 100644
--- a/ACE/ace/Time_Value.inl
+++ b/ACE/ace/Time_Value.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+#include "ace/Truncate.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
@@ -20,7 +22,15 @@ ACE_INLINE
 ACE_Time_Value::operator timeval () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator timeval");
+#if defined (ACE_HAS_TIME_T_LONG_MISMATCH)
+  // Recall that on some Windows we substitute another type for timeval in tv_
+  ACE_Time_Value *me = const_cast<ACE_Time_Value*> (this);
+  me->ext_tv_.tv_sec = ACE_Utils::truncate_cast<long> (this->tv_.tv_sec);
+  me->ext_tv_.tv_usec = ACE_Utils::truncate_cast<long> (this->tv_.tv_usec);
+  return this->ext_tv_;
+#else
   return this->tv_;
+#endif /* ACE_HAS_TIME_T_LONG_MISMATCH */
 }
 
 ACE_INLINE void
@@ -45,26 +55,22 @@ ACE_INLINE
 ACE_Time_Value::operator const timeval * () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator const timeval *");
+#if defined (ACE_HAS_TIME_T_LONG_MISMATCH)
+  // Recall that on some Windows we substitute another type for timeval in tv_
+  ACE_Time_Value *me = const_cast<ACE_Time_Value*> (this);
+  me->ext_tv_.tv_sec = ACE_Utils::truncate_cast<long> (this->tv_.tv_sec);
+  me->ext_tv_.tv_usec = ACE_Utils::truncate_cast<long> (this->tv_.tv_usec);
+  return (const timeval *) &this->ext_tv_;
+#else
   return (const timeval *) &this->tv_;
+#endif /* ACE_HAS_TIME_T_LONG_MISMATCH */
 }
 
 ACE_INLINE void
 ACE_Time_Value::set (time_t sec, suseconds_t usec)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::set");
-#if defined (ACE_WIN64) \
-    || (defined (ACE_WIN32) && !defined (_USE_32BIT_TIME_T))
-  // Win64 uses 'long' (32 bit) timeval and 64-bit time_t, so we have
-  // to get these back in range.
-  if (sec > LONG_MAX)
-    this->tv_.tv_sec = LONG_MAX;
-  else if (sec < LONG_MIN)
-    this->tv_.tv_sec = LONG_MIN;
-  else
-    this->tv_.tv_sec = static_cast<long> (sec);
-#else
   this->tv_.tv_sec = sec;
-#endif
   this->tv_.tv_usec = usec;
 #if __GNUC__
   if (__builtin_constant_p(sec) &&
@@ -128,19 +134,7 @@ ACE_INLINE void
 ACE_Time_Value::sec (time_t sec)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::sec");
-#if defined (ACE_WIN64) \
-  || (defined (ACE_WIN32) && !defined (_USE_32BIT_TIME_T))
-  // Win64 uses 'long' (32 bit) timeval and 64-bit time_t, so we have
-  // to get these back in range.
-  if (sec > LONG_MAX)
-    this->tv_.tv_sec = LONG_MAX;
-  else if (sec < LONG_MIN)
-    this->tv_.tv_sec = LONG_MIN;
-  else
-    this->tv_.tv_sec = static_cast<long> (sec);
-#else
   this->tv_.tv_sec = sec;
-#endif
 }
 
 // Converts from Time_Value format into milli-seconds format.
@@ -149,7 +143,12 @@ ACE_INLINE unsigned long
 ACE_Time_Value::msec (void) const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::msec");
-  return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
+
+  // Note - we're truncating a value here, which can lose data. This is
+  // called out in the user documentation for this with a recommendation to
+  // use msec(ACE_UINT64&) instead, so just go ahead and truncate.
+  time_t secs = this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
+  return ACE_Utils::truncate_cast<unsigned long> (secs);
 }
 
 #if !defined (ACE_LACKS_LONGLONG_T)
@@ -170,9 +169,10 @@ ACE_Time_Value::msec (long milliseconds)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::msec");
   // Convert millisecond units to seconds;
-  this->tv_.tv_sec = milliseconds / 1000;
+  long secs = milliseconds / 1000;
+  this->tv_.tv_sec = secs;
   // Convert remainder to microseconds;
-  this->tv_.tv_usec = (milliseconds - (this->tv_.tv_sec * 1000)) * 1000;
+  this->tv_.tv_usec = (milliseconds - (secs * 1000)) * 1000;
 }
 
 // Returns number of micro-seconds.
@@ -193,16 +193,22 @@ ACE_Time_Value::usec (suseconds_t usec)
   this->tv_.tv_usec = usec;
 }
 
-#if !defined (ACE_LACKS_LONGLONG_T)
 ACE_INLINE void
-ACE_Time_Value::to_usec (ACE_UINT64 &usec) const
+ACE_Time_Value::to_usec (ACE_UINT64 & usec) const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::to_usec");
+
+#if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+  usec = ACE_U_LongLong (static_cast<long long> (this->tv_.tv_sec));
+#elif defined (ACE_LACKS_LONGLONG_T)
+  // No native 64-bit type, meaning time_t is most likely 32 bits.
+  usec = ACE_U_LongLong (this->tv_.tv_sec);
+#else
   usec = static_cast<ACE_UINT64> (this->tv_.tv_sec);
+#endif  /* ACE_LACKS_LONG_LONG_T */
   usec *= 1000000;
   usec += this->tv_.tv_usec;
 }
-#endif /*ACE_LACKS_LONGLONG_T*/
 
 ACE_INLINE ACE_Time_Value
 operator * (double d, const ACE_Time_Value &tv)
diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h
index 359f1456d39..a7f530b4889 100644
--- a/ACE/ace/Timeprobe_T.h
+++ b/ACE/ace/Timeprobe_T.h
@@ -177,7 +177,7 @@ private:
 //   // Initialize a ACE_Timeprobe with default size
 //   ACE_Timeprobe (ACE_Allocator *allocator = ACE_Allocator::instance());
 
-//   /// Create Timeprobes with <size> slots
+//   /// Create Timeprobes with @a size slots
 //   ACE_Timeprobe (ACE_Allocator *allocator = ACE_Allocator::instance(),
 //                  u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE);
 // };
diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp
index 9f5d51fb8d6..45c1fe5c4b2 100644
--- a/ACE/ace/Timer_Hash_T.cpp
+++ b/ACE/ace/Timer_Hash_T.cpp
@@ -12,6 +12,7 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
+#include "ace/Truncate.h"
 
 ACE_RCSID(ace,
           Timer_Hash_T,
@@ -374,8 +375,9 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T<
     reinterpret_cast<Hash_Token<TYPE> *> (
       const_cast<void *> (expired->get_act ()));
 
-  h->pos_ =
-    expired->get_timer_value ().sec () % this->table_size_;
+  size_t secs_hash_input =
+    ACE_Utils::truncate_cast<size_t> (expired->get_timer_value ().sec ());
+  h->pos_ = secs_hash_input % this->table_size_;
 
   h->orig_id_ =
     this->table_[h->pos_]->schedule (expired->get_type (),
@@ -409,8 +411,8 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule_i (const TYPE &type,
 {
   ACE_TRACE ("ACE_Timer_Hash_T::schedule_i");
 
-  size_t position =
-    future_time.sec () % this->table_size_;
+  size_t secs_hash_input = ACE_Utils::truncate_cast<size_t> (future_time.sec ());
+  size_t position = secs_hash_input % this->table_size_;
 
   Hash_Token<TYPE> *h = 0;
 
@@ -452,7 +454,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule_i (const TYPE &type,
   // size of a pointer is 64 bits, but a long is 32. Since this class
   // is not much used, I'm hacking this, at least for now. If it becomes
   // an issue, I'll look at it again then.
-  ptrdiff_t hi = reinterpret_cast<ptrdiff_t> (h);
+  intptr_t hi = reinterpret_cast<intptr_t> (h);
   if (this->pointer_base_ == 0)
     this->pointer_base_ = hi & 0xffffffff00000000;
   return static_cast<long> (hi & 0xffffffff);
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index b5285556127..de2926362f8 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -389,7 +389,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::copy (size_t slot,
               && moved_node->get_timer_id () < (int) this->max_size_);
 
   // Update the corresponding slot in the parallel <timer_ids_> array.
-  this->timer_ids_[moved_node->get_timer_id ()] = slot;
+  this->timer_ids_[moved_node->get_timer_id ()] = static_cast<ssize_t> (slot);
 }
 
 // Remove the slot'th timer node from the heap, but do not reclaim its
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index 530cbae2057..9344809ca51 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -108,7 +108,7 @@ public:
 
   /**
    * Acquire the token, sleeping until it is obtained or until the
-   * expiration of <timeout>, which is treated as "absolute" time.  If
+   * expiration of @a timeout, which is treated as "absolute" time.  If
    * some other thread currently holds the token then <sleep_hook> is
    * called before our thread goes to sleep.  This <sleep_hook> can be
    * used by the requesting thread to unblock a token-holder that is
@@ -116,7 +116,7 @@ public:
    * ACE_Reactor uses this functionality).  Return values: 0 if
    * acquires without calling <sleep_hook> 1 if <sleep_hook> is
    * called.  2 if the token is signaled.  -1 if failure or timeout
-   * occurs (if timeout occurs errno == ETIME) If <timeout> ==
+   * occurs (if timeout occurs errno == ETIME) If @a timeout ==
    * <&ACE_Time_Value::zero> then acquire has polling semantics (and
    * does *not* call <sleep_hook>).
    */
@@ -154,7 +154,7 @@ public:
    * thing to do (since it makes it possible for shared data to be
    * changed unexpectedly) so use with caution...  This method
    * maintians the original token priority.  As in <acquire>, the
-   * <timeout> value is an absolute time.
+   * @a timeout value is an absolute time.
    */
   int renew (int requeue_position = 0,
              ACE_Time_Value *timeout = 0);
diff --git a/ACE/ace/Token_Request_Reply.inl b/ACE/ace/Token_Request_Reply.inl
index 99a6b367a1a..7a62c92d7c1 100644
--- a/ACE/ace/Token_Request_Reply.inl
+++ b/ACE/ace/Token_Request_Reply.inl
@@ -147,7 +147,7 @@ ACE_Token_Request::token_name (const ACE_TCHAR *token_name,
 
   // ... then add in the amount of the variable-sized portion.
   len += token_name_length + client_id_length + 1;
-  this->length (ACE_Utils::Truncate<ACE_UINT32> (len));
+  this->length (ACE_Utils::truncate_cast<ACE_UINT32> (len));
 }
 
 // = Set/get the id of the client.
diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index efae24177d6..28bc27dabf6 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -27,9 +27,10 @@
 #include "ace/If_Then_Else.h"
 #include "ace/Numeric_Limits.h"
 
-#if defined (__BORLANDC__) && __BORLANDC__ <= 0x590
+#if defined (ACE_LACKS_LONGLONG_T) \
+    || defined (__BORLANDC__) && __BORLANDC__ <= 0x590
 # include "ace/Basic_Types.h"
-#endif  /* __BORLANDC__ <= 0x590 */
+#endif  /* ACE_LACKS_LONGLONG_T || __BORLANDC__ <= 0x590 */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -52,6 +53,8 @@ namespace ACE_Utils
   __extension__
 # endif  /* __GNUC__ */
   template<> struct Sign_Check<unsigned long long> { ACE_STATIC_CONSTANT (bool, is_signed = 0); };
+#else
+  template<> struct Sign_Check<ACE_U_LongLong> { ACE_STATIC_CONSTANT (bool, is_signed = 0); };
 #endif  /* !ACE_LACKS_LONGLONG_T */
 
   // Specialize the signed cases.
@@ -124,6 +127,14 @@ namespace ACE_Utils
 
     unsigned_type operator() (unsigned_type x) { return x; }
   };
+#else
+  template<>
+  struct To_Unsigned<ACE_U_LongLong>
+  {
+    typedef ACE_U_LongLong unsigned_type;
+
+    unsigned_type operator() (unsigned_type x) { return x; }
+  };
 #endif  /* !ACE_LACKS_LONGLONG_T */
 
   // ----------------
@@ -431,6 +442,29 @@ namespace ACE_Utils
     }
   };
 
+
+#if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+  // Partial specialization for the case where we're casting from
+  // ACE_U_LongLong to a smaller integer.  We assume that we're always
+  // truncating from ACE_U_LongLong to a smaller type.  The partial
+  // specialization above handles the case where both the FROM and TO
+  // types are ACE_U_LongLong.
+  template<typename TO>
+  struct Truncator<ACE_U_LongLong, TO>
+  {
+    TO operator() (ACE_U_LongLong const & val)
+    {
+      // If val less than or equal to ACE_Numeric_Limits<TO>::max(),
+      // val.lo() must be less than or equal to
+      // ACE_Numeric_Limits<TO>::max (), as well.
+      return
+        (val > ACE_Numeric_Limits<TO>::max ()
+         ? ACE_Numeric_Limits<TO>::max ()
+         : static_cast<TO> (val.lo ()));
+    }
+  };
+#endif /* ACE_LACKS_LONGLONG_T || ACE_LACKS_UNSIGNEDLONGLONG_T */
+
   // -----------------------------------------------------
   /**
    * @struct Noop_Truncator
@@ -452,7 +486,7 @@ namespace ACE_Utils
   // -----------------------------------------------------
 
   /**
-   * @class Truncate
+   * @class truncate_cast
    *
    * @brief Helper function to truncate an integral value to the
    *        maximum  value of the given type.
@@ -465,7 +499,7 @@ namespace ACE_Utils
    * @internal Internal use only.
    */
   template<typename TO, typename FROM>
-  inline TO Truncate (FROM val)
+  inline TO truncate_cast (FROM val)
   {
     // If the size of FROM is less than the size of TO, "val" will
     // never be greater than the maximum "TO" value, so there is no
@@ -592,6 +626,18 @@ namespace ACE_Utils
     }
   };
 
+  template<>
+  struct Truncator<const ACE_UINT64, signed long>
+  {
+    signed long operator() (const ACE_UINT64 val)
+    {
+      return
+        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<signed long>::max ())
+         ? ACE_Numeric_Limits<signed long>::max ()
+         : static_cast<signed long> (val));
+    }
+  };
+
 #endif  /* ACE_SIZEOF_LONG < 8 */
 
 #if defined (ACE_SIZEOF_INT) && ACE_SIZEOF_INT < 8
@@ -725,6 +771,16 @@ namespace ACE_Utils
   };
 
   template<>
+  struct Truncator<const signed long, unsigned int>
+  {
+    unsigned int operator() (const signed long val)
+    {
+      return static_cast<unsigned int> (val);
+    }
+  };
+
+
+  template<>
   struct Truncator<unsigned int, signed long>
   {
     signed long operator() (unsigned int val)
@@ -886,9 +942,24 @@ namespace ACE_Utils
     }
   };
 
+  // Partial specialization for the case where the types are the same,
+  // but the from type is const.  No truncation is necessary.
+  //
+  // This is only necessary to workaround a problem with the BCB6
+  // compiler.
+  template<typename T>
+  struct Truncator<T const, T>
+  {
+    T operator() (T val)
+    {
+      return val;
+    }
+  };
+
   // -------------------------------------
+
   template<typename TO, typename FROM>
-  inline TO Truncate (FROM val)
+  inline TO truncate_cast (FROM val)
   {
     typedef Truncator<FROM, TO> truncator;
 
diff --git a/ACE/ace/UNIX_Addr.inl b/ACE/ace/UNIX_Addr.inl
index 34fa002ef34..48f9fd123ab 100644
--- a/ACE/ace/UNIX_Addr.inl
+++ b/ACE/ace/UNIX_Addr.inl
@@ -15,14 +15,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE
 ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[])
 {
-  this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+  this->set (ACE_Wide_To_Ascii (rendezvous_point).char_rep ());
 }
 
 /// Creates an ACE_UNIX_Addr from a string.
 ACE_INLINE int
 ACE_UNIX_Addr::set (const wchar_t rendezvous_point[])
 {
-  return this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+  return this->set (ACE_Wide_To_Ascii (rendezvous_point).char_rep ());
 }
 #endif /* ACE_HAS_WCHAR */
 
diff --git a/ACE/ace/UPIPE_Stream.cpp b/ACE/ace/UPIPE_Stream.cpp
index 53b170d23cd..c1cddb1ab57 100644
--- a/ACE/ace/UPIPE_Stream.cpp
+++ b/ACE/ace/UPIPE_Stream.cpp
@@ -139,7 +139,7 @@ ACE_UPIPE_Stream::recv (char *buffer,
                             this_len);
             bytes_read += this_len;
             this->mb_last_ = this->mb_last_->release ();   // mb_last_ now 0
-            return bytes_read;
+            return static_cast<ssize_t> (bytes_read);
           }
         else
           {
@@ -167,13 +167,13 @@ ACE_UPIPE_Stream::recv (char *buffer,
           {
             if (errno == EWOULDBLOCK && bytes_read > 0)
               // Return the number of bytes read before we timed out.
-              return bytes_read;
+              return static_cast<ssize_t> (bytes_read);
             else
               return -1;
           }
       }
 
-  return bytes_read;
+  return static_cast<ssize_t> (bytes_read);
 }
 
 ssize_t
diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h
index 98e31cf3349..e43a1eb4330 100644
--- a/ACE/ace/UPIPE_Stream.h
+++ b/ACE/ace/UPIPE_Stream.h
@@ -85,7 +85,7 @@ public:
                   size_t n,
                   ACE_Time_Value *timeout = 0);
 
-  /// Recv a buffer of exactly <n> bytes from the message queue.
+  /// Recv a buffer of exactly @a n bytes from the message queue.
   /// Returns -1 on error, else the number of bytes read.
   ssize_t recv_n (char *buffer,
                   size_t n,
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 9b35fe76a52..bcb876424b1 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -217,7 +217,12 @@ namespace ACE_Utils
         // MSVC. It appears that most platforms support sscanf though
         // so we need to use it directly.
         const int nScanned =
-          ::sscanf(uuid_string.c_str(),
+#if defined (ACE_HAS_TR24731_2005_CRT)
+          sscanf_s (
+#else
+          ::sscanf(
+#endif
+                   uuid_string.c_str(),
                    "%8x-%4x-%4x-%2x%2x-%2x%2x%2x%2x%2x%2x",
                    &timeLow,
                    &timeMid,
@@ -243,6 +248,24 @@ namespace ACE_Utils
     else
       {
         const int nScanned =
+#if defined (ACE_HAS_TR24731_2005_CRT)
+          sscanf_s (uuid_string.c_str(),
+                    "%8x-%4x-%4x-%2x%2x-%2x%2x%2x%2x%2x%2x-%s",
+                    &timeLow,
+                    &timeMid,
+                    &timeHiAndVersion,
+                    &clockSeqHiAndReserved,
+                    &clockSeqLow,
+                    &node[0],
+                    &node[1],
+                    &node[2],
+                    &node[3],
+                    &node[4],
+                    &node[5],
+                    thr_pid_buf,
+                    BUFSIZ
+                    );
+#else
           ::sscanf (uuid_string.c_str(),
                     "%8x-%4x-%4x-%2x%2x-%2x%2x%2x%2x%2x%2x-%s",
                     &timeLow,
@@ -258,6 +281,7 @@ namespace ACE_Utils
                     &node[5],
                     thr_pid_buf
                     );
+#endif /* ACE_HAS_TR24731_2005_CRT */
 
         if (nScanned != 12)
           {
@@ -311,7 +335,7 @@ namespace ACE_Utils
             return;
           }
         ACE_CString thr_pid_str (thr_pid_buf);
-        ssize_t pos = thr_pid_str.find ('-');
+        ssize_t pos = static_cast<ssize_t> (thr_pid_str.find ('-'));
         if (pos == -1)
           ACE_DEBUG ((LM_DEBUG,
                       "ACE_UUID::from_string_i - "
@@ -469,7 +493,14 @@ namespace ACE_Utils
   void
   UUID_Generator::get_systemtime (UUID_time & timestamp)
   {
-    const UUID_time timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
+    const UUID_time timeOffset =
+#if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+      ACE_U_LongLong (ACE_INT64_LITERAL (0x1B21DD213814000));
+#elif defined (ACE_LACKS_LONGLONG_T)
+      ACE_U_LongLong (0x13814000u, 0x1B21DD2u);
+#else
+      ACE_UINT64_LITERAL (0x1B21DD213814000);
+#endif  /* ACE_LACKS_UNSIGNEDLONGLONG_T */
 
     /// Get the time of day, convert to 100ns ticks then add the offset.
     ACE_Time_Value now = ACE_OS::gettimeofday();
diff --git a/ACE/ace/Unbounded_Set.cpp b/ACE/ace/Unbounded_Set.cpp
index c3a444ccd8a..0b3318456d2 100644
--- a/ACE/ace/Unbounded_Set.cpp
+++ b/ACE/ace/Unbounded_Set.cpp
@@ -30,7 +30,7 @@ template <class T> int
 ACE_Unbounded_Set<T>::insert_tail (const T &item)
 {
   // ACE_TRACE ("ACE_Unbounded_Set<T>::insert_tail");
-  ACE_Node<T> *temp;
+  ACE_Node<T> *temp = 0;
 
   // Insert <item> into the old dummy node location.
   this->head_->item_ = item;
@@ -74,10 +74,11 @@ ACE_Unbounded_Set<T>::dump (void) const
   size_t count = 1;
 #endif /* ! ACE_NLOGGING */
 
-  for (ACE_Unbounded_Set_Iterator<T> iter (*(ACE_Unbounded_Set<T> *) this);
-       iter.next (item) != 0;
-       iter.advance ())
-    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %d\n"), count++));
+  const_iterator const the_end = this->end ();
+  for (const_iterator i (this->begin ());
+       i != end;
+       ++i)
+    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %u\n"), count++));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
@@ -183,18 +184,12 @@ template <class T> int
 ACE_Unbounded_Set<T>::find (const T &item) const
 {
   // ACE_TRACE ("ACE_Unbounded_Set<T>::find");
-  // Set <item> into the dummy node.
-  this->head_->item_ = item;
-
-  ACE_Node<T> *temp = this->head_->next_;
-
-  // Keep looping until we find the item.
-  while (!(temp->item_ == item))
-    temp = temp->next_;
+  const_iterator const the_end = this->end ();
+  for (const_iterator i = this->begin (); i != the_end; ++i)
+    if ((*i) == item)
+      return 0;
 
-  // If we found the dummy node then it's not really there, otherwise,
-  // it is there.
-  return temp == this->head_ ? -1 : 0;
+  return -1;
 }
 
 template <class T> int
@@ -236,20 +231,33 @@ ACE_Unbounded_Set<T>::remove (const T &item)
     }
 }
 
-template <class T> ACE_Unbounded_Set_Iterator<T>
+template <class T> typename ACE_Unbounded_Set<T>::iterator
 ACE_Unbounded_Set<T>::begin (void)
 {
   // ACE_TRACE ("ACE_Unbounded_Set<T>::begin");
-  return ACE_Unbounded_Set_Iterator<T> (*this);
+  return iterator (*this);
 }
 
-template <class T> ACE_Unbounded_Set_Iterator<T>
+template <class T> typename ACE_Unbounded_Set<T>::iterator
 ACE_Unbounded_Set<T>::end (void)
 {
   // ACE_TRACE ("ACE_Unbounded_Set<T>::end");
-  return ACE_Unbounded_Set_Iterator<T> (*this, 1);
+  return iterator (*this, 1);
 }
 
+template <class T> typename ACE_Unbounded_Set<T>::const_iterator
+ACE_Unbounded_Set<T>::begin (void) const
+{
+  // ACE_TRACE ("ACE_Unbounded_Set<T>::begin");
+  return const_iterator (*this);
+}
+
+template <class T> typename ACE_Unbounded_Set<T>::const_iterator
+ACE_Unbounded_Set<T>::end (void) const
+{
+  // ACE_TRACE ("ACE_Unbounded_Set<T>::end");
+  return const_iterator (*this, 1);
+}
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Iterator)
 
@@ -262,8 +270,10 @@ ACE_Unbounded_Set_Iterator<T>::dump (void) const
 }
 
 template <class T>
-ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, int end)
-  : current_ (end == 0 ? s.head_->next_ : s.head_ ),
+ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (
+  ACE_Unbounded_Set<T> &s,
+  bool end)
+  : current_ (!end ? s.head_->next_ : s.head_ ),
     set_ (&s)
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator");
@@ -367,8 +377,10 @@ ACE_Unbounded_Set_Const_Iterator<T>::dump (void) const
 }
 
 template <class T>
-ACE_Unbounded_Set_Const_Iterator<T>::ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s, int end)
-  : current_ (end == 0 ? s.head_->next_ : s.head_ ),
+ACE_Unbounded_Set_Const_Iterator<T>::ACE_Unbounded_Set_Const_Iterator (
+  const ACE_Unbounded_Set<T> &s,
+  bool end)
+  : current_ (!end ? s.head_->next_ : s.head_ ),
     set_ (&s)
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator<T>::ACE_Unbounded_Set_Const_Iterator");
@@ -447,6 +459,20 @@ ACE_Unbounded_Set_Const_Iterator<T>::operator* (void)
   return *retv;
 }
 
+template <class T> bool
+ACE_Unbounded_Set_Const_Iterator<T>::operator== (const ACE_Unbounded_Set_Const_Iterator<T> &rhs) const
+{
+  //ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator<T>::operator==");
+  return (this->set_ == rhs.set_ && this->current_ == rhs.current_);
+}
+
+template <class T> bool
+ACE_Unbounded_Set_Const_Iterator<T>::operator!= (const ACE_Unbounded_Set_Const_Iterator<T> &rhs) const
+{
+  //ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator<T>::operator!=");
+  return (this->set_ != rhs.set_ || this->current_ != rhs.current_);
+}
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_UNBOUNDED_SET_CPP */
diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h
index 8cddab86f12..5746a887d5f 100644
--- a/ACE/ace/Unbounded_Set.h
+++ b/ACE/ace/Unbounded_Set.h
@@ -35,7 +35,7 @@ class ACE_Unbounded_Set_Iterator
 {
 public:
   // = Initialization method.
-  ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, int end = 0);
+  ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end = false);
 
   // = Iteration methods.
 
@@ -94,7 +94,8 @@ class ACE_Unbounded_Set_Const_Iterator
 {
 public:
   // = Initialization method.
-  ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s, int end = 0);
+  ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s,
+                                    bool end = false);
 
   // = Iteration methods.
 
@@ -218,17 +219,17 @@ public:
 
   // = Check boundary conditions.
 
-  /// Returns 1 if the container is empty, otherwise returns 0.
+  /// Returns @c true if the container is empty, otherwise returns @c false.
   /**
    * Constant time is_empty check.
    */
-  int is_empty (void) const;
+  bool is_empty (void) const;
 
-  /// Returns 0.
+  /// Returns @c false.
   /**
-   * Always returns 0 since the set can never fill up.
+   * Always returns @c false since the set can never fill up.
    */
-  int is_full (void) const;
+  bool is_full (void) const;
 
   // = Classic unordered set operations.
 
@@ -278,8 +279,10 @@ public:
   void reset (void);
 
   // = STL-styled unidirectional iterator factory.
-  ACE_Unbounded_Set_Iterator<T> begin (void);
-  ACE_Unbounded_Set_Iterator<T> end (void);
+  iterator begin (void);
+  iterator end (void);
+  const_iterator begin (void) const;
+  const_iterator end (void) const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Unbounded_Set.inl b/ACE/ace/Unbounded_Set.inl
index 363fe6e4a6d..00ba23802ef 100644
--- a/ACE/ace/Unbounded_Set.inl
+++ b/ACE/ace/Unbounded_Set.inl
@@ -6,14 +6,14 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE bool
 ACE_Unbounded_Set<T>::is_empty (void) const
 {
   ACE_TRACE ("ACE_Unbounded_Set<T>::is_empty");
   return this->head_ == this->head_->next_;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE bool
 ACE_Unbounded_Set<T>::is_full (void) const
 {
   ACE_TRACE ("ACE_Unbounded_Set<T>::is_full");
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index aeb1b7fd001..91a5af0ab22 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -1,9 +1,9 @@
+
 // -*- C++ -*-
 // $Id$
-
-// This is file was automatically generated by $ACE_ROOT/bin/make_release.
+// This is file was automatically generated by \$ACE_ROOT/bin/make_release.
 
 #define ACE_MAJOR_VERSION 5
-#define ACE_MINOR_VERSION 5 
-#define ACE_BETA_VERSION 6 
-#define ACE_VERSION "5.5.6"
+#define ACE_MINOR_VERSION 5
+#define ACE_BETA_VERSION 7
+#define ACE_VERSION "5.5.7"
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 29fec88714b..506f211095e 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -1064,6 +1064,10 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &)
   ACE_NOTSUP_RETURN (-1);
 }
 
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (push)
+#  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
+#  endif
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
                                     ACE_Timer_Queue *tq,
                                     ACE_Reactor_Notify *notify)
@@ -1129,6 +1133,9 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("WFMO_Reactor")));
 }
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (pop)
+#endif
 
 int
 ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &)
@@ -1753,13 +1760,50 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
   // Note: There is really no need to involve the <timer_queue_> here
   // because even if a timeout in the <timer_queue_> does expire we
   // will not be able to dispatch it
-  int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec ();
 
-  // Atomically wait for both the <lock_> and <ok_to_wait_> event
+  // We need to wait for both the <lock_> and <ok_to_wait_> event.
+  // If not on WinCE, use WaitForMultipleObjects() to wait for both atomically.
+  // On WinCE, the waitAll arg to WFMO must be false, so wait for the
+  // ok_to_wait_ event first (since that's likely to take the longest) then
+  // grab the lock and recheck the ok_to_wait_ event. When we can get them
+  // both, or there's an error/timeout, return.
+#if defined (ACE_HAS_WINCE)
+  ACE_Time_Value timeout = ACE_OS::gettimeofday ();
+  if (max_wait_time != 0)
+    timeout += *max_wait_time;
+  while (1)
+    {
+      int status;
+      if (max_wait_time == 0)
+        status = this->ok_to_wait_.wait ();
+      else
+        status = this->ok_to_wait_.wait (&timeout);
+      if (status == -1)
+        return -1;
+      // The event is signaled, so it's ok to wait; grab the lock and
+      // recheck the event. If something has changed, restart the wait.
+      if (max_wait_time == 0)
+        status = this->lock_.acquire ();
+      else
+        status = this->lock_.acquire (timeout);
+      if (status == -1)
+        return -1;
+
+      // Have the lock_, now re-check the event. If it's not signaled,
+      // another thread changed something so go back and wait again.
+      ACE_Time_Value poll_it = ACE_OS::gettimeofday ();
+      if (this->ok_to_wait_.wait (&poll_it) == 0)
+        break;
+      this->lock_.release ();
+    }
+  return 1;
+
+#else
+  int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec ();
   DWORD result = 0;
   while (1)
     {
-#if defined (ACE_HAS_PHARLAP)
+#  if defined (ACE_HAS_PHARLAP)
       // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't
       // do async I/O, so it's not needed in this case anyway.
       result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
@@ -1770,13 +1814,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
       if (result != WAIT_IO_COMPLETION)
         break;
 
-#elif defined (ACE_HAS_WINCE)
-      result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-                                         this->atomic_wait_array_,
-                                         FALSE,   // Must be FALSE on WinCE
-                                         timeout);
-      break;  // CE does not have WAIT_IO_COMPLETION defined.
-#else
+#  else
       result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
                                            this->atomic_wait_array_,
                                            TRUE,
@@ -1786,7 +1824,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
       if (result != WAIT_IO_COMPLETION)
         break;
 
-#endif /* ACE_HAS_PHARLAP */
+#  endif /* ACE_HAS_PHARLAP */
     }
 
   switch (result)
@@ -1804,6 +1842,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
 
   // It is ok to enter ::WaitForMultipleObjects
   return 1;
+#endif /* ACE_HAS_WINCE */
 }
 
 DWORD
@@ -1921,7 +1960,7 @@ ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status)
        ++number_of_handlers_dispatched)
     {
       const bool ok = (
-#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) \
+#if ! defined(__BORLANDC__) \
     && !defined (ghs) \
     && !defined (__MINGW32__) \
     && !(defined (_MSC_VER) && _MSC_VER >= 1300)
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index e6d7c67e55e..4700720df81 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -97,6 +97,8 @@ public:
 /**
  * @class ACE_WFMO_Reactor_Handler_Repository
  *
+ * @internal This class is for internal ACE use only.
+ *
  * @brief Used to map ACE_HANDLEs onto the appropriate
  * ACE_Event_Handler * and other information.
  */
@@ -300,7 +302,7 @@ public:
   /// Destructor.
   virtual ~ACE_WFMO_Reactor_Handler_Repository (void);
 
-  /// Initialize the repository of the approriate <size>.
+  /// Initialize the repository of the approriate @a size.
   int open (size_t size);
 
   /// Close down the handler repository.
@@ -510,10 +512,10 @@ public:
    * Special trick to unblock <WaitForMultipleObjects> when updates
    * occur.  All we do is enqueue <event_handler> and <mask> onto the
    * ACE_Message_Queue and wakeup the <WFMO_Reactor> by signaling
-   * its <ACE_Event> handle.  The <ACE_Time_Value> indicates how long
-   * to blocking trying to notify the <WFMO_Reactor>.  If <timeout> ==
+   * its <ACE_Event> handle.  The ACE_Time_Value indicates how long
+   * to blocking trying to notify the <WFMO_Reactor>.  If @a timeout ==
    * 0, the caller will block until action is possible, else will wait
-   * until the relative time specified in <timeout> elapses).
+   * until the relative time specified in @a timeout elapses).
    */
   virtual int notify (ACE_Event_Handler *event_handler = 0,
                       ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
@@ -831,7 +833,7 @@ public:
                                 ACE_Reactor_Mask mask);
 
   /**
-   * Register <new_sh> to handle the signal <signum> using the
+   * Register <new_sh> to handle the signal @a signum using the
    * <new_disp>.  Returns the <old_sh> that was previously registered
    * (if any), along with the <old_disp> of the signal handler.
    */
@@ -883,11 +885,11 @@ public:
                               ACE_Reactor_Mask);
 
   /**
-   * Remove the ACE_Event_Handler currently associated with <signum>.
+   * Remove the ACE_Event_Handler currently associated with @a signum.
    * <sigkey> is ignored in this implementation since there is only
    * one instance of a signal handler.  Install the new disposition
    * (if given) and return the previous disposition (if desired by the
-   * caller).  Returns 0 on success and -1 if <signum> is invalid.
+   * caller).  Returns 0 on success and -1 if @a signum is invalid.
    */
   virtual int remove_handler (int signum,
                               ACE_Sig_Action *new_disp,
@@ -1029,10 +1031,10 @@ public:
 
   /**
    * Wakeup one <ACE_WFMO_Reactor> thread if it is currently blocked
-   * in <WaitForMultipleObjects>.  The <ACE_Time_Value> indicates how
+   * in <WaitForMultipleObjects>.  The ACE_Time_Value indicates how
    * long to blocking trying to notify the <WFMO_Reactor>.  If
-   * <timeout> == 0, the caller will block until action is possible,
-   * else will wait until the relative time specified in <timeout>
+   * @a timeout == 0, the caller will block until action is possible,
+   * else will wait until the relative time specified in @a timeout
    * elapses).
    */
   virtual int notify (ACE_Event_Handler * = 0,
@@ -1087,7 +1089,7 @@ public:
                        ACE_Event_Handler **event_handler = 0);
 
   /**
-   * Check to see if <signum> is associated with a valid Event_Handler
+   * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the <event_handler> associated with
    * this <handler> if <event_handler> != 0.
    */
@@ -1188,7 +1190,9 @@ protected:
   /// Return the ID of the "owner" thread. Does not do any locking.
   virtual ACE_thread_t owner_i (void);
 
-  /// Check to see if it is ok to enter <::WaitForMultipleObjects>.
+  /// Wait up to @a max_wait_time until it's ok to enter
+  /// WaitForMultipleObjects. Returns 1 (and holding lock_) if ok to wait;
+  /// -1 (and not holding lock_) if not.
   virtual int ok_to_wait (ACE_Time_Value *max_wait_time,
                           int alertable);
 
diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h
index cb1ba0bf2d3..23fbc0c6381 100644
--- a/ACE/ace/XTI_ATM_Mcast.h
+++ b/ACE/ace/XTI_ATM_Mcast.h
@@ -44,7 +44,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
@@ -72,7 +72,7 @@ public:
   /**
    * Actively connect and produce a <new_stream> if things go well.
    * The <remote_sap> is the address that we are trying to connect
-   * with.  The <timeout> is the amount of time to wait to connect.
+   * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
    * the connection is done using non-blocking mode.  In this case, if
    * the connection can't be made immediately the value of -1 is
@@ -100,7 +100,7 @@ public:
   /**
    * Actively add a leaf to the currently connected stream (i.e.,
    * multicast). The <remote_sap> is the address of the leaf that we
-   * are trying to add. The <timeout> is the amount of time to wait to
+   * are trying to add. The @a timeout is the amount of time to wait to
    * connect. If it's 0 then we block indefinitely.  If *timeout ==
    * {0, 0} then the connection is done using non-blocking mode.  In
    * this case, if the connection can't be made immediately the value
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 4b6aca6fd21..c1bc1850aa0 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -125,6 +125,7 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     Mutex.cpp
     Netlink_Addr.cpp
     Notification_Strategy.cpp
+    Notification_Queue.cpp
     Obchunk.cpp
     Object_Manager.cpp
     Object_Manager_Base.cpp
@@ -247,7 +248,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     Thread_Manager.cpp
     Thread_Mutex.cpp
     Thread_Semaphore.cpp
-    Time_Request_Reply.cpp
     Time_Value.cpp
     Timeprobe.cpp
     Timer_Hash.cpp
@@ -364,7 +364,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     Lock_Adapter_T.inl
     Refcounted_Auto_Ptr.inl
     Reverse_Lock_T.inl
-    Swap.inl
     TSS_T.inl
     ace_wchar.inl
     OS.inl
@@ -416,7 +415,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     String_Base_Const.h
     Svc_Conf.h
     Svc_Conf_Tokens.h
-    Swap.h
     Synch.h
     Synch_Traits.h
     TSS_T.h
@@ -427,6 +425,7 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca
     Version.h
     Versioned_Namespace.h
     ace_wchar.h
+    checked_iterator.h
     config-WinCE.h
     config-all.h
     config-borland-common.h
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 58b7a928fe5..86715f0af96 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -87,6 +87,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     MMAP_Memory_Pool.cpp
     Mutex.cpp
     Notification_Strategy.cpp
+    Notification_Queue.cpp
     Obchunk.cpp
     Object_Manager.cpp
     Object_Manager_Base.cpp
@@ -283,7 +284,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     OS_String.inl
     Refcounted_Auto_Ptr.inl
     Reverse_Lock_T.inl
-    Swap.inl
     TSS_T.inl
     ace_wchar.inl
     MMAP_Memory_Pool.inl
@@ -334,7 +334,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     String_Base_Const.h
     Svc_Conf.h
     Svc_Conf_Tokens.h
-    Swap.h
     Synch.h
     Synch_Traits.h
     TSS_T.h
@@ -343,6 +342,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Value_Ptr.h
     Version.h
     ace_wchar.h
+    checked_iterator.h
     config-WinCE.h
     config-all.h
     config-borland-common.h
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 2d3af93ffb4..b13bcc5923b 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -248,6 +248,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_TEXT_STARTUPINFO                     STARTUPINFOW
 #define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAW
 #define ACE_TEXT_OSVERSIONINFO                   OSVERSIONINFOW
+#define ACE_TEXT_EXPLICIT_ACCESS                 EXPLICIT_ACCESS_W
 
 #define ACE_TEXT_CreateEvent                     ::CreateEventW
 #define ACE_TEXT_CreateFile                      ::CreateFileW
@@ -268,6 +269,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameW
 #define ACE_TEXT_GetTempPath                     ::GetTempPathW
 #define ACE_TEXT_GetUserName                     ::GetUserNameW
+#define ACE_TEXT_GetUserNameEx                   ::GetUserNameExW
 #define ACE_TEXT_GetVersionEx                    ::GetVersionExW
 #define ACE_TEXT_LoadLibrary                     ::LoadLibraryW
 #define ACE_TEXT_MoveFileEx                      ::MoveFileExW
@@ -293,12 +295,15 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_TEXT_SearchPath                      ::SearchPathW
 #define ACE_TEXT_StartService                    ::StartServiceW
 #define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherW
+#define ACE_TEXT_SetFileSecurity                 ::SetFileSecurityW
+#define ACE_TEXT_SetEntriesInAcl                 ::SetEntriesInAclW
 
 #else /* ACE_USES_WCHAR */
 #define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYA
 #define ACE_TEXT_STARTUPINFO                     STARTUPINFOA
 #define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAA
 #define ACE_TEXT_OSVERSIONINFO                   OSVERSIONINFOA
+#define ACE_TEXT_EXPLICIT_ACCESS                 EXPLICIT_ACCESS_A
 
 #define ACE_TEXT_CreateEvent                     ::CreateEventA
 #define ACE_TEXT_CreateFile                      ::CreateFileA
@@ -319,6 +324,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameA
 #define ACE_TEXT_GetTempPath                     ::GetTempPathA
 #define ACE_TEXT_GetUserName                     ::GetUserNameA
+#define ACE_TEXT_GetUserNameEx                   ::GetUserNameExA
 #define ACE_TEXT_GetVersionEx                    ::GetVersionExA
 #define ACE_TEXT_LoadLibrary                     ::LoadLibraryA
 #define ACE_TEXT_MoveFileEx                      ::MoveFileExA
@@ -344,6 +350,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_TEXT_SearchPath                      ::SearchPathA
 #define ACE_TEXT_StartService                    ::StartServiceA
 #define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherA
+#define ACE_TEXT_SetFileSecurity                 ::SetFileSecurityA
+#define ACE_TEXT_SetEntriesInAcl                 ::SetEntriesInAclA
 #endif /* ACE_USES_WCHAR */
 #endif /* ACE_WIN32 */
 
diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h
new file mode 100644
index 00000000000..bc583aebbf4
--- /dev/null
+++ b/ACE/ace/checked_iterator.h
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+
+#ifndef ACE_CHECKED_ITERATOR_H
+#define ACE_CHECKED_ITERATOR_H
+
+/**
+ * @file checked_iterator.h
+ *
+ * @brief Checked iterator factory function.
+ *
+ * Some compilers (e.g. MSVC++ >= 8) issue security related
+ * diagnostics if algorithms such as std::copy() are used in an unsafe
+ * way.  Normally this isn't an issue if STL container iterators are
+ * used in conjuction with the standard algorithms.  However, in cases
+ * where application-specific iterators are use with standard
+ * algorithms that could potentially overrun a buffer, extra care must
+ * be taken to prevent such an overrun.  If supported, checked
+ * iterators can be used to address the potential destination buffer
+ * overrun.
+ *
+ * This header provides function templates that generate the
+ * appropriate checked iterator.  In cases where checked iterators are
+ * not supported, the pointer passed to the function is returned
+ * instead.
+ *
+ * $Id$
+ *
+ * @internal The functions and types in this header are meant for
+ *           internal use.  They may change at any point between
+ *           releases.
+ *
+ * @author Ossama Othman
+ */
+
+# if defined (_MSC_VER) && (_MSC_VER >= 1400)
+// Checked iterators are currently only supported in MSVC++ 8 or better.
+#  include <iterator>
+# endif  /* _MSC_VER >= 1400 */
+
+# if defined (_MSC_VER) && (_MSC_VER >= 1400)
+template <typename PTR>
+stdext::checked_array_iterator<PTR>
+ACE_make_checked_array_iterator (PTR buf, size_t len)
+{
+  return stdext::checked_array_iterator<PTR> (buf, len);
+}
+# else
+template <typename PTR>
+PTR
+ACE_make_checked_array_iterator (PTR buf, size_t /* len */)
+{
+  // Checked iterators are unsupported.  Just return the pointer to
+  // the buffer itself.
+  return buf;
+}
+# endif  /* _MSC_VER >= 1400 */
+
+#endif  /* ACE_CHECKED_ITERATOR_H */
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
index 70a9694c857..8c3fd2ca1d1 100644
--- a/ACE/ace/config-WinCE.h
+++ b/ACE/ace/config-WinCE.h
@@ -64,7 +64,10 @@
 #define ACE_LACKS_GMTIME_R
 #define ACE_LACKS_LOCALTIME
 #define ACE_LACKS_STRFTIME
-#define ACE_LACKS_SETFILEPOINTEREX
+#define ACE_LACKS_WIN32_SETFILEPOINTEREX
+#define ACE_LACKS_WIN32_SERVICES
+#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS
+#define ACE_LACKS_WIN32_GETPROCESSTIMES
 
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 
@@ -177,8 +180,8 @@
 #define ACE_LACKS_SIGACTION
 #define ACE_LACKS_PIPE
 
-#define ACE_LACKS_CUSERID
-#define ACE_LACKS_CHDIR
+//#define ACE_LACKS_CUSERID
+//#define ACE_LACKS_CHDIR
 #define ACE_LACKS_ENV
 #define ACE_LACKS_HOSTNAME
 #define ACE_LACKS_REALPATH
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index cb1af37a18a..580748765dd 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -333,6 +333,5 @@
 #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-cxx-common.h b/ACE/ace/config-cxx-common.h
index 5b5c814e278..4ea2a29c12f 100644
--- a/ACE/ace/config-cxx-common.h
+++ b/ACE/ace/config-cxx-common.h
@@ -60,6 +60,8 @@
 #   pragma message disable basclsnondto
 #   pragma message disable boolexprconst
 #   pragma message disable undpreid
+#   pragma message disable notusetmpfunprm
+#   pragma message disable bltinclnk
 
 #   if (__DECCXX_VER >= 60190029)
       // 6.1-029 and later support msg 1136.  Disable it because it
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 28c7744900e..e9114441092 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -246,10 +246,6 @@ extern "C" { char * cuserid (char *s); }
 #  endif /* ACE_POSIX_AIOCB_PROACTOR */
 #endif /* ACE_HAS_AIO_CALLS */
 
-/* FreeBSD does not define sigval_t */
-#include <sys/signal.h>
-typedef union sigval sigval_t;
-
 #define ACE_LACKS_STROPTS_H
 
 // Needed when ACE_HAS_WCHAR is defined.
@@ -266,6 +262,7 @@ typedef union sigval sigval_t;
 
 #if (__FreeBSD_version < 700007)
 # define ACE_HAS_SIGVAL_SIGVAL_INT
+# define ACE_HAS_BROKEN_SIGEVENT_STRUCT
 #endif
 
 #if (__FreeBSD_version >= 700028)
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index fc77eeb793c..5a177d08e35 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -19,18 +19,6 @@
 
 #  include "ace/config-g++-common.h"
 
-#  if __GLIBC__ >= 2
-     // glibc 2 and higher has wchar support
-#    define ACE_HAS_XPG4_MULTIBYTE_CHAR
-#  endif
-
-// gcc 2.95.2 supplies the ssize_t typedef.
-#  define ACE_HAS_SSIZE_T
-
-// gcc 3.0 claims to have wide character stuff, but (at least the version
-// built by HP) can't actually compile it. It refers to a wctype.h file
-// that's only available with aC++.
-
 #else
 
 // The following configuration section is designed to work for HP
@@ -100,9 +88,16 @@
 #      if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
 #        undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
 #      endif
-#      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#      if defined (RWSTD_NO_NAMESPACE)
+         namespace std {} using namespace std;
+#      else
+#        define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#      endif /* RWSTD_NO_NAMESPACE */
 #    else
 #      define ACE_USES_OLD_IOSTREAMS
+       // There's no support in ACE's use of numeric_limits for those that
+       // aren't in std::
+#      define ACE_LACKS_NUMERIC_LIMITS
 #    endif /* _HP_NAMESPACE_STD */
 
 // Compiler implements templates that support typedefs inside of classes
@@ -133,14 +128,8 @@
 // Compiler supports template specialization.
 #    define ACE_HAS_TEMPLATE_SPECIALIZATION
 
-// Platform has XPG4 wide character support
-#    define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
 #  endif /* __cplusplus < 199707L */
 
-// Compiler supports the ssize_t typedef.
-#  define ACE_HAS_SSIZE_T
-
 // Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h)
 #  define ACE_LACKS_SIGNED_CHAR
 
@@ -244,6 +233,8 @@
 // Compiler/platform has Dirent iterator functions.
 #define ACE_HAS_DIRENT
 
+#define ACE_HAS_VSWPRINTF
+
 // Platform supports getpagesize() call
 #define ACE_HAS_GETPAGESIZE
 // But we define this just to be safe
@@ -325,6 +316,8 @@
 // Platform's sigaction() function takes const sigaction* as 2nd parameter.
 #define ACE_HAS_SIGACTION_CONSTP2
 
+#define ACE_HAS_SSIZE_T
+
 // Platform supports SVR4 extended signals
 #define ACE_HAS_SIGINFO_T
 
@@ -337,6 +330,8 @@
 /* Platform provides socklen_t type, such as Linux with glibc2. */
 #define ACE_HAS_SOCKLEN_T 1
 
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR
+
 /* Platform/compiler supports _sys_errlist symbol */
 #define ACE_HAS_SYS_ERRLIST 1
 
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index d4dcb2d70f8..2a164db6ca3 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -188,8 +188,6 @@ extern "C"
 #define ACE_HAS_POWERPC_TIMER
 #endif
 
-typedef union sigval sigval_t;
-
 /* MIKEC Addtions */
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #include <sys/uio.h> // needed to define iovec
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 0232d20cb1c..598bf6cd3e5 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -29,13 +29,6 @@
 #  define ACE_HAS_PTHREADS_UNIX98_EXT
 #endif /* _XOPEN_SOURCE - 0 >= 500 */
 
-#if (defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199309L)
-#  if !defined (ACE_HAS_CLOCK_GETTIME)
-#    define ACE_HAS_CLOCK_GETTIME
-#    define ACE_HAS_CLOCK_SETTIME
-#  endif  /* !ACE_HAS_CLOCK_GETTIME */
-#endif  /* _POSIX_C_SOURCE >= 199309L */
-
 #if defined (ACE_HAS_LINUX_NPTL)
 # include "ace/config-posix.h"
 
@@ -190,6 +183,8 @@
 # undef ACE_LACKS_LLSEEK_PROTOTYPE
 # undef ACE_LACKS_LSEEK64_PROTOTYPE
 # include "ace/config-borland-common.h"
+#elif defined (__SUNCC_PRO)
+# include "ace/config-suncc-common.h"
 #elif defined (__PGI)
 // Portable group compiler
 # define ACE_HAS_CPLUSPLUS_HEADERS
@@ -198,7 +193,6 @@
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_LACKS_SWAB
-# undef ACE_HAS_CLOCK_GETTIME
 #elif defined (__GNUC__)
 /**
  * GNU C compiler.
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index ee3ca24eeeb..60101909e1e 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -29,6 +29,16 @@
 // ... and the final standard even!
 #define ACE_HAS_PTHREADS_STD
 
+// On linux this is part of pthreads
+#  if (defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199309L)
+#    if !defined (ACE_HAS_CLOCK_GETTIME)
+#      if !defined(__PGI)
+#        define ACE_HAS_CLOCK_GETTIME
+#      endif /* __PGI */
+#      define ACE_HAS_CLOCK_SETTIME
+#    endif  /* !ACE_HAS_CLOCK_GETTIME */
+#  endif  /* _POSIX_C_SOURCE >= 199309L */
+
 #if !defined (ACE_HAS_PTHREADS_UNIX98_EXT)
 #  define ACE_LACKS_RWLOCK_T
 #else
@@ -56,6 +66,10 @@
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #endif
 
+#else
+// AIO support pulls in the rt library, which pulls in the pthread
+// library.  Disable AIO in single-threaded builds.
+# undef ACE_HAS_AIO_CALLS
 #endif  /* ACE_MT_SAFE */
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h
index 69466bbe394..0ed4c1bcaac 100644
--- a/ACE/ace/config-lite.h
+++ b/ACE/ace/config-lite.h
@@ -122,7 +122,7 @@ 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 \
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \
       && !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
@@ -136,7 +136,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \
   typedef std::reverse_iterator<const_iterator, \
                                 value_type const> const_reverse_iterator;
-#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \
+#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \
       && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
 # define ACE_DECLARE_STL_REVERSE_ITERATORS \
   typedef std::reverse_iterator<iterator, \
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index d07d13a273d..9ec56c1236d 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -18,7 +18,6 @@
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
-# define _REENTRANT
 #endif
 
 #include "ace/config-posix.h"
@@ -38,6 +37,8 @@
 #define ACE_HAS_ALLOCA
 #define ACE_HAS_ALLOCA_H
 #define ACE_HAS_AUTOMATIC_INIT_FINI
+#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1
+#define ACE_HAS_BROKEN_SIGEVENT_STRUCT
 #define ACE_HAS_CHARPTR_SHMAT
 #define ACE_HAS_CHARPTR_SHMDT
 #define ACE_HAS_CLOCK_GETTIME
@@ -75,6 +76,7 @@
 #define ACE_HAS_SYS_SOCKIO_H
 #define ACE_HAS_TERMIOS
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
+#define ACE_LACKS_ALPHASORT_PROTOTYPE
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_MADVISE
@@ -96,8 +98,8 @@
 #define ACE_LACKS_VSNPRINTF
 #define ACE_LACKS_WCHAR_H
 #define ACE_MALLOC_ALIGN 8
-#define ACE_NEEDS_IPC_1C_H
 #define ACE_PAGE_SIZE 4096
+#define ACE_POSIX_SIG_PROACTOR
 #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR
 
 #if ACE_MT_SAFE == 1
@@ -112,16 +114,6 @@
 # endif
 #endif /* ACE_MT_SAFE */
 
-#define ACE_POSIX_AIOCB_PROACTOR
-// AIOCB Proactor works on Lynx. But it is not multi-threaded.
-// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use
-// SIG Proactor also, with multiple threads. So, let us use the AIOCB
-// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn
-// on SIG Proactor for this platform.
-// #define ACE_POSIX_SIG_PROACTOR
-
-#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1
-
 #if __GNUC__ < 3
 # define ACE_LACKS_NUMERIC_LIMITS
 #endif /* __GNUC__ < 3 */
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index ebb4189e109..14e60e76760 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -169,7 +169,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 42d4928ab52..916d0bf4313 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -204,7 +204,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 3dfe3f5eaa5..28467f0a91d 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -169,7 +169,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-macros.h b/ACE/ace/config-macros.h
index c2fcaafa03b..b7e244e4789 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -486,8 +486,19 @@
     if (RESULT == FAILVALUE) \
       ACE_OS::set_errno_to_last_error (); \
   } while (0)
+
 #endif  /* ACE_WIN32 */
 
+// The C99 security-improved run-time returns an error value on failure;
+// 0 on success.
+#if defined (ACE_HAS_TR24731_2005_CRT)
+#  define ACE_SECURECRTCALL(X,TYPE,FAILVALUE,RESULT) \
+  do { \
+    errno_t ___ = X; \
+    if (___ != 0) { errno = ___; RESULT = FAILVALUE; } \
+  } while (0)
+#endif /* ACE_HAS_TR24731_2005_CRT */
+
 // ============================================================================
 // Fundamental types
 // ============================================================================
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index ff7ca61e423..4d8d79a994b 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -225,10 +225,6 @@
 // Platform has POSIX terminal interface.
 #define ACE_HAS_TERMIOS
 
-// OpenBSD actually has the clearerr call, but it causes a
-// bogus compiler syntax error.
-#define ACE_LACKS_CLEARERR
-
 // OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO)
 #define ACE_LACKS_SETSCHED
 
@@ -236,5 +232,7 @@
 // has compile errors.
 //#define ACE_HAS_IPV6
 
+#define ACE_HAS_3_PARAM_READDIR_R
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 8281f85f773..736a51a0ab7 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -183,5 +183,6 @@
 #define ACE_LACKS_SYSV_SHMEM 1
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1
 #define ACE_LACKS_UNIX_SYSLOG 1
+#define ACE_LACKS_ALPHASORT 1
 
 #endif
diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h
index 739a424ce19..e955578fb49 100644
--- a/ACE/ace/config-pharlap.h
+++ b/ACE/ace/config-pharlap.h
@@ -34,7 +34,10 @@
 #define ACE_LACKS_TCP_NODELAY
 #define ACE_LACKS_MSG_WFMO
 #define ACE_LACKS_WIN32_MOVEFILEEX
+#define ACE_LACKS_WIN32_REGISTRY
 #define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS
+#define ACE_LACKS_WIN32_SERVICES
+#define ACE_LACKS_WIN32_SETFILEPOINTEREX
 
 // 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,
@@ -56,6 +59,8 @@
 // Let the config-win32.h file do its thing
 #undef ACE_CONFIG_H
 #include "ace/config-win32.h"
+// Now remove things that desktop/server Windows has but Pharlap ETS doesn't.
+#undef ACE_HAS_INTERLOCKED_EXCHANGEADD
 #undef ACE_HAS_WCHAR
 
 #include /**/ <embkern.h>
@@ -64,5 +69,12 @@
 #define ACE_LACKS_IP_ADD_MEMBERSHIP
 #endif /* ACE_HAS_PHARLAP_RT */
 
+// Although IN_CLASSD is defined in both winsock.h and winsock2.h, it ends
+// up undefined for Pharlap ETS builds. If this is the case, set things up
+// so nothing looks like class D.
+#if !defined (IN_CLASSD)
+#  define IN_CLASSD(i) (0)
+#endif
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_PHARLAP_H */
diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h
index a8f5b35ec92..4bf5c194498 100644
--- a/ACE/ace/config-qnx-rtp-62x.h
+++ b/ACE/ace/config-qnx-rtp-62x.h
@@ -15,12 +15,14 @@
 /////////////////////////////////////////////////////////////////
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_3_PARAM_WCSTOK
+#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 // 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
 #define ACE_HAS_ALLOCA_H
+#define ACE_HAS_ALT_CUSERID
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CLOCK_SETTIME
@@ -31,7 +33,6 @@
 #define ACE_HAS_GPERF
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 //#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-#define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_IP_MULTICAST
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
@@ -88,6 +89,7 @@
 #define ACE_LACKS_SOCKET_BUFSIZ
 #define ACE_LACKS_STREAM_MODULES
 #define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_STRPTIME
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
 #define ACE_LACKS_SYS_MSG_H
@@ -96,6 +98,7 @@
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_T_ERRNO
 #define ACE_LACKS_U_LONGLONG_T
+#define ACE_LACKS_ALPHASORT
 
 #define ACE_LACKS_RLIMIT         // QNX rlimit syscalls don't work properly with ACE.
 
@@ -116,7 +119,6 @@
 #define ACE_LACKS_WCSICMP
 #define ACE_LACKS_WCSNICMP
 #define ACE_LACKS_WCSDUP
-#define ACE_LACKS_CUSERID
 // The default value of FD_SETSIZE is 32, but actually x86 NTO
 // supports by default at least 1000 descriptors in fd_set.
 #if defined( FD_SETSIZE )
diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h
index c1ba745d664..18a673ca0cc 100644
--- a/ACE/ace/config-qnx-rtp-pre62x.h
+++ b/ACE/ace/config-qnx-rtp-pre62x.h
@@ -96,6 +96,7 @@
 #define ACE_LACKS_SYSCALL
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
+#define ACE_LACKS_ALPHASORT
 //#define ACE_LACKS_TCP_NODELAY  // Based on the  QNX RTP documentation, this option seems to
                                  // to be supported.
 #define ACE_LACKS_TELLDIR
diff --git a/ACE/ace/config-qnx-rtp.h b/ACE/ace/config-qnx-rtp.h
index c881d1db3f6..513d6eb1b00 100644
--- a/ACE/ace/config-qnx-rtp.h
+++ b/ACE/ace/config-qnx-rtp.h
@@ -9,12 +9,17 @@
 #define ACE_CONFIG_QNX_RTP_H
 #include /**/ "ace/pre.h"
 
-#if !defined(ACE_NTO_VERS)
-#    error "Correct ACE_NTO_VERS in include/makeinclude/platform_qnx_rtp_gcc.GNU"
-#elif ACE_NTO_VERS < 620
-#    include /**/ "ace/config-qnx-rtp-pre62x.h"
+#include <sys/neutrino.h>
+#if !defined(_NTO_VERSION)
+#  error "Could not detect QNX version from macro _NTO_VERSION"
 #else
+#  define ACE_NTO_VERS _NTO_VERSION
+#  if ACE_NTO_VERS < 620
+#    include /**/ "ace/config-qnx-rtp-pre62x.h"
+#  else
 #    include /**/ "ace/config-qnx-rtp-62x.h"
+#  endif
 #endif
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_QNX_RTP_H */
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index f55c688e090..2b7a82bdfb5 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -39,6 +39,7 @@
 
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_DLFCN_H
@@ -63,19 +64,22 @@
 // rtems 4.6.6.
 #define ACE_LACKS_WCHAR_H
 
-// Yes, we do have threads.
-#define ACE_HAS_THREADS
-// And they're even POSIX pthreads (MIT implementation)
-#define ACE_HAS_PTHREADS
-// ... 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
+#if !defined (ACE_MT_SAFE)
 #define ACE_MT_SAFE 1
-#define ACE_PAGE_SIZE 4096
+#endif
+
+#if ACE_MT_SAFE
+# define ACE_HAS_THREADS
+# define ACE_HAS_PTHREADS
+# define ACE_HAS_PTHREADS_STD
+# define ACE_HAS_THREAD_SPECIFIC_STORAGE
+# define ACE_HAS_PTHREAD_SCHEDPARAM
+# define ACE_LACKS_THREAD_PROCESS_SCOPING
+#else
+# define ACE_HAS_POSIX_GETPWNAM_R
+# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#endif
+
 #define ACE_HAS_ALT_CUSERID
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_3_PARAM_READDIR_R
@@ -86,6 +90,7 @@
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
 #define ACE_HAS_NONCONST_READV
+#define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_REENTRANT_FUNCTIONS
@@ -121,7 +126,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
@@ -141,6 +145,7 @@
 #if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6)
 # define ACE_HAS_UALARM
 #else
+# define ACE_HAS_NOTSUP_SC_PAGESIZE
 # define ACE_LACKS_SUSECONDS_T
 # define ACE_LACKS_INTPTR_T
 # undef ACE_HAS_SHM_OPEN
diff --git a/ACE/ace/config-sco-5.0.0.h b/ACE/ace/config-sco-5.0.0.h
index c155651a29a..519b74a2ead 100644
--- a/ACE/ace/config-sco-5.0.0.h
+++ b/ACE/ace/config-sco-5.0.0.h
@@ -25,9 +25,6 @@
 
 #define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
 
-// Compiler doesn't support static data member templates.
-//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_NONCONST_MSGSND
diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h
index 3258d03da19..2ba05b8e792 100644
--- a/ACE/ace/config-sunos5.10.h
+++ b/ACE/ace/config-sunos5.10.h
@@ -14,4 +14,9 @@
 
 #define ACE_HAS_SCANDIR
 
+// Solaris 10 offers a useable alphasort() unlike previous Solaris versions.
+#if defined (ACE_LACKS_ALPHASORT)
+#  undef ACE_LACKS_ALPHASORT
+#endif
+
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h
index cb431bf7520..002ea42ed86 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
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 d877d19af67..4c2764fc405 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -13,6 +13,11 @@
 
 #define ACE_LACKS_STDINT_H
 
+// alphasort() is present on earlier Solaris versions but is marked as not for
+// use on non-BSD systems and not supported for use in applications that use
+// system libraries or with multiple threads. So it's mostly useless.
+#define ACE_LACKS_ALPHASORT
+
 // SunOS 5.5 does not provide getloadavg()
 #define ACE_LACKS_GETLOADAVG
 
@@ -404,7 +409,5 @@
 #  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-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h
index af1cedc425e..f34ed402fc3 100644
--- a/ACE/ace/config-vxworks5.x.h
+++ b/ACE/ace/config-vxworks5.x.h
@@ -36,20 +36,6 @@
 
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-// An explicit check for Tornado 2.1, which had very limited release.
-// See include/makeinclude/platform_vxworks5.x_g++.GNU for details
-// on version conventions used by ACE for VxWorks.
-# if ACE_VXWORKS == 0x542
-    // Older versions of Tornado accidentally omitted math routines from
-    // the link library to support long long arithmetic. These could be
-    // found and used from another library in the distro.
-    // Recent versions of Tornado include these symbols, so we no longer
-    // have a problem.
-#   define ACE_LACKS_LONGLONG_T
-#   define ACE_LACKS_CLEARERR
-#   define ACE_LACKS_AUTO_PTR
-# endif /* ACE_VXWORKS == 0x542 */
-
 # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
 	// GNU 3.3+ toolchain supports long long types but fails to define this so STL
 	// skips some definitions
@@ -137,6 +123,7 @@
 #define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_ACCESS
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FCNTL
@@ -246,7 +233,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..f8819277f80 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -112,6 +112,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
@@ -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
@@ -203,7 +203,9 @@
 
 #if defined __RTP__
   // We are building for RTP mode
-  #define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #if !defined (ACE_AS_STATIC_LIBS)
+  #  define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #endif
   #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
   #define ACE_LACKS_REGEX_H
   #define ACE_LACKS_PUTENV
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 25a36d9bc44..8575ffad62d 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -76,6 +76,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
@@ -103,7 +104,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
@@ -151,7 +151,6 @@
 #define ACE_LACKS_FCNTL
 
 // Some string things
-#define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_ITOW
 #define ACE_LACKS_WCSDUP
 #define ACE_LACKS_WCSICMP
@@ -162,7 +161,9 @@
 
 #if defined __RTP__
   // We are building for RTP mode
-  #define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #if !defined (ACE_AS_STATIC_LIBS)
+  #  define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #endif
   #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
   #define ACE_LACKS_REGEX_H
   #define ACE_LACKS_PUTENV
@@ -172,7 +173,10 @@
   #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
   #define ACE_HAS_SHM_OPEN
-  #define ACE_HAS_AIO_CALLS
+  #if defined (ACE_AS_STATIC_LIBS)
+  #  define ACE_HAS_AIO_CALLS
+  #endif
+  #define ACE_LACKS_STRCASECMP
   // 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
@@ -191,7 +195,6 @@
   #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
@@ -294,3 +297,4 @@
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
+
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index fbc957b9b85..42d1a4d2f8b 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -54,6 +54,22 @@
 #  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! ghs */
 
+// 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
+
 // OS-specific configuration
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_3_PARAM_READDIR_R
@@ -86,6 +102,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_FILELOCKS
@@ -113,7 +130,6 @@
 #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
@@ -160,7 +176,6 @@
 #define ACE_LACKS_FCNTL
 
 // Some string things
-#define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_ITOW
 #define ACE_LACKS_WCSDUP
 #define ACE_LACKS_WCSICMP
@@ -171,16 +186,25 @@
 
 #if defined __RTP__
   // We are building for RTP mode
-  #define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #if !defined (ACE_AS_STATIC_LIBS)
+  #  define ACE_HAS_SVR4_DYNAMIC_LINKING
+  #endif
   #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
   #define ACE_LACKS_REGEX_H
+  #if defined ACE_HAS_PENTIUM
+  // Bug to workaround VxWorks 6.4 x86
+  #  define ACE_LACKS_PUTENV
+  #endif
   #define ACE_HAS_SETENV
+  #define ACE_LACKS_STRCASECMP
   #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
+  #if defined (ACE_AS_STATIC_LIBS)
+  #  define ACE_HAS_AIO_CALLS
+  #endif
   // 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
@@ -199,7 +223,6 @@
   #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
@@ -272,22 +295,6 @@
 # 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)
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 7beabb8ded6..5a8e52d44bc 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -342,9 +342,10 @@
 // No system support for replacing any previous mappings.
 #define ACE_LACKS_AUTO_MMAP_REPLACEMENT
 
-// If you want to use highres timers, ensure that
-// Build.Settings.C++.CodeGeneration.Processor is
-// set to Pentium !
+// ACE_HAS_PENTIUM is used to optimize some CDR operations; it's used for
+// some other time-related things using g++, but not for VC. Current VC
+// compilers set _M_IX86 > 400 by default so if you're not using a Pentium
+// class CPU, set the project code generation options appropriately.
 #if !defined(ACE_HAS_PENTIUM) && (_M_IX86 > 400)
 # define ACE_HAS_PENTIUM
 #endif
@@ -565,6 +566,7 @@
 #define ACE_LACKS_OPENDIR
 #define ACE_LACKS_CLOSEDIR
 #define ACE_LACKS_READDIR
+#define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_MKSTEMP
 #define ACE_LACKS_LSTAT
 // Looks like Win32 has a non-const swab function
diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h
index 13f6d7d233d..72e448c9a6e 100644
--- a/ACE/ace/config-win32-msvc-8.h
+++ b/ACE/ace/config-win32-msvc-8.h
@@ -23,6 +23,10 @@
 #error Use config-win32.h in config.h instead of this header
 #endif /* ACE_CONFIG_WIN32_H */
 
+#ifndef ACE_WIN32_VC8
+#  define ACE_WIN32_VC8
+#endif
+
 // Visual C++ 8.0 (.NET) deprecated the old iostreams
 #if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
@@ -32,6 +36,15 @@
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #endif
 
+// Windows' timeval is non-conformant (defined in terms of long instead of
+// time_t) and VC8 (on desktop, not CE) changed time_t to a 64-bit value
+// even when compiling a 32-bit application. Therefore, ace/Time_Value
+// needs to rearrange a few things for this compiler. See Time_Value.h
+// for complete details.
+#if !defined (ACE_HAS_WINCE)
+#  define ACE_HAS_TIME_T_LONG_MISMATCH
+#endif
+
 #define ACE_HAS_ITOA
 
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
@@ -92,21 +105,13 @@
 // There are too many instances of this warning to fix it right now.
 // Maybe in the future.
 
-// C++ Exception Specification ignored
-#pragma warning(disable:4290)
-
-// 'this' : used in base member initializer list
-#pragma warning(disable:4355)
-
-// 'class1' : inherits 'class2::member' via dominance
-#pragma warning(disable:4250)
-
 // Disable warning of using Microsoft Extension.
 # pragma warning(disable:4231)
 
-// Disable deprecation warnings, because setting _CRT_SECURE_NO_DEPRECATE
-// did not prevent the warnings.
-#pragma warning(disable:4996)
+// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
+#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
+#  define ACE_HAS_TR24731_2005_CRT
+#endif
 
 // On CE w/o MFC config-WinCE.h needs to declare a placement new. This
 // triggers a warning that there's no placement delete, which can be ignored.
diff --git a/ACE/ace/gethrtime.cpp b/ACE/ace/gethrtime.cpp
index 74dbb62b689..9fa33423aff 100644
--- a/ACE/ace/gethrtime.cpp
+++ b/ACE/ace/gethrtime.cpp
@@ -26,9 +26,6 @@ ACE_GETHRTIME_NAME (void)
   ACE_hrtime_t now;
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
-  // See comments about the RDTSC Pentium instruction for the
-  // ACE_WIN32 version of ACE_OS::gethrtime () in ace/OS.i.
-  //
   // Read the high-res tick counter directly into memory variable
   // "now".  The A constraint signifies a 64-bit int.
 #if defined (__GNUG__)
diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h
index c689e07ab7e..bb44c58504c 100644
--- a/ACE/ace/os_include/net/os_if.h
+++ b/ACE/ace/os_include/net/os_if.h
@@ -24,11 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_NEEDS_IPC_1C_H)
-   // LynxOS 3.1.0 and later need this
-#  include /**/ <ipc_1c.h>
-#endif /* ACE_NEEDS_IPC_1C_H */
-
 #if !defined (ACE_LACKS_NET_IF_H)
    // This part if to avoid STL name conflict with the map structure
    // in net/if.h.
diff --git a/ACE/ace/os_include/os_dirent.h b/ACE/ace/os_include/os_dirent.h
index 2f7e12327e7..0f4f6b5fe81 100644
--- a/ACE/ace/os_include/os_dirent.h
+++ b/ACE/ace/os_include/os_dirent.h
@@ -100,6 +100,10 @@ int scandir (const char *,
              int (*) (const void *, const void *));
 #endif /* ACE_LACKS_SCANDIR_PROTOTYPE */
 
+#if defined (ACE_LACKS_ALPHASORT_PROTOTYPE)
+int alphasort (const void *, const void *);
+#endif /* ACE_LACKS_ALPHASORT_PROTOTYPE */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h
index 045d034e149..6f50551a8af 100644
--- a/ACE/ace/os_include/os_dlfcn.h
+++ b/ACE/ace/os_include/os_dlfcn.h
@@ -80,7 +80,7 @@ extern "C"
 #elif defined (__hpux)
    typedef shl_t ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
-#  define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
+#  define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED | DYNAMIC_PATH
 #else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */
    typedef void *ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
diff --git a/ACE/ace/os_include/os_stdio.h b/ACE/ace/os_include/os_stdio.h
index cfb1843c563..f28c8a03ce3 100644
--- a/ACE/ace/os_include/os_stdio.h
+++ b/ACE/ace/os_include/os_stdio.h
@@ -71,25 +71,6 @@ extern "C"
 #endif /* BUFSIZ */
 
 #if defined (ACE_WIN32)
-// The following are #defines and #includes that are specific to
-// WIN32.
-#  if defined (ACE_HAS_WINCE)
-#    define ACE_STDIN  _fileno (stdin)
-#    define ACE_STDOUT _fileno (stdout)
-#    define ACE_STDERR _fileno (stderr)
-#  else
-#    define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE)
-#    define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE)
-#    define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE)
-#  endif  // ACE_HAS_WINCE
-// The following are #defines and #includes that are specific to UNIX.
-#else /* !ACE_WIN32 */
-#  define ACE_STDIN 0
-#  define ACE_STDOUT 1
-#  define ACE_STDERR 2
-#endif /* ACE_WIN32 */
-
-#if defined (ACE_WIN32)
   typedef OVERLAPPED ACE_OVERLAPPED;
 #else
   struct ACE_OVERLAPPED
diff --git a/ACE/ace/os_include/os_stdlib.h b/ACE/ace/os_include/os_stdlib.h
index c123bba0a9d..a75dab5e35a 100644
--- a/ACE/ace/os_include/os_stdlib.h
+++ b/ACE/ace/os_include/os_stdlib.h
@@ -45,13 +45,12 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+   typedef u_int ACE_RANDR_TYPE;
 #if defined (ACE_HAS_BROKEN_RANDR)
    // The SunOS 5.4.X version of rand_r is inconsistent with the header
    // files...
-   typedef u_int ACE_RANDR_TYPE;
    int rand_r (ACE_RANDR_TYPE seed);
 #else
-   typedef u_int ACE_RANDR_TYPE;
 #endif /* ACE_HAS_BROKEN_RANDR */
 
 #if defined (DIGITAL_UNIX)
diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h
index 828c45b5cd4..dc78271ce82 100644
--- a/ACE/ace/os_include/os_unistd.h
+++ b/ACE/ace/os_include/os_unistd.h
@@ -60,6 +60,37 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+#if defined (ACE_WIN32)
+// The following are #defines and #includes that are specific to
+// WIN32.
+#  if defined (ACE_HAS_WINCE)
+#    define ACE_STDIN  _fileno (stdin)
+#    define ACE_STDOUT _fileno (stdout)
+#    define ACE_STDERR _fileno (stderr)
+#  else
+#    define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE)
+#    define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE)
+#    define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE)
+#  endif  // ACE_HAS_WINCE
+// The following are #defines and #includes that are specific to UNIX.
+#else /* !ACE_WIN32 */
+#  if defined (STDIN_FILENO)
+#    define ACE_STDIN STDIN_FILENO
+#  else
+#    define ACE_STDIN 0
+#  endif
+#  if defined (STDOUT_FILENO)
+#    define ACE_STDOUT STDOUT_FILENO
+#  else
+#    define ACE_STDOUT 1
+#  endif
+#  if defined (STDERR_FILENO)
+#    define ACE_STDERR STDERR_FILENO
+#  else
+#    define ACE_STDERR 2
+#  endif
+#endif /* ACE_WIN32 */
+
 #if (!defined (_BSD_SOURCE) && \
     !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED)) \
     || (defined (_XOPEN_SOURCE) && defined (__GNUC__))
@@ -84,7 +115,12 @@ extern "C"
 # endif /* W_OK */
 
 # if !defined (X_OK)
-#   define X_OK    01      /* Test for eXecute permission. */
+#   if defined (ACE_WIN32)
+      /* Windows has no test for X_OK - use R_OK instead */
+#     define X_OK    R_OK      /* Test for eXecute permission. */
+#   else  /* ACE_WIN32 */
+#     define X_OK    01      /* Test for eXecute permission. */
+#   endif /* ACE_WIN32 */
 # endif /* X_OK */
 
 # if !defined (F_OK)
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index 2ece5f6d901..ad975aa2f8a 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -101,7 +101,7 @@ typedef double ACE_timer_t;
 #  if !defined (__BORLANDC__)
      typedef DWORD nlink_t;
 #    if !defined(__MINGW32__)
-        typedef u_short mode_t;
+        typedef int mode_t;
 #    endif /* !__MINGW32__ */
      typedef long uid_t;
      typedef long gid_t;
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
index beb35c1856e..2d1a0f84ada 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
@@ -13,11 +13,18 @@ Event_Channel::~Event_Channel (void)
 {
 }
 
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (push)
+#  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
+#  endif
 Event_Channel::Event_Channel (void)
   : supplier_acceptor_ (*this, 'S'),
     consumer_acceptor_ (*this, 'C')
 {
 }
+#if defined (ACE_WIN32_VC8)
+#  pragma warning (pop)
+#endif
 
 int
 Event_Channel::compute_performance_statistics (void)
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp
index 277cfb11f3a..c7f58c55a11 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp
@@ -285,7 +285,7 @@ No_Cache_Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler
 //----------------
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 void
 Asynch_HTTP_Handler_Factory::open (ACE_HANDLE handle,
 				   ACE_Message_Block &mb)
@@ -311,4 +311,4 @@ Asynch_HTTP_Handler_Factory::create_http_handler (void)
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.h b/ACE/apps/JAWS/server/HTTP_Handler.h
index f7eb9b9a693..558b2f64392 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.h
+++ b/ACE/apps/JAWS/server/HTTP_Handler.h
@@ -188,7 +188,7 @@ public:
 
 //--------------
 
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Service_Handler
   // = TITLE
   //     This class is used to create new HTTP handlers that will use
@@ -217,5 +217,5 @@ private:
   // handlers. New handlers can only be created by the framework when
   // new client connections arrive.
 };
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 #endif /* HTTP_HANDLER_H */
diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp
index 86ffea0542a..f741b1fc623 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Server.cpp
@@ -368,7 +368,7 @@ int
 HTTP_Server::asynch_thread_pool (void)
 {
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
   // Create the appropriate acceptor for this concurrency strategy and
   // an appropriate handler for this I/O strategy
   ACE_Asynch_Acceptor<Asynch_HTTP_Handler_Factory> acceptor;
@@ -389,12 +389,12 @@ HTTP_Server::asynch_thread_pool (void)
 
   // Wait for the threads to finish.
   return this->tm_.wait ();
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
   return -1;
 }
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 Asynch_Thread_Pool_Task::Asynch_Thread_Pool_Task (ACE_Proactor &proactor,
                                                   ACE_Thread_Manager &tm)
@@ -418,7 +418,7 @@ Asynch_Thread_Pool_Task::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 // Define the factory function.
 ACE_SVC_FACTORY_DEFINE (HTTP_Server)
diff --git a/ACE/apps/JAWS/server/HTTP_Server.h b/ACE/apps/JAWS/server/HTTP_Server.h
index 9e8534c4cbd..0ccfa92cd28 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.h
+++ b/ACE/apps/JAWS/server/HTTP_Server.h
@@ -130,7 +130,7 @@ private:
 };
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 class Asynch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = TITLE
   //     Used to implement Asynch Thread Pool
@@ -146,7 +146,7 @@ public:
 private:
   ACE_Proactor &proactor_;
 };
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 ACE_SVC_FACTORY_DECLARE (HTTP_Server)
 
diff --git a/ACE/apps/JAWS/server/IO.cpp b/ACE/apps/JAWS/server/IO.cpp
index 8b727a12019..0d2663c1f85 100644
--- a/ACE/apps/JAWS/server/IO.cpp
+++ b/ACE/apps/JAWS/server/IO.cpp
@@ -195,7 +195,7 @@ JAWS_Synch_IO::send_message (const char *buffer,
 }
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 JAWS_Asynch_IO::JAWS_Asynch_IO (void)
 {
@@ -421,7 +421,7 @@ JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &resu
     this->handler_->error_message_complete ();
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 //-------------------Adding SYNCH IO no Caching
 
diff --git a/ACE/apps/JAWS/server/IO.h b/ACE/apps/JAWS/server/IO.h
index fd5ae0d64b2..0a12785ab6e 100644
--- a/ACE/apps/JAWS/server/IO.h
+++ b/ACE/apps/JAWS/server/IO.h
@@ -174,7 +174,7 @@ protected:
 };
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler
   // = TITLE
@@ -234,7 +234,7 @@ protected:
   // completes.
 };
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 
 //-------------------Adding SYNCH IO no Caching
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
index 23d8ca1b1ce..316ddd472fe 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
@@ -83,6 +83,9 @@ JAWS_Strdup_String::operator = (const char *s)
 void
 JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s)
 {
+  if (this == &s)
+    return;
+
   if (this->c_ && --*(this->c_) == 0)
     {
       if (this->s_)
diff --git a/ACE/apps/JAWS2/JAWS/IO.cpp b/ACE/apps/JAWS2/JAWS/IO.cpp
index 210502b391d..41603c6b626 100644
--- a/ACE/apps/JAWS2/JAWS/IO.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO.cpp
@@ -324,8 +324,8 @@ JAWS_Synch_IO::send_message (JAWS_IO_Handler *ioh,
   stream.send_n (buffer, length);
 }
 
-// This only works on Win32
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+// This only works on asynch I/O-capable systems.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 JAWS_Asynch_IO::JAWS_Asynch_IO (void)
 {
@@ -591,5 +591,5 @@ JAWS_Asynch2_IO::accept (JAWS_IO_Handler *,
 {
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/apps/JAWS2/JAWS/IO.h b/ACE/apps/JAWS2/JAWS/IO.h
index 840ff327380..e336487bd86 100644
--- a/ACE/apps/JAWS2/JAWS/IO.h
+++ b/ACE/apps/JAWS2/JAWS/IO.h
@@ -170,8 +170,8 @@ protected:
 typedef ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
         JAWS_Synch_IO_Singleton;
 
-// This only works on Win32
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+// This only works on asynch I/O-capable systems.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 class JAWS_Export JAWS_Asynch_IO : public JAWS_IO
   // = TITLE
@@ -258,6 +258,6 @@ public:
 typedef ACE_Singleton<JAWS_Asynch2_IO, ACE_SYNCH_MUTEX>
         JAWS_Asynch2_IO_Singleton;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 #endif /* JAWS_IO_H */
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
index 40740c370b3..b0d04c260b2 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
@@ -97,7 +97,7 @@ JAWS_IO_Synch_Acceptor::get_handle (void)
 
 
 JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   : acceptor_ (*(new ACE_Asynch_Acceptor<JAWS_Asynch_Handler>)),
     acceptor_ptr_ (&acceptor_)
 #endif
@@ -106,7 +106,7 @@ JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
 
 JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
   this->acceptor_ptr_ = 0;
 #endif
@@ -115,7 +115,7 @@ JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
 int
 JAWS_IO_Asynch_Acceptor::open (const ACE_INET_Addr &address, int backlog)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // Tell the acceptor to listen on this->port_, which sets up an
   // asynchronous I/O request to the OS.
 
@@ -133,13 +133,13 @@ JAWS_IO_Asynch_Acceptor::open (const ACE_INET_Addr &address, int backlog)
   ACE_UNUSED_ARG (address);
   ACE_UNUSED_ARG (backlog);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
 JAWS_IO_Asynch_Acceptor::open (const ACE_HANDLE &socket)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   ACE_HANDLE handle = this->handle_;
   if (handle == socket)
     return 0;
@@ -152,19 +152,19 @@ JAWS_IO_Asynch_Acceptor::open (const ACE_HANDLE &socket)
 #else
   ACE_UNUSED_ARG (socket);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
 JAWS_IO_Asynch_Acceptor::accept (size_t bytes_to_read, const void *act)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   return this->acceptor_.accept (bytes_to_read, act);
 #else
   ACE_UNUSED_ARG (bytes_to_read);
   ACE_UNUSED_ARG (act);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
@@ -177,20 +177,20 @@ JAWS_IO_Asynch_Acceptor::accept (ACE_SOCK_Stream &, ACE_Addr *,
 ACE_HANDLE
 JAWS_IO_Asynch_Acceptor::get_handle (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   return this->acceptor_.get_handle ();
 #else
   return ACE_INVALID_HANDLE;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 
 void
 JAWS_IO_Asynch_Acceptor::close (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
   this->acceptor_ptr_ = 0;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
index e18bcd55c30..3f97f876d0b 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
@@ -125,11 +125,11 @@ private:
                       int reset_new_handle = 0) const;
 
 private:
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   ACE_Asynch_Acceptor<JAWS_Asynch_Handler> &acceptor_;
   ACE_Asynch_Acceptor<JAWS_Asynch_Handler> *acceptor_ptr_;
   ACE_HANDLE handle_;
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 };
 
 typedef ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
index 0a96db64f5d..e1ddaa43d2d 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -231,7 +231,7 @@ JAWS_IO_Handler::release (void)
 {
 }
 
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory (void)
 {
@@ -498,5 +498,4 @@ JAWS_Asynch_Handler::handler (void)
   return this->ioh_;
 }
 
-#endif /* ACE_WIN32 */
-
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h
index 7420a8825c8..6b67fdbaa12 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h
@@ -145,7 +145,7 @@ public:
 
 };
 
-#if defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS)
 
 // Forward reference.
 class JAWS_Asynch_IO_Handler;
@@ -190,7 +190,7 @@ public:
 private:
   JAWS_Asynch_IO_Handler *ioh_;
 };
-#endif /* defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS) */
+#endif /* defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) */
 
 
 class JAWS_Export JAWS_IO_Handler : public JAWS_Abstract_IO_Handler
@@ -267,7 +267,7 @@ typedef JAWS_IO_Handler_Factory JAWS_Synch_IO_Handler_Factory;
 typedef ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
         JAWS_Synch_IO_Handler_Factory_Singleton;
 
-#if defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS)
+#if defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS)
 
 class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
 {
@@ -310,7 +310,7 @@ protected:
 typedef JAWS_IO_Handler JAWS_Asynch_IO_Handler;
 typedef JAWS_IO_Handler_Factory JAWS_Asynch_IO_Handler_Factory;
 
-#endif /* defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS) */
+#endif /* defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) */
 
 typedef ACE_Singleton<JAWS_Asynch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
         JAWS_Asynch_IO_Handler_Factory_Singleton;
diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp
index 4fbec0cd0f7..b5d3707bc31 100644
--- a/ACE/apps/JAWS2/JAWS/Server.cpp
+++ b/ACE/apps/JAWS2/JAWS/Server.cpp
@@ -61,18 +61,18 @@ JAWS_Server::init (int argc, char *argv[])
       this->policy_.concurrency (JAWS_Thread_Pool_Singleton::instance ());
     }
 
-#if !(defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS))
+#if !(defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS))
   this->dispatch_ = 0;
-#endif /* !defined (ACE_WIN32) */
+#endif /* !(ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS) */
 
   if (this->dispatch_ == 1)
     {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
       this->policy_.io (JAWS_Asynch_IO_Singleton::instance ());
       this->policy_.ioh_factory
         (JAWS_Asynch_IO_Handler_Factory_Singleton::instance ());
       this->policy_.acceptor (JAWS_IO_Asynch_Acceptor_Singleton::instance ());
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
     }
   else
     {
@@ -112,7 +112,7 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol,
   // prime the acceptor if appropriate
   if (this->dispatch_ == 1)
     {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
       int n = this->nthreads_;
       if (this->concurrency_ == 1)
@@ -121,7 +121,7 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol,
       for (int i = 0; i < n * this->ratio_ - n; i++)
         db->task ()->put (db);
 
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
     }
 
   // The message block should contain an INET_Addr, and call the
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
index 0113e73da39..54b4f1c012d 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -11,7 +11,7 @@
 #include "jaws3/Event_Completer.h"
 #include "jaws3/Event_Result.h"
 
-#if defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32)
+#if defined (ACE_HAS_AIO_CALLS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "jaws3/Asynch_IO_Helpers.h"
 
@@ -254,7 +254,7 @@ JAWS_Asynch_IO::transmit ( ACE_HANDLE handle
                                           );
 }
 
-#endif /* defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32) */
+#endif /* ACE_HAS_AIO_CALLS || ACE_HAS_WIN32_OVERLAPPED_IO */
 
 // For now, we will simulate timed Asynch IO with timed Reactive IO.
 // In the future, we will implement the timed Asynch IO with timers
diff --git a/ACE/apps/drwho/global.h b/ACE/apps/drwho/global.h
index c6713f0063e..e81e25050d2 100644
--- a/ACE/apps/drwho/global.h
+++ b/ACE/apps/drwho/global.h
@@ -21,6 +21,7 @@
 #define _GLOBAL_H
 
 #include "ace/config-all.h"
+#include "ace/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,8 +45,8 @@ enum
 #define RWHODIR "/usr/spool/rwho"
 
 // Macros for handling message types.
-#define GET_PACKET_TYPE(P)      (ntohs (*((short *) P)))
-#define SET_PACKET_TYPE(P,T)    ((*(short *) P) = ntohs (T))
+#define GET_PACKET_TYPE(P)      (ACE_NTOHS (*((short *) P)))
+#define SET_PACKET_TYPE(P,T)    ((*(short *) P) = ACE_NTOHS (T))
 #define SKIP_PACKET_TYPE(P)     ((P) + sizeof (short))
 #define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short))
 
diff --git a/ACE/apps/gperf/src/Gen_Perf.cpp b/ACE/apps/gperf/src/Gen_Perf.cpp
index 88c362e0218..1714ee33acf 100644
--- a/ACE/apps/gperf/src/Gen_Perf.cpp
+++ b/ACE/apps/gperf/src/Gen_Perf.cpp
@@ -251,7 +251,7 @@ Gen_Perf::open (void)
 
   if (option[RANDOM])
     {
-      ACE_OS::srand (ACE_OS::time (0));
+      ACE_OS::srand ((u_int) ACE_OS::time (0));
 
       for (int i = 0; i < ACE_STANDARD_CHARACTER_SET_SIZE; i++)
         Vectors::asso_values[i] = (ACE_OS::rand () & asso_value_max - 1);
diff --git a/ACE/bin/ACETAOCIAO.style b/ACE/bin/ACETAOCIAO.style
new file mode 100644
index 00000000000..dc14c929b83
--- /dev/null
+++ b/ACE/bin/ACETAOCIAO.style
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style>
+<name>ACETAOCIAO</name>
+<description>This style is used for ACE/TAO/CIAO</description>
+<sample></sample>
+<flags />
+<rule name="align-global">
+<presetreference>Global_Align Global Variables_false</presetreference>
+</rule>
+<rule name="brace-space">
+<presetreference>Global_Space Before Brace_True</presetreference>
+</rule>
+<rule name="case-statement-indent">
+<presetreference>Switch_Case Statement Indentation_True</presetreference>
+</rule>
+<rule name="catch-bracing-style">
+<presetreference>Try_Catch Brace Position_Indented</presetreference>
+</rule>
+<rule name="chevron-alignment">
+<presetreference>Templates_Chevron Alignment_AlignAtBracket</presetreference>
+</rule>
+<rule name="class-access-specifier-indent">
+<presetreference>Classes and Structs_Access Specifier Indentation_False</presetreference>
+</rule>
+<rule name="class-access-specifier-newline">
+<presetreference>Classes and Structs_Access Specifier New Line_True</presetreference>
+</rule>
+<rule name="class-bracing-style">
+<presetreference>Classes and Structs_Brace Position_Aligned</presetreference>
+</rule>
+<rule name="class-indent">
+<presetreference>Classes and Structs_Indentation_True</presetreference>
+</rule>
+<rule name="class-inheritance-list">
+<presetreference>Classes and Structs_Inheritance List_SameLine</presetreference>
+</rule>
+<rule name="class-member-align">
+<presetreference>Classes and Structs_Member Alignment_False</presetreference>
+</rule>
+<rule name="constructor-initialiser-packing">
+<presetreference>Constructor_Member Initializers_One Per Line</presetreference>
+</rule>
+<rule name="constructor-initialiser-style">
+<presetreference>Constructor_Initializer Alignment_True</presetreference>
+</rule>
+<rule name="declaration-newline">
+<presetreference>Declarations_Start On New Line_True</presetreference>
+</rule>
+<rule name="declarations-keyword-spacing">
+<presetreference>Declarations_Keyword Spacing_True</presetreference>
+</rule>
+<rule name="do-bracing-style">
+<presetreference>Do_Brace Position_Aligned</presetreference>
+</rule>
+<rule name="do-indented-style">
+<presetreference>Do_Indentation_True</presetreference>
+</rule>
+<rule name="do-while-style">
+<presetreference>Do_While Position_SameLine</presetreference>
+</rule>
+<rule name="enum-align-initialisers">
+<presetreference>Enums_Align Initializers_False</presetreference>
+</rule>
+<rule name="enum-bracing-style">
+<presetreference>Enums_Brace Position_Aligned</presetreference>
+</rule>
+<rule name="enum-indent">
+<presetreference>Enums_Indentation_True</presetreference>
+</rule>
+<rule name="enum-items">
+<presetreference>Enums_Items_OnePerLine</presetreference>
+</rule>
+<rule name="enum-single-entry">
+<presetreference>Enums_Single Entry_Normal</presetreference>
+</rule>
+<rule name="exceptions-exc-pos">
+<presetreference>Exceptions_Exception Position_Packed</presetreference>
+</rule>
+<rule name="exceptions-throw-pos">
+<presetreference>Exceptions_Throw Position_Same Line</presetreference>
+</rule>
+<rule name="expression-casts">
+<presetreference>Expressions_C Style Casts_No space after</presetreference>
+</rule>
+<rule name="expression-wrapping">
+<presetreference>Expressions_Binary Operator Wrapping_After</presetreference>
+</rule>
+<rule name="expressions-binary-spacing">
+<presetreference>Expressions_Binary Operators_Spaced</presetreference>
+</rule>
+<rule name="expressions-functioncall-spacing">
+<presetreference>Functions_Calls_Spaced</presetreference>
+</rule>
+<rule name="expressions-member-spacing">
+<presetreference>Expressions_Member Operators_Not Spaced</presetreference>
+</rule>
+<rule name="expressions-pointer-spacing">
+<presetreference>Expressions_Pointer Operators_Not Spaced</presetreference>
+</rule>
+<rule name="expressions-unary-spacing">
+<presetreference>Expressions_Logical and Bitwise Unary Operators_Not Spaced</presetreference>
+</rule>
+<rule name="extern-braces">
+<presetreference>Declarations_Extern Brace Position_Aligned</presetreference>
+</rule>
+<rule name="extern-indentation">
+<presetreference>Declarations_Extern Indentation_True</presetreference>
+</rule>
+<rule name="for-bracing-indent">
+<presetreference>For_Indentation_True</presetreference>
+</rule>
+<rule name="for-bracing-style">
+<presetreference>For_Brace Position_Indented</presetreference>
+</rule>
+<rule name="for-semicolon-spacing">
+<presetreference>For_Semicolon Spacing_SpaceAfter</presetreference>
+</rule>
+<rule name="function-align-params">
+<presetreference>Functions_Parameter Name Alignment_False</presetreference>
+</rule>
+<rule name="function-bracing-style">
+<presetreference>Functions_Brace Position_Aligned</presetreference>
+</rule>
+<rule name="function-call-lines">
+<presetreference>Functions_Call Parameter Lines_SingleLine</presetreference>
+</rule>
+<rule name="function-call-spacing">
+<presetreference>Functions_Call Spacing_AfterComma</presetreference>
+</rule>
+<rule name="function-declaration-alignment">
+<presetreference>Functions_Declaration Alignment_False</presetreference>
+</rule>
+<rule name="function-indent">
+<presetreference>Functions_Indentation_True</presetreference>
+</rule>
+<rule name="function-name-style">
+<presetreference>Functions_Definitions_True</presetreference>
+</rule>
+<rule name="function-parameter-alignment">
+<presetreference>Functions_Parameter Alignment_Bracket</presetreference>
+</rule>
+<rule name="function-parameter-lines">
+<presetreference>Functions_Parameter Lines_False</presetreference>
+</rule>
+<rule name="function-parameter-spacing">
+<presetreference>Functions_Parameter Spacing_AfterComma</presetreference>
+</rule>
+<rule name="function-parenthesis-spacing">
+<presetreference>Functions_Bracket Spacing_False</presetreference>
+</rule>
+<rule name="function-type-style">
+<presetreference>Functions_Return Type_OwnLine</presetreference>
+</rule>
+<rule name="global-alignment-space">
+<presetreference>Global_Alignment ensures at least one space_False</presetreference>
+</rule>
+<rule name="global-bracing-style">
+<presetreference>Global_Default Block Brace Position_Aligned</presetreference>
+</rule>
+<rule name="global-bracket-alignment">
+<presetreference>Expressions_Bracket Alignment_AlignAtBracket</presetreference>
+</rule>
+<rule name="global-bracket-spacing">
+<presetreference>Expressions_Bracket Spacing_NoSpace</presetreference>
+</rule>
+<rule name="global-comma-spacing">
+<presetreference>Expressions_Comma Spacing_AfterComma</presetreference>
+</rule>
+<rule name="global-function-bracket-alignment">
+<presetreference>Functions_Bracket Alignment_AlignAtBracket</presetreference>
+</rule>
+<rule name="global-function-empty-brackets">
+<presetreference>Functions_Empty Brackets_NoSpace</presetreference>
+</rule>
+<rule name="global-function-empty-chevron">
+<presetreference>Templates_Empty Chevrons_NoSpace</presetreference>
+</rule>
+<rule name="global-function-single-line">
+<presetreference>Functions_Empty Functions_Formatted</presetreference>
+</rule>
+<rule name="global-indentation">
+<presetreference>Global_Default Block Indentation_Yes</presetreference>
+</rule>
+<rule name="global-initialiser-comma-spacing">
+<presetreference>Declarations_Comma Spacing_AfterComma</presetreference>
+</rule>
+<rule name="global-semicolon-spacing">
+<presetreference>Global_Semicolon Spacing_False</presetreference>
+</rule>
+<rule name="global-statement-newline">
+<presetreference>Global_Statements On New Line_False</presetreference>
+</rule>
+<rule name="global-statement-spacing">
+<presetreference>Global_Statement Spacing_True</presetreference>
+</rule>
+<rule name="identifier-spacing">
+<presetreference>Declarations_Spacing Before Identifier_Space</presetreference>
+</rule>
+<rule name="if-bracing-style">
+<presetreference>If_Brace Position_Indented</presetreference>
+</rule>
+<rule name="if-else-style">
+<presetreference>If_Else Position_OwnLine</presetreference>
+</rule>
+<rule name="if-indented-style">
+<presetreference>If_Indentation_True</presetreference>
+</rule>
+<rule name="indent-amount">
+<presetreference>Global_Indentation Amount_2</presetreference>
+</rule>
+<rule name="indent-continuation">
+<presetreference>Global_Indent Continuation Lines_true</presetreference>
+</rule>
+<rule name="initialiser-braces">
+<presetreference>Declarations_Initializer Brace Position_Aligned</presetreference>
+</rule>
+<rule name="initialiser-indentation">
+<presetreference>Declarations_Initializer Indentation_True</presetreference>
+</rule>
+<rule name="initialiser-list">
+<presetreference>Declarations_Initializer List Entries_Pack</presetreference>
+</rule>
+<rule name="initialiser-spacing">
+<presetreference>Declarations_Initializer Spacing_True</presetreference>
+</rule>
+<rule name="label-indentation">
+<presetreference>Global_Label Indentation_None</presetreference>
+</rule>
+<rule name="line-wrap-width">
+<presetreference>Global_Line Wrapping_80</presetreference>
+</rule>
+<rule name="member-initialiser-position">
+<presetreference>Constructor_Member Initializer Position_Below Indented</presetreference>
+</rule>
+<rule name="namespace-bracing-style">
+<presetreference>Namespaces_Brace Position_Aligned</presetreference>
+</rule>
+<rule name="namespace-indent">
+<presetreference>Namespaces_Indentation_True</presetreference>
+</rule>
+<rule name="pointer-hangleft">
+<presetreference>Pointers and References_Hang Left on Alignment_False</presetreference>
+</rule>
+<rule name="pointer-position">
+<presetreference>Pointers and References_Positioning_Var</presetreference>
+</rule>
+<rule name="pointer-qualifier">
+<presetreference>Pointers and References_Qualifiers_True</presetreference>
+</rule>
+<rule name="pointer-spacing">
+<presetreference>Pointers and References_Spacing_False</presetreference>
+</rule>
+<rule name="preprocessor-indent">
+<presetreference>Global_Preprocessor Indentation_False</presetreference>
+</rule>
+<rule name="statement-force">
+<presetreference>Global_Force Statements To Start On New Line_True</presetreference>
+</rule>
+<rule name="strict-whitespace">
+<presetreference>Global_Trim Excess Newlines_False</presetreference>
+</rule>
+<rule name="switch-bracing-style">
+<presetreference>Switch_Brace Position_Indented</presetreference>
+</rule>
+<rule name="switch-indentation-style">
+<presetreference>Switch_Statement Indentation_True</presetreference>
+</rule>
+<rule name="template-dec-comma">
+<presetreference>Templates_Comma Spacing_AfterComma</presetreference>
+</rule>
+<rule name="template-declaration-chevron">
+<presetreference>Templates_Chevron Spacing_False</presetreference>
+</rule>
+<rule name="template-declaration-id">
+<presetreference>Templates_Identifier Spacing_True</presetreference>
+</rule>
+<rule name="template-newline">
+<presetreference>Templates_Declaration On New Line_True</presetreference>
+</rule>
+<rule name="template-parameter-lines">
+<presetreference>Templates_Parameter Lines_False</presetreference>
+</rule>
+<rule name="trim-trailing-whitespace">
+<presetreference>Global_Trim Trailing Whitespace_True</presetreference>
+</rule>
+<rule name="try-bracing-style">
+<presetreference>Try_Try Brace Position_Indented</presetreference>
+</rule>
+<rule name="try-catch-style">
+<presetreference>Try_Catch Position_NewLine</presetreference>
+</rule>
+<rule name="try-indented-style">
+<presetreference>Try_Indentation_True</presetreference>
+</rule>
+<rule name="use-tabs">
+<presetreference>Global_Indentation Type_Spaces</presetreference>
+</rule>
+<rule name="while-bracing-style">
+<presetreference>While_Brace Position_Indented</presetreference>
+</rule>
+<rule name="while-indent-style">
+<presetreference>While_Indentation_True</presetreference>
+</rule>
+</style>
diff --git a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
index f94fdd21f8b..208de546c19 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
@@ -2,19 +2,29 @@
 // $Id$
 
 project : openssl {
-
-  // The ACE/TAO configure scripts set ace_TLS_CFLAGS and ace_TLS_LIBS 
-  // instead of $(SSL_ROOT)/include and $(SSL_ROOT)/lib as set by MPC's
-  // openssl.mpb.
-
-  specific (automake) {
+  // For both automake and gnuace, we want to use built-in macros instead of
+  // the values provided by the openssl base project.
+  specific (automake, gnuace) {
     lit_libs -= ssl crypto
     includes -= $(SSL_ROOT)/include
     includes -= /usr/kerberos/include
     libpaths -= $(SSL_ROOT)/lib
+  }
 
+  // The ACE/TAO configure scripts set ace_TLS_CFLAGS and ace_TLS_LIBS 
+  // instead of $(SSL_ROOT)/include and $(SSL_ROOT)/lib as set by MPC's
+  // openssl.mpb.
+  specific (automake) {
     compile_flags += @ACE_TLS_CPPFLAGS@
-    linkflags += @ACE_TLS_LDFLAGS@
-    pure_libs += @ACE_TLS_LIBS@
+    linkflags     += @ACE_TLS_LDFLAGS@
+    pure_libs     += @ACE_TLS_LIBS@
+  }
+
+  // These values get set in platform_macros.GNU or defaulted
+  // in wrapper_macros.GNU if the GNU make variable ssl is set to 1.
+  specific (gnuace) {
+    compile_flags += $(PLATFORM_SSL_CPPFLAGS)
+    linkflags     += $(PLATFORM_SSL_LDFLAGS)
+    pure_libs     += $(PLATFORM_SSL_LIBS)
   }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index 99cf8d75eec..e7d14465290 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: ipv6 {
+project: ipv6, vc8_warnings {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features
index 975a1baad49..5dffb075457 100644
--- a/ACE/bin/MakeProjectCreator/config/global.features
+++ b/ACE/bin/MakeProjectCreator/config/global.features
@@ -46,7 +46,7 @@ negotiate_codesets  = 0
 versioned_namespace = 0
 vcl           = 0
 stl           = 0
-
+xsc           = 0
 // Features for various GUI libraries
 
 // Some of features are switched on because they are also controlled
diff --git a/ACE/bin/MakeProjectCreator/config/ipv6.mpb b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
index 60ceabf96f0..60ceabf96f0 100755..100644
--- a/ACE/bin/MakeProjectCreator/config/ipv6.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
diff --git a/ACE/bin/MakeProjectCreator/config/ssl.mpb b/ACE/bin/MakeProjectCreator/config/ssl.mpb
index cd343b235a3..859fda7d3d4 100644
--- a/ACE/bin/MakeProjectCreator/config/ssl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ssl.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 // In the future, other ssl libraries could be supported
-// by creating a new xyzssl.mpb similar to openssl.mpb. 
+// by creating a new xyzssl.mpb similar to openssl.mpb.
 // You would then derive the following project from this base.
 project : acelib, ssl_full, ssl_for_tao, ace_openssl {
 
diff --git a/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
new file mode 100644
index 00000000000..46c2b0c65fe
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
@@ -0,0 +1,31 @@
+// -*- MPC -*-
+// $Id$
+
+// This file contains a number of optional features that disable VC8
+// warnings regarding various items that VC8 turned into warnings that were
+// not present in earlier versions. Some people may consider these superfluous
+// or have already checked code to be sure it causes no trouble. So these
+// warnings are disabled by default. To enable them, generate your projects
+// with the feature set to 0.
+
+
+feature(vc8_avoid_crt_secure_warnings) {
+  specific(vc8, nmake) {
+    macros += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE
+  }
+}
+
+feature(!vc8_scl_secure_warnings) {
+  specific(vc8, nmake) {
+    macros += _SCL_SECURE_NO_WARNINGS
+  }
+}
+
+feature(vc8_avoid_this_in_initializer_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4355
+  }
+  specific(nmake) {
+    compile_flags += /wd4355
+  }
+}
diff --git a/ACE/bin/MakeProjectCreator/config/vc8nmake.mpb b/ACE/bin/MakeProjectCreator/config/vc8nmake.mpb
index 562d73f7317..d6dfa6fbfd1 100644
--- a/ACE/bin/MakeProjectCreator/config/vc8nmake.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vc8nmake.mpb
@@ -3,7 +3,7 @@
 
 project {
   specific(nmake) {
-    compile_flags -= /EHs
+    compile_flags -= /EHsc
     compile_flags += /EHa
   }
 }
diff --git a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
new file mode 100644
index 00000000000..4fe86bd9ab8
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
@@ -0,0 +1,26 @@
+// Current as of 2/27/2007
+// This defines the role of all the template variables specific to the
+// 'gnuace' project type.
+//
+// Please try to keep this alphabetically sorted.
+//
+ciao = Indicates whether or not this project contains CIAO code.
+cidlc = The full path to the cidl compiler.
+cidlc_dep = The full path to the cidl compiler as a dependency.
+cidlc_flags = The default flags for the cidl compiler.
+dds = Indicates whether or not this project contains DDS code.
+idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name.
+install = This is a synonym for exeout.
+link_groups = This indicates that statically linked executable library names will be surrounded by -Wl,--start-group and -Wl,--end-group for the GNU compiler only.
+tao = Indicates whether or not this project contains TAO code.
+tao_idl = The full path to the idl compiler.
+tao_idl3_to_idl2 = The full path to the idl3 to idl2 compiler.
+tao_idl3_to_idl2_dep = The full path to the idl3 to idl2 compiler as a dependency.
+tao_idl_dep = The full path to the idl compiler as a dependency.
+tao_idlflags = The default flags for the idl compiler.
+targetoutdir = Specifies a location for all targets and intermediaries within the makefile.  It should always end in a slash.
+vpath = The value will be used as the VPATH setting within the makefile.
+xerceslib = The name of the Xerces library.
+xsc_bin = The full path of the XSC executable.
+xsc_dep = The full path of the XSC executable as a dependency.
+xsc_flags = The default flags to the XSC executable.
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index 9d0ae9eb366..47ef47cb3d2 100644
--- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -59,11 +59,17 @@ sub fill_value {
             (defined $libs && $libs =~ /tao/i));
   }
   elsif ($name eq 'ciao') {
-      my($incs) = $self->get_assignment('includes');
-      my($libs) = $self->get_assignment('libpaths');
+    my($incs) = $self->get_assignment('includes');
+    my($libs) = $self->get_assignment('libpaths');
     return ((defined $incs && $incs =~ /ciao/i) ||
             (defined $libs && $libs =~ /ciao/i));
   }
+  elsif ($name eq 'dds') {
+    my($incs) = $self->get_assignment('includes');
+    my($libs) = $self->get_assignment('libpaths');
+    return ((defined $incs && $incs =~ /dds/i) ||
+            (defined $libs && $libs =~ /dds/i));
+  }
 
   return undef;
 }
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index fbadaae83c3..45a8c37dcca 100644
--- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -29,6 +29,11 @@ my($base) = 'GNUmakefile';
 # Subroutine Section
 # ************************************************************
 
+sub targets {
+  return 'clean depend idl_stubs realclean';
+}
+
+
 sub generate_implicit_project_dependencies {
   #my($self) = shift;
   return 1;
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 75f07eadbf5..6af26002efe 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -93,6 +93,15 @@ CIDLC_DEP = <%cidlc_dep%>$(EXEEXT)
 <%if(cidlc_flags)%>
 CIDLC_FLAGS = <%cidlc_flags%>
 <%endif%>
+<%if(xsc_bin)%>
+XSC_BIN = <%xsc_bin%>
+<%endif%>
+<%if(xsc_dep)%>
+XSC_DEP = <%xsc_dep%>$(EXEEXT)
+<%endif%>
+<%if(xsc_flags)%>
+XSC_FLAGS = <%xsc_flags%>
+<%endif%>
 <%if(tao_idl3_to_idl2)%>
 TAO_IDL3_TO_IDL2 = <%tao_idl3_to_idl2%>
 <%endif%>
@@ -146,21 +155,22 @@ VSHDIR = <%targetoutdir%>.shobj/
 
 <%endif%>
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-## We don't need the ACELIB setting from wrapper_macros.GNU
-ACELIB =
+<%if(!dds && version)%>
+
+ifeq ($(versioned_so),1)
+  SOVERSION = .<%version%>
+endif # versioned_so
+
+<%endif%>
+<%if(dds)%>
+include $(DDS_ROOT)/rules.dds.GNU
+<%endif%>
 <%if(ciao)%>
 include $(CIAO_ROOT)/rules.ciao.GNU
 <%endif%>
 <%if(tao)%>
-tao_dont_use_idl_make_rule = 1
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
-<%if(version)%>
-
-ifeq ($(versioned_so),1)
-SOVERSION = .<%version%>
-endif
-<%endif%>
 
 <%if(resource_files)%>
 ifneq (,$(RC))
@@ -419,9 +429,9 @@ endif
 <%endfor%>
 <%if(libpaths)%>
 ifeq ($(VXWORKSLINK),true)
-LDLIBPATH     =<%foreach(libpaths)%> <%if(targetoutdir)%>-L<%libpath%>/<%targetoutdir%> <%endif%>-L<%libpath%><%endfor%>
+LDLIBPATH     =<%foreach(libpaths)%> <%if(targetoutdir)%>-L<%libpath%>/<%targetoutdir%> <%endif%>-L<%libpath%><%endfor%><%if(linkflags)%> <%linkflags%><%endif%>
 else
-LDFLAGS      +=<%foreach(libpaths)%> <%if(targetoutdir)%>-L<%libpath%>/<%targetoutdir%> <%endif%>-L<%libpath%><%endfor%>
+LDFLAGS      +=<%foreach(libpaths)%> <%if(targetoutdir)%>-L<%libpath%>/<%targetoutdir%> <%endif%>-L<%libpath%><%endfor%><%if(linkflags)%> <%linkflags%><%endif%>
 endif
 <%endif%>
 <%if(includes)%>
@@ -430,6 +440,9 @@ CPPFLAGS     +=<%foreach(includes)%> -I<%include%><%endfor%>
 <%if(macros)%>
 CPPFLAGS     +=<%foreach(macros)%> -D<%macro%><%endfor%>
 <%endif%>
+<%if(compile_flags)%>
+CPPFLAGS     += <%compile_flags%>
+<%endif%>
 <%if(dynamicflags)%>
 ifeq ($(shared_libs),1)
   ifneq ($(SHLIB),)
@@ -440,6 +453,11 @@ endif
 <%if(staticflags)%>
 ifeq ($(static_libs),1)
   CPPFLAGS +=<%foreach(staticflags)%> -D<%staticflag%><%endfor%>
+<%if(exename && link_groups)%>
+  ifeq ($(notdir $(CXX)), g++)
+    LDLIBS := -Wl,--start-group $(LDLIBS) -Wl,--end-group
+  endif
+<%endif%>
 endif
 <%endif%>
 
@@ -597,7 +615,7 @@ idl_stubs: $(ADDITIONAL_IDL_TARGETS)
 
 # This assignment forces make to run the idl_stubs
 # target before building any of the source files.
-FORCED_IDL_STUBS = <%source_files%>
+FORCED_IDL_STUBS = <%source_files%>  <%if(pch_source)%>$(ACE_PCH_SOURCE)<%endif%>
 <%foreach(custom_types)%>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->source_output_files)%>
diff --git a/ACE/bin/PerlACE/ProcessVX_Unix.pm b/ACE/bin/PerlACE/ProcessVX_Unix.pm
index 387813917b1..af87ae82b9f 100644
--- a/ACE/bin/PerlACE/ProcessVX_Unix.pm
+++ b/ACE/bin/PerlACE/ProcessVX_Unix.pm
@@ -262,7 +262,8 @@ sub Spawn ()
         @cmds[$cmdnr++] = 'C memShow()';
     }
 
-    @cmds[$cmdnr++] = $program . '.vxe ' . $self->{ARGUMENTS};
+    $cmdline = $program . '.vxe ' . $self->{ARGUMENTS};
+    @cmds[$cmdnr++] = $cmdline;
 
     FORK:
     {
diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index f23adc289fc..c616b0ca2b3 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -86,6 +86,10 @@ sub Executable
 
     my $executable = $self->{EXECUTABLE};
 
+    if (PerlACE::is_vxworks_test()) {
+        $executable = PerlACE::VX_HostFile ($executable);
+    }
+    
     if ($self->{IGNOREEXESUBDIR}) {
         return $executable;
     }
diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm
index 8138887c377..b540302bd11 100644
--- a/ACE/bin/PerlACE/Run_Test.pm
+++ b/ACE/bin/PerlACE/Run_Test.pm
@@ -18,6 +18,12 @@ if(exists $ENV{TAO_ROOT}) {
 } else {
     $PerlACE::TAO_ROOT = "$PerlACE::ACE_ROOT/TAO";
 }
+$PerlACE::CIAO_ROOT;
+if(exists $ENV{CIAO_ROOT}) {
+    $PerlACE::CIAO_ROOT = $ENV{CIAO_ROOT};
+} else {
+    $PerlACE::CIAO_ROOT = "$PerlACE::TAO_ROOT/CIAO";
+}
 
 my $config = new PerlACE::ConfigList;
 $PerlACE::VxWorks_Test = $config->check_config("VxWorks");
diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl
index 4f23f6f8bd1..61bff396987 100755
--- a/ACE/bin/auto_run_tests.pl
+++ b/ACE/bin/auto_run_tests.pl
@@ -75,10 +75,14 @@ push (@file_list, "$opt_l");
 }
 
 if (scalar(@file_list) == 0) {
-push (@file_list, "/bin/ace_tests.lst");
-push (@file_list, "/bin/tao_orb_tests.lst") if -d "$ACE_ROOT/TAO";
-push (@file_list, "/bin/tao_other_tests.lst") if -d "$ACE_ROOT/TAO";
-push (@file_list, "/bin/ciao_tests.lst") if -d "$ACE_ROOT/TAO/CIAO";
+    push (@file_list, "/bin/ace_tests.lst");
+    if (-d $TAO_ROOT || -d "$ACE_ROOT/TAO") {
+        push (@file_list, "/bin/tao_orb_tests.lst");
+        push (@file_list, "/bin/tao_other_tests.lst");
+    }
+    if (-d $CIAO_ROOT || -d "$ACE_ROOT/TAO/CIAO") {
+        push (@file_list, "/bin/ciao_tests.lst");
+    }
 }
 
 $startdir = getcwd();
@@ -122,10 +126,14 @@ foreach my $test_lst (@file_list) {
         if ($directory =~ m:^TAO/(.*):) {
           $directory = $1;
         }
+        if ($directory =~ m:^CIAO/(.*):) {
+          $directory = $1;
+        }
 
         $status = undef;
         foreach my $path ($ACE_ROOT."/$directory",
                           $TAO_ROOT."/$directory",
+                          $CIAO_ROOT."/$directory",
                           $startdir."/$directory",
                           $startdir."/$orig_dir") {
           if (-d $path && ($status = chdir ($path))) {
diff --git a/ACE/bin/ciao_tests.lst b/ACE/bin/ciao_tests.lst
index 062bf79a4c8..a1689628737 100644
--- a/ACE/bin/ciao_tests.lst
+++ b/ACE/bin/ciao_tests.lst
@@ -9,7 +9,7 @@
 #
 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/examples/Hello/descriptors_RTCCM/rt_run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO RT_CAPABLE
 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
diff --git a/ACE/bin/clean_sems.sh b/ACE/bin/clean_sems.sh
index 0409ce83960..b73793c7b62 100755
--- a/ACE/bin/clean_sems.sh
+++ b/ACE/bin/clean_sems.sh
@@ -15,7 +15,7 @@ fi
 
 case "$SYSTEM" in
   "Linux" )
-    ipcs -a | grep $USER | awk '{ print ($2) }' | xargs ipcrm sem;
+    ipcs -a | grep $USER | awk '{ print ($2) }' | xargs -r ipcrm sem;
     ;;
   * )
     semids=`$IPCS | grep "^s" | grep $USER | awk '{ print ($2) }'`
diff --git a/ACE/bin/diff-builds.pl b/ACE/bin/diff-builds.pl
index a2465fba94e..1add07303c0 100755
--- a/ACE/bin/diff-builds.pl
+++ b/ACE/bin/diff-builds.pl
@@ -261,7 +261,7 @@ if ($#builds == -1 && $#dates >= 0)
         $dates[1] = strftime ("%Y_%m_%d", gmtime);
     }
 
-    foreach $build (@builds) {
+    foreach $build (sort @builds) {
         $files[0] = $files[1] = $build;
         differentiate (\@files, \@dates);
     }
diff --git a/ACE/bin/doxygen-convert-h.pl b/ACE/bin/doxygen-convert-h.pl
index 3fcfc64abe0..48974bd2709 100755
--- a/ACE/bin/doxygen-convert-h.pl
+++ b/ACE/bin/doxygen-convert-h.pl
@@ -10,13 +10,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #   (Search for @todo in this script)
 
 use File::Copy;
+use FileHandle;
 use Getopt::Std;
 
 ##############################################################################
 # Parse the options
 
 if (!getopts ('dDhsu') || $opt_h) {
-    print "doxygen-convert-h.pl [-dDhsu] filename\n";
+    print "doxygen-convert-h.pl [-dDhsu] filenames or directories\n";
     print "\n";
     print "    -d         debug script\n";
     print "    -D         really verbose debug\n";
@@ -34,12 +35,46 @@ $opt_d = 1 if (defined $opt_D);
 
 @files = ();
 
+sub recursive_find {
+  my($file) = shift;
+  my(@rfiles) = ();
+  my($fh) = new FileHandle();
+
+  if (opendir($fh, $file)) {
+    foreach my $f (grep(!/^\.\.?$/, readdir($fh))) {
+      if ($f ne '.svn') {
+        my($full) = "$file/$f";
+        if (-d $full) {
+          push(@rfiles, recursive_find($full));
+        }
+        else {
+          push(@rfiles, $full)
+          if ($f =~ /\.(h|hxx|hpp|hh|inl|cpp|cxx|cc|c|C)$/)
+          ;
+        }
+      }
+    }
+    closedir($fh);
+  }
+
+  return @rfiles;
+}
+
 foreach $arg (@ARGV) {
     my @results = glob $arg;
     if ($#results < 0) {
         print STDERR "File not Found: $arg\n"
     }
-    push @files, @results;
+    else {
+        foreach my $result (@results) {
+            if (-d $result) {
+                push(@files, recursive_find($result));
+            }
+            else {
+                push(@files, $results);
+            }
+        }
+    }
 }
 
 ##############################################################################
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index a0e49ede380..f883e625804 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -6,6 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #   Fuzz is a script whose purpose is to check through ACE/TAO files for
 #   easy to spot (by a perl script, at least) problems.
 
+use Cwd;
 use File::Find;
 use File::Basename;
 use Getopt::Std;
@@ -14,14 +15,10 @@ use Getopt::Std;
 #
 # Add tests for these:
 #
-# - no relative path to tao_idl in the .dsp files
-# - Linking to wrong type of library in dsp's
 # - not setting up the release configs correctly in dsp files
 # - Guards in .h files
 # - no global functions
 # - other commit_check checks, tabs, trailing spaces.
-# - _narrow() should always have ACE_ENV_ARG_PARAMETER
-# - Using ACE_TRY_NEW_ENV (Nanbor suggests using ACE_DECLARE_NEW_CORBA_ENV)
 #
 # And others in ACE_Guidelines and Design Rules
 #
@@ -233,6 +230,10 @@ sub check_for_msc_ver_string ()
                     $found = 1;
                     $mscline = $.;
                 }
+                if ($disable == 0 and /\_MSC_VER \> 1200/) {
+                    $found = 1;
+                    $mscline = $.;
+                }
                 if ($disable == 0 and /\_MSC_VER \< 1300/) {
                     $found = 1;
                     $mscline = $.;
@@ -975,151 +976,6 @@ sub check_for_bad_ace_trace()
 }
 
 
-
-# This test checks missing ACE_ENV_ARG_PARAMETER when using
-# resolve_initial_references
-sub check_for_missing_rir_env ()
-{
-    print "Running resolve_initial_references() check\n";
-    foreach $file (@files_cpp, @files_inl) {
-        if (open (FILE, $file)) {
-            my $disable = 0;
-            my $native_try = 0;
-            my $in_rir = 0;
-            my $found_env = 0;
-
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                if (/FUZZ\: disable check_for_missing_rir_env/) {
-                    $disable = 1;
-                }
-                if (/FUZZ\: enable check_for_missing_rir_env/) {
-                    $disable = 0;
-                }
-                if ($disable == 0) {
-                    next if m/^\s*\/\//;
-
-                    if (m/^\s*try/) {
-                        $disable = 1;
-                        next;
-                    }
-
-                    if (m/[^\:]resolve_initial_references\s*\(/) {
-                        $found_env = 0;
-                        $in_rir = 1;
-                    }
-
-                    if (m/ACE_ENV_ARG_PARAMETER/) {
-                        $found_env = 1;
-                    }
-
-                    if ($in_rir == 1 && m/\;\s*$/) {
-                        $in_rir = 0;
-                        if ($found_env != 1) {
-                            print_error ("$file:$.: Missing ACE_ENV_ARG_PARAMETER in"
-                                         . " resolve_initial_references");
-                        }
-                        $found_env = 0;
-                    }
-
-                }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
-# This test checks for usage of ACE_CHECK/ACE_TRY_CHECK
-sub check_for_ace_check ()
-{
-    print "Running ACE_CHECK check\n";
-    foreach $file (@files_cpp, @files_inl) {
-        if (open (FILE, $file)) {
-            my $disable = 0;
-            my $in_func = 0;
-            my $in_return = 0;
-            my $in_ace_try = 0;
-            my $found_env = 0;
-
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                if (/FUZZ\: disable check_for_ace_check/) {
-                    $disable = 1;
-                }
-                if (/FUZZ\: enable check_for_ace_check/) {
-                    $disable = 0;
-                }
-
-                if (/FUZZ\: ignore check_for_ace_check/) {
-                    next;
-                }
-
-                next if m/^\s*\/\//;
-                next if m/^\s*$/;
-
-                if (m/ACE_TRY\s*$/ || m/ACE_TRY_EX/ || m/ACE_TRY\s*{/) {
-                  $in_ace_try = 1;
-                }
-                if (m/ACE_CATCH/) {
-                  $in_ace_try = 0;
-                }
-
-                if ($disable == 0) {
-                    if (m/\s*ACE_ENV_(SINGLE_)?ARG_PARAMETER[,\)]/) {
-                        $env_line = $.;
-                        if ($found_env) {
-                            print_error ("$file:$env_line: Missing ACE_CHECK/ACE_TRY_CHECK");
-                        }
-                        $found_env = 1;
-                        $in_func = 1;
-                    }
-
-                    if (m/^\s*return/) {
-                      $in_return = 1;
-                    }
-                    if ($in_return && m/;/) {
-                      $in_return = 0;
-                      $found_env = 0;
-                    }
-
-                    # ignore quoted ACE_ENV_ARG_PARAMETERS's
-                    if (m/^[^\"]*\"[^\"]*ACE_ENV_(SINGLE_)?ARG_PARAMETER[^\"]*\"[^\"]*$/) {
-                        $found_env = 0;
-                    }
-
-                    if (m/ACE_ENV_(SINGLE_)?ARG_PARAMETER.*ACE_ENV_(SINGLE_)?ARG_PARAMETER/) {
-                        print_error ("$file:$.: Multiple ACE_ENV_ARG_PARAMETER");
-                    }
-
-                    if (m/ACE_THROW/ && $in_ace_try) {
-                        print_error ("$file:$.: ACE_THROW/ACE_THROW_RETURN used inside of an ACE_TRY");
-                    }
-
-                    if ($in_func && m/\)/) {
-                      $in_func = 0;
-                    }
-                    elsif (!$in_func && $found_env) {
-                        if (m/ACE_CHECK/ && $in_ace_try) {
-                            print_error ("$file:$.: ACE_CHECK/ACE_CHECK_RETURN used inside of an ACE_TRY");
-                        }
-                        elsif (!m/_CHECK/ && !m/^\}/ && !$in_return) {
-                            print_error ("$file:$env_line: Missing ACE_CHECK/ACE_TRY_CHECK");
-                        }
-                        $found_env = 0;
-                    }
-                }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
 # This test checks for broken ChangeLog entries.
 sub check_for_changelog_errors ()
 {
@@ -1155,6 +1011,15 @@ sub check_for_changelog_errors ()
 
 sub check_for_deprecated_macros ()
 {
+    ## Take the current working directory and remove everything up to
+    ## ACE_wrappers (or ACE for the peer-style checkout).  This will be
+    ## used to determine when the use of ACE_THROW_SPEC is an error.
+    my($cwd) = getcwd();
+    if ($cwd =~ s/.*(ACE_wrappers)/$1/) {
+    }
+    elsif ($cwd =~ s/.*(ACE)/$1/) {
+    }
+
     print "Running deprecated macros check\n";
     foreach $file (@files_cpp, @files_inl, @files_h) {
         if (open (FILE, $file)) {
@@ -1165,6 +1030,12 @@ sub check_for_deprecated_macros ()
                 if (m/ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION\)/) {
                     print_error ("$file:$.: ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION found.");
                 }
+                elsif (/ACE_THROW_SPEC/) {
+                    ## Do not use ACE_THROW_SPEC in TAO or CIAO.
+                    if ($file =~ /TAO|CIAO/i || $cwd =~ /TAO|CIAO/i) {
+                        print_error ("$file:$.: ACE_THROW_SPEC found.");
+                    }
+                }
             }
             close (FILE);
         }
@@ -1405,8 +1276,6 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
            check_for_bad_run_test
            check_for_absolute_ace_wrappers
            check_for_bad_ace_trace
-           check_for_missing_rir_env
-           check_for_ace_check
            check_for_changelog_errors
            check_for_ptr_arith_t
            check_for_include
@@ -1465,8 +1334,6 @@ check_for_mismatched_filename () if ($opt_l >= 2);
 check_for_bad_run_test () if ($opt_l >= 6);
 check_for_absolute_ace_wrappers () if ($opt_l >= 3);
 check_for_bad_ace_trace () if ($opt_l >= 4);
-check_for_missing_rir_env () if ($opt_l >= 6);
-check_for_ace_check () if ($opt_l >= 6);
 check_for_changelog_errors () if ($opt_l >= 4);
 check_for_ptr_arith_t () if ($opt_l >= 4);
 check_for_include () if ($opt_l >= 5);
diff --git a/ACE/bin/indent_macros.perl b/ACE/bin/indent_macros.pl
index 3429d746dba..3429d746dba 100755
--- a/ACE/bin/indent_macros.perl
+++ b/ACE/bin/indent_macros.pl
diff --git a/ACE/bin/make_release b/ACE/bin/make_release
deleted file mode 100755
index 0077bb83598..00000000000
--- a/ACE/bin/make_release
+++ /dev/null
@@ -1,938 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# Creates an ACE or TAO kit.
-#
-# 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.
-
-use strict;
-require Cwd;
-
-my $usage="usage: $0 [-?] [-i] [-k <kit>] [-n] [-v <version>] " .
-    "[-ta <ACE tag>] [-tt <TAO tag>] [-tc <CIAO tag>] " .
-    "[-u]\n";
-my $long_usage="   -? option prints this message\n" .
-    "   -i to install to public web server directory\n" .
-    "   -k <kit>, where <kit> is ace, tao, ciao or ace+tao+ciao \n" .
-    "   -n option prints what would be done, but doesn't do it\n" .
-    "   -v <version>, where <version> is major, minor, or beta (default)\n" .
-    "   -t Specifies the tag from which to pull components during release." .
-    " Uses working copy for exports if not present." .
-    "   -u to update versions\n" .
-    "   -r to specify alternate repository root\n" .
-    "   -d to specify destination for generated packages\n";
-
-########
-######## Sanity checks.
-########
-$ENV{'SIGNATURE'} ||
-    die "$0: must set your SIGNATURE environment variable\n";
-
-$ENV{'MAILID'} ||
-    die "$0: must set your MAILID environment variable\n";
-
-
-my $which_host = $ENV{'OSTYPE'};
-
-my $release_host = substr ($which_host, 0, 5);
-
-# ## We are not going to use any Sun boxes for the release anymore..
-
-$release_host = `uname`;
-chomp ($release_host);
-if (! ($release_host  eq 'Linux')){
-    die "$0: You are on the wrong OS ($release_host). Please move to a linux box.\n";
-}
-
-# my  $perl_path = `which perl`;
-
-# &can_run($perl_path.' -V') ||
-#     die "$0: perl path is incorrect, please fix the script\n";
-
-my $hostname;
-chomp ($hostname = $ENV{'HOSTNAME'}  ||  `uname -n`);
-unless ("$hostname" eq 'anduril.dre.vanderbilt.edu') {
-#### For efficiency sake . . .
-    die "$0: must run on host anduril\n";
-}
-
-$ENV{'DOC_ROOT'} ||
-    die "$0: must set your DOC_ROOT environment variable\n";
-my $doc_root = $ENV{'DOC_ROOT'};
-my $ace_root = "$doc_root/ACE";
-my $tao_root = "$doc_root/TAO";
-my $ciao_root = "$doc_root/CIAO";
-
-########
-######## Configuration parameters.
-########
-my $gnu = '/bin';
-
-####### Add the path to /bin unconditionally..
-
-$ENV{'PATH'} = "$gnu" . ':' . $ENV{'PATH'};
-
-my $gnu2 = '/usr/local/bin:/usr/bin';
-
-####### Add the path to /usr/bin unconditionally..
-$ENV{'PATH'} = "$gnu2" . ':' . $ENV{'PATH'};
-
-my $repo_root = 'https://svn.dre.vanderbilt.edu/DOC';
-my $export_dir = '/export/doc/latest';
-my $old_versions_dir = '/export/doc/previous-versions';
-my $diffs_dir = "$export_dir/diffs";
-my $exec_prefix = '';
-my $install = 0;
-my $kit = '';
-my $release_type = 'beta';
-my $kit_tag = '';
-my $controlled_files = my $release_files = my $release_lib_files = '';
-my $release_tag_files = my $release_autoconf_files = '';
-my $release_filter = '-iname build -prune -o ' .
-    '! -name \'.\#*\' ! -name \'\#*\' ! -name \'*~\' ' .
-    '! -name \'*.MAK\' ! -name \'.cvsignore\' -print';
-my $update_versions = 0;
-my $create_zips = 1;
-my $package_dest = "/export/anduriltmp/bczar/packages";
-########
-######## Process command line args.
-########
-while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
-    if ($ARGV[0] eq '-i') {
-        $install = 1;
-    } elsif ($ARGV[0] eq '-k') {
-        if ($ARGV[1] =~ /^[^-]+/  &&
-            ($ARGV[1] eq 'ace' || $ARGV[1] eq 'tao' || $ARGV[1] eq 'ciao' || $ARGV[1] eq 'ace+tao' || $ARGV[1] eq 'ace+tao+ciao')) {
-            $kit = $ARGV[1]; shift;
-        } else {
-            print STDERR "$0:  must provide argument for -k option\n";
-            die "$usage$long_usage";
-        }
-    } elsif ($ARGV[0] eq '-n') {
-        $exec_prefix = 'echo ';
-    } elsif ($ARGV[0] eq '-v') {
-        if ($ARGV[1] =~ /^[^-]+/  &&
-            ($ARGV[1] eq 'major' || $ARGV[1] eq 'minor' ||
-             $ARGV[1] eq 'beta')) {
-            $release_type = $ARGV[1]; shift;
-        } else {
-            print STDERR "$0:  must provide argument for -v option\n";
-            die "$usage$long_usage";
-        }
-    } elsif ($ARGV[0] eq '-t') {
-        if ($ARGV[1] =~ /^[^-]+/) {
-            $kit_tag = $ARGV[1]; shift;
-        } else {
-            print STDERR "$0:  must provide argument for -t option\n";
-            die "$usage$long_usage";
-        }
-    } elsif ($ARGV[0] eq '-u') {
-        $update_versions = 1;
-    } elsif ($ARGV[0] eq '-r') {
-        if ($ARGV[1] =~ /^[^-]+/) {
-            $repo_root = $ARGV[1];
-        }
-    } elsif ($ARGV[0] eq '-?') {
-        print "$usage$long_usage";
-        exit;
-    } elsif ($ARGV[0] eq '-d') {
-        $package_dest = $ARGV[1]; shift;
-    } else {
-        print STDERR "$0:  unknown option $ARGV[0]\n";
-        die "$usage$long_usage";
-    }
-    shift;
-
-}
-
-my $KIT;
-
-if ($kit eq 'ace') {
-    $KIT = 'ACE';
-} elsif ($kit eq 'tao') {
-    $KIT = 'TAO';
-} elsif ($kit eq 'ciao') {
-    $KIT = 'CIAO';
-} else {
-    #### Creating combined ACE+TAO kit.  Don't use $KIT.
-};
-
-sub which {
-    my $command = shift;
-
-    my $cmd = `which $command`;
-    chomp ($cmd);
-    return $cmd;
-}
-
-my $chmod = which ("chmod");
-# All of them had gnu suffixes. Removed them..
-my $chgrp = which ("chgrp");
-my $chmod = which ("chmod");
-my $cpio = which ("cpio");
-# my $cvs = 'cvs';
-my $svn = which ("svn");
-my $date = which ("date");
-my $egrep = which ("egrep");
-my $find = which ("find");
-my $gzip = which ("gzip");
-my $bzip2 = which ("bzip2");
-my $make = which ("make") . " -f Release -s";
-my $regmake = which ("make") . ' -s';
-my $mv = which ("mv") . ' -f';
-my $rm = which ("rm") . ' -f';
-my $cp = which ("cp") . ' -f';
-my $md5sum = which ("md5sum");
-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'}>";
-
-# unless ("$controlled_files") {
-#     chomp ($controlled_files = `$make show_controlled_files`);
-# }
-
-# unless ("$release_files") {
-#     chomp ($release_files = `$make show_release_files`);
-# }
-
-# unless ("$release_lib_files") {
-#     chomp ($release_lib_files = `$make show_release_lib_files`);
-# }
-
-# unless ("$release_tag_files") {
-#     chomp ($release_tag_files = `$make show_release_tag_files`);
-# }
-
-#####
-##### Preparation for the release
-#####
-&ex ("$touch  $export_dir/DON")  &&
-    die "$0: Write failures in $export_dir, access problems..\n";
-
-&ex ("$touch  $old_versions_dir/DON")  &&
-    die "$0: Write failures in $old_versions_dir, access problems..\n";
-
-my $ace_root = "$ENV{'DOC_ROOT'}/ACE";
-
-&ex ("$touch  $ace_root/MPC/DON")  &&
-    die "$0: Read/Write failures in $ace_root/MPC/, access problems..\n";
-
-&ex ("$rm -r  $ace_root/MPC/DON")  &&
-    die "$0: Delete failures in $ace_root/MPC \n";
-
-&ex ("$rm -r $export_dir/DON $export_dir/*.gz $export_dir/*.zip $export_dir/*.bz2")  &&
-    die "$0: failed to remove files in $export_dir\n";
-
-&ex ("$rm -r $old_versions_dir/DON")  &&
-    die "$0: failed to remove file in $old_versions_dir\n";
-
-########
-######## Setup signal handlers.
-########
-my $status = 1;  #### Must get set to 0 explicitly to indicate success.
-$SIG{'HUP'} = $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'TERM'} = 'cleanup';
-
-
-########
-######## Defend against fascist umasks.
-########
-umask 022;
-
-
-my %comp_versions = ();
-my $previous_version = my $version = '';
-my $ace_version = '';
-my $tao_version = '';
-my $ciao_version = '';
-
-########
-######## Main execution thread.
-########
-if ($update_versions) {
-    #### Update versions and tag, but don't create the kit.
-
-    $status = &check_workspace () ||
-	&get_and_update_versions () ||
-        &tag ();
-
-    if ($status != 0) {
-	print "Exited with an error!\n";
-    }
-} else {
-    # Sanity check
-    die "$0: must specify a -k option\n" unless "$kit";
-
-    #### Create the kit.
-
-    #### If a tag was specified, export using the tag from a staging area.
-    #### If not, create a kit from the current directory.
-    my $stage_dir = "../ACE_wrappers_stage-$$";
-    unless ("$exec_prefix") {
-	mkdir "$stage_dir", 0755  ||
-	    die "$0: unable to mkdir $stage_dir\n";
-    }
-
-    # Root for all tags.
-    if ($kit =~ /ace/) {
-	if ("$kit_tag") {
-	    # Export ACE
-	    &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/ACE $stage_dir/ACE_wrappers") &&
-		die "$0: failed cvs export of $kit_tag in $stage_dir\n";
-	    # Export MPC
-	    &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") &&
-		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") &&
-		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") &&
-		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";
-    }
-
-    print "Creating kits with build files\n";
-    $status = &create_kit ();
-
-    if ("$kit_tag") {
-        if ($install) {
-            chdir "../";
-            &ex ("$rm -r $stage_dir")  &&
-                warn "$0: failed to remove $stage_dir\n";
-        } else {
-            warn "$0: kits are in $stage_dir\n";
-        }
-    }
-}
-&cleanup;
-
-
-########
-######## Clean up when done or on signal.
-########
-sub cleanup {
-    exit $status;
-}
-
-
-########
-######## Check that the workspace is up-to-date, if releasing from
-######## the official release directory.
-########
-sub check_workspace () {
-    my $module;
-    my @out_of_date = ();
-
-    # Update the workspace
-    &ex ("$svn -q update > /dev/null") &&
-        die "$0: failed svn update failed.  Note this script assumes you have\n" .
-	"Middleware/trunk as the CWD.\n";
-    &ex ("$svn -q update $ace_root/MPC  > /dev/null") &&
-        die "$0: failed svn update of ACE_ROOT/MPC. Note this script assumes you have\n" .
-	"MPC/trunk checked out as ACE_ROOT/MPC.\n";
-
-    if ("$exec_prefix") {
-	print "$svn status $module\n";
-    } else {
-	open (SVNSTATUS, "$svn status $module 2>&1 |")  ||
-	    die "$0: unable to open $svn for status\n";
-	while (<SVNSTATUS>) {
-	    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;
-    }
-
-    if (@out_of_date) {
-        warn "ERROR: workspace must be updated (with cvs -q up -d) or " .
-            "cleaned:\n  " .
-            join ("\n  ", @out_of_date) . "\n";
-        return 1;
-    }
-
-    0;
-}
-
-sub get_and_update_versions () {
-    # Update the version numbers for the various components.
-    my $retval =
-	get_version ("ACE", 1) ||
-	update_version_files ("ACE") ||
-	update_changelog ("ACE") ||
-	get_version ("TAO", 1) ||
-	update_version_files ("TAO") ||
-	update_changelog ("TAO") ||
-	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;
-}
-
-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>) {
-        if (/version (\d+)\.(\d+)\.(\d+)/o) {
-            $comp_versions{"$component" . "_major"} = $1;
-            $comp_versions{"$component" . "_minor"} = $2;
-            $comp_versions{"$component" . "_beta"} = $3;
-            last;
-        } elsif (/version (\d+)\.(\d+)[^\.]/o) {
-            #### Previous release was a minor.
-            $comp_versions{"$component" . "_major"} = $1;
-            $comp_versions{"$component" . "_minor"} = $2;
-            $comp_versions{"$component" . "_beta"} = 0;
-            last;
-        } elsif (/version (\d+)[^\.]/o) {
-            #### Previous release was a major.
-            $comp_versions{"$component" . "_major"} = $1;
-            $comp_versions{"$component" . "_minor"} = 0;
-            $comp_versions{"$component" . "_beta"} = 0;
-            last;
-        }
-    }
-    close VERSION;
-
-    if ($update_version) {
-        # Increment the version count
-        if ($release_type eq 'beta') {
-            ++$comp_versions{"$component" . "_beta"};
-        } elsif ($release_type eq 'minor' ) {
-            $comp_versions{"$component" . "_beta"} = 0;
-            ++$comp_versions{"$component" . "_minor"};
-        } elsif ($release_type eq 'major' ) {
-            $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"} . '.' .
-	    $comp_versions{"$component" . "_minor"}. '.' .
-	    $comp_versions{"$component" . "_beta"};
-    } elsif ($release_type eq 'minor' ) {
-	$comp_versions{"$component" . "_version"} =
-	    $comp_versions{"$component" . "_major"} . '.' .
-	    $comp_versions{"$component" . "_minor"};
-    }
-
-    return 0;
-}
-
-
-########
-######## Update VERSION file(s).
-########
-sub update_version_files {
-    my $component = shift;
-    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 {
-            open (VERSION_H, "> " . lc ($component) . "/Version.h")  ||
-                die "$0: unable to open ". lc ($component) . "/Version.h\n";
-
-            print VERSION_H
-                "// -*- C++ -*-\n" .
-                "// \$Id\$\n\n" .
-                "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" .
-                "\#define " . $component . "_MAJOR_VERSION " . $comp_versions{$component . "_major"} . "\n" .
-                "\#define " . $component . "_MINOR_VERSION " . $comp_versions{$component . "_minor"} . " \n" .
-                "\#define " . $component . "_BETA_VERSION " . $comp_versions{$component . "_beta"} . " \n" .
-                "\#define " . $component . "_VERSION \" " . $comp_versions{$component . "_version"} . "\"\n";
-
-            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");
-        return 1 if $? >> 8;
-
-        &ex ("perl -pi -e 's/ACE VERSION :.*/ACE VERSION : " .
-	     $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"} .
-	     "/' PROBLEM-REPORT-FORM");
-        return 1 if $? >> 8;
-
-
-	chdir "../";
-    }
-
-    if ($component eq "ACE") {
-
-	&ex ("perl -pi -e 's/$component VERSION:.*/$component VERSION: $comp_version/' " .
-	     "PROBLEM-REPORT-FORM");
-	return 1 if $? >> 8;
-
-	chdir "../";
-    }
-
-    0;
-}
-
-########
-######## Add ChangeLog entries, and make sure that they have proper
-######## permissions.
-########
-sub update_changelog {
-    my $component = shift;
-    print "Updating changelog for $component\n";
-
-    my $message = "$log_line\n\n" .
-        "        * $component version " .
-	$comp_versions{"$component" . "_version"} .
-	" released.\n\n";
-
-    chdir $component  ||  die "$0: unable to chdir $component\n";
-
-    if ("$exec_prefix") {
-        print "Adding to ChangeLog: \n", $message, "\n";
-	chdir "../";
-        return 0;
-    }
-    open (NEW_CHANGELOG, ">ChangeLog.bak")
-        || return 1;
-    open (CHANGELOG, "ChangeLog")
-        || return 1;
-    print NEW_CHANGELOG $message;
-    while (<CHANGELOG>) {
-        print NEW_CHANGELOG $_;
-    }
-    close (CHANGELOG)
-        || return 1;
-    close (NEW_CHANGELOG)
-        || return 1;
-    rename "ChangeLog.bak", "ChangeLog"
-        || return 1;
-
-    chdir "../";
-
-    0;
-}
-
-########
-######## Tag the release.
-########
-sub tag () {
-    my $tag = "ACE+TAO+CIAO-" . $comp_versions{"ACE_version"};
-    #### cvs tag does not allow dots.
-    $tag =~ tr/./_/;
-
-    print "start tagging $tag\n";
-
-    #Tag the MPC repository
-    &ex ("$svn copy $repo_root/MPC/trunk $repo_root/MPC/tags/$tag -m \"Tagging for release\"");
-
-    #Make sure the tag directory exists
-#    &ex ("$svn mkdir $repo_root/Middleware/tags/$tag -m \"Tagging for release\"");
-    &ex ("$svn copy $repo_root/Middleware/trunk $repo_root/Middleware/tags/$tag -m \"Tagging for release\"");
-
-    return 1 if $? >> 8;
-    print "finished tagging $tag\n";
-
-    0;
-}
-
-########
-######## Generate GNUmakefiles and workspace/project files.
-########
-sub generate_makefiles () {
-
-    # The current ACE_ROOT setting is where this script started from, not
-    # the staging area we want to generate files in. So, we need to
-    # specifically set the -relative option on mwc to replace ACE_ROOT
-    # correctly in generated files.
-    #
-    # Need todo a common chmod on the file lists!
-    my $here = Cwd::getcwd();
-
-    print "My current wok in generate makefiles $here \n";
-    my $exclude_option = '-exclude TAO/TAO_*.mwc,TAO/CIAO/CIAO_*.mwc';
-    my $tmp_mpc_option =
-        '-recurse -hierarchy -relative ACE_ROOT=';
-
-    my $mpc_option = $tmp_mpc_option.$here.'/ACE_wrappers';
-
-    my $tmp_static_option =
-        '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAO_*.mwc ';
-
-    my $static_option = $tmp_static_option.$mpc_option;
-
-    # Visual Studio 2005 (aka VC8) uses the same file suffixes as VC7.1, so
-    # append _vc8 to the names.
-    my $vc8_option = '-name_modifier *_vc8';
-
-    # Additionally, VC8 can do Windows CE builds and these can be
-    # configured in. However, the CE builds have uses_wchar turned on,
-    # so we don't mix them with the Win32 VC8 files. The complete list of
-    # available platforms known at this point is in
-    # $MPC_ROOT/template/vc8_platforms.mpt - since the default is Win32
-    # and we're generating only CE builds, replace it instead of adding to it.
-    my $tmp_ce = '-value_template platforms=\'"Pocket PC 2003 (ARMV4)"\'';
-    $tmp_ce = $tmp_ce.' -value_template platforms+=\'"Smartphone 2003 (ARMV4)"\'';
-    $tmp_ce = $tmp_ce.' -value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\'';
-    $tmp_ce = $tmp_ce.' -value_template platforms+=\'"Windows Mobile 5.0 Smartphone SDK (ARMV4I)"\'';
-    my $ce_option = '-name_modifier *_WinCE -features "uses_wchar=1,wince=1" '.$tmp_ce;
-
-    &ex ("cd ACE_wrappers; \
-          bin/mwc.pl -type gnuace $exclude_option $mpc_option; \
-          find ./ -name 'GNUmake*' | /usr/bin/xargs chmod 0644");
-
-    &ex ("cd ACE_wrappers; \
-          bin/mwc.pl -type vc8 $mpc_option $vc8_option; \
-          bin/mwc.pl -type vc8 $mpc_option $exclude_option $ce_option; \
-          bin/mwc.pl -type vc71 $mpc_option; \
-          bin/mwc.pl -type borland  $mpc_option $exclude_option; \
-          bin/mwc.pl -type vc71 $static_option; \
-          find ./ -name '*.bor' | /usr/bin/xargs chmod 0644;\
-	  find ./ -name '*.vcproj' | /usr/bin/xargs chmod 0644;\
-	  find ./ -name '*.sln' | /usr/bin/xargs chmod 0644");
-}
-
-sub generate_em3 () {
-
-    my $here = Cwd::getcwd();
-
-    &ex ("cd ACE_wrappers; \
-        bin/mwc.pl -type em3 -exclude TAO -recurse -hierarchy -relative ACE_ROOT=$here/ACE_wrappers;\
-        find ./ -name '*.vc[p,w]' | /usr/bin/xargs chmod 0644");
-}
-
-########
-######## Bootstrap autotool support
-########
-sub bootstrap_autotools () {
-    # Autotool (i.e. GNU autoconf, automake and libtool) support is
-    # currently only available in ACE.  As such, only bootstrap autotool
-    # support into the ACE-only distribution to avoid potential
-    # confusion for TAO and CIAO users.  For example, they may wonder
-    # why TAO and CIAO are not configured when ACE's configure script is
-    # run.
-    if ($kit =~ /^ace/) {
-        &ex ("cd ACE_wrappers && bin/bootstrap");
-    }
-}
-
-########
-######## Create the tar file(s) and move to their proper location.
-########
-sub create_kit {
-    my $src_only = shift;
-
-    get_version ("ACE_wrappers", 0);
-
-    # Get version but don't update version count
-    (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g;
-
-    my $suffix = "";
-
-    if ($src_only) {
-	$suffix = "-src";
-    }
-
-    print `pwd`;
-
-    #### Create kits with group write permission.
-    umask 002;
-
-    my $dest = $install  ?  "$export_dir"  :  'created';
-    my $dispose = $install  ?  "$mv"  :  'echo';
-    my $checksum = "$md5sum";
-    my $cksum_ext = 'md5';
-    my $redirect = $install  ?  '>'  :  '\>';
-    my $shell_cd = $install  ?  'cd'  :  'echo cd';
-
-    # These files don't get LF->CRLF conversions done when making the zip.
-    my $bin_files =
-        "\"\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" .
-        "\\.sxd|\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\|\\.png\|\\.vsd\|\\.bz2\"";
-
-    my $build_command;
-    my $archives;
-
-    my $base_release_files = $release_files;
-
-    if ($kit eq 'ace+tao+ciao') {
-        # Create a list of files that needs to be packed with CIAO
-        # including ACE+TAO.
-        my $tmp_rel_file = '';
-        chomp ($tmp_rel_file = `$regmake -f $tao_root/Release show_release_files`);
-        $release_files .= ' ';
-        $release_files .= $tmp_rel_file;
-        $tmp_rel_file = '';
-        $release_files .= ' ';
-        chomp ($tmp_rel_file = `$regmake -f $ciao_root/Release show_release_files`);
-        $release_files .= $tmp_rel_file;
-
-        print "RELEASE FILES from CIAO are $release_files \n";
-
-        $build_command =
-            "$rm $package_dest/ACE+TAO+CIAO$suffix.zip; " .
-            "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE+TAO+CIAO$suffix.zip -q9@ &&" .
-            "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE+TAO+CIAO$suffix.zip -qlg9@ &&" .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE+TAO+CIAO$suffix.tar.gz && " .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$chmod 664 $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$chgrp doc $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$dispose $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 $dest &&" .
-            "$cp $dest/ACE+TAO+CIAO$suffix.zip $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.zip &&".
-            "$cp $dest/ACE+TAO+CIAO$suffix.tar.gz $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.gz &&".
-            "$cp $dest/ACE+TAO+CIAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.bz2; ";
-        $archives = " $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 ";
-    }
-
-    # First dispose of ACE+TAO+CIAO.
-    my $checksum_command =
-        "$shell_cd $dest; " .
-        "for p in $archives; do " .
-        "$rm \${p}.${cksum_ext}; " .
-        "$checksum \$p $redirect \${p}.${cksum_ext}; " .
-        "done";
-
-    &ex ($build_command);
-    &ex ($checksum_command);
-
-    if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') {
-        # Set the release 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`);
-        $release_files = $base_release_files;
-        $release_files .= ' ';
-        $release_files .= $tmp_rel_file;
-
-        print "RELEASE FILES for TAO are $release_files \n";
-
-        $build_command =
-            "$rm $package_dest/ACE+TAO$suffix.zip; " .
-            "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE+TAO$suffix.zip -q9@ &&" .
-            "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE+TAO$suffix.zip -qlg9@ &&" .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE+TAO$suffix.tar.gz && " .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$chmod 664 $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$chgrp doc $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$dispose $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 $dest &&" .
-            "$cp $dest/ACE+TAO$suffix.zip $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.zip &&".
-            "$cp $dest/ACE+TAO$suffix.tar.gz $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.gz &&".
-            "$cp $dest/ACE+TAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.bz2; ";
-        $archives = " $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 ";
-    }
-
-    # Dispose of ACE+TAO now
-    $checksum_command =
-        "$shell_cd $dest; " .
-        "for p in $archives; do " .
-        "$rm \${p}.${cksum_ext}; " .
-        "$checksum \$p $redirect \${p}.${cksum_ext}; " .
-        "done";
-
-    &ex ($build_command);
-    &ex ($checksum_command);
-
-    if ($kit eq 'ace'  ||  $kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') {
-	if ($src_only == 0) {
-	    print "Generating em3 files\n";
-	    $status = &generate_em3 ();
-
-	    if ($status != 0) {
-		die "$0: failed to generate em3 files\n";
-	    }
-	}
-
-
-        # Reset it again with autoconf files
-        chomp ($release_files = `$regmake -f $ace_root/Release show_release_files`);
-
-        $build_command =
-            "$rm $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip; " .
-            "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE$suffix.zip -q9@ &&" .
-            "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE$suffix.zip -qlg9@ &&" .
-            "$find $release_lib_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE$suffix-lib.zip -q9@ &&" .
-            "$find $release_lib_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE$suffix-lib.zip -qlg9@ &&" .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE$suffix.tar.gz && " .
-            "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE$suffix.tar.bz2 && " .
-            "$find $release_lib_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE$suffix-lib.tar.gz && " .
-            "$find $release_lib_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE$suffix-lib.tar.bz2 && " .
-            "$chmod 664 $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 ".
-            "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " .
-            "$chgrp doc $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 ".
-            "$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;";
-        $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 ";
-    }
-
-    # Now dispose of ACE in all its glory
-    $checksum_command =
-        "$shell_cd $dest; " .
-        "for p in $archives; do " .
-        "$rm \${p}.${cksum_ext}; " .
-        "$checksum \$p $redirect \${p}.${cksum_ext}; " .
-        "done";
-
-    &ex ($build_command);
-    &ex ($checksum_command);
-}
-
-
-
-########
-######## Execute a command, unless -n had been specified.  Return value
-######## of 0 indicates success.
-########
-sub ex ()
-{
-    my ($command) = @_;
-
-    if ("$exec_prefix") {
-        print $command . "\n";
-        0;
-    } else {
-	print "Executing $command \n";
-        system ("$command");
-    }
-}
-
-########
-######## Verify that a command can be executed, return 1 on sucess
-########
-sub can_run {
-    my $command = shift;
-
-    open (RUN, "$command 2>&1 |")
-        || return 0;
-    while (<RUN>) {}
-    close(RUN)
-        || return 0;
-    return 1;
-}
-
-
-# Local Variables:
-# mode:Perl
-# End:
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
new file mode 100755
index 00000000000..2817df864e4
--- /dev/null
+++ b/ACE/bin/make_release.py
@@ -0,0 +1,755 @@
+#!/usr/local/bin/python2.5
+
+# @file make_release.py
+# @author William R. Otte <wotte@dre.vanderbilt.edu>
+#
+# Packaging script for ACE/TAO/CIAO
+
+from __future__ import with_statement
+from time import strftime
+import pysvn
+import re
+
+##################################################
+#### Global variables
+##################################################
+""" Options from the command line """
+opts=None
+
+""" Arguments from the command line """
+args=None
+
+""" Absolute path from the SVN workspace to be used for the
+release"""
+doc_root=None
+
+""" Full name of person performing release, obtained from the
+environment"""
+signature=None
+
+""" Full email address of person performing release. """
+mailid = None
+
+""" A dict containing version information used for the release.
+This dict contains entries of the form
+COMPONENT_version
+COMPONENT_beta
+COMPONENT_minor
+COMPONENT_major """
+comp_versions = dict ()
+
+release_date = strftime (# ie: Mon Jan 23 00:35:37 CST 2006
+                              "%a %b %d %H:%M:%S %Z %Y")
+
+# Packaging configuration
+
+""" This is a regex that detects files that SHOULD NOT have line endings
+converted to CRLF when being put into a ZIP file """
+bin_regex = re.compile ("\.(mak|mdp|ide|exe|ico|gz|zip|xls|sxd|gif|vcp|vcproj|vcw|sln|dfm|jpg|png|vsd|bz2)$")
+
+
+##################################################
+#### SVN Client Hooks
+##################################################
+svn_auth_info = None
+def svn_login_callback (realm, username, may_save):
+    """ Callback used by the SVN library to obtain login credentials"""
+    global svn_auth_info
+    if svn_auth_info is None:
+        print "Please enter your Subversion login credentials.  They will be saved for the duration of this script."
+        username = raw_input ("Username: ")
+        password = raw_input ("Password: ")
+
+        svn_auth_info = (True, username, password, False)
+
+    return svn_autn_info
+
+def svn_log_message_callback ():
+    """ Callback used by the svn library to generate log messages
+    for operations such as copy """
+    return (True, "ChangeLogTag:%s  %s  <%s>" % (release_date, signature, mailid))
+
+svn_client = pysvn.Client ()
+svn_client.callback_get_login = svn_login_callback
+svn_client.callback_get_log_message = svn_log_message_callback
+
+##################################################
+#### Utility Methods
+##################################################
+def parse_args ():
+    from optparse import OptionParser
+
+    parser = OptionParser ("usage %prog [options]")
+
+    parser.add_option ("--major", dest="release_type", action="store_const",
+                       help="Create a major release.", default=None, const="major")
+    parser.add_option ("--minor", dest="release_type", action="store_const",
+                       help="Create a minor release.", default=None, const="minor")
+    parser.add_option ("--beta", dest="release_type", action="store_const",
+                       help="Create a beta release.", default=None, const="beta")
+
+
+    parser.add_option ("--tag", dest="action", action="store_const",
+                       help="Tag the release. DO NOT USE WITH --kit", default=None, const="tag")
+    parser.add_option ("--update", dest="update", action="store_true",
+                       help="Update the version numbers, only used with --tag", default=False)
+
+
+    parser.add_option ("--kit", dest="action", action="store_const",
+                       help="Create kits. DO NOT USE WITH --tag", default=None, const="kit")
+    parser.add_option ("--dest", dest="package_dir", action="store",
+                       help="Specify destination for the created packages.", default=None)
+    
+    parser.add_option ("--root", dest="repo_root", action="store",
+                       help="Specify an alternate repository root",
+                       default="https://svn.dre.vanderbilt.edu/DOC/")
+
+    parser.add_option ("-n", dest="take_action", action="store_false",
+                       help="Take no action", default=True)
+    parser.add_option ("--verbose", dest="verbose", action="store_true",
+                       help="Print out actions as they are being performed",
+                       default=False)
+    parser.add_option ("--override-host", dest="override_host", action="store_true",
+                       help="Override the default release host.  Not reccomended", default=False)
+    (options, arguments) = parser.parse_args ()
+    
+    if options.action is None:
+        parser.error ("Must specify an action, ie --tag or --kit")
+
+    if options.action == "tag":
+        if options.release_type is None:
+            parser.error ("When tagging, must specify a release type")
+
+        if options.update is False:
+            print "Warning: You are tagging a release, but not requesting a version increment"
+    
+    return (options, arguments)
+
+
+def ex (command):
+    from os import system
+    global opts
+    vprint ("Executing " + command)
+
+    if not opts.take_action:
+        print "Executing " + command
+        return
+    
+    status = system(command)
+    if status != 0:
+        print "ERROR: Nonzero retrun value from " + command
+        raise Exception
+    
+###
+# Checks that the users environment is sane.
+#
+def check_environment ():
+    from os import getenv
+
+    global doc_root, signature, mailid, opts
+
+    doc_root = getenv ("DOC_ROOT")
+    if (doc_root is None):
+        print "ERROR: Environment DOC_ROOT must be defined."
+        return False
+
+    signature = getenv ("SIGNATURE")
+    if (signature is None):
+        print "ERROR: Must define SIGNATURE environment variable to your full name, used in changelogs."
+        return False
+
+    mailid = getenv ("MAILID")
+    if (mailid is None):
+        print "ERROR: Must define MAILID environment to your email address for changelogs."
+        return False
+        
+    from socket import gethostname
+
+    if ((not opts.override_host) and gethostname () != "anduril.dre.vanderbilt.edu"):
+        print "ERROR: Must run script on anduril.dre.vanderbilt.edu"
+        return False
+
+    return True
+
+def vprint (string):
+    """ Prints the supplied message if verbose is enabled"""
+    global opts
+
+    if opts.verbose:
+        print string
+
+##################################################
+#### Tagging methods
+##################################################
+def commit (files):
+    """ Commits the supplied list of files to the repository. """
+    vprint ("Committing the following files: " + " ".join (files))
+
+    rev = svn_client.checkin (files,
+                              "ChangeLogTag:%s  %s  <%s>" % (release_date, signature, mailid))
+
+    print "Checked in files, resuling in revision ", rev.number
+
+def check_workspace ():
+    """ Checks that the DOC and MPC repositories are up to date.  """
+    global opts, doc_root, svn_client
+    # @@TODO: Replace with a svn library
+    try:
+        rev = svn_client.update (doc_root)
+        print "Successfully updated ACE/TAO/CIAO working copy to revision "
+    except:
+        print "Unable to update ACE/TAO/CIAO workspace at " + doc_root
+        raise
+
+    try:
+        rev = svn_client.update (doc_root + "ACE/MPC")
+        print "Successfully updated MPC working copy to revision "
+    except:
+        print "Unable to update the MPC workspace at " + doc_root + "/MPC"
+        raise
+
+def update_version_files (component):
+    """ Updates the version files for a given component.  This includes
+    Version.h, the PRF, and the VERSION file."""
+    
+    global comp_versions, opts, release_date
+
+    vprint ("Updating version files for " + component)
+        
+    import re
+
+    retval = list ()
+    
+    ## Update component/VERSION
+    with open (component + "/VERSION", "r+") as version_file:
+        new_version = re.sub (component + " version .*",
+                              "%s version %s, released %s" % (component,
+                                                              comp_versions[component + "_version"],
+                                                              release_date),
+                              version_file.read ())
+        if opts.take_action:
+            version_file.seek (0)
+            version_file.truncate (0)
+            version_file.write (new_version)
+        else:
+            print "New version file for " + component
+            print new_version
+
+        vprint ("Updating Version.h for " + component)
+    
+    retval += [component + "/VERSION"]
+    
+    ## Update component/component/Version.h
+    version_header = """
+// -*- C++ -*-
+// $Id$
+// This is file was automatically generated by \$ACE_ROOT/bin/make_release.
+
+#define %s_MAJOR_VERSION %s
+#define %s_MINOR_VERSION %s
+#define %s_BETA_VERSION %s
+#define %s_VERSION \"%s\"
+""" % (component, comp_versions[component + "_major"],
+       component, comp_versions[component + "_minor"],
+       component, comp_versions[component + "_beta"],
+       component, comp_versions[component + "_version"])
+    
+    if opts.take_action:
+        with open (component + '/' + component.lower () + "/Version.h", 'r+') as version_h:
+            version_h.write (version_header)
+    else:
+        print "New Version.h for " + component
+        print version_header
+
+    retval += [component + '/' + component.lower () + "/Version.h"]
+    
+    # Update component/PROBLEM-REPORT-FORM
+    vprint ("Updating PRF for " + component)
+    
+    version_string = re.compile ("^\s*(\w+) +VERSION ?:")
+    
+    with open (component + "/PROBLEM-REPORT-FORM", 'r+') as prf:
+        new_prf = ""
+        for line in prf.readlines ():
+            match = None
+            match = version_string.search (line)
+            if match is not None:
+                vprint ("Found PRF Version for " + match.group (1))
+                line = re.sub ("(\d\.)+\d?",
+                               comp_versions[match.group(1) + "_version"],
+                               line)
+
+            new_prf += line
+            
+        if opts.take_action:
+            prf.seek (0)
+            prf.truncate (0)
+            prf.writelines (new_prf)
+        else:
+            print "New PRF for " + component
+            print "".join (new_prf)
+
+    retval += [component + "/PROBLEM-REPORT-FORM"]
+    return retval
+                
+    
+def get_and_update_versions ():
+    """ Gets current version information for each component,
+    updates the version files, creates changelog entries,
+    and commit the changes into the repository."""
+    
+    try:
+        get_comp_versions ("ACE") 
+        get_comp_versions ("TAO") 
+        get_comp_versions ("CIAO")
+
+        files = list ()
+        files += update_version_files ("ACE") 
+        files += update_version_files ("TAO") 
+        files += update_version_files ("CIAO") 
+        files += create_changelog ("ACE") 
+        files += create_changelog ("TAO") 
+        files += create_changelog ("CIAO")
+        
+        commit (files)
+    except:
+        print "Fatal error in get_and_update_versions."
+        raise
+    
+def create_changelog (component):
+    """ Creates a changelog entry for the supplied component that includes
+    the version number being released"""
+    vprint ("Creating ChangeLog entry for " + component)
+    
+    global comp_versions, opts
+
+    # generate our changelog entry
+    changelog_entry = """
+%s  %s  <%s>
+
+\t* %s version %d.%d.%d released.
+
+""" % (release_date, signature, mailid,
+       component,
+       comp_versions[component + "_major"],
+       comp_versions[component + "_minor"],
+       comp_versions[component + "_beta"])
+
+    vprint ("Changelog Entry for " + component + "\n" + changelog_entry)
+    
+    with open ("%s/ChangeLog" % (component), 'r+') as changelog:
+        changelog_entry += changelog.read ()
+
+        if opts.take_action:
+            changelog.seek (0)
+            changelog.truncate (0)
+            changelog.write (changelog_entry)
+    
+    return ["%s/ChangeLog" % (component)]
+    
+def get_comp_versions (component):
+    """ Extracts the current version number from the VERSION
+    file and increments it appropriately for the release type
+    requested."""
+    vprint ("Detecting current version for" + component)
+        
+    import re
+
+    global comp_versions, opts
+    
+    beta = re.compile ("version (\d+)\.(\d+)\.(\d+)")
+    minor = re.compile ("version (\d+)\.(\d+)[^\.]")
+    major = re.compile ("version (\d+)[^\.]")
+
+    with open (component + "/VERSION") as version_file:
+        for line in version_file:
+            match = None
+
+            match = beta.search (line)
+            if match is not None:
+                vprint ("Detected beta version %s.%s.%s" %
+                           (match.group (1), match.group (2), match.group (3)))
+
+                comp_versions[component + "_major"] = int (match.group (1))
+                comp_versions[component + "_minor"] = int (match.group (2))
+                comp_versions[component + "_beta"] = int (match.group (3))
+                break
+
+            match = minor.search (line)
+            if match is not None:
+                vprint ("Detected minor version %s.%s" %
+                            (match.group (1), match.group (2)))
+                    
+                comp_versions[component + "_major"] = int (match.group (1))
+                comp_versions[component + "_minor"] = int (match.group (2))
+                comp_versions[component + "_beta"] = 0
+                break
+
+            match = major.search (line)
+            if match is not None:
+                vprint ("Detected major version " + match.group (1) + ".0")
+
+                comp_versions[component + "_major"] = int (match.group (1))
+                comp_versions[component + "_minor"] = 0
+                comp_versions[component + "_beta"] = 0
+                break
+
+            print "FATAL ERROR: Unable to locate current version for " + component
+            raise Exception
+        
+    if opts.update:
+        if opts.release_type == "major":
+            comp_versions[component + "_major"] += 1
+            comp_versions[component + "_minor"] = 0
+            comp_versions[component + "_beta"] = 0
+        elif opts.release_type == "minor":
+            comp_versions[component + "_minor"] += 1
+            comp_versions[component + "_beta"] = 0
+        elif opts.release_type == "beta":
+            comp_versions[component + "_beta"] += 1
+
+    if opts.release_type == "beta":
+        comp_versions [component + "_version"] = \
+                      str (comp_versions[component + "_major"])  + '.' + \
+                      str (comp_versions[component + "_minor"])  + '.' + \
+                      str (comp_versions[component + "_beta"])
+    else:
+        comp_versions [component + "_version"] = \
+                      str (comp_versions[component + "_major"])  + '.' + \
+                      str (comp_versions[component + "_minor"])
+
+
+def tag ():
+    """ Tags the DOC and MPC repositories for the version """
+    global comp_versions, opts
+
+    branch = "ACE+TAO+CIAO-%d_%d_%d" % (comp_versions["ACE_major"],
+                                        comp_versions["ACE_minor"],
+                                        comp_versions["ACE_beta"])
+    # Tag middleware
+    svn_client.copy (opts.repo_root + "/Middleware/trunk",
+                     opts.repo_root + "/Middleware/tags/" + branch)
+
+    # Tag MPC
+    svn_client.copy (opts.repo_root + "/MPC/trunk",
+                     opts.repo_root + "/MPC/tags/" + branch)
+
+##################################################
+#### Packaging methods
+##################################################
+def export_wc (stage_dir):
+
+    global doc_root
+    
+    # Export our working copy
+    print ("Exporting ACE")    
+    svn_client.export (doc_root + "/ACE",
+                       stage_dir + "/ACE_wrappers")
+
+    print ("Exporting MPC")
+    svn_client.export (doc_root + "/ACE/MPC",
+                       stage_dir + "/ACE_wrappers/MPC")
+
+    print ("Exporting TAO")
+    svn_client.export (doc_root + "/TAO",
+                       stage_dir + "/ACE_wrappers/TAO")
+
+    print ("Exporting CIAO")
+    svn_client.export (doc_root + "/CIAO",
+                       stage_dir + "/ACE_wrappers/TAO/CIAO")
+
+
+def update_packages (text_files, bin_files, stage_dir, package_dir):
+    import os
+
+    print "Updating packages...."
+    os.chdir (stage_dir)
+
+    # -g appends, -q for quiet operation
+    zip_base_args = " -gqu "
+    # -l causes line ending conversion for windows
+    zip_text_args = " -l "
+    zip_file = stage_dir + "/zip-archive.zip"
+
+    # -r appends, -f specifies file.
+    tar_args = "-uf "
+    tar_file = stage_dir + "/tar-archive.tar"
+
+    # Zip binary files
+    print "\tAdding binary files to zip...."
+    instream, outstream = os.popen2 ("xargs zip " + zip_base_args + zip_file)
+
+    instream.write (bin_files)
+
+    instream.close ()
+    outstream.close ()
+
+    # Need to wait for zip process spawned by popen2 to complete
+    # before proceeding.
+    os.wait ()
+    
+    print "\tAdding text files to zip....."
+    instream, outstream = os.popen2 ("xargs zip " + zip_base_args + zip_text_args + zip_file)
+
+    instream.write (text_files)
+
+    instream.close ()
+    outstream.close ()
+
+    # Need to wait for zip process spawned by popen2 to complete
+    # before proceeding.
+    os.wait ()
+    
+    # Tar files
+    print "\tAdding to tar file...."
+    instream, outstream = os.popen2 ("xargs tar " + tar_args + tar_file)
+
+    instream.write (' ' + bin_files + ' ' + text_files)
+
+    instream.close ()
+    outstream.close ()
+
+    os.wait ()
+    
+def move_packages (name, stage_dir, package_dir):
+    """ Copies the temporary files from the stage_dir to the package_dir.
+        Renames them to name.tar and name.zip, respectively, and compresses
+        the tarfile with gzip and bzip2. """
+    import shutil, os
+    from os.path import join
+
+    print "Storing packages for ", name
+    
+    # Take care of the zip file
+    print "\tZip file..."
+    target_file = join (package_dir, name + ".zip")
+    shutil.copy (join (stage_dir, "zip-archive.zip"),
+                 target_file)
+    ex ("md5sum " + target_file + " > " + target_file + ".md5")
+
+
+    tar_file = join (stage_dir, "tar-archive.tar")
+    target_file = join (package_dir, name + ".tar")
+
+    # bzip
+    print "\tBzip2 file....."
+    shutil.copy (tar_file,
+                 target_file)
+    ex ("bzip2 " + target_file)
+    ex ("md5sum " + target_file + " > " + target_file + "bz2.md5")
+
+    print "\tgzip file....."
+    shutil.copy (tar_file,
+                 target_file)
+    ex ("gzip " + target_file)
+    ex ("md5sum " + target_file + " > " + target_file + "gz.md5")
+    
+def create_file_lists (base_dir, prefix, exclude):
+    """ Creates two lists of files:  files that need CR->CRLF
+    conversions (useful for zip files) and those that don't,
+    excluding filies/directories found in exclude. """
+    import os
+    
+    text_files = list ()
+    bin_files = list ()
+
+    for root, dirs, files in os.walk (base_dir):
+        relroot = root.replace (base_dir, "")
+        if len(relroot) and relroot[0] == '/':
+            relroot = relroot [1:]
+            
+        # Remove dirs from our exclude pattern
+        for item in dirs:
+            # Remove our excludes
+            if (item) in exclude:
+                dirs.remove (item)
+                
+        for item in files:
+            
+            fullitem = os.path.join (relroot, item)
+            if fullitem in exclude:
+                pass
+
+            if bin_regex.search (fullitem) is not None:
+                bin_files.append (os.path.join (prefix, fullitem))
+            else:
+                text_files.append (os.path.join (prefix, fullitem))
+
+    return (text_files, bin_files)
+
+def package (stage_dir, package_dir, decorator):
+    """ Packages ACE, ACE+TAO, and ACE+TAO+CIAO releases of current
+        staged tree, with decorator appended to the name of the archive. """
+    from os.path import join
+    from os import remove
+
+    # Erase our old temp files
+    try:
+        remove (join (stage_dir, "zip-archive.zip"))
+        remove (join (stage_dir, "tar-archive.tar"))
+    except:
+        pass # swallow any errors
+    
+    text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers"),
+                                               "ACE_wrappers", ["TAO", "autom4te.cache"])
+
+    update_packages ("\n".join (text_files),
+                     "\n".join (bin_files),
+                     stage_dir,
+                     package_dir)
+
+
+    move_packages ("ACE" + decorator, stage_dir, package_dir)
+    
+    # for TAO:
+    text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers/TAO"),
+                                                     "ACE_wrappers/TAO", ["CIAO", "autom4te.cache"])
+
+    update_packages ("\n".join (text_files),
+                     "\n".join (bin_files),
+                     stage_dir,
+                     package_dir)
+
+    move_packages ("ACE+TAO" + decorator, stage_dir, package_dir)
+
+    # for CIAO:
+    text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers/TAO/CIAO"),
+                                                     "ACE_wrappers/TAO/CIAO", "")
+
+    update_packages ("\n".join (text_files),
+                     "\n".join (bin_files),
+                     stage_dir,
+                     package_dir)
+
+    move_packages ("ACE+TAO+CIAO" + decorator, stage_dir, package_dir)
+
+def generate_workspaces (stage_dir):
+    """ Generates workspaces in the given stage_dir """
+    print "Generating workspaces..."
+    global opts
+    import os
+
+    # Make sure we are in the right directory...
+    os.chdir (os.path.join (stage_dir, "ACE_wrappers"))
+
+    # Set up our environment
+    os.putenv ("ACE_ROOT", os.path.join (stage_dir, "ACE_wrappers"))
+    os.putenv ("MPC_ROOT", os.path.join (stage_dir, "ACE_wrappers", "MPC"))
+    os.putenv ("TAO_ROOT", os.path.join (stage_dir, "ACE_wrappers", "TAO"))
+    os.putenv ("CIAO_ROOT", os.path.join (stage_dir, "ACE_wrappers", "TAO", "CIAO"))
+
+    # Create option strings
+    mpc_command = os.path.join (stage_dir, "ACE_wrappers", "bin", "mwc.pl")
+    exclude_option = ' -exclude TAO/TAO_*.mwc,TAO/CIAO/CIAO_*.mwc '
+    mpc_option = ' -recurse -hierarchy -relative ACE_ROOT=' + stage_dir + '/ACE_wrappers '
+    mpc_option += ' -relative TAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO '
+    mpc_option += ' -relative CIAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO '
+    
+    static_option = ' -static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAO_*.mwc '
+    static_option += mpc_option
+
+    vc8_option = ' -name_modifier *_vc8 '
+
+    # Build option string for VC8 platforms
+    ce_option = ' -name_modifier *_WinCE -features "uses_wchar=1,wince=1" '
+    ce_option += ' -value_template platforms=\'"Pocket PC 2003 (ARMV4)"\' '
+    ce_option += ' -value_template platforms+=\'"Smartphone 2003 (ARMV4)"\' '
+    ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\' '
+    ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Smartphone SDK (ARMV4I)"\' '
+
+    redirect_option = str ()
+    if not opts.verbose:
+        redirect_option = " >> ../mpc.log 2>&1"
+        
+    # Generate GNUmakefiles
+    print "\tGenerating GNUmakefiles...."
+    ex (mpc_command + " -type gnuace " + exclude_option + mpc_option + redirect_option)
+
+    print "\tGenerating VC8 solutions..."
+    ex (mpc_command + " -type vc8 " + mpc_option + vc8_option + redirect_option)
+
+    print "\tGenerating VC8 Windows CE solutions..."
+    ex (mpc_command + " -type vc8 " + mpc_option + exclude_option + ce_option + redirect_option) 
+
+    print "\tGenerating VC71 solutions..."
+    ex (mpc_command + " -type vc71 " + mpc_option + redirect_option)
+
+    print "\tGenerating Borland makefiles"
+    ex (mpc_command + " -type borland " + mpc_option + exclude_option + redirect_option)
+
+    print "\tGenerating VC71 Static solutions"
+    ex (mpc_command + " -type vc71 " + static_option + redirect_option)
+
+    print "\tBootstrapping autotools support"
+    ex ("bin/bootstrap " + redirect_option)
+    
+    print "\tCorrecting permissions for all generated files..."
+    ex ("find ./ -name '*.vc[p,w]' -or -name '*.bor' -or -name '*.vcproj' -or -name '*.sln' -or -name 'GNUmake*' | xargs chmod 0644")
+    
+def create_kit ():
+    """ Creates kits """
+    import os
+    from os.path import join
+    # Get version numbers for this working copy, note this will
+    # not update the numbers.
+    print "Getting current version information...."
+    
+    get_comp_versions ("ACE")
+    get_comp_versions ("TAO")
+    get_comp_versions ("CIAO")
+
+    print "Creating working directories...."
+    stage_dir, package_dir = make_working_directories ()
+
+    print "Exporting working copy..."
+    export_wc (stage_dir)
+
+    ### make source only packages
+    package (stage_dir, package_dir, "-src")
+
+    generate_workspaces (stage_dir)
+
+    ### create standard packages.
+    package (stage_dir, package_dir, "")
+    
+def make_working_directories ():
+    """ Creates directories that we will be working in.
+    In particular, we will have DOC_ROOT/stage-PID and
+    DOC_ROOT/packages-PID """
+    global doc_root
+    import os.path, os
+
+    stage_dir = os.path.join (doc_root, "stage-" + str (os.getpid ()))
+    package_dir = os.path.join (doc_root, "package-" + str (os.getpid ()))
+
+    os.mkdir (stage_dir)
+    os.mkdir (package_dir)
+
+    return (stage_dir, package_dir)
+
+def main ():
+    global opts
+
+    if opts.action == "tag":
+        print "Tagging a " + opts.release_type + " release."
+        raw_input ("Press enter to continue")
+
+        check_workspace ()
+        get_and_update_versions ()
+        tag ()
+            
+    else:
+        print "Creating a kit."
+        raw_input ("Press enter to continue")
+
+        create_kit ()
+
+        
+
+if __name__ == "__main__":
+    (opts, args) = parse_args ()
+
+    if check_environment() is not True:
+        exit (1)
+    
+    main ()
diff --git a/ACE/bin/sets-manager.py b/ACE/bin/sets-manager.py
index 78056cac9f8..2806efe1c82 100755
--- a/ACE/bin/sets-manager.py
+++ b/ACE/bin/sets-manager.py
@@ -83,14 +83,43 @@ def svn_mkdir_local (path):
                         path])
     execute (command)
 
+def get_head_revision (url):
+    command = " ".join ([opts.svn,
+                         "info",
+                         url])
+
+    import re
+    lineregex = re.compile ("Last Changed Rev: (\d+)")
+    
+    for line in os.popen (command).readlines ():
+        match = lineregex.match (line)
+        if (match is not None):
+            return int(match.group (1))
+
+    print "ERROR: Unable to find current MPC head revision"
+    raise Exception
+
 def branch_ACE ():
     # Perform branching
     destination = opts.repo + opts.dest
     svn_copy (opts.repo + opts.source + "/ACE",
               destination + "modules/ACE")
+
+    # pin MPC revision
+    # Need local copy of the ACE directory to to the propset
+#    execute ("svn up -N " + opts.repo + path + "/modules/ACE sets_manager_temp/module_ACE")
+    execute ("svn up -N sets_manager_temp/modules/ACE")
+    mpc_rev = get_head_revision ("svn://svn.dre.vanderbilt.edu/DOC/MPC/trunk")
+    
+    svn_propset ("sets_manager_temp/modules/ACE",
+                 "svn:externals",
+                 "%s\t-r %d %s" % ("MPC",
+                                   mpc_rev,
+                                   "svn://svn.dre.vanderbilt.edu/DOC/MPC/trunk"))
+    
     #Create the set
-    svn_mkdir_local ("sets/ACE")
-    svn_propset ("sets/ACE",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE")
+    svn_propset ("sets_manager_temp/sets/ACE",
                  "svn:externals",
                  "%s\t%s" % ("ACE_wrappers",
                              destination + "modules/ACE"))
@@ -104,8 +133,8 @@ def branch_TAO ():
               destination + "modules/TAO")
 
     #Create the set
-    svn_mkdir_local ("sets/ACE+TAO")
-    svn_propset ("sets/ACE+TAO",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE+TAO")
+    svn_propset ("sets_manager_temp/sets/ACE+TAO",
                  "svn:externals",
                  "%s\t%s\n%s\t%s" % ("ACE_wrappers",
                                      destination + "modules/ACE",
@@ -121,8 +150,8 @@ def branch_CIAO ():
               destination + "modules/CIAO")
 
     # Create the set
-    svn_mkdir_local ("sets/ACE+TAO+CIAO")
-    svn_propset ("sets/ACE+TAO+CIAO",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE+TAO+CIAO")
+    svn_propset ("sets_manager_temp/sets/ACE+TAO+CIAO",
                  "svn:externals",
                  "%s\t%s\n%s\t%s\n%s\t%s" %
                  ("ACE_wrappers",
@@ -147,14 +176,15 @@ def main (opts, args):
     # Make branch/tag directory
     svn_mkdir (opts.repo + path)
 
+    execute ("svn co " + opts.repo + path + " sets_manager_temp")
+    
     # Make modules and sets subdirectory
-    svn_mkdir (opts.repo + path + "/modules")
-    svn_mkdir (opts.repo + path + "/sets")
-
-    # We need a local copy of the sets directory, as svn:externals
-    # can only be modified locally
-    execute ("svn co " + opts.repo + path + "/sets")
-
+    svn_mkdir_local ("sets_manager_temp/modules")
+    svn_mkdir_local ("sets_manager_temp/sets")
+    
+    # commit the new directories
+    execute ('svn commit -m "branching/tagging" sets_manager_temp')
+    
     # opts.dest should now be set to path, all of the branching
     # functions assume dest now points to the branch/tag in which
     # the copies should be places
@@ -165,10 +195,10 @@ def main (opts, args):
      'ciao': branch_CIAO}[opts.project] ()
 
     # Commit the sets directory
-    execute ('svn commit -m "branching/tagging" sets')
+    execute ('svn commit -m "branching/tagging" sets_manager_temp')
 
     # remove the sets directory
-    for root, dirs, files in os.walk ('sets', False):
+    for root, dirs, files in os.walk ('sets_manager_temp', False):
         for name in files:
             os.remove (os.path.join (root, name))
         for name in dirs:
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index 1428facae20..d76437f9711 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -25,6 +25,7 @@ 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/CORBA_e_Implicit_Activation/run_test.pl: CORBA_E_COMPACT
 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
@@ -77,6 +78,10 @@ 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_2683_Regression/run_test.pl:
+TAO/tests/Bug_2792_Regression/run_test.pl:
+TAO/tests/Bug_2795_Regression/run_test.pl:
+TAO/tests/Bug_2809_Regression/run_test.pl:
+TAO/tests/Bug_2826_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 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
@@ -111,6 +116,7 @@ TAO/tests/OBV/ValueBox/run_test.pl:
 TAO/tests/OBV/Truncatable/run_test.pl:
 TAO/tests/OBV/Simple/run_test.pl:
 TAO/tests/Hello/run_test.pl:
+TAO/tests/LongDouble/run_test.pl:
 TAO/tests/IPV6/run_test.pl: IPV6
 TAO/tests/AlternateIIOP/run_test.pl:
 TAO/tests/Optimized_Connection/run_test.pl: !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
@@ -152,6 +158,7 @@ TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !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_1592_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 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/Deactivate_Object/run_test.pl
@@ -160,6 +167,7 @@ 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/DiffServ/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 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
@@ -176,7 +184,10 @@ 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/DSI_AMI_Gateway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/DSI_AMH/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/DynUnion_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 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
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index 4b9d8a0be31..bbf106c554e 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -65,7 +65,7 @@ TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !
 TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !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/orbsvcs/tests/Bug_1334_Regression/run_test.pl: !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl: !ACE_FOR_TAO !CORBA_E_MICRO
 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
@@ -81,11 +81,11 @@ TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CO
 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/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.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !CORBA_E_MICRO
 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/unit/Trading/Interpreter/run_test.pl: !CORBA_E_MICRO
 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
@@ -139,9 +139,10 @@ TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM
 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
-TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 #HANGS TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane
 #HANGS'TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir
+TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
@@ -158,8 +159,12 @@ TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !CORBA_E_C
 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/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/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
+TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
+TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 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/Bug_2800_Regression/run_test.pl: !ST !CORBA_E_MICRO
+TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: !ST !CORBA_E_MICRO
+TAO/orbsvcs/examples/Notify/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 6124926e816..4af06cefeb0 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -3443,6 +3443,8 @@ esac
 
 ACE_CHECK_LACKS_FUNCS(access)
 
+ACE_CHECK_LACKS_FUNCS(alphasort)
+
 ACE_CHECK_LACKS_FUNCS(asctime)
 
 ACE_CHECK_LACKS_FUNCS(asctime_r)
diff --git a/ACE/docs/ACE-FMM.html b/ACE/docs/ACE-FMM.html
index 0430b7b9a7d..7ab2aaeb40d 100644
--- a/ACE/docs/ACE-FMM.html
+++ b/ACE/docs/ACE-FMM.html
@@ -241,6 +241,53 @@ int MyHandler::handle_close (ACE_HANDLE handle,
 </td>
 <tr><td colspan=2><hr noshade></td></tr>
 
+<tr>
+<td align=right valign=top>
+	<b>symptom</b>
+</td>
+<td align=left valign=top>
+  Application crashes after deleting Event_Handler.
+</td>
+</tr>
+<tr>
+<td align=right valign=top>
+	<b>probable cause</b>
+</td>
+<td align=left valign=top>
+  You left a dangling pointer to the Event_Handler in the Reactor.
+  It is the application's responsibility to remove all pending notifications,
+  timer events and completely remove the event handler I/O registrations
+  before removing the event handler.
+
+  Also, the application should remove the event handler from the reactor
+  <b>before</b> closing the underlying file descriptor / handle.
+  Otherwise:
+  <ul>
+  <li>The reactor does not know how to remove the event handler, because the
+  handle is used as the identifier for the event handlers</li>
+  <li>The file descriptor / handle may be reused by another thread, leading to
+  nasty race conditions.</li>
+  </ul>
+</td>
+</tr>
+<tr>
+<td align=right valign=top>
+	<b>solution</b>
+  <ul>
+    <li>Use reference counted event handlers.  The reactor and the application
+      cooperate to remove the event handler when the last reference goes away.
+    </li>
+    <li>Remember to call <tt>purge_pending_notifications()</tt>,
+     <tt>remove_handler()</tt> and <tt>cancel_timer()</tt> before deleting the
+  event handler.
+    </li>
+  </ul>
+</td>
+<td align=left valign=top>
+
+</td>
+<tr><td colspan=2><hr noshade></td></tr>
+
 <!--
 
 <tr>
diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html
index 1494c0e97da..0333f81aade 100644
--- a/ACE/docs/ACE-bug-process.html
+++ b/ACE/docs/ACE-bug-process.html
@@ -26,7 +26,7 @@ traffic immediately.  Prompt bug fixes from the DOC group also
 discourage the creation of a larger community of <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-members.html">users</A> and
 <A
-HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.htlm">commercial
+HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">commercial
 support companies</A> who have deep knowledge of how ACE, TAO, and
 CIAO work and can help provide bug fixes and new features. <P>
 
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index f54c5f76707..c4c226c279e 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -569,11 +569,11 @@ Foo::bar ()
     <li>Mutators and accessors should be of this form:<p>
 
         <pre>
+        /// Sets @c object_addr_ cache from @c host and @c port.
         void object_addr (const ACE_INET_Addr &);
-        // Sets &lt;object_addr_&gt; cache from &lt;host&gt; and &lt;port&gt;.
 
+        /// Returns the ACE_INET_Addr for this profile.
         const ACE_INET_Addr &object_addr const (void);
-        // Returns the &lt;ACE_INET_Addr&gt; for this profile.
         </pre><p>
 
         instead of the "set_" and "get_" form.<p>
diff --git a/ACE/docs/CVS.html b/ACE/docs/CVS.html
deleted file mode 100644
index b986f9dec0a..00000000000
--- a/ACE/docs/CVS.html
+++ /dev/null
@@ -1,889 +0,0 @@
-<!-- $Id$ -->
-
-<html>
-<head>
-  <title>CVS Minimal Help</title>
-  <link rev=made href="mailto:levine@cs.wustl.edu">
-<!-- Changed by: David Levine, 26-Mar-1997 -->
-</head>
-
-<body text    = "#000000"
-      link    = "#000fff"
-      vlink   = "#ff0f0f"
-      bgcolor = "#ffffff">
-<hr><p>
-<center>
-  <h1>CVS Minimal Help</h1>
-  <h2><a href="mailto:levine@cs.wustl.edu">David L. Levine</a></h2>
-  <font size=-1>
-    Last modified Monday, 30-Sep-2002 11:15:16 CDT.
-  </font>
-</center>
-<h2>&nbsp</h2>
-
-This page contains the minimum (and then some) commands necessary to
-access and update <a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</a>
-through <a href="file:/project/doc/pkg/cvs/cvs-1.10/doc/cvs.ps">CVS</a>
-version control.  The intended audience is local ACE developers, so
-it's not by any means a general introduction to CVS.  And some HTML
-links and other references are local only.<p>
-
-The information here is based on CVS versions 1.9 and 1.10.5 and later.<p>
-
-Notes to emacs users: the emacs Tools/Version Control (or vc) pulldown
-has CVS commands:  it's well worth checking out.  And, see the
-<a href="#Preliminaries">Preliminaries</a> section for a handy
-addition to your .emacs file.<p>
-
-If you'd like to update your CVS workspace remotely, see
-<a href="http://www.cs.wustl.edu/~nanbor/">Nanbor Wang</a>'s&nbsp&nbsp
-<a href="http://www.cs.wustl.edu/~nanbor/CVSUP/">CVSup</a>&nbsp page.<p>
-
-Please <a href="mailto:levine@cs.wustl.edu">email me</a> any corrections or
-suggestions!<p>
-
-
-<font size="+2"><strong>Contents:</strong></font>
-<ol>
-  <li><a href="#The Model">The Model</a>
-  <li><a href="#Preliminaries">Preliminaries</a>
-  <li><a href="#Getting started with ACE on CVS">Getting
-    started with ACE on CVS</a>
-  <li><a href="#Windows NT setup">Windows NT setup</a>
-  <li><a href="#Checking in changes">Checking in changes</a>
-  <li><a href="#Workspace update">Workspace update</a>
-  <li><a href="#Adding/removing files/directories">Adding/removing
-    files/directories</a>
-  <li><a href="#Modules">Modules</a>
-  <li><a href="#ChangeLog updates">ChangeLog updates</a>
-  <li><a href="#File revisions">File revisions</a>
-  <li><a href="#File reversion">File reversion</a>
-  <li><a href="#Renaming a file">Renaming a file</a>
-  <li><a href="#Local version control">Local version control</a>
-  <li><a href="#Branches">Branches</a>
-  <li><a href="#Remote repositories">Remote repositories</a>
-  <li><a href="#Exporting from CVS">Exporting from CVS</a>
-  <li><a href="#ACE_wrappers-frozen workspace">ACE_wrappers-frozen
-         workspace</a>
-  <li><a href="#ACE release bug-fix branch">ACE release bug-fix branch</a>
-  <li><a href="#Warning messages/problems">Warning messages/problems</a>
-  <li><a href="#For more info on CVS">For more info on CVS</a>
-</ol>
-
-
-<hr><p>
-<h3>1. <a name="The Model">The Model</a></h3>
-The following terms are used in the discussion in this web page:<br>
-<ul>
-  <li><em>Repository</em>: The master store of all versions of all
-    controlled files.<p>
-  <li><em>Workspace</em>: A user's collection of controlled files.
-    The user may modify these files at will.<p>
-  <li><em>Check out</em>: Retrieve one or more files from the
-    repository, and place them in a workspace.  Any version of any
-    file may be retrieved; typically, that will be the latest version.<p>
-  <li><em>Check in, or commit</em>: Update the latest version of
-    one or more files in the repository.  This is done from a workspace.<p>
-  <li><em>Module</em>: Directory.
-</ul>
-
-Our use of CVS fits into the
-<a href="http://www.cs.wustl.edu/~levine/ACE_wrappers/docs/ACE-development-process.html">ACE development process</a>.<p>
-
-
-<hr><p>
-<h3>2. <a name="Preliminaries">Preliminaries</a></h3>
-<p>The <code>CVSROOT</code> environment variable listed below is <font
-color=red> <strong><blink>required</blink></strong></font>.  If you
-want to use CVS from within emacs, you'll have to restart it from a
-shell that has <code>CVSROOT</code> defined.<p>
-
-Emacs users might want to add <var>(setq vc-follow-symlinks t)</var>
-to your .emacs file to instruct emacs to follow symlinks to
-version-controlled plain files.<p>
-
-For lack of a better place to put the following, I'll put it here.
-It's a good idea to insert a CVS/RCS keyword string at the top of
-every file that you place under CVS control.  This includes source
-files, Makefiles, config files, <em>etc</em>.  It will embed in the
-file a concise record of the filename, last update time, revision
-number, and last user who updated it.  For C++ files, the keyword
-string is:
-  <pre>
-  // $<!-- -->Id$
-  </pre>
-It's not necessary to fill in the fields of the keyword string,
-or modify them when you edit a file that already has one.  CVS
-does that automatically when you checkout or update the file.<p>
-
-On Unix systems, you might want to create a file called <code>.cvsrc</code>
-in your home directory with the following contents:
-<pre><code>
-co -P
-update -P
-</code></pre>
-That will cause CVS to prune empty directories on checkout or update.
-<p>
-
-
-<hr><p>
-<h3>3. <a name="Getting started with ACE on CVS">Getting started with ACE on CVS</a></h3>
-Note:  the first three steps are for UNIX platforms.  See the
-<a href="#Windows NT setup">Windows NT setup</a> section for
-setup information for Windows NT.
-<ol>
-  <li>% <code>setenv CVSROOT /project/cvs-repository </code> ####
-      site-specific location<p>
-  <li>cd to the directory that you want your ACE_wrappers workspace
-      to be under.<p>
-  <li>% <code>setenv ACE_ROOT `pwd` </code> #### to set the ACE_ROOT
-      environment<p>
-  <li>Change your umask to something like 022 <strong>if</strong> you want
-      others to be able to view your workspace.<p>
-  <li>% <code>cvs checkout ACE_wrappers</code><p>
-  <li>Add the ace/config.h and include/makeinclude/platform_macros.GNU
-      symlinks.  For example, for Sun C++ on SunOS 5.5:
-      <pre><code>
-      % ln -s config-sunos5.5.h ace/config.h
-      % ln -s platform_sunos5_sunc++.GNU include/makeinclude/platform_macros.GNU
-      </code></pre><p>
-  <li>Hack away in your own workspace.  All files have user write
-      permission.
-</ol><p>
-
-
-<hr><p>
-<h3>4. <a name="Windows NT setup">Windows NT setup</a></h3>
-Thanks to <a href="http://www.cs.wustl.edu/~brunsch/">Darrell Brunsch</a>
-and <a href="http://www.cs.wustl.edu/~irfan/">Irfan Pyarali</a> for
-providing this NT setup information.  (It contains a site-specific
-<code>CVSROOT</code>.)<p>
-
-You can use the CVS client under Windows NT to keep a local repository
-of ACE.  To set it up, follow these steps:<P>
-<ol>
-  <li>Find or create a directory in your path (I just created a utils
-      directory and added it to my path).<p>
-  <li>Download the files cvs.exe, patch.exe, and win32gnu.dll.  They're
-      in a zip file on
-      <a href="http://download.cyclic.com/pub/cvs-1.10.5/windows/">Cyclic
-      Software's download site.</a>  (Cyclic Software hsa been acquired
-      by SourceGear Corporation.)<p>
-
-      Alternatively, <a href="http://www.wincvs.org">WinCVS</a> provides
-      a graphical front-end on Windows.  <strong>NOTE: </strong>if
-      you use WinCVS, beware that it enables read-only checkout by
-      default.  So be sure not to check out that way if you want to
-      edit files.<p>
-
-      Thanks to <a href="http://www.riverace.com">Steve Huston</a> for that
-      note.<p>
-  <li>Be sure that the <a href="http://www.sourcegear.com/CVS">SourceGear</a>
-      cvs utilities precede any
-      <a href="http://www.cygnus.com/misc/gnu-win32/">Cygnus
-      GNU-Win32 utilities</a> in your path, something like this:<p>
-
-      <pre>
-      d:\utilities\cvs;D:\utilities\gnuwin32\b18\H-i386-cygwin32\bin
-      </pre>
-  <li>Add to your environment: <BR>
-      <code>LOGNAME = </code><em>username</em><br>
-      <code>CVSROOT = ace.cs.wustl.edu:/project/cvs-repository</code><br>
-</ol>
-Please note that this approach uses a remote shell.  So, your
-account must be able to rsh to the server machine.<p>
-
-For an alternative approach that uses CVS pserver instead of rsh,
-please see Darrell's <a
-href="http://tao.cs.wustl.edu/howto/use_win32_pserver.html">CVS
-pserver page for Win32</a>.<p>
-
-
-<hr><p>
-<h3>5. <a name="Checking in changes">Checking in changes</a></h3>
-By convention, any repository change should be documented in
-an appropriate ChangeLog.  The ChangeLog entry should start with
-a line of this form:
-<pre>
-  ChangeLogTag: <em>date</em>  <em>name</em>  &lt;<em>email address</em>&gt;
-</pre><p>
-
-In all examples below, <code>ChangeLog</code> refers to appropriate
-ChangeLog.<p>
-
-<h4>5.1. Command line</h4>
-    To enter your workspace changes into the master repository from
-    the command line::<p>
-<pre>
-    % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>file(s)/directori(es)</em> ChangeLog
-</pre><p>
-
-<h4>5.2. From emacs</h4>
-    To checkin one file or directory to the repository:<p>
-<ol>
-  <li><code>C-x v v </code>(vc-next-action) to check the file or directory
-       in<p>
-  <li>Insert the ChangeLogTag, using the first line of your ChangeLog entry<p>
-  <li><code>C-c C-c </code> to finish checkin
-</ol><p>
-
-
-<hr><p>
-<h3>6. <a name="Workspace update">Workspace update</a></h3>
-To update your workspace from the master repository, to pick up changes
-by others:<p>
-   <blockquote>% <code>cvs update ACE_wrappers</code></blockquote><p>
-
-cvs will print out a line for each directory that it enters
-(by default, it will recurse through the directory tree; to
-disable this and only update one directory, add <code>-l</code>
-after <code>update</code>).<p>
-
-cvs will print out a line for each file that differs from what is
-in the repository.  This first character indicates the file status:
-<ul>
-  <li><code>U</code> the file was brought <strong>up-to-date</strong>, so
-                     now it agrees with what is in the repository
-  <li><code>P</code> same as <code>U</code>, except used by CVS server
-                     when it sends a patch instead of the entire file
-  <li><code>M</code> the file is <strong>modified</strong> in your
-                     workspace with respect to the repository; without any
-                     other message, it means that the file was not modified
-                     by this update operation.  If changes were
-                     successfully merged (without conflict), then cvs will
-                     note on the previous lines.
-  <li><code>C</code> the file needs to be updated, but a
-                     <strong>conflict</strong> was detected.  The file now
-                     contains the differences, demarcated with
-                     <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> and
-                     <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code>.  The
-                     unmodified file was moved to <em>.#file.revision</em>.
-                     You'll need to edit the file to resolve the
-                     differences.  I get a lot of false positives on files
-                     that I know I didn't modify locally:  for those cases,
-                     I just remove the file and rerun update.
-  <li><code>A</code> or <code>R</code> The file has been
-                     <strong>added</strong> or <strong>removed</strong>
-                     to/from your workspace, but the add or
-                     remove has not yet been committed.
-  <li><code>?</code> the file is <strong>private</strong> to your
-                     workspace:  it does not exist in the repository
-</ul>
-
-To show what update would do to the currently directory (recursively),
-without actually doing it:
-<blockquote>% <code>cvs -n update <strong>.</strong></code></blockquote>
-<blockquote>
-  The -q option to update suppresses the ``Updating'' message for each
-  directory:
-  <blockquote>%
-              <code>cvs -nq update <strong>.</strong></code></blockquote>
-</blockquote>
-
-To get the status of the current directory (recursively) with respect to
-the repository:
-<blockquote>% <code>cvs status <strong>.</strong></code></blockquote>
-
-To get the status of a single file with respect to the repository,
-with symbolic tags displayed:
-<blockquote>% <code>cvs status -v <em>file</em></code></blockquote>
-
-To show local (in current workspace) changes to one or more files,
-relative to the versions that they were checked out from:
-<blockquote>% <code>cvs diff <em>file(s)/directori(es)</em></code>
-</blockquote>
-
-To show local (in current workspace) changes to one or more files,
-relative to the latest versions in the repository:
-<blockquote>% <code>cvs diff -rHEAD <em>file(s)/directori(es)</em></code>
-</blockquote><p>
-
-
-<hr><p>
-<h3>7. <a name="Adding/removing files/directories">Adding/removing files/directories</a></h3>
-Adding one or more text files requires two steps:
-<pre>
-    % cvs add <em>file . . .</em>
-    % cvs commit <em>file . . .</em>
-</pre><br>
-The commit may be done later, on the entire directory, etc.
-Note that cvs <strong>add</strong> is not recursive, so
-that the files in each directory of a hierarchy must be
-added in separate commands.  Also, only files in the current
-directory can be added.<p>
-
-Binary files require the <code>-kb</code> option to <code>cvs add</code>:
-<pre>
-    % cvs add -kb <em>file . . .</em>
-    % cvs commit <em>file . . .</em>
-</pre><br>
-If not applied during the <code>add</code> operation, <code>-kb</code>
-can be applied using <code>cvs admin -kb</code>.<p>
-
-Removing files is similar, except the cvs <strong>remove</strong>
-command is used instead of the <strong>add</strong> command:
-<pre>
-    % cvs remove <em>file . . .</em>
-    % cvs commit <em>file . . .</em>
-</pre><p>
-
-An add of an empty directory doesn't require a commit.<p>
-
-Removing a directory is more problematic.  There is no CVS command to
-remove (or rename) a directory:  it has to be done behind CVS' back,
-directly in the repository.  This is by design; a CVS command can't be
-used to irrevocably destroy information.  Therefore, never remove a
-directory.  You can safely remove all of the files in it, using the
-above steps.
-
-To just remove a directory from a workspace (without removing it from
-the repository):  first, remove the directory and all of its files
-using usual OS commands.  Second, run
-<pre>
-    % cvs update -P <em>directory-path </em>
-</pre><br>
-to prune the directory from the workspace.<p>
-
-
-<hr><p>
-<h3>8. <a name="Modules">Modules</a></h3>
-Instead of referring to ``ACE_wrappers'' above, you can refer
-to a module, such as ace, tests, performance-tests, and so on.
-To get a list of known modules, use the -c option to checkout:
-<blockquote>% <code>cvs checkout -c</code></blockquote><p>
-
-<strong>IMPORTANT</strong>:  if a subdirectory is added to ACE, it
-<strong>must</strong> be added to the list of known modules in
-<code>$CVSROOT/CVSROOT/modules</code>!  If you don't want to edit that
-file, please tell <a href="mailto:levine@cs.wustl.edu">David</a>.  The
-<code>CVSROOT</code> files are under RCS control.  emacs' VC tools
-handle them the same way that they handle CVS-controlled files.  So,
-you can check them out and back in with <code>C-x v v</code>.<p>
-
-To add an entirely new module:
-<ol>
-  <li>Create the directories/files.<p>
-  <li>Add the module to <code>$CVSROOT/CVSROOT/modules</code>, as
-      mentioned above.<p>
-  <li>Create a new directory in <code>$CVSROOT</code>, owned by the appropriate
-      group and with sufficient (probably group write+setuid) permissions.<p>
-  <li>Change to the directory just above the top-level directory for
-      the module in your workspace.<p>
-  <li><code>cvs checkout <em>new module name</em></code><p>
-  <li>Add all of the new directories/files in the module, as described
-      <a href="#Adding/removing files/directories">above</a>, then commit.
-</ol>
-
-
-<hr><p>
-<h3>9. <a name="ChangeLog updates">ChangeLog updates</a></h3>
-To automatically update the ChangeLog, use the emacs command:
-<pre>
-  C-u C-x v a
-</pre>
-Thanks to James Hu &lt;jxh@cs.wustl.edu&gt; for this useful tidbit.<p>
-
-To set a specific host address in your ChangeLog entries, add a line
-like this to your <code>~/.emacs</code>:
-<pre>
-  (setq mail-host-address "cs.wustl.edu")
-</pre><p>
-
-To set a specific name in your ChangeLog entries, add a line like
-this to your <code>~/.emacs</code>:
-<pre>
-  (setq user-full-name "my full name")
-</pre>
-Otherwise, CVS uses the name (GECOS field) from your passwd entry.<p>
-
-
-<hr><p>
-<h3>10. <a name="File revisions">File revisions</a></h3>
-File revisions in and below the current directory may be tagged with:
-<pre>
-    % cvs tag <em>tag</em> <strong>.</strong>
-</pre><p>
-
-To retrieve an old revision of a file, use the -r option to cvs
-<strong>update</strong>:
-<pre>
-    % cvs update -r<em>tag file</em>
-</pre>
-The revision tags of a file can be viewed
-with the cvs <strong>log</strong> command.<p>
-
-Or, to retrieve the file and/or directory versions as of a
-certain date and time, use the -D option to cvs <strong>update</strong>,
-for example:
-<pre>
-    % cvs update -D "last Saturday" OS.{h,i,cpp}
-</pre>
-
-<strong>NOTE:  </strong>The -r and -D options are ``sticky''; they will
-apply to the file(s)/directories until overwritten with another revision
-tag or date, or until disabled.
-They are disabled by using the update -A option, which also checks out
-the latest revision:
-<pre>
-    % cvs update -A <em>file</em>
-</pre><p>
-
-To change the log message for a particular revision of a file:<p>
-<pre>
-    % cvs admin -m<em>revision</em>:"<em>new message</em>" <em>file</em>
-</pre><p>
-
-
-<hr><p>
-<h3>11. <a name="File reversion">File reversion</a></h3>
-There are a few ways to revert a file to the last revision that is in
-the repository, if you want to abandon your changes to it:
-
-<ul>
-  <li>The easiest way to abandon your changes <strong>in your
-    workspace</strong> is to use the emacs command <code>C-x v u </code>
-    (vc-revert-buffer).  Or from the shell, you could remove the
-    file and update it with <code>cvs update <em>file</em></code>.<p>
-
-  <li><strong>Do not remove a revision from the cvs repository
-    directly.</strong> To revert a revision that you made, use the
-    following command to revert the change in your workspace and
-    check in the reverted version:
-<pre>
-    % cvs update -j<em>after_change</em> -j<em>before_change</em> <em>file</em>
-</pre>
-    For example, if the version containing the version you want to
-    revert is 4.10, then, <em>after_change</em> should be
-    <code>4.10</code> and <em>before_change</em> should be
-    <code>4.9</code>.<p>
-
-    <strong>NOTE:</strong> this doesn't seem to work with CVS version 1.10.<p>
-
-    Make sure the patch succeeded (if you are not reverting a change
-    you made long time ago, most likely it will succeed) before
-    checking in the reverted version.<p>
-
-    Also make sure the you add a ChangeLog entry explaining why
-    you reverted the change.
-</ul>
-
-<hr><p>
-<h3>12. <a name="Renaming a file">Renaming a file</a></h3>
-There are three ways to rename a CVS-controlled file.  The first
-preserves the revision log, but it must be accessed by either the
-original or new name, depending on what you want to see.  And
-revision numbers will start over at 1.0 unless set with the
-<code>-r</code> option.  It's all done in the user's workspace:
-<pre>
-    Add ChangeLog entry containing:
-    Renamed <em>OLD</em> to <em>NEW</em>
-    % mv <em>OLD</em> <em>NEW</em>
-    % cvs remove <em>OLD</em>
-    % cvs add <em>NEW</em>
-    % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>OLD</em> <em>NEW</em> ChangeLog
-</pre><br>
-
-The second method maintains the revision log in one place and the
-revision number sequence.  It makes fetching old releases of the
-module more difficult, which may be an advantage or disadvantage
-depending on local circumstances.  It is more dangerous because the
-repository is modified directly; see the warning in the cvs info page
-about other users accessing the history file while it is being moved:
-<pre>
-    % cd $CVSROOT/<em>MODULE</em>
-    % mv <em>OLD</em>,v <em>NEW</em>,v
-</pre><br>
-
-The third method is to copy the history file in the repository.
-Instead of moving the history file, as in the second method above,
-copy it.  It's not necessary to prevent others from accessing the
-file.  The cvs info pages show other steps, to remove the old tags
-from the new history file.  While technically correct, I don't think
-that's necessary for our purposes.<p>
-
-While the first method is the safest, it has the distinct disadvantage
-of hindering access of old versions.  If that's not a problem for a
-particular file, then it is the preferred approach.  As Carlos would
-probably say if you asked him, ``it's the right thing to do.''<p>
-
-If easy access to old versions is desired, I would use the third
-approach:  copy the history file in the repository.<p>
-
-
-<hr><p>
-<h3>13. <a name="Local version control">Local version control</a></h3>
-All version control with CVS is done through the master repository.
-CVS doesn't provide any facility for local checkpoints.  If you want
-local version control in your workspace, there's nothing to stop you
-from using RCS or SCCS locally (but it might confuse emacs' version
-control).  The preferred approach is to create a branch, and
-checkpoint as much as you want on that branch.  When the time comes to
-make the changes public, just merge the branch.  See the <a
-href="#Branches">Branches</a> section of this page, and the cvs man
-page, for instructions on creating and using a branch.<p>
-
-
-<hr><p>
-<h3>14. <a name="Branches">Branches</a></h3>
-To create a branch, you must first create a tag to identify the
-branch.  Then, you can checkout on that branch.  There are various
-ways to go about doing this, but these steps show how when starting
-from scratch:
-
-<pre>
-    % cvs rtag -b <em>branch_tag</em> <em>module(s)</em>
-    % cvs checkout -r <em>branch_tag</em> <em>module(s)</em>
-</pre>
-
-It's not necessary to checkout all the files in a directory or module
-on the branch, but it's probably the easiest and least confusing
-approach in the long run.  <strong>Note</strong> that it's usually
-tricky to tag individual files on a branch because CVS won't
-be able to identify which module they're in.  By way of example,
-to checkout just <code>ace/OS.h</code> on a branch, you'd have to do
-this, assuming that you're already in the <code>ace</code> directory:
-<pre>
-    % cd ..
-    % cvs rtag -b <em>branch_tag</em> ace/OS.h
-    % cvs checkout -r <em>branch_tag</em> ace/OS.h
-    % cd ace
-</pre>
-This can be done after modifying files, and CVS will retain your
-modifications.  However, if you don't trust CVS, it's best to backup
-your files first.<p>
-
-Checkouts on a branch are sticky, and will apply until the head
-version of the file(s) have been checked out with the <code>-A</code>
-option to <code>cvs update</code>.  Presumably, this will be done
-after merging the branch to the main trunk.  See the
-<a href="#Old file revisions">Old file revisions</a> section of this
-page for similar discussion of sticky tags.<p>
-
-To merge an entire branch to the main trunk, use the <code>-j</code>
-(for <em>join</em>) option to <code>cvs checkout</code>.  That just
-merges in your workspace; the repository can then be updated from the
-workspace using <code>commit</code> as usual:
-<pre>
-    Add ChangeLog entry containing:
-    merged <em>branch_tag</em>
-    % cvs checkout -P -Aj <em>branch_tag</em> <em>file(s)/directori(es)</em>
-    % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>file(s)/directori(es)</em> ChangeLog
-</pre>
-(The <code>-A</code> is needed if you are in the workspace that has
-the checkouts on the branch.  It updates the workspace to the latest
-versions on the main trunk.  So, <strong>don't</strong> use it if
-you want to keep working on the branch.)<p>
-
-To merge any changes on the main trunk to a branch, the first time:
-<pre>
-    Add ChangeLog entry containing:
-    merged main trunk changes
-    % cvs update -jHEAD <em>file(s)/directori(es)</em>
-    % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>file(s)/directori(es)</em> ChangeLog
-    % cvs tag <em>merged_foo_branch</em> <em>file(s)/directori(es)</em>
-</pre>
-
-<strong>AFTER MERGING, APPLY A LABEL TO THE SOURCE BRANCH,
-as shown above.</strong>
-For example, if you merged from the main trunk to a branch,
-apply a new label to the main trunk.  You can use that label
-later to merge any subsequent changes on the main trunk.  The
-<code>cvs</code> info pages have a good example of this.
-Briefly:
-
-<pre>
-    Add ChangeLog entry containing:
-    merged main trunk changes
-    % cvs update -j<em>merged_foo_branch</em> -jHEAD <em>file(s)/directori(es)</em>
-    % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>file(s)/directori(es)</em> ChangeLog
-    % cvs tag <em>merged_foo_branch_again</em> <em>file(s)/directori(es)</em>
-</pre>
-
-
-Note that any files created on the branch won't be visible on
-the main trunk, even after the merge.  I'm not sure of right
-way to take care of this, but I follow these steps for each
-file created on the branch:<p>
-<ol>
-  <li>In the repository, move the RCS file from the <var>Attic</var>
-      directory up to its parent directory.
-  <li>Edit the RCS file, replacing the "dead" state with "Exp".
-  <li>Merge from the branch to the main trunk:
-    <pre>
-      Add ChangeLog entry containing:
-      merged <em>branch_tag</em>
-      % cvs update -Aj <em>branch_tag</em> <em>file</em>
-      % cvs commit -m "ChangeLogTag: `head -1 ChangeLog`" <em>file</em> ChangeLog
-    </pre>
-</ol>
-
-To create a file on a branch, in a directory that has not been
-checked out on the branch:
-<ol>
-  <li>Add the file and commit it to the main branch
-  <li>Create the branch tag on the file, and check the file out
-    on the branch.
-  <li>Remove the file, cvs remove the file, and commit the removal.
-  <li>Check the file out on the branch.
-</ol>
-Alternatively, the recommended procedure is to simply check the
-entire directory out on the branch, then create the file.<p>
-
-In general, deleting branch tags is not recommended.  But it's often
-necessary, especially when getting started with branches.  The
-<code>-d</code> option to <code>cvs rtag</code> can be used to delete
-a branch tag.<p>
-
-The use of a branch for maintaining a release is illustrated
-in the section on the <a href="#ACE release bug-fix branch">ACE
-release bug-fix branch</a>.<p>
-
-
-<hr><p>
-<h3>15. <a name="Remote repositories">Remote repositories</a></h3>
-Before setting up a repository for remote access, be sure to see
-the <a href="file:/project/doc/pkg/cvs/cvs-1.10/doc/cvs.ps">CVS
-documentation</a>.  There are important security considerations.<p>
-
-An easy way to access a remote repository is via rsh.  These steps
-ought to get you going:
-<ol>
-  <li>Install cvs on the local system, if it doesn't already have it.<p>
-  <li>Add yourself to an <code>.rhosts</code> file on the remote machine
-      of a user that can access the repository.<p>
-  <li>Set your <code>CVSROOT</code> environment variable to:<br>
-        <pre>
-          <em>remote user</em>@<em>remote host</em>:<em>remote repository</em>
-        </pre>
-</ol>
-Then, you can issue cvs commands just as you would on the remote machine.<p>
-
-If you have ssh on your client machine, you can use ssh instead of
-rsh.  Just set your <code>CVS_RSH</code> environment variable to
-<code>ssh</code>.  You don't need to add an <code>.rhosts</code>
-entry with ssh, so it's the best alternative for remote repository
-access.<p>
-
-Another way to access to remote cvs repository is to run cvs in
-client-server mode.  To use this feature, first check if you have your
-<code>HOME</code> environment variable set properly.  Then, set your
-<code>CVSROOT</code> to:<p>
-<pre>
-        :pserver:your_user_id@ace.cs.wustl.edu:/project/cvs-repository
-</pre><p>
-Then, do a cvs login as
-<pre>
-    % cvs login
-</pre><p>
-Type in your password when CVS prompts you to enter your password.
-This will create a file call "<code>.cvspass</code>" in your home
-directory (as defined by <code>$HOME</code>) that contains the
-encripted password for the server.  You can now perform regular CVS
-operation directly.<p>
-
-<strong>Notice:</strong> It's not difficult to decode the passwords in
-<code>.cvspass</code> file.  Therefore, never use cvs in client-server
-mode in a unsafe environment.  (Where others can read your .cvspass
-file.)<p>
-
-To speed up client-server mode operations, it might help to use
-the <code>cvs</code> <code>-z</code> option.  It requires that
-<code>gzip</code> be on your search path on both the client and
-server.  An example use is:<p>
-<pre>
-    % cvs -z 1 update
-</pre><p>
-
-Thanks to <a href="http://www.cs.wustl.edu/~nanbor/">Nanbor Wang</a>
-and <a href="http://www.cs.wustl.edu/~brunsch/">Darrell Brunsch</a>
-for figuring out and providing this documentation for cvs
-client-server mode.<p>
-
-
-<hr><p>
-<h3>16. <a name="Exporting from CVS">Exporting from CVS</a></h3>
-There are two different strategies for exporting CVS-controlled files,
-such as for code releases.  The first, preferred approach is to use
-the cvs <strong>export</strong> command to stage a version of the
-controlled files to a non-controlled directory.  This version will
-not have any of the CVS files in it.  THe second approach is to
-create a release from a user's CVS-controlled workspace.<p>
-
-To use cvs <strong>export</strong>, either a date or revision
-tag must be specified.  It's usually a good idea to tag the sources
-with a revision tag and use that.  So, the steps would be:<br>
-<pre>
-    % cd <em>root of directory tree</em>
-    % cvs tag <em>tag</em> <strong>.</strong>
-    % cd <em>staging directory</em>
-    % cvs export -r <em>tag</em>
-    % find . -print | cpio -o -H tar | gzip -9 &gt; <em>tar filename</em>
-</pre>
-
-To tag and create a release in the form of a gzip'ped tar file
-from a user's workspace:
-<pre>
-    % cd <em>root of directory tree</em>
-    % cvs tag <em>tag</em> <strong>.</strong>
-    % find . -name CVS -prune -o -print | cpio -o -H tar | gzip -9 &gt; <em>tar filename</em>
-</pre>
-
-The relative advantage of the first, export approach is that you will
-be sure that only CVS-controlled files will be released.  However, it
-requires the extra step and creation of the staging area.<p>
-
-This extra step is one reason why we don't currently stage releases of
-ACE.  Instead, they are built from Doug's personal workspace.  That
-workspace is visible on the web, so that ACE users can track the very
-latest changes without any explicit action by Doug.  If we were to
-stage it, to make any change visible would require an explicit move to
-the staging area.<p>
-
-
-<hr><p>
-<h3>17. <a name="ACE_wrappers-frozen workspace">ACE_wrappers-frozen workspace</a></h3>
-
-This section applies to the DOC group at Wash. U. only:<p>
-
-There's now a ``frozen'' ACE in
-<strong>/project/cvs-repository/ACE_wrappers-frozen/</strong>.
-It contains the latest official release of ACE.<p>
-
-There are complete g++ 2.7.2.1 and Sun C++ 4.2 builds in the
-<strong>build</strong> directory below the directory noted above.
-To use one of these builds, set or prepend to these environment variables:<p>
-<table border>
-<tr>
-<th>Compiler</th>
-<th>set <strong>WRAPPER_ROOT</strong> to:</th>
-<th>prepend to <strong>LD_LIBRARY_PATH</strong>:</th>
-<tr>
-<td>g++</td>
-<td>/project/cvs-repository/ACE_wrappers-frozen/build/SunOS5_g++</td>
-<td>/project/cvs-repository/ACE_wrappers-frozen/build/SunOS5_g++/ace</td>
-<tr>
-<td>Sun C++</td>
-<td>/project/cvs-repository/ACE_wrappers-frozen/build/SunOS5_sunc++-4.2</td>
-<td>/project/cvs-repository/ACE_wrappers-frozen/build/SunOS5_sunc++-4.2/ace</td>
-</table><p>
-
-
-<hr><p>
-<h3>18. <a name="ACE release bug-fix branch">ACE release bug-fix branch</a></h3>
-
-This section applies to the DOC group at Wash. U. only:<p>
-
-The ``main line'' CVS branch will (continue to) be the ``new features''
-branch.  If you want the very latest and greatest ACE at all times, no
-changes to the use of your workspace are required.  Just
-<code>cvs update</code> it as usual.<p>
-
-Bug fixes to the official release will go on a branch.  For the ACE
-4.2 release, for example, this branch is name
-<strong>ACE-4_2</strong>.  (CVS does not allow periods in branch names
-or any other tags.)  To use it, do this in your workspace:
-<pre>
-    % cd ..
-    % cvs checkout -r ACE-4_2 ACE_wrappers
-</pre>
-
-From that point on, all updates and commits in that workspace
-will be from/to the <strong>ACE-4_2</strong> branch.<p>
-
-
-<hr><p>
-<h3>19. <a name="Warning messages/problems">Warning messages/problems</a></h3>
-<dl>
-<blockquote>
-
-  <dt><pre>cvs update: conflict: <em>foo </em>is modified but no longer in the repository<br>
-U <em>bar</em></pre>
-  <dd>That might indicate that file <em>foo</em> was renamed to <em>bar</em>.
-      If so, <em>foo</em> should be removed from the current workspace.  (And
-      that warning will not reoccur for the workspace, because its CVS will
-      have removed <em>foo</em> from the workspace entries and checked out
-      <em>bar</em>.)<p>
-
-  <dt><pre>cvs update: [<em>time</em>] waiting for <em>user</em>'s lock in <em>repository</em></pre>
-  <dd>Check for lock files and directories in the <code>$CVSROOT/CVSROOT</code>
-      and lock files anywhere in the <code>$CVSROOT</code> hierarchy.  Remove
-      ones that no longer appear to be in use and retry.  Lock files and
-      directories have names starting with ``.#'', I think.<p>
-
-  <dt>Why does a file in the repository not have group and/or other read
-      permission?<p>
-  <dd>Because it didn't have those permissions when it was added to the
-      repository.  To fix it, those permissions can be added to the ,v file in
-      the repository.  To avoid it, those permissions should be added to the
-      file before it is created/committed the first time.<p>
-
-  <dt>Why does CVS keep removing group/and or other read permission from a
-      file in my workspace?<p>
-  <dd>Because your umask is something like 7 or 77.  Change it to something
-      like 22.  If you don't want to change it for everything, then alias cvs;
-      in t/csh:<br>
-      <blockquote>% <code>alias cvs '(umask 22; \cvs \!*)'</code></blockquote>
-      <p>
-      Also, the file will have to have mode 644 before you commit it.  So if
-      your editor removes group/other read permission, you'll have to ``fix''
-      that as well.<p>
-
-  <dt>I modified Makefile in my workspace so I don't build static or shared
-      ACE libraries.  But, I forgot about it and commited the modified
-      Makefile to the repository.  Help?<p>
-  <dd>You'll have to correct the Makefile and commit your corrections.<p>
-
-      Instead of modifying your makefile, try these commands to build the
-      ACE static and shared libraries, respectively:
-      <blockquote>% make <code>static_libs_only=1</code></blockquote>
-
-      <blockquote>% make <code>shared_libs_only=1</code></blockquote>
-
-</blockquote>
-</dl><p>
-
-
-<hr><p>
-<h3>20. <a name="For more info on CVS">For more info on CVS</a></h3>
-Please see these sources for more information on CVS:
-<ul>
-  <li>David Discher's <a href="http://dpd.dpdtech.com/cvs/">Quick N
-    Dirty CVS HOW-TO</a> is really helpful.<p>
-
-  <li>Please check out David G. Grubbs' great, comprehensive <a
-  href="http://cellworks.washington.edu/pub/docs/cvs/cvs-FAQ/cvsfaq0.html">"The
-  CVS FAQ"</a>.<p>
-
-  <li><a href="http://www.loria.fr/~molli/cvs-index.html">CVS Bubbles</a>
-      is a collection of useful CVS information and links.<p>
-
-  <li>Commercial support for CVS is available from <a
-      href="http://www.sourcegear.com/CVS">SourceGear Corporation</a>.
-      Their web pages are very helpful.<p>
-
-  <li>Terris Linenbach has an interesting, brief discussion of
-      source code management on-line at <a
-      href="http://devguy.com/fp/ProgrammersCanvas">Programmers'
-      Canvas</a>.  Programmers' Canvas is a pattern language,
-      also quite interesting.
-</ul>
-
-<p><hr>
-<p>Back to
-<a href="http://www.cs.wustl.edu/~levine">David L. Levine's home page</a>.
-<p>
-
-
-
-<font size=-1>
-Last modified 11:15:16 CDT 30 September 2002.
-<br>
-[an error occurred while processing this directive]
-[an error occurred while processing this directive]
-<p>
-</font>
-
-
-
-</body>
-</html>
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index ba2278aa560..976edfa4481 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -57,7 +57,7 @@ from a number of companies.  <P>
 <P>
 
 Our process for developing and releasing ACE, TAO, and CIAO, as well
-as the role of stable releases vs. beta kits is described in detail in
+as the role of "official" releases vs. beta kits is described in detail in
 the DOC group's <A
 HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/ACE-development-process.html?revision=HEAD">
 development and release process</A> document.  Please check that
@@ -317,16 +317,8 @@ please use the links below to download it.
   </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/">
-      web site</A>.
-  </LI>
-  <LI>Stable commercially supported versions of TAO are available from
-    the OCI
-    <A HREF="http://www.theaceorb.com/">
-      web site</A>.
-  </LI>
+  <LI>Commercially supported versions of ACE+TAO are available from
+    <A HREF="http://www.dre.vanderbilt.edu/support.html">several companies</A>.
   <LI> Ken Sedgwick's <A HREF="http://dist.bonsai.com/ken/ace_tao_rpm/">Fedora
       RPMs</A> for ACE and TAO.
 
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index d7f652acfa9..55b2f0ccb83 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -118,9 +118,9 @@ name. This is used to fill the ChangeLog entry.</li>
 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
+<li> Tag the release by executing <code>ACE/bin/make_release.py --beta --update --tag</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>
+<li> Create the kits by executing <code>ACE/bin/make_release.py --kit </code>  This will take about two hours to complete.
 
 <ul><li>These commands only tags and creates the kits for the
  software itself, not documentation. </li>
@@ -128,7 +128,7 @@ take a couple minutes to complete.</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>
+successfully: <p>
 <code>
 sm@beatrice ~<br>
 $ ssh bczar@anduril.dre.vanderbilt.edu<br>
@@ -140,8 +140,8 @@ No default printer<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>
+-bash-3.00$ ACE/bin/make_release.py --beta --update --tag<br>
+-bash-3.00$ ACE/bin/make_release.py --kit<br>
 </code>
 <p>
 Feel free to cut and paste with suitable edits.
@@ -161,6 +161,7 @@ CIAO/VERSION<br>
 CIAO/ciao/Version.h<br>
 TAO/tao/Version.h<br>
 ace/Version.h<br></code><p>
+In most cases, a <code>svn revert -R *</code> from DOC_ROOT will suffice.<br />
 The tag will also need to be removed: ACE+TAO+CIAO-X_Y_Z
 (wher X and Y are the minor and beta release numbers of the release that is to be restarted).<p>
 E.g.:<br>
@@ -170,12 +171,18 @@ svn rm https://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z<br
 
 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
+<li>The packages and up by default under $DOC_ROOT/packages-PID, 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>
+cp $DOC_ROOT/packages-PID/ACE* /export/www/download.dre/ACE+TAO-distribution<br>
 </code>
+<li>You shoulde also copy the packages wo the previous versions directory with the appropriate decorators.
+<ul>
+<li><code>cd $DOC_ROOT/packages-PID</code></li>
+<li><code>rename tar X.Y.Z.tar *</code> Where X, Y, and Z are the appropriate major, minor, and beta version numbers for ACE.</li>
+<li><code>rename zip X.Y.Z.zip *</code></li>
+<li><code>cp * /export/www/download.dre/previous_versions</code</li>
+</ul>
 <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>
diff --git a/ACE/docs/index.html b/ACE/docs/index.html
index 4f14542cc80..1f49c0ef420 100644
--- a/ACE/docs/index.html
+++ b/ACE/docs/index.html
@@ -73,8 +73,6 @@ ask. <P>
 <ul>
   <li><a href="ACE-development-process.html">Development and Release Process</a> - The process we use
       to develop and release the ACE, TAO, and CIAO software.
-  <li><a href="CVS.html">Overview of CVS</a> - How to use the source
-      control system we use for ACE, TAO, CIAO, etc.
   <li><a href="ACE-guidelines.html">Style Guide</a> - How to write
       compliant ACE, TOA, and CIAO code.
   <li><a href="ACE-porting.html">Porting</a> - What to do to port to a new platform.
diff --git a/ACE/etc/ciao.doxygen b/ACE/etc/ciao.doxygen
index 88a0ba4de6b..4a162b53468 100644
--- a/ACE/etc/ciao.doxygen
+++ b/ACE/etc/ciao.doxygen
@@ -122,9 +122,7 @@ INCLUDE_PATH          = TAO . ACEXML
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        CIAO_NAMESPACE
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/ciao_DAnCE.doxygen b/ACE/etc/ciao_DAnCE.doxygen
index 61b2aec9447..aba8abadb4a 100644
--- a/ACE/etc/ciao_DAnCE.doxygen
+++ b/ACE/etc/ciao_DAnCE.doxygen
@@ -121,9 +121,7 @@ INCLUDE_PATH          = TAO . ACEXML TAO/tao/IORTable
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        CIAO_NAMESPACE
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/ciao_config_handlers.doxygen b/ACE/etc/ciao_config_handlers.doxygen
index 22bce624615..a29cf6b93d6 100644
--- a/ACE/etc/ciao_config_handlers.doxygen
+++ b/ACE/etc/ciao_config_handlers.doxygen
@@ -121,9 +121,7 @@ INCLUDE_PATH          = TAO . ACEXML TAO/tao/IORTable TAO/CIAO/tools/Config_Hand
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        CIAO_NAMESPACE
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao.doxygen b/ACE/etc/tao.doxygen
index 4ccd5c93df4..c43fa9bab23 100644
--- a/ACE/etc/tao.doxygen
+++ b/ACE/etc/tao.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
 			ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_anytypecode.doxygen b/ACE/etc/tao_anytypecode.doxygen
index ceeb6ec6b97..618f28584bc 100644
--- a/ACE/etc/tao_anytypecode.doxygen
+++ b/ACE/etc/tao_anytypecode.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_av.doxygen b/ACE/etc/tao_av.doxygen
index e5fb9bcf8c2..312513df33c 100644
--- a/ACE/etc/tao_av.doxygen
+++ b/ACE/etc/tao_av.doxygen
@@ -125,8 +125,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_compression.doxygen b/ACE/etc/tao_compression.doxygen
index 83b1a8b6030..73bd7c1fd9d 100644
--- a/ACE/etc/tao_compression.doxygen
+++ b/ACE/etc/tao_compression.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosevent.doxygen b/ACE/etc/tao_cosevent.doxygen
index 5b461cb1310..fd23e8ad6db 100644
--- a/ACE/etc/tao_cosevent.doxygen
+++ b/ACE/etc/tao_cosevent.doxygen
@@ -125,8 +125,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosnaming.doxygen b/ACE/etc/tao_cosnaming.doxygen
index 2feb7676733..9bf82b499bc 100644
--- a/ACE/etc/tao_cosnaming.doxygen
+++ b/ACE/etc/tao_cosnaming.doxygen
@@ -123,8 +123,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosnotification.doxygen b/ACE/etc/tao_cosnotification.doxygen
index 0710726f421..0c2c6720b78 100644
--- a/ACE/etc/tao_cosnotification.doxygen
+++ b/ACE/etc/tao_cosnotification.doxygen
@@ -130,8 +130,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_costime.doxygen b/ACE/etc/tao_costime.doxygen
index c696362829f..8c12acf4f66 100644
--- a/ACE/etc/tao_costime.doxygen
+++ b/ACE/etc/tao_costime.doxygen
@@ -123,8 +123,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_costrader.doxygen b/ACE/etc/tao_costrader.doxygen
index 76be5b0cd31..b909b9d3442 100644
--- a/ACE/etc/tao_costrader.doxygen
+++ b/ACE/etc/tao_costrader.doxygen
@@ -126,8 +126,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_dynamicany.doxygen b/ACE/etc/tao_dynamicany.doxygen
index f4e63f2fe8f..d6df3b857fa 100644
--- a/ACE/etc/tao_dynamicany.doxygen
+++ b/ACE/etc/tao_dynamicany.doxygen
@@ -123,8 +123,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_dynamicinterface.doxygen b/ACE/etc/tao_dynamicinterface.doxygen
index af32db0b4d8..cb5c4706cb6 100644
--- a/ACE/etc/tao_dynamicinterface.doxygen
+++ b/ACE/etc/tao_dynamicinterface.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_esf.doxygen b/ACE/etc/tao_esf.doxygen
index 65fa10ea1ce..f3c2e45603c 100644
--- a/ACE/etc/tao_esf.doxygen
+++ b/ACE/etc/tao_esf.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_ifr.doxygen b/ACE/etc/tao_ifr.doxygen
index 4a708e39a59..448df51fac4 100644
--- a/ACE/etc/tao_ifr.doxygen
+++ b/ACE/etc/tao_ifr.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_implrepo.doxygen b/ACE/etc/tao_implrepo.doxygen
index 99633483ca6..e1dc14223d9 100644
--- a/ACE/etc/tao_implrepo.doxygen
+++ b/ACE/etc/tao_implrepo.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_iormanip.doxygen b/ACE/etc/tao_iormanip.doxygen
index ee37cf2a4b5..dcade9f9126 100644
--- a/ACE/etc/tao_iormanip.doxygen
+++ b/ACE/etc/tao_iormanip.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_iortable.doxygen b/ACE/etc/tao_iortable.doxygen
index 0d5dac7db89..e8f4f018149 100644
--- a/ACE/etc/tao_iortable.doxygen
+++ b/ACE/etc/tao_iortable.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pi.doxygen b/ACE/etc/tao_pi.doxygen
index 23290991fb8..57f5f9253f3 100644
--- a/ACE/etc/tao_pi.doxygen
+++ b/ACE/etc/tao_pi.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pi_server.doxygen b/ACE/etc/tao_pi_server.doxygen
index 1675300518a..16c4475f117 100644
--- a/ACE/etc/tao_pi_server.doxygen
+++ b/ACE/etc/tao_pi_server.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_portablegroup.doxygen b/ACE/etc/tao_portablegroup.doxygen
index 22efcd8b343..9331f5eeeec 100644
--- a/ACE/etc/tao_portablegroup.doxygen
+++ b/ACE/etc/tao_portablegroup.doxygen
@@ -125,8 +125,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_portableserver.doxygen b/ACE/etc/tao_portableserver.doxygen
index 5c40b2f529a..2535fea5f2c 100644
--- a/ACE/etc/tao_portableserver.doxygen
+++ b/ACE/etc/tao_portableserver.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pss.doxygen b/ACE/etc/tao_pss.doxygen
index f69f6fb19a2..f468f54d8e1 100644
--- a/ACE/etc/tao_pss.doxygen
+++ b/ACE/etc/tao_pss.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtcorba.doxygen b/ACE/etc/tao_rtcorba.doxygen
index 3f0a3bd43c8..04354c2a791 100644
--- a/ACE/etc/tao_rtcorba.doxygen
+++ b/ACE/etc/tao_rtcorba.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtevent.doxygen b/ACE/etc/tao_rtevent.doxygen
index 979fb778ae1..78c8a944f69 100644
--- a/ACE/etc/tao_rtevent.doxygen
+++ b/ACE/etc/tao_rtevent.doxygen
@@ -131,8 +131,7 @@ INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtportableserver.doxygen b/ACE/etc/tao_rtportableserver.doxygen
index 8803ab7b784..791e18df520 100644
--- a/ACE/etc/tao_rtportableserver.doxygen
+++ b/ACE/etc/tao_rtportableserver.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_security.doxygen b/ACE/etc/tao_security.doxygen
index 5c1469901e7..effdc248df8 100644
--- a/ACE/etc/tao_security.doxygen
+++ b/ACE/etc/tao_security.doxygen
@@ -127,8 +127,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_smartproxies.doxygen b/ACE/etc/tao_smartproxies.doxygen
index ff96c0f7e9e..64a8608b0c6 100644
--- a/ACE/etc/tao_smartproxies.doxygen
+++ b/ACE/etc/tao_smartproxies.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_ssliop.doxygen b/ACE/etc/tao_ssliop.doxygen
index f54271c8b55..a9bec2fbe58 100644
--- a/ACE/etc/tao_ssliop.doxygen
+++ b/ACE/etc/tao_ssliop.doxygen
@@ -127,8 +127,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_strategies.doxygen b/ACE/etc/tao_strategies.doxygen
index 2fb3561d55e..549da3e30ab 100644
--- a/ACE/etc/tao_strategies.doxygen
+++ b/ACE/etc/tao_strategies.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_transportcurrent.doxygen b/ACE/etc/tao_transportcurrent.doxygen
index 959489dd056..e154e90896a 100644
--- a/ACE/etc/tao_transportcurrent.doxygen
+++ b/ACE/etc/tao_transportcurrent.doxygen
@@ -122,8 +122,7 @@ INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor.cpp b/ACE/examples/APG/Naming/Temperature_Monitor.cpp
index 8ac841b4108..98438d2876d 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor.cpp
+++ b/ACE/examples/APG/Naming/Temperature_Monitor.cpp
@@ -48,7 +48,7 @@ void Temperature_Monitor::record_failure (void)
 // Listing 41
 
 // Listing 42 code/ch21
-  int now = ACE_OS::time ();
+  int now = (int) ACE_OS::time ();
   int lastResetTime;
   if (lastReset.get ())
     {
@@ -128,6 +128,6 @@ void Temperature_Monitor::monitor (void)
       ACE_OS::sleep (this->opt_.poll_interval ());
     }
 
-  delete this->thermometer_;
+  ACE_NOTREACHED (delete this->thermometer_;)
 }
 // Listing 2
diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
index b24f1c1f329..124eb64ec87 100644
--- a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
+++ b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp
@@ -89,7 +89,7 @@ void Temperature_Monitor2::record_failure (void)
   Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset"));
   Name_Binding_Ptr resetCount (this->naming_context_.fetch ("resetCount"));
 
-  int now = ACE_OS::time ();
+  int now = (int) ACE_OS::time ();
 
   int lastFailureTime;
   int lastResetTime = 0;
@@ -141,5 +141,5 @@ void Temperature_Monitor2::monitor (void)
       ACE_OS::sleep (this->opt_.poll_interval ());
     }
 
-  delete this->thermometer_;
+  ACE_NOTREACHED (delete this->thermometer_;)
 }
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
index 9d9b9dfb0e5..1ed2aa03620 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
@@ -11,7 +11,7 @@
 #include "ace/Proactor.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 // Listing 1 code/ch08
 void
@@ -159,5 +159,5 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* (ACE_WIN32 && != ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
index f66080b62cd..e6d77c141ef 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
@@ -15,7 +15,7 @@
 // Listing 1 code/ch08
 #include "ace/Asynch_IO.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 class HA_Proactive_Service : public ACE_Service_Handler
 {
@@ -59,7 +59,7 @@ public:
 };
 // Listing 2
 
-#endif /* (ACE_WIN32 && != ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 
 #if 0
 // Listing 3 code/ch08
diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp
index 507b6172108..b9842182222 100644
--- a/ACE/examples/APG/Streams/Answerer.cpp
+++ b/ACE/examples/APG/Streams/Answerer.cpp
@@ -399,5 +399,5 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   // Listing 3
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
index e1d5b8c440d..f4dcd8fad69 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -69,7 +69,7 @@ consumer (void *)
 
   int verb = options.verbose ();
   int msiz = options.message_size ();
-  int secs, par1, par2;
+  time_t secs, par1, par2;
   time_t currsec;
 
   if (verb)
@@ -88,7 +88,7 @@ consumer (void *)
   int cnt = 0;
   ACE_OS::time (&currsec);
 
-  par1= (time_t) currsec;
+  par1 = currsec;
 
   while (done == 0
          && (c_stream.recv (mb_p) != -1))
@@ -109,15 +109,17 @@ consumer (void *)
       }
 
     ACE_OS::time (&currsec);
-    par2 = (time_t) currsec;
+    par2 = currsec;
 
     secs = par2 - par1;
 
     if (secs <= 0)
       secs=1;
 
-    cout << "consumer got " << cnt << " messages of size " << msiz
-         << "within " << secs << " seconds" << endl;
+    ACE_DEBUG ((LM_INFO,
+                ACE_TEXT ("consumer got %d messages of size %d ")
+                ACE_TEXT ("within %: seconds\n"),
+                cnt, msiz, secs));
 
     ACE_OS::sleep (2);
     cout << "consumer terminating " << endl;
diff --git a/ACE/examples/C++NPv1/Logging_Server.cpp b/ACE/examples/C++NPv1/Logging_Server.cpp
index c685412c769..6162e7017db 100644
--- a/ACE/examples/C++NPv1/Logging_Server.cpp
+++ b/ACE/examples/C++NPv1/Logging_Server.cpp
@@ -27,7 +27,7 @@ int Logging_Server::run (int argc, char *argv[])
       return -1;
   }
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 
diff --git a/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index ad6fdc684af..b78059df0fd 100644
--- a/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -140,7 +140,7 @@ Process_Per_Connection_Logging_Server::run_master (int argc, char *argv[])
     if (handle_connections () == -1)
       return -1;
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.h b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.h
index edf3651cf46..3a63c61686e 100644
--- a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.h
+++ b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.h
@@ -42,7 +42,7 @@ public:
         return -1;
     }
 
-    return 0;
+    ACE_NOTREACHED (return 0;)
   }
 };
 
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
index 8885b0353cd..c25f9508ce5 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -13,7 +13,7 @@
 
 ACE_RCSID(blocking, SPIPE_acceptor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 Svc_Handler::Svc_Handler (void)
   : mb_ (BUFSIZ + 1)
@@ -188,16 +188,17 @@ IPC_Server::svc (void)
           // Run single-threaded.
           if (n_threads_ <= 1)
             run_reactor_event_loop (0);
-          else if (ACE_Thread_Manager::instance ()->spawn_n
+          else
+            {
+              if (ACE_Thread_Manager::instance ()->spawn_n
                    (n_threads_,
                     run_reactor_event_loop,
                     0,
                     THR_NEW_LWP) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("%p\n"),
-                                 ACE_TEXT ("spawn_n")),
-                                1);
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   ACE_TEXT ("%p\n"),
+                                   ACE_TEXT ("spawn_n")),
+                                  1);
 
               ACE_Thread_Manager::instance ()->wait ();
             }
@@ -219,6 +220,6 @@ IPC_Server::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 #endif /* SPIPE_ACCEPTOR_C */
 
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
index 546941c48fb..af4d3d52aae 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
@@ -18,7 +18,7 @@
 
 // This only works on Win32 platforms and on Unix platforms
 // supporting POSIX aio calls.
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 // This is the class that does the work once the ACE_Oneshot_Acceptor
 // has accepted a connection.
@@ -74,6 +74,6 @@ private:
   // Signal handler method.
 };
 
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 #endif /* SP_ACCEPTOR_H */
 
diff --git a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
index 549690ebf43..62a6d776c84 100644
--- a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
+++ b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
@@ -6,7 +6,7 @@
 
 ACE_RCSID(blocking, test_spipe_acceptor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/ACE/examples/DLL/README b/ACE/examples/DLL/README
index 716b2c2b628..3526af927a9 100644
--- a/ACE/examples/DLL/README
+++ b/ACE/examples/DLL/README
@@ -34,11 +34,11 @@ Compilation and Execution:
    to exercise the test.
 
 
-2. On NT or any Win32 platform:
+2. Win32 platforms:
 
-   Load Dll.dsw which contains Test_dll.dsp, Today.dsp and Newsweek.dsp.
+   Load DLL.sln which contains DLL_Main.vcproj, DLL_Today.vcproj and DLL_Newsweek.vcproj.
 
-   Build each dsp such that you build Test_dll.dsp last.
+   Build each vcproj such that you build DLL_Main.vcproj last.
    This is because the test_dll.exe will be using Today.dll and Newsweek.dll. 
 
    Execute test_dll
diff --git a/ACE/examples/DLL/test_dll.cpp b/ACE/examples/DLL/test_dll.cpp
index 49f385aff98..2831592a0ce 100644
--- a/ACE/examples/DLL/test_dll.cpp
+++ b/ACE/examples/DLL/test_dll.cpp
@@ -20,7 +20,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_DLL dll;
 
-  int retval = dll.open (ACE_TEXT("./") ACE_DLL_PREFIX ACE_TEXT("DLL_Today"));
+  int retval = dll.open (ACE_DLL_PREFIX ACE_TEXT("DLL_Today"));
 
   if (retval != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index e4cf8997857..1781f6ab8b8 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   struct hostent *hp;
   const ACE_TCHAR *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
   u_short port_num =
-    htons (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT);
+    ACE_HTONS (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT);
   int sockbufsize = argc > 3 ? ACE_OS::atoi (argv[3]) : 0;
   char buf[BUFSIZ];
   ACE_HANDLE s_handle;
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
index 0a6915cc463..94d538f1672 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
@@ -20,7 +20,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_OS::socket_init (ACE_WSOCK_VERSION);
 
   u_short port_num =
-    htons (argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT);
+    ACE_HTONS (argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT);
   int sockbufsize = argc > 2 ? ACE_OS::atoi (argv[2]) : 0;
   struct sockaddr_in saddr;
   ACE_HANDLE s_handle, n_handle;
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index ed24bd697bb..95583fe5c16 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -66,7 +66,7 @@ Options::init (void)
                   -1);
 
   // Copy the length into the beginning of the message.
-  ACE_UINT32 length = ntohl (this->message_len_);
+  ACE_UINT32 length = ACE_NTOHL (this->message_len_);
   ACE_OS::memcpy ((void *) this->message_buf_,
                   (void *) &length,
                   sizeof length);
@@ -207,7 +207,7 @@ Options::shared_client_test (u_short port,
                 remote_addr.get_host_name (),
                 remote_addr.get_port_number ()));
 
-  ACE_INT32 len = htonl (this->message_len ());
+  ACE_INT32 len = ACE_HTONL (this->message_len ());
 
   // Allocate the transmit buffer.
   char *buf;
@@ -354,7 +354,7 @@ Options::twoway_client_test (void *)
   ACE_Time_Value tv;
 
   timer.elapsed_time_incr (tv);
-  double real_time = tv.sec () * ACE_ONE_SECOND_IN_USECS + tv.usec ();
+  double real_time = (long) tv.sec () * ACE_ONE_SECOND_IN_USECS + tv.usec ();
   double messages_per_sec = iteration * double (ACE_ONE_SECOND_IN_USECS) / real_time;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
index f299bc36a36..b39d33940fa 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
@@ -99,7 +99,7 @@ twoway_server (void *arg)
         }
       else
         {
-          len = ntohl (len);
+          len = ACE_NTOHL (len);
           ACE_NEW_RETURN (request,
                           char [len],
                           0);
@@ -215,7 +215,7 @@ oneway_server (void *arg)
         }
       else
         {
-          len = ntohl (len);
+          len = ACE_NTOHL (len);
           ACE_NEW_RETURN (request,
                           char [len],
                           0);
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
index 83333ccc357..b5f6b7f914e 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
@@ -204,7 +204,7 @@ main (int, char *[])
 }
 #else
 #include "ace/OS_NS_stdio.h"
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_OS::fprintf (stderr, "This feature is not supported\n");
   return 0;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
index 22535160cf0..6be3ce47b9e 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
@@ -355,7 +355,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
index 8563067af03..c1f173cd72f 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
@@ -414,7 +414,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SSL_Context *context = ACE_SSL_Context::instance ();
 
diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
index fac6447d898..dc9d8d689a4 100644
--- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -13,6 +13,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Singleton.h"
+#include "ace/CDR_Stream.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/Test_and_Set.h"
 
 // FUZZ: disable check_for_streams_include
@@ -100,61 +102,91 @@ Logging_Handler::handle_timeout (const ACE_Time_Value &,
 int
 Logging_Handler::handle_input (ACE_HANDLE)
 {
-  // Perform two recv's to emulate record-oriented semantics.  Note
-  // that this code is not entirely portable since it relies on the
-  // fact that sizeof (ssize_t) is the same on both the sender and
-  // receiver side.  To correctly handle this is painful, and we leave
-  // it as an exercise for the reader ;-).
-
-  ssize_t len;
-  ssize_t n = this->peer ().recv ((void *) &len, sizeof len);
-
-  switch (n)
+  ACE_Log_Record log_record;
+
+  // We need to use the old two-read trick here since TCP sockets
+  // don't support framing natively.  Allocate a message block for the
+  // payload; initially at least large enough to hold the header, but
+  // needs some room for alignment.
+  ACE_Message_Block *payload_p = 0;
+  ACE_Message_Block *header_p = 0;
+  ACE_NEW_RETURN (header_p,
+                  ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
+                  -1);
+
+  auto_ptr <ACE_Message_Block> header (header_p);
+
+  // Align the Message Block for a CDR stream
+  ACE_CDR::mb_align (header.get ());
+
+  ACE_CDR::Boolean byte_order;
+  ACE_CDR::ULong length;
+
+  ssize_t count = ACE::recv_n (this->peer ().get_handle (), 
+			       header->wr_ptr (),
+			       8);
+  switch (count)
     {
+      // Handle shutdown and error cases.
+    default:
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                         ACE_TEXT ("client logger"), this->peer_name_), -1);
-      /* NOTREACHED */
     case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) closing log daemon at host %C (fd = %d)\n"),
-                         this->peer_name_, this->get_handle ()), -1);
-      /* NOTREACHED */
-    case sizeof (size_t):
-      {
-        ACE_Log_Record lp;
-
-        len = ntohl (len);
-        n = this->peer ().recv_n ((void *) &lp, len);
-
-        if (n != len)
-          ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                             ACE_TEXT ("client logger"), this->peer_name_),-1);
-        /* NOTREACHED */
-
-        lp.decode ();
-
-        if (lp.length () == n)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, cerr);
-#else
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, stderr);
-#endif
-          }
-        else
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) error, lp.length = %d, n = %d\n"),
-                      lp.length (), n));
-        break;
-      }
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                         ACE_TEXT ("client logger"), this->peer_name_), -1);
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("server logging daemon closing down\n")));
+
+      return -1;
       /* NOTREACHED */
+
+    case 8:
+      // Just fall through in this case..
+      break;
     }
 
+  header->wr_ptr (8); // Reflect addition of 8 bytes.
+
+  // Create a CDR stream to parse the 8-byte header.
+  ACE_InputCDR header_cdr (header.get ());
+
+  // Extract the byte-order and use helper methods to disambiguate
+  // octet, booleans, and chars.
+  header_cdr >> ACE_InputCDR::to_boolean (byte_order);
+
+  // Set the byte-order on the stream...
+  header_cdr.reset_byte_order (byte_order);
+
+  // Extract the length
+  header_cdr >> length;
+  
+  ACE_NEW_RETURN (payload_p,
+                  ACE_Message_Block (length),
+                  -1);
+  auto_ptr <ACE_Message_Block> payload (payload_p);
+
+  // Ensure there's sufficient room for log record payload.
+  ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
+
+  // Use <recv_n> to obtain the contents.
+  if (ACE::recv_n (this->peer ().get_handle (),
+                   payload->wr_ptr (),
+                   length) <= 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("recv_n()")));
+      return -1;
+    }
+
+  payload->wr_ptr (length);   // Reflect additional bytes
+
+  ACE_InputCDR payload_cdr (payload.get ());
+  payload_cdr.reset_byte_order (byte_order);
+  payload_cdr >> log_record;  // Finally extract the <ACE_log_record>.
+
+  log_record.length (length);
+
+  log_record.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, stderr);
+
   return 0;
 }
 
diff --git a/ACE/examples/Logger/client/logging_app.cpp b/ACE/examples/Logger/client/logging_app.cpp
index ba5bb24295e..1b407229e35 100644
--- a/ACE/examples/Logger/client/logging_app.cpp
+++ b/ACE/examples/Logger/client/logging_app.cpp
@@ -6,6 +6,7 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/Log_Record.h"
 #include "ace/Log_Msg.h"
+#include "ace/CDR_Stream.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_stdlib.h"
@@ -40,16 +41,39 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TCHAR buf[BUFSIZ];
       ACE_OS::sprintf (buf, ACE_TEXT ("message = %d\n"), i + 1);
       log_record.msg_data (buf);
-      size_t len = log_record.length ();
-      size_t encoded_len = htonl (len);
 
-      log_record.encode ();
+      const size_t max_payload_size =
+        4 // type()
+        + 8 // timestamp
+        + 4 // process id
+        + 4 // data length
+        + ACE_Log_Record::MAXLOGMSGLEN // data
+        + ACE_CDR::MAX_ALIGNMENT; // padding;
 
-      if (logger.send (4, &encoded_len, sizeof encoded_len,
-		       (char *) &log_record, len) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send")),-1);
-      else
-	ACE_OS::sleep (1);
+      // Insert contents of <log_record> into payload stream.
+      ACE_OutputCDR payload (max_payload_size);
+      payload << log_record;
+
+      // Get the number of bytes used by the CDR stream.
+      ACE_CDR::ULong length = payload.total_length ();
+
+      // Send a header so the receiver can determine the byte order and
+      // size of the incoming CDR stream.
+      ACE_OutputCDR header (ACE_CDR::MAX_ALIGNMENT + 8);
+      header << ACE_OutputCDR::from_boolean (ACE_CDR_BYTE_ORDER);
+
+      // Store the size of the payload that follows
+      header << ACE_CDR::ULong (length);
+
+      // Use an iovec to send both buffer and payload simultaneously.
+      iovec iov[2];  
+      iov[0].iov_base = header.begin ()->rd_ptr ();
+      iov[0].iov_len  = 8;
+      iov[1].iov_base = payload.begin ()->rd_ptr ();
+      iov[1].iov_len  = length;
+
+      if (logger.sendv_n (iov, 2) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send"), -1);
     }
 
   if (logger.close () == -1)
diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
index 111a26248fc..aacad00c3f1 100644
--- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
+#include "ace/Message_Block.h"
+#include "ace/Log_Record.h"
+#include "ace/OS_NS_string.h"
+#include "ace/CDR_Stream.h"
+#include "ace/Auto_Ptr.h"
 
 #include "Logging_Handler.h"
 #include "Reactor_Singleton.h"
-#include "ace/Log_Record.h"
-#include "ace/OS_NS_string.h"
 
 ACE_RCSID(simple_server, Logging_Handler, "$Id$")
 
@@ -51,56 +54,91 @@ Logging_Handler::handle_timeout (const ACE_Time_Value &,
 int
 Logging_Handler::handle_input (ACE_HANDLE)
 {
-  ssize_t n;
-  size_t len;
-
-  // Perform two recv's to emulate record-oriented semantics.  Note
-  // that this code is not entirely portable since it relies on the
-  // fact that sizeof (ssize_t) is the same on both the sender and
-  // receiver side.  To correctly handle this is painful, and we leave
-  // it as an exercise for the reader ;-).
-
-  switch (n = this->cli_stream_.recv ((void *) &len, sizeof len))
+  ACE_Log_Record log_record;
+
+  // We need to use the old two-read trick here since TCP sockets
+  // don't support framing natively.  Allocate a message block for the
+  // payload; initially at least large enough to hold the header, but
+  // needs some room for alignment.
+  ACE_Message_Block *payload_p = 0;
+  ACE_Message_Block *header_p = 0;
+  ACE_NEW_RETURN (header_p,
+                  ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
+                  -1);
+
+  auto_ptr <ACE_Message_Block> header (header_p);
+
+  // Align the Message Block for a CDR stream
+  ACE_CDR::mb_align (header.get ());
+
+  ACE_CDR::Boolean byte_order;
+  ACE_CDR::ULong length;
+
+  ssize_t count = ACE::recv_n (this->peer ().get_handle (), 
+			       header->wr_ptr (),
+			       8);
+  switch (count)
     {
+      // Handle shutdown and error cases.
+    default:
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                         ACE_TEXT ("client logger"), this->host_name_), -1);
-      /* NOTREACHED */
     case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) closing log daemon at host %s (fd = %d)\n",
-                         this->host_name_, this->get_handle ()), -1);
-      /* NOTREACHED */
-    case sizeof (size_t):
-      {
-        ACE_Log_Record lp;
-
-        len = ntohl (len);
-        n = this->cli_stream_.recv_n ((void *) &lp, len);
-        if (n != (ssize_t) len)
-          ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                             ACE_TEXT ("client logger"), this->host_name_), -1);
-        /* NOTREACHED */
-
-        lp.decode ();
-
-        if (lp.length () == n)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->host_name_), 1);
-          }
-        else
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) error, lp.length = %d, n = %d\n"),
-                      lp.length (), n));
-        break;
-      }
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
-                         ACE_TEXT ("client logger"), this->host_name_), -1);
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("server logging daemon closing down\n")));
+
+      return -1;
       /* NOTREACHED */
+
+    case 8:
+      // Just fall through in this case..
+      break;
     }
 
+  header->wr_ptr (8); // Reflect addition of 8 bytes.
+
+  // Create a CDR stream to parse the 8-byte header.
+  ACE_InputCDR header_cdr (header.get ());
+
+  // Extract the byte-order and use helper methods to disambiguate
+  // octet, booleans, and chars.
+  header_cdr >> ACE_InputCDR::to_boolean (byte_order);
+
+  // Set the byte-order on the stream...
+  header_cdr.reset_byte_order (byte_order);
+
+  // Extract the length
+  header_cdr >> length;
+  
+  ACE_NEW_RETURN (payload_p,
+                  ACE_Message_Block (length),
+                  -1);
+  auto_ptr <ACE_Message_Block> payload (payload_p);
+
+  // Ensure there's sufficient room for log record payload.
+  ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
+
+  // Use <recv_n> to obtain the contents.
+  if (ACE::recv_n (this->peer ().get_handle (),
+                   payload->wr_ptr (),
+                   length) <= 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("recv_n()")));
+      return -1;
+    }
+
+  payload->wr_ptr (length);   // Reflect additional bytes
+
+  ACE_InputCDR payload_cdr (payload.get ());
+  payload_cdr.reset_byte_order (byte_order);
+  payload_cdr >> log_record;  // Finally extract the <ACE_log_record>.
+
+  log_record.length (length);
+
+  log_record.print (ACE_TEXT_CHAR_TO_TCHAR (this->host_name_), 1, stderr);
+
   return 0;
 }
 
diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp
index fbbf4a60cf4..43f09fba0dd 100644
--- a/ACE/examples/NT_Service/main.cpp
+++ b/ACE/examples/NT_Service/main.cpp
@@ -21,6 +21,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ntsvc.h"
+
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 #include "ace/OS_NS_errno.h"
@@ -254,3 +256,15 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   return PROCESS::instance ()->run (argc, argv);
 }
 
+#else
+
+#include "ace/OS_main.h"
+
+int
+ACE_TMAIN (int, ACE_TCHAR*[])
+{
+  // This program needs Windows services.
+  return 0;
+}
+
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/ACE/examples/NT_Service/ntsvc.cpp b/ACE/examples/NT_Service/ntsvc.cpp
index f21dec5dad7..9b6742b46f3 100644
--- a/ACE/examples/NT_Service/ntsvc.cpp
+++ b/ACE/examples/NT_Service/ntsvc.cpp
@@ -21,6 +21,8 @@
 #include "ace/Reactor.h"
 #include "ntsvc.h"
 
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
+
 Service::Service (void)
 {
   // Remember the Reactor instance.
@@ -111,3 +113,4 @@ Service::svc (void)
   return 0;
 }
 
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h
index cecc91b34c5..1444b5977d9 100644
--- a/ACE/examples/NT_Service/ntsvc.h
+++ b/ACE/examples/NT_Service/ntsvc.h
@@ -21,6 +21,10 @@
 #ifndef NTSVC_H_
 #define NTSVC_H_
 
+#include "ace/config-lite.h"
+
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
+
 #include "ace/Event_Handler.h"
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -62,4 +66,6 @@ private:
 
 typedef ACE_Singleton<Service, ACE_Mutex> SERVICE;
 
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
+
 #endif /* #ifndef NTSVC_H_ */
diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp
index 181254e0cb4..02b76ef48f5 100644
--- a/ACE/examples/OS/Process/imore.cpp
+++ b/ACE/examples/OS/Process/imore.cpp
@@ -215,24 +215,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_Process new_process;
 
-  // Notice that we must enclose ACE_Process_Options in the block
-  // so the file handlers it keeps can be close elegantly.
+  // The ACE_Process_Options does not need to be enclosed in a block
+  // because it does not close the file handles, the ACE_Process closes
+  // them upon destruction.
 #if !defined (ACE_WIN32)
-  {
-    ACE_Process_Options options;
+  ACE_Process_Options options;
 
-    if ((use_named_pipe ? ::setup_named_pipes :
-         ::setup_unnamed_pipe) (options) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "Error, bailing out!\n"), -1);
+  if ((use_named_pipe ? ::setup_named_pipes :
+       ::setup_unnamed_pipe) (options) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "Error, bailing out!\n"), -1);
 
-    options.command_line (executable);
-    if (new_process.spawn (options) == -1)
-      {
-        int error = ACE_OS::last_error ();
-        ACE_ERROR_RETURN ((LM_ERROR, "%p errno = %d.\n",
-                           "test_more", error), -1);
-      }
-  }
+  options.command_line (executable);
+  if (new_process.spawn (options) == -1)
+    {
+      int error = ACE_OS::last_error ();
+      ACE_ERROR_RETURN ((LM_ERROR, "%p errno = %d.\n",
+                         "test_more", error), -1);
+    }
 
   // write file to ACE_STDOUT.
   if (::print_file (infile) == -1)
diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp
index a04663b28ad..a49aed52f9c 100644
--- a/ACE/examples/Reactor/Misc/notification.cpp
+++ b/ACE/examples/Reactor/Misc/notification.cpp
@@ -236,9 +236,7 @@ Thread_Handler::handle_input (ACE_HANDLE handle)
 int
 Thread_Handler::svc (void)
 {
-  ACE_Time_Value sleep_timeout (0,
-                                // Transform this into microseconds and divide by 2.
-                                (Thread_Handler::interval_.sec () * ACE_ONE_SECOND_IN_USECS) / 2);
+  ACE_Time_Value sleep_timeout (Thread_Handler::interval_.sec () / 2);
 
   for (int i = this->iterations_;
        i > 0;
diff --git a/ACE/examples/Reactor/Misc/test_signals_2.cpp b/ACE/examples/Reactor/Misc/test_signals_2.cpp
index 466ab58482f..856e06adf91 100644
--- a/ACE/examples/Reactor/Misc/test_signals_2.cpp
+++ b/ACE/examples/Reactor/Misc/test_signals_2.cpp
@@ -168,7 +168,7 @@ public:
 	else
 	  ACE_DEBUG ((LM_DEBUG,
                       "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_,
+                      this->msg_,
                       this->int_sigkey_,
                       this->quit_sigkey_));
       }
@@ -229,7 +229,6 @@ external_handler (int signum)
               signum));
 }
 
-#if !defined (HPUX)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
@@ -273,19 +272,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *[])
                   "\nwaiting for SIGINT or SIGQUIT\n"));
 
       if (reactor.handle_events () == -1)
-	ACE_ERROR ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR,
                     "%p\n",
                     "handle_events"));
     }
 
   ACE_NOTREACHED (return 0);
 }
-#else
-int
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "The HP C++ compiler is too lame to support this feature\n"),
-                    -1);
-}
-#endif /* HPUX */
diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
index 055b57b9975..547430e08e9 100644
--- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -63,9 +63,11 @@ Log_Wrapper::log_message (Log_Priority type, char *message)
   sequence_number_++;
 
   this->log_msg_.type = type;
-  this->log_msg_.time = time (0);
+  // Casting time() to long will start causing bad results sometime in 2038
+  // but the receiver isn't looking at the time, so who cares?
+  this->log_msg_.time = (long) time (0);
   this->log_msg_.msg_length = ACE_OS::strlen(message)+1;
-  this->log_msg_.sequence_number = htonl(sequence_number_);
+  this->log_msg_.sequence_number = ACE_HTONL(sequence_number_);
 
   iovec iovp[2];
   iovp[0].iov_base = reinterpret_cast<char*> (&log_msg_);
diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp
index 65e39b97d1a..ef1b53e670a 100644
--- a/ACE/examples/Reactor/Multicast/server.cpp
+++ b/ACE/examples/Reactor/Multicast/server.cpp
@@ -171,7 +171,7 @@ Server_Events::handle_input (ACE_HANDLE)
       total_messages_received_++;
       total_bytes_received_ += retcode;
       last_sequence_number_ =
-        ntohl (log_record_->sequence_number);
+        ACE_NTOHL (log_record_->sequence_number);
 
       for (char *message_end = this->message_ + ACE_OS::strlen (this->message_) - 1;
            ACE_OS::strchr ("\r\n \t", *message_end) != 0;
diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp
index e6545241953..905c5718e5c 100644
--- a/ACE/examples/Reactor/Proactor/post_completions.cpp
+++ b/ACE/examples/Reactor/Proactor/post_completions.cpp
@@ -44,14 +44,13 @@
 static ACE_Atomic_Op <ACE_SYNCH_MUTEX, size_t> Completions_To_Go;
 
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
 #if defined (ACE_HAS_AIO_CALLS)
 #define RESULT_CLASS ACE_POSIX_Asynch_Result
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#elif defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 #define RESULT_CLASS ACE_WIN32_Asynch_Result
 #endif /* ACE_HAS_AIO_CALLS */
 
@@ -292,7 +291,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -302,5 +301,5 @@ main (int, char *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
index 1f4557d7df5..99d53bda5ac 100644
--- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
@@ -26,7 +26,7 @@
 
 ACE_RCSID(Proactor, test_proactor, "simple_test_proactor.cpp,v 1.1 1999/05/18 22:15:30 alex Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -266,4 +266,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return success ? 0 : 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp
index c10f8e9be2c..49c0c0a6490 100644
--- a/ACE/examples/Reactor/Proactor/test_cancel.cpp
+++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp
@@ -52,7 +52,7 @@
 
 ACE_RCSID (Proactor, test_proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -233,7 +233,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -243,4 +243,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
index 096f77b089d..641a8785c6f 100644
--- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -31,8 +31,7 @@
 #include "ace/POSIX_Proactor.h"
 #include "ace/OS_main.h"
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
@@ -154,7 +153,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -164,5 +163,5 @@ main (int, char *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
index ac4228ab641..5199ac01bb4 100644
--- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -27,7 +27,7 @@
 
 ACE_RCSID(Proactor, test_multiple_loops, "$Id$")
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler
 {
@@ -137,4 +137,4 @@ main (int, char *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp
index 035a2facf6a..db257d2ae96 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp
@@ -39,7 +39,7 @@
 
 ACE_RCSID(Proactor, test_proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -666,7 +666,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -676,4 +676,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index cd5cbf7092e..6afb541eee6 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -42,11 +42,11 @@
 
 ACE_RCSID(Proactor, test_proactor2, "test_proactor2.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "ace/WIN32_Proactor.h"
 
@@ -676,7 +676,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (parse_args (argc, argv) == -1)
     return -1;
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
   ACE_WIN32_Proactor *      pImpl = new ACE_WIN32_Proactor;
 
@@ -805,4 +805,4 @@ int PrintSigMask ()
   return 0;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
index c47468276c8..6aaaa50b4dd 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
@@ -40,11 +40,11 @@
 
 ACE_RCSID(Proactor, test_proactor, "test_proactor.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #	include "ace/WIN32_Proactor.h"
 
@@ -53,7 +53,7 @@ ACE_RCSID(Proactor, test_proactor, "test_proactor.cpp,v 1.27 2000/03/07 17:15:56
 #	include "ace/POSIX_Proactor.h"
 #	include "ace/SUN_Proactor.h"
 
-#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 //  Some debug helper functions
 static int disable_signal (int sigmin, int sigmax);
@@ -114,7 +114,7 @@ MyTask::create_proactor (void)
 
   if (threads_ == 0)
     {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
       ACE_WIN32_Proactor *proactor = new ACE_WIN32_Proactor;
       ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=WIN32"));
 
@@ -861,4 +861,4 @@ print_sigmask (void)
 }
 #endif /* 0 */
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp
index 39351717db9..b1ee421e1d8 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp
@@ -30,8 +30,7 @@
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -116,7 +115,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -127,4 +126,4 @@ main (int, char *[])
   return 1;
 }
 
-#endif /*  ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /*  ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
index ae44c2ba1f4..c7a984b9eb2 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
@@ -24,7 +24,7 @@
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
@@ -96,4 +96,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
index 49d834a2884..c14dc280c9e 100644
--- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -31,8 +31,8 @@
 
 ACE_RCSID(Proactor, test_udp_proactor, "test_proactor.cpp,v 1.29 2001/02/02 23:41:16 shuston Exp")
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || defined (ACE_HAS_AIO_CALLS)
-  // This only works on Win32 platforms.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+  // This only works on asynch I/O-capable platforms.
 
 // Host that we're connecting to.
 static ACE_TCHAR *host = 0;
@@ -418,7 +418,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS*/
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -428,5 +428,5 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index 0778f375251..ba4565cfd95 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -212,7 +212,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
   Task_Handler task (number_of_handles,
                      concurrent_threads);
 
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
   for (int i = 1; i <= iterations; i++)
     {
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index be787293e65..9f773cfd247 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -20,7 +20,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Reactor.h"
 #include "ace/Registry.h"
@@ -143,4 +143,4 @@ ACE_TMAIN (int, ACE_TCHAR **)
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
index 32438088614..dd10962b320 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
@@ -134,7 +134,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "ace/Reactor.h"
 #include "ace/Reactor_Notification_Strategy.h"
@@ -585,10 +585,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   return 0;
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_HAS_WIN32_OVERLAPPED_IO */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
index f5a1994168c..1694933fd7b 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
@@ -21,7 +21,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/Reactor.h"
@@ -97,4 +97,4 @@ ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
diff --git a/ACE/examples/Registry/test_registry_iterator.cpp b/ACE/examples/Registry/test_registry_iterator.cpp
index e24a418ca07..df776ca2fad 100644
--- a/ACE/examples/Registry/test_registry_iterator.cpp
+++ b/ACE/examples/Registry/test_registry_iterator.cpp
@@ -9,7 +9,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Registry.h"
 
@@ -137,10 +137,10 @@ indent (u_long indentation)
   for (; indentation > 0; indentation--)
     cout << " ";
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_WIN32 || ACE_LACKS_WIN32_REGISTRY */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/examples/Registry/test_registry_update.cpp b/ACE/examples/Registry/test_registry_update.cpp
index 443f1a766ff..78cd0aabd8c 100644
--- a/ACE/examples/Registry/test_registry_update.cpp
+++ b/ACE/examples/Registry/test_registry_update.cpp
@@ -15,7 +15,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Registry.h"
 
@@ -152,10 +152,10 @@ setup_names ()
 
   component.id_ = ACE_TEXT ("Instance Counter"), ::counter_name.insert (component);
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_WIN32 || ACE_LACKS_WIN32_REGISTRY */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp
index 83289095444..dafdd5e7ff0 100644
--- a/ACE/examples/Web_Crawler/Command_Processor.cpp
+++ b/ACE/examples/Web_Crawler/Command_Processor.cpp
@@ -76,7 +76,6 @@ Command_Processor::destroy (void)
 {
   delete this;
   return 0;
-return 0;
 }
 
 int
diff --git a/ACE/include/makeinclude/compiler.bor b/ACE/include/makeinclude/compiler.bor
index 380ef48e934..f72603101fe 100644
--- a/ACE/include/makeinclude/compiler.bor
+++ b/ACE/include/makeinclude/compiler.bor
@@ -32,24 +32,14 @@
 # LIB_EXT - the extension to be used for libs
 #
 
-# Get the BCBVER and VCLVER, if it is not set, we default to BCB6.
+# Check for BCBVER
 !if $(BCBVER) == 8
-VCLVER =
 !else
 !if $(BCBVER) == 6
-VCLVER =
-!else
-!if $(BCBVER) == 5
-VCLVER = 50
-!else
-!if $(BCBVER) == 4
-VCLVER = 40
 !else
 !error BCBVER must be explicitly set as environment variable or is set to a not supported value.
 !endif
 !endif
-!endif
-!endif
 
 OBJ_EXT = obj
 LIB_EXT = lib
@@ -79,7 +69,7 @@ CPU_CFLAG =
 DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1
 DEBUG_LFLAGS = -v -L$(BCB)\lib\debug
 !else
-!if $(BCBVER) == 6 || $(BCBVER) == 5
+!if $(BCBVER) == 6
 DEBUG_CFLAGS = -OS -Ov -Og -DNDEBUG
 !else
 DEBUG_CFLAGS = -O2 -DNDEBUG
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU
index a40ffbef07e..864ce829009 100644
--- a/ACE/include/makeinclude/platform_freebsd.GNU
+++ b/ACE/include/makeinclude/platform_freebsd.GNU
@@ -46,7 +46,7 @@ PRELIB = @echo
 ifeq ($(threads),1)
 RET = $(shell test $(OSVERSION) -lt 500016 && printf 1)
 ifeq ($(RET),1)
-  PTHREAD_CFLAGS = -D_THREAD_SAFE
+  PTHREAD_CPPFLAGS = -D_THREAD_SAFE
   PTHREAD_LIBS   = -pthread
 else
   RET = $(shell test $(OSVERSION) -lt 502102 && printf 1)
@@ -57,9 +57,11 @@ else
   endif
 endif # RET
 
-CFLAGS  += $(PTHREAD_CFLAGS)
+CPPFLAGS  += $(PTHREAD_CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
+else
+CPPFLAGS += -DACE_MT_SAFE=0
 endif # threads
 
 # Test for template instantiation, add to SOFLAGS if SONAME set,
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
index 83dce0bb58a..45184c092be 100644
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU
@@ -1,11 +1,6 @@
 # $Id$
 #
-# This is for the HP-UX 10.x and 11.x using the aC++ compiler.
-#
-# For 10.x, most of the difference for threaded vs. non-threaded is
-# contained in ace/config-hpux-10.x.h.  However, to build without threads,
-# you should run the make with "threads=0" since the default is to build
-# with threads.
+# This is for HP-UX 11.x using the aC++ compiler.
 #
 # HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which
 # architecture the build is done on.  This file is set up to build native
@@ -20,6 +15,7 @@ debug ?= 1
 distrib ?= 0
 exceptions ?= 1
 optimize ?= 0
+stdcpplib ?= 1
 threads ?= 1
 versioned_so ?= 0
 
@@ -36,21 +32,6 @@ CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
 CXXMINORVERS := $(word 8, $(CXXVERS_WORDS))
 CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS))
 
-ifeq (,$(stdcpplib))
-# If the user didn't explicitly set stdcpplib, assume that the compiler
-# can do -AA, unless it's a .2x version (e.g., 03.24). 03.27 can do -AA,
-# so check for that one explicitly and enable it if so.
-  ifeq (,$(filter 2%,$(CXXMINORVERS)))
-    stdcpplib = 1
-  else
-    ifeq (27,$(CXXMINORVERS))
-      stdcpplib = 1
-    else
-      stdcpplib = 0
-    endif
-  endif
-endif
-
 ifeq (1,$(stdcpplib))
   CCFLAGS += -AA
   ifeq (03,$(CXXMAJORVERS))
@@ -66,6 +47,8 @@ ifeq (1,$(stdcpplib))
 # JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001.
 # If you still have problems with this area, uncomment the following line:
 #  exceptions = 1
+else
+  CCFLAGS += -AP
 endif
 
 # Set the appropriate preprocessor defs for threading based on OS version
@@ -95,9 +78,7 @@ else
   THR_DEFS = -DACE_HAS_THREADS=0
   # On HP-UX 11, even without building for threads, the *_r reentrant
   # functions are available, and _REENTRANT enables them.
-  ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-    THR_DEFS += -D_REENTRANT
-  endif
+  THR_DEFS += -D_REENTRANT
 endif
 
 ifeq ($(HPMODEL), ia64)
@@ -106,7 +87,9 @@ endif
 
 ifeq (03,$(CXXMAJORVERS))
   # Suppress Warning 302 ((...) parameter list is a non-portable feature)
-  CCFLAGS                += +W302
+  # Suppress Warning 361 (missing return from non-void function)
+  # Suppress Warning 1039(Binary incompatabilty between old and new compilers)
+  CCFLAGS                += +W302,361,1039
 
   ifeq (57,$(CXXMINORVERS))
     # aCC 3.57 has a bug. When a class has private constructors
@@ -166,7 +149,7 @@ endif
 ifeq ($(itanium),1)
  SOEXT		= so
 else
- SOEXT           = sl
+ SOEXT          = sl
 endif
 
 ifeq ($(buildbits),32)
@@ -183,14 +166,9 @@ ifeq ($(buildbits),64)
     CFLAGS += +DD64
     CCFLAGS += +DD64
   else
-    ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-      ## Without the W, it isn't really a 64-bit build
-      CFLAGS += +DA2.0W +DS2.0W
-      CCFLAGS += +DA2.0W +DS2.0W
-    else
-      CFLAGS += +DA2.0 +DS2.0
-      CCFLAGS += +DA2.0 +DS2.0
-    endif
+    ## Without the W, it isn't really a 64-bit build
+    CFLAGS += +DA2.0W +DS2.0W
+    CCFLAGS += +DA2.0W +DS2.0W
   endif
 LDFLAGS         += -Wl,+vnocompatwarnings
 else
@@ -212,3 +190,20 @@ ifeq ($(threads),1)
   endif
 endif
 LIBS          += -lxti -lrt -ldld
+
+# The correct flags to pass to the linker for dynamic shared library
+# versioning
+#
+ifneq ($(SONAME),)
+  SOFLAGS += -Wl,+h -Wl,$(SONAME)
+endif
+
+# if _FILE_OFFSET_BITS==64 then the HP headers will produce
+# spurious 600 warnings, except on 11.23
+# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11
+#
+ifeq ($(64bitoffsets),1)
+  ifneq ($(HPUX_VERS), 1123)
+    CCFLAGS += +W600
+  endif
+endif
diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU
index d4ee47b86c0..bf7c5207448 100644
--- a/ACE/include/makeinclude/platform_hpux_gcc.GNU
+++ b/ACE/include/makeinclude/platform_hpux_gcc.GNU
@@ -1,7 +1,7 @@
 # $Id$
 #
 
-buildbits ?= 0
+buildbits ?= 64
 debug ?= 1
 distrib ?= 0
 exceptions ?= 1
@@ -13,6 +13,7 @@ with_ld ?= hpux
 
 # First, extract the OS version number.
 HPVERS_WORDS := $(subst ., ,$(shell uname -r))
+HPMODEL := $(shell uname -m)
 HPUX_VERS	:= $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
 CC		= gcc
@@ -34,6 +35,10 @@ ifeq ($(threads),1)
   endif
 endif
 
+ifeq ($(HPMODEL), ia64)
+  itanium = 1
+endif
+
 # On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and
 # sys/pthread.h - both define the function, but slightly differently.
 # -fstrict-prototype resolves the issue.
@@ -51,9 +56,25 @@ ARFLAGS		= ruv
 RANLIB		= echo
 LDFLAGS		= -L. -L$(ACE_ROOT)/lib -Wl,+s
 SOFLAGS		+= $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E
-SOEXT		= sl
 SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $<
 PRELIB = @true
+
+ifeq ($(itanium),1)
+  SOEXT           = so
+else
+  SOEXT           = sl
+endif
+
+ifeq ($(itanium),1)
+  ifeq ($(buildbits),64)
+    CCFLAGS     += -mlp64
+    CFLAGS     += -mlp64
+  else
+    CCFLAGS     += -milp32
+    CFLAGS     += -milp32
+  endif
+endif
+
 #
 # Grab the appropriate libraries based on the version of HP-UX we're building
 # on and whether or not thread support is being used.
diff --git a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU b/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
index 1ad3c5c7d3d..8d18862b6dd 100644
--- a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
+++ b/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
@@ -83,8 +83,17 @@ endif
 endif
 
 PIC		= -KPIC
-AR		= ar
-ARFLAGS		= r
+
+ifneq ($(templates),implicit)
+  AR            = ar
+  ARFLAGS       = r
+else
+# We need to create the archive via CC so that the prelinker can
+# instantiate the required templates.
+  AR            = CC -ar
+  ARFLAGS       = -o
+endif # templates != implicit
+
 RANLIB		= echo
 SOFLAGS		+= -shared $(CCFLAGS) $(CPPFLAGS) -all -multigot
 SOBUILD		= $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 86a393c1762..c18863b876d 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -41,12 +41,12 @@ PLATFORM_BOOST_CPPFLAGS ?=
 PLATFORM_BOOST_LDLAGS ?=
 PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework
 
-PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
-PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_CPPFLAGS=
+PLATFORM_TCL_LIBS=-ltcl
 PLATFORM_TCL_LDFLAGS=
 
-PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
-PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG)
 PLATFORM_TK_LDFLAGS=
 
 PLATFORM_AIO_SUPPORT := \
@@ -104,9 +104,9 @@ LIBS    += -ldl
 
 ifeq ($(threads),1)
   LIBS += -lpthread
+  # look for the rt library in the usual places
+  LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 endif
-# look for the rt library in the usual places
-LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 
 ifeq ($(optimize),1)
   SOFLAGS += -Wl,-O3
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 0516a9deeaf..8df824ec7d3 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -70,6 +70,9 @@ endif
 ifeq (9.1,$(findstring 9.1,$(CXX_VERSION)))
   CFLAGS += -wd1684
 endif
+ifeq (10.0,$(findstring 10.0,$(CXX_VERSION)))
+  CFLAGS += -wd1684
+endif
 
 ifeq ($(inline),0)
   CPPFLAGS += -fno-inline
diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU
index 02016cefd4e..43a4e839868 100644
--- a/ACE/include/makeinclude/platform_linux_suncc.GNU
+++ b/ACE/include/makeinclude/platform_linux_suncc.GNU
@@ -103,6 +103,13 @@ ifeq ($(shared_libs), 1)
   endif
 endif
 
+ifeq ($(buildbits),32)
+  CFLAGS   += -m32
+  LDFLAGS  += -m32
+endif
+ifeq ($(buildbits),64)
+  CFLAGS   += -m64
+endif
 
 # Added line below to support "Executable Shared Object" files (as
 # needed by the service configurator).
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 6249592e166..8bccc06db43 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -90,10 +90,6 @@ PLATFORM_TK_CPPFLAGS=
 PLATFORM_TK_LIBS=
 PLATFORM_TK_LDFLAGS=
 
-PLATFORM_SSL_CPPFLAGS=-I/usr/ssl/include
-PLATFORM_SSL_LIBS=
-PLATFORM_SSL_LDFLAGS=-L/usr/ssl/lib
-
 ifeq ($(threads),1)
   CFLAGS  += -mthreads
   SOFLAGS += -mthreads
diff --git a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
index 344ca621a8e..cc0a6db11aa 100644
--- a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
+++ b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU
@@ -2,8 +2,6 @@
 #
 # QNX/RTP hosted, using gcc-2.95.2
 
-nto_version := $(shell uname -a | awk '{ gsub("\\.","", $$3 ); print $$3;}')
-
 inline ?= 1
 debug ?= 1
 optimize ?= 0
@@ -33,8 +31,7 @@ endif #debug
 CC      ?= gcc
 CXX     ?= g++
 
-CFLAGS  += -pipe -W -Wall -Wpointer-arith -DACE_NTO_VERS=$(nto_version)
-CPPFLAGS += -DACE_NTO_VERS=$(nto_version)
+CFLAGS  += -pipe -W -Wall -Wpointer-arith
 
 DLD     = $(CXX)
 LD      = $(CXX)
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 00813ebcffd..2f74d549406 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -9,6 +9,7 @@ optimize ?= 1
 exceptions ?= 1
 rtti ?= 1
 threads ?= 1
+pipes ?= 1
 
 shared_libs =
 static_libs = 1
@@ -34,12 +35,13 @@ ifeq (no,$(RTEMS_HAS_NETWORKING))
  CCFLAGS += -DACE_LACKS_NETWORKING
 endif
 
-CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
-CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
 ifeq (0,$(rtti))
   CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
 endif # rtti
 DCFLAGS         += -g
+DCCFLAGS        += -g
 DLD             = $(LD)
 INCLDIRS        +=
 
diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU
index 335c10f362a..8db177d16c5 100644
--- a/ACE/include/makeinclude/platform_tru64_cxx.GNU
+++ b/ACE/include/makeinclude/platform_tru64_cxx.GNU
@@ -93,7 +93,7 @@ ifneq ($(SONAME),)
 endif
 
 CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG)
-DCFLAGS         += -g -O0
+DCFLAGS         += -g1 -O0
 DLD             = $(CXX)
 LD              = $(CXX)
 #### The -hidden [...] -non_hidden business avoids multiply defined
diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
index c73e42594b1..d793875a660 100644
--- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -22,18 +22,12 @@ ifneq (,$(HOST_ROOT))
   TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
 endif
 
-ifeq ("$(OS)", "Windows_NT")
-ifneq ($(MAKE_MODE), unix)
-vxworks_ntbuild = 1
-MKDIR_NTSTYLE = 1
-endif
-endif
-
 debug ?= 1
 optimize ?= 1
 rtti ?= 1
 threads ?= 1
 exceptions ?= 1
+xerces ?= 0
 
 ifeq ($(static_libs),1)
   shared_libs = 0
@@ -55,11 +49,11 @@ ifeq (,$(WIND_HOST_TYPE))
 	@ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-ifeq ($(DIAB_HOST_TYPE),)
-ifeq ("$(OS)", "Windows_NT")
-  DIAB_HOST_TYPE = WIN32
-else
-  DIAB_HOST_TYPE = UNIX
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+ifneq ($(MAKE_MODE), unix)
+vxworks_ntbuild = 1
+MKDIR_NTSTYLE = 1
+lacks_touch = 1
 endif
 endif
 
diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU
index 229abff0a6f..e3fccd1ec7f 100644
--- a/ACE/include/makeinclude/platform_vxworks6.2.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU
@@ -22,13 +22,6 @@ ifneq (,$(HOST_ROOT))
   TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
 endif
 
-ifeq ("$(OS)", "Windows_NT")
-ifneq ($(MAKE_MODE), unix)
-vxworks_ntbuild = 1
-MKDIR_NTSTYLE = 1
-endif
-endif
-
 debug ?= 1
 optimize ?= 1
 rtti ?= 1
@@ -36,6 +29,7 @@ threads ?= 1
 exceptions ?= 1
 rtp ?= 1
 pthread ?= 1
+xerces ?= 0
 
 ifeq ($(static_libs),1)
   shared_libs = 0
@@ -57,11 +51,11 @@ ifeq (,$(WIND_HOST_TYPE))
 	@ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-ifeq ($(DIAB_HOST_TYPE),)
-ifeq ("$(OS)", "Windows_NT")
-  DIAB_HOST_TYPE = WIN32
-else
-  DIAB_HOST_TYPE = UNIX
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+ifneq ($(MAKE_MODE), unix)
+vxworks_ntbuild ?= 1
+MKDIR_NTSTYLE ?= 1
+lacks_touch ?= 1
 endif
 endif
 
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 91c59adc0da..dc0deb43d43 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -16,19 +16,6 @@
 VXWORKS = 1
 CROSS-COMPILE = 1
 
-ifneq (,$(HOST_ROOT))
-  TAO_IDL ?= $(HOST_ROOT)/bin/tao_idl$(EXEEXT)
-  TAO_IDL_DEP ?= $(TAO_IDL)
-  TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
-endif
-
-ifeq ("$(OS)", "Windows_NT")
-ifneq ($(MAKE_MODE), unix)
-vxworks_ntbuild = 1
-MKDIR_NTSTYLE = 1
-endif
-endif
-
 debug ?= 1
 optimize ?= 1
 rtti ?= 1
@@ -36,6 +23,8 @@ threads ?= 1
 exceptions ?= 1
 rtp ?= 1
 pthread ?= 1
+xerces ?= 0
+aio ?= 0
 
 ifeq ($(static_libs),1)
   shared_libs = 0
@@ -57,12 +46,30 @@ ifeq (,$(WIND_HOST_TYPE))
 	@ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-ifeq ($(DIAB_HOST_TYPE),)
-ifeq ("$(OS)", "Windows_NT")
-  DIAB_HOST_TYPE = WIN32
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+  vxworks_ntbuild ?= 0
+  mingw32 ?= 1
+  lacks_touch ?= 0
+  PWD=$(subst \,/,$(shell pwd))
+  ACE_ROOT:=$(subst \,/,$(ACE_ROOT))
+  TAO_ROOT:=$(subst \,/,$(TAO_ROOT))
+  CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT))
+endif # x86-win32
+
+ifneq (,$(HOST_ROOT))
+TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+  TAO_IDL = $(HOST_ROOT)/bin/tao_idl.exe
+  TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2.exe
+  CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc.exe
 else
-  DIAB_HOST_TYPE = UNIX
+  TAO_IDL = $(HOST_ROOT)/bin/tao_idl
+  TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2
+  CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc
 endif
+TAO_IDL_DEP = $(TAO_IDL)
+TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
+CIDLC_DEP = $(CIDLC)
 endif
 
 HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
@@ -173,6 +180,13 @@ ifeq ($(rtp),1)
   include $(WIND_USR)/make/defs.$(WIND_HOST_TYPE)
   ifeq ("$(TOOL_FAMILY)","gnu")
     CPPFLAGS += -mrtp
+    SOFLAGS += -mrtp
+  endif
+  ifeq ($(SHARED_LIBS), 1)
+    ifeq ($(aio),1)
+      CPPFLAGS += -DACE_HAS_AIO_CALLS
+      LIBS += AioPx
+    endif
   endif
   LDFLAGS := $(filter-out -X, $(LDFLAGS))
   LDFLAGS := $(filter-out -N, $(LDFLAGS))
@@ -183,7 +197,6 @@ ifeq ($(rtp),1)
   else
     LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common
   endif
-  LDLIBS += -ldl
 else
   include $(TGT_DIR)/h/make/defs.default
   include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE)
@@ -191,6 +204,18 @@ else
   include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 endif
 
+ifeq ($(SHARED_LIBS), 1)
+ifeq ("$(TOOL_FAMILY)","gnu")
+  PIC = -fpic
+  SOFLAGS += -fpic -shared
+  LDFLAGS += -non-static
+else
+  PIC = -Xpic
+  SOFLAGS += -Xshared
+  LDFLAGS += -Xdynamic
+endif
+endif
+
 ## make sure we don't use that stupid, crippled vxrm.bat script.
 override RM=rm -f
 
@@ -296,7 +321,7 @@ endif
 endif # rtti
 
 ifeq ("$(TOOL_FAMILY)","diab")
-  LDLIBS += -lstlstd
+  LIBS += -lstlstd
 endif
 
 ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),)
@@ -319,18 +344,6 @@ endif
 
 CCFLAGS         += $(C++FLAGS)
 
-ifeq (0,$(rtp))
-PIC              =
-else
-  ifeq ("$(TOOL_FAMILY)","diab")
-    PIC = -Xpic
-  else
-  ifeq ("$(TOOL_FAMILY)","gnu")
-    PIC = -fpic
-  endif
-endif
-endif
-
 ifeq ("$(VXWORKSLINK)","true")
 
   ifdef repo
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 2b0ded6127f..8cff7458812 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -156,7 +156,8 @@ $(VLIB): $(VLOBJS)
         #### to lib files, for example.
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
   endif # ace_lib_prelink
-	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
+	([ "`echo $(TMPINCDIR:%=%/*.o)`" != "$(TMPINCDIR:%=%/*.o)" ] && echo $(TMPINCDIR:%=%/*.o); \
+	echo $(filter %.o, $?)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
   ifdef ibmcxx_build
 # This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates.
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index 67878326f76..6d08b6f6586 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -32,6 +32,7 @@ ifdef sun
 endif
 
 vxworks_ntbuild ?= 0
+lacks_touch ?= 0
 
 #### TEMPLATE_REPOSITORY can be set in individual platform files
 #### to create template repository directories.  See
@@ -418,7 +419,7 @@ ORIGdepend.local: $(MAKEFILE)
 
 ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
 $(DEPENDENCY_FILE):
-ifeq ($(vxworks_ntbuild),1)
+ifeq ($(lacks_touch),1)
 	copy NUL "$(DEPENDENCY_FILE)"
 else
 	touch $(DEPENDENCY_FILE)
@@ -460,15 +461,6 @@ IDL_CLIENT_HDR_EXT ?=
 
 idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)$(IDL_CLIENT_HDR_EXT))
 
-ifdef $(TAO_IDL_DEP)
-$(TAO_IDL_DEP):
-	@if test ! -s $(TAO_IDL_DEP); then \
-	  echo " ***"; \
-	  echo " *** ERROR: $(TAO_IDL_DEP) not found."; \
-	  echo " ***"; \
-	  echo; /bin/false; fi
-endif # TAO_IDL_DEP
-
 #----------------------------------------------------------------------------
 #       RCS info target
 #----------------------------------------------------------------------------
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index e3f13eb7363..25bf80c53a3 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -377,8 +377,6 @@ VAR             =
 VDIR          ?= .obj/
 VSHDIR        ?= .shobj/
 
-ACELIB ?= -lACE
-
 # NOTE: VLDLIBS is defined below, in case it is overridden for static-
 #       or shared-only builds.
 ifeq (default,$(origin YACC))
@@ -589,18 +587,18 @@ ifneq ($(gl),)
   ACE_MAKE_OPTIONS += gl
 endif # gl
 
-ssl ?=
+ssl ?= 0
 ifeq ($(ssl),0)
   override ssl =
 else
-  ifneq ($(SSL_ROOT),)
-    # Don't do a thing..
-  else
-    CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS)
-    LDFLAGS  += $(PLATFORM_SSL_LDFLAGS)
-    LIBS     += $(PLATFORM_SSL_LIBS)
-    ACE_MAKE_OPTIONS += ssl
+  ifneq ($(SSL_ROOT), /usr)
+    ifneq ($(SSL_ROOT),)
+      PLATFORM_SSL_CPPFLAGS += -I$(SSL_ROOT)/include
+      PLATFORM_SSL_LDFLAGS  += -L$(SSL_ROOT)/lib
+    endif
   endif
+  PLATFORM_SSL_LIBS ?= -lssl -lcrypto
+  ACE_MAKE_OPTIONS  += ssl
 endif
 
 ## These are related to MPC.  When 'requires' is used in a project
@@ -705,7 +703,7 @@ else # ! shared_libs
   endif # static_libs
 endif # shared_libs
 
-VLDLIBS = $(LDLIBS) $(ACELIB) $(LIBS)
+VLDLIBS = $(LDLIBS) $(LIBS)
 
 probe ?=
 ifeq ($(probe),0)
@@ -781,6 +779,7 @@ pipes ?= 0
 # platform_macros.GNU file.
 ifeq ($(pipes),1)
    CFLAGS += -pipe
+   CCFLAGS += -pipe
 endif # pipes
 
 # RMCast is turned on by default
diff --git a/ACE/m4/compiler.m4 b/ACE/m4/compiler.m4
index 6367b036ce4..ca5f95d8e4d 100644
--- a/ACE/m4/compiler.m4
+++ b/ACE/m4/compiler.m4
@@ -338,10 +338,10 @@ dnl @todo Clean up / consolidate these conditionals
      [
       case "${enableval}" in
        yes)
-	 ace_user_symbol_visibility=yes
+         ace_user_enable_symbol_visibility=yes
 	 ;;
        no)
-	 ace_user_symbol_visibility=no
+         ace_user_enable_symbol_visibility=no
 	 ;;
        *)
 	 AC_MSG_ERROR([bad value ${enableval} for --enable-symbol-visibility])
@@ -366,7 +366,7 @@ dnl @todo Clean up / consolidate these conditionals
 			])
    fi
  fi
- 
+
  dnl Additional flags
  if test "$GXX" = yes; then
    case `$CXX --version` in
diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am
index 54b8ed75617..c525ee11ec6 100644
--- a/ACE/netsvcs/lib/Makefile.am
+++ b/ACE/netsvcs/lib/Makefile.am
@@ -30,6 +30,7 @@ libnetsvcs_la_SOURCES = \
   Name_Handler.cpp \
   Server_Logging_Handler.cpp \
   Server_Logging_Handler_T.cpp \
+  Time_Request_Reply.cpp \
   TS_Clerk_Handler.cpp \
   TS_Server_Handler.cpp \
   Token_Handler.cpp
@@ -42,6 +43,7 @@ noinst_HEADERS = \
   Server_Logging_Handler.h \
   Server_Logging_Handler_T.cpp \
   Server_Logging_Handler_T.h \
+  Time_Request_Reply.h \
   TS_Clerk_Handler.h \
   TS_Server_Handler.h \
   Token_Handler.h
diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp
index 7d085c1c3cc..8be8ed89a79 100644
--- a/ACE/netsvcs/lib/Name_Handler.cpp
+++ b/ACE/netsvcs/lib/Name_Handler.cpp
@@ -292,7 +292,7 @@ ACE_Name_Handler::recv_request (void)
     case sizeof (ACE_UINT32):
       {
         // Transform the length into host byte order.
-        ssize_t length = ntohl (this->name_request_.length ());
+        ssize_t length = ACE_NTOHL (this->name_request_.length ());
 
         // Do a sanity check on the length of the message.
         if (length > (ssize_t) sizeof this->name_request_)
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
index 2077c1162ae..ca9517350f4 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -187,14 +187,14 @@ ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE)
   else
     {
       // Get current local time
-      ACE_UINT32 local_time = ACE_OS::time (0);
+      time_t local_time = ACE_OS::time (0);
 
       // Compure delta time (difference between current local time and
       // system time obtained from the server)
-      long t = reply.time () - local_time;
+      time_t t = reply.time () - local_time;
 
       // Compute round trip delay and adjust time accordingly
-      ACE_UINT32 one_way_time = (local_time - this->start_time_)/2;
+      time_t one_way_time = (local_time - this->start_time_)/2;
       t += one_way_time;
 
       // Now update time info (to be retrieved by Clerk_Processor)
@@ -338,15 +338,15 @@ ACE_TS_Clerk_Processor::alloc (void)
   if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR) ==  -1)
     {
       // Allocate the space out of shared memory for the system time entry
-      void *temp = this->shmem_->malloc (sizeof (this->system_time_));
+      time_t *temp = (time_t *)(this->shmem_->malloc (2 * sizeof (time_t)));
 
       // Give it a name binding
       this->shmem_->bind (ACE_DEFAULT_TIME_SERVER_STR, temp);
 
       // Set up pointers. Note that we add one to get to the second
       // field in the structure
-      this->system_time_.delta_time_ = (long *) temp;
-      this->system_time_.last_local_time_ = ((long *) temp) + 1;
+      this->system_time_.delta_time_ = temp;
+      this->system_time_.last_local_time_ = temp + 1;
 
       // Initialize
       *(this->system_time_.delta_time_) = 0;
@@ -373,7 +373,7 @@ ACE_TS_Clerk_Processor::update_time ()
   this->cur_sequence_num_++;
 
   int count = 0;
-  long total_delta = 0;
+  time_t total_delta = 0;
   ACE_Time_Info time_info;
 
   //  Call send_request() on all handlers
@@ -421,7 +421,7 @@ ACE_TS_Clerk_Processor::update_time ()
   *(this->system_time_.last_local_time_) = ACE_OS::time (0);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Average delta time: %d\n"),
-              *(this->system_time_.delta_time_)));
+              (int)(*(this->system_time_.delta_time_))));
   return 0;
 }
 
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h
index b322e82eef8..f549394971e 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.h
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h
@@ -24,10 +24,11 @@
 #include "ace/MMAP_Memory_Pool.h"
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
-#include "ace/Time_Request_Reply.h"
 #include "ace/svc_export.h"
 #include "ace/os_include/os_dirent.h"
 
+#include "Time_Request_Reply.h"
+
 /**
  * @class ACE_Time_Info
  *
@@ -37,7 +38,7 @@ class ACE_Time_Info
 {
 
 public:
-  long delta_time_;
+  time_t delta_time_;
 
   ACE_UINT32 sequence_num_;
 };
@@ -157,7 +158,7 @@ private:
   ACE_TS_Clerk_Processor *processor_;
 
   /// Time at which request was sent (used to compute round trip delay)
-  ACE_UINT32 start_time_;
+  time_t start_time_;
 
   /// Next sequence number of time request (waiting for this update from
   /// the server).
@@ -230,8 +231,8 @@ private:
 
   struct System_Time
     {
-      long *delta_time_;       // Difference between system time and local time
-      long *last_local_time_;  // Last local time
+      time_t *delta_time_;       // Diff between system time and local time
+      time_t *last_local_time_;  // Last local time
     };
 
   /// Clerk system time containing pointers to entries in shared memory
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h
index 142c98ecdc1..1fca9bce0fe 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.h
+++ b/ACE/netsvcs/lib/TS_Server_Handler.h
@@ -22,9 +22,10 @@
 
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Svc_Handler.h"
-#include "ace/Time_Request_Reply.h"
 #include "ace/svc_export.h"
 
+#include "Time_Request_Reply.h"
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class ACE_Svc_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
diff --git a/ACE/ace/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp
index 7692b73bf45..aede65c2c25 100644
--- a/ACE/ace/Time_Request_Reply.cpp
+++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp
@@ -1,13 +1,17 @@
 // $Id$
 
-#include "ace/Time_Request_Reply.h"
+#include "ace/Basic_Types.h"
+#include "ace/CDR_Base.h"
 #include "ace/Log_Msg.h"
+#include "ace/Truncate.h"
 #include "ace/os_include/netinet/os_in.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-ACE_RCSID(ace, Time_Request_Reply, "$Id$")
+#define ACE_BUILD_SVC_DLL
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Time_Request_Reply.h"
+
+ACE_RCSID(lib, Time_Request_Reply, "$Id$")
 
 // Default "do nothing" constructor.
 
@@ -19,7 +23,7 @@ ACE_Time_Request::ACE_Time_Request (void)
 // Create a ACE_Time_Request message.
 
 ACE_Time_Request::ACE_Time_Request (ACE_INT32 t, // Type of request.
-                                    const ACE_UINT32 time,
+                                    const time_t time,
                                     ACE_Time_Value *timeout) // Max time waiting for request.
 {
   ACE_TRACE ("ACE_Time_Request::ACE_Time_Request");
@@ -41,7 +45,7 @@ ACE_Time_Request::ACE_Time_Request (ACE_INT32 t, // Type of request.
     }
 
   // Copy time into request
-  this->time_ = this->transfer_.time_ = time;
+  this->transfer_.time_ = this->time_ = time;
 }
 
 // Initialize length_ in order to avoid problems with byte-ordering
@@ -95,7 +99,8 @@ ACE_Time_Value
 ACE_Time_Request::timeout (void) const
 {
   ACE_TRACE ("ACE_Time_Request::timeout");
-  return ACE_Time_Value (this->transfer_.sec_timeout_, this->transfer_.usec_timeout_);
+  time_t sec = ACE_Utils::truncate_cast<time_t> (this->transfer_.sec_timeout_);
+  return ACE_Time_Value (sec, this->transfer_.usec_timeout_);
 }
 
 void
@@ -107,7 +112,7 @@ ACE_Time_Request::timeout (const ACE_Time_Value& timeout)
 }
 
 // = Set/get the time
-ACE_UINT32
+time_t
 ACE_Time_Request::time (void) const
 {
   ACE_TRACE ("ACE_Time_Request::time");
@@ -115,7 +120,7 @@ ACE_Time_Request::time (void) const
 }
 
 void
-ACE_Time_Request::time (ACE_UINT32 t)
+ACE_Time_Request::time (time_t t)
 {
   ACE_TRACE ("ACE_Time_Request::time");
   this->time_ = t;
@@ -132,9 +137,13 @@ ACE_Time_Request::encode (void *&buf)
   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_);
+#if defined (ACE_LITTLE_ENDIAN)
+  ACE_UINT64 secs = this->transfer_.sec_timeout_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.sec_timeout_);
+  secs = this->transfer_.time_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.time_);
+#endif
 
   return this->size ();  // Always fixed
 }
@@ -148,11 +157,15 @@ ACE_Time_Request::decode (void)
   // 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->time_ = this->transfer_.time_;
+#if defined (ACE_LITTLE_ENDIAN)
+  ACE_UINT64 secs = this->transfer_.sec_timeout_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.sec_timeout_);
+  secs = this->transfer_.time_;
+  ACE_CDR::swap_8 ((const char *)&secs, (char *)&this->transfer_.time_);
+#endif
+
+  this->time_ = ACE_Utils::truncate_cast<time_t> (this->transfer_.time_);
   return 0;
 }
 
@@ -185,12 +198,10 @@ ACE_Time_Request::dump (void) const
       ACE_Time_Value tv = this->timeout ();
 #endif /* ! ACE_NLOGGING */
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"),
-                  tv.sec (), tv.usec ()));
+                  (int)(tv.sec ()), tv.usec ()));
     }
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\ntime = %d\n"),
-              this->time ()));
+              (int)(this->time ())));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("+++++++\n")));
 #endif /* ACE_HAS_DUMP */
 }
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Time_Request_Reply.h b/ACE/netsvcs/lib/Time_Request_Reply.h
index 8c062cbd9a5..530c5693899 100644
--- a/ACE/ace/Time_Request_Reply.h
+++ b/ACE/netsvcs/lib/Time_Request_Reply.h
@@ -19,13 +19,12 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Time_Value.h"
+#include "ace/svc_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ACE_Time_Request
  *
@@ -34,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * This class is implemented to minimize data copying.
  * In particular, all marshaling is done in situ...
  */
-class ACE_Export ACE_Time_Request
+class ACE_Svc_Export ACE_Time_Request
 {
 public:
   enum Constants
@@ -56,7 +55,7 @@ public:
    * @param timeout Max time waiting for request.
    */
   ACE_Time_Request (ACE_INT32 msg_type,
-                    const ACE_UINT32 time,
+                    const time_t time,
                     ACE_Time_Value *timeout = 0);
 
   /**
@@ -76,10 +75,10 @@ public:
   void msg_type (ACE_INT32);
 
   /// Get the time
-  ACE_UINT32 time (void) const;
+  time_t time (void) const;
 
   // Set the time
-  void time (ACE_UINT32 t);
+  void time (time_t t);
 
   /// Get the blocking semantics.
   ACE_UINT32 block_forever (void) const;
@@ -117,23 +116,21 @@ private:
     ACE_UINT32 block_forever_;
 
     /// Max seconds willing to wait for name if not blocking forever.
-    ACE_UINT32 sec_timeout_;
+    ACE_UINT64 sec_timeout_;
 
     /// Max micro seconds to wait for name if not blocking forever.
     ACE_UINT32 usec_timeout_;
 
     /// The data portion contains <time_>
-    ACE_UINT32 time_;
+    ACE_UINT64 time_;
   };
 
   /// Transfer buffer.
   Transfer transfer_;
 
   /// Time
-  ACE_UINT32 time_;
+  time_t time_;
 };
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 #endif /* ACE_TIME_REQUEST_REPLY_H */
diff --git a/ACE/netsvcs/lib/lib.mpc b/ACE/netsvcs/lib/lib.mpc
index d1e2f34a9fa..4a3e04a17f7 100644
--- a/ACE/netsvcs/lib/lib.mpc
+++ b/ACE/netsvcs/lib/lib.mpc
@@ -6,6 +6,7 @@ project(netsvcs): acelib {
   sharedname    = netsvcs
   dynamicflags += ACE_NETSVCS_BUILD_DLL
   Source_Files {
+    Time_Request_Reply.cpp
     TS_Server_Handler.cpp
     TS_Clerk_Handler.cpp
     Client_Logging_Handler.cpp
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index 7f98883bfad..c6e0ae7342e 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -57,7 +57,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
   ACE_ERROR_RETURN((LM_ERROR,
                     ACE_TEXT ("SCTP was NOT installed/accessible when this binary was compiled.\n")),
                    1);
-#endif
+#else
 
   // check that valid options were specified
   if (optsMgr._error) {
@@ -107,6 +107,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
     ACE_SCTP::report();
 
   return 0;
+#endif /* ACE_HAS_SCTP */
 }
 
 // create a histogram to store test results
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
index 84db9afc541..f0826eeb9f1 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
@@ -33,6 +33,8 @@ extern "C" {
 // class that manages setting of options
 #include "Options_Manager.h"
 
+#ifdef ACE_HAS_SCTP
+
 // structure to bundle arguments for thread functions
 struct ArgStruct {
   ACE_SOCK_SEQPACK_Association * stream;
@@ -212,6 +214,9 @@ static void run_server (ACE_HANDLE handle)
 
 }
 
+#endif
+
+
 int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts"));
@@ -227,7 +232,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
   ACE_ERROR_RETURN((LM_ERROR,
                     ACE_TEXT ("SCTP was NOT installed/accessible when this binary was compiled.\n")),
                    1);
-#endif
+#else
 
   // check that valid options were specified
   if (optsMgr._error) {
@@ -356,4 +361,5 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   }
   return 0;
+#endif /* ACE_HAS_SCTP */
 }
diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
index c2d3cceb1fc..a9ff3959a42 100644
--- a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
@@ -354,5 +354,5 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
     }
 
   }
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.cpp b/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
index bd14abcce3d..1270b681e0e 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
@@ -76,7 +76,7 @@ ACE::HTBP::Environment::initialize (int use_registry,
 int
 ACE::HTBP::Environment::open_registry_config ()
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
   HKEY root =
     ACE_Configuration_Win32Registry::resolve_key
     (HKEY_LOCAL_MACHINE,ACE_TEXT("Software\\HTBP\\Environment"));
@@ -88,7 +88,7 @@ ACE::HTBP::Environment::open_registry_config ()
 #else
   errno = ENOTSUP;
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 }
 
 int
diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp
index bf670c04de0..979041dbe00 100644
--- a/ACE/protocols/ace/RMCast/Link.cpp
+++ b/ACE/protocols/ace/RMCast/Link.cpp
@@ -30,7 +30,7 @@ namespace ACE_RMCast
         stop_ (false)
 
   {
-    srand (time (0));
+    srand ((unsigned int) time (0));
 
 
     rsock_.set_option (IP_MULTICAST_LOOP, 0);
diff --git a/ACE/protocols/ace/RMCast/Simulator.cpp b/ACE/protocols/ace/RMCast/Simulator.cpp
index ca6d81d47e4..ed0d786e535 100644
--- a/ACE/protocols/ace/RMCast/Simulator.cpp
+++ b/ACE/protocols/ace/RMCast/Simulator.cpp
@@ -9,7 +9,7 @@ namespace ACE_RMCast
   Simulator::
   Simulator ()
   {
-    srand (time (0));
+    srand ((unsigned int)time (0));
   }
 
   void Simulator::
diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp
index 1f2b2a60dfd..e153b23c94d 100644
--- a/ACE/protocols/ace/TMCast/Group.cpp
+++ b/ACE/protocols/ace/TMCast/Group.cpp
@@ -333,7 +333,7 @@ namespace ACE_TMCast
     }
 
     GroupImpl (ACE_INET_Addr const& addr, char const* id)
-      throw (Group::Failed)
+      ACE_THROW_SPEC((Group::Failed))
         : send_cond_ (mutex_),
           recv_cond_ (mutex_),
           failed_ (false),
@@ -356,7 +356,7 @@ namespace ACE_TMCast
 
     void
     send (void const* msg, size_t size)
-      throw (Group::InvalidArg, Group::Failed, Group::Aborted)
+      ACE_THROW_SPEC((Group::InvalidArg, Group::Failed, Group::Aborted))
     {
       if (size > Protocol::MAX_PAYLOAD_SIZE) throw InvalidArg ();
 
@@ -410,7 +410,8 @@ namespace ACE_TMCast
 
 
     size_t
-    recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
+    recv (void* msg, size_t size)
+      ACE_THROW_SPEC((Group::Failed, Group::InsufficienSpace))
     {
       AutoLock lock (mutex_);
 
@@ -481,7 +482,7 @@ namespace ACE_TMCast
   //
   Group::
   Group (ACE_INET_Addr const& addr, char const* id)
-    throw (Group::Failed)
+    ACE_THROW_SPEC((Group::Failed))
       : pimpl_ (new GroupImpl (addr, id))
   {
   }
@@ -492,13 +493,15 @@ namespace ACE_TMCast
   }
 
   void
-  Group::send (void const* msg, size_t size) throw (Group::InvalidArg, Group::Failed, Group::Aborted)
+  Group::send (void const* msg, size_t size)
+    ACE_THROW_SPEC((Group::InvalidArg, Group::Failed, Group::Aborted))
   {
     pimpl_->send (msg, size);
   }
 
   size_t
-  Group::recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
+  Group::recv (void* msg, size_t size)
+    ACE_THROW_SPEC((Group::Failed, Group::InsufficienSpace))
   {
     return pimpl_->recv (msg, size);
   }
diff --git a/ACE/protocols/ace/TMCast/Group.hpp b/ACE/protocols/ace/TMCast/Group.hpp
index 13c49f210bb..d2e4746deee 100644
--- a/ACE/protocols/ace/TMCast/Group.hpp
+++ b/ACE/protocols/ace/TMCast/Group.hpp
@@ -23,14 +23,16 @@ namespace ACE_TMCast
   public:
     ~Group ();
 
-    Group (ACE_INET_Addr const& addr, char const* id) throw (Failed);
+    Group (ACE_INET_Addr const& addr, char const* id) ACE_THROW_SPEC((Failed));
 
   public:
     void
-    send (void const* msg, size_t size) throw (InvalidArg, Failed, Aborted);
+    send (void const* msg, size_t size)
+      ACE_THROW_SPEC((InvalidArg, Failed, Aborted));
 
     size_t
-    recv (void* msg, size_t size) throw (Failed, InsufficienSpace);
+    recv (void* msg, size_t size)
+      ACE_THROW_SPEC((Failed, InsufficienSpace));
 
   private:
     bool
diff --git a/ACE/protocols/examples/TMCast/Member/member.cpp b/ACE/protocols/examples/TMCast/Member/member.cpp
index f89c68564ea..7aad7736ccf 100644
--- a/ACE/protocols/examples/TMCast/Member/member.cpp
+++ b/ACE/protocols/examples/TMCast/Member/member.cpp
@@ -28,7 +28,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     else if (argv[1][0] == 's') receiver = false;
     else throw Args ();
 
-    if (!receiver) ACE_OS::srand (ACE_OS::time ());
+    if (!receiver) ACE_OS::srand ((u_int) ACE_OS::time ());
 
     ACE_INET_Addr address (argv[3]);
 
diff --git a/ACE/protocols/examples/example_base.mpb b/ACE/protocols/examples/example_base.mpb
deleted file mode 100644
index 71b8b3452c6..00000000000
--- a/ACE/protocols/examples/example_base.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-// Anything specific to examples could be added here. 
-// examples.mwc uses the implicit keyword to cause this 
-// project to be used as the base for all examples,
-project : aceexe {
-}
\ No newline at end of file
diff --git a/ACE/protocols/examples/examples.mwc b/ACE/protocols/examples/examples.mwc
index 975ad4e462d..dd297256b34 100644
--- a/ACE/protocols/examples/examples.mwc
+++ b/ACE/protocols/examples/examples.mwc
@@ -2,13 +2,4 @@
 // $Id$
 
 workspace {
-  // This doesn't work quite yet, because not all the projects
-  // can be created implicitly. To fix this, we can either create
-  // a separate directory for each separate project, or we can
-  // add mpc files for C++NPv1/2 and other problem directories.
-  // The nice thing about splitting up into separate directories is
-  // that it completely eliminates mpc maintenance.
-
-  implicit = example_base
-  cmdline += -include $PWD
 }
diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp
index a31b8a9f6a1..b7fd8c59049 100644
--- a/ACE/tests/Auto_Event_Test.cpp
+++ b/ACE/tests/Auto_Event_Test.cpp
@@ -186,7 +186,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_THREADS)
   parse_args (argc, argv);
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
   //Test timed waits.
   for (size_t i = 0; i < test_timeout_count; i++)
diff --git a/ACE/tests/Bug_2815_Regression_Test.cpp b/ACE/tests/Bug_2815_Regression_Test.cpp
new file mode 100644
index 00000000000..dc831ed6b13
--- /dev/null
+++ b/ACE/tests/Bug_2815_Regression_Test.cpp
@@ -0,0 +1,498 @@
+/**
+ * @file Bug_2815_Regression_Test.cpp
+ *
+ * $Id$
+ *
+ * Verify that the notification queue can be used with large numbers
+ * of event handlers.
+ *
+ * Normally the ACE_Reactor uses a pipe to implement the notify()
+ * methods.  ACE can be compiled with
+ * ACE_HAS_REACTOR_NOTIFICATION_QUEUE, with this configuration flag
+ * the Reactor uses a user-space queue to contain the notifications.
+ * A single message is sent through the pipe to indicate "pipe not
+ * empty."
+ *
+ * In this configuration, if an event handler is removed
+ * from the Reactor the user-space queue has to be searched for
+ * pending notifications and the notifications must be removed.
+ *
+ * The original implementation used a naive algorithm to search and
+ * remove the handlers, which resulted in very high overhead when
+ * removing handlers while having a very long notification queue.
+ *
+ * @author Carlos O'Ryan <coryan@atdesk.com>
+ *
+ */
+
+#include "test_config.h"
+#include "ace/Reactor.h"
+#include "ace/TP_Reactor.h"
+#include "ace/Select_Reactor.h"
+
+ACE_RCSID(tests,
+          Bug_2815_Regression_Test, "$Id$")
+
+class One_Shot_Handler;
+
+/**
+ * @class Driver
+ *
+ * @brief Main driver for the test, generates notification events and
+ * verifies they are received correctly.
+ *
+ */
+class Driver
+{
+public:
+  Driver(ACE_Reactor * reactor,
+	 int max_notifications,
+	 char const *test_name);
+
+  /// Run the test
+  void run (void);
+  
+  /// One of the sub-handlers has received a notification
+  void notification_received ();
+  
+  /// One of the sub-handlers has decided to skip several notifications
+  void notifications_skipped (int skip_count);
+	
+  /**
+   * @brief Return the reactor configured for this test
+   */
+  ACE_Reactor * reactor ();
+
+private:
+  /**
+   * @brief Implement a single iteration.
+   *
+   * Each iteration of the test consists of sending multiple
+   * notifications simultaneously.
+   */
+  void send_notifications (void);
+
+  /**
+   * @brief Return true if the test is finished.
+   */
+  bool done (void) const;
+  
+  /**
+   * @brief Return true if there are more iterations to run.
+   */
+  bool more_iterations () const;
+  
+  /**
+   * @brief Return true if the current iteration is completed.
+   */
+  bool current_iteration_done () const;
+  
+  /**
+   * @brief Run one iteration of the test, each iteration doubles
+   * the number of events.
+   */
+  int run_one_iteration (void);
+  
+  /**
+   * @brief Initialize a bunch of One_Shot_Handlers
+   */
+  void initialize_handlers(
+    int nhandlers, One_Shot_Handler ** handlers);
+	
+  /**
+   * @brief Dispatch events to the One_Shot_Handlers
+   */
+  void notify_handlers(
+    int nhandlers, One_Shot_Handler ** handlers);
+
+  /**
+   * @brief Helpful for debugging
+   *
+   * The number of notifications received, skipped and sent are
+   * subject to simple invariants.  During debugging any violation of
+   * those invariants indicates a problem in the application or the
+   * Reactor.
+   */
+  void check_notification_invariants();
+
+  /// A good place to set break points.
+  void invariant_failed();
+
+private:
+  /**
+   * @brief The reactor used in this test
+   */
+  ACE_Reactor * reactor_;
+
+  /**
+   * @brief The maximum number of notifications in any single
+   * iteration.
+   */
+  int max_notifications_;
+
+  /**
+   * @brief The name of the test
+   */
+  char const * test_name_;
+
+  /**
+   * @brief Number of notifications received
+   */
+  int notifications_sent_;
+
+  /**
+   * @brief Number of notifications sent
+   */
+  int notifications_recv_;
+
+  /**
+   * @brief Number of notifications skipped because
+   * the handler was removed
+   */
+  int notifications_skipped_;
+
+  /**
+   * @brief Number of notifications sent on each iteration
+   */
+  int notifications_curr_;
+};
+
+/**
+ * @class One_Shot_Handler
+ *
+ * @brief A handler that removes itself from the reactor
+ * after its first notification.
+ *
+ * To demonstrate the problems with the first implementation of
+ * the notification queue we generate multiple event handlers.
+ * Then we generate multiple notifications for each, but the handlers
+ * remove themselves from the reactor when the first notification
+ * is delivered.  This causes a lot of activity in the notification
+ * queue.
+ *
+ */
+class One_Shot_Handler : public ACE_Event_Handler
+{
+public:
+  One_Shot_Handler(
+    Driver * master_handler,
+	char const * test_name,
+	int id);
+
+  /// Increase the number of expected notifications
+  void notification_queued();
+  
+  /// Receive the notifications, but remove itself from the reactor on
+  /// on the first one.
+  virtual int handle_exception(ACE_HANDLE);
+
+private:
+  /// The driver for this test, communicate results to it
+  Driver * master_handler_;
+
+  /// The number of expected notifications
+  int expected_notifications_;
+
+  /// Identify the test and handler for debugging and better error output
+  char const * test_name_;
+  int id_;  
+};
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("Bug_2815_Regression_Test"));
+
+#if !defined(ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
+  ACE_DEBUG ((LM_INFO,
+              ACE_TEXT ("Notification queue disabled. ")
+              ACE_TEXT ("This test depends on purge_pending_notifications. ")
+              ACE_TEXT ("Thus, the test is disabled in this case\n")));
+
+#else
+  int max_notifications = 512 * 1024;
+
+  {
+    ACE_Reactor select_reactor (
+        new ACE_Select_Reactor,
+        1);
+
+    Driver handler(&select_reactor,
+		   max_notifications,
+		   "Select_Reactor");
+
+    handler.run ();
+  }
+
+  {
+    ACE_Reactor tp_reactor (new ACE_TP_Reactor,
+                            1);
+    Driver handler(&tp_reactor,
+		   max_notifications,
+		   "TP_Reactor");
+    handler.run();
+  }
+
+#endif /* ACE_HAS_THREADS */
+  ACE_END_TEST;
+
+  return 0;
+}
+
+Driver::Driver (
+    ACE_Reactor * reactor,
+    int max_notifications,
+    char const * test_name)
+  : reactor_(reactor)
+  , max_notifications_(max_notifications)
+  , test_name_(test_name)
+  , notifications_sent_(0)
+  , notifications_recv_(0)
+  , notifications_skipped_(0)
+  , notifications_curr_(1)
+{
+}
+
+void
+Driver::run (void)
+{
+  while(more_iterations())
+  {
+    if(run_one_iteration() == -1)
+      {
+	return;
+      }
+
+    notifications_curr_ *= 2;
+  }
+
+  ACE_DEBUG ((LM_INFO,
+	      ACE_TEXT ("Test %C passed sent=%d, recv=%d, skip=%d\n"),
+	      test_name_,
+	      notifications_sent_,
+	      notifications_recv_,
+	      notifications_skipped_));
+}
+
+void
+Driver::notification_received ()
+{
+  ++notifications_recv_;
+  check_notification_invariants();
+}
+
+void
+Driver::notifications_skipped (int skip_count)
+{
+  notifications_skipped_ += skip_count;
+  check_notification_invariants();
+}
+
+ACE_Reactor *
+Driver::reactor()
+{
+  return reactor_;
+}
+
+void
+Driver::send_notifications (void)
+{
+  int const nhandlers = 16;
+  One_Shot_Handler * handlers[nhandlers];
+  initialize_handlers(nhandlers, handlers);
+  
+  for (int i = 0; i != notifications_curr_; ++i)
+  {
+    notify_handlers(nhandlers, handlers);
+  }
+}
+
+bool
+Driver::done (void) const
+{
+  return !more_iterations() && current_iteration_done();
+}
+
+bool
+Driver::more_iterations() const
+{
+  return notifications_curr_ < max_notifications_;
+}
+
+bool
+Driver::current_iteration_done() const
+{
+  return notifications_sent_ == (notifications_recv_ + notifications_skipped_);
+}
+
+int
+Driver::run_one_iteration (void)
+{
+  ACE_DEBUG ((LM_INFO,
+              ACE_TEXT ("Running iteration with %d events for %C test\n"),
+	      notifications_curr_,
+	      test_name_));
+
+  send_notifications ();
+
+  // Run for 30 seconds or until the test is done.
+
+  ACE_Time_Value const timeout(30,0);
+
+  while (!current_iteration_done())
+  {
+    ACE_Time_Value start = ACE_OS::gettimeofday();
+    ACE_Time_Value interval(1,0);
+    reactor()->run_reactor_event_loop(interval);
+    ACE_Time_Value end = ACE_OS::gettimeofday();
+
+    if (end - start >= timeout)
+      {
+	ACE_ERROR ((LM_ERROR,
+		    ACE_TEXT ("Test %C failed due to timeout ")
+		    ACE_TEXT (" sent=%d,recv=%d,skip=%d\n"),
+		    test_name_,
+		    notifications_sent_,
+		    notifications_recv_,
+		    notifications_skipped_));
+	return -1;
+      }
+  }
+
+  return 0;
+}
+
+void
+Driver::initialize_handlers(
+  int nhandlers, One_Shot_Handler ** handlers)
+{
+  for (int j = 0; j != nhandlers; ++j)
+  {
+    handlers[j] = new One_Shot_Handler(this, test_name_, j);
+  }
+}
+
+void
+Driver::notify_handlers(
+  int nhandlers, One_Shot_Handler ** handlers)
+{
+  for(int i = 0; i != nhandlers; ++i)
+  {
+    if(reactor()->notify (handlers[i]) == -1)
+      {
+	ACE_ERROR((LM_ERROR,
+		   ACE_TEXT ("Cannot send notifications in %C test (%d/%d)\n"),
+		   test_name_, i, notifications_curr_));
+	return;
+      }
+    handlers[i]->notification_queued();
+
+    ++notifications_sent_;
+  }
+}
+
+void Driver::
+check_notification_invariants()
+{
+  if (notifications_sent_ < 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("The number of notifications sent (%d)")
+		  ACE_TEXT(" should be positive\n"),
+		  notifications_sent_));
+      invariant_failed();
+    }
+
+  if (notifications_recv_ < 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("The number of notifications received (%d)")
+		  ACE_TEXT(" should be positive\n"),
+		  notifications_recv_));
+      invariant_failed();
+    }
+
+  if (notifications_skipped_ < 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("The number of notifications skipped (%d)")
+		  ACE_TEXT(" should be positive\n"),
+		  notifications_skipped_));
+      invariant_failed();
+    }
+  
+  if (notifications_sent_ < notifications_recv_)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("Too many notifications received (%d)")
+		  ACE_TEXT(" vs sent (%d)\n"),
+		  notifications_recv_, notifications_sent_));
+      invariant_failed();
+    }
+
+  if (notifications_sent_ < notifications_skipped_)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("Too many notifications skipped (%d)")
+		  ACE_TEXT(" vs sent (%d)\n"),
+		  notifications_skipped_, notifications_sent_));
+      invariant_failed();
+    }
+
+  if (notifications_skipped_ + notifications_recv_ > notifications_sent_)
+    {
+      ACE_ERROR ((LM_ERROR,
+		  ACE_TEXT("Too many notifications skipped (%d)")
+		  ACE_TEXT(" and received (%d) vs sent (%d)\n"),
+		  notifications_skipped_, notifications_recv_,
+		  notifications_sent_));
+      invariant_failed();
+    }
+}
+
+void Driver::
+invariant_failed()
+{
+  // Just a good place to set a breakpoint
+}
+
+// ============================================
+
+One_Shot_Handler::One_Shot_Handler(
+	Driver * master_handler,
+	char const * test_name, int id)
+  : ACE_Event_Handler(master_handler->reactor())
+  , master_handler_(master_handler)
+  , expected_notifications_(0)
+  , test_name_(test_name)
+  , id_(id)
+{
+}
+
+void One_Shot_Handler::
+notification_queued()
+{
+  ++expected_notifications_;
+}
+  
+int One_Shot_Handler::
+handle_exception(ACE_HANDLE)
+{
+  --expected_notifications_;
+  master_handler_->notification_received();
+  
+  int r = reactor()->purge_pending_notifications(this);
+  if (r >= 0)
+    {
+      master_handler_->notifications_skipped(r);
+      delete this;
+      return 0;
+    }
+	
+  ACE_ERROR((LM_ERROR,
+	     ACE_TEXT ("Cannot remove handler %d in %C test\n"),
+	     id_, test_name_));
+
+  delete this;
+  return 0;
+}
diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp
new file mode 100644
index 00000000000..68828bc7d65
--- /dev/null
+++ b/ACE/tests/Bug_2820_Regression_Test.cpp
@@ -0,0 +1,141 @@
+/**
+ * @file Bug_2820_Regression_Test.cpp
+ *
+ * $Id$
+ *
+ * Verify that the event handler reference counting works correctly
+ * when the reactor is destroyed.
+ *
+ * Pushing a notification through the reactor increments the reference
+ * count on the target event handler.  Both dispatching and purging
+ * the notification decrement the reference count.  However,
+ * destroying the reactor used to not decrement the reference count.
+ * This test reproduces the problem and serves as a regression for it.
+ *
+ * @author Carlos O'Ryan <coryan@atdesk.com>
+ *
+ */
+
+#include "test_config.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Reactor.h"
+#include "ace/Select_Reactor.h"
+
+ACE_RCSID(tests,
+          Bug_2820_Regression_Test, "$Id$")
+
+/**
+ * @class Simple_Handler
+ *
+ * @brief A simple event handler for the test
+ *
+ */
+class Simple_Handler : public ACE_Event_Handler
+{
+public:
+  /// Constructor
+  Simple_Handler(ACE_Reactor * reactor);
+
+  /// Destructor
+  ~Simple_Handler();
+
+  /// Receive (and ignore) the notifications
+  virtual int handle_exception(ACE_HANDLE);
+};
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("Bug_2820_Regression_Test"));
+
+  int result = 0;
+
+  auto_ptr<ACE_Reactor> reactor(
+      new ACE_Reactor(new ACE_Select_Reactor, 1));
+
+  ACE_Event_Handler_var v(
+      new Simple_Handler(reactor.get()));
+
+  ACE_Event_Handler::Reference_Count pre_notify_count =
+    v->add_reference();
+
+  int const notify_count = 4;
+  for(int i = 0; i != notify_count; ++i)
+    {
+      reactor->notify(v.handler());
+    }
+
+  ACE_Event_Handler::Reference_Count pos_notify_count =
+    v->add_reference();
+
+  if(pos_notify_count != pre_notify_count + notify_count + 1)
+    {
+      result = -1;
+      ACE_ERROR((LM_ERROR,
+		 ACE_TEXT("Reference count should increase by %d.")
+		 ACE_TEXT("  Initial count=%d, final count = %d\n"),
+		 notify_count, pre_notify_count, pos_notify_count));
+    }
+
+  ACE_auto_ptr_reset(reactor, (ACE_Reactor*)0);
+
+  // Reset the reactor in the event handler, since it is gone.p
+  v->reactor(0);
+
+  ACE_Event_Handler::Reference_Count pos_release_count =
+    v->add_reference();
+
+  // Only our explicit calls to add_reference() should be reflected in
+  // the refence_count...
+  if (pos_release_count != pre_notify_count + 2)
+    {
+      result = -1;
+      ACE_ERROR((LM_ERROR,
+		 ACE_TEXT("Reference count should have increased by 2.")
+		 ACE_TEXT("  Initial count=%d, final count = %d\n"),
+		 pre_notify_count, pos_release_count));
+    }
+
+  ACE_DEBUG ((LM_INFO,
+	      ACE_TEXT("Ref count results.  pre_notify refcount=%d,")
+	      ACE_TEXT(" pos_notify=%d, pos_delete=%d\n"),
+	      pre_notify_count, pos_notify_count, pos_release_count));
+  
+  // Remove a reference for each time we explicitly increased it.
+  v->remove_reference();
+  v->remove_reference();
+  ACE_Event_Handler::Reference_Count pos_remove_count =
+      v->remove_reference();
+
+  ACE_DEBUG ((LM_INFO,
+	      ACE_TEXT("Ref count results.  pre_notify refcount=%d,")
+	      ACE_TEXT(" pos_notify=%d, pos_delete=%d, pos_remove=%d\n"),
+	      pre_notify_count, pos_notify_count, pos_release_count,
+	      pos_remove_count));
+
+  ACE_END_TEST;
+
+  return result;
+}
+
+// ============================================
+
+Simple_Handler::
+Simple_Handler(
+    ACE_Reactor * r)
+  : ACE_Event_Handler(r)
+{
+  reference_counting_policy().value(
+        ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
+}
+
+Simple_Handler::
+~Simple_Handler()
+{
+}
+
+int Simple_Handler::
+handle_exception(ACE_HANDLE)
+{
+  return 0;
+}
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index 92f92631073..6aeb97a5e7b 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -27,6 +27,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 #include "ace/ACE.h"
+#include "ace/Truncate.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -87,9 +88,11 @@ operator << (ostream &os,
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n"
                         "Char:               %c\n"
-      "Short:              %u\n"
+                        "Short:              %u\n"
                         "Long:               %d\n"),
-                    t.char_, t.word2_, t.word4_));
+              t.char_,
+              t.word2_,
+              t.word4_));
 
   ACE_CDR::ULongLong hi = (t.word8_ >> 32);
   ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff);
@@ -97,12 +100,13 @@ operator << (ostream &os,
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n"
                         "ULongLong 1st half: %x\n"
-      "ULongLong 2nd half: %x\n"
+                        "ULongLong 2nd half: %x\n"
                         "Float:              %f\n"
                         "Double:             %f\n"),
-                        ACE_U64_TO_U32(hi),
-                        ACE_U64_TO_U32(lo),
-                        t.fpoint_, t.dprec_));
+              ACE_Utils::truncate_cast<ACE_UINT32> (hi),
+              ACE_Utils::truncate_cast<ACE_UINT32> (lo),
+              t.fpoint_,
+              t.dprec_));
 #else
   os << "Char:              " << t.char_ << endl
      << "Short:             " << t.word2_ << endl
@@ -113,11 +117,11 @@ operator << (ostream &os,
 
   os << "ULongLong 1st half: "
      << hex
-     << ACE_U64_TO_U32 (hi)
+     << ACE_Utils::truncate_cast<ACE_UINT32> (hi)
      << dec << endl
      << "ULongLong 2nd half: "
      << hex
-     << ACE_U64_TO_U32 (lo)
+     << ACE_Utils::truncate_cast<ACE_UINT32> (lo)
      << dec << endl
      << "Float:             " << t.fpoint_ << endl
      << "Double:            " << t.dprec_ << endl;
diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index 64717629458..700b2d7f5d7 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -112,11 +112,13 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDL
       return result;
     }
 
-  // If the error occured due to teh fact that the file descriptor
+  // If the error occured due to the fact that the file descriptor
   // limit was exhausted, then purge the connection cache of some
   // entries.
-  result = this->out_of_sockets_handler ();
-  ACE_ASSERT (result == 0);
+  if (0 != this->out_of_sockets_handler ())
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("out_of_sockets_handler")));
 
   // Close down handler to avoid memory leaks.
   svc_handler->close (0);
@@ -281,10 +283,19 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
                                    ACE_Reactor::instance (),
                                    0,
                                    &listen_one_time_accept_strategy);
-  ACE_ASSERT (result == 0);
+  if (result != 0)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("acceptor open")));
+      return;
+    }
 
   result = listen_one_time_acceptor.acceptor ().get_local_addr (server_addr);
-  ACE_ASSERT (result == 0);
+  if (result != 0)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("acceptor getaddr")));
+      listen_one_time_acceptor.close ();
+      return;
+    }
 
   for (int i = 1; i <= iterations; ++i)
     {
@@ -311,7 +322,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("open")));
-              ACE_ASSERT (0);
+              break;
             }
 
           if (listen_multiple_times_acceptor.acceptor ().get_local_addr (server_addr) == -1)
@@ -319,7 +330,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("get_local_addr")));
-              ACE_ASSERT (0);
+              break;
             }
 
         }
@@ -330,11 +341,10 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
                         server_addr.get_port_number ()));
 
       // Run the cached blocking test.
-      int result = cached_connect (strategy_connector,
-                                   server_addr);
-      ACE_ASSERT (result != -1);
-
-      server ();
+      if (-1 == cached_connect (strategy_connector, server_addr))
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("cached_connect")));
+      else
+        server ();
     }
 }
 
@@ -465,8 +475,8 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Consume all handles in the process, leaving us
   // <keep_handles_available> to play with.
   ACE_Handle_Gobbler handle_gobbler;
-  result = handle_gobbler.consume_handles (keep_handles_available);
-  ACE_ASSERT (result == 0);
+  if (0 != handle_gobbler.consume_handles (keep_handles_available))
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("handle_gobbler")));
 
   // Do we need to test all the strategies.  Note, that the less
   // useful null strategy is ignored in this case.
diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp
index c55cc4f44b0..1bd3eef6aaa 100644
--- a/ACE/tests/Cached_Allocator_Test.cpp
+++ b/ACE/tests/Cached_Allocator_Test.cpp
@@ -153,7 +153,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT (" (%t) Creating allocator: ")
-              ACE_TEXT ("%d chunks, %d bytes each\n"),
+              ACE_TEXT ("%B chunks, %B bytes each\n"),
               n_chunks,
               chunk_size));
 
@@ -161,13 +161,11 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   if ((depth = allocator.pool_depth ()) != n_chunks)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
+                ACE_TEXT ("Expected pool depth %B but reported %B\n"),
                 n_chunks, depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
-              ACE_TEXT (" (%t) Allocating chunk 1: %d bytes, should succeed...\n"),
+              ACE_TEXT (" (%t) Allocating chunk 1: %B bytes, should succeed...\n"),
               requested_size));
 
   ptr1 = (char *) allocator.malloc (requested_size);
@@ -177,14 +175,12 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) OK, succeeded.\n")));
   if ((depth = allocator.pool_depth ()) != (n_chunks - 1))
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
+                ACE_TEXT ("Expected pool depth %B but reported %B\n"),
                 n_chunks - 1, depth));
 
   requested_size = chunk_size + 1;
   ACE_DEBUG ((LM_INFO,
-              ACE_TEXT (" (%t) Allocating chunk 2: %d bytes, too big, should fail...\n"),
+              ACE_TEXT (" (%t) Allocating chunk 2: %B bytes, too big, should fail...\n"),
               requested_size));
 
   ptr2 = (char *) allocator.malloc (requested_size);
@@ -195,7 +191,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   requested_size = chunk_size - 1;
   ACE_DEBUG ((LM_INFO,
-              ACE_TEXT (" (%t) Allocating chunk 3: %d bytes, ")
+              ACE_TEXT (" (%t) Allocating chunk 3: %B bytes, ")
               ACE_TEXT ("should succeed...\n"),
               requested_size));
   ptr3 = (char *) allocator.malloc (requested_size);
@@ -207,13 +203,11 @@ run_main (int argc, ACE_TCHAR *argv[])
   // One chunk too far...
   if ((depth = allocator.pool_depth ()) != 0)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth 0")
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
+                ACE_TEXT ("Expected pool depth 0 but reported %B\n"),
                 depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
-              ACE_TEXT (" (%t) Allocating chunk 4: %d bytes, no free chunks,")
+              ACE_TEXT (" (%t) Allocating chunk 4: %B bytes, no free chunks,")
               ACE_TEXT (" should fail...\n"),
               requested_size));
 
@@ -237,7 +231,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   allocator.free (ptr1);
 
   requested_size = chunk_size;
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Allocating chunk: %d bytes, ")
+  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Allocating chunk: %B bytes, ")
                        ACE_TEXT ("should succeed...\n"),
               requested_size));
   ptr1 = (char *) allocator.malloc (requested_size);
diff --git a/ACE/tests/Cached_Conn_Test.cpp b/ACE/tests/Cached_Conn_Test.cpp
index d67d84a5988..ce4ba892ed9 100644
--- a/ACE/tests/Cached_Conn_Test.cpp
+++ b/ACE/tests/Cached_Conn_Test.cpp
@@ -173,18 +173,21 @@ out_of_sockets_handler (void)
     {
       // Close connections which are cached by explicitly purging the
       // connection cache maintained by the connector.
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Purging connections from Connection Cache...\n")));
+      ACE_DEBUG
+        ((LM_DEBUG,
+          ACE_TEXT ("Purging connections from Connection Cache...\n")));
 
-      int retval = connect_strategy->purge_connections ();
-      ACE_ASSERT (retval != -1);
+      if (-1 == connect_strategy->purge_connections ())
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("purge_connections")));
     }
   else
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
-                  ACE_TEXT ("out_of_sockets_handler  failed!")));
-      // This shouldn't happen!
-      ACE_ASSERT (0);
+                  ACE_TEXT ("in out_of_sockets_handler, ")
+                  ACE_TEXT ("but out_of_handles said no")));
     }
 }
 
@@ -260,11 +263,18 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
   ACCEPTOR listen_one_time_acceptor;
   ACE_INET_Addr server_addr;
 
-  int result = listen_one_time_acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &));
-  ACE_ASSERT (result == 0);
+  if (0 != listen_one_time_acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)))
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("acceptor open")));
+      return;
+    }
 
-  result = listen_one_time_acceptor.acceptor ().get_local_addr (server_addr);
-  ACE_ASSERT (result == 0);
+  if (0 != listen_one_time_acceptor.acceptor ().get_local_addr (server_addr))
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("acceptor getaddr")));
+      listen_one_time_acceptor.close ();
+      return;
+    }
 
   for (int i = 1; i <= iterations; ++i)
     {
@@ -295,7 +305,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("get_local_addr")));
-              ACE_ASSERT (0);
+              break;
             }
 
           if (debug)
@@ -305,12 +315,10 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
         }
 
       // Run the cached blocking test.
-      int result = cached_connect (strategy_connector,
-                                   server_addr);
-      ACE_ASSERT (result != -1);
+      if (-1 == cached_connect (strategy_connector, server_addr))
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("cached_connect")));
 
-      result = server (&acceptor);
-      if (result == -1)
+      if (-1 == server (&acceptor))
         out_of_sockets_handler ();
     }
 }
@@ -441,8 +449,8 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Consume all handles in the process, leaving us
   // <keep_handles_available> to play with.
   ACE_Handle_Gobbler handle_gobbler;
-  result = handle_gobbler.consume_handles (keep_handles_available);
-  ACE_ASSERT (result == 0);
+  if (0 != handle_gobbler.consume_handles (keep_handles_available))
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("handle_gobbler")));
 
   // Do we need to test all the strategies.  Note, that the less
   // useful null strategy is ignored in this case.
diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp
index 01bc3bf97bf..4d11e5e928b 100644
--- a/ACE/tests/Config_Test.cpp
+++ b/ACE/tests/Config_Test.cpp
@@ -512,7 +512,7 @@ run_tests (void)
     }
   }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
   {
     ACE_Configuration_Win32Registry RegConfig (HKEY_LOCAL_MACHINE);
     int result = test_subkey_path (&RegConfig);
@@ -549,7 +549,8 @@ run_tests (void)
                         -1);
   }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
+
   // Test Heap version
   ACE_Configuration_Heap heap_config;
 
diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp
index f699d6740d4..867e5de8a52 100644
--- a/ACE/tests/DLL_Test.cpp
+++ b/ACE/tests/DLL_Test.cpp
@@ -65,19 +65,9 @@ int handle_test (ACE_DLL &dll)
 
 int basic_test (ACE_DLL &dll)
 {
-#if defined (__KCC)
-  /* With KCC, turning on close-on-destruction will cause problems
-     when libKCC tries to call dtors. */
-  int retval = dll.open (ACE_TEXT (OBJ_PREFIX)
-                         ACE_TEXT ("DLL_Test_Lib")
-                         ACE_TEXT (OBJ_SUFFIX),
-                         ACE_DEFAULT_SHLIB_MODE,
-                         0);
-#else
   int retval = dll.open (OBJ_PREFIX
                          ACE_TEXT ("DLL_Test_Lib")
                          OBJ_SUFFIX);
-#endif /* __KCC */
 
   if (retval != 0)
     {
diff --git a/ACE/tests/Date_Time_Test.cpp b/ACE/tests/Date_Time_Test.cpp
index ac50bea608f..56c1fc230e6 100644
--- a/ACE/tests/Date_Time_Test.cpp
+++ b/ACE/tests/Date_Time_Test.cpp
@@ -116,7 +116,11 @@ run_main (int, ACE_TCHAR *[])
                   static_dt.hour (), hour));
       error = 1;
     }
-  if (static_dt.minute () != minute)
+
+  // There's a rare instance where the starting seconds is 59 and the
+  // minute roles over during the test run.
+  if (!(static_dt.minute () == minute ||
+       (static_dt.minute () + 1 == minute && static_dt.second () > seconds)))
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("Static minute (%d) doesn't match %d\n"),
diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp
index eaf2dbfd9c2..c564623aaef 100644
--- a/ACE/tests/Dirent_Test.cpp
+++ b/ACE/tests/Dirent_Test.cpp
@@ -71,7 +71,7 @@ selector (const ACE_DIRENT *d)
 static int
 comparator (const ACE_DIRENT **d1, const ACE_DIRENT **d2)
 {
-  return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name);
+  return ACE_OS::alphasort (d1, d2);
 }
 
 } /* extern "C" */
diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp
index a8798a476ba..8c0090e374d 100644
--- a/ACE/tests/Future_Test.cpp
+++ b/ACE/tests/Future_Test.cpp
@@ -10,9 +10,10 @@
 //
 // = DESCRIPTION
 //    This example tests the ACE Future and illustrates an
-//    implementation of the Active Object pattern, which is available
-//    at <http://www.cs.wustl.edu/~schmidt/Act-Obj.ps.gz>.  The
-//    Active Object itself is very simple -- it determines if numbers
+//    implementation of the Active Object pattern, which is described
+//    in the POSA2 book <www.cs.wustl.edu/~schmidt/POSA/> and in a
+//    paper at <www.cs.wustl.edu/~schmidt/PDF/Act-Obj.pdf>.  The
+//    Active Object example here is very simple -- it determines if numbers
 //    are prime.
 //
 // = AUTHOR
diff --git a/ACE/tests/Handle_Set_Test.cpp b/ACE/tests/Handle_Set_Test.cpp
index 61e48e0a2c4..17f83625f4b 100644
--- a/ACE/tests/Handle_Set_Test.cpp
+++ b/ACE/tests/Handle_Set_Test.cpp
@@ -35,7 +35,7 @@ test_duplicates (size_t count)
 
   ACE_Handle_Set handle_set;
 
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
   for (size_t i = 0; i < count; i++)
     {
diff --git a/ACE/tests/High_Res_Timer_Test.cpp b/ACE/tests/High_Res_Timer_Test.cpp
index 5398157d8d3..c537790691b 100644
--- a/ACE/tests/High_Res_Timer_Test.cpp
+++ b/ACE/tests/High_Res_Timer_Test.cpp
@@ -22,25 +22,25 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(tests, High_Res_Timer_Test, "High_Res_Timer_Test.cpp,v 4.6 2000/04/23 04:43:58 brunsch Exp")
+ACE_RCSID(tests, High_Res_Timer_Test, "$Id$")
 
 static
 u_int
-check (const u_int interval, const u_int measured)
+check (const time_t interval, const time_t measured)
 {
-  const u_int threshold = 25 /* percent */;
+  time_t const threshold = 25 /* percent */;
 
-  const u_int difference =
+  time_t const difference =
     interval > measured  ?  interval - measured  :  measured - interval;
 
-  const u_int percentage_difference = difference * 100 / interval;
+  time_t const percentage_difference = difference * 100 / interval;
 
   if (percentage_difference < threshold)
     return 0;
   else
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("The measured time of %u differs from ")
-                       ACE_TEXT ("the interval of %u by %u percent.\n"),
+                       ACE_TEXT ("The measured time of %Q differs from ")
+                       ACE_TEXT ("the interval of %Q by %Q percent.\n"),
                        measured,
                        interval,
                        percentage_difference),
@@ -52,26 +52,26 @@ check (const u_int interval, const u_int measured)
 static u_int
 check_micro_nano (ACE_hrtime_t microinterval, ACE_hrtime_t nanointerval)
 {
-  const u_int threshold = 8 /* promille */;
+  ACE_hrtime_t const threshold = 8 /* promille */;
 
   microinterval *= 1000u;
-  ACE_hrtime_t hr_difference = (microinterval > nanointerval  ?
-                                microinterval - nanointerval  :
-                                nanointerval - microinterval    );
-  const u_int difference = ACE_HRTIME_CONVERSION (hr_difference);
+  ACE_hrtime_t const difference = (microinterval > nanointerval
+                                   ? (microinterval - nanointerval)
+                                   : (nanointerval - microinterval));
   if (nanointerval == 0)
     nanointerval = 1;      // Prevent divide-by-zero
-  const u_int promille_difference = difference * 1000 /
-                                          ACE_HRTIME_CONVERSION(nanointerval);
+  ACE_hrtime_t const promille_difference =
+    difference * 1000 / nanointerval;
 
   if ((promille_difference < threshold) || (difference < 1500))
     return 0;
   else
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("The microseconds * 1000 of %u differs from ")
-                       ACE_TEXT ("the nanoseconds of %u by %u promille\n"),
-                       ACE_HRTIME_CONVERSION (microinterval),
-                       ACE_HRTIME_CONVERSION (nanointerval),
+                       ACE_TEXT ("The microseconds * 1000 of %Q ")
+                       ACE_TEXT ("differs from the nanoseconds of %Q ")
+                       ACE_TEXT (" by %Q promille\n"),
+                       microinterval,
+                       nanointerval,
                        promille_difference),
                       1);
 }
@@ -96,9 +96,8 @@ time_interval (const ACE_Time_Value &interval,
 }
 
 
-static
-u_int
-intervals [] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000, 4000000}; /*usec*/
+static u_int const intervals[] =
+  {0, 1, 10, 100, 1000, 10000, 100000, 1000000, 4000000}; /*usec*/
 
 int
 run_main (int argc, ACE_TCHAR *argv[])
@@ -125,7 +124,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   // We don't check for errors if the interval is shorter than this
   // value because the OS has a finite resolution anyway.
-  const u_int TIMER_RESOLUTION = 10000;
+  static u_int const TIMER_RESOLUTION = 10000;
 
   for (u_int i = 0; i < sizeof intervals / sizeof (u_int); ++i)
     {
@@ -137,34 +136,41 @@ run_main (int argc, ACE_TCHAR *argv[])
           const ACE_Time_Value measured = time_interval (interval,
                                                          nanoseconds,
                                                          microseconds);
+          time_t const interval_usec =
+            interval.sec () * ACE_ONE_SECOND_IN_USECS + interval.usec ();
+          time_t const measured_usec =
+            measured.sec () * ACE_ONE_SECOND_IN_USECS + measured.usec ();
+
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("interval: %u usec, measured: %u usec%s\n"),
-                      interval.sec () * 1000000 + interval.usec (),
-                      measured.sec () * 1000000 + measured.usec (),
-                      intervals[i] <= TIMER_RESOLUTION  ?
-                      ACE_TEXT (" (interval and measured may differ)")  :
-                      ACE_TEXT ("")));
+                      ACE_TEXT ("interval: %: usec, measured: %: usec %s\n"),
+                      interval_usec,
+                      measured_usec,
+                      (intervals[i] <= TIMER_RESOLUTION
+                       ? ACE_TEXT (" (interval and measured may differ)")
+                       : ACE_TEXT (""))));
 
           if (intervals[i] > TIMER_RESOLUTION)
             {
-              errors += check (interval.sec () * 1000000 + interval.usec (),
-                               measured.sec () * 1000000 + measured.usec ());
+              errors += check (interval.sec () * ACE_ONE_SECOND_IN_USECS
+                               + interval.usec (),
+                               measured.sec () * ACE_ONE_SECOND_IN_USECS
+                               + measured.usec ());
               // Don't check for error for intervals below 10 msec.
             }
           // Check the ACE_Timer_Value-calculated microseconds against
           // the ACE_High_Res_Timer-calculated nanoseconds.
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ACE_Time_Value usec: %u, ACE_HR nsec: %u\n"),
-                      measured.sec () * 1000000 + measured.usec (),
-                      ACE_HRTIME_CONVERSION (nanoseconds)));
+                      ACE_TEXT ("ACE_Time_Value usec: %:, ACE_HR nsec: %Q\n"),
+                      measured_usec,
+                      nanoseconds));
           // This gives problems -> should be fixed
-          errors += check_micro_nano (measured.sec () * 1000000 +
-                                      measured.usec (),
+          errors += check_micro_nano (measured.sec () * ACE_ONE_SECOND_IN_USECS
+                                      + measured.usec (),
                                       nanoseconds);
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ACE_High_Res_Timer usec: %u, nsec: %u\n"),
-                      ACE_HRTIME_CONVERSION (microseconds),
-                      ACE_HRTIME_CONVERSION (nanoseconds)));
+                      ACE_TEXT ("ACE_High_Res_Timer usec: %Q, nsec: %Q\n"),
+                      microseconds,
+                      nanoseconds));
           // Now check the ACE_High_Res_Timer-calculated values against
           // each other.
           errors += check_micro_nano (microseconds, nanoseconds);
diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp
index 5a25bd54fba..4f1e27bad96 100644
--- a/ACE/tests/INET_Addr_Test.cpp
+++ b/ACE/tests/INET_Addr_Test.cpp
@@ -55,6 +55,10 @@ int check_type_consistency (const ACE_INET_Addr &addr)
   return 0;
 }
 
+struct Address {
+  const char* name;
+  bool loopback;
+};
 
 int run_main (int argc, ACE_TCHAR *argv[])
 {
@@ -66,9 +70,9 @@ int run_main (int argc, ACE_TCHAR *argv[])
   int status = 0;     // Innocent until proven guilty
 
   const char *ipv4_addresses[] =
-  {
-    "127.0.0.1", "138.38.180.251", "64.219.54.121", "192.0.0.1", "10.0.0.1", 0
-  };
+    {
+      "127.0.0.1", "138.38.180.251", "64.219.54.121", "192.0.0.1", "10.0.0.1", 0
+    };
 
   ACE_INET_Addr addr;
   status |= check_type_consistency (addr);
@@ -101,7 +105,8 @@ int run_main (int argc, ACE_TCHAR *argv[])
           status = 1;
         }
 
-      if (0 != ACE_OS::strcmp (addr.get_host_addr(), ipv4_addresses[i]))
+      if (addr.get_host_addr () != 0 &&
+          ACE_OS::strcmp (addr.get_host_addr(), ipv4_addresses[i]) != 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("%s failed get_host_addr() check\n")
@@ -114,7 +119,8 @@ int run_main (int argc, ACE_TCHAR *argv[])
 
       // Now we check the operation of get_host_addr(char*,int)
       const char* haddr = addr.get_host_addr (&hostaddr[0], sizeof(hostaddr));
-      if (0 != ACE_OS::strcmp (&hostaddr[0], haddr))
+      if (haddr != 0 &&
+          ACE_OS::strcmp (&hostaddr[0], haddr) != 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("%s failed get_host_addr(char* buf,int) check\n")
@@ -124,7 +130,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
                       haddr));
           status = 1;
         }
-      if (0 != ACE_OS::strcmp (&hostaddr[0], ipv4_addresses[i]))
+      if (ACE_OS::strcmp (&hostaddr[0], ipv4_addresses[i]) != 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("%s failed get_host_addr(char*,int) check\n")
@@ -149,7 +155,8 @@ int run_main (int argc, ACE_TCHAR *argv[])
       addr.set (80, addr32, 0); // addr32 is already in network byte order
       status |= check_type_consistency(addr);
 
-      if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv4_addresses[i]))
+      if (addr.get_host_addr () != 0 &&
+          ACE_OS::strcmp (addr.get_host_addr (), ipv4_addresses[i]) != 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("%s failed second get_host_addr() check\n")
@@ -217,6 +224,33 @@ int run_main (int argc, ACE_TCHAR *argv[])
 
 #endif
 
+  struct Address loopback_addresses[] =
+    { {"127.0.0.1", true}, {"127.1.2.3", true}
+      , {"127.0.0.0", true}, {"127.255.255.255", true}
+      , {"126.255.255.255", false}, {"128.0.0.0", false}, {0, true}
+    };
+
+  for (int i=0; loopback_addresses[i].name != 0; i++)
+    {
+      struct in_addr addrv4;
+      ACE_UINT32 addr32 = 0;
+
+      ACE_OS::inet_pton (AF_INET, loopback_addresses[i].name, &addrv4);
+
+      ACE_OS::memcpy (&addr32, &addrv4, sizeof (addr32));
+
+      addr.set (80, loopback_addresses[i].name);
+
+      if (addr.is_loopback() != loopback_addresses[i].loopback)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ACE_INET_Addr::is_loopback() ")
+                      ACE_TEXT ("failed to distinguish loopback address. %s\n")
+                      , loopback_addresses[i].name));
+          status = 1;
+        }
+    }
+
   ACE_END_TEST;
 
   return status;
diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp
index f9c60764bca..97f08a10d03 100644
--- a/ACE/tests/Integer_Truncate_Test.cpp
+++ b/ACE/tests/Integer_Truncate_Test.cpp
@@ -4,7 +4,7 @@
  *
  * $Id$
  *
- * Test @c ACE_Utils::Truncate<> function template.
+ * Test @c ACE_Utils::truncate_cast<> function template.
  *
  * @author Ossama Othman <ossama_othman at symantec dot com>
  */
@@ -40,7 +40,7 @@ sizeof_from_lt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f) != static_cast<to_type> (f))
+    if (truncate_cast<to_type> (f) != static_cast<to_type> (f))
       {
         success = false;
 
@@ -60,7 +60,7 @@ sizeof_from_lt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f) != static_cast<to_type> (f))
+    if (truncate_cast<to_type> (f) != static_cast<to_type> (f))
       {
         success = false;
 
@@ -81,8 +81,8 @@ sizeof_from_lt_sizeof_to (void)
     from_type f2 =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f1) != f1
-        || Truncate<to_type> (f2) != f2)
+    if (truncate_cast<to_type> (f1) != f1
+        || truncate_cast<to_type> (f2) != f2)
       {
         success = false;
 
@@ -102,7 +102,7 @@ sizeof_from_lt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f) != static_cast<to_type> (f))
+    if (truncate_cast<to_type> (f) != static_cast<to_type> (f))
       {
         success = false;
 
@@ -140,8 +140,8 @@ sizeof_from_eq_sizeof_to (void)
     from_type f2 =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (static_cast<from_type> (Truncate<to_type> (f1)) != f1
-        || static_cast<from_type> (Truncate<to_type> (f2)) != f2)
+    if (static_cast<from_type> (truncate_cast<to_type> (f1)) != f1
+        || static_cast<from_type> (truncate_cast<to_type> (f2)) != f2)
       {
         success = false;
 
@@ -161,7 +161,7 @@ sizeof_from_eq_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should be truncated.
 
-    if (Truncate<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
+    if (truncate_cast<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
       {
         success = false;
 
@@ -182,8 +182,8 @@ sizeof_from_eq_sizeof_to (void)
     from_type f2 =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f1) != f1
-        || Truncate<to_type> (f2) != f2)
+    if (truncate_cast<to_type> (f1) != f1
+        || truncate_cast<to_type> (f2) != f2)
       {
         success = false;
 
@@ -203,7 +203,7 @@ sizeof_from_eq_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should not be truncated.
 
-    if (Truncate<to_type> (f) != f)
+    if (truncate_cast<to_type> (f) != f)
       {
         success = false;
 
@@ -240,7 +240,7 @@ sizeof_from_gt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should be truncated.
 
-    if (Truncate<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
+    if (truncate_cast<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
       {
         success = false;
 
@@ -260,7 +260,7 @@ sizeof_from_gt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should be truncated.
 
-    if (Truncate<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
+    if (truncate_cast<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
       {
         success = false;
 
@@ -281,8 +281,8 @@ sizeof_from_gt_sizeof_to (void)
     from_type f2 =
       ACE_Numeric_Limits<from_type>::max ();  // Should be truncated.
 
-    if (Truncate<to_type> (f1) != f1
-        || Truncate<to_type> (f2) != ACE_Numeric_Limits<to_type>::max ())
+    if (truncate_cast<to_type> (f1) != f1
+        || truncate_cast<to_type> (f2) != ACE_Numeric_Limits<to_type>::max ())
       {
         success = false;
 
@@ -302,7 +302,7 @@ sizeof_from_gt_sizeof_to (void)
     from_type f =
       ACE_Numeric_Limits<from_type>::max ();  // Should be truncated.
 
-    if (Truncate<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
+    if (truncate_cast<to_type> (f) != ACE_Numeric_Limits<to_type>::max ())
       {
         success = false;
 
diff --git a/ACE/tests/MT_SOCK_Test.cpp b/ACE/tests/MT_SOCK_Test.cpp
index 11220d36e29..adfd3dc58ee 100644
--- a/ACE/tests/MT_SOCK_Test.cpp
+++ b/ACE/tests/MT_SOCK_Test.cpp
@@ -101,10 +101,12 @@ client (void *arg)
       {
         // This is, I believe, more of an issue with WinXP-64 _server_
         // side, but we can trap it here since we know we're connecting
-        // to localhost. It appears, though I haven't found documentation
-        // stating, that WinXP-64 will appear to accept connections at the
-        // TCP level past the listen backlog but if data arrives before the
-        // actual application-level accept() occurs, the connection is reset.
+        // to localhost. Some Windows versions will appear to accept
+        // connections at the TCP level past the listen backlog but if
+        // data arrives before the actual application-level accept() occurs,
+        // the connection is reset. This is caused when we trip the Windows
+        // SYN attack prevention (http://technet2.microsoft.com/WindowsServer/
+        // en/library/910c8482-e5e5-4e2c-9ea4-11301ddfc4661033.mspx?mfr=true)
         // So, if we get a reset on the first send, don't flag the error -
         // just note it and act like the connection was refused.
         if (c == ACE_ALPHABET && errno == ECONNRESET) // First byte sent
diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp
index fd7d1705a92..354066c9975 100644
--- a/ACE/tests/Multicast_Test_IPV6.cpp
+++ b/ACE/tests/Multicast_Test_IPV6.cpp
@@ -897,8 +897,6 @@ int advance_addr (ACE_INET_Addr &addr)
                             -1);
 
         }
-
-      return 0;
     }
 #endif /* ACE_HAS_IPV6 */
 
diff --git a/ACE/tests/NonBlocking_Conn_Test.cpp b/ACE/tests/NonBlocking_Conn_Test.cpp
index 1b4dfa8a884..80e25c63cfb 100644
--- a/ACE/tests/NonBlocking_Conn_Test.cpp
+++ b/ACE/tests/NonBlocking_Conn_Test.cpp
@@ -135,7 +135,7 @@ test_connect (ACE_Reactor &reactor,
     {
       ACE_TCHAR buffer[1024];
       addresses[i].addr_to_string (buffer,
-                                   sizeof buffer,
+                                   sizeof buffer / sizeof (ACE_TCHAR),
                                    1);
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/tests/Notification_Queue_Unit_Test.cpp b/ACE/tests/Notification_Queue_Unit_Test.cpp
new file mode 100644
index 00000000000..76ee3461e12
--- /dev/null
+++ b/ACE/tests/Notification_Queue_Unit_Test.cpp
@@ -0,0 +1,329 @@
+/**
+ * @file Notification_Queue_Unit_Test.cpp
+ *
+ * $Id$
+ *
+ * A unit test for the ACE_Notification_Queue class.
+ *
+ * @author Carlos O'Ryan <coryan@atdesk.com>
+ *
+ */
+
+#include "test_config.h"
+#include "ace/Notification_Queue.h"
+
+ACE_RCSID(tests,
+          Notification_Queue_Unit_Test, "$Id$")
+
+#define TEST_LIST \
+  ACTION(null_test) \
+  ACTION(pop_returns_element_pushed) \
+  ACTION(purge_empty_queue) \
+  ACTION(purge_with_no_matches) \
+  ACTION(purge_with_single_match) \
+  ACTION(purge_with_multiple_matches) \
+  ACTION(reset_empty_queue) \
+  ACTION(reset_non_empty_queue) \
+
+// Declare all the tests
+#define ACTION(TEST_NAME) void TEST_NAME (char const * test_name);
+TEST_LIST
+#undef ACTION
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("Notification_Queue_Unit_Test"));
+
+  // Call all the tests
+#define ACTION(TEST_NAME) TEST_NAME (#TEST_NAME);
+TEST_LIST
+#undef ACTION
+
+  ACE_END_TEST;
+
+  return 0;
+}
+
+// There are far more elegant ways to do this.  Ideally one would use
+// an existing framework (Boost.Test, TUT, CppTest).  But this will
+// do for our purposes
+void test_equal(int x, int y, char const * x_msg, char const * y_msg,
+		char const * error_message,
+		char const * test_name, char const * filename, int lineno);
+void test_equal(void * x, void * y, char const * x_msg, char const * y_msg,
+		char const * error_message,
+		char const * test_name, char const * filename, int lineno);
+void test_not_equal(int x, int y, char const * x_msg, char const * y_msg,
+		    char const * error_message,
+		    char const * test_name, char const * filename, int lineno);
+void test_assert(bool predicate, char const * predicate_msg,
+		 char const * error_message,
+		 char const * test_name, char const * filename, int lineno);
+
+#define TEST_EQUAL(X, Y, MSG) \
+  test_equal((X), (Y), #X, #Y, MSG, test_name, __FILE__, __LINE__)
+#define TEST_NOT_EQUAL(X, Y, MSG) \
+  test_not_equal((X), (Y), #X, #Y, MSG, test_name, __FILE__, __LINE__)
+#define TEST_ASSERT(PREDICATE, MESSAGE) \
+  test_assert((PREDICATE), #PREDICATE, MESSAGE, test_name, __FILE__, __LINE__)
+
+void null_test(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  TEST_EQUAL(0, 0, "Test framework failure");
+  TEST_NOT_EQUAL(1, 0, "Test framework failure");
+  TEST_ASSERT(true, "True is still true");
+}
+
+class Event_Handler : public ACE_Event_Handler
+{
+public:
+  Event_Handler(int event_handler_id)
+    : ACE_Event_Handler()
+    , id (event_handler_id)
+  {
+  }
+
+  int id;
+};
+
+void pop_returns_element_pushed(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+  Event_Handler eh2(2);
+  Event_Handler eh3(2);
+
+  int result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::READ_MASK));
+  TEST_ASSERT(result == 1, "push[1] should return 1");
+
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  TEST_ASSERT(result == 0, "push[2] should return 0");
+
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh3,
+			      ACE_Event_Handler::READ_MASK
+			      |ACE_Event_Handler::WRITE_MASK));
+  TEST_ASSERT(result == 0, "push[3] should return 0");
+
+  ACE_Notification_Buffer current;
+  bool more_messages_queued;
+  ACE_Notification_Buffer next;
+
+  result = queue.pop_next_notification(current, more_messages_queued, next);
+  TEST_ASSERT(result == 1, "pop[0] should return 1");
+  TEST_ASSERT(more_messages_queued, "pop[0] should have more messages");
+
+  TEST_EQUAL(current.eh_, &eh1, "Wrong handler extracted");
+  TEST_EQUAL(current.mask_, ACE_Event_Handler::READ_MASK,
+		     "Wrong mask extracted");
+
+  result = queue.pop_next_notification(current, more_messages_queued, next);
+  TEST_ASSERT(result == 1, "pop[1] should return 1");
+  TEST_ASSERT(more_messages_queued, "pop[1] should have more messages");
+
+  TEST_EQUAL(current.eh_, &eh2, "Wrong handler extracted");
+  TEST_EQUAL(current.mask_, ACE_Event_Handler::WRITE_MASK,
+		     "Wrong mask extracted");
+
+  result = queue.pop_next_notification(current, more_messages_queued, next);
+  TEST_ASSERT(result == 1, "pop[2] should return 1");
+  TEST_ASSERT(!more_messages_queued, "pop[2] should not have more messages");
+
+  TEST_EQUAL(current.eh_, &eh3, "Wrong handler extracted");
+  TEST_EQUAL(current.mask_, ACE_Event_Handler::READ_MASK
+		     |ACE_Event_Handler::WRITE_MASK,
+		     "Wrong mask extracted");
+
+  more_messages_queued = true;
+  result = queue.pop_next_notification(current, more_messages_queued, next);
+  TEST_ASSERT(result == 0, "pop[3] should return 0");
+  TEST_ASSERT(!more_messages_queued, "pop[3] should not have more messages");
+}
+
+void purge_empty_queue(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+
+  int result = queue.purge_pending_notifications(&eh1,
+						 ACE_Event_Handler::READ_MASK);
+  TEST_ASSERT(result == 0, "purge of empty queue should return 0");
+}
+
+void purge_with_no_matches(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+  Event_Handler eh2(2);
+
+  int result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::READ_MASK));
+
+  result = queue.purge_pending_notifications(&eh2,
+					     ACE_Event_Handler::READ_MASK);
+  TEST_ASSERT(result == 0, "purge of eh2 should return 0");
+
+  result = queue.purge_pending_notifications(&eh1,
+					     ACE_Event_Handler::WRITE_MASK);
+  TEST_ASSERT(result == 0, "purge of eh1/WRITE should return 0");
+}
+
+void purge_with_single_match(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+  Event_Handler eh2(2);
+
+  int result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::READ_MASK
+			      |ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::READ_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+
+  result = queue.purge_pending_notifications(&eh2,
+					     ACE_Event_Handler::READ_MASK);
+  TEST_EQUAL(result, 1, "purge of eh2/READ should return 1");
+
+  result = queue.purge_pending_notifications(&eh1,
+					     ACE_Event_Handler::READ_MASK);
+  TEST_EQUAL(result, 0, "purge of eh1/READ should return 0");
+}
+
+void purge_with_multiple_matches(char const * test_name)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+  Event_Handler eh2(2);
+
+  int result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::READ_MASK
+			      |ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::READ_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  result = queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+
+  result = queue.purge_pending_notifications(&eh2,
+					     ACE_Event_Handler::WRITE_MASK);
+  TEST_EQUAL(result, 3, "purge of eh2/WRITE should return 3");
+
+  result = queue.purge_pending_notifications(&eh1,
+					     ACE_Event_Handler::WRITE_MASK);
+  TEST_EQUAL(result, 1, "purge of eh1/WRITE should return 1");
+}
+
+void reset_empty_queue(char const * /* test_name */)
+{
+  ACE_Notification_Queue queue;
+
+  queue.reset();
+}
+
+void reset_non_empty_queue(char const * /* test_name */)
+{
+  ACE_Notification_Queue queue;
+
+  Event_Handler eh1(1);
+  Event_Handler eh2(2);
+
+  queue.push_new_notification(
+      ACE_Notification_Buffer(0,
+			      ACE_Event_Handler::READ_MASK));
+  queue.push_new_notification(
+      ACE_Notification_Buffer(&eh1,
+			      ACE_Event_Handler::READ_MASK));
+  queue.push_new_notification(
+      ACE_Notification_Buffer(&eh2,
+			      ACE_Event_Handler::WRITE_MASK));
+  queue.push_new_notification(
+      ACE_Notification_Buffer(0,
+			      ACE_Event_Handler::WRITE_MASK));
+
+  queue.reset();
+}
+
+void test_equal(int x, int y, char const * x_msg, char const * y_msg,
+		char const * error_message,
+		char const * test_name, char const * filename, int lineno)
+{
+  if (x == y) return;
+  ACE_ERROR ((LM_ERROR,
+	      ACE_TEXT("%C in (%C %C:%d) %C (%d) != %C (%d)\n"),
+	      error_message,
+	      test_name, filename, lineno,
+	      x_msg, x, y_msg, y));
+}
+
+void test_equal(void * x, void * y, char const * x_msg, char const * y_msg,
+		char const * error_message,
+		char const * test_name, char const * filename, int lineno)
+{
+  if (x == y) return;
+  ACE_ERROR ((LM_ERROR,
+	      ACE_TEXT("%C in (%C %C:%d) %C (%@) != %C (%@)\n"),
+	      error_message,
+	      test_name, filename, lineno,
+	      x_msg, x, y_msg, y));
+}
+
+void test_not_equal(int x, int y, char const * x_msg, char const * y_msg,
+		    char const * error_message,
+		    char const * test_name, char const * filename, int lineno)
+{
+  if (x != y) return;
+  ACE_ERROR ((LM_ERROR,
+	      ACE_TEXT("%C in (%C %C:%d) %C (%d) != %C (%d)\n"),
+	      error_message,
+	      test_name, filename, lineno,
+	      x_msg, x, y_msg, y));
+}
+
+void test_assert(bool predicate, char const * predicate_msg,
+		 char const * error_message,
+		char const * test_name, char const * filename, int lineno)
+{
+  if (predicate) return;
+  ACE_ERROR ((LM_ERROR,
+	      ACE_TEXT("Assertion in (%C %C:%d) %C %C\n"),
+	      test_name, filename, lineno,
+	      predicate_msg, error_message));
+}
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index d270a19d66c..68258c690c2 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -895,6 +895,29 @@ cpu_info_test (void)
 }
 
 int
+pagesize_test (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing getpagesize method\n")));
+
+  long const pagesize = ACE_OS::getpagesize ();
+  if (pagesize <= 0)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error, pagesize should return a value bigger ")
+                            ACE_TEXT ("then zero, it returned %d\n"), pagesize));
+      return 1;
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Pagesize returned %d\n"),
+                  pagesize));
+    }
+  return 0;
+}
+
+
+int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("OS_Test"));
@@ -925,6 +948,9 @@ run_main (int, ACE_TCHAR *[])
   if ((result = cpu_info_test ()) != 0)
       status = result;
 
+  if ((result = pagesize_test ()) != 0)
+      status = result;
+
   ACE_END_TEST;
   return status;
 }
diff --git a/ACE/tests/Object_Manager_Flipping_Test.cpp b/ACE/tests/Object_Manager_Flipping_Test.cpp
new file mode 100644
index 00000000000..e2dc4349d39
--- /dev/null
+++ b/ACE/tests/Object_Manager_Flipping_Test.cpp
@@ -0,0 +1,128 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Object_Manager_Flipping_Test.cpp
+//
+// = DESCRIPTION
+
+//    Tests the basic function of the ACE_Service_Config in scenarios
+//    where the ACE_Object_Manager is being
+//    flipped. i.e. ACE::init/ACE::fini() are called in sequence
+//    (which can occur with loading DLLs).  More specifically we test
+//    that the OM correctly controlls the lifecycle of the default SC
+//    instance, which is pointed to by a TSS pointer.
+//
+// = AUTHOR
+//    Iliyan Jeliazkov <iliyan@ociweb.com>
+//
+// ============================================================================
+
+#include "test_config.h"
+#include "ace/Object_Manager.h"
+#include "ace/OS_Memory.h"
+#include "ace/ACE.h"
+#include "ace/Service_Config.h"
+
+ACE_RCSID(tests, Object_Manager_Flipping_Test, "$Id$")
+
+static u_int *ip;
+
+static const bool is_static_object_manager =
+#if defined (ACE_HAS_STATIC_OBJECT_MANAGER)
+    true;
+#else
+    false;
+#endif
+
+extern "C"
+void
+hook1 (void)
+{
+  delete ip;
+  ip = 0;
+}
+
+
+int run_main (int, ACE_TCHAR *[])
+{
+
+  // Causing the creation of a SC instance and the corresponding TSS
+  // key.  It is not registered with the Object Manager, but beware -
+  // OM finalization will destroy it too.
+  ACE_Service_Gestalt *p0 = ACE_Service_Config::instance ();
+
+  ACE_Service_Gestalt *p1 = 0;
+  u_int errors = 0;
+
+  // ...
+  {
+    ACE::init ();
+    ACE_START_TEST (ACE_TEXT ("Object_Manager_Flipping_Test"));
+
+
+    // If hook1 never gets called, this will show up as a memory leak.
+    ACE_NEW_RETURN (ip,
+                    u_int,
+                    -1);
+
+    if (ACE_OS::atexit (hook1) != 0)
+      {
+        ++errors;
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("ACE_OS::atexit () returned non-zero!!!!")));
+      }
+
+    // Obtain a SC instance which will be later used to compare with others.
+    p1 = ACE_Service_Config::instance ();
+
+    // ACE_ASSERT uses Log_Msg::instance() and needs to be done only
+    // after ACE_START_TEST
+
+    ACE_ASSERT (p0 == p1);
+    ACE_ASSERT (!p0->is_opened ());
+    ACE_END_TEST;
+
+
+    // ACE::fini() destroys the SC (unmanaged) singleton ...
+    // Next time we ask for one, it will be a different instance.
+    ACE::fini ();
+  }
+
+  p1 = ACE_Service_Config::instance ();
+
+  // This is a legitimate test, but more importantly an
+  // attemp to dereference p1 should succeed. If SC's TSS
+  // was not cleaned correctly this will SEGV. As will the
+  // following ACE::init, as it tries to use the SC instance.
+
+  if (p1->is_opened ())
+      ++errors;
+
+  // Not using ACE_ASSERT because ACE is not initialized yet.
+
+  {
+    ACE::init();
+    ACE_START_TEST (ACE_TEXT ("Object_Manager_Flipping_Test"));
+
+    ACE_Service_Gestalt *p2 = ACE_Service_Config::instance ();
+
+    // ACE_ASSERT uses Log_Msg::instance() and needs to be done only
+    // after ACE_START_TEST
+    ACE_ASSERT (p1 == p2);
+
+    // An attempt to dereference should be fine.
+    ACE_ASSERT (!p2->is_opened ());
+
+    ACE_END_TEST;
+    ACE::fini();   // Flipped twice
+  }
+
+  return errors == 0 ? 0 : 1;
+
+}
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index 28a5dbcff8a..eb94ffbe3de 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -253,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       break;
 #  endif /* sun */
 
-#  if !defined(__Lynx__)
+#  if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
     case CB:
       ACE_NEW_RETURN (proactor_impl,
                       ACE_POSIX_CB_Proactor (max_op),
@@ -261,7 +261,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) Create Proactor Type = CB\n")));
       break;
-#  endif /* __Lynx__ */
+#  endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
 
     default:
       ACE_DEBUG ((LM_DEBUG,
@@ -1769,11 +1769,11 @@ set_proactor_type (const ACE_TCHAR *ptype)
       proactor_type = SUN;
       return 1;
 #endif /* sun */
-#if !defined (__Lynx__)
+#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
      case 'C':
        proactor_type = CB;
        return 1;
-#endif /* __Lynx__ */
+#endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
     default:
       break;
     }
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index 003f6915612..9958d41e8d0 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -253,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       break;
 #  endif /* sun */
 
-#  if !defined(__Lynx__)
+#  if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
     case CB:
       ACE_NEW_RETURN (proactor_impl,
                       ACE_POSIX_CB_Proactor (max_op),
@@ -261,7 +261,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) Create Proactor Type = CB\n")));
       break;
-#  endif /* __Lynx__ */
+#  endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
 
     default:
       ACE_DEBUG ((LM_DEBUG,
@@ -1809,11 +1809,11 @@ set_proactor_type (const ACE_TCHAR *ptype)
       proactor_type = SUN;
       return 1;
 #endif /* sun */
-#if !defined (__Lynx__)
+#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
      case 'C':
        proactor_type = CB;
        return 1;
-#endif /* __Lynx__ */
+#endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
     default:
       break;
     }
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index 3ceb16c51cb..c151e078830 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -27,6 +27,7 @@
 
 #include "test_config.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Process_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread.h"
@@ -102,6 +103,28 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE
   return result;
 }
 
+static int
+command_line_test ()
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing for last character of command line\n")));
+  int result = 0;
+  const ACE_TCHAR *command = ACE_TEXT ("test Hello");
+  size_t command_len = ACE_OS::strlen (command);
+  ACE_Process_Options options (1, command_len + 1);
+  options.command_line (command);
+  ACE_TCHAR * const *procargv = options.command_line_argv ();
+  if (ACE_OS::strcmp (procargv [1], ACE_TEXT ("Hello")) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("command_line_test failed: expected \"%s\"; got \"%s\"\n"),
+                  ACE_TEXT ("Hello"),
+                  procargv [1]));
+      result = 1;
+    }
+  return result;
+}
+
 int
 run_main (int argc, ACE_TCHAR *argv[])
 {
@@ -142,9 +165,14 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_START_TEST (ACE_TEXT ("Process_Manager_Test"));
 
+  int result = 0;
+  int test_status = 0;
+
+  if ((result = command_line_test ()) != 0)
+    test_status = result;
+
   // Try the explicit <ACE_Process_Manager::wait> functions
 
-  int result = 0, test_status = 0;
   ACE_Process_Manager mgr;
 
   mgr.register_handler (new Exit_Handler ("default"));
diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp
index a24bf4770a8..c657b75a853 100644
--- a/ACE/tests/Reactor_Notify_Test.cpp
+++ b/ACE/tests/Reactor_Notify_Test.cpp
@@ -433,7 +433,14 @@ run_notify_purge_test (void)
                   status));
     // Fifth test:
     r->notify (n2);
-    // <ap> destructor should cause n2's notify to be cancelled.
+
+    // The destructor of the event handler no longer removes the
+    // notifications.  It is the application's responsability to do
+    // so.
+    r->purge_pending_notifications(n2,
+				   ACE_Event_Handler::ALL_EVENTS_MASK);
+    r->purge_pending_notifications(&n1,
+				   ACE_Event_Handler::ALL_EVENTS_MASK);
   }
 
   ACE_Time_Value t (1);
@@ -447,10 +454,6 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Reactor_Notify_Test"));
 
-  // To automatically delete the ACE_Reactor instance at program
-  // termination:
-  auto_ptr<ACE_Reactor> r (ACE_Reactor::instance ());
-
   int test_result = 0;       // Innocent until proven guilty
 
   test_result = run_notify_purge_test ();
diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp
index f99dba58ff0..fafe771551a 100644
--- a/ACE/tests/Recursive_Mutex_Test.cpp
+++ b/ACE/tests/Recursive_Mutex_Test.cpp
@@ -49,18 +49,42 @@ static int reported_notsup = 0;
 #endif /* ACE_HAS_MUTEX_TIMEOUTS */
 
 // Total number of iterations.
-static int n_iterations = 100;
+static int const n_iterations = 100;
 static size_t n_threads = ACE_MAX_THREADS;
 
+// ACE_Recursive_Thread_Mutex::get_nesting_level() will return a
+// meaningful value.
+static bool nesting_level_supported = false;
+
 static void
 test_recursion_depth (int nesting_level,
                       ACE_TEST_MUTEX *rm)
 {
   if (nesting_level < n_iterations)
     {
+#if !defined (ACE_HAS_WTHREADS)
+      // This will work for Windows, too, if ACE_TEST_MUTEX is
+      // ACE_Recursive_Thread_Mutex instead of ACE_Process_Mutex.
+      if (nesting_level_supported
+          && nesting_level != 0
+          && nesting_level != rm->get_nesting_level ())
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) Pre-mutex acquire nesting ")
+                      ACE_TEXT ("levels do not match.\n")));
+        }
+#endif  /* !ACE_HAS_WTHREADS */
       int result = rm->acquire ();
       ACE_ASSERT (result == 0);
 #if !defined (ACE_HAS_WTHREADS)
+      if (nesting_level_supported
+          && (nesting_level + 1) != rm->get_nesting_level ())
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) Post-mutex acquire nesting ")
+                      ACE_TEXT ("levels do not match.\n")));
+        }
+
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) = acquired, nesting = %d, thread id = %u\n"),
                   rm->get_nesting_level (),
@@ -70,6 +94,15 @@ test_recursion_depth (int nesting_level,
       test_recursion_depth (nesting_level + 1,
                             rm);
 
+#if !defined (ACE_HAS_WTHREADS) 
+      if (nesting_level_supported
+          && (nesting_level + 1) != rm->get_nesting_level ())
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) Post recursion nesting ")
+                      ACE_TEXT ("levels do not match.\n")));
+        }
+#endif  /* !ACE_HAS_WTHREADS */
       result = rm->release ();
       ACE_ASSERT (result == 0);
 #if !defined (ACE_HAS_WTHREADS)
@@ -77,6 +110,15 @@ test_recursion_depth (int nesting_level,
                   ACE_TEXT ("(%P|%t) = released, nesting = %d, thread id = %u\n"),
                   rm->get_nesting_level (),
                   rm->get_thread_id ()));
+
+      if (nesting_level_supported
+          && nesting_level != 0
+          && nesting_level != rm->get_nesting_level ())
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) Post-mutex release nesting ")
+                      ACE_TEXT ("levels do not match.\n")));
+        }
 #endif /* !ACE_HAS_WTHREADS */
     }
 }
@@ -91,7 +133,7 @@ test_timed_wait (int nesting_level,
                      rm);
   else
     {
-      ACE_OS::srand (ACE_OS::time (0));
+      ACE_OS::srand ((u_int) ACE_OS::time (0));
 
       for (size_t i = 0; i < ACE_MAX_ITERATIONS / 2; i++)
         {
@@ -319,6 +361,13 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_TEST_MUTEX rm;
 
+#if !defined (ACE_HAS_WTHREADS)
+  // This will work for Windows, too, if ACE_TEST_MUTEX is
+  // ACE_Recursive_Thread_Mutex instead of ACE_Process_Mutex.
+  nesting_level_supported = 
+    (rm.get_nesting_level () != -1 || errno != ENOTSUP);
+#endif  /* !ACE_HAS_WTHREADS */
+
   ACE_Thread_Manager::instance ()->spawn_n (n_threads,
                                             ACE_THR_FUNC (recursion_worker),
                                             (void *) &rm);
diff --git a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
index d20cb0a0d07..dc1c9ffe71f 100644
--- a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
+++ b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
@@ -47,7 +47,7 @@ int send_datagram (ACE_SOCK_Dgram_Bcast &socket, int datagram_no)
 {
     static char dgram_buffer[BUFSIZ];
 
-    ACE_OS::snprintf (dgram_buffer, sizeof(dgram_buffer) - 1,
+    ACE_OS::snprintf (dgram_buffer, sizeof(dgram_buffer),
                       "Datagram %d", datagram_no);
     if (socket.send (dgram_buffer,
                      ACE_OS::strlen (dgram_buffer) + 1,
diff --git a/ACE/tests/SString_Test.cpp b/ACE/tests/SString_Test.cpp
index 17b0fa4625c..f91e2e8e9ed 100644
--- a/ACE/tests/SString_Test.cpp
+++ b/ACE/tests/SString_Test.cpp
@@ -136,17 +136,17 @@ run_main (int, ACE_TCHAR *[])
   {
     /* Set #2 */
     ACE_CString s0 = "hello";
-    ACE_CString s1 ("hello", 0, 0);
-    ACE_CString s2 ("world", 0, 0);
-    ACE_CString s3 ("ll", 0, 0);
-    ACE_CString s4 ("ello", 0, 0);
+    ACE_CString s1 ("hello", 0, false);
+    ACE_CString s2 ("world", 0, false);
+    ACE_CString s3 ("ll", 0, false);
+    ACE_CString s4 ("ello", 0, false);
     ACE_CString s5 = s1 + " " + s2;
 
     char single_character = 'z';
     ACE_CString single_character_string (single_character);
 
-    ACE_CString empty_string (0, 0, 0);
-    ACE_CString zero_size_string (s1.c_str (), 0, 0, 0);
+    ACE_CString empty_string (0, 0, false);
+    ACE_CString zero_size_string (s1.c_str (), 0, 0, false);
 
     // Not equal comparisons. Error if they are equal
     if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;}
diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp
index e2b82042559..fb5ccc36dce 100644
--- a/ACE/tests/Semaphore_Test.cpp
+++ b/ACE/tests/Semaphore_Test.cpp
@@ -201,7 +201,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_THREADS)
   parse_args (argc, argv);
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
 #  if !defined (ACE_HAS_STHREADS) && (!defined (ACE_HAS_POSIX_SEM) || defined (ACE_HAS_POSIX_SEM_TIMEOUT))
   //Test timed waits.
diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp
index 3502fea9e3b..63a03f024df 100644
--- a/ACE/tests/Test_Output.cpp
+++ b/ACE/tests/Test_Output.cpp
@@ -56,7 +56,8 @@ ACE_Test_Output::~ACE_Test_Output (void)
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && \
+    (!defined (ACE_HAS_PHARLAP) || defined (ACE_PHARLAP_TESTLOG_TO_FILE))
   if (this->output_file_ == log_msg_stream)
     delete this->output_file_;
   // else something else changed the stream and hence should
@@ -80,7 +81,7 @@ ACE_Test_Output::output_file (void)
 int
 ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 {
-#if defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP) && !defined (ACE_PHARLAP_TESTLOG_TO_FILE)
   // For PharLap, just send it all to the host console for now - redirect
   // to a file there for saving/analysis.
   EtsSelectConsole(ETS_CO_HOST);
@@ -159,7 +160,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
   ACE_LOG_MSG->msg_ostream (this->output_file_);
-#endif /* ACE_HAS_PHARLAP */
+#endif /* ACE_HAS_PHARLAP && !ACE_PHARLAP_TESTLOG_TO_FILE */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp
index 01d8eb84d1d..56004ae9b25 100644
--- a/ACE/tests/Thread_Manager_Test.cpp
+++ b/ACE/tests/Thread_Manager_Test.cpp
@@ -124,8 +124,8 @@ worker (int iterations)
                 {
                   ACE_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("(%t) has been cancelled ")
-			      ACE_TEXT ("before iteration %d!\n"),
-			      i));
+                              ACE_TEXT ("before iteration %d!\n"),
+                              i));
                   break;
                 }
             }
diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp
index a463e72b523..048aa855a6a 100644
--- a/ACE/tests/Thread_Mutex_Test.cpp
+++ b/ACE/tests/Thread_Mutex_Test.cpp
@@ -50,7 +50,7 @@ test (void *args)
 {
   ACE_TEST_MUTEX *mutex = (ACE_TEST_MUTEX *) args;
   ACE_UNUSED_ARG (mutex); // Suppress ghs warning about unused local "mutex".
-  ACE_OS::srand (ACE_OS::time (0));
+  ACE_OS::srand ((u_int) ACE_OS::time (0));
 
   for (size_t i = 0; i < ACE_MAX_ITERATIONS / 2; i++)
     {
diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp
index 764b23f406d..20145f81145 100644
--- a/ACE/tests/Time_Value_Test.cpp
+++ b/ACE/tests/Time_Value_Test.cpp
@@ -49,16 +49,7 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$")
 #include "ace/ACE.h"
 #include "ace/Time_Value.h"
 
-#if !defined(ACE_LACKS_NUMERIC_LIMITS)
-// some platforms pollute the namespace by defining max() and min() macros
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-#include <limits>
-#endif /* ACE_LACKS_NUMERIC_LIMITS */
+#include "ace/Numeric_Limits.h"
 
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
 static
@@ -236,49 +227,44 @@ run_main (int, ACE_TCHAR *[])
   tv1.set (1, 1);
   tv2.set (2, 2);
   tv1 *= 2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (1, 1);
   tv2.set (-2, -2);
   tv1 *= -2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
   // test usec shift
   tv1.set (1, 999999);
   tv2.set (19, 999990);
   tv1 *= 10.0;
-  ACE_ASSERT ( tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT ( tv1 == tv2);
   tv1.set (1, 999999);
   tv2.set (-19, -999990);
   tv1 *= -10.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
-#if !defined(ACE_LACKS_NUMERIC_LIMITS) && !defined (ACE_WIN64)
-  const time_t max_time_t = std::numeric_limits<time_t>::max ();
-  const time_t min_time_t = std::numeric_limits<time_t>::min ();
-#else
-  const time_t max_time_t = LONG_MAX;
-  const time_t min_time_t = LONG_MIN;
-#endif
+  const time_t max_time_t = ACE_Numeric_Limits<time_t>::max ();
+  const time_t min_time_t = ACE_Numeric_Limits<time_t>::min ();
 
   // test results near limits
   tv1.set ((max_time_t >> 1), 499999);
   tv2.set ((-(max_time_t >> 1) << 1), -999998);
   tv1 *= -2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (max_time_t >> 1, 499999);
   tv2.set (((max_time_t >> 1) << 1), 999998);
   tv1 *= 2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
   // test saturated result
   tv1.set (max_time_t - 1, 499999);
-  tv2.set (max_time_t, 999999);
-  tv1 *= max_time_t;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  tv2.set (max_time_t, 999999);  // ACE_Time_Value::max_time
+  tv1 *= 10.0;
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (max_time_t - 1, 499999);
   tv2.set (min_time_t, -999999);
-  tv1 *= min_time_t;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  tv1 *= -10.0;
+  ACE_ASSERT (tv1 == tv2);
 
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
   if (test_ace_u_longlong () != 0)
diff --git a/ACE/tests/Timer_Queue_Test.cpp b/ACE/tests/Timer_Queue_Test.cpp
index 5f364c2f21b..1a788f1fc26 100644
--- a/ACE/tests/Timer_Queue_Test.cpp
+++ b/ACE/tests/Timer_Queue_Test.cpp
@@ -568,7 +568,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Timer_Queue_Test"));
 
-  ACE_OS::srand (ACE_OS::time (0L));
+  ACE_OS::srand ((u_int) ACE_OS::time (0L));
 
   if (argc > 1)
     max_iterations = ACE_OS::atoi (argv[1]);
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 4568e8ba530..a9e36f266f0 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -36,6 +36,8 @@ Bug_2497_Regression_Test
 Bug_2540_Regression_Test
 Bug_2659_Regression_Test: !ST
 Bug_2653_Regression_Test: !ST
+Bug_2815_Regression_Test
+Bug_2820_Regression_Test
 CDR_Array_Test: !ACE_FOR_TAO
 CDR_File_Test: !ACE_FOR_TAO
 CDR_Test
@@ -70,7 +72,7 @@ INET_Addr_Test
 IOStream_Test
 Integer_Truncate_Test
 Lazy_Map_Manager_Test
-Log_Msg_Test: !LynxOS !ACE_FOR_TAO
+Log_Msg_Test: !ACE_FOR_TAO
 Logging_Strategy_Test: !DISABLE_ToFix_LynxOS_PPC !STATIC !ST
 Manual_Event_Test: !DISABLE_ToFix_LynxOS_PPC
 MEM_Stream_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !VxWorks !nsk !ACE_FOR_TAO
@@ -96,9 +98,11 @@ Naming_Test: !LynxOS !Unicos !VxWorks !nsk !ACE_FOR_TAO
 Network_Adapters_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 New_Fail_Test: ALL !DISABLED
 NonBlocking_Conn_Test
+Notification_Queue_Unit_Test
 Notify_Performance_Test: !nsk !ACE_FOR_TAO
 OS_Test
 Object_Manager_Test
+Object_Manager_Flipping_Test
 Obstack_Test
 OrdMultiSet_Test
 Pipe_Test: !VxWorks
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 64b74caa8aa..e9b4437b94a 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -234,6 +234,20 @@ project(Bug_2653_Regression_Test) : acetest {
   }
 }
 
+project(Bug_2815_Regression_Test) : acetest {
+  exename = Bug_2815_Regression_Test
+  Source_Files {
+    Bug_2815_Regression_Test.cpp
+  }
+}
+
+project(Bug_2820_Regression_Test) : acetest {
+  exename = Bug_2820_Regression_Test
+  Source_Files {
+    Bug_2820_Regression_Test.cpp
+  }
+}
+
 project(Cache Map Manager Test) : acetest {
   exename = Cache_Map_Manager_Test
   Source_Files {
@@ -624,6 +638,13 @@ project(New Fail Test) : acetest {
   }
 }
 
+project(Notification Queue Unit Test) : acetest {
+  exename = Notification_Queue_Unit_Test
+  Source_Files {
+    Notification_Queue_Unit_Test.cpp
+  }
+}
+
 project(Notify Performance Test) : acetest {
   avoids += ace_for_tao
   exename = Notify_Performance_Test
@@ -639,6 +660,13 @@ project(Object Manager Test) : acetest {
   }
 }
 
+project(Object Manager Flipping Test) : acetest {
+  exename = Object_Manager_Flipping_Test
+  Source_Files {
+    Object_Manager_Flipping_Test.cpp
+  }
+}
+
 project(Obstack Test) : acetest {
   exename = Obstack_Test
   Source_Files {
diff --git a/ACE/tests/unload_libace.mpb b/ACE/tests/unload_libace.mpb
index 7fe13bae305..129822de2b3 100644
--- a/ACE/tests/unload_libace.mpb
+++ b/ACE/tests/unload_libace.mpb
@@ -3,4 +3,12 @@
 
 feature(ace_for_tao) {
   macros += ACE_LIB_NAME=\\"ACE_FOR_TAO\\"
-}
\ No newline at end of file
+}
+project {
+  specific(vc8) {
+    macros += _CRT_SECURE_NO_WARNINGS
+  }
+  specific(nmake) {
+    compile_flags += /wd4996
+  }
+}
diff --git a/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp b/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
index ea8397fcf03..ca32411c320 100644
--- a/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
+++ b/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct HomeExecutor
       {
+        virtual ~HomeExecutor ()
+        {
+        }
+        
         virtual void
         begin (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp b/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp
index 6c3d84b2481..1d77e8ea026 100644
--- a/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp
+++ b/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp
@@ -119,8 +119,23 @@ public:
       return not_found_value;
     }
   }
-
-
+  
+  bool 
+  get_all_values (std::string name, std::vector<std::string> &values)
+  {
+    Options::iterator i (options.begin ());
+    
+    while ((i = std::find_if (i, 
+                              options.end (), 
+                              OptionNamePredicat (name))) != options.end ())
+      {
+        values.push_back (i->value ());
+        ++i;
+      }
+    
+    return values.size () != 0;
+  }
+  
   struct Option
   {
     Option (std::string const& name)
diff --git a/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp b/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
index f1d3ab4fb8c..6dac816bed4 100644
--- a/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
+++ b/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
@@ -55,6 +55,10 @@ namespace CCF
       {
         return traits::eof ();
       }
+      
+      virtual ~TokenStream ()
+      { 
+      }
     };
 
     class InputStreamAdapter : public TokenStream<char>
@@ -64,7 +68,11 @@ namespace CCF
           : is_ (is)
       {
       }
-
+      
+      virtual ~InputStreamAdapter ()
+      {
+      }
+      
     public:
 
       virtual int_type
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
index d113d9136cf..9d002fbc3f5 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Attribute
       {
+        virtual ~Attribute ()
+        {
+        }
+        
         virtual void
         begin_ro () = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Const.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Const.hpp
index dcb7c0054ac..92e1ee09dbe 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Const.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Const.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Const
       {
+        virtual ~Const ()
+        {
+        }
+        
         virtual void
         begin (IdentifierPtr const& type,
                SimpleIdentifierPtr const& name) = 0;
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
index 18687171a78..3bd1f4bdd99 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Scope
       {
+        virtual ~Scope ()
+        {
+        }
+        
         virtual void
         open_scope () = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Enum.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Enum.hpp
index c0822d44470..468da206b6e 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Enum.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Enum.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Enum
       {
+        virtual ~Enum ()
+        {
+        }
+        
         virtual void
         begin (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Exception.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Exception.hpp
index 02230082b49..3bd7323c943 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Exception.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Exception.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Exception : Scope
       {
+        virtual ~Exception ()
+        {
+        }
+        
         virtual void
         begin (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
index f67dbfd1914..dda020e73d5 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Include
       {
+        virtual ~Include ()
+        {
+        }
+        
         virtual void
         quote (StringLiteralPtr const& sl) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
index ebbb2398764..1f5a327caee 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Interface : Scope
       {
+        virtual ~Interface ()
+        {
+        }
+        
         virtual void
         begin_abstract_def (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Member.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Member.hpp
index a5e835ee351..e706b7d1a78 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Member.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Member.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Member
       {
+        virtual ~Member ()
+        {
+        }
+        
         virtual void
         type (IdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
index 08411592eac..49e9eea7723 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Module : Scope
       {
+        virtual ~Module ()
+        {
+        }
+        
         virtual void
         begin (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Native.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Native.hpp
index ed7fd4422f5..368920f2615 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Native.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Native.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Native
       {
+        virtual ~Native ()
+        {
+        }
+        
         virtual void
         name (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp
index 4b0423d8e63..671019133de 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct NumericExpression
       {
+        virtual ~NumericExpression ()
+        {
+        }
+        
         virtual void
         flush () = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
index 99131c60e15..7cdd069faa0 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
@@ -17,6 +17,10 @@ namespace CCF
     {
       struct Operation
       {
+        virtual ~Operation ()
+        {
+        }
+        
         virtual void
         one_way () = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Struct.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Struct.hpp
index 00581af6016..8a53b85ff15 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Struct.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Struct.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Struct : Scope
       {
+        virtual ~Struct ()
+        {
+        }
+        
         virtual void
         begin_def (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
index a716961bbf0..535fbc80654 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct TypeId
       {
+        virtual ~TypeId ()
+        {
+        }
+        
         virtual void
         begin (IdentifierPtr const& name, StringLiteralPtr const& id) = 0;
 
@@ -25,6 +29,10 @@ namespace CCF
 
       struct TypePrefix
       {
+        virtual ~TypePrefix ()
+        {
+        }
+        
         virtual void
         begin (IdentifierPtr const& name, StringLiteralPtr const& prefix) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
index 8e76d3c3a7f..ad90573a6bb 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Typedef
       {
+        virtual ~Typedef ()
+        {
+        }
+        
         virtual void
         pre (KeywordPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Union.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Union.hpp
index dac2297294d..8b7c5d51f46 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Union.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Union.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Union : Scope
       {
+        virtual ~Union ()
+        {
+        }
+        
         virtual void
         begin_def (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueType.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueType.hpp
index 9d990567778..2db412f6a32 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueType.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueType.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct ValueType : Scope
       {
+        virtual ~ValueType ()
+        {
+        }
+        
         virtual void
         begin_abstract_def (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp
index 4d47407f360..f7239c45a94 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct ValueTypeFactory
       {
+        virtual ~ValueTypeFactory ()
+        {
+        }
+        
         virtual void
         name (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp
index 9eec25ef934..08fc89fd028 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct ValueTypeMember
       {
+        virtual ~ValueTypeMember ()
+        {
+        }
+        
         virtual void
         begin_private () = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
index 36d64ce5797..23d2507ea17 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Consumes
       {
+        virtual ~Consumes ()
+        {
+        }
+        
         virtual void
         type (IdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
index 819383a2df4..43a6555a8eb 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Emits
       {
+        virtual ~Emits ()
+        {
+        }
+        
         virtual void
         type (IdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp
index 12514bb773e..f476b31f93b 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct EventTypeFactory
       {
+        virtual ~EventTypeFactory ()
+        {
+        }
+        
         virtual void
         name (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
index 405370f3f64..ae060698b8f 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct HomeFactory
       {
+        virtual ~HomeFactory ()
+        {
+        }
+        
         virtual void
         name (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp
index e24cf65065b..bf2d9ef9803 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct HomeFinder
       {
+        virtual ~HomeFinder ()
+        {
+        }
+        
         virtual void
         name (SimpleIdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
index 3b54f53b050..30323092fa2 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Provides
       {
+        virtual ~Provides ()
+        {
+        }
+        
         virtual void
         type (IdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
index 46fa0a65892..e30eacb456e 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Publishes
       {
+        virtual ~Publishes ()
+        {
+        }
+        
         virtual void
         type (IdentifierPtr const& id) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp b/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
index dcd571bf5fa..453a6def984 100644
--- a/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
+++ b/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
@@ -15,6 +15,10 @@ namespace CCF
     {
       struct Uses
       {
+        virtual ~Uses ()
+        {
+        }
+        
         virtual void
         multiple () = 0;
 
diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc
index 2a42a84b833..09b64314bce 100644
--- a/CIAO/CIAO_TAO.mwc
+++ b/CIAO/CIAO_TAO.mwc
@@ -24,5 +24,4 @@ workspace {
   tools
   tests
   examples
-  RACE
 }
diff --git a/CIAO/CIDLC/AttributeHeaderEmitters.cpp b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
index d5794a889f5..a0629f60f8c 100644
--- a/CIAO/CIDLC/AttributeHeaderEmitters.cpp
+++ b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
@@ -40,22 +40,8 @@ WriteAttributeHeaderEmitter::get_raises (SemanticGraph::ReadWriteAttribute&)
 }
 
 void
-WriteAttributeHeaderEmitter::set_raises_none (SemanticGraph::ReadWriteAttribute&)
+WriteAttributeHeaderEmitter::set_raises (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_SNGL];
-}
-
-void
-WriteAttributeHeaderEmitter::set_raises_pre (SemanticGraph::ReadWriteAttribute&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-WriteAttributeHeaderEmitter::set_raises_post (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "))";
 }
 
 void
@@ -104,20 +90,16 @@ AttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
 void
 AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadWriteAttribute&)
 {
-  os << "))";
 }
 
 void
@@ -161,20 +143,16 @@ AttributeHeaderEmitter::name (SemanticGraph::ReadAttribute& a)
 void
 AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadAttribute&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadAttribute&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadAttribute&)
 {
-  os << "))";
 }
 
 void
diff --git a/CIAO/CIDLC/AttributeHeaderEmitters.hpp b/CIAO/CIDLC/AttributeHeaderEmitters.hpp
index f4318ad0073..9535a30e127 100644
--- a/CIAO/CIDLC/AttributeHeaderEmitters.hpp
+++ b/CIAO/CIDLC/AttributeHeaderEmitters.hpp
@@ -30,13 +30,7 @@ struct WriteAttributeHeaderEmitter : Traversal::ReadWriteAttribute,
   get_raises (SemanticGraph::ReadWriteAttribute&);
 
   virtual void
-  set_raises_none (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises_pre (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises_post (SemanticGraph::ReadWriteAttribute&);
+  set_raises (SemanticGraph::ReadWriteAttribute&);
 
   virtual void
   post (SemanticGraph::ReadWriteAttribute&);
diff --git a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
index 9f601d27de7..9873f5c2f99 100644
--- a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
+++ b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
@@ -39,7 +39,7 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
   virtual void
   gen_swapping_set ()
   {
-    os << "this->activate_component (" << ");"
+    os << "this->activate_component ();"
        << endl;
   }
 
@@ -54,14 +54,13 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
   {
     os << scope_.name ()
        << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl;
+       << a.name () << " (";
 
     Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
 
     os << (exec_src_ ? " /* " : " ")
        << a.name ()
-       << (exec_src_ ? " */" : "") << endl
-       << ")" << endl;
+       << (exec_src_ ? " */" : "") << ")" << endl;
   }
 
   virtual void
@@ -70,22 +69,8 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
   }
 
   virtual void
-  set_raises_none (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << STRS[EXCP_SNGL];
-  }
-
-  virtual void
-  set_raises_pre (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
-  }
-
-  virtual void
-  set_raises_post (SemanticGraph::ReadWriteAttribute&)
+  set_raises (SemanticGraph::ReadWriteAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
@@ -104,9 +89,8 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
           this->gen_swapping_set ();
         }
 
-        os << "this->executor_->" << a.name () << " (" << endl
-           << a.name () << endl
-           << ");" << endl;
+        os << "this->executor_->" << a.name ()
+           << " (" << a.name () << ");" << endl;
       }
 
     os << "}";
@@ -188,27 +172,12 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   {
     os << scope_.name ()
        << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl
-       << ")" << endl;
-  }
-
-  virtual void
-  get_raises_none (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << STRS[EXCP_SNGL] << endl;
+       << a.name () << " ()" << endl;
   }
 
   virtual void
-  get_raises_pre (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
-  }
-
-  virtual void
-  get_raises_post (SemanticGraph::ReadWriteAttribute&)
+  get_raises (SemanticGraph::ReadWriteAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
@@ -280,27 +249,12 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   {
     os << scope_.name ()
        << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl
-       << ")" << endl;
-  }
-
-  virtual void
-  get_raises_none (SemanticGraph::ReadAttribute&)
-  {
-    os << STRS[EXCP_SNGL] << endl;
-  }
-
-  virtual void
-  get_raises_pre (SemanticGraph::ReadAttribute&)
-  {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
+       << a.name () << " ()" << endl;
   }
 
   virtual void
-  get_raises_post (SemanticGraph::ReadAttribute&)
+  get_raises (SemanticGraph::ReadAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
diff --git a/CIAO/CIDLC/ExecImplGenerator.cpp b/CIAO/CIDLC/ExecImplGenerator.cpp
index 26f0d1c8ede..d616124c22b 100644
--- a/CIAO/CIDLC/ExecImplGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplGenerator.cpp
@@ -6,6 +6,7 @@
 #include "ExecImplHeaderGenerator.hpp"
 #include "ExecImplSourceGenerator.hpp"
 #include "CxxNamePrinter.hpp"
+#include "Upcase.hpp"
 
 #include "CCF/CodeGenerationKit/Regex.hpp"
 #include "CCF/CodeGenerationKit/IndentationCxx.hpp"
@@ -19,17 +20,6 @@ using namespace Traversal;
 using std::string;
 using std::ostream;
 
-namespace
-{
-  // On some platforms toupper can be something else than a
-  // function.
-  int
-  upcase (int c)
-  {
-    return toupper (c);
-  }
-}
-
 ExecImplGenerator::ExecImplGenerator (CommandLine const& cl)
     : cl_ (cl),
       file_name_ (""),
@@ -147,13 +137,7 @@ ExecImplGenerator::compute_export_macro (const fs::path& file_path)
   {
     // Modify a copy of the filename string.
     export_macro_ = file_name_;
-
-
-    // Convert filename string to upper case.
-    transform (export_macro_.begin (),
-               export_macro_.end (),
-               export_macro_.begin (),
-               upcase);
+    str_upcase (export_macro_);
 
     // Replace the suffix.
     export_macro_ =
diff --git a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index 6ee4899a4df..3c823ef78cc 100644
--- a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -135,8 +135,7 @@ namespace
 
       os << "_ptr" << endl
          << "get_" << p.name () << " (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << ");" << endl;
     }
 
     virtual void
@@ -148,8 +147,7 @@ namespace
       Traversal::ConsumerData::belongs (c, belongs_);
 
       os << " *ev" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << ");" << endl;
    }
 
   private:
@@ -306,46 +304,17 @@ namespace
 
       os << "virtual void" << endl
          << "set_session_context (" << endl
-         << STRS[COMP_SC] << "_ptr ctx" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+         << STRS[COMP_SC] << "_ptr ctx);" << endl;
 
-      os << "virtual void" << endl
-         << "ciao_preactivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ciao_preactivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ciao_postactivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ciao_postactivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_activate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_activate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_passivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_passivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_remove (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_remove ();" << endl;
     }
 
     virtual void
@@ -590,11 +559,7 @@ namespace
 
       os << "// Implicit operations." << endl << endl
          << "virtual " << STRS[COMP_EC] << "_ptr" << endl
-         << "create (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+         << "create ();" << endl;
     }
 
     virtual void
@@ -668,19 +633,11 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
   }
 
   string uc_file_name = file_name;
-
-  std::transform (uc_file_name.begin (),
-                  uc_file_name.end (),
-                  uc_file_name.begin (),
-                  upcase);
+  str_upcase (uc_file_name);
 
   string uc_file_suffix = cl_.get_value ("exec-hdr-file-suffix",
                                          "_exec.h");
-
-  std::transform (uc_file_suffix.begin (),
-                  uc_file_suffix.end (),
-                  uc_file_suffix.begin (),
-                  upcase);
+  str_upcase (uc_file_suffix);
 
   string guard =
     "CIAO_"
@@ -791,19 +748,11 @@ ExecImplHeaderEmitter::post (TranslationUnit&)
   if (file_.empty ()) return;
 
   string uc_file_name = file_.leaf ();
-
-  std::transform (uc_file_name.begin (),
-                  uc_file_name.end (),
-                  uc_file_name.begin (),
-                  upcase);
+  str_upcase (uc_file_name);
 
   string uc_file_suffix = cl_.get_value ("exec-hdr-file-suffix",
                                          "_exec.h");
-
-  std::transform (uc_file_suffix.begin (),
-                  uc_file_suffix.end (),
-                  uc_file_suffix.begin (),
-                  upcase);
+  str_upcase (uc_file_suffix);
 
   string guard =
     "CIAO_"
diff --git a/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 1f36dd99248..331e5a91e92 100644
--- a/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -57,22 +57,8 @@ namespace
     }
 
     virtual void
-    raises_pre (Type&)
+    raises (Type&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_none (Type&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_post (Type&)
-    {
-      os << "))";
     }
 
     virtual void
@@ -229,7 +215,6 @@ namespace
       os << "_ptr" << endl
          << scope_.name () << "_exec_i::get_"
          << p.name () << " ()" << endl
-         << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
          << "return ";
@@ -255,7 +240,6 @@ namespace
 
       os << " * /* ev */" << endl
          << ")" << endl
-         << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
          << "}";
@@ -440,11 +424,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::set_session_context (" << endl
-         << STRS[COMP_SC] << "_ptr ctx" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
+         << STRS[COMP_SC] << "_ptr ctx)" << endl
          << "{"
          << "this->context_ =" << endl
          << "  " << t.name () << "_Context::_narrow (" << endl
@@ -460,45 +440,30 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_preactivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_postactivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_activate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_passivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_remove ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
@@ -580,22 +545,8 @@ namespace
     }
 
     virtual void
-    raises_none (SemanticGraph::HomeFactory&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_pre (SemanticGraph::HomeFactory&)
+    raises (SemanticGraph::HomeFactory&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_post (SemanticGraph::HomeFactory&)
-    {
-      os << "))";
     }
 
     virtual void
@@ -673,22 +624,8 @@ namespace
     }
 
     virtual void
-    raises_none (SemanticGraph::HomeFinder&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_pre (SemanticGraph::HomeFinder&)
-    {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_post (SemanticGraph::HomeFinder&)
+    raises (SemanticGraph::HomeFinder&)
     {
-      os << "))";
     }
 
     virtual void
@@ -974,9 +911,6 @@ namespace
       os << "// Implicit operations." << endl << endl
          << STRS[COMP_EC] << "_ptr" << endl
          << t.name () << "_exec_i::create ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[COMP_EC] << "_ptr retval =" << endl
          << "  " << STRS[COMP_EC] << "::_nil ();" << endl
diff --git a/CIAO/CIDLC/Literals.cpp b/CIAO/CIDLC/Literals.cpp
index 0ed8f8e9699..dec2bfcd286 100644
--- a/CIAO/CIDLC/Literals.cpp
+++ b/CIAO/CIDLC/Literals.cpp
@@ -31,10 +31,8 @@ namespace StringLiterals
   char const* const STRS[LIT_SIZE] =
   {
     // Common CORBA and all Components exceptions.
-    "ACE_THROW_SPEC (( ::CORBA::SystemException))",       // EXCP_SNGL
-    "ACE_THROW_SPEC ((",                                  // EXCP_START
     "::CORBA::SystemException",                           // EXCP_SYS
-    "::CORBA::BAD_PARAM ()",                              // EXCP_BP
+    "::CORBA::BAD_PARAM",                                 // EXCP_BP
     "::Components::IllegalState",                         // EXCP_IS
     "::Components::AlreadyConnected",                     // EXCP_AC
     "::Components::InvalidConnection",                    // EXCP_IC
@@ -74,8 +72,7 @@ namespace StringLiterals
     "variable-size",                                      // VAR_SIZE
     "_ciao_extract_val",                                  // EXTRACT
     "_ciao_extract_tmp",                                  // EXTRACT_TMP
-    "ACE_UNUSED_ARG",                                     // ACE_UA
-    "ACE_THROW_RETURN"                                    // ACE_TR
+    "ACE_UNUSED_ARG"                                      // ACE_UA
   };
 }
 
diff --git a/CIAO/CIDLC/Literals.hpp b/CIAO/CIDLC/Literals.hpp
index 09e2a8cb7c4..2e0a650df30 100644
--- a/CIAO/CIDLC/Literals.hpp
+++ b/CIAO/CIDLC/Literals.hpp
@@ -12,8 +12,6 @@ namespace StringLiterals
   // Index into the string array in Literals.cpp.
   enum
   {
-    EXCP_SNGL,
-    EXCP_START,
     EXCP_SYS,
     EXCP_BP,
     EXCP_IS,
@@ -48,7 +46,6 @@ namespace StringLiterals
     EXTRACT,
     EXTRACT_TMP,
     ACE_UA,
-    ACE_TR,
     LIT_SIZE
   };
 
diff --git a/CIAO/CIDLC/OperationHeaderEmitters.cpp b/CIAO/CIDLC/OperationHeaderEmitters.cpp
index e41e3d6d023..db72340bb62 100644
--- a/CIAO/CIDLC/OperationHeaderEmitters.cpp
+++ b/CIAO/CIDLC/OperationHeaderEmitters.cpp
@@ -43,22 +43,8 @@ OperationEmitter::receives_post (Type&)
 }
 
 void
-OperationEmitter::raises_pre (Type&)
+OperationEmitter::raises (Type&)
 {
-  os << STRS[EXCP_START] << " "
-      << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-OperationEmitter::raises_none (Type&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-OperationEmitter::raises_post (Type&)
-{
-  os << "))";
 }
 
 void
@@ -146,22 +132,8 @@ FactoryOperationEmitter::receives_post (SemanticGraph::HomeFactory&)
 }
 
 void
-FactoryOperationEmitter::raises_none (SemanticGraph::HomeFactory&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-FactoryOperationEmitter::raises_pre (SemanticGraph::HomeFactory&)
+FactoryOperationEmitter::raises (SemanticGraph::HomeFactory&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-FactoryOperationEmitter::raises_post (SemanticGraph::HomeFactory&)
-{
-  os << "))";
 }
 
 void
@@ -232,22 +204,8 @@ FinderOperationEmitter::receives_post (SemanticGraph::HomeFinder&)
 }
 
 void
-FinderOperationEmitter::raises_none (SemanticGraph::HomeFinder&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-FinderOperationEmitter::raises_pre (SemanticGraph::HomeFinder&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-FinderOperationEmitter::raises_post (SemanticGraph::HomeFinder&)
+FinderOperationEmitter::raises (SemanticGraph::HomeFinder&)
 {
-  os << "))";
 }
 
 void
diff --git a/CIAO/CIDLC/OperationHeaderEmitters.hpp b/CIAO/CIDLC/OperationHeaderEmitters.hpp
index d1fc148e0c3..1f87e254e03 100644
--- a/CIAO/CIDLC/OperationHeaderEmitters.hpp
+++ b/CIAO/CIDLC/OperationHeaderEmitters.hpp
@@ -29,11 +29,7 @@ struct OperationEmitter : Traversal::Operation,
 
   virtual void receives_post (Type&);
 
-  virtual void raises_pre (Type&);
-
-  virtual void raises_none (Type&);
-
-  virtual void raises_post (Type&);
+  virtual void raises (Type&);
 
   virtual void post (Type&);
 
@@ -84,13 +80,7 @@ struct FactoryOperationEmitter : Traversal::HomeFactory,
   receives_post (SemanticGraph::HomeFactory&);
 
   virtual void
-  raises_none (SemanticGraph::HomeFactory&);
-
-  virtual void
-  raises_pre (SemanticGraph::HomeFactory&);
-
-  virtual void
-  raises_post (SemanticGraph::HomeFactory&);
+  raises (SemanticGraph::HomeFactory&);
 
   virtual void
   post (SemanticGraph::HomeFactory&);
@@ -109,38 +99,23 @@ struct FinderOperationEmitter : Traversal::HomeFinder,
 {
   FinderOperationEmitter (Context& c, bool for_exec = false);
 
-  virtual void
-  pre (SemanticGraph::HomeFinder&);
+  virtual void pre (SemanticGraph::HomeFinder&);
 
-  virtual void
-  returns (SemanticGraph::HomeFinder&);
+  virtual void returns (SemanticGraph::HomeFinder&);
 
-  virtual void
-  name (SemanticGraph::HomeFinder&);
+  virtual void name (SemanticGraph::HomeFinder&);
 
-  virtual void
-  receives_none (SemanticGraph::HomeFinder&);
+  virtual void receives_none (SemanticGraph::HomeFinder&);
 
-  virtual void
-  receives_pre (SemanticGraph::HomeFinder&);
+  virtual void receives_pre (SemanticGraph::HomeFinder&);
 
-  virtual void
-  receives_post (SemanticGraph::HomeFinder&);
+  virtual void receives_post (SemanticGraph::HomeFinder&);
 
-  virtual void
-  raises_none (SemanticGraph::HomeFinder&);
+  virtual void raises (SemanticGraph::HomeFinder&);
 
-  virtual void
-  raises_pre (SemanticGraph::HomeFinder&);
+  virtual void post (SemanticGraph::HomeFinder&);
 
-  virtual void
-  raises_post (SemanticGraph::HomeFinder&);
-
-  virtual void
-  post (SemanticGraph::HomeFinder&);
-
-  virtual void
-  comma (SemanticGraph::HomeFinder&);
+  virtual void comma (SemanticGraph::HomeFinder&);
 
 private:
   ReturnTypeNameEmitter returns_emitter_;
diff --git a/CIAO/CIDLC/ServantGenerator.cpp b/CIAO/CIDLC/ServantGenerator.cpp
index f817087b92d..81aa3c51f81 100644
--- a/CIAO/CIDLC/ServantGenerator.cpp
+++ b/CIAO/CIDLC/ServantGenerator.cpp
@@ -6,6 +6,7 @@
 #include "ServantHeaderGenerator.hpp"
 #include "ServantSourceGenerator.hpp"
 #include "CxxNamePrinter.hpp"
+#include "Upcase.hpp"
 
 #include "CCF/CodeGenerationKit/Regex.hpp"
 #include "CCF/CodeGenerationKit/IndentationCxx.hpp"
@@ -19,17 +20,6 @@ using namespace Traversal;
 using std::string;
 using std::ostream;
 
-namespace
-{
-  // On some platforms toupper can be something else than a
-  // function.
-  int
-  upcase (int c)
-  {
-    return toupper (c);
-  }
-}
-
 ServantGenerator::ServantGenerator (CommandLine const& cl)
     : cl_ (cl),
       file_name_ (""),
@@ -71,7 +61,7 @@ void ServantGenerator::options (CL::Description& d)
                   "svnt-export-macro",
                   "macro",
                   "Replace default servant DLL export macro "
-                  "with provided ,acro.",
+                  "with provided macro.",
                   CL::OptionType::value));
 
   d.add_option (CL::OptionDescription (
@@ -92,6 +82,11 @@ void ServantGenerator::options (CL::Description& d)
                   "type",
                   "Generate code for custom container of the provided type.",
                   CL::OptionType::value));
+                  
+  d.add_option (CL::OptionDescription (
+                  "static-config",
+                  "No dynamic configuration, no locks on state access.",
+                  CL::OptionType::flag));
 }
 
 
@@ -158,12 +153,7 @@ ServantGenerator::compute_export_macro (const fs::path& file_path)
   {
     // Modify a copy of the filename string.
     export_macro_ = file_name_;
-
-    // Convert filename string to upper case.
-    transform (export_macro_.begin (),
-               export_macro_.end (),
-               export_macro_.begin (),
-               upcase);
+    str_upcase (export_macro_);
 
     // Replace the suffix.
     export_macro_ =
diff --git a/CIAO/CIDLC/ServantHeaderGenerator.cpp b/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 6676db3e77d..3613d3cc3e3 100644
--- a/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -87,10 +87,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -102,7 +100,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -122,8 +119,7 @@ namespace
 
       os << "// Get component implementation." << endl
          << "virtual CORBA::Object_ptr" << endl
-         << "_get_component ()" << endl
-         << STRS[EXCP_SNGL] << ";" << endl
+         << "_get_component ();" << endl
          << "protected:" << endl
          << "// Facet executor." << endl
          << i.scoped_name ().scope_name ()<< "::CCM_" << i.name ()
@@ -173,8 +169,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "ev)" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+        os << "ev);" << endl;
       }
 
       virtual void
@@ -186,8 +181,7 @@ namespace
 
         os << endl
             << "get_connection_" << u.name ()
-            << " ()" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+            << " ();" << endl;
       }
 
       virtual void
@@ -195,8 +189,7 @@ namespace
       {
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name ()
-           << " ()" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << " ();" << endl;
       }
 
       virtual void
@@ -208,8 +201,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "ev)" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+        os << "ev);" << endl;
       }
 
     private:
@@ -238,20 +230,14 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << e.name () << " ();" << endl;
       }
 
       virtual void
@@ -262,21 +248,14 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr);" << endl;
 
         os << "virtual ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << u.name () << " ();" << endl;
       }
 
       virtual void
@@ -287,11 +266,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr);" << endl;
 
         os << "virtual ";
 
@@ -299,10 +274,7 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "::Components::Cookie * ck);" << endl;
       }
 
       virtual void
@@ -313,18 +285,12 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[COMP_ECB] << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -332,10 +298,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[COMP_CK] << " *ck);" << endl;
       }
 
     private:
@@ -380,30 +343,60 @@ namespace
       virtual void
       traverse (SemanticGraph::MultiUser& u)
       {
-        os << "// Multiplex " << u.name () << " connection." << endl
-           << "ACE_Active_Map_Manager<" << endl;
+        os << endl
+           << "// Multiplex " << u.name () << " connection." << endl
+           << "typedef ACE_Array_Map< ::CORBA::ULong," << endl
+           << "                       ";
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_var>" << endl
-           << "ciao_uses_" << u.name () << "_;" << endl;
+           << "  ";
+
+        string uc_port_name (u.name ().str ());
+        str_upcase (uc_port_name);
+
+        os << uc_port_name << "_TABLE;"
+           << uc_port_name << "_TABLE ciao_uses_"
+           << u.name () << "_;";
+
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "TAO_SYNCH_MUTEX " << u.name () << "_lock_;";
+        }
      }
 
       virtual void
       traverse (SemanticGraph::Publisher& p)
       {
-        os << "ACE_Active_Map_Manager<" << endl;
+        os << endl
+           << "typedef ACE_Array_Map< ::CORBA::ULong," << endl
+           << "                       ";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var>" << endl
-           << "ciao_publishes_" << p.name () << "_map_;"
-           << endl;
+           << "  ";
 
-        os << "ACE_Active_Map_Manager<" << endl
-           << STRS[COMP_ECB] << "_var>" << endl
-           << "ciao_publishes_" << p.name () << "_generic_map_;"
-           << endl;
+        string uc_port_name (p.name ().str ());
+        str_upcase (uc_port_name);
+
+        os << uc_port_name << "_TABLE;"
+           << uc_port_name << "_TABLE ciao_publishes_"
+           << p.name () << "_;";
+
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "TAO_SYNCH_MUTEX " << p.name () << "_lock_;";
+        }
+
+        os << endl
+           << "typedef ACE_Array_Map< ::CORBA::ULong," << endl
+           << "                       " << STRS[COMP_ECB]
+           << "_var>" << endl
+           << "  " << uc_port_name << "_GENERIC_TABLE;"
+           << uc_port_name << "_GENERIC_TABLE ciao_publishes_"
+           << p.name () << "_generic_;";
       }
 
     private:
@@ -427,8 +420,7 @@ namespace
          << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_Context," << endl
          << "      " << t.name () << "_Servant," << endl
-         << "      " << t.scoped_name () << "," << endl
-         << "      " << t.scoped_name () << "_var" << endl
+         << "      " << t.scoped_name () << endl
          << "    >" << endl
          << "{"
          << "public:" << endl;
@@ -476,12 +468,8 @@ namespace
            << endl << endl;
 
         os << "virtual " << STRS[COMP_CD] << " *" << endl
-           << "get_registered_consumers (" << endl
-           << "const char *publisher_name)" << endl
-           << STRS[EXCP_START] << endl
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IN] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "get_registered_consumers (const char *publisher_name);"
+           << endl;
       }
 
       os << "// CIAO-specific." << endl << endl;
@@ -576,8 +564,7 @@ namespace
 
         os << "_ptr" << endl
            << "provide_" << p.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -588,21 +575,14 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << u.name () << " ();" << endl;
 
         os << "virtual ";
 
@@ -610,8 +590,7 @@ namespace
 
         os << "_ptr" << endl
            << "get_connection_" << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -622,11 +601,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -634,15 +609,11 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "::Components::Cookie * ck);" << endl;
 
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -691,15 +662,11 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << " *evt" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "virtual void" << endl
-           << "push_event ( ::Components::EventBase *ev)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl;
+           << "push_event ( ::Components::EventBase *ev);" << endl;
 
         // @@ GD added below code.
 
@@ -707,23 +674,18 @@ namespace
            << "virtual void" << endl
            << "ciao_push_event ( ::Components::EventBase *ev," << endl
            << "const char * source_id," << endl
-           << "::CORBA::TypeCode_ptr tc)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl;
+           << "::CORBA::TypeCode_ptr tc);" << endl;
 
         os << "// CIAO-specific in " << STRS[COMP_ECB] << "." << endl
            << "virtual CORBA::Boolean" << endl
            << "ciao_is_substitutable (" << endl
            << "const char *event_repo_id" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "// Get component implementation." << endl
            << "virtual CORBA::Object_ptr" << endl
            << "_get_component (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "protected:" << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
@@ -744,8 +706,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "get_consumer_" << c.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -756,20 +717,14 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << e.name () << " ();" << endl;
       }
 
       virtual void
@@ -780,18 +735,12 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[COMP_ECB] << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -799,10 +748,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[COMP_CK] << " *ck);" << endl;
       }
 
     private:
@@ -872,8 +818,7 @@ namespace
       {
         os << "::CORBA::Object_ptr" << endl
            << "provide_" << p.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -891,8 +836,7 @@ namespace
       {
         os << "::Components::EventConsumerBase_ptr" << endl
            << "get_consumer_" << c.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -1057,85 +1001,45 @@ namespace
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "connect (" << endl
          << "const char *name," << endl
-         << "CORBA::Object_ptr connection)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << "CORBA::Object_ptr connection);" << endl;
 
       os << "virtual CORBA::Object_ptr" << endl
          << "disconnect (" << endl
          << "const char *name," << endl
-         << STRS[COMP_CK] << " *ck)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl;
+         << STRS[COMP_CK] << " *ck);" << endl;
 
       os << "virtual " << STRS[COMP_RD] << " *" << endl
-         << "get_all_receptacles (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_receptacles ();" << endl;
 
       os << "// Operations for Events interface." << endl << endl;
 
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "subscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_ECB] << "_ptr subscriber)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << STRS[COMP_ECB] << "_ptr subscriber);" << endl;
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
          << "unsubscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_CK] << " *ck)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[COMP_CK] << " *ck);" << endl;
 
       os << "virtual void" << endl
          << "connect_consumer (" << endl
          << "const char *emitter_name," << endl
-         << STRS[COMP_ECB] << "_ptr consumer)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[COMP_ECB] << "_ptr consumer);" << endl;
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
-         << "disconnect_consumer (" << endl
-         << "const char *source_name)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl;
+         << "disconnect_consumer (const char *source_name);" << endl;
 
       os << "virtual " << STRS[COMP_PD] << " *" << endl
-         << "get_all_publishers (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_publishers ();" << endl;
 
       os << "virtual " << STRS[COMP_ED] << " *" << endl
-         << "get_all_emitters (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_emitters ();" << endl;
 
       os << "// CIAO specific operations on the servant. " << endl
          << "CORBA::Object_ptr" << endl
-         << "get_facet_executor (" << endl
-         << "const char *name)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS]<< "));" << endl;
+         << "get_facet_executor (const char *name);" << endl;
 
       os << "private:" << endl << endl;
 
@@ -1160,9 +1064,7 @@ namespace
 
       os << "private:" << endl << endl
          << "void" << endl
-         << "populate_port_tables (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "populate_port_tables ();" << endl;
 
       // Generate private operations for ports.
       {
@@ -1444,8 +1346,7 @@ namespace
          << "create" << name << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "CIAO::Session_Container *c," << endl
-         << "const char *ins_name" << endl
-         << ");" << endl;
+         << "const char *ins_name);" << endl;
     }
 
   private:
@@ -1589,19 +1490,11 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   }
 
   string uc_file_name = file_name;
-
-  std::transform (uc_file_name.begin (),
-                  uc_file_name.end (),
-                  uc_file_name.begin (),
-                  upcase);
+  str_upcase (uc_file_name);
 
   string uc_file_suffix = cl_.get_value ("svnt-hdr-file-suffix",
                                          "_svnt.h");
-
-  std::transform (uc_file_suffix.begin (),
-                  uc_file_suffix.end (),
-                  uc_file_suffix.begin (),
-                  upcase);
+  str_upcase (uc_file_suffix);
 
   string guard =
       "CIAO_GLUE_SESSION_"
@@ -1649,7 +1542,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   bool swapping = (swap_option == "upgradeable");
 
   os << "#include \"ciao/"
-     << (swapping ? "Swapping_Container.h" : "Container_Base.h")
+     << (swapping ? "Swapping_Container.h" : "Session_Container.h")
      << "\"" << endl
      << "#include \"ciao/"
      << (swapping ? "Upgradeable_Context_Impl_T.h"
@@ -1754,19 +1647,11 @@ ServantHeaderEmitter::post (TranslationUnit&)
   if (file_.empty ()) return;
 
   string uc_file_name = file_.leaf ();
-
-  std::transform (uc_file_name.begin (),
-                  uc_file_name.end (),
-                  uc_file_name.begin (),
-                  upcase);
+  str_upcase (uc_file_name);
 
   string uc_file_suffix = cl_.get_value ("svnt-hdr-file-suffix",
                                          "_svnt.h");
-
-  std::transform (uc_file_suffix.begin (),
-                  uc_file_suffix.end (),
-                  uc_file_suffix.begin (),
-                  upcase);
+  str_upcase (uc_file_suffix);
 
   string guard =
     "CIAO_GLUE_SESSION_"
diff --git a/CIAO/CIDLC/ServantSourceGenerator.cpp b/CIAO/CIDLC/ServantSourceGenerator.cpp
index f4d715b523d..b15903ecde0 100644
--- a/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -11,6 +11,7 @@
 #include "ModuleEmitter.hpp"
 #include "InterfaceEmitter.hpp"
 #include "Literals.hpp"
+#include "Upcase.hpp"
 
 #include <ostream>
 #include <sstream>
@@ -179,7 +180,7 @@ namespace
 
     // Overridden by facet and home operation emitters to do nothing.
     virtual void
-    gen_swap_related (Type& o)
+    gen_swap_related (Type&)
     {
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
@@ -216,22 +217,8 @@ namespace
     }
 
     virtual void
-    raises_pre (Type&)
-    {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_none (Type&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_post (Type&)
+    raises (Type&)
     {
-      os << "))";
     }
 
     virtual void
@@ -334,8 +321,7 @@ namespace
 
         Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
 
-        os << " " << a.name () << endl
-           << ")" << endl;
+        os << " " << a.name () << ")" << endl;
       }
     };
 
@@ -376,8 +362,7 @@ namespace
       name (SemanticGraph::ReadWriteAttribute& a)
       {
         os << scope_.name () << "_Servant_T<T>::"
-           << a.name () << " (" << endl
-           << ")" << endl;
+           << a.name () << " ()" << endl;
       }
 
       // ReadAttribute
@@ -401,8 +386,7 @@ namespace
       name (SemanticGraph::ReadAttribute& a)
       {
         os << scope_.name () << "_Servant_T<T>::"
-           << a.name () << " (" << endl
-           << ")" << endl;
+           << a.name () << " ()" << endl;
       }
     };
 
@@ -461,10 +445,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -476,7 +458,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -496,31 +477,23 @@ namespace
 
       os << "template <typename T>" << endl
          << "::CORBA::Object_ptr" << endl
-         << i.name () << "_Servant_T<T>::_get_component (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << i.name () << "_Servant_T<T>::_get_component ()" << endl
          << "{"
          << STRS[COMP_SC] << "_var sc =" << endl
-         << "  " << STRS[COMP_SC] << "::_narrow (" << endl
-         << "  this->ctx_.in ()" << endl
-         << "  " << ");"
+         << "  " << STRS[COMP_SC] << "::_narrow (this->ctx_.in ());"
          << endl
          << "if (! ::CORBA::is_nil (sc.in ()))" << endl
          << "{"
-         << "return sc->get_CCM_object (" << endl
-         << ");"
+         << "return sc->get_CCM_object ();"
          << "}"
          << "::Components::EntityContext_var ec =" << endl
-         << "::Components::EntityContext::_narrow (" << endl
-         << "this->ctx_.in ()" << endl
-         << ");"
+         << "  ::Components::EntityContext::_narrow (this->ctx_.in ());"
          << endl
          << "if (! ::CORBA::is_nil (ec.in ()))" << endl
          << "{"
-         << "return ec->get_CCM_object (" << endl
-         << ");"
+         << "return ec->get_CCM_object ();"
          << "}"
-         << STRS[ACE_TR] << " ( ::CORBA::INTERNAL (), 0);" << endl
+         << "throw ::CORBA::INTERNAL ();" << endl
          << "}" << endl;
 
       // Close the facet servant's namespace.
@@ -563,9 +536,7 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name () << "_Context::get_connection_"
-           << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << u.name () << " ()" << endl
            << "{"
            << "return ";
 
@@ -583,10 +554,6 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
@@ -610,19 +577,14 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_NC] << " ()," << endl;
-
-        Traversal::SingleUserData::belongs (u, belongs_);
+           << "throw "
+           << STRS[EXCP_NC] << " ();" << endl;
 
-        os << "::_nil ());" << endl
+        os << endl
            << "}"
            << "return this->ciao_uses_" << u.name ()
            << "_._retn ();" << endl
@@ -634,54 +596,51 @@ namespace
       {
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name () << "_Context::get_connections_"
-           << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
-           << "{"
-           << u.scoped_name () << "Connections *tmp_retv = 0;"
+           << u.name () << " ()" << endl
+           << "{";
+
+        bool static_cfg =
+          ctx.cl ().get_value ("static-config", false);
+
+        if (! static_cfg)
+        {
+          os << "ACE_READ_GUARD_RETURN ("
+            << "TAO_SYNCH_MUTEX," << endl
+            << "mon," << endl
+            << "this->" << u.name () << "_lock_," << endl
+            << "0);" << endl;
+        }
+
+        os << u.scoped_name () << "Connections *tmp_retv = 0;"
            << "ACE_NEW_THROW_EX ("
            << "tmp_retv," << endl
            << u.scoped_name () << "Connections (" << endl
            << "this->ciao_uses_"
-           << u.name () << "_.current_size ())," << endl
+           << u.name () << "_.size ())," << endl
            << "::CORBA::NO_MEMORY ());" << endl
            << u.scoped_name () << "Connections_var retv"
            << " = tmp_retv;" << endl
            << "retv->length (this->ciao_uses_" << u.name ()
-           << "_.current_size ());" << endl;
+           << "_.size ());" << endl;
 
         os << "::CORBA::ULong i = 0;" << endl;
 
-        os << "for (ACE_Active_Map_Manager< " << endl
-           << "  ";
-
-        Traversal::MultiUserData::belongs (u, belongs_);
+        string uc_port_name (u.name ().str ());
+        str_upcase (uc_port_name);
 
-        os << "_var>::iterator iter =" << endl
-           << "    this->ciao_uses_" << u.name () << "_.begin ();" << endl
+        os << "for (" << uc_port_name << "_TABLE::const_iterator iter ="
+           << endl
+           << "  this->ciao_uses_" << u.name () << "_.begin ();" << endl
            << "iter != this->ciao_uses_" << u.name () << "_.end ();"
            << endl
-           << "++iter)" << endl
+           << "++iter, ++i)" << endl
            << "{"
-           << "ACE_Active_Map_Manager< " << endl;
-
-        Traversal::MultiUserData::belongs (u, belongs_);
-
-        os << "_var>::ENTRY & entry = *iter;" << endl
-           << "retv[i].objref = ";
-
-        Traversal::MultiUserData::belongs (u, belongs_);
-
-        os << "::_narrow (" << endl
-           << "entry.int_id_.in ()" << endl
-           << ");"
-           << endl;
+           << "retv[i].objref = iter->second;" << endl;
 
         os << "ACE_NEW_THROW_EX ("
            << "retv[i].ck.inout ()," << endl
-           << "::CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
-           << "++i;" << endl
+           << "::CIAO::Cookie_Impl (iter->first)," << endl
+           << "::CORBA::NO_MEMORY ());"
            << "}";
 
         os << "return retv._retn ();" << endl
@@ -694,42 +653,51 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " (), 0);" << endl
+           << "throw "
+           << STRS[EXCP_IC] << " ();" << endl
            << "}";
 
+        os << "std::pair<" << uc_port_name
+           << "_TABLE::iterator, bool> result;"
+           << uc_port_name << "_TABLE::value_type entry;"
+           << "entry.first = c->_hash (ACE_UINT32_MAX);"
+           << "entry.second = ";
+
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_var conn = ";
+        os << "::_duplicate (c);" << endl;
 
-        Traversal::MultiUserData::belongs (u, belongs_);
+        if (! static_cfg)
+        {
+          os << "{"
+             << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << u.name () << "_lock_," << endl
+             << "0);" << endl;
+        }
 
-        os << "::_duplicate (c);"
-           << "ACE_Active_Map_Manager_Key key;" << endl;
+        os << "result = this->ciao_uses_" << u.name ()
+           << "_.insert (entry);";
 
-        os << "if (this->ciao_uses_" << u.name ()
-           << "_.bind (conn.in (), key) == -1)" << endl
+        if (! static_cfg)
+        {
+          os << "}";
+        }
+
+        os << "if (! result.second)" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " (), 0);" << endl
+           << "throw "
+           << STRS[EXCP_IC] << " ();" << endl
            << "}";
 
-        os << "conn._retn ();" << endl;
-
         os << STRS[COMP_CK] << " * ck = 0;"
-           << "ACE_NEW_THROW_EX ("
-           << "ck," << endl
-           << "::CIAO::Map_Key_Cookie (key)," << endl
+           << "ACE_NEW_THROW_EX (ck," << endl
+           << "::CIAO::Cookie_Impl (entry.first)," << endl
            << "::CORBA::NO_MEMORY ());" << endl;
 
-
         os << "return ck;" << endl
            << "}";
 
@@ -739,36 +707,50 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{";
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_var retv;"
-           << "ACE_Active_Map_Manager_Key key;" << endl;
+           << "::CORBA::ULong key = 0UL;"
+           << uc_port_name << "_TABLE::size_type n = 0UL;" << endl;
 
-        os << "if (! CIAO::Map_Key_Cookie::extract (ck, key))"
+        os << "if (ck == 0 || ! ::CIAO::Cookie_Impl::extract (ck, key))"
            << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " ()," << endl;
+           << "throw " << STRS[EXCP_IC] << " ();"
+           << "}";
 
-        Traversal::MultiUserData::belongs (u, belongs_);
+        if (! static_cfg)
+        {
+          os << "{"
+             << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << u.name () << "_lock_," << endl;
 
-        os << "::_nil ());" << endl
-           << "}";
+          Traversal::MultiUserData::belongs (u, belongs_);
+
+          os << "::_nil ());" << endl;
+        }
 
-        os << "if (this->ciao_uses_" << u.name ()
-           << "_.unbind (key, retv) != 0)" << endl
+        os << uc_port_name << "_TABLE::iterator iter =" << endl
+           << "  this->ciao_uses_" << u.name () << "_.find (key);" << endl
+           << "if (iter == this->ciao_uses_" << u.name ()
+           << "_.end ())" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " ()," << endl;
+           << "throw " << STRS[EXCP_IC] << " ();"
+           << "}"
+           << "retv = iter->second;"
+           << "n = this->ciao_uses_" << u.name () << "_.erase (key);";
 
-        Traversal::MultiUserData::belongs (u, belongs_);
+        if (! static_cfg)
+        {
+          os << "}";
+        }
 
-        os << "::_nil ());" << endl
+        os << "if (n != 1UL)" << endl
+           << "{"
+           << "throw " << STRS[EXCP_IC] << " ();"
            << "}";
 
         os << "return retv._retn ();" << endl
@@ -784,48 +766,46 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << " *ev" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
-           << "{"
-           << "for (ACE_Active_Map_Manager< " << endl
-           << "  ";
+        os << " *ev)" << endl
+           << "{";
 
-        Traversal::PublisherData::belongs (p, belongs_);
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "ACE_READ_GUARD (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << p.name () << "_lock_);" << endl;
+        }
+
+        string uc_port_name (p.name ().str ());
+        str_upcase (uc_port_name);
 
-        os << "Consumer_var>::iterator iter =" << endl
-           << "    this->ciao_publishes_" << p.name ()
-           << "_map_.begin ();" << endl
+        os << "for (" << uc_port_name
+           << "_TABLE::const_iterator iter =" << endl
+           << "  this->ciao_publishes_" << p.name ()
+           << "_.begin ();" << endl
            << "iter != this->ciao_publishes_" << p.name ()
-           << "_map_.end ();" << endl
+           << "_.end ();" << endl
            << "++iter)" << endl
            << "{"
-           << "(*iter).int_id_->push_";
+           << "iter->second->push_";
 
         Traversal::PublisherData::belongs (p, simple_belongs_);
 
-        os << " (" << endl
-           << "ev" << endl
-           << ");" << endl
+        os << " (ev);"
            << "}";
 
-        // @@ GD Modified Code Below
+        os << "ACE_CString source_id = this->_ciao_instance_id ();"
+           << "source_id += \"_" << p.name () << "\";" << endl;
 
-        os << endl;
-        os << "ACE_CString source_id = this->_ciao_instance_id ();";
-        os << "source_id += \"_\";" << endl;
-        os << "source_id += \"" << p.name () << "\";//port name" << endl << endl;
-
-        os << "for (ACE_Active_Map_Manager< " << endl
-           << "  " << STRS[COMP_ECB] << "_var>::iterator giter =" << endl
-           << "    this->ciao_publishes_" << p.name ()
-           << "_generic_map_.begin ();" << endl
+        os << "for (" << uc_port_name
+           << "_GENERIC_TABLE::const_iterator giter =" << endl
+           << "  this->ciao_publishes_" << p.name ()
+           << "_generic_.begin ();" << endl
            << "giter != this->ciao_publishes_" << p.name ()
-           << "_generic_map_.end ();" << endl
+           << "_generic_.end ();" << endl
            << "++giter)" << endl
            << "{"
-           << "(*giter).int_id_->ciao_push_event" << " (" << endl
-           << "ev," << endl
+           << "giter->second->ciao_push_event (ev," << endl
            << "source_id.c_str ()," << endl;
 
         Traversal::PublisherData::belongs (p, enclosing_belongs_);
@@ -834,8 +814,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, simple_belongs_);
 
-        os << endl
-           << ");" << endl
+        os << ");"
            << "}"
            << "}";
 
@@ -846,60 +825,99 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), 0);" << endl
+           << "throw ::CORBA::BAD_PARAM ();" << endl
            << "}";
 
+        os << "std::pair<" << uc_port_name
+           << "_TABLE::iterator, bool> result;"
+           << uc_port_name << "_TABLE::value_type entry;"
+           << "entry.first = c->_hash (ACE_UINT32_MAX);"
+           << "entry.second = ";
+
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_var sub =" << endl
-           << "  ";
+        os << "Consumer::_duplicate (c);" << endl;
 
-        Traversal::PublisherData::belongs (p, belongs_);
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "{"
+             << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << p.name () << "_lock_," << endl
+             << "0);" << endl;
+        }
 
-        os << "Consumer::_duplicate (c);" << endl
-           << "ACE_Active_Map_Manager_Key key;"
-           << "this->ciao_publishes_" << p.name ()
-           << "_map_.bind (sub.in (), key);"
-           << "sub._retn ();" << endl
-           << STRS[COMP_CK] << " * retv = 0;"
-           << "ACE_NEW_THROW_EX ("
-           << "retv," << endl
-           << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
-           << "return retv;" << endl
+        os << "result = this->ciao_publishes_" << p.name ()
+           << "_.insert (entry);";
+
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "}";
+        }
+
+        os << "if (! result.second)" << endl
+           << "{"
+           << "/* Already subscribed, ignore & "
+           << "return new cookie with same key. */"
+           << "}";
+
+        os << STRS[COMP_CK] << " * retv = 0;"
+           << "ACE_NEW_THROW_EX (retv," << endl
+           << "::CIAO::Cookie_Impl (entry.first)," << endl
+           << "::CORBA::NO_MEMORY ());" << endl;
+
+        os << "return retv;"
            << "}";
 
         os << STRS[COMP_CK] << " *" << endl
            << scope_.name () << "_Context::subscribe_"
            << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
+           << "::Components::EventConsumerBase_ptr c)"
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), 0);" << endl
+           << "throw ::CORBA::BAD_PARAM ();" << endl
            << "}";
 
-        os << STRS[COMP_ECB] << "_var sub =" << endl
-           << "  " << STRS[COMP_ECB] << "::_duplicate (c);" << endl
-           << "ACE_Active_Map_Manager_Key key;"
-           << "this->ciao_publishes_" << p.name ()
-           << "_generic_map_.bind (sub.in (), key);"
-           << "sub._retn ();" << endl
-           << STRS[COMP_CK] << " * retv = 0;"
-           << "ACE_NEW_THROW_EX ("
-           << "retv," << endl
-           << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
-           << "return retv;" << endl
+        os << "std::pair<" << uc_port_name
+           << "_GENERIC_TABLE::iterator, bool> result;"
+           << uc_port_name << "_GENERIC_TABLE::value_type entry;"
+           << "entry.first = c->_hash (ACE_UINT32_MAX);"
+           << "entry.second = "
+           << "::Components::EventConsumerBase::_duplicate (c);" << endl;
+
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "{"
+             << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << p.name () << "_lock_," << endl
+             << "0);" << endl;
+        }
+
+        os << "result = this->ciao_publishes_" << p.name ()
+           << "_generic_.insert (entry);";
+
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "}";
+        }
+
+        os << "if (! result.second)" << endl
+           << "{"
+           << "/* Already subscribed, ignore & "
+           << "return new cookie with same key. */"
+           << "}";
+
+        os << STRS[COMP_CK] << " * retv = 0;"
+           << "ACE_NEW_THROW_EX (retv," << endl
+           << "::CIAO::Cookie_Impl (entry.first)," << endl
+           << "::CORBA::NO_MEMORY ());" << endl;
+
+        os << "return retv;"
            << "}";
 
         Traversal::PublisherData::belongs (p, belongs_);
@@ -908,44 +926,74 @@ namespace
            << scope_.name () << "_Context::unsubscribe_"
            << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "ACE_Active_Map_Manager_Key key;" << endl
-           << "if (ck == 0 || ::CIAO::Map_Key_Cookie::extract (ck, key) == false)"
-           << endl
+           << "::CORBA::ULong key = 0UL;"
+           << uc_port_name << "_TABLE::size_type n = 0UL;" << endl;
+
+        os << "if (ck == 0 || ! ::CIAO::Cookie_Impl::"
+           << "extract (ck, key))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " ()," << endl;
+           << "throw " << STRS[EXCP_IC] << " ();"
+           << "}";
 
-        Traversal::PublisherData::belongs (p, belongs_);
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "{"
+             << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->" << p.name () << "_lock_," << endl;
 
-        os << "Consumer::_nil ());" << endl
-           << "}";
+             Traversal::PublisherData::belongs (p, belongs_);
+
+          os << "Consumer::_nil ());" << endl;
+        }
+
+        os << uc_port_name << "_TABLE::iterator iter =" << endl
+           << "  this->ciao_publishes_"
+           << p.name () << "_.find (key);" << endl;
+
+        os << "if (iter != this->ciao_publishes_"
+           << p.name () << "_.end ())" << endl
+           << "{";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_var retv;"
-           << "if (this->ciao_publishes_" << p.name ()
-           << "_map_.unbind (key, retv) == 0)" << endl
+        os << "Consumer_var retv = iter->second;"
+           << "n = this->ciao_publishes_"
+           << p.name () << "_.erase (key);" << endl;
+
+        os << "if (n == 1UL)" << endl
            << "{"
-           << "return retv._retn ();" << endl
+           << "return retv._retn ();"
+           << "}"
+           << "throw " << STRS[EXCP_IC] << " ();"
            << "}";
 
-        os << STRS[COMP_ECB] << "_var ecb;" << endl;
+        os << uc_port_name << "_GENERIC_TABLE::iterator giter =" << endl
+           << "  this->ciao_publishes_" << p.name ()
+           << "_generic_.find (key);" << endl;
 
-        os << "if (this->ciao_publishes_" << p.name ()
-           << "_generic_map_.unbind (key, ecb) != 0)" << endl
+        os << "if (giter == this->ciao_publishes_"
+           << p.name () << "_generic_.end ())" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_IC] << " ()," << endl;
+           << "throw "
+           << STRS[EXCP_IC] << " ();"
+           << "}";
 
-        Traversal::PublisherData::belongs (p, belongs_);
+        os << "n = this->ciao_publishes_" << p.name ()
+           << "_generic_.erase (key);" << endl;
 
-        os << "Consumer::_nil ());" << endl
-           << "}"
-           << "return ";
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "}";
+        }
+
+        os << "if (n != 1UL)" << endl
+           << "{"
+           << "throw " << STRS[EXCP_IC] << " ();"
+           << "}";
+
+        os << "return ";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
@@ -962,18 +1010,18 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << " *ev" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+        os << " *ev)" << endl
+           << "{"
+           << "if (! ::CORBA::is_nil (this->ciao_emits_"
+           << e.name () << "_consumer_.in ()))" << endl
            << "{"
            << "this->ciao_emits_" << e.name ()
            << "_consumer_->push_";
 
         Traversal::EmitterData::belongs (e, simple_belongs_);
 
-        os << " (" << endl
-           << "ev" << endl
-           << ");" << endl
+        os << " (ev);" << endl
+           << "}"
            << "}";
 
         os << "void" << endl
@@ -983,9 +1031,6 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
@@ -1009,19 +1054,14 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
            << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_NC] << " ()," << endl;
+           << "throw "
+           << STRS[EXCP_NC] << " ();" << endl;
 
-        Traversal::EmitterData::belongs (e, belongs_);
-
-        os << "Consumer::_nil ());" << endl
+        os << endl
            << "}"
            << "return this->ciao_emits_" << e.name ()
            << "_consumer_._retn ();" << endl
@@ -1052,67 +1092,49 @@ namespace
       virtual void
       traverse (SemanticGraph::Publisher& p)
       {
+        string uc_port_name (p.name ().str ());
+        str_upcase (uc_port_name);
+
         os << "if (ACE_OS::strcmp (publisher_name, \""
            << p.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
            << "_ciao_size = this->ciao_publishes_" << p.name ()
-           << "_map_.current_size ();" << endl
-           << "ACE_NEW_THROW_EX ("
+           << "_.size ();" << endl;
+           
+        os << "ACE_NEW_THROW_EX ("
            << "tmp," << endl
            << STRS[COMP_CD] << " (_ciao_size)," << endl
            << "::CORBA::NO_MEMORY ());" << endl
            << "retval = tmp;"
-           << "retval->length (_ciao_size);" << endl
-           << "ACE_Active_Map_Manager<" << endl;
-
-        Traversal::PublisherData::belongs (p, belongs_);
-
-        os << "Consumer_var>::iterator end =" << endl
-           << "  this->ciao_publishes_" << p.name ()
-           << "_map_.end ();" << endl
-           << "for (ACE_Active_Map_Manager<" << endl
-           << "  ";
-
-        Traversal::PublisherData::belongs (p, belongs_);
-
-        os << "Consumer_var>::iterator iter =" << endl
-           << "    this->ciao_publishes_" << p.name ()
-           << "_map_.begin ();"
-           << "iter != end;"
-           << "++iter)" << endl
-           << "{"
-           << "ACE_Active_Map_Manager<" << endl;
-
-        Traversal::PublisherData::belongs (p, belongs_);
-
-        os << "Consumer_var>::entry &e = *iter;" << endl;
-
-        Traversal::PublisherData::belongs (p, belongs_);
-
-        os << "Consumer_var c =" << endl;
-
-        Traversal::PublisherData::belongs (p, belongs_);
-
-        os << "Consumer::_narrow (" << endl
-           << "e.int_id_.in ()" << endl
-           << ");"
+           << "retval->length (_ciao_size);" << endl;
+           
+        os << "for (" << uc_port_name << "_TABLE::const_iterator iter ="
+           << endl
+           << "  this->ciao_publishes_" << p.name () << "_.begin ();"
            << endl
-           << "if ( ::CORBA::is_nil (c.in ()))"
+           << "iter != this->ciao_publishes_" << p.name () << "_.end ();"
+           << endl
+           << "++iter, ++_ciao_index)" << endl
+           << "{"      
+           << "if ( ::CORBA::is_nil (iter->second.in ()))"
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
-           << "}"
-           << "::Components::ConsumerDescription *cd = 0;"
+           << "throw " << STRS[EXCP_IC] << " ();"
+           << "}";
+           
+        os << "::Components::ConsumerDescription *cd = 0;"
            << "ACE_NEW_THROW_EX ("
            << "cd," << endl
            << "OBV_Components::ConsumerDescription ()," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
-           << "::Components::ConsumerDescription_var safe = cd;"
+           << "::CORBA::NO_MEMORY ());" << endl;
+           
+        os << "::Components::ConsumerDescription_var safe = cd;"
            << "safe->name (\"\");"
            << "safe->type_id (\"\");"
-           << "safe->consumer (c.in ());" << endl
-           << "retval[_ciao_index++] = safe;"
-           << "}"
-           << "return retval._retn ();"
+           << "safe->consumer (iter->second.in ());"
+           << "retval[_ciao_index] = safe;"
+           << "}";
+           
+        os << "return retval._retn ();"
            << "}";
       }
 
@@ -1141,8 +1163,7 @@ namespace
          << "        " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_Context," << endl
          << "        " << t.name () << "_Servant," << endl
-         << "        " << t.scoped_name () << "," << endl
-         << "        " << t.scoped_name () << "_var" << endl
+         << "        " << t.scoped_name () << endl
          << "      > (h, c, sv)";
 
       string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -1155,9 +1176,8 @@ namespace
              << "        " << t.scoped_name ().scope_name () << "::CCM_"
              << t.name () << "_Context," << endl
              << "        " << t.name () << "_Servant," << endl
-             << "        " << t.scoped_name () << "," << endl
-             << "        " << t.scoped_name () << "_var" << endl
-             << "      > (h, c, sv)" << endl;
+             << "        " << t.scoped_name () << endl
+             << "      > (h, c, sv)";
         }
       else
         {
@@ -1172,9 +1192,9 @@ namespace
          << "{"
          << "}";
 
-      os << "// Operations for " << t.name () << " receptacles"
+      os << "/// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
-         << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
+         << "/// defined in " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_Context."
          << endl << endl;
 
@@ -1198,22 +1218,18 @@ namespace
       // Extra *_Context methods for swapping container.
       if (swapping)
       {
-        os << "// Operations defined in " << t.scoped_name ().scope_name ()
+        os << "/// Operations defined in " << t.scoped_name ().scope_name ()
            << "::CCM_" << t.name () << "_Context" << endl
-           << "// that enable component swapping in the container"
+           << "/// that enable component swapping in the container"
            << endl << endl;
 
         os << STRS[COMP_CD] << " *" << endl
            << t.name () << "_Context::get_registered_consumers (" << endl
            << "const char *publisher_name)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IN] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if (publisher_name == 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
+           << "throw " << STRS[EXCP_IN] << " ();"
            << "}"
            << STRS[COMP_CD] << " *tmp = 0;"
            << STRS[COMP_CD] << "_var retval;"
@@ -1241,16 +1257,15 @@ namespace
           component_emitter.traverse (t);
         }
 
-        os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
+        os << "throw " << STRS[EXCP_IN] << " ();"
            << "}";
       }
 
-      os << "// CIAO-specific." << endl << endl;
+      os << "/// CIAO-specific." << endl << endl;
 
       os << t.name () << "_Context *" << endl
          << t.name () << "_Context::_narrow (" << endl
-         << STRS[COMP_SC] << "_ptr p" << endl
-         << ")" << endl
+         << STRS[COMP_SC] << "_ptr p)" << endl
          << "{"
          << "return dynamic_cast<" << t.name () << "_Context *> (p);"
          << endl
@@ -1291,9 +1306,7 @@ namespace
 
         Traversal::EmitterData::belongs (t, belongs_);
 
-        os << "Consumer::_narrow (" << endl
-           << "  consumer" << endl
-           << "  " << ");" << endl
+        os << "Consumer::_narrow (consumer);" << endl
            << "if ( ::CORBA::is_nil (_ciao_consumer.in ()))" << endl
            << "{"
            << "throw " << STRS[EXCP_IC] << " ();"
@@ -1373,9 +1386,6 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{";
 
         string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -1388,18 +1398,13 @@ namespace
           }
 
         os << "return this->context_->subscribe_" << p.name ()
-           << " (" << endl
-           << "c" << endl
-           << ");" << endl
+           << " (c);"
            << "}";
 
         os << STRS[COMP_CK] << " *" << endl
            << scope_.name ()
            << "_Servant::subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{";
 
         if (swapping)
@@ -1409,9 +1414,7 @@ namespace
           }
 
         os << "return this->context_->subscribe_" << p.name ()
-           << "_generic (" << endl
-           << "c" << endl
-           << ");" << endl
+           << "_generic (c);"
            << "}";
 
         Traversal::PublisherData::belongs (p, belongs_);
@@ -1420,9 +1423,6 @@ namespace
            << scope_.name ()
            << "_Servant::unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{";
 
         if (swapping)
@@ -1432,9 +1432,7 @@ namespace
           }
 
         os << "return this->context_->unsubscribe_"
-           << p.name () << " (" << endl
-           << "ck" << endl
-           << ");" << endl
+           << p.name () << " (ck);"
            << "}";
       }
 
@@ -1464,23 +1462,40 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_var _ciao_conn =" << endl;
+        os << "_var _ciao_conn =" << endl
+           << "  ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "::_narrow (" << endl
-           << "connection" << endl
-           << ");"
-           << endl
+        os << "::_narrow (connection);" << endl
            << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
-           << endl
-           << "}"
-           << "// Simplex connect." << endl
-           << "this->connect_" << u.name () << " (" << endl
-           << "_ciao_conn.in ()" << endl
-           << ");"
+           << "throw " << STRS[EXCP_IC] << " ();" << endl
+           << "}";
+
+        os << "ACE_CString receptacle_name (\""
+           << u.name ().unescaped_str () << "\");"
+           << "receptacle_name += '_';"
+           << "receptacle_name += this->context_->_ciao_instance_id ();"
+           << "::CORBA::PolicyList policy_list =" << endl
+           << "  this->container_->get_receptacle_policy ("
+           << "receptacle_name.c_str ());" << endl;
+
+        os << "if (policy_list.length () != 0)" << endl
+           << "{"
+           << "::CORBA::Object_var over_ridden_object =" << endl
+           << "  _ciao_conn->_set_policy_overrides (policy_list," << endl
+           << "CORBA::SET_OVERRIDE);"
+           << "_ciao_conn =" << endl
+           << "  ";
+
+        Traversal::SingleUserData::belongs (u, belongs_);
+
+        os << "::_narrow (over_ridden_object.in ());"
+           << "}";
+
+        os << "/// Simplex connect." << endl
+           << "this->connect_" << u.name () << " (_ciao_conn.in ());"
            << endl
            << "return 0;" << endl
            << "}";
@@ -1505,13 +1520,11 @@ namespace
            << endl
            << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
+           << "throw " << STRS[EXCP_IC] << " ();"
            << endl
            << "}"
-           << "// Multiplex connect." << endl
-           << "return this->connect_" << u.name () << " (" << endl
-           << "_ciao_conn.in ()" << endl
-           << ");"
+           << "/// Multiplex connect." << endl
+           << "return this->connect_" << u.name () << " (_ciao_conn.in ());"
            << "}";
       }
 
@@ -1535,7 +1548,7 @@ namespace
         os << "if (ACE_OS::strcmp (name, \""
            << u.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
-           << "// Simplex disconnect." << endl
+           << "/// Simplex disconnect." << endl
            << "return this->disconnect_" << u.name ()
            << " ();" << endl
            << "}";
@@ -1550,13 +1563,10 @@ namespace
            << "// Multiplex disconnect." << endl
            << "if (ck == 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
-           << STRS[EXCP_CR] << " ()," << endl
-           << "::CORBA::Object::_nil ());" << endl
+           << "throw "
+           << STRS[EXCP_CR] << " ();" << endl
            << "}"
-           << "return this->disconnect_" << u.name () << " (" << endl
-           << "ck" << endl
-           << ");" << endl
+           << "return this->disconnect_" << u.name () << " (ck);" << endl
            << "}";
       }
     };
@@ -1583,15 +1593,8 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "this->context_->connect_" << u.name () << " ("
-           << endl
-           << "c" << endl
-           << ");" << endl
+           << "this->context_->connect_" << u.name () << " (c);" << endl
            << "this->add_receptacle (\"" << u.name ().unescaped_str ()
            << "\", c, 0);" << endl
            << "}";
@@ -1601,13 +1604,9 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_" << u.name ()
-           << " (" << endl
-           << ");" << endl
+           << " ();" << endl
            << "}";
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -1615,13 +1614,10 @@ namespace
         os << "_ptr" << endl
            << scope_.name ()
            << "_Servant::get_connection_" << u.name ()
-           << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << " ()" << endl
            << "{"
            << "return this->context_->get_connection_"
-           << u.name () << " (" << endl
-           << ");" << endl
+           << u.name () << " ();" << endl
            << "}";
       }
 
@@ -1635,16 +1631,9 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "::Components::Cookie * cookie = "
-          "this->context_->connect_" << u.name () << " ("
-           << endl
-           << "c" << endl
-           << ");" << endl
+           << "::Components::Cookie * cookie =" << endl
+           << "  this->context_->connect_" << u.name () << " (c);" << endl
            << "this->add_receptacle (\"" << u.name ().unescaped_str ()
            << "\", c, cookie);" << endl
            << "return cookie;" << endl
@@ -1656,26 +1645,17 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_" << u.name ()
-           << " (" << endl
-           << "ck" << endl
-           << ");" << endl
+           << " (ck);" << endl
            << "}";
 
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name ()
-           << "_Servant::get_connections_" << u.name ()
-           << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::get_connections_" << u.name () << " ()" << endl
            << "{"
            << "return this->context_->get_connections_"
-           << u.name () << " (" << endl
-           << ");" << endl
+           << u.name () << " ();" << endl
            << "}";
       }
 
@@ -1709,10 +1689,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer::_narrow (" << endl
-           << "subscribe" << endl
-           << ");"
-           << endl;
+        os << "Consumer::_narrow (subscribe);" << endl;
 
         os << "if ( ::CORBA::is_nil (sub.in ()))" << endl
            << "{"
@@ -1722,26 +1699,23 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "::_tao_obv_static_repository_id ()" << endl
-           << "  " << ");"
+        os << "::_tao_obv_static_repository_id ());"
            << endl;
 
         os << "if (substitutable)" << endl
            << "{"
-           << "return this->subscribe_" << p.name () << "_generic (" << endl
-           << "subscribe" << endl
-           << ");" << endl
+           << "return this->subscribe_" << p.name ()
+           << "_generic (subscribe);" << endl
            << "}"
            << "else" << endl
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);" << endl
+           << "throw " << STRS[EXCP_IC] << " ();" << endl
            << "}"
            << "}"
            << "else" << endl
            << "{"
-           << "return this->subscribe_" << p.name () << " (" << endl
-           << "sub.in ()" << endl
-           << ");" << endl
+           << "return this->subscribe_" << p.name ()
+           << " (sub.in ());" << endl
            << "}"
            << "}";
       }
@@ -1765,9 +1739,7 @@ namespace
            << p.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
            << "return this->unsubscribe_" << p.name ()
-           << " (" << endl
-           << "ck" << endl
-           << ");" << endl
+           << " (ck);" << endl
            << "}";
       }
     };
@@ -1793,9 +1765,6 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "))" << endl
            << "{"
            << "this->context_->connect_" << e.name ()
            << " (" << endl
@@ -1808,9 +1777,6 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
            << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_"
            << e.name () << " (" << endl
@@ -1870,9 +1836,7 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name ()
-           << "_Servant::provide_" << p.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::provide_" << p.name () << " ()" << endl
            << "{";
 
         string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -1910,10 +1874,7 @@ namespace
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "::_narrow ("
-           << "obj.in ()" << endl
-           << ");"
-           << endl
+        os << "::_narrow (obj.in ());" << endl
            << "this->provide_" << p.name () << "_ = fo;"
            << "return ";
 
@@ -1927,9 +1888,7 @@ namespace
 
         os << "::CORBA::Object_ptr" << endl
            << scope_.name ()
-           << "_Servant::provide_" << p.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::provide_" << p.name () << "_i ()" << endl
            << "{"
            << "::CORBA::Object_ptr ret =" << endl
            << "  this->lookup_facet (\""
@@ -1940,29 +1899,7 @@ namespace
            << "return ret;"
            << "}";
 
-        os << "::CIAO::Port_Activator_T<" << endl
-           << "    ::" << STRS[FACET_PREFIX];
-
-        Traversal::ProviderData::belongs (p, facet_enclosing_belongs_);
-
-        os << "::";
-
-        Traversal::ProviderData::belongs (p, servant_belongs_);
-
-        os << "," << endl
-           << "    ";
-
-        Traversal::ProviderData::belongs (p, enclosing_belongs_);
-
-        os << "::CCM_";
-
-        Traversal::ProviderData::belongs (p, simple_belongs_);
-
-        os << "," << endl
-           << "    ::Components::CCMContext," << endl
-           << "    " << scope_.name () << "_Servant" << endl
-           << "  > *tmp = 0;" << endl
-           << "typedef ::CIAO::Port_Activator_T<" << endl
+        os << "typedef ::CIAO::Port_Activator_T<" << endl
            << "    ::" << STRS[FACET_PREFIX];
 
         Traversal::ProviderData::belongs (p, facet_enclosing_belongs_);
@@ -1982,17 +1919,17 @@ namespace
 
         os << "," << endl
            << "    ::Components::CCMContext," << endl
-           << "    " << scope_.name () << "_Servant" << endl
-           << "  >" << endl
-           << "MACRO_MADNESS_TYPEDEF;" << endl;
+           << "    " << scope_.name () << "_Servant>" << endl
+           << "  MACRO_MADNESS_TYPEDEF;" << endl;
 
-        os << "ACE_CString obj_id (this->ins_name_);"
-           << "obj_id += \"_" << p.name ().unescaped_str () << "\";" << endl;
+        os << "MACRO_MADNESS_TYPEDEF *tmp = 0;"
+           << "ACE_CString obj_id (this->ins_name_);"
+           << "obj_id += \"_" << p.name ().unescaped_str ()
+           << "\";" << endl;
 
         os << "ACE_NEW_THROW_EX ("
            << "tmp," << endl
-           << "MACRO_MADNESS_TYPEDEF (" << endl
-           << "obj_id.c_str ()," << endl
+           << "MACRO_MADNESS_TYPEDEF (obj_id.c_str ()," << endl
            << "\"" << p.name ().unescaped_str () << "\"," << endl
            << "::CIAO::Port_Activator::Facet," << endl
            << "0," << endl
@@ -2019,14 +1956,10 @@ namespace
         Traversal::ProviderData::belongs (p, repo_id_belongs_);
 
         os << "," << endl
-           << "  ::CIAO::Container::Facet_Consumer" << endl
-           << "  " << ");"
-           << endl
+           << "  ::CIAO::Container::Facet_Consumer);" << endl
            << "this->add_facet (\""
            << p.name ().unescaped_str () << "\"," << endl
-           << "obj.in ()" << endl
-           << ");"
-           << endl;
+           << "obj.in ());" << endl;
 
         os << "return obj._retn ();" << endl
            << "}";
@@ -2113,9 +2046,7 @@ namespace
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
         os << "Consumer_" << c.name ()
-           << "_Servant::_get_component (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::_get_component ()" << endl
            << "{"
            << "return this->ctx_->get_CCM_object "
            << "();" << endl
@@ -2135,17 +2066,13 @@ namespace
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << " *evt" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+        os << " *evt)" << endl
            << "{"
            << "this->executor_->push_" << c.name ()
-           << " (" << endl
-           << "evt" << endl
-           << ");" << endl
+           << " (evt);" << endl
            << "}";
 
-        os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
+        os << "/// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "void" << endl
            << scope_.name  () << "_Servant::";
 
@@ -2154,9 +2081,6 @@ namespace
         os << "Consumer_" << c.name ()
            << "_Servant::push_event (" << endl
            << "::Components::EventBase *ev)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "))" << endl
            << "{";
 
         Traversal::ConsumerData::belongs (c, belongs_);
@@ -2173,9 +2097,7 @@ namespace
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
-        os << " (" << endl
-           << "ev_type" << endl
-           << ");" << endl
+        os << " (ev_type);" << endl
            << "return;" << endl
            << "}"
            << "throw " << STRS[EXCP_BET] << " ();" << endl
@@ -2184,7 +2106,7 @@ namespace
         // GD Added below code
         // Begin
 
-        os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
+        os << "/// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "void" << endl
            << scope_.name  () << "_Servant::";
 
@@ -2195,9 +2117,6 @@ namespace
            << "::Components::EventBase *ev," << endl
            << "const char * /* source_id */," << endl
            << "::CORBA::TypeCode_ptr /* tc */)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "))" << endl
            << "{"
            << "this->push_event (ev);" << endl
            << "}";
@@ -2211,38 +2130,28 @@ namespace
 
         os << "Consumer_" << c.name ()
            << "_Servant::ciao_is_substitutable (" << endl
-           << "const char * event_repo_id" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "const char * event_repo_id)" << endl
            << "{"
            << "if (event_repo_id == 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), false);" << endl
+           << "throw ::CORBA::BAD_PARAM ();" << endl
            << "}"
            << scope_.name () << "_Context *ctx =" << endl
-           << "  " << scope_.name () << "_Context::_narrow (" << endl
-           << "  this->ctx_.in ()" << endl
-           << "  " << ");"
-           << endl;
+           << "  " << scope_.name ()
+           << "_Context::_narrow (this->ctx_.in ());" << endl;
 
         os << "CORBA::ORB_ptr orb = ctx->_ciao_the_Container ()->the_ORB ();"
            << endl;
 
         os << "CORBA::ValueFactory f =" << endl
-           << "  orb->lookup_value_factory (" << endl
-           << "  event_repo_id" << endl
-           << "  " << ");"
-           << endl;
+           << "  orb->lookup_value_factory (event_repo_id);" << endl;
 
         os << "if (f == 0)" << endl
            << "{"
            << "return false;" << endl
            << "}"
-           << "CORBA::ValueBase_var v =" << endl
-           << "  f->create_for_unmarshal ();"
-           << endl;
-
-        os << "f->_remove_ref ();" << endl;
+           << "CORBA::ValueBase_var v = f->create_for_unmarshal ();"
+           << "f->_remove_ref ();" << endl;
 
         os << "if (v.in () == 0)" << endl
            << "{"
@@ -2260,9 +2169,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << scope_.name  () << "_Servant::"
-           << "get_consumer_" << c.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "get_consumer_" << c.name () << " ()" << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->consumes_" << c.name ()
            << "_.in ()))" << endl
@@ -2276,9 +2183,7 @@ namespace
            << "}";
 
         os << "::Components::EventConsumerBase_var obj =" << endl
-           << "  this->get_consumer_" << c.name () << "_i (" << endl
-           << "  " << ");"
-           << endl;
+           << "  this->get_consumer_" << c.name () << "_i ();" << endl;
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
@@ -2287,10 +2192,7 @@ namespace
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << "Consumer::_narrow (" << endl
-           << "  obj.in ()" << endl
-           << "  " << ");"
-           << endl
+        os << "Consumer::_narrow (obj.in ());" << endl
            << "this->consumes_" << c.name () << "_ = eco;"
            << "return ";
 
@@ -2304,9 +2206,7 @@ namespace
 
         os << "::Components::EventConsumerBase_ptr" << endl
            << scope_.name  () << "_Servant::"
-           << "get_consumer_" << c.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "get_consumer_" << c.name () << "_i ()" << endl
            << "{"
            << "::Components::EventConsumerBase_ptr ret =" << endl
            << "  this->lookup_consumer (\""
@@ -2317,49 +2217,29 @@ namespace
            << "return ret;"
            << "}";
 
-        os << "::CIAO::Port_Activator_T<" << endl;
+        os << "typedef  ::CIAO::Port_Activator_T<" << endl
+           << "    ";
 
         os << scope_.name  () << "_Servant::";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
-        os << "Consumer_" << c.name ()
-           << "_Servant," << endl
-           << c.scoped_name ().scope_name ().scope_name ()
-           << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
+        os << "Consumer_" << c.name () << "_Servant," << endl
+           << "    " << c.scoped_name ().scope_name ().scope_name ()
+           << "::CCM_" << c.scoped_name ().scope_name ().simple_name ()
            << "," << endl
-           << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
+           << "    " << c.scoped_name ().scope_name ().scope_name ()
+           << "::CCM_" << c.scoped_name ().scope_name ().simple_name ()
            << "_Context," << endl
-           << scope_.name () << "_Servant"
-           << " > *tmp = 0;" << endl
-           << "typedef  CIAO::Port_Activator_T<" << endl;
-
-        os << "    " << scope_.name  () << "_Servant::";
+           << "    " << scope_.name () << "_Servant>" << endl
+           << "  MACRO_MADNESS_TYPEDEF;" << endl;
 
-        Traversal::ConsumerData::belongs (c, simple_belongs_);
-
-        os << "Consumer_" << c.name ()
-           << "_Servant," << endl
-           << "    " << c.scoped_name ().scope_name ().scope_name ()
-           << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "," << endl
-           << "    " << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "_Context, " << endl
-           << "    " << scope_.name () << "_Servant" << endl
-           << "  >" << endl
-           << "MACRO_MADNESS_TYPEDEF;" << endl;
-
-        os << "ACE_CString obj_id (this->ins_name_);"
+        os << "MACRO_MADNESS_TYPEDEF  *tmp = 0;" << endl
+           << "ACE_CString obj_id (this->ins_name_);"
            << "obj_id += \"_" << c.name ().unescaped_str () << "\";" << endl;
 
-        os << "ACE_NEW_THROW_EX (" << endl
-           << "tmp," << endl
-           << "MACRO_MADNESS_TYPEDEF ("
-           << "obj_id.c_str ()," << endl
+        os << "ACE_NEW_THROW_EX (tmp," << endl
+           << "MACRO_MADNESS_TYPEDEF (obj_id.c_str ()," << endl
            << "\"" << c.name ().unescaped_str () << "\"," << endl
            << "::CIAO::Port_Activator::Sink," << endl
            << "this->executor_.in ()," << endl
@@ -2386,21 +2266,15 @@ namespace
         Traversal::ConsumerData::belongs (c, repo_id_belongs_);
 
         os << "," << endl
-           << "  ::CIAO::Container::Facet_Consumer" << endl
-           << "  " << ");"
-           << endl;
+           << "  ::CIAO::Container::Facet_Consumer);" << endl;
 
         os << "::Components::EventConsumerBase_var ecb =" << endl
-           << "  ::Components::EventConsumerBase::_narrow (" << endl
-           << "  obj.in ()" << endl
-           << "  " << ");"
+           << "  ::Components::EventConsumerBase::_narrow (obj.in ());"
            << endl;
 
         os << "this->add_consumer (\""
            << c.name ().unescaped_str () << "\"," << endl
-           << "ecb.in ()" << endl
-           << ");"
-           << endl;
+           << "ecb.in ());" << endl;
 
         os << "return ecb._retn ();" << endl
            << "}";
@@ -2613,9 +2487,8 @@ namespace
       virtual void
       traverse (SemanticGraph::Provider& p)
       {
-        os << "obj_var =" << endl
-           << "  this->provide_" << p.name () << "_i (" << endl
-           << "  " << ");" << endl;
+        os << "obj_var = this->provide_" << p.name ()
+           << "_i ();" << endl;
       }
 
       virtual void
@@ -2637,8 +2510,8 @@ namespace
       traverse (SemanticGraph::Consumer& p)
       {
         os << "ecb_var =" << endl
-           << "  this->get_consumer_" << p.name () << "_i (" << endl
-           <<  "  " << ");" << endl;
+           << "  this->get_consumer_" << p.name () << "_i ();"
+           << endl;
       }
     };
 
@@ -2727,6 +2600,17 @@ namespace
       virtual void
       traverse (SemanticGraph::MultiUser& u)
       {
+        bool static_cfg = ctx.cl ().get_value ("static-config", false);
+
+        if (! static_cfg)
+        {
+          os << "{"
+             << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->context_->" << u.name () << "_lock_," << endl
+             << "0);" << endl;
+        }
+
         os << "::CIAO::Servant_Impl_Base::describe_multiplex_receptacle<"
            << endl
            << "    ";
@@ -2743,6 +2627,11 @@ namespace
            << "safe_retval," << endl
            << slot_ << "UL);" << endl;
 
+        if (! static_cfg)
+        {
+          os << "}";
+        }
+
         ++slot_;
       }
 
@@ -2789,6 +2678,15 @@ namespace
       virtual void
       traverse (SemanticGraph::Publisher& p)
       {
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "{"
+             << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << endl
+             << "mon," << endl
+             << "this->context_->" << p.name () << "_lock_," << endl
+             << "0);" << endl;
+        }
+
         os << "::CIAO::Servant_Impl_Base::describe_pub_event_source<"
            << endl
            << "    ";
@@ -2801,11 +2699,16 @@ namespace
         Traversal::PublisherData::belongs (p, repo_id_belongs_);
 
         os << "," << endl
-           << "this->context_->ciao_publishes_" << p.name ()
-           << "_map_," << endl
+           << "this->context_->ciao_publishes_" << p.name () << "_,"
+           << endl
            << "safe_retval," << endl
            << slot_ << "UL);" << endl;
 
+        if (! ctx.cl ().get_value ("static-config", false))
+        {
+          os << "}";
+        }
+
         ++slot_;
       }
 
@@ -2911,7 +2814,7 @@ namespace
          << "this->context_," << endl
          << t.name () << "_Context (h, c, this));" << endl;
 
-      os << "// Set the instance id of the component on the context" << endl
+      os << "/// Set the instance id of the component on the context" << endl
          << endl
          << "this->context_->_ciao_instance_id (this->ins_name_);" << endl;
 
@@ -2938,17 +2841,12 @@ namespace
       os << "try" << endl
          << "{"
          << "::Components::SessionComponent_var scom =" << endl
-         << "  ::Components::SessionComponent::_narrow (" << endl
-         << "  exe" << endl
-         << "  " << ");" << endl
+         << "  ::Components::SessionComponent::_narrow (exe);" << endl
          << "if (! ::CORBA::is_nil (scom.in ()))" << endl
          << "{"
-         << "scom->set_session_context (" << endl
-         << "this->context_" << endl
-         << ");"
+         << "scom->set_session_context (this->context_);"
          << "}"
-         << "this->populate_port_tables (" << endl
-         << ");"
+         << "this->populate_port_tables ();"
          << "}"
          << "catch (const CORBA::Exception&)" << endl
          << "{"
@@ -2965,8 +2863,7 @@ namespace
       // Override pure virtual set_attributes() operation.
       os << "void" << endl
          << t.name () << "_Servant::set_attributes (" << endl
-         << "const ::Components::ConfigValues &descr" << endl
-         << ")" << endl
+         << "const ::Components::ConfigValues &descr)" << endl
          << "{" << endl;
 
       string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -3059,16 +2956,8 @@ namespace
       }
 
       os << STRS[COMP_CK] << " *" << endl
-         << t.name () << "_Servant::connect (" << endl
-         << "const char *name," << endl
-         << "::CORBA::Object_ptr connection" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "))" << endl
+         << t.name () << "_Servant::connect (const char *name," << endl
+         << "::CORBA::Object_ptr connection)" << endl
          << "{";
 
       if (swapping)
@@ -3077,12 +2966,12 @@ namespace
              << endl;
         }
 
-      os << "// If the component has no receptacles, this will be unused."
+      os << "/// If the component has no receptacles, this will be unused."
          << endl
          << STRS[ACE_UA] << " (connection);" << endl
          << "if (name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
+         << "throw " << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       // Generate IF block in connect operation for each receptacle.
@@ -3102,20 +2991,13 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
+      os << "throw " << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       os << "::CORBA::Object_ptr" << endl
-         << t.name () << "_Servant::disconnect (" << endl
-         << "const char *name," << endl
-         << STRS[COMP_CK] << " * ck" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "))" << endl
+         << t.name () << "_Servant::disconnect (const char *name,"
+         << endl
+         << STRS[COMP_CK] << " * ck)" << endl
          << "{"
          << STRS[ACE_UA] << " (ck);" << endl;
 
@@ -3127,9 +3009,8 @@ namespace
 
       os << "if (name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( "
-         << STRS[EXCP_BP] << "," << endl
-         << "::CORBA::Object::_nil ());" << endl
+         << "throw "
+         << STRS[EXCP_BP] << " ();" << endl
          << "}";
 
       // Generate IF block in disconnect operation for each receptacle.
@@ -3149,15 +3030,12 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( "
-         << STRS[EXCP_IN] << " ()," << endl
-         << "::CORBA::Object::_nil ());"
+      os << "throw "
+         << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       os << STRS[COMP_RD] << " *" << endl
-         << t.name () << "_Servant::get_all_receptacles (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_receptacles ()" << endl
          << "{"
          << STRS[COMP_RD] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3227,13 +3105,7 @@ namespace
          << t.name () << "_Servant::connect_consumer ("
          << endl
          << "const char * emitter_name," << endl
-         << STRS[COMP_ECB] << "_ptr consumer" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "))" << endl
+         << STRS[COMP_ECB] << "_ptr consumer)" << endl
          << "{";
 
       if (swapping)
@@ -3244,7 +3116,7 @@ namespace
 
       os << "if (emitter_name == 0)" << endl
          << "{"
-         << "throw " << STRS[EXCP_BP] << ";" << endl
+         << "throw " << STRS[EXCP_BP] << " ();" << endl
          << "}";
 
       // Generate an IF block for each 'emits' declaration.
@@ -3270,13 +3142,9 @@ namespace
          << "}";
 
       os << STRS[COMP_ECB] << "_ptr" << endl
-         << t.name () << "_Servant::disconnect_consumer (" << endl
-         << "const char *source_name" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "))" << endl
+         << t.name ()
+         << "_Servant::disconnect_consumer (const char *source_name)"
+         << endl
          << "{";
 
       if (swapping)
@@ -3287,8 +3155,7 @@ namespace
 
       os << "if (source_name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( " << STRS[EXCP_BP] << "," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "throw " << STRS[EXCP_BP] << " ();" << endl
          << "}";
 
       // Generate an IF block for each 'emits' declaration.
@@ -3308,15 +3175,12 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( "
-         << STRS[EXCP_IN] << " ()," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
+      os << "throw "
+         << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       os << STRS[COMP_PD] << " *" << endl
-         << t.name () << "_Servant::get_all_publishers (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_publishers ()" << endl
          << "{"
          << STRS[COMP_PD] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3364,9 +3228,7 @@ namespace
          << "}";
 
       os << STRS[COMP_ED] << " *" << endl
-         << t.name () << "_Servant::get_all_emitters (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_emitters ()" << endl
          << "{"
          << STRS[COMP_ED] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3416,13 +3278,7 @@ namespace
       os << STRS[COMP_CK] << " *" << endl
          << t.name () << "_Servant::subscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_ECB] << "_ptr subscribe" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "))" << endl
+         << STRS[COMP_ECB] << "_ptr subscribe)" << endl
          << "{";
 
       if (swapping)
@@ -3431,12 +3287,11 @@ namespace
              << endl;
         }
 
-      os << "// Just in case there are no if blocks" << endl
+      os << "/// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (subscribe);" << endl
          << "if (publisher_name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
-         << endl
+         << "throw " << STRS[EXCP_IN] << " ();"<< endl
          << "}";
 
       // Generate an IF block in for each publisher in subscribe().
@@ -3456,19 +3311,14 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
+      os << "throw " << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       os << STRS[COMP_ECB] << "_ptr" << endl
          << t.name () << "_Servant::unsubscribe ("
          << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_CK] << " *ck" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "))" << endl
+         << STRS[COMP_CK] << " *ck)" << endl
          << "{";
 
       if (swapping)
@@ -3477,13 +3327,12 @@ namespace
            << endl;
       }
 
-      os << "// Just in case there are no if blocks" << endl
+      os << "/// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (ck);" << endl
          << "if (publisher_name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( "
-         << STRS[EXCP_IN] << " ()," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "throw "
+         << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       // Generate an IF block in for each publisher in unsubscribe().
@@ -3503,9 +3352,8 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( "
-         << STRS[EXCP_IN] << " ()," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
+      os << "throw "
+         << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       // Generate connect() and disconnect() for each emits declaration.
@@ -3528,10 +3376,7 @@ namespace
       os << "::CORBA::Object_ptr" << endl
          << t.name ()
          << "_Servant::get_facet_executor (" << endl
-         << "const char *name" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "))" << endl
+         << "const char *name)" << endl
          << "{";
 
       if (swapping)
@@ -3542,8 +3387,7 @@ namespace
 
       os << "if (name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " ( " << STRS[EXCP_BP] << "," << endl
-         << "::CORBA::Object::_nil ());" << endl
+         << "throw " << STRS[EXCP_BP] << " ();" << endl
          << "}";
 
 
@@ -3567,7 +3411,7 @@ namespace
       os << "return ::CORBA::Object::_nil ();"
          << "}";
 
-      os << "// Supported operations." << endl << endl;
+      os << "/// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
       {
@@ -3597,10 +3441,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -3612,7 +3454,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -3630,7 +3471,7 @@ namespace
       }
 
       // Generate operations for component attributes.
-      os << "// Component attribute operations." << endl << endl;
+      os << "/// Component attribute operations." << endl << endl;
 
       {
         Traversal::Component component_emitter;
@@ -3648,15 +3489,12 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// Private method to populate the port tables."
+      os << "/// Private method to populate the port tables."
          << endl;
 
       os << "void" << endl
-         << t.name () << "_Servant::populate_port_tables (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::populate_port_tables ()" << endl
          << "{"
-         << ";"
          << "::CORBA::Object_var obj_var;"
          << "::Components::EventConsumerBase_var ecb_var;" << endl;
 
@@ -3798,22 +3636,8 @@ namespace
       }
 
       virtual void
-      raises_none (SemanticGraph::HomeFactory&)
+      raises (SemanticGraph::HomeFactory&)
       {
-        os << STRS[EXCP_SNGL];
-      }
-
-      virtual void
-      raises_pre (SemanticGraph::HomeFactory&)
-      {
-        os << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl;
-      }
-
-      virtual void
-      raises_post (SemanticGraph::HomeFactory&)
-      {
-        os << "))";
       }
 
       virtual void
@@ -3937,33 +3761,15 @@ namespace
       }
 
       virtual void
-      raises_none (SemanticGraph::HomeFinder&)
-      {
-        os << STRS[EXCP_SNGL];
-      }
-
-      virtual void
-      raises_pre (SemanticGraph::HomeFinder&)
-      {
-        os << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl;
-      }
-
-      virtual void
-      raises_post (SemanticGraph::HomeFinder&)
+      raises (SemanticGraph::HomeFinder&)
       {
-        os << "))";
       }
 
       virtual void
-      post (SemanticGraph::HomeFinder& hf)
+      post (SemanticGraph::HomeFinder&)
       {
         os << "{"
-           << STRS[ACE_TR] << " ( ::CORBA::NO_IMPLEMENT ()," << endl;
-
-        Traversal::HomeFinder::returns (hf, simple_returns_);
-
-        os << "::_nil ());"
+           << "throw ::CORBA::NO_IMPLEMENT ();" << endl
            << "}";
       }
 
@@ -4035,7 +3841,7 @@ namespace
          << "{"
          << "}";
 
-      os << "// Home operations." << endl << endl;
+      os << "/// Home operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4052,10 +3858,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         home_operation_emitter.edge_traverser (receives);
         home_operation_emitter.edge_traverser (returns);
-        home_operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4067,7 +3871,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4084,7 +3887,7 @@ namespace
         home_emitter.traverse (t);
       }
 
-      os << "// Home supported interface operations." << endl << endl;
+      os << "/// Home supported interface operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4113,10 +3916,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4128,7 +3929,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4145,7 +3945,7 @@ namespace
         home_emitter.traverse (t);
       }
 
-      os << "// Home factory and finder operations." << endl << endl;
+      os << "/// Home factory and finder operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4164,13 +3964,10 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         factory_operation_emitter.edge_traverser (receives);
         factory_operation_emitter.edge_traverser (returns);
-        factory_operation_emitter.edge_traverser (raises);
         finder_operation_emitter.edge_traverser (receives);
         finder_operation_emitter.edge_traverser (returns);
-        finder_operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4182,7 +3979,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4200,7 +3996,7 @@ namespace
       }
 
       // Generate operations for component attributes.
-      os << "// Home attribute operations." << endl << endl;
+      os << "/// Home attribute operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4238,8 +4034,7 @@ namespace
          << "create" << name << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "::CIAO::Session_Container *c," << endl
-         << "const char *ins_name" << endl
-         << ")" << endl
+         << "const char *ins_name)" << endl
          << "{"
          << "if (p == 0)" << endl
          << "{"
@@ -4248,18 +4043,12 @@ namespace
          << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var x =" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
-         << "::_narrow (" << endl
-         << "p" << endl
-         << ");"
-         << endl
+         << "::_narrow (p);" << endl
          << "if (::CORBA::is_nil (x.in ()))" << endl
          << "{"
          << "return 0;" << endl
          << "}"
-         << "return new" << endl;
-
-      os << t.name () << "_Servant (" << endl
-         << "x.in ()," << endl
+         << "return new " << t.name () << "_Servant (x.in ()," << endl
          << "ins_name," << endl
          << "c);" << endl
          << "}";
@@ -4390,6 +4179,7 @@ ServantSourceEmitter::pre (TranslationUnit&)
      << "#include \"ciao/Servant_Activator.h\"" << endl
      << (swapping ? "#include \"ciao/Dynamic_Component_Activator.h\"\n" : "")
      << "#include \"ciao/Port_Activator_T.h\"" << endl
+     << "#include \"tao/SystemException.h\"" << endl
      << "#include \"ace/SString.h\"" << endl << endl;
 }
 
diff --git a/CIAO/CIDLC/Upcase.hpp b/CIAO/CIDLC/Upcase.hpp
index cf114dd8392..ca30079bd98 100644
--- a/CIAO/CIDLC/Upcase.hpp
+++ b/CIAO/CIDLC/Upcase.hpp
@@ -16,6 +16,15 @@ namespace
   {
     return std::toupper (c);
   }
+
+  void
+  str_upcase (std::string &str)
+  {
+    std::transform (str.begin (),
+                    str.end (),
+                    str.begin (),
+                    upcase);
+  }
 }
 
 #endif  // UPCASE_HPP
diff --git a/CIAO/COPYING b/CIAO/COPYING
index 1645f46c517..4296f4649cf 100644
--- a/CIAO/COPYING
+++ b/CIAO/COPYING
@@ -1,9 +1,9 @@
 
      _________________________________________________________________
-
+   
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
   CoSMIC(TM)
-
+  
    [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
@@ -13,9 +13,10 @@
    copy, and distribute--perpetually and irrevocably--the DOC software
    source code and object code produced from the source, as well as copy
    and distribute modified versions of this software. You must, however,
-   include this copyright statement along with code built using DOC
-   software.
-
+   include this copyright statement along with any code built using DOC
+   software that you release. No copyright statement needs to be provided
+   if you just ship binary executables of your software products.
+   
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not do
@@ -26,7 +27,7 @@
    software in your software, though we encourage you to let [10]us know
    so we can promote your project in the [11]DOC software success
    stories.
-
+   
    The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
@@ -44,7 +45,7 @@
    modification of such Submissions is entirely at the discretion of the
    moderators of the open-source DOC software projects or their
    designees.
-
+   
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -62,13 +63,13 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-
+   
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
    world provide commercial support for DOC software, however.
-
+   
    DOC software is Y2K-compliant, as long as the underlying OS platform
    is Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
@@ -77,7 +78,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-
+   
    The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
@@ -88,13 +89,13 @@
    Vanderbilt University appear in their names, without express written
    permission from Washington University, UC Irvine, and Vanderbilt
    University.
-
+   
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
-
+   
    [21]Douglas C. Schmidt
      _________________________________________________________________
-
+   
    Back to the [22]ACE home page.
 
 References
@@ -120,4 +121,4 @@ References
   19. http://www.cs.wustl.edu/~schmidt/commercial-support.html
   20. mailto:d.schmidt@vanderbilt.edu
   21. http://www.dre.vanderbilt.edu/~schmidt/
-  22. http://www.cs.wustl.edu/~schmidt/ACE.html
+  22. http://www.cs.wustl.edu/ACE.html
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 025b79521f3..69248875f48 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,1625 @@
+
+Wed Mar 21 12:12:26 CDT 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+	* CIAO version 0.5.7 released.
+
+Wed Mar 21 14:54:24 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * NEWS
+        
+          Latest NEWS items.
+
+Tue Mar 13 20:13:09 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * MPC/config/cidlc.mpb: Added C4996 (deprecated CRT function) to the
+          list of suppressed warnings. The warnings emanate from the
+          ACE_wrappers/contrib/utility area, in case anyone wants to
+          investigate the desireability of making a change.
+
+Mon Mar 11 07:12:19 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+          Added missing .in() to the generation
+
+Sat Mar 10 22:49:01 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * MPC/config/ciao_vc8warnings.mpb: New base containing features that
+          turn VC8 warnings on/off. Some of these may benefit from some looking
+          at; if you want to see them, regenerate projects with the feature
+          turned off.
+
+        * MPC/config/ciao_client_dnc.mpb: Inherit from ciao_vc8warnings to
+          shut off the gazillions of VC8 warnings.
+
+Sat Mar 10 01:11:40 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/tutorials/Quoter/Simple/01.html:
+        * docs/tutorials/Quoter/Simple/02.html:
+        * docs/tutorials/Quoter/Simple/03.html:
+        * docs/tutorials/Quoter/Simple/04.html:
+        * docs/tutorials/Quoter/Simple/index.html:
+
+          Added $Id to each file to fix fuzz errors.
+
+Fri Mar  9 21:11:20 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Changes to code generation specific to upgradeable components
+          corresponding to changes in
+
+          Tue Mar  6 20:21:45 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Fri Mar  9 15:53:02 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: Adjusted 3rd arg to
+          ACE_CString for matching change in ACE from yesterday.
+
+Fri Mar  9 14:09:19 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/RTConfig_Manager.{cpp,inl}:
+          Fixed ownership problems with the policy list, fixes bugzilla 2743.
+          Also moved destructor to cpp file
+
+Thu Mar  8 01:27:19 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/tutorials/Quoter/Simple/01.html:
+        * docs/tutorials/Quoter/Simple/02.html:
+        * docs/tutorials/Quoter/Simple/03.html:
+        * docs/tutorials/Quoter/Simple/04.html:
+        * docs/tutorials/Quoter/Simple/index.html:
+
+          Added link to CIDLC compiler options.
+          Added link to generate_component_mpc.pl options.
+          Made it easier to navigate between tutorial pages.
+
+Wed Mar  7 11:42:26 PST 2007  William R. Otte <wotte@dre.vanderbilt.edu>
+
+        * NEWS:
+
+          Updated to include some important changes in this release and
+          plans for next release.
+
+
+Wed Mar  7 02:20:26 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/tutorials/CoSMIC:
+        * docs/tutorials/CoSMIC/01.html:
+        * docs/tutorials/CoSMIC/02.html:
+        * docs/tutorials/CoSMIC/03.html:
+        * docs/tutorials/CoSMIC/04.html:
+        * docs/tutorials/CoSMIC/Icons:
+        * docs/tutorials/CoSMIC/Icons/AddConnMode.gif:
+        * docs/tutorials/CoSMIC/Icons/SetMode.gif:
+        * docs/tutorials/CoSMIC/Images:
+        * docs/tutorials/CoSMIC/Images/fig1.jpg:
+        * docs/tutorials/CoSMIC/Images/fig10.jpg:
+        * docs/tutorials/CoSMIC/Images/fig11.jpg:
+        * docs/tutorials/CoSMIC/Images/fig12.jpg:
+        * docs/tutorials/CoSMIC/Images/fig2.jpg:
+        * docs/tutorials/CoSMIC/Images/fig3.jpg:
+        * docs/tutorials/CoSMIC/Images/fig4.jpg:
+        * docs/tutorials/CoSMIC/Images/fig5.jpg:
+        * docs/tutorials/CoSMIC/Images/fig6.jpg:
+        * docs/tutorials/CoSMIC/Images/fig7.jpg:
+        * docs/tutorials/CoSMIC/Images/fig8.jpg:
+        * docs/tutorials/CoSMIC/Images/fig9.jpg:
+        * docs/tutorials/CoSMIC/Model:
+        * docs/tutorials/CoSMIC/Model/Quoter.xme:
+        * docs/tutorials/CoSMIC/index.html:
+        * docs/tutorials/CoSMIC/style.css:
+
+          Removed these files. This tutorial has been subsumed by the
+          tutorial in docs/tutorials/Quoter.
+
+Tue Mar  6 23:43:58 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Added code generation for attaching diffserv policies to
+          receptacle interfaces at connection time.
+
+Tue Mar  6 20:21:45 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Cookies.h:
+        * ciao/Servant_Impl_Base.h:
+        * ciao/Servant_Impl_Utils_T.cpp:
+        * ciao/Server_init.cpp:
+        * ciao/Cookies.inl:
+        * ciao/Servant_Impl_Base.cpp:
+        * ciao/Cookies.cpp:
+        * ciao/Dynamic_Component_Servant_Base.h:
+        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * CIDLC/AttributeSourceEmitters_T.hpp:
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+        * CIDLC/ExecImplGenerator.cpp:
+        * CIDLC/Upcase.hpp:
+        * CIDLC/ServantGenerator.cpp:
+
+          - changed the container used to hold object reference for
+            multiplex receptacle and event source ports from
+            ACE_Active_Object_Map to ACE_Array_Map
+
+          - removed class CIAO::Map_Key_Cookie (since it encodes an
+            ACE_Active_Object_Map_Key, which is tightly coupled with
+            ACE_Active_Object_Map) and replaced it with class
+            Cookie_Impl, which encodes a CORBA::ULong
+
+          - formatting and cosmetic changes to CIDLC-generated code
+
+Tue Mar  6 13:21:24 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Updated this file to clarify that the CIAO license need
+          not be shipped with binary-only releases.  Thanks to Michael
+          Kircher <michael dot kircher at siemens dot com> and Werner
+          Burger <werner dot burger at siemens dot com> for motivating
+          this.
+
+Sun Mar  4 21:49:19 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/tutorials/Quoter/Simple/Icons:
+        * docs/tutorials/Quoter/Simple/Model:
+
+          Added GME model of the Quoter tutorial.
+
+Thu Mar  1 23:05:27 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/Simple/images/step6.jpg:
+        * docs/tutorials/Quoter/Simple/images/step1.jpg:
+        * docs/tutorials/Quoter/Simple/images/step2.jpg:
+        * docs/tutorials/Quoter/Simple/images/step3.jpg:
+        * docs/tutorials/Quoter/Simple/images/steps.jpg:
+
+          Lowercased file names, removed spaces.
+
+        * docs/tutorials/Quoter/Simple/03.html:
+        * docs/tutorials/Quoter/Simple/04.html:
+        * docs/tutorials/Quoter/Simple/index.html:
+
+          Changes to reflect above change.
+Thu Mar  1 22:20:28 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+
+          A minor change to add a "_" to the receptacle name,
+          that is used as a key in a Hash Map storing the
+          receptacle policies and the receptacle name.
+
+Thu Mar  1 07:17:00 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/ccd.hpp:
+        * tools/Config_Handlers/cid.cpp:
+        * tools/Config_Handlers/pcd.cpp:
+        * tools/Config_Handlers/toplevel.cpp:
+        * tools/Config_Handlers/cdd.hpp:
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp:
+        * tools/Config_Handlers/cpd.hpp:
+        * tools/Config_Handlers/cdp.hpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+        * tools/Config_Handlers/ccd.cpp:
+        * tools/Config_Handlers/iad.hpp:
+        * tools/Config_Handlers/cid.hpp:
+        * tools/Config_Handlers/pcd.hpp:
+        * tools/Config_Handlers/Deployment.cpp:
+        * tools/Config_Handlers/cdd.cpp:
+        * tools/Config_Handlers/toplevel.hpp:
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp:
+        * tools/Config_Handlers/cdp.cpp:
+        * tools/Config_Handlers/cpd.cpp:
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+        * tools/Config_Handlers/iad.cpp:
+
+          Regenrated with the latest version of XSC to pick up
+          bugfixes, esp for addressing warnings in Borland.
+
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp:
+        * tools/Config_Handlers/RT-CCM/TP_Handler.cpp:
+        * tools/Config_Handlers/IRDD_Handler.h:
+        * tools/Config_Handlers/IRDD_Handler.cpp:
+        * tools/Config_Handlers/IDD_Handler.cpp:
+
+          Borland compile errors resolved.
+
+        * tools/Config_Handlers/Property_Handler.h:
+
+          Layout changes.
+
+Thu Mar  1 03:54:50 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
+        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
+
+          Changed base project from ciao_xml_utils to ciao_config_handlers_base
+          to pull in specific block that turns off visibility.
+
+Wed Feb 28 22:19:37 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * ciao/Container_Base.cpp:
+        * ciao/Container_Base.h:
+
+          Added a method to get the receptacle policy associated
+          with a receptacle.
+
+Wed Feb 28 22:04:52 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * ciao/Container_Base.cpp:
+        * ciao/Container_Base.h:
+
+          Added a new private variable of type ACE_Hash_Map to hold
+          the receptacle policy list.
+
+          Added a set operation for setting the value of the receptacle policy
+          map.
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+
+          When the Container_Impl class is created, pass on the
+          NA's configurator. The configurator will be used by the
+          Container_Impl class to identify the policies that needs to
+          be set on the components and their ports. Finally, the
+          Container_Impl class lets the container know about these policies.
+
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCE/NodeApplication/Container_Impl.inl:
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+
+          Modified the constructor to receive the NA configurator as
+          an input argument.
+
+          Added capabilities to collect the policies associated with the
+          receptacles of the components.
+
+Wed Feb 28 14:30:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO_TAO.mwc:
+          Removed RACE
+
+Wed Feb 28 09:33:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ciao_nodeapp_configurator.mpb:
+          New base project
+
+        * MPC/config/ciao_nodeapplication.mpb:
+          Updated because of new project
+
+        * MPC/config/ciao_race_component.mpb:
+        * MPC/config/ciao_race_default.mpb:
+        * MPC/config/ciao_race_monitor.mpb:
+          Removed, RACE is removed for the moment
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+          Use the new base project
+
+        * NodeApplicationManager/NodeApplicationManager_Impl.h:
+          Layout changes
+
+        * NodeApplicationManager/NodeApplicationManager_Impl.inl:
+          No need to use ACE_UNUSED_ARG
+
+Wed Feb 28 07:00:15 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+
+          Added missing includes to the .cpp file, and added
+          missing file for compilation in the .mpc file.
+
+Tue Feb 27 21:35:17 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApp_Configurator.h:
+
+          Changed the current structure of the NodeApplication library
+          by introducing the NodeApp_Configurator, that will now be
+          used to manage both RT and non-RT policies using the respective
+          config managers.
+
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
+
+          Previously, when RT support was required, the Configurator
+          Factory would create the RT config manager.
+
+          Instead, now the NodeApp_Configurator is created, which will
+          then subsequently create the RT or non-RT config managers
+          depending on whether RT support is required or not.
+
+          By default a non-RT config manager is created, which will be used
+          to create the non-RT policies.
+
+        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
+
+          Made modifications to create the RT and non-RT config managers.
+
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+        * DAnCE/NodeApplication/RTConfig_Manager.h:
+
+          Made modifications to conform to the base config manager class.
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+
+          Made modifications to compile the newly added files.
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+
+          Changed the private variable type for the NA Configurator used.
+
+Tue Feb 27 20:11:28 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Fixed cut and paste error in code generation of type-specific
+          disconnect_*() method for multiplex uses ports.
+
+Tue Feb 27 17:44:08 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * examples/Hello/descriptors/run_test_without_ns.pl:
+
+          Updated the script in finding the location of the Execution
+          Manager executable.
+
+Tue Feb 27 05:26:53 UTC 2007  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+
+          Modified the remove_extracted_package () function.
+          Added the functionality to save the package information when
+          install or delete a package.
+
+Tue Feb 27 03:29:42 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/DynAny_Handler.mpc
+
+          Inherit from config_handlers_base to disable symbol visibility.
+
+Tue Feb 27 03:10:14 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+
+          Changed double quotes to <%quote%> to correctly generate in
+          Visual Studio projects.  Thanks to Kitty for suggesting the
+          fix.
+
+Tue Feb 27 03:00:25 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
+        * tests/Bug_2130_Regression/descriptors/run_test.pl
+        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
+        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl
+        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl
+        * DAnCE/tests/NodeApplicationTest/run_test.pl
+        * examples/Hello/descriptors/run_NodeDaemons.pl
+        * examples/Hello/descriptors/run_test_without_ns.pl
+        * examples/Hello/descriptors/run_test.pl
+        * 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
+        * examples/Hello/descriptors_RTCCM/rt_run_test.pl
+        * examples/BasicSP/descriptors/run_test.pl
+        * examples/BasicSP/descriptors/basicNodeDaemon.pl
+        * examples/Display/descriptors/run_test_without_ns.pl
+        * examples/Display/descriptors/basicNodeDaemon.pl
+        * examples/Display/descriptors/run_NodeDaemons.pl
+
+          Updated to reflect movement of binaries to CIAO_ROOT/bin.
+
+Mon Feb 26 17:21:55 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * examples/Hello/descriptors_RTCCM/rt_run_test.pl:
+
+          Locate the CIAO directory using $PerlACE::CIAO_ROOT instead of
+          assuming that it is nested within TAO.  This change supports the
+          peer-style directory layout.
+
+Sat Feb 24 21:32:05 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+        * DAnCE/NodeApplication/RTConfig_Manager.h:
+        * DAnCE/NodeApplication/NodeApp_Configurator.h:
+        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
+
+          Reverted some inadvertent check-ins.
+
+Sat Feb 24 20:53:14 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApp_Configurator.h:
+        * DAnCE/NodeApplication/NodeApp_Configurator.cpp:
+
+          Changed the current structure of the NodeApplication library
+          by introducing the NodeApp_Configurator, that will now be
+          used to manage both RT and non-RT policies using the respective
+          config managers.
+
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
+
+          Previously, when RT support was required, the Configurator
+          Factory would create the RT config manager.
+
+          Instead, now the NodeApp_Configurator is created, which will
+          then subsequently create the RT or non-RT config managers
+          depending on whether RT support is required or not.
+
+          By default a non-RT config manager is created, which will be used
+          to create the non-RT policies.
+
+        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
+
+          Made modifications to create the RT and non-RT config managers.
+
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+        * DAnCE/NodeApplication/RTConfig_Manager.h:
+
+          Made modifications to conform to the base config manager class.
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+
+          Made modifications to compile the newly added files.
+
+Sat Feb 24 19:52:49 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/Config_Manager.h:
+
+          A new base class for the RT and non-RT NodeApplication
+          config managers, that are used by the NodeApplication
+          configurators.
+
+        * DAnCE/NodeApplication/NAConfig_Manager.cpp:
+        * DAnCE/NodeApplication/NAConfig_Manager.h:
+        * DAnCE/NodeApplication/NAConfig_Manager.inl:
+        * DAnCE/NodeApplication/NA_Configurator_Export.h:
+
+          A non-RT NodeApplication config manager that is being used to
+          create the DiffServ policies. In general, this config manager
+          can be used to create all the TAO-specific policies that are
+          created using ORB, rather than RT-ORB.
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+
+          Updated the MPC file to compile the new non-RT NodeApplication
+          config manager library.
+
+Fri Feb 23 04:08:04 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * CIDLC/ServantGenerator.cpp:
+
+          cidlc --help prints the following:
+
+            [--svnt-export-macro macro]
+            Replace default servant DLL export macro with provided ,acro.
+
+          Fixed the misspelling of macro in the cidlc help message.
+
+
+Thu Feb 22 22:59:01 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * docs/schema/ServerResourceUsage.txt:
+
+          Updated the text document with the new usage guidelines.
+
+Thu Feb 22 22:53:52 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+
+          Changed in order to remove a warning in the build
+
+Thu Feb 22 22:22:13 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * examples/Hello/descriptors_RTCCM/rt-example.cdp:
+
+          Updated the RT-CCM example deployment plan to conform
+          to the latest changes in specifying the POA policies
+          within the deployment plan.
+
+          The POA policies now need to be specified with a tag name
+          as CIAO:InstancePolicy.
+
+Thu Feb 22 22:19:14 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+
+          Modifications to read in DiffServ policy specifications
+          within the deployment plan.
+
+Thu Feb 22 22:18:24 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CCF/CCF/CompilerElements/TokenStream.hpp
+        * CCF/CCF/IDL2/SemanticAction/Exception.hpp
+        * CCF/CCF/IDL2/SemanticAction/TypeId.hpp
+        * CCF/CCF/IDL2/SemanticAction/Operation.hpp
+        * CCF/CCF/IDL2/SemanticAction/Interface.hpp
+        * CCF/CCF/IDL2/SemanticAction/Typedef.hpp
+        * CCF/CCF/IDL2/SemanticAction/Attribute.hpp
+        * CCF/CCF/IDL2/SemanticAction/Enum.hpp
+        * CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp
+        * CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp
+        * CCF/CCF/IDL2/SemanticAction/Member.hpp
+        * CCF/CCF/IDL2/SemanticAction/Elements.hpp
+        * CCF/CCF/IDL2/SemanticAction/ValueType.hpp
+        * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp
+        * CCF/CCF/IDL2/SemanticAction/Include.hpp
+        * CCF/CCF/IDL2/SemanticAction/Struct.hpp
+        * CCF/CCF/IDL2/SemanticAction/Module.hpp
+        * CCF/CCF/IDL2/SemanticAction/Native.hpp
+        * CCF/CCF/IDL2/SemanticAction/Const.hpp
+        * CCF/CCF/IDL2/SemanticAction/Union.hpp
+        * CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
+        * CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp
+        * CCF/CCF/IDL3/SemanticAction/Provides.hpp
+        * CCF/CCF/IDL3/SemanticAction/Consumes.hpp
+        * CCF/CCF/IDL3/SemanticAction/Publishes.hpp
+        * CCF/CCF/IDL3/SemanticAction/Uses.hpp
+        * CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
+        * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp
+        * CCF/CCF/IDL3/SemanticAction/Emits.hpp
+
+          Addressed warnings relating to classes w/ virtual methods having
+          non virtual destructors.
+
+Thu Feb 22 21:36:35 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+
+          Fix for compile warning.
+
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+
+          Regenerated with newer version of XSC than Jai had, re-applying
+          fixes from
+          Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+Thu Feb 22 17:07:08 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp:
+
+          Removed a unused input argument from cnw_priority_pd () method.
+
+Thu Feb 22 02:30:29 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/Deployment/CIAO_ServerResources.idl:
+
+          Modified the IDL to conform to the changes made in the
+          schema.
+
+Thu Feb 22 02:27:00 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/RT-CCM/CNPM_Handler.h:
+        * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp:
+        * tools/Config_Handlers/RT-CCM/NPM_Handler.h:
+        * tools/Config_Handlers/RT-CCM/NPM_Handler.cpp:
+
+          New config handlers for handling the DiffServ policy
+          additions in the CIAOServerResources schema.
+
+        * tools/Config_Handlers/RT-CCM/PS_Handler.cpp:
+
+          PolicySet within the CIAOServerResources schema will now
+          have DiffServ policy specify sub-elements. So the PolicySet
+          handler is modified to call the specific handlers checked-in
+          above.
+
+        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
+
+          Included the new files in the MPC.
+
+Thu Feb 22 01:26:05 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * docs/schema/CIAOServerResources.xsd:
+
+          Added elements for representing the DiffServ policy.
+
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp:
+
+          Associated config handlers change.
+
+Wed Feb 21 22:01:45 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * docs/schema/Basic_Deployment_Data.xsd:
+
+          Updated the InstanceDeploymentDescription element's
+          deployedResource sub-element to be a sequence.
+
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp:
+        * tools/Config_Handlers/IRDD_Handler.h:
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+        * tools/Config_Handlers/IDD_Handler.cpp:
+
+          Associated config handler changes.
+
+Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DynAny_Handler/DynAny_Handler.cpp
+        * CIAO_Events/CIAOEvents.hpp
+        * RT-CCM/CIAOServerResources.hpp
+        * Basic_Deployment_Data.hpp
+
+          Compile fixes for Borland and pedantic G++ compilers.
+
+Wed Feb 21 19:16:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Fixed error in this file
+
+Wed Feb 21 19:12:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Deployment/Deployment_Target_Data.idl:
+          Removed, this file was reintroduced with the move by accident
+
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+          Use full paths
+
+Wed Feb 21 15:49:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Added missing files
+
+Wed Feb 21 08:30:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Swapping_Container.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Layout change
+
+        * tools/Config_Handlers/Utils/XercesString.{h,cpp}:
+          Use std::swap instead of ACE_Swap
+
+Tue Feb 20 17:56:25 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Clarified how the COPYING file need to be included with
+          any code released.  Thanks to Scott Mark <sjm at pobox dot com>
+          for helping clarify this.
+
+Tue Feb 20 17:59:51 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/Deployment/Deployment_TargetManager.idl
+        * DAnCE/Deployment/DAnCE_Core.mpc
+        * DAnCE/TargetManager/DomainDataManager.h
+        * DAnCE/TargetManager/TargetManager.mpc
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/ResourceCommitmentManager.h
+        * DAnCE/TargetManager/TargetManagerImpl.idl
+        * DAnCE/NodeApplication/Container_Impl.h
+        * ciao/Context_Impl_Base.h
+        * ciao/Swapping_Container.cpp
+
+          Cleared up compile errors from
+          Tue Feb 20 16:17:46 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+Tue Feb 20 17:48:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Context_Impl_Base.h:
+        * DAnCE/Deployment/NodeApp_CB_Impl.{h,cpp}:
+          Removed ACE_THROW_SPEC
+
+Tue Feb 20 17:10:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Extension_Context.{h,cpp}:
+          Moved to ciao/extension
+
+Tue Feb 20 16:17:46 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Merged ciao_core_2 to head.
+
+        Tue Feb 20 16:03:02 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * RACE/Plan_Analyzer/Interface/PlanIngress.idl
+        * RACE/Planners/Interface/Planner_I.idl
+        * RACE/Controller/Component/Controller.idl
+        * RACE/Output_Adapters/Interface/PlanEgress.idl
+        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl
+
+          Further updates to support migration of Deployment IDL to
+          DAnCE/Deployment.
+
+  Mon Feb 19 21:27:11 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/ciao_events_base_dnc.mpb
+        * MPC/config/ciaoexe.mpb
+        * MPC/config/ciao_client_dnc.mpb
+        * MPC/config/ciao_container_dnc.mpb
+        * MPC/config/ciao_servant_dnc.mpb
+        * MPC/config/ciao_component_dnc.mpb
+        * MPC/config/ciao_events_dnc.mpb
+        * MPC/config/ciao_server_dnc.mpb
+
+          Removed the _DnC_ from a bunch of projects, as since we no longer have
+          DnC and non DnC versions of CIAO, its reall superfluous.
+
+        * DAnCE/Deployment
+        * DAnCE/Deployment/Deployment_NodeApplication.idl
+        * DAnCE/Deployment/Deployment_Data.idl
+        * DAnCE/Deployment/Deployment_svnt_export.h
+        * DAnCE/Deployment/Deployment_Base.idl
+        * DAnCE/Deployment/Deployment_RepositoryManager.idl
+        * DAnCE/Deployment/Deployment_Packaging_Data.idl
+        * DAnCE/Deployment/Deployment_Target_Data.idl
+        * DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
+        * DAnCE/Deployment/Deployment_TargetData.idl
+        * DAnCE/Deployment/Deployment.idl
+        * DAnCE/Deployment/Deployment_NodeManager.idl
+        * DAnCE/Deployment/Deployment_TargetManager.idl
+        * DAnCE/Deployment/Deployment_Container.idl
+        * DAnCE/Deployment/NodeApp_CB_Impl.cpp
+        * DAnCE/Deployment/Deployment_DomainApplicationManager.idl
+        * DAnCE/Deployment/Deployment_Core.idl
+        * DAnCE/Deployment/NodeApp_CB_Impl.h
+        * DAnCE/Deployment/Deployment_DeploymentPlan.idl
+        * DAnCE/Deployment/Deployment_DomainApplication.idl
+        * DAnCE/Deployment/CIAO_ServerResources.idl
+        * DAnCE/Deployment/Deployment_stub_export.h
+        * DAnCE/Deployment/Deployment_ExecutionManager.idl
+        * DAnCE/Deployment/Deployment_ApplicationManager.idl
+        * DAnCE/Deployment/Deployment_Connection.idl
+        * DAnCE/Deployment/Deployment_Application.idl
+        * DAnCE/Deployment/Deployment_NodeApplicationManager.idl
+        * DAnCE/Deployment/Deployment_Events.idl
+        * DAnCE/Deployment/Deployment_common.h
+
+          Moved these IDLs from CIAO_ROOT/ciao in an effort to isolate the
+          DnC IDL from the CIAO IDL and control directory size explosion of
+          CIAO_ROOT/ciao.
+
+        * tools/Config_Handlers/DnC_Dump.h
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Property_Handler.cpp
+        * tools/Config_Handlers/ID_Handler.cpp
+        * tools/Config_Handlers/DnC_Dump.cpp
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/test.cpp
+        * 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/PCD_Handler.cpp
+        * tools/Config_Handlers/CRDD_Handler.cpp
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/STD_CPD_Handler.cpp
+        * tools/Config_Handlers/CIAO_Events/test.cpp
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.cpp
+        * tools/Config_Handlers/DP_PCD_Handler.cpp
+        * tools/Config_Handlers/RDD_Handler.cpp
+        * tools/Config_Handlers/STD_CID_Handler.cpp
+        * tools/Config_Handlers/ERE_Handler.cpp
+        * tools/Config_Handlers/XML_File_Intf.cpp
+        * tools/Config_Handlers/test.cpp
+        * tools/Config_Handlers/CCD_Handler.cpp
+        * tools/Config_Handlers/SatisfierProperty_Handler.cpp
+        * tools/Config_Handlers/RT-CCM/CLA_Handler.h
+        * tools/Config_Handlers/RT-CCM/TPL_Handler.h
+        * tools/Config_Handlers/RT-CCM/OC_Handler.h
+        * tools/Config_Handlers/RT-CCM/PM_Handler.h
+        * tools/Config_Handlers/RT-CCM/OR_Handler.h
+        * tools/Config_Handlers/RT-CCM/PS_Handler.h
+        * tools/Config_Handlers/RT-CCM/TP_Handler.h
+        * tools/Config_Handlers/RT-CCM/CB_Handler.h
+        * tools/Config_Handlers/RT-CCM/SRD_Handler.h
+        * tools/Config_Handlers/PSPE_Handler.cpp
+        * tools/Config_Handlers/Dump_Obj.h
+        * tools/Config_Handlers/ESD_Handler.cpp
+        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.cpp
+        * tools/Config_Handlers/STD_CID_Handler.h
+        * tools/Config_Handlers/IRDD_Handler.cpp
+        * tools/Config_Handlers/DD_Handler.cpp
+        * tools/Config_Handlers/ADD_Handler.cpp
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+        * ciaosvcs/Events/CIAO_Events.mpc
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/NodeManager/MonitorCB.h
+        * DAnCE/NodeManager/BaseMonitor.h
+        * DAnCE/Plan_Generator/PCVisitorBase.h
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.h
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/DomainEvents.idl
+        * DAnCE/TargetManager/TargetManagerImpl.idl
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+        * DAnCE/Interfaces/ExecutionManagerDaemon.idl
+        * DAnCE/Interfaces/NodeManagerDaemon.idl
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/ImplementationInfo.h
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.h
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeApplication/Container_Impl.h
+        * DAnCE/NodeApplication/RTConfig_Manager.h
+        * DAnCE/NodeApplication/NodeApp_Configurator.h
+        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
+        * DAnCE/NodeApplication/NodeApplication_Core.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/RepositoryManager/RM_Helper.h
+        * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+        * DAnCE/RepositoryManager/PC_Updater.cpp
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/PC_Updater.h
+        * DAnCE/ExecutionManager/DAM_Map.h
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
+        * DAnCE/ExecutionManager/ExecutionManager.mpc
+        * ciao/Swapping_Container.h
+        * ciao/Dynamic_Component_Activator.h
+        * ciao/CCM_Core.mpc
+        * ciao/Container_Base.h
+
+          For the most part, modifications to support movement of DnC interfaces
+          to DAnCE/Deployment.  One or two files were further modified to support
+          removal of DnC from project names.
+
+  Mon Feb 19 19:40:19 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/ciaoexe.mpb
+        * DAnCE/NodeManager/NodeManager.mpc
+        * DAnCE/NodeApplication/NodeApplication.mpc
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
+
+          Modified to install exes to CIAO_ROOT/bin.
+
+  Mon Feb 19 19:33:32 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/MonitorCB.cpp
+        * DAnCE/TargetManager/DomainDataManager.cpp
+
+          Corrected to reflect changes in IDL.
+
+        * CCF/CCF/CodeGenerationKit/CommandLine.cpp
+
+          Added get_all_values to support revrieval of all values for a given
+          option passed on the command line.
+
+  Mon Feb 19 19:32:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Container_Base.cpp
+
+          Cosmetic format changes.
+
+        * ciao/CCM_Context.idl
+
+          re-added removed comment.
+
+  Mon Feb 19 19:25:06 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ccd.hpp
+        * cid.cpp
+        * pcd.cpp
+        * Deployment.hpp
+        * toplevel.cpp
+        * cdd.hpp
+        * Basic_Deployment_Data.cpp
+        * cdp.hpp
+        * cpd.hpp
+        * CIAO_Events/CIAOEvents.cpp
+        * CIAO_Events/CIAOEvents.hpp
+        * ccd.cpp
+        * iad.hpp
+        * cid.hpp
+        * pcd.hpp
+        * Deployment.cpp
+        * cdd.cpp
+        * toplevel.hpp
+        * RT-CCM/CIAOServerResources.hpp
+        * RT-CCM/CIAOServerResources.cpp
+        * cdp.cpp
+        * cpd.cpp
+        * Basic_Deployment_Data.hpp
+        * iad.cpp
+
+        * docs/schema/cid.xsd
+        * docs/schema/cpd.xsd
+
+          Changed include ordering.
+
+        * docs/schema/Basic_Deployment_Data.xsd
+
+          Added elements to support sequence, struct, and valuetypes
+          in the schema.
+
+  Mon Feb 19 19:20:35 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Package_Handlers/PCD_Handler.cpp
+
+          Changed to reflect slight change in schema.
+
+        * CIAO_Events/CIAO_Events_Handlers.mpc
+        * Config_Handlers.mpc
+        * RT-CCM/RT-CCM-Handlers.mpc
+
+          Updated to include XSC generation.
+
+  Mon Feb 19 15:30:04 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/xscdefaults.mpb
+        * tools/Config_Handlers/Config_Handlers.mpc
+
+          Added a custom type to MPC to handle XSC generation.
+
+  Wed Feb  7 21:16:36 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_ApplicationManager.idl
+        * ciao/CCM_CCMException.idl
+        * ciao/Deployment_Application.idl
+        * ciao/Context_Impl_Base.h
+        * ciao/Deployment.idl
+        * ciao/Context_Impl_Base.cpp
+        * ciao/Deployment_NodeApplication.idl
+        * ciao/Deployment_TargetData.idl
+        * ciao/CCM_Events.idl
+        * ciao/Deployment_ExecutionManager.idl
+        * ciao/Deployment_NodeApplicationManager.idl
+        * ciao/CCM_Context.idl
+        * ciao/Deployment_Base.idl
+        * ciao/Deployment_Packaging_Data.idl
+        * ciao/Deployment_DomainApplicationManager.idl
+        * ciao/Deployment_Connection.idl
+        * ciao/Deployment_TargetManager.idl
+        * ciao/Deployment_DeploymentPlan.idl
+        * ciao/Deployment_NodeManager.idl
+
+          Updated with changes to comply with the 06-02-01 version of the
+          DnC spec.  Many of these changes would break the entire toolchain,
+          so they are commented out for the time being.  grep for
+
+          @@changed @@add @@delete
+
+          to find changes.
+
+        * ciao/CCM_Core.mpc
+        *ciao/Deployment_DomainApplication.idl
+
+         Added DomainApplication interface, completely missing from our IDL.
+
+
+>>>>>>> .r77261
+Tue Feb 20 14:15:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/OperationHeaderEmitters.cpp:
+        * CIDLC/OperationHeaderEmitters.hpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+          Override raises to get no throw spec at all
+
+Tue Feb 20 03:56:37 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl:
+
+          Added missing dependency on iortable base project.
+
+Mon Feb 19 20:22:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/extension/*:
+          Moved all idl files for QoS4CCM to the new extension directory
+
+        * caio/Session_Container.h:
+          Layout change
+
+Sat Feb 17 03:45:30 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl:
+
+          Updated template file to match the recent enhancements to StaticDAnCEApp.cpp
+          found in examples/Null_Component/StaticDAnCEApp.cpp
+
+Fri Feb 15 19:41:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/AttributeHeaderEmitters.cpp:
+        * CIDLC/AttributeSourceEmitters_T.hpp:
+        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * CIDLC/ExecImplSourceGenerator.cpp:
+        * CIDLC/Literals.cpp:
+        * CIDLC/Literals.hpp:
+        * CIDLC/OperationHeaderEmitters.cpp:
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+          Removed generation of ACE_THROW_SPEC, maybe some raise methods can be
+          removed internally but that is for the next cleanup round
+
+        * examples/Null_Component/Null_Component_exec.h:
+          Layout change
+
+        * examples/Null_Component/StaticDAnCEApp.cpp:
+          Updated include
+
+Fri Feb 15 09:34:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+          Removed the extension context files for the moment, this needs
+          much more idl files
+
+Thu Feb 14 16:06:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Target_Data.idl:
+        * ciao/Deployment_PlanError.idl:
+          Renamed Target_Data to PlanError
+
+        * ciao/CCM_Core.mpc:
+        * ciao/Deployment.idl:
+        * ciao/Deployment_TargetManager.idl:
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+          Updated because of rename above
+
+Thu Feb 14 16:00:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_CCMException.idl:
+          Enabled the QoS4CCM enums
+
+        * ciao/CCM_Core.mpc:
+          Added ExtensionContext.cpp
+
+        * ciao/ExtensionContext.{h,cpp}:
+          New file, just throw no implement in all the new methods, just
+          creating first the empty classes and infrastructure
+
+Thu Feb 14 13:05:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Context_Impl_Base.h:
+        * ciao/Dynamic_Component_Activator.cpp:
+        * ciao/Dynamic_Component_Activator.h:
+        * ciao/Dynamic_Component_Servant_T.h:
+        * ciao/Home_Servant_Impl_Base.cpp
+        * ciao/Home_Servant_Impl_Base.h:
+        * ciao/ome_Servant_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_T.h:
+        * ciao/Object_Set_T.h:
+        * ciao/Port_Activator_T.cpp
+        * ciao/Port_Activator_T.h:
+        * ciao/Servant_Impl_Utils_T.cpp:
+        * ciao/StandardConfigurator_Impl.cpp:
+        * ciao/StandardConfigurator_Impl.h:
+        * ciao/Swapping_Container.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
+        * ciao/Upgradeable_Context_Impl_T.h:
+          Layout changes
+
+        * ciao/Cookies.cpp:
+        * ciao/Cookies.inl:
+          Don't inline virtual destructors
+
+Thu Feb 14 12:51:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Context_Impl_Base.cpp:
+          Just let resolve_service_reference throw not implemented,
+          need some more work
+
+Thu Feb 14 12:22:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Container_Base.cpp:
+        * ciao/Container_Base.h:
+        * ciao/Session_Container.cpp:
+        * ciao/Session_Container.h:
+        * ciao/Session_Container.inl:
+          Moved Session_Container to its own file
+
+        * ciao/Container_Base.inl:
+          Removed, not needed anymore
+
+        * ciao/CCM_Context.idl:
+          Added resolve_service_reference
+
+        * ciao/CCM_Core.mpc:
+          Added new Session_Container
+
+        * ciao/Context_Impl_Base.cpp:
+        * ciao/Context_Impl_Base.h:
+          Layout changes and implemented resolve_service_reference
+
+        * ciao/Context_Impl_T.cpp:
+        * ciao/Context_Impl_T.h:
+        * ciao/Port_Activator.h:
+        * ciao/Port_Activator_T.h:
+        * ciao/Servant_Impl_Base.cpp:
+        * DAnCE/ExecutionManager/Execution_Manager.cpp:
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+          Layout changes
+
+        * ciao/Dynamic_Component_Activator.cpp:
+        * ciao/Dynamic_Component_Activator.h:
+        * ciao/Swapping_Container.cpp:
+        * ciao/Swapping_Container.h:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+          Renamed add_servant_map to add_servant_to_map and delete_servant_map
+          to delete_servant_from_map
+
+        * CIDLC/ServantHeaderGenerator.cpp:
+          Include Session_Container.h instead of Container_Base.h
+
+        * DAnCE/ExecutionManager/DAM_Map.cpp:
+          No need to use intermediate variables
+
+Tue Feb 13 20:49:13 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+          Changed in order to address couple of warnings in the TargetManager.
+
+Mon Feb 12 16:02:14 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * RACE:
+
+        * RACE/Controller:
+
+        * RACE/Controller/Component:
+
+        * RACE/Controller/Component/Controller.cidl:
+        * RACE/Controller/Component/Controller.idl:
+        * RACE/Controller/Component/Controller.mpc:
+        * RACE/Controller/Component/Controller_exec.h:
+        * RACE/Controller/Component/Controller_exec.cpp:
+        * RACE/Controller/Component/Controller_exec_export.h:
+        * RACE/Controller/Component/Controller_stub_export.h:
+        * RACE/Controller/Component/Controller_svnt_export.h:
+
+        * RACE/Input_Adapters:
+
+        * RACE/Input_Adapters/Base:
+
+        * RACE/Input_Adapters/Base/Input_Adapter.idl:
+        * RACE/Input_Adapters/Base/Input_Adapter.mpc:
+        * RACE/Input_Adapters/Base/Input_Adapter_stub_export.h:
+        * RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h:
+
+        * RACE/Input_Adapters/Interactive_Input_Adapter:
+
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h:
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h:
+
+        * RACE/Input_Adapters/LocationUpdater:
+
+        * 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:
+
+        * RACE/Input_Adapters/PlanGenerator:
+
+        * 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.cidl:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h:
+        * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp:
+        * 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:
+
+        * RACE/Output_Adapters:
+
+        * RACE/Output_Adapters/Base:
+
+        * RACE/Output_Adapters/Base/Output_Adapter.idl:
+        * RACE/Output_Adapters/Base/Output_Adapter.mpc:
+        * RACE/Output_Adapters/Base/Output_Adapter_stub_export.h:
+        * RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h:
+
+        * RACE/Output_Adapters/Component:
+
+        * RACE/Output_Adapters/Component/Output_Manager.idl:
+
+        * RACE/Output_Adapters/Interface:
+
+        * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc:
+        * RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h:
+        * RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h:
+        * RACE/Output_Adapters/Interface/PlanEgress.idl:
+
+        * RACE/Output_Adapters/XML_Output_Adapter:
+
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h:
+        * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h:
+
+        * RACE/Plan_Analyzer:
+
+        * RACE/Plan_Analyzer/Component:
+
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer.idl:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h:
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h:
+
+        * RACE/Plan_Analyzer/Interface:
+
+        * RACE/Plan_Analyzer/Interface/PlanIngress.idl:
+        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc:
+        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h:
+        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h:
+
+        * RACE/Planner_Manager:
+
+        * RACE/Planner_Manager/Component:
+
+        * RACE/Planner_Manager/Component/Planner_Manager.cidl:
+        * RACE/Planner_Manager/Component/Planner_Manager.idl:
+        * RACE/Planner_Manager/Component/Planner_Manager.mpc:
+        * RACE/Planner_Manager/Component/Planner_Manager_exec.h:
+        * RACE/Planner_Manager/Component/Planner_Manager_exec.cpp:
+        * RACE/Planner_Manager/Component/Planner_Manager_exec_export.h:
+        * RACE/Planner_Manager/Component/Planner_Manager_stub_export.h:
+        * RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h:
+
+        * RACE/Planner_Manager/Interface:
+
+        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl:
+        * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc:
+        * RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h:
+        * RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h:
+
+        * RACE/Planners:
+
+        * RACE/Planners/Base:
+
+        * RACE/Planners/Base/Planner.idl:
+        * RACE/Planners/Base/Planner.mpc:
+        * RACE/Planners/Base/Planner_stub_export.h:
+        * RACE/Planners/Base/Planner_svnt_export.h:
+
+        * RACE/Planners/Interface:
+
+        * RACE/Planners/Interface/Planner_I.idl:
+        * RACE/Planners/Interface/Planner_Interface.mpc:
+        * RACE/Planners/Interface/Planner_Interface_stub_export.h:
+        * RACE/Planners/Interface/Planner_Interface_svnt_export.h:
+
+        * RACE/Planners/SimpleBinPacker:
+
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h:
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h:
+
+        * RACE/common:
+
+        * RACE/common/RACE_common.idl:
+        * RACE/common/RACE_common.mpc:
+        * RACE/common/RACE_common_stub_export.h:
+        * RACE/common/RACE_common_svnt_export.h:
+
+        * RACE/descriptors:
+
+        * RACE/descriptors/Deployment.xsd:
+        * RACE/descriptors/Modified_Deployment.xsd:
+        * RACE/descriptors/XMI.xsd:
+        * RACE/descriptors/deployment.dat:
+        * RACE/descriptors/flattened_deploymentplan.cdp:
+
+          Removed these files. Removed the RACE implementation from the HEAD,
+          since this is obsolete. This module is now in the process of
+          re-structuring and will be checked in by Nishanth Shankaran.
+
+Mon Feb 12 12:53:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+Sat Feb 10 20:16:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/ResourceCommitmentManager.h:
+        * DAnCE/TargetManager/ResourceCommitmentManager.cpp:
+
+        * ciao/Deployment_ResourceCommitmentManager.idl:
+          Added missing Id tag
+
+Fri Feb  9 20:11:15 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * ChangeLog:
+
+        * DAnCE/NodeManager/MonitorCB.cpp:
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/ResourceCommitmentManager.h:
+        * DAnCE/TargetManager/ResourceCommitmentManager.cpp:
+        * DAnCE/TargetManager/TargetManager.mpc:
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
+
+        * ciao/CCM_Core.mpc:
+        * ciao/Deployment_ResourceCommitmentManager.idl:
+        * ciao/Deployment_TargetManager.idl:
+
+        Merged in changes from the branch TargetManager_Ext to introduce new
+        feature complying to the spec
+
+          Fri Feb  2 21:00:48 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager.mpc:
+          * DAnCE/TargetManager/TargetManagerImpl.idl:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          Cleaning TM code to separate CIAO-specific functionality.
+
+          Tue Jan 16 21:18:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManagerExt.idl:
+          * DAnCE/TargetManager/TargetManagerImpl.idl:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          Added some comments to decrease doxygen warnings;Changed
+          ACE_DEBUG in many places to ACE_ERROR;Removed a lot of unwanted
+          debug messages
+
+          Fri Jan 12 22:04:14 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
+
+          * ciao/Deployment_TargetManager.idl:
+          Changed to address Johnny's comments
+
+          Thu Dec 28 22:59:45 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Modified defination to ResourceCommitmentManager
+
+          Wed Dec 27 19:59:32 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager.mpc:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          * ciao/CCM_Core.mpc:
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Changes made to accomodate the ResourceCommitmentManager
+
+          Tue Dec  5 17:44:49 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * ciao/Deployment_TargetManager.idl:
+          Deleted some extraneous comments
+
+          Tue Dec  5 06:29:22 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+          * DAnCE/TargetManager/CmpClient.cpp:
+
+          * ciao/CCM_Core.mpc:
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Added in order to introduce ResourceCommitmenManager
+          to TargetManager
+
+Thu Feb  8 18:35:51 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/Literals.cpp:
+        * CIDLC/Literals.hpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+          Don't generate ACE_THROW_RETURN but just throw
+
+Wed Feb  7 23:48:51 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+
+          Removed an 'ex' identifier in a catch block that is
+          no longer referenced.
+
+Wed Feb  7 23:22:08 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Context_Impl_T.h:
+        * ciao/Upgradeable_Context_Impl_T.h:
+        * ciao/Context_Impl_T.cpp:
+        * ciao/Upgradeable_Context_Impl_T.cpp:
+
+          - Replaced a class template parameter in both
+            Context_Impl and Upgradeable_Context_Impl with
+            a trait in the class body. This change was
+            evidently overlooked when similar changes were
+            made to Servant_Impl and Home_Servant_Impl
+            pursuant to dropping support for Visual Studio 6.
+
+          - In Upgradeable_Context_Impl, removed class members
+            already present in the base class Context_Impl.
+
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          - Made changes to the generated context class corresponding
+            to the changes above.
+
+          - Added code generation to check for a nil event
+            consumer before a push call is made on it by
+            an emits port. The event consumer would be nil
+            if a connection had not yet been made. Thanks
+            to James Hill <hillj@isis.vanderbilt.edu> for
+            reporting the problem.
+
+Fri Feb  2 15:09:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Container_Base.cpp:
+        * ciao/Context_Impl_Base.cpp:
+        * ciao/Context_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_Base.cpp:
+        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Port_Activator_T.cpp:
+        * ciao/Servant_Activator.cpp:
+        * ciao/Servant_Impl_Base.cpp:
+        * ciao/Servant_Impl_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_Base.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * docs/templates/CIAO_Glue_Session_Template.cpp:
+        * docs/templates/CIAO_Glue_Session_Template.inl:
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp:
+          Replaced ACE_THROW_RETURN with throw
+
+Fri Feb  2 13:28:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
+        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
+        * examples/BasicSP/EC/client.cpp:
+        * performance-tests/Benchmark/RoundTripServer/server.cpp:
+        * performance-tests/Benchmark/server.cpp:
+        * performance-tests/Protocols/Controller/Controller.cpp:
+        * RACE/Input_Adapters/LocationUpdater/Injector.cpp:
+        * RACE/Input_Adapters/PlanGenerator/Injector.cpp:
+        * tests/IDL3/Events/Any/main.cpp:
+        * tools/Config_Handlers/Package_Handlers/test.cpp:
+        * tools/Config_Handlers/RT-CCM/test.cpp:
+        * tools/Config_Handlers/test.cpp:
+          No need anymore to pass an empty string as orbname
+
+Fri Feb  2 11:48:34 UTC 2007  Simon McQueen  <sm@prismtech.com>
+
+        * tests/IDL3/Components/SimpleComponent/SimpleComponent.idl:
+
+          Add regression testing for bug #2790.
+
+Wed Jan 31 15:44:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Plan_Generator/PCVisitor.cpp:
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+        * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
+        * RACE/Controller/Component/Controller_exec.cpp:
+        * RACE/Controller/Component/Controller_exec.h:
+
+Wed Jan 31 15:03:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/ExecutionManager/DAM_Map.{h,cpp}:
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.{h,cpp}:
+          Const changes, layout improvements
+
+Tue Jan 30 20:49:50 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+         * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+         * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp:
+
+           Compile fixes for FC6.
+
+Tue Jan 30 20:43:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
+          Changed the check for the bind, with -1 return an error, with
+          1 report a debug message of the reuse, else a normal debug.
+          Thanks to Sandro Andrade <sandro dot andrade at gmail dot com>
+          for reporting that ReDAC was broken.
+
+Tue Jan 30 11:27:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Server_init.{h,cpp}:
+          Change argument of BindObjectPath to a _ptr. Fixes bugzilla
+          2779. Thanks to Abdullah Sowayan <abdullah.sowayan@lmco.com>
+          for reporting this.
+
+Mon Jan 29 19:23:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}:
+        * ciao/Upgradeable_Context_Impl_T.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+          Layout changes
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
+          Fixed parsing of node manager file
+
+        * examples/BasicSP/descriptors/run_test.pl:
+          New script to run this example automatically
+
+        * exampls/BasicSP/README.html:
+          Fixed incorrect path and mpc generation command
+
 Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * CIAO version 0.5.6 released.
diff --git a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl b/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
index 35cf8afabdd..9398507a0ad 100644
--- a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl
+++ b/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
@@ -9,8 +9,8 @@
  * NodeApplication.
  */
 
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment_NodeApplication.idl"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/ciao/CIAO_ServerResources.idl b/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl
index de14402f835..75eb8880d07 100644
--- a/CIAO/ciao/CIAO_ServerResources.idl
+++ b/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl
@@ -151,11 +151,13 @@ module CIAO
     /**
      * @brief PolicyType supported by DAnCE extension.  Again, we are
      * redefining these value to avoid dependencies to various ORB
-     * modules such as RTCORBA.
+     * modules such as RTCORBA and DiffServ policy libraries.
      */
     const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
     const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
     const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
+    const CORBA::PolicyType CLIENT_NETWORK_PRIORITY_TYPE = 86;
+    const CORBA::PolicyType NETWORK_PRIORITY_TYPE = 87;
 
     enum PriorityModel
       {
@@ -163,6 +165,12 @@ module CIAO
         SERVER_DECLARED
       };
 
+    enum NWPriorityModel
+      {
+        CLIENT_PROPAGATED_NWPRIORITY,
+        SERVER_DECLARED_NWPRIORITY
+      };
+
     /**
      * @brief Defines data required for creating a PriorityModel Policy
      */
@@ -173,6 +181,25 @@ module CIAO
     };
 
     /**
+     * @brief Defines data required for creating a server side DiffServ policy
+     */
+    struct NWPriorityModelPolicyDef
+    {
+      NWPriorityModel nw_priority_model;
+      long request_dscp;
+      long reply_dscp;
+    };
+
+    /**
+     * @brief Defines data required for creating a client side DiffServ policy
+     */
+    struct CNWPriorityModelPolicyDef
+    {
+      long request_dscp;
+      long reply_dscp;
+    };
+
+    /**
      * @brief Define data required for creating a Threadpool policy
      */
     struct ThreadpoolPolicyDef
@@ -196,6 +223,8 @@ module CIAO
     case 40: PriorityModelPolicyDef PriorityModelDef;
     case 41: ThreadpoolPolicyDef    ThreadpoolDef;
     case 45: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef;
+    case 86: CNWPriorityModelPolicyDef CNWPriorityModelDef;
+    case 87: NWPriorityModelPolicyDef NWPriorityModelDef;
     };
 
     /**
diff --git a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
new file mode 100644
index 00000000000..7c45fd1c175
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
@@ -0,0 +1,120 @@
+// -*- MPC -*-
+// $Id$
+
+
+// Valuetype library must be linked for this project.
+// Please don't remove.
+project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc {
+  sharedname   =  CIAO_Deployment_stub
+
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
+  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
+
+  dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
+
+  IDL_Files {
+    idlflags += -SS -Sci
+    Deployment_Packaging_Data.idl
+    Deployment_PlanError.idl
+  }
+
+  IDL_Files {
+    idlflags += -SS
+    Deployment_Base.idl
+    Deployment_Connection.idl
+    Deployment_Data.idl
+    Deployment_DeploymentPlan.idl
+    Deployment_TargetData.idl
+    Deployment_Events.idl
+    CIAO_ServerResources.idl
+  }
+
+  IDL_Files {
+    Deployment_ResourceCommitmentManager.idl
+    Deployment_TargetManager.idl
+    CIAO_NodeApplication_CallBack.idl
+    Deployment_Core.idl
+    Deployment_NodeApplication.idl
+    Deployment_Application.idl
+    Deployment_Container.idl
+    Deployment.idl
+    Deployment_NodeManager.idl
+    Deployment_ApplicationManager.idl
+    Deployment_NodeApplicationManager.idl
+    Deployment_DomainApplicationManager.idl
+    Deployment_DomainApplication.idl
+    Deployment_ExecutionManager.idl
+    Deployment_RepositoryManager.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_PlanErrorC.cpp
+    DeploymentC.cpp
+    Deployment_TargetManagerC.cpp
+    Deployment_NodeManagerC.cpp
+    Deployment_NodeApplicationManagerC.cpp
+    Deployment_ApplicationManagerC.cpp
+    Deployment_DomainApplicationManagerC.cpp
+    Deployment_DomainApplicationC.cpp
+    Deployment_ExecutionManagerC.cpp
+    Deployment_RepositoryManagerC.cpp
+    Deployment_ResourceCommitmentManagerC.cpp
+    CIAO_NodeApplication_CallBackC.cpp
+    CIAO_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 {
+  sharedname   =  CIAO_Deployment_svnt
+  dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
+  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
+
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Deployment_CoreS.cpp
+    Deployment_ApplicationS.cpp
+    Deployment_NodeApplicationS.cpp
+    Deployment_ContainerS.cpp
+    DeploymentS.cpp
+    Deployment_RepositoryManagerS.cpp
+    Deployment_NodeManagerS.cpp
+    Deployment_NodeApplicationManagerS.cpp
+    Deployment_ApplicationManagerS.cpp
+    Deployment_DomainApplicationManagerS.cpp
+    Deployment_DomainApplicationS.cpp
+    Deployment_ExecutionManagerS.cpp
+    NodeApp_CB_Impl.cpp
+    Deployment_TargetManagerS.cpp
+    CIAO_NodeApplication_CallBackS.cpp
+    Deployment_ResourceCommitmentManagerS.cpp
+  }
+
+}
+
diff --git a/CIAO/ciao/Deployment.idl b/CIAO/DAnCE/Deployment/Deployment.idl
index 793c44fc853..ee3ea4df782 100644
--- a/CIAO/ciao/Deployment.idl
+++ b/CIAO/DAnCE/Deployment/Deployment.idl
@@ -3,8 +3,8 @@
 #ifndef DEPLOYMENT_IDL
 #define DEPLOYMENT_IDL
 
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment_Target_Data.idl"
+#include "DAnCE/Deployment/Deployment_Packaging_Data.idl"
+#include "DAnCE/Deployment/Deployment_PlanError.idl"
 
 module Deployment {
 
@@ -12,7 +12,23 @@ module Deployment {
     string name;
     string reason;
   };
-
+  
+  // @@added
+  exception InvalidNodeExecParameter {
+    string name;
+    string reason;
+  };
+  
+  // @@added
+  exception InvalidComponentExecParameter {
+    string name;
+    string reason;
+  };
+  
+  // @@added
+  exception LastConfiguration {
+  };
+  
   exception NoSuchName {
   };
 
diff --git a/CIAO/ciao/Deployment_Application.idl b/CIAO/DAnCE/Deployment/Deployment_Application.idl
index df03887cf7d..e045d0ca849 100644
--- a/CIAO/ciao/Deployment_Application.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Application.idl
@@ -3,7 +3,7 @@
 #if !defined (DEPLOYMENT_APPLICATION_IDL)
 #define DEPLOYMENT_APPLICATION_IDL
 
-#include "ciao/Deployment_Connection.idl"
+#include "DAnCE/Deployment/Deployment_Connection.idl"
 
 module Deployment
 {
@@ -21,6 +21,11 @@ module Deployment
 
   interface Application
   {
+    // @@changed
+    //     void finishLaunch (in Connections providedReference,
+    //                        in boolean start)
+    //       raises (StartError, InvalidConnection);
+    
     void finishLaunch (in Connections providedReference,
                        in boolean start,
                        in boolean is_ReDAC)
diff --git a/CIAO/ciao/Deployment_ApplicationManager.idl b/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl
index 98fe247f2f9..c7f5a1957d1 100644
--- a/CIAO/ciao/Deployment_ApplicationManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl
@@ -2,8 +2,8 @@
 #ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL
 #define DEPLOYMENT_APPLICATIONMANAGER_IDL
 
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment.idl"
+#include "DAnCE/Deployment/Deployment_Core.idl"
+#include "DAnCE/Deployment/Deployment.idl"
 
 module Deployment {
   exception ResourceNotAvailable {
@@ -16,10 +16,12 @@ module Deployment {
 
   interface ApplicationManager {
     /// @todo Spec mentions another few exceptions in the raises cluase
+    // @@changed
     Application startLaunch (in Properties configProperty,
                              out Connections providedReference,
                              in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
+      raises (ResourceNotAvailable, StartError, InvalidProperty,
+              InvalidNodeExecParameter, InvalidComponentExecParameter);
     void destroyApplication (in Application app)
       raises (StopError);
   };
diff --git a/CIAO/ciao/Deployment_Base.idl b/CIAO/DAnCE/Deployment/Deployment_Base.idl
index cb98f5d05b6..0ae4a2748f6 100644
--- a/CIAO/ciao/Deployment_Base.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Base.idl
@@ -11,12 +11,14 @@ module Deployment {
     any value;
   };
   typedef sequence < Property > Properties;
-
+  
+  // @@changed element order
   struct Requirement {
-    string resourceType;
     string name;
+    string resourceType;
     Properties property;
   };
+
   typedef sequence < Requirement > Requirements;
 
   enum SatisfierPropertyKind {
diff --git a/CIAO/ciao/Deployment_Connection.idl b/CIAO/DAnCE/Deployment/Deployment_Connection.idl
index 769c331a748..0d6ac886ef1 100644
--- a/CIAO/ciao/Deployment_Connection.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Connection.idl
@@ -3,7 +3,7 @@
 #if !defined (DEPLOYMENT_CONNECTION_IDL)
 #define DEPLOYMENT_CONNECTION_IDL
 
-#include "ciao/Deployment_DeploymentPlan.idl"
+#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
 #include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 
 // *************** Packaging and Deployment ***************
@@ -11,7 +11,14 @@ module Deployment
 {
   typedef sequence < Object > Endpoints;
   //typedef Object Endpoint;
-
+  
+  // @@changed
+  // struct Connection
+  //   {
+  //     string name;
+  //     Endpoints 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
diff --git a/CIAO/ciao/Deployment_Container.idl b/CIAO/DAnCE/Deployment/Deployment_Container.idl
index 55ac0c7dfdd..3e35cbae5b3 100644
--- a/CIAO/ciao/Deployment_Container.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Container.idl
@@ -3,8 +3,8 @@
 #if !defined (DEPLOYMENT_CONTAINER_IDL)
 #define DEPLOYMENT_CONTAINER_IDL
 
-#include "ciao/Deployment_Application.idl"
-#include "ciao/Deployment_Core.idl"
+#include "DAnCE/Deployment/Deployment_Application.idl"
+#include "DAnCE/Deployment/Deployment_Core.idl"
 
 // *************** Packaging and Deployment ***************
 module Deployment
diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/DAnCE/Deployment/Deployment_Core.idl
index fbaa5ea18c6..d6c32e010a9 100644
--- a/CIAO/ciao/Deployment_Core.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Core.idl
@@ -4,9 +4,9 @@
 #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 "DAnCE/Deployment/Deployment_TargetData.idl"
+#include "DAnCE/Deployment/Deployment_Data.idl"
+#include "DAnCE/Deployment/Deployment_Application.idl"
 
 // *************** Packaging and Deployment ***************
 module Deployment
diff --git a/CIAO/ciao/Deployment_Data.idl b/CIAO/DAnCE/Deployment/Deployment_Data.idl
index 0c296a815ba..b452ebe3ad4 100644
--- a/CIAO/ciao/Deployment_Data.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Data.idl
@@ -3,13 +3,17 @@
 #ifndef DEPLOYMENT_DATA_IDL
 #define DEPLOYMENT_DATA_IDL
 
-#include "ciao/Deployment_DeploymentPlan.idl"
+#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
 
 module Deployment {
 
   struct ComponentPackageReference {
     string requiredUUID;
     string requiredName;
+
+    // @@changed
+    //ComponentInterfaceDescription requiredType;
+
     string requiredType;
   };
 
@@ -21,8 +25,9 @@ module Deployment {
     ResourceUsageKinds resourceUsage;
     string resourcePort;
     string componentPort;
-    string resourceType;
+    // @@ changed: order of name and resourceType
     string name;
+    string resourceType;
     Properties property;
   };
 
diff --git a/CIAO/ciao/Deployment_DeploymentPlan.idl b/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl
index e8dbde8ae2b..248a61b75d2 100644
--- a/CIAO/ciao/Deployment_DeploymentPlan.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
 #define DEPLOYMENT_DEPLOYMENTPLAN_IDL
 
-#include "ciao/Deployment_Base.idl"
+#include "DAnCE/Deployment/Deployment_Base.idl"
 #include "tao/StringSeq.pidl"
 #include "tao/ULongSeq.pidl"
 #include "tao/Typecode_types.pidl"
@@ -56,7 +56,14 @@ module Deployment {
     string name;
     ::CORBA::StringSeq source;
     ::CORBA::ULongSeq artifactRef;
+    // @@changed 
+    // Properties nodeExecParameter;
     Properties execParameter;
+    
+    // @@added
+    // Properties componentExecParameter;
+    
+    // @@delete:
     Requirements deployRequirement;
   };
 
@@ -72,6 +79,11 @@ module Deployment {
 
   struct InstanceResourceDeploymentDescription {
     ResourceUsageKind resourceUsage;
+    // @@added
+    //string resourcePort;
+    // @@added
+    //string componentPort;
+    
     string requirementName;
     string resourceName;
     Properties property;
@@ -108,6 +120,12 @@ module Deployment {
 
   struct ExternalReferenceEndpoint {
     string location;
+    // @@added
+    // boolean provider;
+    // @@added
+    // string portName;
+    // @@added
+    // ::CORBA::StringSeq supportedType;
   };
 
   typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
@@ -169,12 +187,28 @@ module Deployment {
     string node;
     ::CORBA::StringSeq source;
     Properties execParameter;
+
+    // @@delete:
     Requirements deployRequirement;
+
     ResourceDeploymentDescriptions deployedResource;
   };
 
   typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
-
+  
+  // @@added
+  enum PlanLocalityKind {
+    PlanSameProcess,
+    PlanDifferentProcess,
+    PlanNoConstraint
+  };
+  
+  // @@added
+  struct PlanLocality {
+    PlanLocalityKind constraint;
+    ::CORBA::ULongSeq constrainedInstanceRef;
+  };
+  
   struct DeploymentPlan {
     string label;
     string UUID;
@@ -182,10 +216,12 @@ module Deployment {
     MonolithicDeploymentDescriptions implementation;
     InstanceDeploymentDescriptions instance;
     PlanConnectionDescriptions connection;
-            PlanPropertyMappings externalProperty;
+    PlanPropertyMappings externalProperty;
     ImplementationDependencies dependsOn;
     ArtifactDeploymentDescriptions artifact;
     Properties infoProperty;
+    // @added
+    // PlanLocalities localityConstraint;
   };
 };
 
diff --git a/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl b/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl
new file mode 100644
index 00000000000..7781907bafe
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl
@@ -0,0 +1,19 @@
+// $Id$
+
+#ifndef DEPLOYMENT_DOMAINAPPLICATION_IDL
+#define DEPLOYMENT_DOMAINAPPLICATION_IDL
+
+#include "Deployment_Application.idl"
+#include "Deployment_Core.idl"
+
+module Deployment
+{
+  // @@added
+  interface DomainApplication : 
+    Application
+  {
+  };
+};
+
+
+#endif
diff --git a/CIAO/ciao/Deployment_DomainApplicationManager.idl b/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl
index 65b7523959e..9e0ab0eab52 100644
--- a/CIAO/ciao/Deployment_DomainApplicationManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl
@@ -2,11 +2,19 @@
 #ifndef DOMAINAPPLICATIONMANAGER_IDL
 #define DOMAINAPPLICATIONMANAGER_IDL
 
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_ApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment.idl"
+#include "DAnCE/Deployment/Deployment_NodeApplication.idl"
+#include "DAnCE/Deployment/Deployment_ApplicationManager.idl"
 
 module Deployment {
+  // @@changed
+  // interface DomainApplicationManager :
+  //     ApplicationManager
+  //   {
+  //     Applications getApplications ();
+  //     DeploymentPlan getPlan ();
+  //   };
+  
   /// CIAO 's DomainApplicationManager interface differs spec-defined interface
   /// in the same that it also integrates the spec-defined interface for
   /// DomainApplication into itself
diff --git a/CIAO/ciao/Deployment_Events.idl b/CIAO/DAnCE/Deployment/Deployment_Events.idl
index b0559dfe164..b0559dfe164 100644
--- a/CIAO/ciao/Deployment_Events.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Events.idl
diff --git a/CIAO/ciao/Deployment_ExecutionManager.idl b/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl
index 39c2ba6053b..070b6a99100 100644
--- a/CIAO/ciao/Deployment_ExecutionManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl
@@ -2,10 +2,21 @@
 #ifndef EXECUTIONMANAGER_IDL
 #define EXECUTIONMANAGER_IDL
 
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_DomainApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment.idl"
+#include "DAnCE/Deployment/Deployment_DomainApplicationManager.idl"
 
 module Deployment {
+  // @@changed
+  //   interface ExecutionManager
+  //   {
+  //     DomainApplicationManager preparePlan (in DeploymentPlan plan,
+  //                                           in ResourceCommitmentManager resourceCommitment)
+  //       raises (ResourceNotAvailable, PlanError, StartError);
+  //     DomainApplicationManagers getManagers ();
+  //     void destroyManager (in DomainApplicationManager manager)
+  //       raises (StopError);
+  //   };
+  
   interface ExecutionManager {
     /// @todo ResourceCommitmentManger is missing
     DomainApplicationManager preparePlan (in DeploymentPlan plan,
diff --git a/CIAO/ciao/Deployment_NodeApplication.idl b/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl
index 7c0a0db93b7..f80dda55369 100644
--- a/CIAO/ciao/Deployment_NodeApplication.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl
@@ -34,7 +34,12 @@ module Deployment
 
   /// CIAO specific extension
   typedef sequence<ESInstallationInfo> ESInstallationInfos;
-
+  
+  // @@changed
+  //interface NodeApplication : Application
+  //{  
+  //};
+  
   interface NodeApplication : Application
   {
     /// CIAO specific extensions
diff --git a/CIAO/ciao/Deployment_NodeApplicationManager.idl b/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl
index 32f3f0d21f9..9fc2aa09581 100644
--- a/CIAO/ciao/Deployment_NodeApplicationManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl
@@ -21,7 +21,12 @@ module Deployment {
     long msec_;
   };
 
-
+  // @@changed:
+  // interface NodeApplicationManager :
+  //     ApplicationManager
+  //   {
+  //   };
+  
   interface NodeApplicationManager :
     ApplicationManager
   {
diff --git a/CIAO/ciao/Deployment_NodeManager.idl b/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl
index e6672764115..7c15dff0598 100644
--- a/CIAO/ciao/Deployment_NodeManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl
@@ -2,9 +2,9 @@
 #ifndef NODEMANAGER_IDL
 #define NODEMANAGER_IDL
 
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment_TargetManager.idl"
+#include "DAnCE/Deployment/Deployment.idl"
+#include "DAnCE/Deployment/Deployment_Core.idl"
+#include "DAnCE/Deployment/Deployment_TargetManager.idl"
 
 module Deployment {
 
@@ -12,7 +12,20 @@ module Deployment {
   };
 
   interface NodeApplicationManager;
-
+  
+  //@@changed
+//   interface NodeManager {
+//     void joinDomain (in Domain theDomain, in TargetManager manager, in
+//                      Logger log, in long updateInterval);
+//     void leaveDomain ();
+//     NodeApplicationManager preparePlan (in DeploymentPlan plan, in
+//                                         ResourceCommitmentManager resourceCommitment)
+//       raises (StartError, PlanError);
+//     void destroyManager (in NodeApplicationManager appManager)
+//       raises (StopError);
+//     Resources getDynamicResources ();
+//   };
+  
   interface NodeManager {
     /*
      * @todo 06-02-01 mentions a 4th argument:in long updateInterval
diff --git a/CIAO/ciao/Deployment_Packaging_Data.idl b/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl
index ed3d0feecb2..99619f4699c 100644
--- a/CIAO/ciao/Deployment_Packaging_Data.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl
@@ -3,7 +3,7 @@
 #ifndef PACKAGING_DATA_IDL
 #define PACKAGING_DATA_IDL
 
-#include "ciao/Deployment_Data.idl"
+#include "DAnCE/Deployment/Deployment_Data.idl"
 
 module Deployment
 {
@@ -35,11 +35,9 @@ module Deployment
 
   typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
 
-#ifndef AVOID_IFR_CRASH
   struct NamedImplementationArtifact;
 
   typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
-#endif /* AVOID_IFR_CRASH */
 
   struct ImplementationArtifactDescription {
     string label;
@@ -47,9 +45,7 @@ module Deployment
     ::CORBA::StringSeq location;
     Properties execParameter;
     Requirements deployRequirement;
-#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts dependsOn;
-#endif /* AVOID_IFR_CRASH */
     Properties infoProperty;
   };
 
@@ -57,19 +53,17 @@ module Deployment
     string name;
     ImplementationArtifactDescription referencedArtifact;
   };
-
+  
+  // @@changed: order of members
   struct MonolithicImplementationDescription {
     Properties nodeExecParameter;
-    Properties componentExecParameter;
-#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts primaryArtifact;
-#endif /* AVOID_IFR_CRASH */
     ImplementationRequirements deployRequirement;
+    Properties componentExecParameter;
   };
 
   typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
 
-#ifndef AVOID_IFR_CRASH
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
@@ -77,14 +71,11 @@ module Deployment
   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;
@@ -102,11 +93,29 @@ module Deployment
   };
 
   typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
+  
+  // @@added
+  enum LocalityKind {
+    SameNodeAnyProcess,
+    SameNodeSameProcess,
+    SameNodeDifferentProcess,
+    DifferentNode,
+    DifferentProcess,
+    NoConstraint
+  };
+  
+  // @@added
+  struct Locality {
+    LocalityKind constraint;
+    ::CORBA::ULongSeq constrainedInstanceRef; 
+  };
+    
   struct ComponentAssemblyDescription {
     SubcomponentInstantiationDescriptions instance;
     AssemblyConnectionDescriptions connection;
     AssemblyPropertyMappings externalProperty;
+    // @@added
+    // Localities localityConstraint;
   };
 
   typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
@@ -145,13 +154,15 @@ module Deployment
   struct PackageConfiguration {
     string label;
     string UUID;
-#ifndef AVOID_IFR_CRASH
-    PackageConfigurations specializedConfig;
     ComponentPackageDescriptions basePackage;
-#endif /* AVOID_IFR_CRASH */
-    ComponentPackageReferences reference;
+    PackageConfigurations specializedConfig;
     Requirements selectRequirement;
     Properties configProperty;
+    ComponentPackageReferences reference;
+    // @@changed, delete previous
+    //ComponentPackageReferences referencedPackage;
+    // @@add
+    ComponentPackageImports importedPackage;
   };
 
 
diff --git a/CIAO/DAnCE/Deployment/Deployment_PlanError.idl b/CIAO/DAnCE/Deployment/Deployment_PlanError.idl
new file mode 100644
index 00000000000..2816db930dd
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_PlanError.idl
@@ -0,0 +1,14 @@
+// $Id$
+
+#ifndef DEPLOYMENT_PLANERROR_IDL
+#define DEPLOYMENT_PLANERROR_IDL
+
+module Deployment {
+
+  exception PlanError {
+    string name;
+    string reason;
+  };
+};
+
+#endif /* DEPLOYMENT_PLANERROR_IDL */
diff --git a/CIAO/ciao/Deployment_RepositoryManager.idl b/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl
index 539d2954416..d9201af0702 100644
--- a/CIAO/ciao/Deployment_RepositoryManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl
@@ -2,8 +2,8 @@
 #ifndef REPOSITORY_MANAGER_IDL
 #define REPOSITORY_MANAGER_IDL
 
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment.idl"
+#include "DAnCE/Deployment/Deployment_Packaging_Data.idl"
+#include "DAnCE/Deployment/Deployment.idl"
 
 module Deployment {
 
diff --git a/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl b/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
new file mode 100644
index 00000000000..8c1e9c29776
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
@@ -0,0 +1,41 @@
+// $Id$
+//
+#ifndef RESOURCE_COMMITMENT_MANAGER_IDL
+#define RESOURCE_COMMITMENT_MANAGER_IDL
+
+#include "DAnCE/Deployment/Deployment_Base.idl"
+#include "tao/AnyTypeCode/AnySeq.pidl"
+
+module Deployment {
+
+  exception ResourceCommitmentFailure {
+    string reason;
+    long index;
+    string propertyName;
+    ::CORBA::AnySeq propertyValue;
+  };
+  /**
+   * @struct ResourceAllocation
+   * @brief Identifies a resource within a domain that is 
+   *  allocated from and the amount it is allocated
+   */
+  struct ResourceAllocation
+  {
+    string elementName;
+    string resourceName;
+    Properties property;
+  };
+
+  /// The Resource Allocation Sequence
+  typedef sequence <ResourceAllocation> ResourceAllocations;
+
+  interface ResourceCommitmentManager {
+    void commitResources (in ResourceAllocations resources)
+      raises (ResourceCommitmentFailure);
+    void releaseResources (in ResourceAllocations resources)
+      raises (ResourceCommitmentFailure);
+  };
+};
+
+
+#endif
diff --git a/CIAO/ciao/Deployment_TargetData.idl b/CIAO/DAnCE/Deployment/Deployment_TargetData.idl
index 82cff14ca83..877600f93bf 100644
--- a/CIAO/ciao/Deployment_TargetData.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_TargetData.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_TARGETDATA_IDL
 #define DEPLOYMENT_TARGETDATA_IDL
 
-#include "ciao/Deployment_Base.idl"
+#include "DAnCE/Deployment/Deployment_Base.idl"
 #include "tao/StringSeq.pidl"
 #include "tao/ULongSeq.pidl"
 
@@ -14,6 +14,7 @@ module Deployment {
     ::CORBA::StringSeq resourceType;
     SatisfierProperties property;
   };
+
   typedef sequence < Resource > Resources;
 
   struct SharedResource {
diff --git a/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl b/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
new file mode 100644
index 00000000000..91a9c849099
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
@@ -0,0 +1,45 @@
+// $Id$
+
+#ifndef TARGETMANAGER_IDL
+#define TARGETMANAGER_IDL
+
+#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "DAnCE/Deployment/Deployment_TargetData.idl"
+#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
+// Only needed for ResourceNotAvailable but that should go, so this include also
+#include "DAnCE/Deployment/Deployment_ApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl"
+
+module Deployment {
+
+  /// @todo, UpdateAvailable is not in the spec, must be UpdateDynamic
+  enum DomainUpdateKind {
+    Add,
+    Delete,
+    UpdateAll,
+    // @@changed
+    UpdateDynamic
+  };
+  
+  interface TargetManager {
+    Domain getAllResources ();
+    Domain getAvailableResources ();
+
+    // @@changed
+    ResourceCommitmentManager createResourceCommitment (in ResourceAllocations resources)
+      raises (ResourceCommitmentFailure);
+    
+    // @@added
+    void destroyResourceCommitment (in ResourceCommitmentManager manager);
+
+    /// @todo This is not part of 06-04-01
+    // @@delete:
+    //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_common.h b/CIAO/DAnCE/Deployment/Deployment_common.h
index 725b6afd953..725b6afd953 100644
--- a/CIAO/ciao/Deployment_common.h
+++ b/CIAO/DAnCE/Deployment/Deployment_common.h
diff --git a/CIAO/ciao/Deployment_stub_export.h b/CIAO/DAnCE/Deployment/Deployment_stub_export.h
index 12985a68b5b..12985a68b5b 100644
--- a/CIAO/ciao/Deployment_stub_export.h
+++ b/CIAO/DAnCE/Deployment/Deployment_stub_export.h
diff --git a/CIAO/ciao/Deployment_svnt_export.h b/CIAO/DAnCE/Deployment/Deployment_svnt_export.h
index e403dbf0c41..e403dbf0c41 100644
--- a/CIAO/ciao/Deployment_svnt_export.h
+++ b/CIAO/DAnCE/Deployment/Deployment_svnt_export.h
diff --git a/CIAO/ciao/NodeApp_CB_Impl.cpp b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp
index c87e80f9333..d3817d4b4c4 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.cpp
+++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp
@@ -6,7 +6,6 @@ NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
                                 PortableServer::POA_ptr p,
                                 Deployment::NodeApplicationManager_ptr s,
                                 const Deployment::Properties &properties)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   : orb_ (CORBA::ORB::_duplicate (o)),
     poa_ (PortableServer::POA::_duplicate (p)),
     nam_ (Deployment::NodeApplicationManager::_duplicate (s))
@@ -42,7 +41,6 @@ Deployment::NodeApplicationManager_ptr
 CIAO::NodeApplication_Callback_Impl::register_node_application (
     Deployment::NodeApplication_ptr na,
     Deployment::Properties_out properties)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   properties = this->properties_._retn ();
 
diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h
index bd5c5fd7711..6b4bd0e2a30 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h
@@ -41,8 +41,7 @@ namespace CIAO
     NodeApplication_Callback_Impl (CORBA::ORB_ptr o,
                                    PortableServer::POA_ptr p,
                                    Deployment::NodeApplicationManager_ptr s,
-                                   const Deployment::Properties &properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                   const Deployment::Properties &properties);
 
     /// Get the containing POA.  This operation does *not* increase
     /// the reference count of the POA.
@@ -53,8 +52,7 @@ namespace CIAO
     /// NodeApplicationManager
     Deployment::NodeApplicationManager_ptr
     register_node_application (Deployment::NodeApplication_ptr na,
-                               Deployment::Properties_out properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                               Deployment::Properties_out properties);
 
     Deployment::NodeApplication_ptr get_nodeapp_ref (void);
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index fba4b35cef2..f4d93d3e33d 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -45,7 +45,7 @@ CIAO::Deployment_Configuration::init (const char *filename)
   char* string = 0;
 
   // Read from the file line by line
-  while ((string = reader.read ('\n', '\0')) != 0)
+  while ((string = reader.read ('\n')) != 0)
     {
       // Search from the right to the first space
       const char* ior_start = ACE_OS::strrchr (string, ' ');
@@ -54,8 +54,10 @@ CIAO::Deployment_Configuration::init (const char *filename)
       // 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_CString ior (ior_start + 1,  ACE_OS::strlen (ior_start + 1));
+      int const result =
+        this->deployment_info_.bind (destination.c_str (), ior.c_str ());
+      if (result == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "DAnCE (%P|%t) Deployment_Configuration, "
@@ -63,12 +65,24 @@ CIAO::Deployment_Configuration::init (const char *filename)
                              destination.c_str ()),
                              -1);
         }
-
-      if (CIAO::debug_level () > 5)
+      else if (result == 1)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "DAnCE (%P|%t) Deployment_Configuration, "
-                      "read <%s> <%s>\n", destination.c_str (), ior.c_str ()));
+          if (CIAO::debug_level () > 5)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) Deployment_Configuration.cpp, "
+                          "reuse existing node in the cached map: <%s>\n" ,
+                          destination.c_str ()));
+            }
+        }
+      else
+       {
+         if (CIAO::debug_level () > 5)
+           {
+             ACE_DEBUG ((LM_DEBUG,
+                         "DAnCE (%P|%t) Deployment_Configuration, "
+                         "bind <%s> <%s>\n", destination.c_str (), ior.c_str ()));
+           }
         }
 
       if (first)
@@ -88,11 +102,9 @@ CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const
     return this->get_default_node_manager_ior ();
 
   ACE_Hash_Map_Entry
-    <ACE_CString,
-    CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
+    <ACE_CString, CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
 
-  if (this->deployment_info_.find (ACE_CString (name),
-                                   entry) != 0)
+  if (this->deployment_info_.find (ACE_CString (name), entry) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "DAnCE (%P|%t) Deployment_Configuration, "
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index af17d4357ed..cd6d13b9f0c 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_NodeManagerC.h"
+#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "ace/SString.h"
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 74a6177e5a8..7a7a082eb25 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 "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
@@ -19,7 +19,6 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
                                Execution_Manager::Execution_Manager_Impl * em,
                                const Deployment::DeploymentPlan & plan,
                                const char * deployment_file)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     execution_manager_ (em), // a plain C++ pointer
@@ -74,16 +73,12 @@ CIAO::DomainApplicationManager_Impl::~DomainApplicationManager_Impl ()
 }
 
 Deployment::NodeApplication_ptr
-CIAO::DomainApplicationManager_Impl::
-get_node_app (const char * node_name)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::NoSuchName))
+CIAO::DomainApplicationManager_Impl::get_node_app (const char * node_name)
 {
   // Get the NodeApplication object reference.
   ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
 
-  if (this->artifact_map_.find (node_name,
-                                entry) != 0)
+  if (this->artifact_map_.find (node_name, entry) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
@@ -100,12 +95,7 @@ get_node_app (const char * node_name)
 }
 
 void
-CIAO::DomainApplicationManager_Impl::
-init ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::PlanError))
+CIAO::DomainApplicationManager_Impl::init ()
 {
   try
     {
@@ -221,8 +211,7 @@ init ()
 }
 
 bool
-CIAO::DomainApplicationManager_Impl::
-get_plan_info (void)
+CIAO::DomainApplicationManager_Impl::get_plan_info (void)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_plan_info");
 
@@ -317,8 +306,7 @@ get_plan_info (void)
 //@@ We should ask those spec writers to look at the code below, hopefully
 //   They will realize some thing.
 int
-CIAO::DomainApplicationManager_Impl::
-split_plan (void)
+CIAO::DomainApplicationManager_Impl::split_plan (void)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::split_plan");
 
@@ -499,10 +487,6 @@ void
 CIAO::DomainApplicationManager_Impl::
 startLaunch (const ::Deployment::Properties & configProperty,
              ::CORBA::Boolean start)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::ResourceNotAvailable,
-                   ::Deployment::StartError,
-                   ::Deployment::InvalidProperty))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::startLaunch");
   ACE_UNUSED_ARG (start);
@@ -643,10 +627,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
 
 void
-CIAO::DomainApplicationManager_Impl::
-install_all_es (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
+CIAO::DomainApplicationManager_Impl::install_all_es (void)
 {
   try
     {
@@ -699,8 +680,6 @@ void
 CIAO::DomainApplicationManager_Impl::
 add_es_to_map (const char * node_name,
                CIAO::CIAO_Event_Service * ciao_es)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   try
     {
@@ -721,8 +700,6 @@ void
 CIAO::DomainApplicationManager_Impl::
 finishLaunch (CORBA::Boolean start,
               CORBA::Boolean is_ReDaC)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::finishLaunch");
   try
@@ -738,7 +715,7 @@ finishLaunch (CORBA::Boolean start,
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeApplication object reference.
-          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry;
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry = 0;
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
@@ -940,8 +917,6 @@ finishLaunch (CORBA::Boolean start,
 void
 CIAO::DomainApplicationManager_Impl::
 post_finishLaunch (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   try
     {
@@ -1144,7 +1119,6 @@ get_outgoing_connections_i (const char * instname,
                             Deployment::Connections & retv,
                             bool is_getting_all_connections,
                             bool is_search_new_plan)
-  ACE_THROW_SPEC ((Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i");
 
@@ -1185,7 +1159,6 @@ populate_connection_for_binding (
      const Deployment::PlanConnectionDescription & binding,
      const Deployment::DeploymentPlan & plan,
      Deployment::Connections & retv)
-  ACE_THROW_SPEC ((Deployment::StartError))
 {
   const CORBA::ULong binding_len = binding.internalEndpoint.length ();
 
@@ -1216,7 +1189,6 @@ handle_es_connection (
      const Deployment::PlanConnectionDescription & binding,
      const Deployment::DeploymentPlan & plan,
      Deployment::Connections & retv)
-  ACE_THROW_SPEC ((Deployment::StartError))
 {
   // The initial retv might have something inside
   CORBA::ULong len = retv.length ();
@@ -1267,10 +1239,9 @@ handle_es_connection (
       error += instname;
       error += ": unable to find object reference for connection ";
       error += binding.name.in ();
-      ACE_THROW_RETURN (Deployment::StartError
-        ("DomainApplicationManager_Impl::create_connections_i",
-                      error.c_str ()),
-                      false);
+      throw Deployment::StartError(
+        "DomainApplicationManager_Impl::create_connections_i",
+        error.c_str ());
     }
 
   retv[len].event_service = es._retn ();
@@ -1306,10 +1277,9 @@ handle_es_connection (
           error += instname;
           error += ": unable to find object reference for connection ";
           error += binding.name.in ();
-          ACE_THROW_RETURN (Deployment::StartError
-            ("DomainApplicationManager_Impl::handle_es_connection",
-                          error.c_str ()),
-                          false);
+          throw Deployment::StartError(
+            "DomainApplicationManager_Impl::handle_es_connection",
+            error.c_str ());
         }
     }
 
@@ -1323,7 +1293,6 @@ handle_direct_connection (
      const Deployment::PlanConnectionDescription & binding,
      const Deployment::DeploymentPlan & plan,
      Deployment::Connections & retv)
-  ACE_THROW_SPEC ((Deployment::StartError))
 {
   // The initial retv might have something inside
   CORBA::ULong len = retv.length ();
@@ -1397,10 +1366,9 @@ handle_direct_connection (
               error += instname;
               error += ": unable to find object reference for connection ";
               error += binding.name.in ();
-              ACE_THROW_RETURN (Deployment::StartError
-                ("DomainApplicationManager_Impl::create_connections_i",
-                              error.c_str ()),
-                              false);
+              throw Deployment::StartError(
+                "DomainApplicationManager_Impl::create_connections_i",
+                error.c_str ());
             }
           break;
         }
@@ -1411,8 +1379,6 @@ handle_direct_connection (
 void
 CIAO::DomainApplicationManager_Impl::
 start ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::start");
 
@@ -1519,8 +1485,6 @@ start ()
 void
 CIAO::DomainApplicationManager_Impl::
 destroyApplication ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::StopError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication");
   try
@@ -1651,8 +1615,6 @@ destroyApplication ()
 void
 CIAO::DomainApplicationManager_Impl::
 destroyManager ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyManager");
   try
@@ -1690,13 +1652,6 @@ void
 CIAO::DomainApplicationManager_Impl::
 perform_redeployment (
   const Deployment::DeploymentPlan & plan)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                    Deployment::PlanError,
-                    Deployment::InstallationFailure,
-                    Deployment::UnknownImplId,
-                    Deployment::ImplEntryPointNotFound,
-                    Deployment::InvalidConnection,
-                    ::Components::RemoveFailure))
 {
   // Currently we could dynamically update the NodeManagerMap topology,
   // but later maybe we could add another parameter to this operation,
@@ -1748,7 +1703,6 @@ perform_redeployment (
 ::Deployment::DeploymentPlan *
 CIAO::DomainApplicationManager_Impl::
 getPlan ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::getPlan");
   Deployment::DeploymentPlan_var plan = 0;
@@ -1880,8 +1834,6 @@ subtract_connections (const Deployment::Connections & left,
 void
 CIAO::DomainApplicationManager_Impl::
 passivate_shared_components (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   try
     {
@@ -1914,8 +1866,6 @@ passivate_shared_components (void)
 void
 CIAO::DomainApplicationManager_Impl::
 activate_shared_components (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   try
     {
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index f9ebd9dba06..bc471e2f495 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -29,14 +29,14 @@
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
 
-#include "ciao/Deployment_DomainApplicationManagerS.h"
-#include "ciao/Deployment_common.h"
+#include "DAnCE/Deployment/Deployment_DomainApplicationManagerS.h"
+#include "DAnCE/Deployment/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 "DAnCE/Deployment/Deployment_EventsC.h"
 
 #include "Deployment_Configuration.h"
 #include "DomainApplicationManager_Export.h"
@@ -90,8 +90,7 @@ namespace CIAO
                                    Deployment::TargetManager_ptr manager,
                                    Execution_Manager::Execution_Manager_Impl * em,
                                    const Deployment::DeploymentPlan &plan,
-                                   const char * deployment_file)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                   const char * deployment_file);
 
 
     /*===========================================================
@@ -116,11 +115,7 @@ namespace CIAO
      *
      * @@ What else do we need to initialize here?
      */
-    void init ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::StartError,
-                       Deployment::PlanError));
+    void init ();
 
     /**
      * set_uuid method on the DomainApplicationManager assigns the
@@ -141,10 +136,7 @@ namespace CIAO
      * Fetch the NodeApplication object reference based on the NodeManager name.
      */
     virtual Deployment::NodeApplication_ptr get_node_app (
-        const char * node_name)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Deployment::NoSuchName));
+        const char * node_name);
 
     /**
      * Executes the application, but does not start it yet. Users can
@@ -159,11 +151,7 @@ namespace CIAO
      */
     virtual void
       startLaunch (const ::Deployment::Properties & configProperty,
-                   ::CORBA::Boolean start)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::ResourceNotAvailable,
-                       ::Deployment::StartError,
-                       ::Deployment::InvalidProperty));
+                   ::CORBA::Boolean start);
 
     /**
      * The second step in launching an application in the
@@ -172,9 +160,7 @@ namespace CIAO
      * launching or starting the application fails.
      */
     virtual void finishLaunch (CORBA::Boolean start,
-                               CORBA::Boolean is_ReDAC)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::StartError));
+                               CORBA::Boolean is_ReDAC);
 
     /**
      * The last step in launching an application in the
@@ -184,25 +170,17 @@ namespace CIAO
      * Internally, this operation will invoke some operations
      * on ExecutionManager to finish up this task.
      */
-    virtual void post_finishLaunch (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+    virtual void post_finishLaunch (void);
 
-    virtual void passivate_shared_components (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+    virtual void passivate_shared_components (void);
 
-    virtual void activate_shared_components (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+    virtual void activate_shared_components (void);
 
     /**
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
      */
-    virtual void start ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::StartError));
+    virtual void start ();
 
     /**
      * Terminates a running application. Raises the StopError
@@ -210,15 +188,12 @@ namespace CIAO
      * InvalidReference exception if the appliction reference is
      * unknown.
      */
-    virtual void destroyApplication ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::StopError));
+    virtual void destroyApplication ();
 
     /**
      * Returns the DeploymentPlan associated with this ApplicationManager.
      */
-    virtual ::Deployment::DeploymentPlan * getPlan ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::DeploymentPlan * getPlan ();
 
     /**
      * This is a helper function to destroy the NodeAppManager.
@@ -227,22 +202,13 @@ namespace CIAO
      * op invoked on it. This is part of the result for merging DAM
      * with DA.
      */
-    virtual void destroyManager ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError));
+    virtual void destroyManager ();
 
     // The input parameter is a *new_plan* which has the
     // same UUID of the existing running plan.
     virtual void
     perform_redeployment (
-      const Deployment::DeploymentPlan & plan)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                        Deployment::PlanError,
-                        Deployment::InstallationFailure,
-                        Deployment::UnknownImplId,
-                        Deployment::ImplEntryPointNotFound,
-                        Deployment::InvalidConnection,
-                        ::Components::RemoveFailure));
+      const Deployment::DeploymentPlan & plan);
 
   protected:
     /// Destructor
@@ -336,32 +302,28 @@ namespace CIAO
     get_outgoing_connections_i (const char * instname,
                                 Deployment::Connections & retv,
                                 bool is_ReDAC,
-                                bool is_search_new_plan)
-      ACE_THROW_SPEC ((Deployment::StartError));
+                                bool is_search_new_plan);
 
     bool
     populate_connection_for_binding (
         const char * instname,
         const Deployment::PlanConnectionDescription & binding,
         const Deployment::DeploymentPlan & plan,
-        Deployment::Connections & retv)
-      ACE_THROW_SPEC ((Deployment::StartError));
+        Deployment::Connections & retv);
 
     bool
     handle_es_connection (
         const char * instname,
         const Deployment::PlanConnectionDescription & binding,
         const Deployment::DeploymentPlan & plan,
-        Deployment::Connections & retv)
-      ACE_THROW_SPEC ((Deployment::StartError));
+        Deployment::Connections & retv);
 
     bool
     handle_direct_connection (
         const char * instname,
         const Deployment::PlanConnectionDescription & binding,
         const Deployment::DeploymentPlan & plan,
-        Deployment::Connections & retv)
-      ACE_THROW_SPEC ((Deployment::StartError));
+        Deployment::Connections & retv);
 
     /// Dump connections, a static method
     void dump_connections (const ::Deployment::Connections & connections);
@@ -385,18 +347,14 @@ namespace CIAO
      * Internally, this operation will invoke an operation on each cached
      * NodeApplication object.
      */
-    virtual void install_all_es (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+    virtual void install_all_es (void);
 
     /**
      * Add all CIAO_Event_Service objects into the cached map.
      */
     virtual void
     add_es_to_map (const char* node_name,
-                   CIAO::CIAO_Event_Service * ciao_es)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+                   CIAO::CIAO_Event_Service * ciao_es);
 
     /**
      * Get the actual event connection QoS properties based on the
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
index 350fb63d331..5d50cc682d0 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
@@ -16,13 +16,13 @@ namespace CIAO
     }
 
     size_t
-    DAM_Map::size (void)
+    DAM_Map::size (void) const
     {
       return this->map_.current_size ();
     }
 
     bool
-    DAM_Map::is_plan_available (const ACE_CString &str)
+    DAM_Map::is_plan_available (const ACE_CString &str) const
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::is_plan_available");
       if (this->map_.find (str) == 0)
@@ -41,8 +41,7 @@ namespace CIAO
       ::Deployment::DomainApplicationManager_var tmp;
 
       /// There should be duplicate when assigning a _var to an _var.
-      int const retval =  this->map_.find (str,
-                                           tmp);
+      int const retval =  this->map_.find (str, tmp);
 
       if (CIAO::debug_level () > 9)
         {
@@ -62,11 +61,8 @@ namespace CIAO
       ::Deployment::DomainApplicationManager_ptr dam)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::bind_dam_reference");
-      int const retval =
-        this->map_.rebind (str,
-                         dam);
 
-      if (retval != 0)
+      if (this->map_.rebind (str, dam) != 0)
         return false;
 
       return true;
@@ -77,8 +73,7 @@ namespace CIAO
     DAM_Map::get_dams ()
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
-      CORBA::ULong const sz =
-        this->map_.current_size ();
+      CORBA::ULong const sz = this->map_.current_size ();
 
       // Initialize the list of DomainApplication Managers
       Deployment::DomainApplicationManagers_var list;
@@ -89,13 +84,11 @@ namespace CIAO
       // Add the manager to the list
       list->length (sz);
 
-      Iterator end =
-        this->map_.end ();
+      Iterator end = this->map_.end ();
 
       CORBA::ULong i = 0;
 
-      for (Iterator b =
-             this->map_.begin (); b != end; ++b)
+      for (Iterator b = this->map_.begin (); b != end; ++b)
         {
           list [i] =
             Deployment::DomainApplicationManager::_duplicate ((*b).int_id_.in ());
@@ -110,10 +103,8 @@ namespace CIAO
     DAM_Map::unbind_dam (const ACE_CString &str)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::unbind_dam");
-      int const retval =
-        this->map_.unbind (str);
 
-      if (retval != 0)
+      if (this->map_.unbind (str) != 0)
         return false;
 
       return true;
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index d69c9d10e9a..734b953d912 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 "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,7 @@ namespace CIAO
     public:
       DAM_Map (void);
 
-      bool is_plan_available (const ACE_CString &str);
+      bool is_plan_available (const ACE_CString &str) const;
 
       ::Deployment::DomainApplicationManager_ptr
       fetch_dam_reference (const ACE_CString &str);
@@ -47,12 +47,11 @@ namespace CIAO
         const ACE_CString &str,
         ::Deployment::DomainApplicationManager_ptr tmp);
 
-      Deployment::DomainApplicationManagers *
-      get_dams ();
+      Deployment::DomainApplicationManagers *get_dams ();
 
       bool unbind_dam (const ACE_CString &str);
 
-      size_t size (void);
+      size_t size (void) const;
 
     private:
       typedef
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 736eaa5f885..2e2ce4693eb 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,7 +1,7 @@
 // -*- 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, ciao_executionmanager_stub, ciaoexe {
   exename = Execution_Manager
 
   IDL_Files {
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index c7b5df7b96a..aeca2391336 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -61,14 +61,11 @@ namespace CIAO
     }
 
     bool
-    write_ior_file (CORBA::ORB_ptr orb,
-                    CIAO::ExecutionManagerDaemon_ptr obj)
+    write_ior_file (CORBA::ORB_ptr orb, CIAO::ExecutionManagerDaemon_ptr obj)
     {
-      CORBA::String_var ior =
-        orb->object_to_string (obj);
+      CORBA::String_var ior = orb->object_to_string (obj);
 
-      FILE* ior_output_file_ =
-        ACE_OS::fopen (ior_file_name_, "w");
+      FILE* ior_output_file_ = ACE_OS::fopen (ior_file_name_, "w");
 
       if (ior_output_file_)
         {
@@ -115,7 +112,6 @@ namespace CIAO
       CosNaming::Name name (1);
       name.length (1);
 
-      // String dup required for MSVC6
       name[0].id = CORBA::string_dup ("ExecutionManager");
 
       // Register the servant with the Naming Service
@@ -124,7 +120,7 @@ namespace CIAO
           // Register the servant with the Naming Service
           naming_context->bind (name, obj);
         }
-      catch (CosNaming::NamingContext::AlreadyBound &)
+      catch (const CosNaming::NamingContext::AlreadyBound &)
         {
           ACE_DEBUG ((LM_DEBUG, "Execution_Manager.cpp: Name already bound, rebinding....\n"));
           naming_context->rebind (name, obj);
@@ -139,21 +135,15 @@ namespace CIAO
 
       try
         {
-          CORBA::ORB_var orb =
-            CORBA::ORB_init (argc,
-                             argv,
-                             "");
+          CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
           if (!parse_args (argc, argv))
             return -1;
 
           // Get reference to Root POA.
-          CORBA::Object_var obj
-            = orb->resolve_initial_references ("RootPOA");
-
-          PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in ());
+          CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
+          PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ());
 
           if (CORBA::is_nil (poa.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -172,34 +162,28 @@ namespace CIAO
           // Implicit activation
           PortableServer::ServantBase_var safe_daemon (daemon_servant);
 
-          CIAO::ExecutionManagerDaemon_var daemon =
-            daemon_servant->_this ();
+          CIAO::ExecutionManagerDaemon_var daemon = daemon_servant->_this ();
 
           TAO::Utils::Implicit_Deactivator de (daemon_servant);
           bool retval = false;
 
           if (register_with_ns_)
             {
-              retval =
-                register_with_ns (orb.in (),
-                                  daemon.in ());
+              retval = register_with_ns (orb.in (), daemon.in ());
             }
 
           if (write_to_ior_)
             {
-              retval =
-                write_ior_file (orb.in (),
-                                daemon.in ());
+              retval = write_ior_file (orb.in (), daemon.in ());
             }
 
           if (!retval)
             return -1;
 
           // Activate POA manager
-          PortableServer::POAManager_var mgr =
-            poa->the_POAManager ();
+          PortableServer::POAManager_var mgr = poa->the_POAManager ();
 
-          if (mgr.in () == 0)
+          if (CORBA::is_nil (mgr.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA Manager error, returning \n"),
@@ -220,14 +204,13 @@ namespace CIAO
           // destroy.
           (void) de.release ();
 
-          poa->destroy (1,
-                        1);
+          poa->destroy (1, 1);
 
           orb->destroy ();
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("CIAO_ExecutionManager::main\t\n");
+          ex._tao_print_exception ("CIAO_ExecutionManager::main\n");
           return -1;
         }
 
@@ -242,6 +225,5 @@ namespace CIAO
 int
 main (int argc, char *argv[])
 {
-  return CIAO::Execution_Manager::run_main (argc,
-                                            argv);
+  return CIAO::Execution_Manager::run_main (argc, argv);
 }
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 8a93b2f5ef0..f45063c93ea 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -30,11 +30,6 @@ namespace CIAO
     Execution_Manager_Impl::preparePlan (
       const Deployment::DeploymentPlan &plan,
       CORBA::Boolean)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::PlanError,
-                       Deployment::StartError
-                       ))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::preparePlan");
 
@@ -111,8 +106,7 @@ namespace CIAO
       ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to set uuid on DAM...\n"));
       dam_servant->set_uuid (plan.UUID.in ());
 
-      Deployment::DomainApplicationManager_var dam =
-        dam_servant->_this ();
+      Deployment::DomainApplicationManager_var dam = dam_servant->_this ();
 
       /// @@ TODO:Need to check the return value......
       ///
@@ -127,7 +121,6 @@ namespace CIAO
 
     Deployment::DomainApplicationManagers *
     Execution_Manager_Impl::getManagers ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::getManagers");
 
@@ -138,7 +131,6 @@ namespace CIAO
 
     Deployment::DomainApplicationManager_ptr
     Execution_Manager_Impl::getManager (const char * plan_uuid)
-      ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist))
     {
       return this->map_.fetch_dam_reference (plan_uuid);
     }
@@ -146,8 +138,6 @@ namespace CIAO
     void
     Execution_Manager_Impl::destroyManager (
       Deployment::DomainApplicationManager_ptr manager)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagers");
       try
@@ -172,8 +162,7 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception (
-            "Execution_Manager_Impl::destroyManager\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::destroyManager\n");
           throw Deployment::StopError ();
         }
     }
@@ -182,8 +171,6 @@ namespace CIAO
     void
     Execution_Manager_Impl::destroyManagerByPlan (
       const char * plan_uuid)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagerByPlan");
       try
@@ -227,16 +214,13 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception (
-            "Execution_Manager_Impl::destroyManager\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::destroyManager\n");
           throw Deployment::StopError ();
         }
     }
 
-
     void
     Execution_Manager_Impl::shutdown ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::shutdown");
       // Shutdown the ORB on which it is runing
@@ -246,14 +230,6 @@ namespace CIAO
     void
     Execution_Manager_Impl::perform_redeployment (
       const Deployment::DeploymentPlan & plan)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::PlanError,
-                       ::Deployment::InstallationFailure,
-                       ::Deployment::UnknownImplId,
-                       ::Deployment::ImplEntryPointNotFound,
-                       ::Deployment::InvalidConnection,
-                       ::Deployment::InvalidProperty,
-                       ::Components::RemoveFailure))
     {
       CIAO_TRACE ("CIAO::Execution_Manager_Impl::perform_redeployment");
 
@@ -287,14 +263,13 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::perform_redeployment\t\n");
+            "Execution_Manager_Impl::perform_redeployment\n");
           throw;
         }
     }
 
     Deployment::DeploymentPlan *
     Execution_Manager_Impl::getPlan (const char * plan_uuid)
-      ACE_THROW_SPEC ((::CORBA::SystemException))
     {
       Deployment::DomainApplicationManager_var dam;
 
@@ -317,7 +292,7 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("Execution_Manager_Impl::getPlan\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::getPlan\n");
           throw;
         }
     }
@@ -326,9 +301,6 @@ namespace CIAO
     Execution_Manager_Impl::finalize_global_binding (
           const Component_Binding_Info & binding,
           CORBA::Boolean add_or_remove)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          ::Deployment::InvalidConnection))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Execution_Manage::finalizing  global bindings.\n"));
@@ -361,7 +333,7 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::finalize_global_binding\t\n");
+            "Execution_Manager_Impl::finalize_global_binding\n");
           throw Deployment::InvalidConnection ();
         }
     }
@@ -369,9 +341,6 @@ namespace CIAO
     void
     Execution_Manager_Impl::passivate_shared_components (
           const Component_Binding_Info & binding)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          Deployment::StartError))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Execution_Manage::passivate shared components.\n"));
@@ -396,7 +365,7 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::passivate_shared_components\t\n");
+            "Execution_Manager_Impl::passivate_shared_components\n");
           throw Deployment::StartError ();
         }
     }
@@ -404,9 +373,6 @@ namespace CIAO
     void
     Execution_Manager_Impl::activate_shared_components (
           const Component_Binding_Info & binding)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException,
-          Deployment::StartError))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Execution_Manage::activate shared components.\n"));
@@ -431,19 +397,14 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::passivate_shared_components\t\n");
+            "Execution_Manager_Impl::passivate_shared_components\n");
           throw Deployment::StartError ();
         }
     }
 
-
     Deployment::NodeApplication_ptr
-
-    Execution_Manager_Impl::
-    find_node_application (const Component_Binding_Info & binding)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Deployment::InvalidConnection))
+    Execution_Manager_Impl::find_node_application (
+      const Component_Binding_Info & binding)
     {
       // Find the DAM based on plan_UUID
       Deployment::DomainApplicationManager_var dam;
@@ -463,8 +424,8 @@ namespace CIAO
 
       // Find the NA based on the NodeName field of the binding
       // This is a CORBA call on the DAM
-      Deployment::NodeApplication_var
-        node_app = dam->get_node_app (binding.node_.c_str ());
+      Deployment::NodeApplication_var node_app =
+        dam->get_node_app (binding.node_.c_str ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -493,8 +454,8 @@ namespace CIAO
     }
 
     bool
-    Execution_Manager_Impl::
-    is_component_running (const char * name, const char * plan_uuid)
+    Execution_Manager_Impl::is_component_running (
+      const char * name, const char * plan_uuid)
     {
       for (ACE_Unbounded_Set<Component_Binding_Info>::iterator
            iter = this->shared_components_.begin ();
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index cf674d37fe9..21f30f82933 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -24,7 +24,7 @@
 
 #include "DAM_Map.h"
 #include "ace/SString.h"
-#include "ciao/Deployment_common.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 
 namespace CIAO
 {
@@ -34,9 +34,8 @@ namespace CIAO
      *
      * @class Execution_Manager_Impl
      *
-     * @brief This class implements the
-     * ExecutionManger. ExecutionManager starts the execution process
-     * after the planning stage.
+     * @brief This class implements the ExecutionManger. ExecutionManager
+     * starts the execution process after the planning stage.
      *
      */
     class Execution_Manager_Impl
@@ -49,56 +48,32 @@ namespace CIAO
                               const char * init_file);
 
       /// Template methods from ExecutionManagerDaemon, please see
-      /// $CIAO_ROOT/ciao/Deployment.idl for documentation
+      /// $CIAO_ROOT/DAnCE/Deployment/Deployment.idl for documentation
       virtual Deployment::DomainApplicationManager_ptr
       preparePlan (const Deployment::DeploymentPlan & plan,
-                   CORBA::Boolean commitResources)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::ResourceNotAvailable,
-                         Deployment::PlanError,
-                         Deployment::StartError));
+                   CORBA::Boolean commitResources);
 
-      virtual Deployment::DomainApplicationManagers *
-      getManagers ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual Deployment::DomainApplicationManagers *getManagers ();
 
       // Below method is CIAO specific extension
       virtual Deployment::DomainApplicationManager_ptr
-      getManager (const char * plan_uuid)
-        ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist));
+      getManager (const char * plan_uuid);
 
       virtual void
-      destroyManager (Deployment::DomainApplicationManager_ptr manager)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::StopError));
+      destroyManager (Deployment::DomainApplicationManager_ptr manager);
 
       // Below method is CIAO specific extension, please see the IDL
       // definition for more details.
-      virtual void
-      destroyManagerByPlan (const char * plan_uuid)
-        ACE_THROW_SPEC ((::CORBA::SystemException,
-                         ::Deployment::StopError));
+      virtual void destroyManagerByPlan (const char * plan_uuid);
 
-      virtual void shutdown ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void shutdown ();
 
       // The input parameter is a *new_plan* which has the
       // same UUID of the existing running plan.
       virtual void
-      perform_redeployment (
-          const Deployment::DeploymentPlan & plan)
-        ACE_THROW_SPEC ((::CORBA::SystemException,
-                         ::Deployment::PlanError,
-                         ::Deployment::InstallationFailure,
-                         ::Deployment::UnknownImplId,
-                         ::Deployment::ImplEntryPointNotFound,
-                         ::Deployment::InvalidConnection,
-                         ::Deployment::InvalidProperty,
-                         ::Components::RemoveFailure));
-
-      virtual Deployment::DeploymentPlan * getPlan (
-          const char * plan_uuid)
-        ACE_THROW_SPEC ((::CORBA::SystemException));
+      perform_redeployment (const Deployment::DeploymentPlan & plan);
+
+      virtual Deployment::DeploymentPlan * getPlan (const char * plan_uuid);
 
     /// ****************** C++ Methods *************************
 
@@ -110,20 +85,13 @@ namespace CIAO
     /// a list of bindings and do the batch job.
     virtual void finalize_global_binding (
         const Component_Binding_Info & binding,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     virtual void passivate_shared_components (
-        const Component_Binding_Info & binding)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+        const Component_Binding_Info & binding);
 
     virtual void activate_shared_components (
-        const Component_Binding_Info & binding)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::StartError));
+        const Component_Binding_Info & binding);
 
       /// Add shared component information.
       /// This call will be made by DomainApplicationManager.
@@ -144,10 +112,7 @@ namespace CIAO
     protected:
       /// Return the NodeApplication hosting the given biding
       virtual Deployment::NodeApplication_ptr
-        find_node_application (const Component_Binding_Info & binding)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Deployment::InvalidConnection));
+        find_node_application (const Component_Binding_Info & binding);
 
     protected:
       /// Destructor.
diff --git a/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl b/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
index 01942fd3afa..6bc330ff25e 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 "DAnCE/Deployment/Deployment_ExecutionManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
index 617df0f080f..2daf535031a 100644
--- a/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
+++ b/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
@@ -6,8 +6,8 @@
  * @brief Controling interface for managing and controling CIAO daemon.
  */
 
-#include "ciao/Deployment_NodeManager.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment_NodeManager.idl"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/NodeApplication/Config_Manager.h b/CIAO/DAnCE/NodeApplication/Config_Manager.h
new file mode 100755
index 00000000000..06e4dc47c39
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/Config_Manager.h
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Config_Manager.h
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+
+#ifndef CIAO_CONFIG_MANAGER_H
+#define CIAO_CONFIG_MANAGER_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
+#include "ace/Null_Mutex.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
+
+namespace CIAO
+{
+  /**
+   */
+  class Config_Manager
+  {
+  public:
+    virtual ~Config_Manager (void) {}
+
+    virtual int pre_orb_initialize (void) = 0;
+
+    virtual int post_orb_initialize (CORBA::ORB_ptr o) = 0;
+
+    virtual void init_resources (const CIAO::DAnCE::ServerResource &info) = 0;
+
+    virtual void init (CORBA::ORB_ptr orb) = 0;
+
+    virtual CORBA::PolicyList *find_policies_by_name (const char *name)= 0;
+
+    virtual bool policy_exists (const char *name) = 0;
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_MANAGER_H */
+
diff --git a/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp b/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
index 5de92094ee8..b9a05bfe7fa 100644
--- a/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
+++ b/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
@@ -1,7 +1,8 @@
 // $Id$
 
 #include "Configurator_Factory.h"
-#include "NoOp_Configurator.h"
+// #include "NoOp_Configurator.h"
+#include "NodeApp_Configurator.h"
 #include "ace/Null_Mutex.h"
 #include "ciao/CIAO_common.h"
 #include "ace/Arg_Shifter.h"
@@ -81,6 +82,18 @@ CIAO::NodeApplication_Options::parse_args (int &argc, char *argv[])
 CIAO::NodeApp_Configurator *
 CIAO::NodeApplication_Options::create_nodeapp_configurator (void)
 {
+  CIAO::NodeApp_Configurator* ptr = 0;
+  ACE_NEW_THROW_EX (ptr,
+                    CIAO::NodeApp_Configurator (),
+                    CORBA::NO_MEMORY (TAO::VMCID,
+                                      CORBA::COMPLETED_NO));
+  if (this->rt_support_)
+    {
+      ptr->set_rt_support ();
+    }
+
+  return ptr;
+  /*
   typedef CIAO::NodeApp_Configurator * (*intelligent_designer)(void);
   CIAO::NodeApp_Configurator* ptr = 0;
 
@@ -100,6 +113,7 @@ CIAO::NodeApplication_Options::create_nodeapp_configurator (void)
                             0);
         }
 
+
       // Cast the void* to non-pointer type first - it's not legal to
       // cast a pointer-to-object directly to a pointer-to-function.
       void *void_ptr =
@@ -135,4 +149,5 @@ CIAO::NodeApplication_Options::create_nodeapp_configurator (void)
     }
 
   return ptr;
+  */
 }
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 89cab7af662..42d834c2ba5 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -27,7 +27,6 @@ CIAO::Container_Impl::_default_POA (void)
 
 CORBA::Long
 CIAO::Container_Impl::init (const CORBA::PolicyList *policies)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::init");
   // @@ Initialize container and create the internal container
@@ -54,8 +53,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies)
                         CORBA::NO_MEMORY ());
     }
 
-  return this->container_->init (0,
-                                 policies);
+  return this->container_->init (0, policies);
 }
 
 
@@ -63,11 +61,6 @@ Deployment::ComponentInfos *
 CIAO::Container_Impl::install (
     const ::Deployment::ContainerImplementationInfo & container_impl_info
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  ::Deployment::UnknownImplId,
-                  ::Deployment::ImplEntryPointNotFound,
-                  ::Deployment::InstallationFailure,
-                  ::Components::InvalidConfiguration))
 {
   CIAO_TRACE ("CIAO::Container_Impl::install");
   Deployment::ComponentInfos_var retv;
@@ -85,9 +78,44 @@ CIAO::Container_Impl::install (
 
      CORBA::ULong const len = impl_infos.length ();
      retv->length (len);
+     REC_POL_MAP rec_pol_map;
 
      for (CORBA::ULong i = 0; i < len; ++i)
        {
+         const CORBA::ULong cplen = impl_infos[i].component_config.length ();
+         for (CORBA::ULong cp_len = 0; cp_len < cplen; ++cp_len)
+           {
+             if (impl_infos[i].component_config[cp_len].
+                 value.type ()->kind () == CORBA::tk_string)
+               {
+                 const char* policy_set_id;
+                 ACE_CString receptacle_name;
+                 ACE_CString instance_name;
+                 impl_infos[i].component_config[cp_len].value >>=
+                   policy_set_id;
+                 bool result = this->configurator_.policy_exists (
+                   policy_set_id);
+                 if (result == true)
+                   {
+                     receptacle_name = impl_infos[i].component_config[cp_len].
+                       name.in ();
+                     instance_name = impl_infos[i].
+                       component_instance_name.in ();
+                     receptacle_name += "_";
+                     receptacle_name += instance_name;
+                     CORBA::PolicyList_var policies =
+                       this->configurator_.find_policies_by_name (
+                         policy_set_id);
+                     CORBA::PolicyList temp_policies (0);
+                     if (policies != 0)
+                       {
+                         temp_policies = *policies;
+                       }
+                     rec_pol_map.bind (receptacle_name, temp_policies);
+                   }
+               }
+           }
+
          // Install home
          Components::CCMHome_var home =
            this->install_home (impl_infos[i]);
@@ -99,8 +127,7 @@ CIAO::Container_Impl::install (
            throw Deployment::InstallationFailure ();
 
          // Create component from home
-         Components::CCMObject_var comp =
-           kh->create_component ();
+         Components::CCMObject_var comp = kh->create_component ();
 
          if (CORBA::is_nil (comp.in ()))
            throw Deployment::InstallationFailure ();
@@ -225,6 +252,7 @@ CIAO::Container_Impl::install (
            std_configurator->set_configuration (comp_attributes);
          }
        }
+     this->container_->set_receptacle_policy_map (rec_pol_map);
    }
   catch (const CORBA::Exception& ex)
    {
@@ -237,7 +265,6 @@ CIAO::Container_Impl::install (
 
 ::Deployment::Properties *
 CIAO::Container_Impl::properties ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::properties");
   ::Deployment::Properties *retval = 0;
@@ -253,7 +280,6 @@ CIAO::Container_Impl::properties ()
 
 ::Deployment::NodeApplication_ptr
 CIAO::Container_Impl::get_node_application ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::get_node_application");
   return ::Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
@@ -262,11 +288,6 @@ CIAO::Container_Impl::get_node_application ()
 ::Components::CCMHome_ptr
 CIAO::Container_Impl::install_home (
     const ::Deployment::ComponentImplementationInfo & impl_info)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::UnknownImplId,
-                   Deployment::ImplEntryPointNotFound,
-                   Deployment::InstallationFailure,
-                   Components::InvalidConfiguration))
 {
   CIAO_TRACE ("CIAO::Container_Impl::install_home");
   if (CIAO::debug_level () > 9)
@@ -308,8 +329,7 @@ CIAO::Container_Impl::install_home (
                   "error in binding home for component "
                   "instance [%s] \n",
                   impl_info.component_instance_name.in ()));
-      ACE_THROW_RETURN (Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
+      throw Deployment::InstallationFailure ();
     }
 
   //Note: If the return value will be discarded, it must be kept in a var or
@@ -320,8 +340,6 @@ CIAO::Container_Impl::install_home (
 
 void
 CIAO::Container_Impl::remove_home (const char * comp_ins_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   CIAO_TRACE ("CIAO::Container_Impl::remove_home");
 
@@ -347,8 +365,6 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name)
 // Remove all homes and components
 void
 CIAO::Container_Impl::remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   CIAO_TRACE ("CIAO::Container_Impl::remove");
 
@@ -379,8 +395,6 @@ CIAO::Container_Impl::remove ()
 
 void
 CIAO::Container_Impl::remove_components ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   CIAO_TRACE ("CIAO::Container_Impl::remove_components");
 
@@ -413,8 +427,6 @@ CIAO::Container_Impl::remove_components ()
 // Below method is not used actually.
 void
 CIAO::Container_Impl::remove_component (const char * comp_ins_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   CIAO_TRACE ("CIAO::Container_Impl::remove_component");
 
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 7becc7b8e9e..8d749149acb 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -25,12 +25,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_ContainerS.h"
-#include "ciao/Deployment_NodeApplicationC.h"
-#include "ciao/Container_Base.h"
+#include "DAnCE/Deployment/Deployment_ContainerS.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment//DeploymentC.h"
+#include "ciao/Session_Container.h"
 #include "ace/SString.h"
 #include "ciao/Server_init.h"  // write_IOR function & NameUtility
 #include "ciao/CIAO_common.h" // CIAO::debug_level
+#include "NodeApp_Configurator.h"
 
 namespace CIAO
 {
@@ -53,6 +55,7 @@ namespace CIAO
     Container_Impl (CORBA::ORB_ptr o,
                     PortableServer::POA_ptr p,
                     ::Deployment::NodeApplication_ptr server,
+                    NodeApp_Configurator &c,
                     const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
 
     /// Destructor
@@ -62,32 +65,19 @@ namespace CIAO
     /*--------------------  IDL operations (idl) ------------------*/
 
     /// Initialize the container.
-    virtual CORBA::Long init (const CORBA::PolicyList *policies)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long init (const CORBA::PolicyList *policies);
 
     /// Install all homes and components
     Deployment::ComponentInfos *
-      install (const ::Deployment::ContainerImplementationInfo & container_impl_info)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::UnknownImplId,
-                         Deployment::ImplEntryPointNotFound,
-                         Deployment::InstallationFailure,
-                         Components::InvalidConfiguration));
+      install (const ::Deployment::ContainerImplementationInfo & container_impl_info);
 
     /// Remove all homes and components
-    virtual void
-      remove ()
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::RemoveFailure));
+    virtual void remove ();
 
     /// Deployment::Container interface defined attributes/operations.
-    virtual ::Deployment::Properties *
-      properties ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::Properties *properties ();
 
-    virtual ::Deployment::NodeApplication_ptr
-      get_node_application ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::NodeApplication_ptr get_node_application ();
 
     /*-------------------------------------------------------------*/
     /*-------------------  C++ help methods (c++) -----------------*/
@@ -96,15 +86,9 @@ namespace CIAO
     /// increase the reference count of the POA.
     virtual PortableServer::POA_ptr _default_POA (void);
 
-
     // Install the home of this particular component
     virtual ::Components::CCMHome_ptr
-      install_home (const ::Deployment::ComponentImplementationInfo & impl_info)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::UnknownImplId,
-                         Deployment::ImplEntryPointNotFound,
-                         Deployment::InstallationFailure,
-                         Components::InvalidConfiguration));
+      install_home (const ::Deployment::ComponentImplementationInfo & impl_info);
 
     /**
      * @@Note: I don't know how to remove a home right now.
@@ -118,10 +102,7 @@ namespace CIAO
      * the real thinking for easiness.
      */
     // Remove the home of this particular component
-    virtual void
-      remove_home (const char * comp_ins_name)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::RemoveFailure));
+    virtual void remove_home (const char * comp_ins_name);
 
     bool
     register_with_ns (const char * obj_name,
@@ -129,21 +110,15 @@ namespace CIAO
                       Components::CCMObject_ptr obj);
 
     bool
-    unregister_with_ns (const char * obj_name,
-                        CORBA::ORB_ptr orb);
-
+    unregister_with_ns (const char * obj_name, CORBA::ORB_ptr orb);
 
     // ------------------- CIAO Internal Operations ------------------------
     // These below two are helper methods to clean up components
     // should only be called when we are sure that there is no
     // active connection on this component.
-    virtual void remove_components ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    virtual void remove_components ();
 
-    virtual void remove_component (const char * comp_ins_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    virtual void remove_component (const char * comp_ins_name);
 
     /// Set the cached object reference.
     void set_objref (Deployment::Container_ptr o);
@@ -177,6 +152,8 @@ protected:
     /// Cached NodeApplication.
     Deployment::NodeApplication_var nodeapp_;
 
+    NodeApp_Configurator &configurator_;
+
     /// To store all created CCMHome object
     typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                     Components::CCMHome_ptr,
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.inl b/CIAO/DAnCE/NodeApplication/Container_Impl.inl
index 85c17197070..5473cfcb434 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.inl
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.inl
@@ -5,10 +5,12 @@ ACE_INLINE
 CIAO::Container_Impl::Container_Impl (CORBA::ORB_ptr o,
                                       PortableServer::POA_ptr p,
                                       ::Deployment::NodeApplication_ptr server,
+                                      NodeApp_Configurator &c,
                                       const Static_Config_EntryPoints_Maps* static_entrypts_maps)
   : orb_ (CORBA::ORB::_duplicate (o)),
     poa_ (PortableServer::POA::_duplicate (p)),
     nodeapp_ (::Deployment::NodeApplication::_duplicate (server)),
+    configurator_ (c),
     static_entrypts_maps_ (static_entrypts_maps)
 {
 }
diff --git a/CIAO/DAnCE/NodeApplication/NAConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.cpp
new file mode 100755
index 00000000000..a85c5d1a688
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.cpp
@@ -0,0 +1,225 @@
+// $Id$
+
+#include "NAConfig_Manager.h"
+#include "ciao/CIAO_common.h"
+#include "ace/SString.h"
+#include "tao/SystemException.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+
+void
+CIAO::NAResource_Config_Manager::init (CORBA::ORB_ptr orb)
+{
+  this->orb_ = CORBA::ORB::_duplicate (orb);
+}
+
+int
+CIAO::NAResource_Config_Manager::pre_orb_initialize (void)
+{
+  return 0;
+}
+
+int
+CIAO::NAResource_Config_Manager::post_orb_initialize (CORBA::ORB_ptr)
+{
+  return 0;
+}
+
+void
+CIAO::NAResource_Config_Manager::init_resources
+(const CIAO::DAnCE::ServerResource &server_resource)
+{
+  ACE_DEBUG ((LM_DEBUG,"NAResource_Config_Manager::init_resources\n"));
+
+  if (CORBA::is_nil (this->orb_.in()))
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "NAResource_Config_Manager has not been properly initialized\n"));
+      throw CORBA::INTERNAL ();
+    }
+
+  const CIAO::DAnCE::PolicySets &sets = server_resource.orb_config.policy_set;
+  for (CORBA::ULong i = 0; i < sets.length (); ++i)
+    {
+      CORBA::ULong np = sets[i].policies.length ();
+      if (np == 0)
+        continue;
+
+      CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np);
+      policy_list->length (np);
+      CORBA::ULong index = 0;
+      CORBA::ULong array_index = np;
+
+      // Create a list of policies
+      for (CORBA::ULong pc = 0; pc < np; ++pc)
+        {
+          CORBA::Policy_var temp_policy =
+            this->create_single_policy (sets[i].policies[pc]);
+
+          if (CORBA::is_nil (temp_policy.in ()))
+            {
+              array_index = array_index - 1;
+              policy_list->length (array_index);
+            }
+          else
+            {
+              policy_list[index] = temp_policy;
+              index = index + 1;
+            }
+        }
+
+      // Bind the policy list to the name.  The bind operation should
+      // surrender the ownership of the newly created PolicyList
+      // sequence to the map.
+      if (array_index != 0)
+        {
+          if (this->policy_map_.bind (sets[i].Id.in (),
+                                      policy_list) != 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "Error binding Policy_Set with name: %s\n",
+                          sets[i].Id.in ()));
+              throw CORBA::INTERNAL ();
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "NAResource_Config_Manager::init_resource"
+                          " added policy set : %s with %d policies\n",
+                          sets[i].Id.in (), array_index));
+            }
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "NAResource_Config_Manager::init_resource"
+                      " added policy set : %s with %d policies\n",
+                      sets[i].Id.in (), array_index));
+        }
+    }
+}
+
+bool
+CIAO::NAResource_Config_Manager::policy_exists (const char *name)
+{
+  if (name == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Invalid name string found in "
+                  "CIAO::NAResource_Config_Manager::policy_exists\n"));
+      throw CORBA::INTERNAL ();
+    }
+
+  POLICY_MAP::ENTRY *entry = 0;
+
+  if (this->policy_map_.find (name, entry) != 0)
+    {
+      return false;
+    }
+
+  return true;
+}
+
+CORBA::PolicyList *
+CIAO::NAResource_Config_Manager::find_policies_by_name (const char *name)
+{
+  if (name == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Invalid name string found in find_policies_by_name\n"));
+      throw CORBA::INTERNAL ();
+    }
+
+  POLICY_MAP::ENTRY *entry = 0;
+
+  CORBA::PolicyList_var retv;
+
+  if (this->policy_map_.find (name, entry) != 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Unable to find a PolicyList named %s\n",
+                  name));
+      retv = 0;
+    }
+  else
+    {
+      retv = new CORBA::PolicyList (entry->int_id_.in ());
+    }
+  return retv._retn ();
+}
+
+CORBA::Policy_ptr
+CIAO::NAResource_Config_Manager::create_single_policy
+(const CIAO::DAnCE::PolicyDef &policy_def)
+{
+  CORBA::Policy_var retv;
+
+  switch (policy_def._d ())
+    {
+    case TAO::NETWORK_PRIORITY_TYPE:
+      {
+        const CIAO::DAnCE::NWPriorityModelPolicyDef &nw_tmp
+          = policy_def.NWPriorityModelDef ();
+        retv = this->orb_->_create_policy (TAO::NETWORK_PRIORITY_TYPE);
+
+        TAO::NetworkPriorityPolicy_var nw_priority =
+          TAO::NetworkPriorityPolicy::_narrow (retv.in ());
+
+        nw_priority->network_priority_model (
+          (TAO::NetworkPriorityModel) nw_tmp.nw_priority_model);
+
+        nw_priority->request_diffserv_codepoint (
+          (TAO::DiffservCodepoint)  nw_tmp.request_dscp);
+
+        nw_priority->reply_diffserv_codepoint (
+          (TAO::DiffservCodepoint)  nw_tmp.reply_dscp);
+
+        retv = nw_priority._retn ();
+
+        if (! CORBA::is_nil (retv.in ()))
+        ACE_DEBUG ((LM_DEBUG,
+                    "NAConfigManager::Create NetworkPriority policy: %d\n",
+                    nw_tmp.nw_priority_model));
+      }
+      break;
+
+    case TAO::CLIENT_NETWORK_PRIORITY_TYPE:
+      {
+        const CIAO::DAnCE::CNWPriorityModelPolicyDef &cnw_tmp
+          = policy_def.CNWPriorityModelDef ();
+        retv = this->orb_->_create_policy (TAO::CLIENT_NETWORK_PRIORITY_TYPE);
+
+        TAO::NetworkPriorityPolicy_var cnw_priority =
+          TAO::NetworkPriorityPolicy::_narrow (retv.in ());
+
+        cnw_priority->request_diffserv_codepoint (
+          (TAO::DiffservCodepoint) cnw_tmp.request_dscp);
+
+        cnw_priority->reply_diffserv_codepoint (
+          (TAO::DiffservCodepoint) cnw_tmp.reply_dscp);
+
+        retv = cnw_priority._retn ();
+
+        if (! CORBA::is_nil (retv.in ()))
+        ACE_DEBUG ((LM_DEBUG,
+                    "NAConfigManager::Create NetworkPriority policy \n"));
+      }
+      break;
+
+    default:
+      retv = 0;
+    }
+
+  return retv._retn ();
+}
+
+extern "C" CIAO_NA_Configurator_Export CIAO::Config_Manager *create_na_config_manager (void);
+
+CIAO::Config_Manager *
+create_na_config_manager (void)
+{
+  CIAO::NAResource_Config_Manager *config;
+  ACE_NEW_RETURN (config, CIAO::NAResource_Config_Manager, 0);
+  return config;
+}
diff --git a/CIAO/DAnCE/NodeApplication/NAConfig_Manager.h b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.h
new file mode 100755
index 00000000000..00248c5c551
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.h
@@ -0,0 +1,75 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    NAConfig_Manager.h
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+
+#ifndef CIAO_NACONFIG_MANAGER_H
+#define CIAO_NACONFIG_MANAGER_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
+#include "ace/Null_Mutex.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
+#include "Config_Manager.h"
+#include "NA_Configurator_Export.h"
+
+namespace CIAO
+{
+  /**
+   */
+  class CIAO_NA_Configurator_Export NAResource_Config_Manager 
+        : public Config_Manager
+  {
+  public:
+    virtual ~NAResource_Config_Manager (void) {}
+
+    virtual int pre_orb_initialize (void);
+
+    virtual int post_orb_initialize (CORBA::ORB_ptr o);
+
+    virtual void init (CORBA::ORB_ptr orb);
+
+    /// Initializing the NAResource_Config_Manager
+    virtual void init_resources (const CIAO::DAnCE::ServerResource &info);
+
+    /// Query a policy set by name
+    virtual CORBA::PolicyList *find_policies_by_name (const char *name);
+
+    virtual bool policy_exists (const char *name);
+
+  private:
+    /// Cached an ORB reference.
+    CORBA::ORB_var orb_;
+
+    CORBA::Policy_ptr create_single_policy
+    (const CIAO::DAnCE::PolicyDef &policy_def);
+
+    /// Hash_Map stuff.
+    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                    CORBA::PolicyList_var,
+                                    ACE_Hash<ACE_CString>,
+                                    ACE_Equal_To<ACE_CString>,
+                                    ACE_Null_Mutex> POLICY_MAP;
+
+    /// Internal TP names to id map.
+    POLICY_MAP policy_map_;
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_NACONFIG_MANAGER_H */
+
diff --git a/CIAO/DAnCE/NodeApplication/NAConfig_Manager.inl b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.inl
new file mode 100755
index 00000000000..67203a91ff8
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NAConfig_Manager.inl
@@ -0,0 +1,12 @@
+// $Id$
+
+ACE_INLINE
+CIAO::NAResource_Config_Manager::NAResource_Config_Manager ()
+{
+}
+
+ACE_INLINE
+CIAO::NAResource_Config_Manager::~NAResource_Config_Manager ()
+{
+}
+
diff --git a/CIAO/DAnCE/NodeApplication/NA_Configurator_Export.h b/CIAO/DAnCE/NodeApplication/NA_Configurator_Export.h
new file mode 100755
index 00000000000..78d65b4eb45
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NA_Configurator_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl CIAO_NA_Configurator
+// ------------------------------
+#ifndef CIAO_NA_CONFIGURATOR_EXPORT_H
+#define CIAO_NA_CONFIGURATOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (CIAO_NA_CONFIGURATOR_HAS_DLL)
+#  define CIAO_NA_CONFIGURATOR_HAS_DLL 1
+#endif /* ! CIAO_NA_CONFIGURATOR_HAS_DLL */
+
+#if defined (CIAO_NA_CONFIGURATOR_HAS_DLL) && (CIAO_NA_CONFIGURATOR_HAS_DLL == 1)
+#  if defined (CIAO_NA_CONFIGURATOR_BUILD_DLL)
+#    define CIAO_NA_Configurator_Export ACE_Proper_Export_Flag
+#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* CIAO_NA_CONFIGURATOR_BUILD_DLL */
+#    define CIAO_NA_Configurator_Export ACE_Proper_Import_Flag
+#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* CIAO_NA_CONFIGURATOR_BUILD_DLL */
+#else /* CIAO_NA_CONFIGURATOR_HAS_DLL == 1 */
+#  define CIAO_NA_Configurator_Export
+#  define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARATION(T)
+#  define CIAO_NA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CIAO_NA_CONFIGURATOR_HAS_DLL == 1 */
+
+// Set CIAO_NA_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CIAO_NA_CONFIGURATOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define CIAO_NA_CONFIGURATOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define CIAO_NA_CONFIGURATOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !CIAO_NA_CONFIGURATOR_NTRACE */
+
+#if (CIAO_NA_CONFIGURATOR_NTRACE == 1)
+#  define CIAO_NA_CONFIGURATOR_TRACE(X)
+#else /* (CIAO_NA_CONFIGURATOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define CIAO_NA_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (CIAO_NA_CONFIGURATOR_NTRACE == 1) */
+
+#endif /* CIAO_NA_CONFIGURATOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp
new file mode 100755
index 00000000000..8c1ffda2579
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp
@@ -0,0 +1,312 @@
+// $Id$
+
+#include "NodeApp_Configurator.h"
+#include "ace/Log_Msg.h"
+
+CIAO::NodeApp_Configurator::NodeApp_Configurator (void)
+  : rt_support_ (0)
+{
+}
+
+CIAO::NodeApp_Configurator::~NodeApp_Configurator (void)
+{
+  // Not much to do.
+}
+
+void
+CIAO::NodeApp_Configurator::set_rt_support (void)
+{
+  this->rt_support_ = 1;
+}
+
+int
+CIAO::NodeApp_Configurator::create_config_managers (void)
+{
+  typedef CIAO::Config_Manager * (*na_intelligent_designer)(void);
+  typedef CIAO::Config_Manager * (*rtna_intelligent_designer)(void);
+  CIAO::Config_Manager* ptr = 0;
+  CIAO::Config_Manager* rt_ptr = 0;
+
+  int retval = this->config_dll_.open (
+                  ACE_DLL_PREFIX ACE_TEXT ("CIAO_NA_Configurator"),
+                  ACE_DEFAULT_SHLIB_MODE,
+                  0);
+
+  if (0 != retval)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%p\n",
+                         "dll.open"),
+                        0);
+    }
+
+  // Cast the void* to non-pointer type first - it's not legal to
+  // cast a pointer-to-object directly to a pointer-to-function.
+  void *void_ptr =
+    this->config_dll_.symbol (ACE_TEXT ("create_na_config_manager"));
+  ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (void_ptr);
+
+  // "id" is for na_intelligent-designer.
+  na_intelligent_designer config_id =
+    reinterpret_cast<na_intelligent_designer> (tmp);
+
+  if (0 == config_id)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%p",
+                         "dll.symbol"),
+                        0);
+    }
+
+  ptr = config_id ();
+
+  if (0 == ptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Error creating NodeApp_Configurator\n"),
+                        0);
+    }
+
+  this->na_config_manager_.reset (ptr);
+
+  if (this->rt_support_)
+    {
+      int rt_retval = this->config_dll_.open (
+                      ACE_DLL_PREFIX ACE_TEXT ("CIAO_RTNA_Configurator"),
+                      ACE_DEFAULT_SHLIB_MODE,
+                      0);
+
+      if (0 != rt_retval)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "%p\n",
+                             "dll.open"),
+                            0);
+        }
+
+      // Cast the void* to non-pointer type first - it's not legal to
+      // cast a pointer-to-object directly to a pointer-to-function.
+      void *rt_void_ptr =
+        this->config_dll_.symbol (ACE_TEXT ("create_rt_config_manager"));
+      ptrdiff_t rt_tmp = reinterpret_cast<ptrdiff_t> (rt_void_ptr);
+
+      // "id" is for na_intelligent-designer.
+      rtna_intelligent_designer rt_config_id =
+        reinterpret_cast<rtna_intelligent_designer> (rt_tmp);
+
+      if (0 == rt_config_id)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "%p",
+                             "dll.symbol"),
+                            0);
+        }
+
+      rt_ptr = rt_config_id ();
+
+      if (0 == rt_ptr)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Error creating RTNodeApp_Configurator\n"),
+                            0);
+        }
+
+      this->rt_config_manager_.reset (rt_ptr);
+    }
+
+  return 0;
+}
+
+int
+CIAO::NodeApp_Configurator::pre_orb_initialize ()
+{
+  ACE_DEBUG ((LM_DEBUG, "NodeApp_Configurator::pre_orb_init\n"));
+
+  (*this->na_config_manager_.get ()).pre_orb_initialize ();
+  if (this->rt_support_)
+    {
+      (*this->rt_config_manager_.get ()).pre_orb_initialize ();
+    }
+
+  return 0;
+}
+
+int
+CIAO::NodeApp_Configurator::post_orb_initialize (CORBA::ORB_ptr o)
+{
+  ACE_DEBUG ((LM_DEBUG, "NodeApp_Configurator::post_orb_init\n"));
+  this->orb_ = CORBA::ORB::_duplicate (o);
+
+  (*this->na_config_manager_.get ()).init (this->orb_.in ());
+  if (this->rt_support_ == 1)
+    {
+      (*this->rt_config_manager_.get ()).init (this->orb_.in ());
+    }
+
+  (*this->na_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
+  if (this->rt_support_ == 1)
+    {
+      (*this->rt_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
+    }
+
+  return 0;
+}
+
+int
+CIAO::NodeApp_Configurator::init_resource_manager
+(const ::Deployment::Properties &properties)
+{
+  for (CORBA::ULong i = 0; i < properties.length (); ++i)
+    {
+      if (ACE_OS::strcmp (
+          "CIAOServerResources", properties[i].name.in ()) == 0)
+        {
+          const CIAO::DAnCE::ServerResource *svr_resource;
+          if (properties[i].value >>= svr_resource)
+            {
+              (*this->na_config_manager_.get ()).
+                      init_resources (*svr_resource);
+
+              if (this->rt_support_ == 1)
+                {
+                  (*this->rt_config_manager_.get ()).
+                      init_resources (*svr_resource);
+                }
+            }
+          else
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                               "ERROR: NodeApp_Configurator::"
+                               "init_resource_manager unable to extract"
+                               "CIAOServerResources\n"), -1);
+            }
+        }
+    }
+
+  return 0;
+}
+
+CORBA::PolicyList *
+CIAO::NodeApp_Configurator::find_container_policies
+(const ::Deployment::Properties &properties)
+{
+  CORBA::PolicyList *configured_policies = 0;
+  CORBA::PolicyList *rt_configured_policies = 0;
+
+  for (CORBA::ULong i = 0; i < properties.length (); ++i)
+    {
+      if (ACE_OS::strcmp ("ContainerPolicySet", properties[i].name) == 0)
+        {
+          const char *policy_name;
+          if (properties[i].value >>= policy_name)
+            {
+              configured_policies = (*this->na_config_manager_.get ()).
+                      find_policies_by_name (policy_name);
+
+              CORBA::ULong p_length = 0;
+              if (configured_policies != 0)
+                {
+                  p_length = configured_policies->length ();
+                }
+
+              if (this->rt_support_ == 1)
+                {
+                  rt_configured_policies = (*this->rt_config_manager_.get ()).
+                      find_policies_by_name (policy_name);
+                }
+
+              CORBA::PolicyList_var temp_policies;
+              CORBA::ULong rtp_length = 0;
+              if (rt_configured_policies != 0)
+                {
+                  rtp_length = rt_configured_policies->length ();
+                  temp_policies = rt_configured_policies;
+                }
+              else
+                {
+                  return configured_policies;
+                }
+
+              CORBA::ULong final_length = p_length + rtp_length;
+              temp_policies->length (final_length);
+
+              for (CORBA::ULong i = 0; i < p_length; ++i)
+                {
+                  temp_policies[i+rtp_length] =
+                     CORBA::Policy::_duplicate ((*configured_policies)[i]);
+                }
+              return temp_policies._retn ();
+            }
+          else
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "ERROR: NodeApp_Configurator:"
+                    "find_container_policies unable to extract"
+                    "ContainerPolicySet\n"), 0);
+            }
+        }
+    }
+  return 0;
+}
+
+CORBA::PolicyList *
+CIAO::NodeApp_Configurator::find_policies_by_name (const char *policy_name)
+{
+  CORBA::PolicyList *configured_policies = 0;
+  CORBA::PolicyList *rt_configured_policies = 0;
+
+  configured_policies = (*this->na_config_manager_.get ()).
+          find_policies_by_name (policy_name);
+
+  CORBA::ULong p_length = 0;
+  if (configured_policies != 0)
+    {
+      p_length = configured_policies->length ();
+    }
+
+  if (this->rt_support_ == 1)
+    {
+      rt_configured_policies = (*this->rt_config_manager_.get ()).
+          find_policies_by_name (policy_name);
+    }
+
+  CORBA::PolicyList_var temp_policies;
+  CORBA::ULong rtp_length = 0;
+  if (rt_configured_policies != 0)
+    {
+      rtp_length = rt_configured_policies->length ();
+      temp_policies = rt_configured_policies;
+    }
+  else
+    {
+      return configured_policies;
+    }
+
+  CORBA::ULong final_length = p_length + rtp_length;
+  temp_policies->length (final_length);
+
+  for (CORBA::ULong i = 0; i < p_length; ++i)
+    {
+      temp_policies[i+rtp_length] =
+         CORBA::Policy::_duplicate ((*configured_policies)[i]);
+    }
+  return temp_policies._retn ();
+}
+
+bool
+CIAO::NodeApp_Configurator::policy_exists (const char *policy_set_id)
+{
+  bool result;
+  result = (*this->na_config_manager_.get ()).
+               policy_exists (policy_set_id);
+
+  if (result == false)
+    {
+      if (this->rt_support_ == 1)
+        {
+          result = (*this->rt_config_manager_.get ()).
+                         policy_exists (policy_set_id);
+        }
+    }
+  return result;
+}
diff --git a/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
index b3eb92b4482..7ec10b9f053 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
@@ -20,7 +20,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
+#include "Config_Manager.h"
+#include "ace/DLL.h"
+#include "ace/Auto_Ptr.h"
+#include "NodeApp_Configurator_Export.h"
 
 namespace CIAO
 {
@@ -32,39 +36,64 @@ namespace CIAO
    * NodeApp_Configurator base class that's needed for configuring the
    * NodeApplication process.
    **/
-  class NodeApp_Configurator
+  class NODEAPP_Configurator_Export NodeApp_Configurator
   {
   public:
+
+    /// Default constructor.
+    NodeApp_Configurator (void);
+
     /// Default destructor.
-    virtual ~NodeApp_Configurator (void) {}
+    virtual ~NodeApp_Configurator (void);
 
     /**
      * @brief "pre_orb_initialize" is called before ORB_init.
      */
-    virtual int pre_orb_initialize (void) = 0;
+    virtual int pre_orb_initialize (void);
 
     /**
      * @brief "post_orb_initialize" is called after NodeApplication
      * get a hold at this object.
      */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o) = 0;
+    virtual int post_orb_initialize (CORBA::ORB_ptr o);
 
     /**
      * @brief "init_resource_manager" is called by NodeApplication when
      * it receives an "install" commands.
      */
     virtual int
-    init_resource_manager (const ::Deployment::Properties &properties) = 0;
+    init_resource_manager (const ::Deployment::Properties &properties);
 
     /**
      * @brief get a policyset by its name.
      */
     virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties) = 0;
+    find_container_policies (const ::Deployment::Properties &properties);
 
     /// @@ Perhaps we also need a finalizer method here.  Perhaps we
     /// even need to differentiate finalizer before ORB is destroyed
     /// and the one after that.
+
+    void set_rt_support (void);
+
+    int create_config_managers (void);
+
+    bool policy_exists (const char *policy_set_id);
+
+    CORBA::PolicyList *
+    find_policies_by_name (const char *name);
+
+  protected:
+
+    int rt_support_;
+
+    CORBA::ORB_var orb_;
+
+    auto_ptr<Config_Manager> rt_config_manager_;
+
+    auto_ptr<Config_Manager> na_config_manager_;
+
+    ACE_DLL config_dll_;
   };
 }
 
diff --git a/CIAO/DAnCE/NodeApplication/NodeApp_Configurator_Export.h b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator_Export.h
new file mode 100644
index 00000000000..48db48231ac
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/NodeApp_Configurator_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NODEAPP_Configurator
+// ------------------------------
+#ifndef NODEAPP_CONFIGURATOR_EXPORT_H
+#define NODEAPP_CONFIGURATOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (NODEAPP_CONFIGURATOR_HAS_DLL)
+#  define NODEAPP_CONFIGURATOR_HAS_DLL 1
+#endif /* ! NODEAPP_CONFIGURATOR_HAS_DLL */
+
+#if defined (NODEAPP_CONFIGURATOR_HAS_DLL) && (NODEAPP_CONFIGURATOR_HAS_DLL == 1)
+#  if defined (NODEAPP_CONFIGURATOR_BUILD_DLL)
+#    define NODEAPP_Configurator_Export ACE_Proper_Export_Flag
+#    define NODEAPP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NODEAPP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NODEAPP_CONFIGURATOR_BUILD_DLL */
+#    define NODEAPP_Configurator_Export ACE_Proper_Import_Flag
+#    define NODEAPP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NODEAPP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NODEAPP_CONFIGURATOR_BUILD_DLL */
+#else /* NODEAPP_CONFIGURATOR_HAS_DLL == 1 */
+#  define NODEAPP_Configurator_Export
+#  define NODEAPP_CONFIGURATOR_SINGLETON_DECLARATION(T)
+#  define NODEAPP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NODEAPP_CONFIGURATOR_HAS_DLL == 1 */
+
+// Set NODEAPP_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NODEAPP_CONFIGURATOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NODEAPP_CONFIGURATOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NODEAPP_CONFIGURATOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NODEAPP_CONFIGURATOR_NTRACE */
+
+#if (NODEAPP_CONFIGURATOR_NTRACE == 1)
+#  define NODEAPP_CONFIGURATOR_TRACE(X)
+#else /* (NODEAPP_CONFIGURATOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NODEAPP_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NODEAPP_CONFIGURATOR_NTRACE == 1) */
+
+#endif /* NODEAPP_CONFIGURATOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index a801e308c5c..69c31b3e790 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,19 +1,41 @@
 // -*- MPC -*-
 // $Id$
 
-project(NoOp_Configurator): ciao_deployment_stub {
+project(NodeApp_Configurator): ciao_deployment_stub {
+  sharedname   = CIAO_NodeApp_Configurator
+  dynamicflags = NODEAPP_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    NodeApp_Configurator.cpp
+  }
+}
+
+project(NoOp_Configurator): ciao_deployment_stub, ciao_nodeapp_configurator {
   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 {
+project(RTNA_Configurator): ciao_deployment_stub, rt_server, ciao_nodeapp_configurator {
+  sharedname   = CIAO_RTNA_Configurator
+  dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    RTConfig_Manager.cpp
+  }
+}
+
+project(NA_Configurator): ciao_deployment_stub, diffservpolicy, ciao_nodeapp_configurator {
+  sharedname   = CIAO_NA_Configurator
+  dynamicflags = CIAO_NA_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    NAConfig_Manager.cpp
+  }
+}
+
+project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_nodeapp_configurator {
   sharedname   = CIAO_NodeApplication
   dynamicflags = NODEAPPLICATION_BUILD_DLL
-
   Source_Files {
     Configurator_Factory.cpp
     Container_Impl.cpp
@@ -22,20 +44,10 @@ project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configu
   }
 }
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciao_noop_configurator {
+project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciaoexe {
   exename   = NodeApplication
-
   Source_Files {
     NodeApplication.cpp
   }
 }
 
-project(RTNA_Configurator): ciao_deployment_stub, rt_server {
-  sharedname   = CIAO_RTNA_Configurator
-  dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
-
-  Source_Files {
-    RTNodeApp_Configurator.cpp
-    RTConfig_Manager.cpp
-  }
-}
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index eef577b2cfd..de85c365c5f 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 "DAnCE/Deployment/CIAO_NodeApplication_CallBackC.h"
 #include "ace/Sched_Params.h"
 #include "NodeApplication_Impl.h"
 #include "NodeApplication_Core.h"
@@ -180,6 +180,9 @@ CIAO::NodeApplication_Core::startup (int argc, char *argv[])
   // pre-init
   this->configurator_.reset (this->options_.create_nodeapp_configurator ());
 
+  if (this->configurator_->create_config_managers ())
+    return -1;
+
   if (this->configurator_->pre_orb_initialize ())
     return -1;
 
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index afbb5c9bcc6..c0e85d79b4a 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -3,7 +3,7 @@
 #include "NodeApplication_Impl.h"
 #include "ace/SString.h"
 #include "Container_Impl.h"
-#include "Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 #include "ciaosvcs/Events/CIAO_RTEC/CIAO_RTEventC.h"
 
 #if !defined (__ACE_INLINE__)
@@ -17,7 +17,6 @@ CIAO::NodeApplication_Impl::~NodeApplication_Impl (void)
 
 CORBA::Long
 CIAO::NodeApplication_Impl::init ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// @todo initialize this NodeApplication properties
   return 0;
@@ -27,7 +26,6 @@ CORBA::Long
 CIAO::NodeApplication_Impl::create_all_containers (
     const ::Deployment::ContainerImplementationInfos & container_infos
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create all the containers here based on the input node_impl_info.
   CORBA::ULong const len = container_infos.length ();
@@ -61,9 +59,6 @@ CIAO::NodeApplication_Impl::finishLaunch (
     const Deployment::Connections & providedReference,
     CORBA::Boolean start,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::InvalidConnection))
 {
   ACE_UNUSED_ARG (start);
 
@@ -77,9 +72,6 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
     const Deployment::Connections & connections,
     CORBA::Boolean start,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::InvalidConnection))
 {
   ACE_UNUSED_ARG (start);
 
@@ -177,8 +169,6 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
 void
 CIAO::NodeApplication_Impl::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   Component_Iterator end = this->component_state_map_.end ();
   for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -196,8 +186,6 @@ CIAO::NodeApplication_Impl::ciao_preactivate ()
 
 void
 CIAO::NodeApplication_Impl::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   Component_Iterator end = this->component_state_map_.end ();
   for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -215,8 +203,6 @@ CIAO::NodeApplication_Impl::start ()
 
 void
 CIAO::NodeApplication_Impl::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
 {
   Component_Iterator end = this->component_state_map_.end ();
   for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -234,8 +220,6 @@ CIAO::NodeApplication_Impl::ciao_postactivate ()
 
 void
 CIAO::NodeApplication_Impl::ciao_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
 {
   Component_Iterator end = this->component_state_map_.end ();
   for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -252,11 +236,6 @@ CIAO::NodeApplication_Impl::ciao_passivate ()
 Deployment::ComponentInfos *
 CIAO::NodeApplication_Impl::install (
     const ::Deployment::NodeImplementationInfo & node_impl_info)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::UnknownImplId,
-                   Deployment::ImplEntryPointNotFound,
-                   Deployment::InstallationFailure,
-                   Components::InvalidConfiguration))
 {
   Deployment::ComponentInfos_var retv;
   try
@@ -358,8 +337,6 @@ CIAO::NodeApplication_Impl::install (
 
 void
 CIAO::NodeApplication_Impl::remove_component (const char * inst_name)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Components::RemoveFailure))
 {
   ACE_DEBUG ((LM_DEBUG, "NA_I: removing component %s\n",
         inst_name));
@@ -385,8 +362,6 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name)
 
 void
 CIAO::NodeApplication_Impl::passivate_component (const char * name)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Components::RemoveFailure))
 {
   Component_State_Info comp_state;
 
@@ -411,8 +386,6 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name)
 
 void
 CIAO::NodeApplication_Impl::activate_component (const char * name)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::StartError))
 {
   Component_State_Info comp_state;
 
@@ -444,7 +417,6 @@ CIAO::NodeApplication_Impl::activate_component (const char * name)
 
 void
 CIAO::NodeApplication_Impl::remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we still have components installed, then do nothing
 
@@ -490,9 +462,6 @@ CIAO::NodeApplication_Impl::remove ()
 ::Deployment::Container_ptr
 CIAO::NodeApplication_Impl::create_container (
     const ::Deployment::Properties &properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  ::Components::CreateFailure,
-                  ::Components::InvalidConfiguration))
 {
   //if (CIAO::debug_level () > 1)
   //  ACE_DEBUG ((LM_DEBUG, "ENTERING: NodeApplication_Impl::create_container()\n"));
@@ -506,6 +475,7 @@ CIAO::NodeApplication_Impl::create_container (
                     CIAO::Container_Impl (this->orb_.in (),
                                           this->poa_.in (),
                                           this->get_objref (),
+                                          this->configurator_,
                                           this->static_entrypts_maps_),
                     CORBA::NO_MEMORY ());
 
@@ -545,8 +515,6 @@ CIAO::NodeApplication_Impl::create_container (
 // Remove a container interface.
 void
 CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  ::Components::RemoveFailure))
 {
   ACE_DEBUG ((LM_DEBUG, "ENTERING: NodeApplication_Impl::remove_container()\n"));
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -576,7 +544,6 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref)
 // Get containers
 ::Deployment::Containers *
 CIAO::NodeApplication_Impl::get_containers ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -584,8 +551,6 @@ CIAO::NodeApplication_Impl::get_containers ()
 CIAO::CIAO_Event_Service *
 CIAO::NodeApplication_Impl::
 install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
-ACE_THROW_SPEC ((::CORBA::SystemException,
-                 ::Deployment::InstallationFailure))
 {
   try
     {
@@ -616,7 +581,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
 
@@ -629,7 +594,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
 
@@ -644,7 +609,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
         }
@@ -653,7 +618,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
-      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+      throw ::Deployment::InstallationFailure ();
     }
 
 }
@@ -684,8 +649,6 @@ handle_facet_receptable_connection (
     Components::CCMObject_ptr comp,
     const Deployment::Connection & connection,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
 {
   if (CIAO::debug_level () > 11)
     {
@@ -760,8 +723,6 @@ handle_emitter_consumer_connection (
     Components::CCMObject_ptr comp,
     const Deployment::Connection & connection,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
 {
   Components::EventConsumerBase_var consumer =
       Components::EventConsumerBase::_narrow (connection.endpoint.in ());
@@ -834,8 +795,6 @@ handle_publisher_consumer_connection (
     Components::CCMObject_ptr comp,
     const Deployment::Connection & connection,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
 {
   Components::EventConsumerBase_var consumer =
       Components::EventConsumerBase::_narrow (connection.endpoint.in ());
@@ -922,8 +881,6 @@ handle_publisher_es_connection (
     Components::CCMObject_ptr comp,
     const Deployment::Connection & connection,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
 {
   if (! this->_is_publisher_es_conn (connection))
     {
@@ -1017,8 +974,6 @@ CIAO::NodeApplication_Impl::
 handle_es_consumer_connection (
     const Deployment::Connection & connection,
     CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
 {
   if (! this->_is_es_consumer_conn (connection))
     {
@@ -1131,8 +1086,6 @@ void
 CIAO::NodeApplication_Impl::build_event_connection (
     const Deployment::Connection & connection,
     bool add_or_remove)
-  ACE_THROW_SPEC ((Deployment::InvalidConnection,
-                   CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplication_Impl::build_connection ()!!!\n"));
 
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index c412b1aa9f5..70d5c1ee0fd 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -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 "DAnCE/Deployment/Deployment_NodeApplicationS.h"
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 #include "ciao/Object_Set_T.h"
@@ -34,7 +34,7 @@
 #include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventsS.h"
 
 #include "NodeApp_Configurator.h"
-#include "Container_Base.h"
+#include "Session_Container.h"
 
 using CIAO::Utility::write_IOR;
 
@@ -98,97 +98,57 @@ namespace CIAO
     virtual void
     finishLaunch (const Deployment::Connections & connections,
                   CORBA::Boolean start,
-                  CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError,
-                       Deployment::InvalidConnection));
+                  CORBA::Boolean add_connection);
 
-    virtual void
-    start ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
+    virtual void start ();
 
     /*-------------  CIAO specific IDL operations (idl)----------
      *
      *-----------------------------------------------------------*/
 
-    virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
+    virtual void ciao_preactivate ();
 
-    virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
+    virtual void ciao_postactivate ();
 
-    virtual void
-    ciao_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError));
+    virtual void ciao_passivate ();
 
     /// Initialize the NodeApplication
-    virtual CORBA::Long init ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long init ();
 
     /// Start install homes and components.
     virtual ::Deployment::ComponentInfos *
-      install (const ::Deployment::NodeImplementationInfo & node_impl_info)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::UnknownImplId,
-                       ::Deployment::ImplEntryPointNotFound,
-                       ::Deployment::InstallationFailure,
-                       ::Components::InvalidConfiguration));
+      install (const ::Deployment::NodeImplementationInfo & node_impl_info);
 
     /// Install a number of CIAO_Event_Service objects within the NA
     virtual ::CIAO::CIAO_Event_Service *
-      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::InstallationFailure));
+      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info);
 
     /// Get the object reference of the NodeApplicationManager.
     /// This might come in handy later.
-    virtual ::CORBA::Object_ptr
-    get_node_application_manager ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::Object_ptr get_node_application_manager ();
 
     /// Access the readonly attribute.
-    virtual ::Deployment::Properties *
-    properties ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::Properties * properties ();
 
     /// Remove a component instance from the NodeApplication
-    virtual void remove_component (const char * inst_name)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Components::RemoveFailure));
+    virtual void remove_component (const char * inst_name);
 
-    virtual void activate_component (const char * name)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::StartError));
+    virtual void activate_component (const char * name);
 
-    virtual void passivate_component (const char * name)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Components::RemoveFailure));
+    virtual void passivate_component (const char * name);
 
     /// Remove everything inside including all components and homes.
-    virtual void remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void remove ();
 
     /// Create a container interface, which will be hosted in this NodeApplication.
     virtual ::Deployment::Container_ptr
-      create_container (const ::Deployment::Properties &properties)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::CreateFailure,
-                       ::Components::InvalidConfiguration));
+      create_container (const ::Deployment::Properties &properties);
 
     /// Remove a container interface.
-    virtual void remove_container (::Deployment::Container_ptr cref)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::RemoveFailure));
+    virtual void remove_container (::Deployment::Container_ptr cref);
 
     /// Get all container object refs
-    virtual ::Deployment::Containers * get_containers ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::Containers * get_containers ();
 
     /*-------------  CIAO specific helper functions (C++)---------
      *
@@ -215,9 +175,7 @@ namespace CIAO
     /// event connection.
     void build_event_connection (
         const Deployment::Connection & connection,
-        bool add_or_remove)
-      ACE_THROW_SPEC ((Deployment::InvalidConnection,
-                       CORBA::SystemException));
+        bool add_or_remove);
 
   protected:
     /// If <add_connection> is "false", then we shall "remove"
@@ -225,33 +183,24 @@ namespace CIAO
     virtual void
     finishLaunch_i (const Deployment::Connections & connections,
                     CORBA::Boolean start,
-                    CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError,
-                       Deployment::InvalidConnection));
+                    CORBA::Boolean add_connection);
     virtual void
     handle_facet_receptable_connection (
         Components::CCMObject_ptr comp,
         const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     virtual void
     handle_emitter_consumer_connection (
         Components::CCMObject_ptr comp,
         const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     virtual void
     handle_publisher_consumer_connection (
         Components::CCMObject_ptr comp,
         const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     virtual bool
     _is_es_consumer_conn (Deployment::Connection conn);
@@ -266,22 +215,17 @@ namespace CIAO
     handle_publisher_es_connection (
         Components::CCMObject_ptr comp,
         const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     /// Register the consumer to the CIAO event service
     virtual void
     handle_es_consumer_connection (
         const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::InvalidConnection));
+        CORBA::Boolean add_connection);
 
     /// Create and initialize all the containers
     virtual CORBA::Long create_all_containers (
-        const ::Deployment::ContainerImplementationInfos & container_infos)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const ::Deployment::ContainerImplementationInfos & container_infos);
 
     /// Create a "key" for the connection
     virtual ACE_CString *
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
index 2fefdcc84d4..07438304994 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
@@ -20,7 +20,6 @@ NodeApplication_Impl (CORBA::ORB_ptr o,
 ACE_INLINE
 Deployment::Properties *
 CIAO::NodeApplication_Impl::properties ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Deployment::Properties * tmp = 0;
 
@@ -42,7 +41,6 @@ CIAO::NodeApplication_Impl::_default_POA (void)
 ACE_INLINE
 CORBA::Object_ptr
 CIAO::NodeApplication_Impl::get_node_application_manager ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::CORBA::Object::_duplicate (this->node_app_manager_.in ());
 }
@@ -53,7 +51,6 @@ CIAO::NodeApplication_Impl::
 set_objref (Components::Deployment::ServerActivator_ptr act,
             const Components::ConfigValues &config,
             Components::Deployment::ComponentServer_ptr cs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!CORBA::is_nil (this->node_app_manager_.in ()) ||
       !CORBA::is_nil (this->objref_.in ()))
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index b0dfb8a9ac0..0f400349237 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -9,15 +9,28 @@
 #endif /* __ACE_INLINE__ */
 
 void
-CIAO::RTResource_Config_Manager::init (RTCORBA::RTORB_ptr rtorb)
+CIAO::RTResource_Config_Manager::init (CORBA::ORB_ptr orb)
 {
-  this->rtorb_ = RTCORBA::RTORB::_duplicate (rtorb);
+  CORBA::Object_var object =
+    orb->resolve_initial_references ("RTORB");
+  this->rtorb_ = RTCORBA::RTORB::_narrow (object.in ());
+}
+
+int
+CIAO::RTResource_Config_Manager::pre_orb_initialize (void)
+{
+  return 0;
+}
+
+int
+CIAO::RTResource_Config_Manager::post_orb_initialize (CORBA::ORB_ptr)
+{
+  return 0;
 }
 
 void
 CIAO::RTResource_Config_Manager::print_resources
 (const CIAO::DAnCE::ServerResource &server_resource)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CIAO::DAnCE::ORBResource &orb_resource
     = server_resource.orb_config.orb_resources[0];
@@ -103,7 +116,6 @@ CIAO::RTResource_Config_Manager::print_resources
 void
 CIAO::RTResource_Config_Manager::init_resources
 (const CIAO::DAnCE::ServerResource &server_resource)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "RTResource_Config_Manager::init_resource.\n"));
@@ -251,36 +263,59 @@ CIAO::RTResource_Config_Manager::init_resources
 
       CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np);
       policy_list->length (np);
+      CORBA::ULong index = 0;
+      CORBA::ULong array_index = np;
 
       // Create a list of policies
       for (CORBA::ULong pc = 0; pc < np; ++pc)
         {
-          policy_list[pc] = this->create_single_policy (sets[i].policies[pc]);
+          CORBA::Policy_var temp_policy =
+            this->create_single_policy (sets[i].policies[pc]);
+          if (CORBA::is_nil (temp_policy.in ()))
+            {
+              array_index = array_index - 1;
+              policy_list->length (array_index);
+            }
+          else
+            {
+              policy_list[index] = CORBA::Policy::_duplicate (temp_policy.in ());
+              index = index + 1;
+            }
         }
 
       // Bind the policy list to the name.  The bind operation should
       // surrender the ownership of the newly created PolicyList
       // sequence to the map.
-      if (this->policy_map_.bind (sets[i].Id.in (),
-                                  policy_list) != 0)
+      if (array_index != 0)
         {
-          ACE_ERROR ((LM_ERROR,
-                      "Error binding Policy_Set with name: %s\n",
-                      sets[i].Id.in ()));
-          throw CORBA::INTERNAL ();
+          if (this->policy_map_.bind (sets[i].Id.in (),
+                                      policy_list._retn ()) != 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "Error binding Policy_Set with name: %s\n",
+                          sets[i].Id.in ()));
+              throw CORBA::INTERNAL ();
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "RTResource_Config_Manager::init_resource "
+                          "added policy set: %s with %d policies\n",
+                          sets[i].Id.in (), array_index));
+            }
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "RTResource_Config_Manager::init_resource added policy set: %s\n",
-                      sets[i].Id.in ()));
+                      "RTResource_Config_Manager::init_resource "
+                      "added policy set: %s with %d policies\n",
+                      sets[i].Id.in (), array_index));
         }
     }
 }
 
 void
 CIAO::RTResource_Config_Manager::fini ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TP_MAP::ITERATOR iter = this->threadpool_map_.begin ();
   TP_MAP::ITERATOR end = this->threadpool_map_.end ();
@@ -294,13 +329,12 @@ CIAO::RTResource_Config_Manager::fini ()
 
 RTCORBA::ThreadpoolId
 CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_threadpool_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
 
@@ -311,7 +345,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a threadpool named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   return ret_id;
@@ -319,13 +353,12 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
 
 RTCORBA::PriorityBands *
 CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_priority_bands_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
   PB_MAP::ENTRY *entry = 0;
@@ -335,7 +368,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a connection bands named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   RTCORBA::PriorityBands_var retv = new RTCORBA::PriorityBands;
@@ -343,15 +376,35 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
   return retv._retn ();
 }
 
+bool
+CIAO::RTResource_Config_Manager::policy_exists (const char *name)
+{
+  if (name == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Invalid name string found in "
+                  "CIAO::NAResource_Config_Manager::policy_exists\n"));
+      throw CORBA::INTERNAL ();
+    }
+
+  POLICY_MAP::ENTRY *entry = 0;
+
+  if (this->policy_map_.find (name, entry) != 0)
+    {
+      return false;
+    }
+
+  return true;
+}
+
 CORBA::PolicyList *
 CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_policies_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
 
@@ -365,7 +418,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a PolicyList named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   // duplicate the sequence PolicyList.
@@ -380,7 +433,6 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
 CORBA::Policy_ptr
 CIAO::RTResource_Config_Manager::create_single_policy
 (const CIAO::DAnCE::PolicyDef &policy_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //  if (CIAO::debug_level () > 9)
     ACE_DEBUG ((LM_DEBUG,
@@ -438,11 +490,24 @@ CIAO::RTResource_Config_Manager::create_single_policy
       break;
 
     default:
-      ACE_ERROR ((LM_ERROR,
-                  "Invalid policy type - RTPolicy_Set_Manager::create_single_policy\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      retv = 0;
     }
 
   return retv._retn ();
 }
 
+CIAO::RTResource_Config_Manager::~RTResource_Config_Manager ()
+{
+  this->fini ();
+}
+
+extern "C" CIAO_RTNA_Configurator_Export CIAO::Config_Manager
+*create_rt_config_manager (void);
+
+CIAO::Config_Manager *
+create_rt_config_manager (void)
+{
+  CIAO::RTResource_Config_Manager *config;
+  ACE_NEW_RETURN (config, CIAO::RTResource_Config_Manager, 0);
+  return config;
+}
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
index 514a13cb797..53ca9de018a 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
@@ -25,10 +25,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/RTCORBA/RTCORBA.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "Config_Manager.h"
+#include "RTNA_Configurator_Export.h"
 
 namespace CIAO
 {
@@ -47,39 +49,39 @@ namespace CIAO
    * Currently, the only resources supported (and managed) by this
    * class are Threadpool and Threadpool_with_Lanes.
    */
-  class RTResource_Config_Manager
+  class RTResource_Config_Manager : public Config_Manager
   {
   public:
     RTResource_Config_Manager (void);
     ~RTResource_Config_Manager (void);
 
-    void init (RTCORBA::RTORB_ptr rtorb);
+    virtual void init (CORBA::ORB_ptr orb);
+
+    virtual int pre_orb_initialize (void);
+
+    virtual int post_orb_initialize (CORBA::ORB_ptr o);
 
     /// Initializing the RTResource_Config_Manager
-    void init_resources (const CIAO::DAnCE::ServerResource &info)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void init_resources (const CIAO::DAnCE::ServerResource &info);
 
     /// Finalizing the RTResource_Config_Manager and the resources it
     /// manages.
-    void fini ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void fini ();
 
     /// Query a policy set by name
-    CORBA::PolicyList *find_policies_by_name (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::PolicyList *find_policies_by_name (const char *name);
+
+    virtual bool policy_exists (const char *name);
 
   protected:
-    void print_resources (const CIAO::DAnCE::ServerResource &info)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void print_resources (const CIAO::DAnCE::ServerResource &info);
 
     /// Query a thread pool by name.
-    RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name);
 
 
     /// Query a priority bands info by name.
-    RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name);
 
   private:
     /// Cached an ORB reference.
@@ -109,8 +111,7 @@ namespace CIAO
 
     /// create a single policy
     CORBA::Policy_ptr create_single_policy
-    (const CIAO::DAnCE::PolicyDef &policy_def)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    (const CIAO::DAnCE::PolicyDef &policy_def);
 
     /// Hash_Map stuff.
     typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl
index 9537e7569ac..7962506555d 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl
@@ -5,9 +5,3 @@ CIAO::RTResource_Config_Manager::RTResource_Config_Manager ()
 {
 }
 
-ACE_INLINE
-CIAO::RTResource_Config_Manager::~RTResource_Config_Manager ()
-{
-  this->fini ();
-}
-
diff --git a/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
index 741d4263188..04e7bd91f74 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 "DAnCE/Deployment/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..1472f598751 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -3,7 +3,7 @@
 #include "Containers_Info_Map.h"
 #include "ciao/CIAO_Config.h"
 #include "ciao/CIAO_common.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 //Added for HTTP
 #include "URL_Parser.h"              //for parsing the URL
@@ -80,108 +80,180 @@ namespace CIAO
     // component instance. For each policy set, we create a separate container
     // to host all the components with such policy set.
     // NOTE: all the component instances without policies are specified should
-    // be hosted in the same container, and in our map the key is an empty string ""
+    // be hosted in the same container, and in our map the key is an empty
+    // string ""
+    int first_time = 0;
     for (CORBA::ULong i = 0; i < instance_len; ++i)
       {
         CORBA::String_var my_resource_id ("");
-        const char *my_policy_set_id = "";
+        const char *diff_policy_set_id = "";
+        bool found = false;
 
         // @@ super hack here.  we are assuming RT policy set is
         // the only thing that will be specified.
-        if (this->plan_.instance[i].deployedResource.length () != 0)
+        CORBA::ULong dp_length =
+          this->plan_.instance[i].deployedResource.length ();
+
+        if (dp_length == 0)
+          {
+            found = true;
+          }
+
+        for (CORBA::ULong x = 0; x < dp_length; ++x)
           {
             my_resource_id =
-              this->plan_.instance[i].deployedResource[0].resourceName.in ();
+              this->plan_.instance[i].deployedResource[x].resourceName.in ();
 
-            this->plan_.instance[i].deployedResource[0].property[0].value >>=
-              my_policy_set_id;
+            CORBA::ULong property_length =
+              this->plan_.instance[i].deployedResource[x].property.length ();
+
+            found = true;
+
+            for (CORBA::ULong p = 0; p < property_length; ++p)
+              {
+                if (ACE_OS::strcmp (
+                      this->plan_.instance[i].deployedResource[x].
+                      property[p].name.in (),
+                      "CIAO:InstancePolicy") == 0)
+                  { // should be only one of them.
+                    // each instance will have one one CIAO:InstancePolicy
+                    // definition.
+                    this->plan_.instance[i].deployedResource[x].property[p].
+                    value >>= diff_policy_set_id;
+                    if (this->map_.find (diff_policy_set_id) != 0)
+                      {
+                        // we found a policy that is different from what
+                        // we have seen before.
+                        found = true;
+                      }
+                    else
+                      {
+                        found = false;
+                      }
+                  }
+              }
           }
 
         // If we find a existing policy_set_id, then do nothing.
-        if (this->map_.find (my_policy_set_id) == 0)
-          continue;
-        if (ACE_OS::strcmp (my_policy_set_id, "") == 0)
+        if (found == false)
           {
-            // no policy set id has been specified
-            Deployment::ContainerImplementationInfo * info;
-            ACE_NEW (info, Deployment::ContainerImplementationInfo);
-            this->map_.bind (my_policy_set_id, info);
+            // we did not find a new instance policy.
+            // but the instance's receptacles could have their
+            // own policies.
             continue;
           }
+
+        if (ACE_OS::strcmp (diff_policy_set_id, "") == 0)
+          {
+            // no policy set id has been specified
+            // but we could have some receptacle policies around.
+            //
+            if (first_time == 0)
+              {
+                Deployment::ContainerImplementationInfo * info;
+                ACE_NEW (info, Deployment::ContainerImplementationInfo);
+                this->map_.bind (diff_policy_set_id, info);
+                first_time = 1;
+                continue;
+              }
+          }
         else
+          {
+            Deployment::ContainerImplementationInfo * info;
+            ACE_NEW (info, Deployment::ContainerImplementationInfo);
 
-    {
-      Deployment::ContainerImplementationInfo * info;
-      ACE_NEW (info, Deployment::ContainerImplementationInfo);
-
-      // Fetch the actual policy_set_def from the infoProperty
-      // Ugly due to the IDL data structure definition! :(
-      CORBA::ULong j;
-      CORBA::ULong infoProperty_length = this->plan_.infoProperty.length ();
-      bool found = false;
-
-      for (j = 0; j < infoProperty_length; ++j)
-        {
-          if (ACE_OS::strcmp (this->plan_.infoProperty[j].name.in (),
-                              "CIAOServerResources") != 0)
-            continue;
+            // Fetch the actual policy_set_def from the infoProperty
+            // Ugly due to the IDL data structure definition! :(
+            CORBA::ULong j;
+            CORBA::ULong infoProperty_length =
+                this->plan_.infoProperty.length ();
 
-          CIAO::DAnCE::ServerResource *server_resource_def = 0;
-          this->plan_.infoProperty[j].value >>= server_resource_def;
-
-          if (ACE_OS::strcmp ((*server_resource_def).Id,
-                              my_resource_id.in ()) == 0)
-            {
-              // Iterate over the policy_sets
-              CORBA::ULong k;
-              CORBA::ULong policy_sets_length =
-                (*server_resource_def).orb_config.policy_set.length ();
-              for (k = 0; k < policy_sets_length; ++k)
-                {
-                  ACE_DEBUG ((LM_DEBUG, "Looking for policy set id: %s\n", my_policy_set_id));
-                  ACE_DEBUG ((LM_DEBUG, "Compare against policy set id: %s\n\n",
-                              (*server_resource_def).orb_config.policy_set[k].Id.in ()));
-
-                  if (ACE_OS::strcmp (my_policy_set_id,
-                          (*server_resource_def).orb_config.policy_set[k].Id) == 0)
-                    {
-                      // Foud the target policy set def
-                      info->container_config.length (1);
-                      info->container_config[0].name =
-                        CORBA::string_dup ("ContainerPolicySet");
-                      info->container_config[0].value <<=
-                        my_policy_set_id;
-                        // (*server_resource_def).orb_config.policy_set[k];
-
-                      ACE_DEBUG ((LM_DEBUG, "Found matching rt policy set*****\n\n"));
-                      found = true;
-                      break;
-                    }
-                }
-              if (k == policy_sets_length)
-                {
-                  // No Server Resource Def found?
-                  ACE_DEBUG ((LM_DEBUG,
-                      "No matching policy set def found in resource def: %s!\n",
-                      my_resource_id.in ()));
-                }
-            }
-
-          // if we successfully found the policy_set_id
-          if (found)
-            break;
-        } // end of for loop for fetching policy_set_def
-
-      if (j == this->plan_.infoProperty.length ())
-        {
-          // No Server Resource Def found?! Inconsistent descriptor files.
-          ACE_ERROR ((LM_ERROR, "(%P|%t) Descriptor error: "
-              "No matching server resource def found for component: %s!\n",
-              this->plan_.instance[i].name.in ()));
-        }
-      else
-        this->map_.bind (my_policy_set_id, info);
-    }
+            for (j = 0; j < infoProperty_length; ++j)
+              {
+                if (ACE_OS::strcmp (this->plan_.infoProperty[j].name.in (),
+                                    "CIAOServerResources") != 0)
+                  continue;
+
+                CIAO::DAnCE::ServerResource *server_resource_def = 0;
+                this->plan_.infoProperty[j].value >>= server_resource_def;
+
+                if (ACE_OS::strcmp ((*server_resource_def).Id,
+                                    my_resource_id.in ()) == 0)
+                  {
+                    // Iterate over the policy_sets
+                    CORBA::ULong k;
+                    CORBA::ULong policy_sets_length =
+                      (*server_resource_def).orb_config.policy_set.length ();
+                    const char *comparing_policy_set_id;
+                    CORBA::ULong config_length;
+                    CORBA::ULong new_config_length;
+                    for (k = 0; k < policy_sets_length; ++k)
+                      {
+                        CORBA::ULong new_dp_length =
+                          this->plan_.instance[i].deployedResource.length ();
+
+                        for (CORBA::ULong z = 0; z < new_dp_length;
+                             ++z)
+                          {
+                            CORBA::ULong new_property_length =
+                              this->plan_.instance[i].deployedResource[z].
+                                property.length ();
+                            for (CORBA::ULong s = 0;
+                                 s < new_property_length; ++s)
+                              {
+                                this->plan_.instance[i].deployedResource[z].
+                                property[s].value >>= comparing_policy_set_id;
+                                if (ACE_OS::strcmp (comparing_policy_set_id,
+                                      (*server_resource_def).
+                                      orb_config.policy_set[k].Id) == 0)
+                                  {
+                                    config_length =
+                                      info->container_config.length ();
+                                    new_config_length =
+                                      config_length + 1;
+                                    info->container_config.length (
+                                      new_config_length);
+                                    if (ACE_OS::strcmp (
+                                         this->plan_.instance[i].
+                                         deployedResource[z].
+                                         property[s].name.in (),
+                                         "CIAO:InstancePolicy") == 0)
+                                      {
+                                        info->
+                                         container_config[config_length].name =
+                                          CORBA::string_dup
+                                            ("ContainerPolicySet");
+                                      }
+                                    else if (ACE_OS::strcmp (
+                                              this->plan_.instance[i].
+                                              deployedResource[z].
+                                              property[s].name.in (),
+                                              "CIAO:ReceptaclePolicy") == 0)
+                                      {
+                                        info->
+                                         container_config[config_length].name =
+                                          CORBA::string_dup
+                                             ("ReceptaclePolicySet");
+                                      }
+                                    else
+                                      {
+                                        info->
+                                          container_config[config_length].name =
+                                            this->plan_.instance[i].
+                                               deployedResource[z].
+                                               property[s].name.in ();
+                                      }
+                                    info->
+                                      container_config[config_length].value <<=
+                                        comparing_policy_set_id;
+                                  }
+                              }
+                          }
+                      }
+                    this->map_.bind (diff_policy_set_id, info);
+                  }
+              }
+          }
       }
   }
 
@@ -216,17 +288,34 @@ namespace CIAO
     Deployment::ContainerImplementationInfo container_info;
 
     const char * policy_set_id = "";
-    if (instance.deployedResource.length () != 0)
+
+    CORBA::ULong dp_length =
+      instance.deployedResource.length ();
+
+    for (CORBA::ULong x = 0; x < dp_length; ++x)
       {
-        instance.deployedResource[0].property[0].value >>= policy_set_id;
-        //        instance.deployedResource[0].resourceValue >>= policy_set_id;
-        //ACE_ERROR ((LM_ERROR, "ERROR: RT-CCM support has been disabled until code in Containers_Info_Map is updated to reflect IDL changes."));
+        CORBA::ULong property_length =
+          instance.deployedResource[x].property.length ();
+
+        for (CORBA::ULong p = 0; p < property_length; ++p)
+          {
+            if (ACE_OS::strcmp (
+                  instance.deployedResource[x].
+                  property[p].name.in (),
+                  "CIAO:InstancePolicy") == 0)
+              {
+                instance.deployedResource[x].property[p].value >>=
+                  policy_set_id;
+              }
+          }
       }
 
     // Find the ContainerImplementationInfo entry from the map
     MAP::ENTRY *entry = 0;
     if (this->map_.find (policy_set_id, entry) != 0)
-      return false; //should never happen
+      {
+        return false; //should never happen
+      }
     else
       {
         this->insert_instance_into_container (
@@ -261,6 +350,45 @@ namespace CIAO
         impl_infos[i].component_config = instance.configProperty;
       }
 
+    CORBA::ULong config_length =
+      impl_infos[i].component_config.length ();
+
+    CORBA::ULong dp_length =
+      instance.deployedResource.length ();
+
+    const char* policy_set_id = "";
+
+    for (CORBA::ULong x = 0; x < dp_length; ++x)
+      {
+        CORBA::ULong property_length =
+          instance.deployedResource[x].property.length ();
+
+        for (CORBA::ULong p = 0; p < property_length; ++p)
+          {
+            if (ACE_OS::strcmp (
+                  instance.deployedResource[x].
+                  property[p].name.in (),
+                  "CIAO:InstancePolicy") != 0)
+              {
+                if (ACE_OS::strcmp (
+                      instance.deployedResource[x].
+                      property[p].name.in (),
+                      "CIAO:ReceptaclePolicy") != 0)
+                  {
+                    config_length =
+                      impl_infos[i].component_config.length ();
+                    impl_infos[i].component_config.length (config_length + 1);
+                    impl_infos[i].component_config[config_length].name =
+                      instance.deployedResource[x].property[p].name.in ();
+                    instance.deployedResource[x].property[p].value >>=
+                      policy_set_id;
+                    impl_infos[i].component_config[config_length].value <<=
+                      policy_set_id;
+                  }
+              }
+          }
+      }
+
     bool svnt_found = false;
     bool exec_found = false;
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 93f6b70c5cc..237ecf07c86 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -19,8 +19,8 @@
 //added for the HTTP support
 #include "ace/Message_Block.h"      //for ACE_Message_Block
 
-#include "ciao/Deployment_ContainerC.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/Deployment_ContainerC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ace/SString.h"
 #include "CIAO_NAM_Export.h"
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index af905369dcf..0ae9f9b0175 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -3,7 +3,7 @@
 #define CIAO_IMPLEMENTATION_INFO_CPP
 
 #include "ImplementationInfo.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
index 2b935d9d637..4109fee1a21 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 "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Containers_Info_Map.h"
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 51f6cbdb50e..f5fa3a5bae2 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -8,8 +8,9 @@
 #include "ace/Sched_Params.h"
 #include "ace/Vector_T.h"
 #include "ciao/Container_Base.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "NodeApplication/NodeApplication_Impl.h"
+#include "NodeApplication/NodeApp_Configurator.h"
 #include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
@@ -50,10 +51,6 @@ is_external_component (ACE_CString & name)
 Deployment::Connections *
 CIAO::NodeApplicationManager_Impl_Base::
 create_connections ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
 {
   CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_connections");
   Deployment::Connections_var retv;
@@ -182,10 +179,6 @@ CIAO::NodeApplicationManager_Impl_Base::
 startLaunch (const Deployment::Properties & configProperty,
              Deployment::Connections_out providedReference,
              CORBA::Boolean start)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
 {
   try
     {
@@ -359,21 +352,15 @@ startLaunch (const Deployment::Properties & configProperty,
     }
   catch (const Deployment::UnknownImplId& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::ImplEntryPointNotFound& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::InstallationFailure& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
@@ -386,14 +373,6 @@ perform_redeployment (const Deployment::Properties & configProperty,
                       Deployment::Connections_out providedReference,
                       CORBA::Boolean /*add_or_remove*/, // true means "add" only
                       CORBA::Boolean start)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::PlanError,
-                   ::Deployment::InstallationFailure,
-                   ::Deployment::UnknownImplId,
-                   ::Deployment::ImplEntryPointNotFound,
-                   ::Deployment::InvalidConnection,
-                   ::Deployment::InvalidProperty,
-                   ::Components::RemoveFailure))
 {
   // Prerequisite:
   //    (1) If this is an existiing old NAM, then <nodeapp_> is ready to use.
@@ -506,21 +485,15 @@ perform_redeployment (const Deployment::Properties & configProperty,
     }
   catch (const Deployment::UnknownImplId& e)
     {
-      ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (),
-                                                   e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::UnknownImplId (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::ImplEntryPointNotFound& e)
     {
-      ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (),
-                                                            e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::ImplEntryPointNotFound (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::InstallationFailure& e)
     {
-      ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (),
-                                                         e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::InstallationFailure (e.name.in (), e.reason.in ());
     }
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
@@ -530,13 +503,6 @@ perform_redeployment (const Deployment::Properties & configProperty,
 void
 CIAO::NodeApplicationManager_Impl_Base::
 add_new_components ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::PlanError,
-                   ::Deployment::InstallationFailure,
-                   ::Deployment::UnknownImplId,
-                   ::Deployment::ImplEntryPointNotFound,
-                   ::Deployment::InvalidConnection,
-                   ::Deployment::InvalidProperty))
 {
   try
     {
@@ -618,9 +584,6 @@ add_new_components ()
 void
 CIAO::NodeApplicationManager_Impl_Base::
 remove_existing_components ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::PlanError,
-                   ::Components::RemoveFailure))
 {
   try
     {
@@ -674,7 +637,6 @@ is_to_be_removed (const char * name)
 void
 CIAO::NodeApplicationManager_Impl_Base::
 set_shared_components (const Deployment::ComponentPlans & shared)
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   this->shared_components_ = shared;
 }
@@ -682,8 +644,6 @@ set_shared_components (const Deployment::ComponentPlans & shared)
 void
 CIAO::NodeApplicationManager_Impl_Base::
 destroyApplication (Deployment::Application_ptr app)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
 {
   CIAO_TRACE("CIAO::NodeApplicationManager_Impl::destroyApplication");
   ACE_UNUSED_ARG (app);
@@ -734,7 +694,6 @@ destroyApplication (Deployment::Application_ptr app)
 CIAO::NodeApplicationManager_Impl_Base::set_priority (
                                                       const char * cid,
                                                       const ::Deployment::Sched_Params & params)
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   if (CIAO::debug_level () > 20)
     {
@@ -823,8 +782,6 @@ CIAO::NodeApplicationManager_Impl::init (
                                          const Deployment::DeploymentPlan & plan,
                                          const PortableServer::POA_ptr callback_poa,
                                          NodeManager_Impl_Base * nm)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidProperty))
 {
   PortableServer::ObjectId_var oid;
 
@@ -898,10 +855,6 @@ CIAO::NodeApplicationManager_Impl::init (
 Deployment::NodeApplication_ptr
 CIAO::NodeApplicationManager_Impl::
 create_node_application (const ACE_CString & options)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
 {
   CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_node_application");
   Deployment::NodeApplication_var retval;
@@ -1069,8 +1022,6 @@ CIAO::Static_NodeApplicationManager_Impl::init (
                                                 const Deployment::DeploymentPlan & plan,
                                                 const PortableServer::POA_ptr callback_poa,
                                                 NodeManager_Impl_Base * nm)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidProperty))
 {
   PortableServer::ObjectId_var oid;
 
@@ -1109,10 +1060,6 @@ CIAO::Static_NodeApplicationManager_Impl::init (
 Deployment::NodeApplication_ptr
 CIAO::Static_NodeApplicationManager_Impl::
 create_node_application (const ACE_CString & options)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
 {
   ACE_UNUSED_ARG(options);
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 5ea55596f1b..1cfbc313cc9 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -29,8 +29,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/OS_NS_sys_wait.h"
 #include "ace/Process_Manager.h"
-#include "ciao/NodeApp_CB_Impl.h"
-#include "ciao/Deployment_NodeApplicationManagerS.h"
+#include "DAnCE/Deployment/NodeApp_CB_Impl.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManagerS.h"
 #include "ciao/CIAO_common.h"
 #include "CIAO_NAM_Export.h"
 #include "ImplementationInfo.h"
@@ -64,38 +64,22 @@ namespace CIAO
     virtual Deployment::Application_ptr
     startLaunch (const Deployment::Properties & configProperty,
                  Deployment::Connections_out providedReference,
-                 CORBA::Boolean start)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                              Deployment::ResourceNotAvailable,
-                              Deployment::StartError,
-                              Deployment::InvalidProperty));
+                 CORBA::Boolean start);
 
     //@@ Destroy the whole applicaton.
-    virtual void destroyApplication (Deployment::Application_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                              Deployment::StopError));
+    virtual void destroyApplication (Deployment::Application_ptr);
 
     virtual Deployment::Application_ptr
     perform_redeployment (const Deployment::Properties & configProperty,
                           Deployment::Connections_out providedReference,
                           CORBA::Boolean add_or_remove,
-                          CORBA::Boolean start)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::PlanError,
-                       ::Deployment::InstallationFailure,
-                       ::Deployment::UnknownImplId,
-                       ::Deployment::ImplEntryPointNotFound,
-                       ::Deployment::InvalidConnection,
-                       ::Deployment::InvalidProperty,
-                       ::Components::RemoveFailure));
+                          CORBA::Boolean start);
 
     virtual void
-    reset_plan (const ::Deployment::DeploymentPlan & plan)
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+    reset_plan (const ::Deployment::DeploymentPlan & plan);
 
     virtual void
-    set_shared_components (const Deployment::ComponentPlans & shared)
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+    set_shared_components (const Deployment::ComponentPlans & shared);
 
     /**
      * A factory operation to create NodeApplicationManager interface, and return
@@ -135,8 +119,7 @@ namespace CIAO
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
           NodeManager_Impl_Base * nm)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty))=0;
+      =0;
 
     /// @note This method doesn't do duplicate.
     Deployment::NodeApplicationManager_ptr get_nodeapp_manager (void);
@@ -144,8 +127,7 @@ namespace CIAO
     /// Set the priority of the NodeApplication process which this NAM manages
     virtual ::CORBA::Long set_priority (
         const char * cid,
-        const ::Deployment::Sched_Params & params)
-      ACE_THROW_SPEC ((CORBA::SystemException ));
+        const ::Deployment::Sched_Params & params);
 
   protected:
     /// Destructor
@@ -153,21 +135,11 @@ namespace CIAO
 
     /// Add new components
     virtual void
-    add_new_components (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      ::Deployment::PlanError,
-                      ::Deployment::InstallationFailure,
-                      ::Deployment::UnknownImplId,
-                      ::Deployment::ImplEntryPointNotFound,
-                      ::Deployment::InvalidConnection,
-                      ::Deployment::InvalidProperty));
+    add_new_components (void);
 
     /// Remove existing components
     virtual void
-    remove_existing_components (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Deployment::PlanError,
-                   ::Components::RemoveFailure));
+    remove_existing_components (void);
 
     /// Determine whether a component is absent in the new_plan
     /// Return true if absent
@@ -176,27 +148,16 @@ namespace CIAO
 
     /// Internal help function to create new NodeApplicationProcess
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::StartError,
-                       Deployment::InvalidProperty))=0;
+    create_node_application (const ACE_CString & options) = 0;
 
     /// Helper function to get the connection.
-    virtual Deployment::Connections *
-    create_connections ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::StartError,
-                       Deployment::InvalidProperty));
+    virtual Deployment::Connections * create_connections ();
 
     /**
      * Find the configurations in the plan and prepare them to pass to the
      * NodeApplication, from command line probably.
      */
-    void parse_config_value (ACE_CString & str)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty));
+    void parse_config_value (ACE_CString & str);
 
     /// Helper function to check wheather a component instance
     /// is in the "shared components list".
@@ -322,9 +283,7 @@ namespace CIAO
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty));
+          NodeManager_Impl_Base * nm);
 
   protected:
     /// Destructor
@@ -333,11 +292,7 @@ namespace CIAO
     // Internal help function to create new NodeApplicationProcess
     // Here we override it to create an in-process NodeApplication object
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::StartError,
-                       Deployment::InvalidProperty));
+    create_node_application (const ACE_CString & options);
 
 
     /**
@@ -373,9 +328,7 @@ namespace CIAO
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty));
+          NodeManager_Impl_Base * nm);
 
   protected:
     /// Destructor
@@ -384,15 +337,11 @@ namespace CIAO
     /// Internal help function to create new NodeApplicationProcess
     /// Here we override it to create an in-process NodeApplication object
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::ResourceNotAvailable,
-                       Deployment::StartError,
-                       Deployment::InvalidProperty));
+    create_node_application (const ACE_CString & options);
 
     Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
 
-    CIAO::NoOp_Configurator configurator_;
+    CIAO::NodeApp_Configurator configurator_;
   };
 }
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index 49bdc80098e..8bed5d3dd20 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -22,13 +22,8 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
 ACE_INLINE
 void
 CIAO::NodeApplicationManager_Impl_Base::
-parse_config_value (ACE_CString & str)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidProperty))
+parse_config_value (ACE_CString &)
 {
-  // The unused arg is for future improvemnts.
-  ACE_UNUSED_ARG (str);
-
   throw CORBA::NO_IMPLEMENT();
 }
 
@@ -42,7 +37,6 @@ CIAO::NodeApplicationManager_Impl_Base::get_nodeapp_manager (void)
 ACE_INLINE void
 CIAO::NodeApplicationManager_Impl_Base::
 reset_plan (const ::Deployment::DeploymentPlan & plan)
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   this->plan_ = plan;
 }
diff --git a/CIAO/DAnCE/NodeManager/BaseMonitor.h b/CIAO/DAnCE/NodeManager/BaseMonitor.h
index d05e798b523..5fe6a950908 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 "DAnCE/Deployment/Deployment_TargetManagerC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
index 56a789a76a3..538b7262fa8 100644
--- a/CIAO/DAnCE/NodeManager/MonitorCB.cpp
+++ b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
@@ -32,7 +32,7 @@ int CIAO::MonitorCB::update_data (::Deployment::Domain& data)
 
   // data to be updated ...
   ::Deployment::DomainUpdateKind update_kind
-      = ::Deployment::UpdateAvailable;
+      = ::Deployment::UpdateDynamic;
 
   // The copy of the domain variable
   ::Deployment::Domain_var domain
diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.h b/CIAO/DAnCE/NodeManager/MonitorCB.h
index 777625bc9e0..5d4f2d8a58a 100644
--- a/CIAO/DAnCE/NodeManager/MonitorCB.h
+++ b/CIAO/DAnCE/NodeManager/MonitorCB.h
@@ -14,7 +14,7 @@
 #ifndef MONITOR_CBH
 #define MONITOR_CBH
 
-#include "ciao/Deployment_TargetManagerC.h"
+#include "DAnCE/Deployment/Deployment_TargetManagerC.h"
 
 /**
  * @namespace CIAO
diff --git a/CIAO/DAnCE/NodeManager/MonitorController.h b/CIAO/DAnCE/NodeManager/MonitorController.h
index 4da2dfb322f..85d82c2cf3b 100644
--- a/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -16,9 +16,9 @@
 #define MONITOR_CONTROLLER_H
 
 #include "NodeManager_svnt_export.h"
-#include "Deployment_BaseC.h"
+#include "DAnCE/Deployment/Deployment_BaseC.h"
 
-#include "TargetManager/TargetManagerImplC.h"
+#include "DAnCE/TargetManager/TargetManagerImplC.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc
index e58cc2d27d4..bc08d94a07b 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -18,7 +18,7 @@ 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 {
+project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub, ciao_nodeapplicationmanager, ciao_targetmanager_stub, ciao_nodemanager_stub, ciaoexe {
   after += NodeManager_svnt
   libs += NodeManager
   exename = NodeManager
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 5e8fea451cd..4732da4d52a 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -10,7 +10,6 @@ CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
                                                     const char * nodeapp_loc,
                                                     const char * nodeapp_options,
                                                     int spawn_delay)
-  ACE_THROW_SPEC ((CORBA::SystemException))
     : orb_ (CORBA::ORB::_duplicate (orb)),
       poa_ (PortableServer::POA::_duplicate (poa)),
       name_ (CORBA::string_dup (name)),
@@ -27,7 +26,6 @@ CIAO::NodeManager_Impl_Base::~NodeManager_Impl_Base ()
 
 void
 CIAO::NodeManager_Impl_Base::init ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -56,14 +54,12 @@ CIAO::NodeManager_Impl_Base::_default_POA (void)
 
 char *
 CIAO::NodeManager_Impl_Base::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
 CIAO::NodeManager_Impl_Base::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   this->orb_->shutdown (0);
@@ -73,7 +69,6 @@ void
 CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
                                          Deployment::TargetManager_ptr target,
                                          Deployment::Logger_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //  ACE_THROW (CORBA::NO_IMPLEMENT ());
   // Here start the Monitor
@@ -104,7 +99,6 @@ CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
 
 void
 CIAO::NodeManager_Impl_Base::leaveDomain ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the monitor , this will also terminate the thread
   monitor_controller_.reset ();
@@ -116,7 +110,6 @@ CIAO::NodeManager_Impl_Base::set_priority (
                                            const char * cid,
                                            const ::Deployment::Sched_Params & nm_params
                                            )
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 
 {
   ACE_CString key (plan_id);
@@ -224,9 +217,6 @@ set_all_consumers (ACE_CString &name,
 Deployment::NodeApplicationManager_ptr
 CIAO::NodeManager_Impl_Base::
 preparePlan (const Deployment::DeploymentPlan &plan)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::PlanError))
 {
   CIAO_TRACE("CIAO::NodeManager_Impl::preparePlan");
 
@@ -238,8 +228,7 @@ preparePlan (const Deployment::DeploymentPlan &plan)
                   "same component server must have the "
                   "same \"resourceName\" defined.\n"));
 
-      ACE_THROW_RETURN (Deployment::PlanError (),
-                        Deployment::NodeApplicationManager::_nil ());
+      throw Deployment::PlanError ();
     }
 
   // Update the reference count map based on the deployment plan input
@@ -348,8 +337,7 @@ preparePlan (const Deployment::DeploymentPlan &plan)
     }
   catch (const PortableServer::POA::ObjectNotActive&)
     {
-      ACE_THROW_RETURN (Deployment::StartError (),
-                        Deployment::NodeApplicationManager::_nil ());
+      throw Deployment::StartError ();
     }
   catch (const CORBA::Exception& ex)
     {
@@ -363,9 +351,6 @@ preparePlan (const Deployment::DeploymentPlan &plan)
 void
 CIAO::NodeManager_Impl_Base::destroyManager
 (Deployment::NodeApplicationManager_ptr manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError,
-                   Deployment::InvalidReference))
 {
   CIAO_TRACE("CIAO::NodeManager_Impl::destroyManager");
   try
@@ -408,8 +393,6 @@ CIAO::NodeManager_Impl_Base::destroyManager
 void
 CIAO::NodeManager_Impl_Base::
 destroyPlan (const Deployment::DeploymentPlan & plan)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::StopError))
 {
   // Update the reference counting map (subtract by 1 for each instance)
   // If the ref count becomes 0, then remove this component, otherwise,
@@ -476,7 +459,6 @@ destroyPlan (const Deployment::DeploymentPlan & plan)
 Deployment::ComponentPlans *
 CIAO::NodeManager_Impl_Base::
 get_shared_components ()
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return this->get_shared_components_i ();
 }
@@ -628,7 +610,6 @@ NodeManager_Impl (const char *name,
 CIAO::NodeManager_Impl::
 create_node_app_manager (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0;
   ACE_NEW_THROW_EX (app_mgr,
@@ -658,7 +639,6 @@ Static_NodeManager_Impl (const char *name,
 CIAO::Static_NodeManager_Impl::
 create_node_app_manager (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CIAO::debug_level () > 10)
     {
@@ -677,9 +657,6 @@ create_node_app_manager (CORBA::ORB_ptr orb,
 void
 CIAO::Static_NodeManager_Impl::destroyManager
 (Deployment::NodeApplicationManager_ptr manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError,
-                   Deployment::InvalidReference))
 {
   CIAO_TRACE("CIAO::Static_NodeManager_Impl::destroyManager");
   try
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index cea98f0fa91..cf9be0c6720 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -70,54 +70,39 @@ namespace CIAO
                       PortableServer::POA_ptr p,
                       const char * nodeapp_loc,
                       const char* nodeapp_options,
-                      int spawn_delay)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      int spawn_delay);
 
     /// Initializes the NodeManager.
-    virtual void init ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void init ();
 
     /// POA operation..
     virtual PortableServer::POA_ptr _default_POA (void);
 
     /// CIAO::Daemon defined attributes/operations.
-    virtual char * name ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * name ();
 
-    virtual void shutdown ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void shutdown ();
 
     virtual void joinDomain (const Deployment::Domain & domain,
                              Deployment::TargetManager_ptr manager,
                              Deployment::Logger_ptr log
-                             )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                             );
 
-    virtual void leaveDomain ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void leaveDomain ();
 
     virtual ::Deployment::NodeApplicationManager_ptr
-    preparePlan (const Deployment::DeploymentPlan &plan)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError,
-                       Deployment::PlanError));
+    preparePlan (const Deployment::DeploymentPlan &plan);
 
     virtual void
-    destroyManager (Deployment::NodeApplicationManager_ptr appManager)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError,
-                       Deployment::InvalidReference));
+    destroyManager (Deployment::NodeApplicationManager_ptr appManager);
 
     /// CIAO specific extension, which is particularly useful for dealing with
     /// shared components issue
-    virtual void destroyPlan (const Deployment::DeploymentPlan & plan)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::StopError));
+    virtual void destroyPlan (const Deployment::DeploymentPlan & plan);
 
     /// CIAO specific extension, return a set of shared components
     virtual ::Deployment::ComponentPlans *
-    get_shared_components ()
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+    get_shared_components ();
 
     /// RACE specific extension. Modify the priority of a node application
     /// process.
@@ -126,8 +111,7 @@ namespace CIAO
     set_priority (
         const char * plan_id,
         const char * cid,
-        const ::Deployment::Sched_Params & nm_params)
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+        const ::Deployment::Sched_Params & nm_params);
 
     // ********* CIAO Specific Helper functions ************
 
@@ -176,7 +160,7 @@ namespace CIAO
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
                              PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException))=0;
+      =0;
 
     /// Actual implementation of the @c get_shared_components IDL operation
     virtual ::Deployment::ComponentPlans *
@@ -283,8 +267,7 @@ namespace CIAO
 
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
-                             PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                             PortableServer::POA_ptr poa);
   };
 
   class NodeApplicationManager_Impl;
@@ -310,10 +293,7 @@ namespace CIAO
                             );
 
     void destroyManager
-    (Deployment::NodeApplicationManager_ptr manager)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError,
-                       Deployment::InvalidReference));
+    (Deployment::NodeApplicationManager_ptr manager);
 
   protected:
     /// Since this class is reference counted, making this
@@ -325,8 +305,7 @@ namespace CIAO
 
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
-                             PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                             PortableServer::POA_ptr poa);
 
     Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
   };
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
index 39bbb9bb434..99621fcc7c2 100644
--- a/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
@@ -23,7 +23,7 @@
  * structure of the DeploymentPlan.
  *
  * @author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu> 
+ *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
  */
 //========================================================================
 
@@ -131,7 +131,7 @@ void PCVisitor::Visit (Deployment::MonolithicImplementationDescription &mid)
   if (!modify_)
     {
       //increase the implementation length by one
-      size_t impl_len = plan_.implementation.length ();
+      size_t const impl_len = plan_.implementation.length ();
       last_impl_index_ = impl_len;
       plan_.implementation.length (impl_len + 1);
     }
@@ -146,16 +146,16 @@ void PCVisitor::Visit (Deployment::NamedImplementationArtifact &nia)
   if (!modify_)
     {
       //increase the artifact length by one
-      size_t arti_len = plan_.artifact.length ();
+      size_t const arti_len = plan_.artifact.length ();
       plan_.artifact.length (arti_len + 1);
 
       //set the name
       plan_.artifact[arti_len].name = nia.name;
 
-      //set the artifactRef of implementation
-      size_t last_mdd = plan_.implementation.length () - 1;
+      // Set the artifactRef of implementation
+      size_t const last_mdd = plan_.implementation.length () - 1;
       Deployment::MonolithicDeploymentDescription& mdd = plan_.implementation[last_mdd];
-      size_t ref_len = mdd.artifactRef.length ();
+      size_t const ref_len = mdd.artifactRef.length ();
       mdd.artifactRef.length (ref_len + 1);
       mdd.artifactRef[ref_len] = arti_len;
     }
@@ -174,7 +174,7 @@ void PCVisitor::Visit (Deployment::ImplementationArtifactDescription &iad)
 
       //set the location
       size_t plan_loc_len = add.location.length ();
-      size_t num_loc = iad.location.length ();
+      size_t const num_loc = iad.location.length ();
       for (size_t i = 0; i < num_loc; ++i)
       {
         add.location.length (plan_loc_len + 1);
@@ -188,7 +188,7 @@ void PCVisitor::Visit (Deployment::ImplementationArtifactDescription &iad)
 
   else
     {
-      size_t num_arti = plan_.artifact.length ();
+      size_t const num_arti = plan_.artifact.length ();
       for (size_t i = 0; i < num_arti; ++i)
         {
           if (ACE_OS::strstr (iad.location[0], plan_.artifact[i].location[0]))
@@ -259,7 +259,7 @@ void PCVisitor::
 update_execParameter (Deployment::ImplementationArtifactDescription& iad,
                       Deployment::ArtifactDeploymentDescription& add)
 {
-  size_t num_execP = iad.execParameter.length ();
+  size_t const num_execP = iad.execParameter.length ();
   size_t execP_len = add.execParameter.length ();
   for (size_t j = 0; j < num_execP; ++j)
   {
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
index ac34dc4d261..a8bd64ad939 100644
--- a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
@@ -21,7 +21,7 @@
 #define PC_VISITOR_BASE_H
 
 #include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 //========================================================================
 /**
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
index a1e5831e0af..6c96e2a9e04 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -18,8 +18,7 @@ namespace CIAO
     fetch_reference_naming (CORBA::ORB_ptr orb,
                             const char *repoman_name = 0)
     {
-      CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService");
+      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ());
@@ -88,7 +87,6 @@ namespace CIAO
       ACE_TCHAR package[PACKAGE_NAME_LEN];
 
       size_t length = ACE_OS::strlen (package_uri);
-
       size_t pos1 = 0;
       size_t pos2 = ACE_OS::strcspn (package_uri + pos1, "+");
 
@@ -148,6 +146,5 @@ namespace CIAO
 
       return true;
     }
-
   }
 }
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
index 3fbfef3a9c6..98392e4f549 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
@@ -10,7 +10,7 @@
 #ifndef PLAN_GENERATOR_IMPL_H
 #define PLAN_GENERATOR_IMPL_H
 
-#include "ciao/Deployment_RepositoryManagerC.h"
+#include "DAnCE/Deployment/Deployment_RepositoryManagerC.h"
 #include "Plan_Generator_Impl_Export.h"
 
 namespace CIAO
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index f264738108a..4c86092d6b2 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -18,7 +18,7 @@ project(Plan_Launcher_Impl) : ciao_servant_dnc, ciao_config_handlers, ciao_execu
   }
 }
 
-project(Plan_Launcher) : ciao_server_dnc, ciao_config_handlers, ciao_executionmanager_stub, ciao_plan_generator  {
+project(Plan_Launcher) : ciao_server_dnc, ciao_config_handlers, ciao_executionmanager_stub, ciao_plan_generator, ciaoexe  {
   exename = plan_launcher
 
   after += Plan_Launcher_Impl
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 9afc6a69dc4..237ede72b1a 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -12,8 +12,7 @@ namespace CIAO
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb)
     {
-      CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService");
+      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ());
@@ -88,7 +87,6 @@ namespace CIAO
                                   const char *package_uri,
                                   bool use_package_name,
                                   bool use_repoman)
-      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       if (CIAO::debug_level () > 9)
         {
@@ -97,8 +95,7 @@ namespace CIAO
 
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
 
-      ::Deployment::DeploymentPlan_var plan =
-          intf.get_plan ();
+      ::Deployment::DeploymentPlan_var plan = intf.get_plan ();
 
       // Use the package name(s) or type(s) to modify the location of all the
       // artifacts in DeploymentPlan.
@@ -118,7 +115,6 @@ namespace CIAO
 
     const char *
     Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan)
-      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       try
         {
@@ -166,10 +162,10 @@ namespace CIAO
               0);
 
           if (CIAO::debug_level ())
-          {
-            ACE_DEBUG ((LM_DEBUG,
-              "CIAO_PlanLauncher: start Launch application...\n"));
-          }
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                "CIAO_PlanLauncher: start Launch application...\n"));
+            }
 
           // Dont not start the Application immediately since it violates
           // the semantics of component activation sequence
@@ -373,12 +369,10 @@ namespace CIAO
                                      const char *package_uri,
                                      bool use_package_name,
                                      bool use_repoman)
-      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
 
-      ::Deployment::DeploymentPlan_var plan =
-          intf.get_plan ();
+      ::Deployment::DeploymentPlan_var plan = intf.get_plan ();
 
       // Use the package name(s) or type(s) to modify the location of all the
       // artifacts in DeploymentPlan.
@@ -393,7 +387,6 @@ namespace CIAO
 
     const char *
     Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan)
-      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
 
       if (CORBA::is_nil (this->em_.in ()))
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 2212c00333f..72d46ce68cf 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -53,25 +53,21 @@ namespace CIAO
       const char * launch_plan (const char *deployment_plan_uri,
                                 const char *package_uri = 0,
                                 bool use_package_name = true,
-                                bool use_repoman = false)
-        ACE_THROW_SPEC ((Deployment_Failure));
+                                bool use_repoman = false);
 
       const char * re_launch_plan (const char *deployment_plan_uri,
                                    const char *package_uri = 0,
                                    bool use_package_name = true,
-                                   bool use_repoman = false)
-        ACE_THROW_SPEC ((Deployment_Failure));
+                                   bool use_repoman = false);
 
       /**
        * @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.
        */
-      const char * launch_plan (const ::Deployment::DeploymentPlan &plan)
-        ACE_THROW_SPEC ((Deployment_Failure));
+      const char * launch_plan (const ::Deployment::DeploymentPlan &plan);
 
-      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan)
-        ACE_THROW_SPEC ((Deployment_Failure));
+      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan);
 
       /// Returns the DAM associated with a given plan URI
       ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid);
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index d2ce75e8666..1acd3d8c4b9 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "PC_Updater.h"
 #include "PC_Updater_T.h"
 #include "ace/Containers_T.h"        //for ACE_Double_Linked_List
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.h b/CIAO/DAnCE/RepositoryManager/PC_Updater.h
index 9c6d326f54d..5b22e249331 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.h
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.h
@@ -19,7 +19,7 @@
 #define PC_UPDATER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ace/SString.h"             //for the ACE_CString
 
 #include "ZIP_Wrapper.h"             //Wrapper around zzip
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
index f76764e3b11..47e46d35a6f 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
@@ -19,7 +19,7 @@
 #define RM_HELPER_H_
 
 
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "tao/CDR.h"
 #include "ace/Message_Block.h"
 
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index 10d67721cd0..5cefc3467c9 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -270,7 +270,7 @@ int Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index b20b77e2d6c..d14d97843cd 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -4,7 +4,7 @@
 //RepositoryManager project: implementation of a repository manager
 //compleint with the D&C spec
 
-project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib {
+project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib, ciaoexe {
 
   includes += $(CIAO_ROOT)/tools/Config_Handlers $(ACE_ROOT)/contrib/minizip
   //to circumvent an improper include resolution
@@ -36,7 +36,7 @@ project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zlib {
 
 // RMadmin project: a sample client for the RM.
 
-project (RMAdmin) : ciao_servant_dnc, ciao_config_handlers {
+project (RMAdmin) : ciao_servant_dnc, ciao_config_handlers, ciaoexe {
   exename = RMadmin
   after  += RepositoryManager
 
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
index 7f28e7d5683..9deac4abd0e 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_RepositoryManager.idl"
+#include "DAnCE/Deployment/Deployment_RepositoryManager.idl"
 
 module CIAO
 {
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index 91aa4e47460..b3c86d5c221 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -31,8 +31,8 @@
 #include "ace/Malloc_Allocator.h"       //for ACE_New_Allocator
 
 //for the PackageConfiguration parsing
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Package_Handlers/PCD_Handler.h"
 
 #include "RM_Helper.h"            //to be able to externalize/internalize a PackageConfiguration
@@ -40,6 +40,7 @@
 
 #include "ace/Thread.h"           //for obtaining the ID of the current thread
 #include "ace/OS_NS_stdlib.h"     //for itoa ()
+#include "ace/Dirent.h"
 
 #include "URL_Parser.h"           //for parsing the URL
 #include "tao/HTTP_Client.h"      //the HTTP client class to downloading packages
@@ -156,40 +157,7 @@ CIAO_RepositoryManagerDaemon_i::~CIAO_RepositoryManagerDaemon_i (void)
 
 void CIAO_RepositoryManagerDaemon_i::shutdown ()
 
-                ACE_THROW_SPEC ((
-                                CORBA::SystemException
-                                ))
 {
-  // Save the names, UUIDs, & types info to the configuration files.
-  ACE_Configuration_Heap cfg;
-  cfg.open ();
-  ACE_Configuration_Section_Key root = cfg.root_section ();
-
-  ACE_Configuration_Section_Key NameSection;
-  cfg.open_section (root, RM_RECORD_NAME_SECTION, 1, NameSection);
-  for (PCMap_Iterator iter = this->names_.begin ();
-    iter != this->names_.end ();
-    ++iter)
-  {
-    PCEntry& element = *iter;
-    cfg.set_string_value (NameSection, element.ext_id_.c_str (), element.int_id_.c_str ());
-  }
-
-  ACE_Configuration_Section_Key UUIDSection;
-  cfg.open_section (root, RM_RECORD_UUID_SECTION, 1, UUIDSection);
-  for (PCMap_Iterator iter = this->uuids_.begin ();
-    iter != this->uuids_.end ();
-    ++iter)
-  {
-    PCEntry& element = *iter;
-    cfg.set_string_value (UUIDSection, element.ext_id_.c_str (), element.int_id_.c_str ());
-  }
-
-  ACE_Registry_ImpExp exporter (cfg);
-  ACE_OS::chdir (install_path.c_str ());
-  exporter.export_config (RM_RECORD_FILE);
-  ACE_OS::chdir (this->cwd_);
-
   // Release resource.
   this->names_.unbind_all ();
   this->uuids_.unbind_all ();
@@ -209,11 +177,6 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
                                                      const char * location,
                                                      ::CORBA::Boolean replace
                                                      )
-                     ACE_THROW_SPEC ((
-                                      CORBA::SystemException,
-                                      ::Deployment::NameExists,
-                                      ::Deployment::PackageError
-                                     ))
 {
 
   PCEntry *entry = 0;
@@ -292,7 +255,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   if (pc_name == "")
   {
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
 
@@ -309,7 +272,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   if (this->uuids_.find (ACE_CString (pc->UUID), entry) == 0)
   {
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
 
@@ -324,7 +287,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   if (!(pc->basePackage.length () > 0))
   {
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
 
@@ -338,7 +301,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     ACE_DEBUG ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
 
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
     throw Deployment::PackageError ();
@@ -358,7 +321,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
                  installationName));
 
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
     //remove the PackageConfiguration externalization
@@ -379,7 +342,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
      this->names_.unbind (installationName);
 
      //clean the extracted files
-     remove_extracted_package (package_path.c_str (), path.c_str ());
+     remove_extracted_package (path.c_str ());
      //remove the package
      remove (package_path.c_str ());
      //remove the PackageConfiguration externalization
@@ -395,6 +358,8 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
 
   this->dump ();
 
+  this->save ();
+
   ACE_DEBUG ((LM_INFO,
               "Installed PackageConfiguration \n\tname: %s \n\tuuid: %s\n",
               installationName, ACE_CString (pc->UUID).c_str ()));
@@ -412,11 +377,6 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
                                                     const char * baseLocation,
                                                     ::CORBA::Boolean replace
                                                     )
-                   ACE_THROW_SPEC ((
-                                    CORBA::SystemException,
-                                    ::Deployment::NameExists,
-                                    ::Deployment::PackageError
-                                   ))
 {
   ::Deployment::PackageConfiguration pc = package;
 
@@ -496,7 +456,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   {
     ACE_ERROR ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
     throw Deployment::PackageError ();
@@ -515,7 +475,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
                  installationName));
 
     //clean the extracted files
-    remove_extracted_package (package_path.c_str (), path.c_str ());
+    remove_extracted_package (path.c_str ());
     //remove the package
     remove (package_path.c_str ());
     //remove the PackageConfiguration externalization
@@ -536,7 +496,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
      this->names_.unbind (installationName);
 
      //clean the extracted files
-     remove_extracted_package (package_path.c_str (), path.c_str ());
+     remove_extracted_package (path.c_str ());
      //remove the package
      remove (package_path.c_str ());
      //remove the PackageConfiguration externalization
@@ -553,6 +513,8 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
 
   this->dump ();
 
+  this->save ();
+
   ACE_DEBUG ((LM_INFO,
               "Created PackageConfiguration \n  directory: %s \n  name: %s \n  uuid: %s\n",
               path.c_str (), installationName, ACE_CString (pc.UUID).c_str ()));
@@ -567,10 +529,6 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
 ::Deployment::PackageConfiguration*
 CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
 
-                               ACE_THROW_SPEC ((
-                                                CORBA::SystemException,
-                                                ::Deployment::NoSuchName
-                                               ))
 {
   // Find out if the PackageConfiguration was installed in the repository,
   // return it if found or throw and exception otherwise
@@ -591,7 +549,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
 
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   ACE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
 
@@ -607,10 +565,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
 ::Deployment::PackageConfiguration*
 CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 
-                              ACE_THROW_SPEC ((
-                                              CORBA::SystemException,
-                                              ::Deployment::NoSuchName
-                                              ))
 {
   // Find out if the PackageConfiguration was installed in the repository,
   // return it if found or throw and exception otherwise
@@ -631,7 +585,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   ACE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
 
@@ -646,9 +600,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 ::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::findNamesByType (
                                                                       const char * type
                                                                       )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CIEntry *entry = 0;
 
@@ -697,9 +648,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 ::CORBA::StringSeq*
 CIAO_RepositoryManagerDaemon_i::getAllNames ()
 
-                   ACE_THROW_SPEC ((
-                                   CORBA::SystemException
-                                   ))
 {
   //Map.current_size () gives you the current number with the duplicates
   //Map.total_size () gives you the allocated space + the empty slots
@@ -742,9 +690,6 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
 ::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::getAllTypes (
 
   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   //Map.current_size () gives you the current number with the duplicates
   //Map.total_size () gives you the allocated space + the empty slots
@@ -790,10 +735,6 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
 void CIAO_RepositoryManagerDaemon_i::deletePackage (
                                                     const char * installationName
                                                     )
-                     ACE_THROW_SPEC ((
-                                      CORBA::SystemException,
-                                      ::Deployment::NoSuchName
-                                     ))
 {
   bool internal_err = false;
 
@@ -850,7 +791,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
   //actually delete the package here!
 
   //clean the extracted files
-  remove_extracted_package (package_path.c_str (), path.c_str ());
+  remove_extracted_package (path.c_str ());
   //remove the package
   remove (package_path.c_str ());
   //remove the PackageConfiguration externalization
@@ -858,6 +799,8 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
 
   this->dump ();
 
+  this->save ();
+
   if (internal_err)
     throw CORBA::INTERNAL ();
   else
@@ -1119,66 +1062,48 @@ int CIAO_RepositoryManagerDaemon_i::remove_descriptor_files (char* package)
   return return_code;
 }
 
-//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.
-//return 1 on success
-//       0 on error
-
-int CIAO_RepositoryManagerDaemon_i::remove_extracted_package
-                                       (const char* package_path,
-                                        const char* extraction_location)
-{
-  //change the working dir
-  if (ACE_OS::chdir (extraction_location) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "[RM::remove_extracted_package] Unable to chdir to doomed directory!\n"),
-                      0);
+int CIAO_RepositoryManagerDaemon_i::remove_extracted_package (const char* path)
+  {
+    ACE_TCHAR full_path[MAXPATHLEN];
+    ACE_OS::getcwd (full_path, sizeof(full_path));
 
-  int return_code = 1;
+    ACE_OS::chdir (path);
 
-  //create a doubly link list
-  ACE_New_Allocator allocator;
-  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
+    ACE_Dirent dir (path);
 
-  //get the list of files in the package and figure out the names of all necessary files
-  if (!(ZIP_Wrapper::file_list_info (const_cast <char*> (package_path), list)))
+    for (ACE_DIRENT *directory; (directory = dir.read ()) != 0;)
     {
-      //change back the the old working dir
-      ACE_OS::chdir (this->cwd_);
-      return 0;
-    }
+      if (ACE_OS::strcmp (directory->d_name, ".") == 0
+          || ACE_OS::strcmp (directory->d_name, "..") == 0)
+        continue;
 
-  while (!list.is_empty ())
-    {
-      ZIP_File_Info* inf = list.delete_head ();
+      ACE_stat stat_buf;
+      ACE_OS::lstat (directory->d_name, &stat_buf);
 
-      //delete file from disk
-      if(remove (inf->name_.c_str ()))
+      ACE_CString temp = path;
+      temp += "/";
+      temp += directory->d_name;
+      switch (stat_buf.st_mode & S_IFMT)
         {
-          ACE_ERROR ((LM_ERROR,
-                      "[RM::remove_extracted files] Unable to delete %s!\n", inf->name_.c_str ()));
-          return_code = 0;
-        }
-
-      //deallocate the head of the filename list
-      delete inf;
-    }
-
-  //now remove the descriptors and implementations directories.
-  ACE_OS::rmdir ("descriptors");
-  ACE_OS::rmdir ("implementations");
+        case S_IFREG: // Either a regular file or an executable.   
+          remove (temp.c_str ());
+          break;
 
-  //now go one directory up and delete the extraction directory
-  ACE_OS::chdir (this->install_root_.c_str ());
-  ACE_OS::rmdir (extraction_location);
+        case S_IFDIR:
+          remove_extracted_package (temp.c_str ());
+          break;
 
-  //change back the the old working dir
-  ACE_OS::chdir (this->cwd_);
+        default:
+          break;
+        }
+    }
+    
+    ACE_OS::chdir (full_path);
+    
+    ACE_OS::rmdir (path);
 
-  return return_code;
-}
+    return 0;
+  }
 
 //function to extract the type of the component from
 //the PackageConfiguration and update the interface map
@@ -1265,3 +1190,37 @@ void CIAO_RepositoryManagerDaemon_i::dump (void)
 
 #endif /* ACE_HAS_DUMP */
 }
+
+//function to save the package info of the RepositoryManager
+void CIAO_RepositoryManagerDaemon_i::save (void)
+{
+  // Save the names, UUIDs, & types info to the configuration files.
+  ACE_Configuration_Heap cfg;
+  cfg.open ();
+  ACE_Configuration_Section_Key root = cfg.root_section ();
+
+  ACE_Configuration_Section_Key NameSection;
+  cfg.open_section (root, RM_RECORD_NAME_SECTION, 1, NameSection);
+  for (PCMap_Iterator iter = this->names_.begin ();
+    iter != this->names_.end ();
+    ++iter)
+  {
+    PCEntry& element = *iter;
+    cfg.set_string_value (NameSection, element.ext_id_.c_str (), element.int_id_.c_str ());
+  }
+
+  ACE_Configuration_Section_Key UUIDSection;
+  cfg.open_section (root, RM_RECORD_UUID_SECTION, 1, UUIDSection);
+  for (PCMap_Iterator iter = this->uuids_.begin ();
+    iter != this->uuids_.end ();
+    ++iter)
+  {
+    PCEntry& element = *iter;
+    cfg.set_string_value (UUIDSection, element.ext_id_.c_str (), element.int_id_.c_str ());
+  }
+
+  ACE_Registry_ImpExp exporter (cfg);
+  ACE_OS::chdir (install_path.c_str ());
+  exporter.export_config (RM_RECORD_FILE);
+  ACE_OS::chdir (this->cwd_);
+}
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 0c371d7c758..734ce8fc004 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -63,22 +63,14 @@ public:
   virtual
   void shutdown (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void installPackage (
       const char * installationName,
       const char * location,
       ::CORBA::Boolean replace
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NameExists,
-      ::Deployment::PackageError
-    ));
+    );
 
   virtual
   void createPackage (
@@ -86,63 +78,37 @@ public:
       const ::Deployment::PackageConfiguration & package,
       const char * baseLocation,
       ::CORBA::Boolean replace
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NameExists,
-      ::Deployment::PackageError
-    ));
+    );
 
   virtual
   ::Deployment::PackageConfiguration * findPackageByName (
       const char * name
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NoSuchName
-    ));
+    );
 
   virtual
   ::Deployment::PackageConfiguration * findPackageByUUID (
       const char * UUID
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NoSuchName
-    ));
+    );
 
   virtual
   ::CORBA::StringSeq * findNamesByType (
       const char * type
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::CORBA::StringSeq * getAllNames (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::CORBA::StringSeq * getAllTypes (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void deletePackage (
       const char * installationName
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NoSuchName
-    ));
+    );
 
 protected:
 
@@ -190,7 +156,7 @@ protected:
   /// @note extraction location is path/*archive_name*/
   /// @retval 1 on success
   /// @retval 0 on error
-  int remove_extracted_package (const char* package_path, const char* extraction_location);
+  int remove_extracted_package (const char* package_path);
 
   /// Function to extract the type of the component from
   /// the PackageConfiguration and update the interface map
@@ -209,6 +175,9 @@ protected:
   /// Function to dump the state of the RepositoryManager
   void dump (void);
 
+  /// Function to save the package info of the RepositoryManager
+  void save (void);
+
 private:
   /// Cached information about the installed PackageConfigurations
   /// A separate map for the installation names and their UUID's
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
index 985173e5720..9f6e4572475 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Container_Base.h"
+#include "Session_Container.h"
 #include "NodeManager/NodeManager_Impl.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
@@ -22,22 +22,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       int homes_table_size =
         sizeof (homes_table)/sizeof(HomeAttributes);
@@ -75,13 +69,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       static_node_manager_impl->init ();
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
           ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
@@ -90,28 +81,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         static_node_manager_impl->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     str.in ());
 
       // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      ex._tao_print_exception ("Caught CORBA Exception: ");
       return -1;
     }
 
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
index 4895dd9a045..c528ee65695 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEApp): ciao_static_dnc_app {
+project(StaticDAnCEApp): ciao_static_dnc_app, iortable {
   exename   = StaticDAnCEApp
 
   libs     += Hello_Base_DnC_stub
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index 12deaa5ac80..de1e60fb29d 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -9,263 +9,303 @@
  * TM to getAllResources and getAvailable resources
  */
 
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerC.h"
 #include "DAnCE/TargetManager/TargetManagerImplC.h"
 #include "ace/streams.h"
+#include "ace/FILE_IO.h"
+#include "ace/FILE_Connector.h"
+#include "ace/FILE_Addr.h"
+#include "ace/Get_Opt.h"
 #include "Config_Handlers/DnC_Dump.h"
 
-void write_to_file (::Deployment::Domain domain);
-
-int main (int argc, char* argv[])
+/**
+ * TM_Tester contains the code to test the TM Component
+ */
+namespace TM_Tester
 {
-  try {
-    // First initialize the ORB, that will remove some arguments...
-    CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,
-          "" /* the ORB name, it can be anything! */);
-
-    // There must be at least two arguments, the first is the factory
-    // name, the rest are the names of the stock symbols we want to
-    // get quotes for.
-    if (argc < 2) {
-      cerr << "Usage: " << argv[0]
-        << " Factory_IOR ..." << endl;
-      return 1;
-    }
+  /**
+   * writes the extracted data to file
+   */
+  void write_to_file (::Deployment::Domain domain);
 
-    // Use the first argument to create the factory object reference,
-    // in real applications we use the naming service, but let's do
-    // the easy part first!
-    CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+  /// variable contains IOR of the TM
+  const char * stringified_TM_IOR;
 
-    // Now downcast the object reference to the appropriate type
-    CIAO::TargetManagerImpl_var targetCmp =
-      CIAO::TargetManagerImpl::_narrow (factory_object.in ());
+  /// if add or delete from domain
+  bool add_to_domain = true;
 
-    // Now get the facet reference from the target Manager Component
-    ACE_DEBUG((LM_DEBUG, "Making a Call to provide_targetMgr ()\n"));
-    Deployment::TargetManager_ptr targetI = targetCmp->provide_targetMgr ();
+  /// whether to test update domain or not
+  bool call_update = false;
 
-    // Now make calls on the Target Manager facet
+  /// contains the host name
+  const char * host_name;
 
-    try
-    {
-      Deployment::Domain_var domainV = targetI->getAllResources ();
-      ACE_DEBUG ((LM_DEBUG , "\n\nGetAllResources Returned \n"));
-      ::Deployment::DnC_Dump::dump (domainV);
-    }
-    catch(CORBA::NO_IMPLEMENT &)
-    {
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
-    }
-    catch(CORBA::Exception &)
-    {
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA Generic Exception \n"));
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:Exception in TargetManager call\n"));
-    }
+    /// parses the arguments and extracts the params
+  bool parse_args (int argc, char *argv[])
+  {
+    ACE_Get_Opt get_opts (argc, argv, "t:u:d");
+    int c;
+    while ((c = get_opts ()) != -1)
+      switch (c)
+      {
+        case 't':
+          stringified_TM_IOR = get_opts.opt_arg ();
+          break;
+        case 'u':
+          host_name = get_opts.opt_arg ();
+          call_update = true;
+          break;
+        case 'd':
+         add_to_domain = false;
+          break;
+        case '?':  // display help for use of the server.
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                "usage:  %s\n"
+                "-t <TM_IOR>\n"
+                "-u <host_name in update>\n"
+                "-n <delete , default add>\n"
+                "\n",
+                argv [0]),
+              false);
+      }
 
+    return true;
+  }
+}
 
-    // make a call to the commit resources .....
+  /// The main function
+  int main (int argc, char* argv[])
+  {
+    try {
+      // First initialize the ORB, that will remove some arguments...
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv,
+            "" /* the ORB name, it can be anything! */);
 
+      if (!TM_Tester::parse_args (argc, argv))
+        return -1;
 
-    Deployment::DeploymentPlan plan;
+      // Use the first argument to create the factory object reference,
+      // in real applications we use the naming service, but let's do
+      // the easy part first!
+      CORBA::Object_var factory_object =
+        orb->string_to_object (TM_Tester::stringified_TM_IOR);
 
-    plan.instance.length (2);
+      // Now downcast the object reference to the appropriate type
+      CIAO::TargetManagerImpl_var targetCmp =
+        CIAO::TargetManagerImpl::_narrow (factory_object.in ());
 
-    ::Deployment::InstanceDeploymentDescription instance_;
-    instance_.node = CORBA::string_dup ("foil");
-    instance_.deployedResource.length (1);
-    instance_.deployedResource[0].requirementName =
-      CORBA::string_dup ("Processor");
-    instance_.deployedResource[0].resourceName =
-      CORBA::string_dup ("CPULoad");
+      // Now get the facet reference from the target Manager Component
+      Deployment::TargetManager_ptr targetI = targetCmp->provide_targetMgr ();
 
-    instance_.deployedResource[0].property.length (1);
-    instance_.deployedResource[0].property[0].name =
-      CORBA::string_dup ("LoadAverage");
-    CORBA::Long d = 20;
-    instance_.deployedResource[0].property[0].value <<= d;
+      // Now make calls on the Target Manager facet
 
-    plan.instance[0] = instance_;
+      try
+      {
+        Deployment::Domain_var domainV = targetI->getAllResources ();
+        ::Deployment::DnC_Dump::dump (domainV);
+      }
+      catch(CORBA::NO_IMPLEMENT &)
+      {
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+      }
+      catch(CORBA::Exception &)
+      {
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception \n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:Exception in TargetManager call\n"));
+      }
 
-    instance_.node = CORBA::string_dup ("blade30");
-    instance_.deployedResource.length (1);
-    instance_.deployedResource[0].requirementName =
-      CORBA::string_dup ("Processor");
-    instance_.deployedResource[0].resourceName =
-      CORBA::string_dup ("CPULoad");
 
-    instance_.deployedResource[0].property.length (1);
-    instance_.deployedResource[0].property[0].name =
-      CORBA::string_dup ("LoadAverage");
-    d = 50;
+      // make a call to the commit resources .....
 
-    instance_.deployedResource[0].property[0].value <<= d;
+      bool resource_available = true;
 
-    plan.instance[1] = instance_;
+      ::Deployment::ResourceAllocations resource_seq;
 
-    bool resource_available = true;
+      resource_seq.length (1);
 
-    try
-    {
-      targetI->commitResources(plan);
-      ACE_DEBUG ((LM_DEBUG , "\n\ncommitResources Returned \n"));
-    }
-    catch(CORBA::NO_IMPLEMENT &)
-    {
-      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
-    }
-    catch (Deployment::ResourceNotAvailable & e)
-    {
-      resource_available = 0;
-      cout << "TargetManager commitResources ResourceNotAvailable Exception" <<endl;
-
-      ACE_DEBUG ((LM_DEBUG ,
-            "ResourceNotAvailable\n name=[%s]\n elementName=[%s]\n resourceName=[%s]\n \
-            resourceType= [%s]\n propertyName=[%s]\n",
-            e.name.in (),
-            e.elementName.in (),
-            e.resourceName.in (),
-            e.resourceType.in (),
-            e.propertyName.in ()));
-    }
-    catch(CORBA::Exception & ex)
-    {
-      cout << "Error:TargetManager:commitResources Exception" <<endl;
-      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
-    }
+      resource_seq[0].elementName = CORBA::string_dup ("TargetManagerNode_1");
 
+      resource_seq[0].resourceName = CORBA::string_dup ("Processor");
 
-    // Make a call to release resources , if resource < 0
-    try
-    {
-      if (!resource_available)
-        {
-          targetI->releaseResources(plan);
-          ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n"));
-        }
-    }
-    catch(CORBA::NO_IMPLEMENT &)
-    {
-      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
-    }
-    catch (Deployment::ResourceNotAvailable &)
-    {
-      cout << "Error:TargetManager releaseResources ResourceNotAvailable Exception" <<endl;
-    }
-    catch(CORBA::Exception & ex)
-    {
-      cout << "Error:TargetManager:releaseResources Exception" <<endl;
-      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
-    }
+      resource_seq[0].property.length (1);
+      resource_seq[0].property[0].name =
+        CORBA::string_dup ("LoadAverage");
 
-    // Here make a call on the TM with update domain and node deletion
+      CORBA::Long d = 20;
+      resource_seq[0].property[0].value <<= d;
 
-    ::Deployment::Domain updated;
-    updated.node.length (1);
-    updated.node[0].name = CORBA::string_dup (argv[2]);
+      ::Deployment::ResourceCommitmentManager_ptr manager = 
+        ::Deployment::ResourceCommitmentManager::_nil ();
 
-    ::CORBA::StringSeq elements;
-    elements.length (0);
+      try
+      {
+        manager = targetI->createResourceCommitment (resource_seq);
 
-    bool Add = true;
-    Add = ACE_OS::atoi (argv[3]);
+        manager->commitResources (resource_seq);
 
-    if (Add)
-    {
+      }
+      catch(CORBA::NO_IMPLEMENT &)
+      {
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+      }
+      catch (::Deployment::ResourceCommitmentFailure& e)
+      {
+        resource_available = 0;
+        ACE_ERROR ((LM_ERROR, "TargetManager commitResources ResourceCommitmentFailure Exception\n"));
+
+        ACE_ERROR ((LM_ERROR ,
+              "ResourceCommitmentFailure\n reason=[%s]\n elementName=[%s]\n resourceName=[%s]\n propertyName=[%s]\n",
+              e.reason.in (),
+              resource_seq[e.index].elementName.in (),
+              resource_seq[e.index].resourceName.in (),
+              e.propertyName.in ()));
+      }
+      catch(const CORBA::Exception &)
+      {
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:commitResources Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
+      }
+
+      // Make a call to release resources , if resource < 0
       try
       {
-        targetI->updateDomain (elements , updated, ::Deployment::Add);
+        {
+          d = 10;
+          resource_seq[0].property[0].value <<= d;
+          manager->releaseResources (resource_seq);
+        }
       }
-      catch(CORBA::NO_IMPLEMENT &)
+      catch(const CORBA::NO_IMPLEMENT &)
       {
-        cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
-      catch(CORBA::Exception & ex)
+      catch (const Deployment::ResourceCommitmentFailure&)
       {
-        cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-        cerr << "Error:TargetManager:Exception in UpdateDomain call" << ex << endl;
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
       }
-    }
-    else
-    {
+      catch(const CORBA::Exception &)
+      {
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:releaseResources Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
+      }
+
+      // Here make a call on the TM with update domain and node deletion
+
+      ::Deployment::Domain updated;
+      updated.node.length (1);
+      updated.node[0].name = CORBA::string_dup (TM_Tester::host_name);
+
+      ::CORBA::StringSeq elements;
+      elements.length (0);
+
+
+      if (TM_Tester::call_update)
+      {
+        if (TM_Tester::add_to_domain)
+        {
+          try
+          {
+            targetI->updateDomain (elements , updated, ::Deployment::Add);
+          }
+          catch(CORBA::NO_IMPLEMENT &)
+          {
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+          }
+          catch(CORBA::Exception &)
+          {
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
+          }
+        }
+        else
+        {
+          try
+          {
+            targetI->updateDomain (elements , updated, ::Deployment::Delete);
+          }
+          catch(CORBA::NO_IMPLEMENT &)
+          {
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+          }
+          catch(CORBA::Exception &)
+          {
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
+          }
+        }
+      }
+
+      // Now make a call of getAvailableResources on the TargetManager ...
       try
       {
-        targetI->updateDomain (elements , updated, ::Deployment::Delete);
+        Deployment::Domain_var domainV = targetI->getAvailableResources();
+
+        // here write things to file ...
+        TM_Tester::write_to_file (domainV.in());
+
+        ::Deployment::DnC_Dump::dump (domainV);
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
-      catch(CORBA::Exception & ex)
+      catch(CORBA::Exception &)
       {
-        cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-        cerr << "Error:TargetManager:Exception in UpdateDomain call" << ex << endl;
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR,  "Error:TargetManager:Exception in TargetManager call\n"));
       }
-    }
-    // Now make a call of getAvailableResources on the TargetManager ...
-    try
-    {
-      Deployment::Domain_var domainV = targetI->getAvailableResources();
-
-      // here write things to file ...
-      write_to_file (domainV.in());
 
-      ACE_DEBUG ((LM_DEBUG , "\n\nGetAvailableResources Returned \n"));
-      ::Deployment::DnC_Dump::dump (domainV);
+      // Finally destroy the ORB
+      orb->destroy ();
     }
-    catch(CORBA::NO_IMPLEMENT &)
+    catch (CORBA::Exception &)
     {
-      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
+      ACE_ERROR ((LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
     }
-    catch(CORBA::Exception & ex)
-    {
-      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
-    }
-
-    // Finally destroy the ORB
-    orb->destroy ();
+    return 0;
   }
-  catch (CORBA::Exception & ex) {
-    cerr << "Error:TargetManager:CORBA exception raised!" << ex << endl;
-  }
-  return 0;
-}
 
-void write_to_file (::Deployment::Domain domain)
+namespace TM_Tester
 {
-  for (size_t i = 0;i < domain.node.length ();i++)
+  void write_to_file (::Deployment::Domain domain)
   {
-    std::ofstream out (domain.node[i].name.in ());
-
-
-    // write in the node usage ...
-    for (size_t j = 0;j < domain.node[i].resource.length ();j++)
+    for (size_t i = 0;i < domain.node.length ();i++)
     {
+      std::ofstream out (domain.node[i].name.in ());
 
-      if (!strcmp (domain.node[i].resource[j].name.in (), "Processor"))
-      {
-        CORBA::Double node_cpu;
-        domain.node[i].resource[j].property[0].value >>= node_cpu;
-        out << node_cpu << std::endl;
-      }
-      if (!strcmp (domain.node[i].resource[j].name.in (), "NA_Monitor"))
+
+      // write in the node usage ...
+      for (size_t j = 0;j < domain.node[i].resource.length ();j++)
       {
-        std::string file_name = "NA_";
-        file_name += domain.node[i].name.in ();
-        std::ofstream na_out (file_name.c_str ());
-        CORBA::Double na_node_cpu;
-        domain.node[i].resource[j].property[0].value >>= na_node_cpu;
-        na_out << na_node_cpu << std::endl;
-        na_out.close ();
+
+        if (!strcmp (domain.node[i].resource[j].name.in (), "Processor"))
+        {
+          CORBA::Double node_cpu;
+          domain.node[i].resource[j].property[0].value >>= node_cpu;
+          out << node_cpu << std::endl;
+        }
+        if (!strcmp (domain.node[i].resource[j].name.in (), "NA_Monitor"))
+        {
+          std::string file_name = "NA_";
+          file_name += domain.node[i].name.in ();
+          ACE_FILE_IO file_io;
+          ACE_FILE_Connector (file_io, ACE_FILE_Addr (file_name.c_str ()));
+          CORBA::Double na_node_cpu;
+          domain.node[i].resource[j].property[0].value >>= na_node_cpu;
+          char buf[BUFSIZ];
+          memset (buf , 0 , BUFSIZ);
+          ACE_OS::sprintf (buf , "%f", na_node_cpu);
+          file_io.send (buf, ACE_OS::strlen (buf));
+        }
       }
+
+      out.close ();
     }
 
-    out.close ();
   }
-
 }
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index da7f59a3b86..69ca5d6b9c7 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -1,16 +1,4 @@
 // $Id$
-//===============================================================
-/**
- * @file DomainDataManager.cpp
- *
- * @brief Maintains the Domain Information
- *
- * It contains the entire Domain information.Both the
- * initial domain as well as the current available domain.
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
 #include "DomainDataManager.h"
 
 #include "Config_Handlers/DD_Handler.h"
@@ -32,7 +20,7 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
   return global_data_manager_;
 }
 
-
+// Returns the pointer to the static variable
 CIAO::DomainDataManager*
 CIAO::DomainDataManager::get_data_manager ()
 {
@@ -47,8 +35,6 @@ CIAO::DomainDataManager::delete_data_manger ()
     delete global_data_manager_;
 }
 
-
-
 int CIAO::DomainDataManager::update_domain (
                              const ::CORBA::StringSeq &,
                              const ::Deployment::Domain & domainSubset,
@@ -63,7 +49,7 @@ int CIAO::DomainDataManager::update_domain (
   switch (update_kind)
     {
       case ::Deployment::UpdateAll:
-      case ::Deployment::UpdateAvailable:
+      case ::Deployment::UpdateDynamic:
         break;
       case ::Deployment::Add:
         add_to_domain (domainSubset);
@@ -75,22 +61,18 @@ int CIAO::DomainDataManager::update_domain (
         break;
     }
 
-  int size = current_domain_.node.length ();
+  CORBA::ULong const size = current_domain_.node.length ();
 
-  int i;
+  CORBA::ULong i;
   for (i=0;i < size;i++)
     {
-      if (!strcmp (domainSubset.node[0].name ,
+      if (!ACE_OS::strcmp (domainSubset.node[0].name ,
                    current_domain_.node[i].name))
         {
           // found a match
           // for now overwrite the entire Node info ...
           // but later , this has to be changed to overwrite
           // only the specific part ...
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG , "TM::Changed the cpu Value\n"));
-            }
           current_domain_.node[i] = domainSubset.node[0];
           break; // finished job ...break
         }
@@ -103,11 +85,6 @@ int CIAO::DomainDataManager::update_domain (
       current_domain_.node.length (size+1);
       current_domain_.node[size]=domainSubset.node[0];
     }
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG ,
-          "TM::Inside The update Domain of Manager\n"));
-    }
   return 0;
 }
 
@@ -118,11 +95,8 @@ DomainDataManager (CORBA::ORB_ptr orb,
     deployment_config_ (orb_.in()),
     target_mgr_ (::Deployment::TargetManager::_duplicate(target))
 {
-  //  ACE_DEBUG((LM_DEBUG , "Calling DD_HANDLER\n"));
   CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
-  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER Constructor\n"));
   ::Deployment::Domain* dmn = dd.domain_idl ();
-  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER domain_idl\n"));
 
   if (CIAO::debug_level () > 9)
     ::Deployment::DnC_Dump::dump (*dmn);
@@ -168,10 +142,6 @@ int CIAO::DomainDataManager::call_all_node_managers ()
     }
 
   CORBA::ULong const 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++)
     {
@@ -195,11 +165,6 @@ int CIAO::DomainDataManager::call_all_node_managers ()
 
       if (!CORBA::is_nil (node_manager.in ()))
         {
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
-                          initial_domain_.node[i].name.in ()));
-            }
           Deployment::Logger_ptr log =
             Deployment::Logger::_nil ();
           ::Deployment::Domain sub_domain;
@@ -219,7 +184,7 @@ int CIAO::DomainDataManager::call_all_node_managers ()
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Join Domain==\n"));
+              ACE_ERROR ((LM_ERROR , "TM::Error in calling Join Domain==\n"));
               ex._tao_print_exception (
                 "Exception caught in ""DomainDataManager::joinDomain");
             }
@@ -229,98 +194,6 @@ int CIAO::DomainDataManager::call_all_node_managers ()
 
 }
 
-CIAO::Host_NodeManager_seq * CIAO::DomainDataManager::get_node_managers ()
-{
-  ::CIAO::Host_NodeManager_seq* node_mgr_seq =
-      new ::CIAO::Host_NodeManager_seq ();
-  node_mgr_seq->length (initial_domain_.node.length ());
-  for (unsigned int i=0;i < initial_domain_.node.length ();i++)
-    {
-      (*node_mgr_seq)[i].host_ =
-        CORBA::string_dup (initial_domain_.node[i].name);
-      ::Deployment::NodeManager_var node_manager =
-          deployment_config_.get_node_manager (initial_domain_.node[i].name);
-      //      if (node_manager.in () != 0)
-        {
-          (*node_mgr_seq)[i].node_mgr_ = ::CIAO::NodeManagerDaemon::_narrow (node_manager.in ());
-        }
-    }
-  return node_mgr_seq;
-}
-
-CIAO::Host_Infos*  CIAO::DomainDataManager::get_cpu_info ()
-{
-  CIAO::Host_Infos* host_info_seq = new CIAO::Host_Infos ();
-  host_info_seq->length (current_domain_.node.length ());
-
-  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG , "TM:: The node length is [%d]",
-                current_domain_.node.length ()));
-
-  for (unsigned int i=0;i < current_domain_.node.length ();i++)
-    {
-      (*host_info_seq)[i].hostname =
-        CORBA::string_dup (current_domain_.node[i].name);
-      //      ACE_DEBUG ((LM_DEBUG , "The resource length is [%d]",
-      //          current_domain_.node[i].resource.length ()));
-
-      for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++)
-        {
-          if (!strcmp(
-                      current_domain_.node[i].resource[j].name,
-                      "Processor"))
-            {
-              current_domain_.node[i].resource[j].property[0].value
-                >>= (*host_info_seq)[i].cpu_util;
-              CORBA::Double d;
-              current_domain_.node[i].resource[j].property[0].value
-                >>= d;
-              //      ACE_DEBUG ((LM_DEBUG, "TM::The current cpu util is [%f]\n", d));
-            }
-        }
-    }
-
-  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG , "TM::Returning from get_cpu_info"));
-
-  return host_info_seq;
-}
-
-CORBA::Long CIAO::DomainDataManager::get_pid (ACE_CString cmp)
-{
-  CORBA::Long pid;
-
-  // This is really ineffiecient this is O(n) ; searching all the nodes
-  // all the resources for a particular component.
-  // It needs to be stored in some other data structure
-
-  for (unsigned int i=0;i < current_domain_.node.length ();i++)
-    {
-      if (CIAO::debug_level () > 9)
-        ACE_DEBUG ((LM_DEBUG , "TM::The resource length is [%d]",
-                    current_domain_.node[i].resource.length ()));
-
-      for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++)
-        {
-          // The resource
-          if (!ACE_OS::strcmp(
-                      current_domain_.node[i].resource[j].name,
-                      "Component") &&
-              ACE_CString (current_domain_.node[i].resource[j].property[0].name) ==
-              cmp)
-            {
-              current_domain_.node[i].resource[j].property[0].value
-                >>= pid;
-              if (CIAO::debug_level () > 9)
-                ACE_DEBUG ((LM_DEBUG,
-                            "TM::getpid::The current pid is [%d]\n", pid));
-
-            }
-        } // resources
-    }// nodes
-
-  return pid;
-}
 
 void CIAO::DomainDataManager
 ::commitResources (
@@ -336,27 +209,21 @@ void CIAO::DomainDataManager
   ::Deployment::Domain temp_provisioned_data =
       provisioned_data_;
 
-  for (unsigned int i = 0;i < plan.instance.length ();i++)
+  for (CORBA::ULong i = 0;i < plan.instance.length ();i++)
     {
-      for (unsigned int j = 0;j < temp_provisioned_data.node.length ();j++)
+      for (CORBA::ULong j = 0;j < temp_provisioned_data.node.length ();j++)
         {
-          if (!strcmp (plan.instance[i].node.in () ,
+          if (!ACE_OS::strcmp (plan.instance[i].node.in () ,
                        temp_provisioned_data.node[j].name.in ()))
           {
-            if (CIAO::debug_level () > 9)
-              ACE_DEBUG ((LM_DEBUG ,
-                  "TM::commitResource::Host name matched\n"));
             try {
               match_requirement_resource (
-                                          plan.instance[i].deployedResource,
-                                          temp_provisioned_data.node[j].resource);
+                                plan.instance[i].deployedResource,
+                                temp_provisioned_data.node[j].resource);
             }
-            catch (::Deployment::ResourceNotAvailable& ex)
+            catch (::Deployment::ResourceCommitmentFailure& ex)
               {
                 // catch the exception and add parameters
-                ex.elementName =
-                  CORBA::string_dup (temp_provisioned_data.node[j].name);
-
                 throw ex;
               }
           }
@@ -378,19 +245,13 @@ releaseResources (
   // set the action value
   current_action_ = release;
 
-  for (unsigned int i = 0;i < plan.instance.length ();i++)
+  for (CORBA::ULong i = 0;i < plan.instance.length ();i++)
     {
-      for (unsigned int j = 0;j < provisioned_data_.node.length ();j++)
+      for (CORBA::ULong j = 0;j < provisioned_data_.node.length ();j++)
         {
           if (!ACE_OS::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"));
-              }
-
             match_requirement_resource (
                                         plan.instance[i].deployedResource,
                                         provisioned_data_.node[j].resource);
@@ -416,32 +277,22 @@ match_requirement_resource (
       // available resource
       for (CORBA::ULong j = 0;j < available.length ();j++)
         {
-          if (!strcmp (deployed[i].requirementName, available[j].name))
+          if (!ACE_OS::strcmp (deployed[i].requirementName, available[j].name))
             {
               if (CIAO::debug_level () > 9)
-                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++)
                 {
-                  if (!strcmp (deployed[i].resourceName,
+                  if (!ACE_OS::strcmp (deployed[i].resourceName,
                                available[j].resourceType[k]))
                     {
-                      if (CIAO::debug_level () > 9)
-                        ACE_DEBUG ((LM_DEBUG ,
-                           "TM::commitResource::Resource name matched\n"));
-
                       try {
                         match_properties (deployed[i].property,
                                           available[j].property);
                       }
-                      catch (::Deployment::ResourceNotAvailable& ex)
+                      catch (::Deployment::ResourceCommitmentFailure& ex)
                         {
                           // catch the exception and add parameters
-                          ex.resourceType =
-                            CORBA::string_dup (available[j].resourceType[k]);
-                          ex.resourceName =
-                            CORBA::string_dup (available[j].name);
                           throw ex;
                         }
                     }
@@ -457,9 +308,14 @@ match_properties (
       ::Deployment::Properties deployed,
       ::Deployment::SatisfierProperties & available)
 {
+  bool property_found;
+
   for (CORBA::ULong i = 0;i < deployed.length ();i++)
     {
+      property_found = false;
+
       for (CORBA::ULong j = 0;j < available.length ();j++)
+      {
         if (!ACE_OS::strcmp (deployed[i].name , available[j].name))
           {
             // check kind here ....and then subtract ....
@@ -467,14 +323,25 @@ match_properties (
             // some specialised algo
             // for now assuming Capacity ....
             // and tk_double ....
-            if (CIAO::debug_level () > 9)
-              ACE_DEBUG ((LM_DEBUG ,
-                          "TM::commitResource::Property name matched\n"));
 
               commit_release_resource (deployed[i] , available[j]);
-
+              property_found = true;
           }
-    }
+      } // internal for ....
+
+      // check if property was found or not
+      if (property_found == false)
+      {
+        // throw an error since property was not found in the Resource
+        ::Deployment::ResourceCommitmentFailure failure;
+
+        failure.reason = CORBA::string_dup ("Property Not Found\n");
+        failure.propertyName = CORBA::string_dup (deployed[i].name);
+        failure.propertyValue.length (0);
+
+        throw failure;
+      }
+    } // outside for ...
 }
 
 void CIAO::DomainDataManager::commit_release_resource (
@@ -497,24 +364,20 @@ void CIAO::DomainDataManager::commit_release_resource (
       if (available_d >= required_d)
         {
           available_d = available_d - required_d;
-          if (CIAO::debug_level () > 9)
-            ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
-                        available_d));
 
           available.value <<= available_d;
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "Insufficient resources! Available: %d, Required %d\n",
-                      available_d, required_d));
-          throw ::Deployment::ResourceNotAvailable ("",
-                                                    "",
-                                                    deployed.name.in (),
-                                                    "",
-                                                    "");
-        }
+          ::Deployment::ResourceCommitmentFailure failure;
 
+          failure.reason = CORBA::string_dup ("Insufficient resources!");
+          failure.propertyName = CORBA::string_dup (available.name);
+          failure.propertyValue.length (1);
+          failure.propertyValue[0] = available.value;
 
+          throw failure;
+        }
     }
   else
     {
@@ -529,10 +392,6 @@ void CIAO::DomainDataManager::commit_release_resource (
 
       // Should we check for bin > 100 ??????
 
-      if (CIAO::debug_level () > 9)
-        ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
-                    available_d));
-
       available.value <<= available_d;
     }
 }
@@ -541,10 +400,6 @@ void CIAO::DomainDataManager::stop_monitors ()
 {
 
   CORBA::ULong 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++)
     {
@@ -567,18 +422,13 @@ void CIAO::DomainDataManager::stop_monitors ()
 
       if (!CORBA::is_nil (node_manager.in ()))
         {
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
-                          initial_domain_.node[i].name.in ()));
-            }
           try
             {
               node_manager->leaveDomain ();
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Leave Domain\n"));
+              ACE_ERROR ((LM_ERROR , "TM::Error in calling Leave Domain\n"));
               ex._tao_print_exception (
                 "Exception caught in ""DomainDataManager::leaveDomain");
             }
@@ -622,10 +472,6 @@ int CIAO::DomainDataManager::add_to_domain (
         }
   }
 
-//  ::Deployment::DnC_Dump::dump (this->provisioned_data_);
-
-  ACE_DEBUG ((LM_DEBUG, "TM::Node Up Message Processed\n"));
-
   return 0;
 }
 
@@ -694,7 +540,7 @@ int CIAO::DomainDataManager::delete_from_domain (
 
       for (CORBA::ULong i = 0;i < domain.node.length ();i++)
         {
-          if (strcmp (domain.node[i].name.in (),
+          if (ACE_OS::strcmp (domain.node[i].name.in (),
                       this->provisioned_data_.node[j].name.in ()) == 0)
             {
               found = true;
@@ -736,3 +582,83 @@ bool CIAO::DomainDataManager::update_node_status ()
   // update the node status here ...
   return 0;
 }
+
+void CIAO::DomainDataManager::commitResourceAllocation (
+          const ::Deployment::ResourceAllocations & resources)
+{
+  // commit the resources
+  // parse into the plan and commit resources ...
+
+  // set the action value
+  current_action_ = commit;
+
+  this->commit_release_RA (resources);
+}
+
+void CIAO::DomainDataManager::releaseResourceAllocation (
+    const ::Deployment::ResourceAllocations & resources)
+{
+  // set the action value
+  current_action_ = release;
+
+  this->commit_release_RA (resources);
+}
+
+
+int CIAO::DomainDataManager::
+commit_release_RA (const ::Deployment::ResourceAllocations& resources)
+{
+  // temporary used to guard against exceptions
+  temp_provisioned_data_ = provisioned_data_;
+
+
+  for (CORBA::ULong i = 0;i < resources.length ();i++)
+  {
+    try
+    {
+      ::Deployment::Resource& res = find_resource (resources[i]);
+
+      match_properties (resources[i].property , res.property);
+    }
+    catch (::Deployment::ResourceCommitmentFailure& ex)
+    {
+      // catch the exception and add parameters
+      ACE_ERROR ((LM_ERROR, "Caught the Exception in releaseResourceAllocation\n"));
+      ex.index = i;
+      throw ex;
+    }
+  }
+
+  // here commit the commitresources
+  provisioned_data_ = temp_provisioned_data_;
+
+  return 0;
+}
+
+::Deployment::Resource&
+CIAO::DomainDataManager::find_resource (
+    const ::Deployment::ResourceAllocation& resource)
+{
+  // for now search the resource in the Node sequence; Later need
+  // to add it to the Bridges and Interconnects too according to the
+  // spec
+    for (CORBA::ULong j = 0;j < this->temp_provisioned_data_.node.length ();j++)
+    {
+      if (!ACE_OS::strcmp (resource.elementName.in () ,
+            this->temp_provisioned_data_.node[j].name.in ()))
+      {
+        for (CORBA::ULong k =0;
+              k < this->temp_provisioned_data_.node[j].resource.length ();
+              k++)
+        {
+          if (!ACE_OS::strcmp (this->temp_provisioned_data_.node[j].resource[k].name.in (),
+                resource.resourceName.in ()))
+            return this->temp_provisioned_data_.node[j].resource[k];//resource found here, return
+        }
+
+        // resource not found
+        throw ::Deployment::ResourceCommitmentFailure ().reason = CORBA::string_dup ("Resource Not Found\n");
+      }
+    }
+    throw ::Deployment::ResourceCommitmentFailure ().reason = CORBA::string_dup ("Resource Not Found\n");
+}
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h
index d75e314606d..e32ba09a6d0 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -16,6 +16,7 @@
 
 #include "TargetManagerImplC.h"
 #include "DAnCE/DomainApplicationManager/Deployment_Configuration.h"
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerC.h"
 
 /**
  * @namespace CIAO
@@ -51,7 +52,7 @@ namespace CIAO
                            ::Deployment::DomainUpdateKind updateKind
                            );
       /**
-       * @brief        This function is called the Executor code
+       * @brief        This function is called from the Executor code
        *               to get the Original Domain data.
        * @return       Domain* The Initial Domain
        *
@@ -59,13 +60,12 @@ namespace CIAO
       ::Deployment::Domain* get_initial_domain ();
 
       /**
-       * @brief       This function is called the Executor code
+       * @brief       This function is called from the Executor code
        *              to get the Current Domain data.
        * @return      Domain* The Current Domain
        */
       ::Deployment::Domain* get_current_domain ();
 
-
       /**
        * This function calls the constructor of the
        * class Domain Data Manager
@@ -82,7 +82,7 @@ namespace CIAO
        * @brief Returns the static pointer to the
        *        data manager.
        * @return DomainDataManager*
-       * @description The staic get_data_manger function returning
+       * The staic get_data_manger function returning
        *              the data_manager pointer
        */
       static DomainDataManager* get_data_manager ();
@@ -96,36 +96,6 @@ namespace CIAO
        * @brief returns the sequence of node managers
        * object reference
        */
-      CIAO::Host_NodeManager_seq *
-        get_node_managers ();
-
-      /**
-       * @brief returns the node specific cpu utilization
-       *
-       * @return CIAO::Host_Infos*
-       */
-
-       CIAO::Host_Infos* get_cpu_info ();
-
-       /**
-        * @brief returns the pid of the component id submitted
-        * @param cmp The component id
-        *
-        * @return process id
-        */
-       CORBA::Long get_pid (ACE_CString cmp);
-
-       /**
-        * @brief commits the resources that are specified
-        * in the plan.
-        * @param plan ::Deployment::DeploymentPlan
-        * @exception  ::Deployment::ResourceNotAvailable thrown
-        *             when the resources mentioned in the plan exceeds
-        *             the current resource.
-        * @exception  ::Deployment::PlanError thrown if the plan has any
-        *              error
-        *
-        */
        void commitResources (
        const ::Deployment::DeploymentPlan & plan);
 
@@ -144,7 +114,27 @@ namespace CIAO
         */
        void stop_monitors ();
 
-    protected:
+       /**
+        * @brief The function allocates resources specified in the
+        * parameter
+        *
+        * This function is for the ResourceCommitmentManager
+        *
+        */
+       void commitResourceAllocation (
+           const ::Deployment::ResourceAllocations & resources);
+
+       /**
+        * @brief The function releases resources specified in the
+        * parameter
+        *
+        * This function is for the ResourceCommitmentManager
+        *
+        */
+       void releaseResourceAllocation (
+           const ::Deployment::ResourceAllocations & resources);
+
+      private:
 
       /**
        * The constructor made protected so that no one can create
@@ -252,6 +242,18 @@ namespace CIAO
        */
       bool update_node_status ();
 
+      /**
+       * @function find_resource
+       * @brief It finds the Resource structure which is respresents the
+       * ResourceAllocation
+       */
+      ::Deployment::Resource& find_resource (
+          const ::Deployment::ResourceAllocation& resource);
+
+      int commit_release_RA (
+          const ::Deployment::ResourceAllocations& resources);
+
+
       /// The ORB pointer
       CORBA::ORB_var orb_;
 
@@ -262,7 +264,8 @@ namespace CIAO
       /// at total capacity
       ::Deployment::Domain initial_domain_;
 
-
+      /// The staic data member , replacing a global variable
+      static DomainDataManager* global_data_manager_; 
       /// The Current Domain - contains resources
       /// at current capacity
       ::Deployment::Domain current_domain_;
@@ -271,20 +274,18 @@ namespace CIAO
       ::Deployment::TargetManager_var target_mgr_;
 
       /**
-       * The staic data manager pointer implementing
-       * singleton pattern
-       */
-      static DomainDataManager* global_data_manager_;
-
-      /**
        * The static provisioned Domain data
        */
       ::Deployment::Domain provisioned_data_;
 
+      /// temporary domain used in commit/release to
+      /// guard against exceptions
+      ::Deployment::Domain temp_provisioned_data_;
+
       /// The current action
       Action current_action_;
     };
-
 } // CIAO
 
+
 #endif /* DOMAIN_DATA_MGRH */
diff --git a/CIAO/DAnCE/TargetManager/DomainEvents.idl b/CIAO/DAnCE/TargetManager/DomainEvents.idl
index 4fe089a86a6..bf973ebd0c4 100644
--- a/CIAO/DAnCE/TargetManager/DomainEvents.idl
+++ b/CIAO/DAnCE/TargetManager/DomainEvents.idl
@@ -10,7 +10,7 @@
 #ifndef DOMAIN_CHANGE_IDL
 #define DOMAIN_CHANGE_IDL
 
-#include "ciao/Deployment_TargetManager.idl"
+#include "DAnCE/Deployment/Deployment_TargetManager.idl"
 #include "ciao/CCM_Events.idl"
 
 module CIAO
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp
new file mode 100644
index 00000000000..5735e109f0c
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp
@@ -0,0 +1,52 @@
+// $Id$
+//
+#include "DomainDataManager.h"
+#include "ResourceCommitmentManager.h"
+
+// Implementation skeleton constructor
+CIAO::ResourceCommitmentManager_i::ResourceCommitmentManager_i (void)
+{
+}
+
+// Implementation skeleton destructor
+CIAO::ResourceCommitmentManager_i::~ResourceCommitmentManager_i (void)
+{
+}
+
+void CIAO::ResourceCommitmentManager_i::commitResources (
+    const ::Deployment::ResourceAllocations& resources)
+{
+  CIAO::DomainDataManager::get_data_manager ()->commitResourceAllocation (resources);
+
+  // commit succesful .. add to commited resource
+  this->add_to_commited_resource (resources);
+  return;
+}
+
+void CIAO::ResourceCommitmentManager_i::releaseResources (
+    const ::Deployment::ResourceAllocations & resources)
+{
+  ::Deployment::ResourceAllocations res;
+
+  // if the resources set is null , use the already allocated resources ..
+  if (resources.length () == 0)
+    res = this->resources_;
+  else
+    res = resources;
+
+  CIAO::DomainDataManager::get_data_manager ()->releaseResourceAllocation (res);
+  return;
+}
+
+int CIAO::ResourceCommitmentManager_i::add_to_commited_resource (
+    ::Deployment::ResourceAllocations res)
+{
+  CORBA::ULong current_length = this->resources_.length ();
+
+  this->resources_.length (current_length + res.length ());
+
+  for (CORBA::ULong i =0;i < res.length ();i++)
+    this->resources_[current_length + i] = res[i];
+
+  return 0;
+}
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
new file mode 100644
index 00000000000..99a21a797bc
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
@@ -0,0 +1,63 @@
+// $Id$
+//
+/**
+ * @file ResourceCommitmentManager.h
+ *
+ * @brief This file declares the ResourceCommitmentManager class
+ *
+ * This class acts as the servant of the interface
+ * ResourceCommitmentManager
+ */
+#ifndef DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
+#define DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
+
+#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO {
+
+  class  ResourceCommitmentManager_i
+   : public virtual POA_Deployment::ResourceCommitmentManager
+    {
+      public:
+        // Constructor
+        ResourceCommitmentManager_i (void);
+
+        // Destructor
+        virtual ~ResourceCommitmentManager_i (void);
+
+        /**
+         * @function commitResources
+         * @brief Commits the resources
+         *
+         * @description This function makes a call to the DomainDataManager in order
+         * to commit the resources mentioned in the ResourceAllocation
+         * sequence. If the resource cannot be allocated throws a
+         * ResourceCommitmentFailed exception
+         */
+        virtual
+          void commitResources (
+              const ::Deployment::ResourceAllocations& resources);
+
+        virtual
+          void releaseResources (
+              const ::Deployment::ResourceAllocations & resources);
+
+      private:
+        /**
+         * @function add_to_commited_resource
+         * @brief This function adds the res to already commited resources.
+         *        This is to be called from within commitResources
+         */
+        int add_to_commited_resource (::Deployment::ResourceAllocations res);
+
+        /// The commited resource
+        ::Deployment::ResourceAllocations resources_;
+    };
+
+}
+
+#endif /* DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_  */
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 11d1bd518b9..a4a03cca6a4 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -55,6 +55,7 @@ project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, cia
   Source_Files {
     DomainDataManager.cpp
     TargetManager_exec.cpp
+    ResourceCommitmentManager.cpp
   }
 
   IDL_Files {
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
index 025d8188e39..26d0c336b62 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
@@ -12,12 +12,6 @@
  * a facet by the TargetManager component
  */
 
-/**
- * @module CIAO
- *
- * @brief The CIAO module
- */
-
 #include "DAnCE/Interfaces/NodeManagerDaemon.idl"
 
 module CIAO
@@ -55,7 +49,10 @@ module CIAO
    */
   struct Host_NodeManager
   {
+    /// host name
     string host_;
+
+    /// the node manager IOR
     ::CIAO::NodeManagerDaemon node_mgr_;
   };
 
@@ -71,9 +68,17 @@ module CIAO
    */
   interface TargetManagerExt
   {
+    ///Returns the pid in which a component runs
     long get_pid (in string component_uuid);
+    
+    /// returns the cpu usage for each host in the 
+    /// last cycle
     Host_Infos get_host_cpu ();
+    
+    /// Return the detail of the components
     Component_Infos get_component_cpu ();
+
+    /// Returns the OR of the Node managers
     Host_NodeManager_seq get_all_node_managers ();
   };
 };
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
index 705a3146a75..484b1e53d20 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -11,22 +11,15 @@
 #define TARGETMGR_IDL
 
 #include "ciao/Components.idl"
-#include "ciao/Deployment_Target_Data.idl"
-#include "TargetManagerExt.idl"
-#include "DomainEvents.idl"
+#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "DAnCE/TargetManager/TargetManagerExt.idl"
+#include "DAnCE/TargetManager/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;
   };
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
index a39446e7273..0f3e30f37b0 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -1,13 +1,4 @@
 // $Id$
-//===============================================================
-/**
- * @file TargetManager_exec.cpp
- *
- * @brief TargetManager Executor code
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
 #include "TargetManager_exec.h"
 #include "ciao/CIAO_common.h"
 #include <orbsvcs/CosNamingC.h>
@@ -16,6 +7,8 @@
 
 #include "DomainEventsC.h"
 
+#include "ResourceCommitmentManager.h"
+
 namespace CIDL_TargetManager_i
 {
   //==================================================================
@@ -25,8 +18,7 @@ namespace CIDL_TargetManager_i
   TargetManager_exec_i::
   TargetManager_exec_i (TargetManagerImpl_exec_i* exec ,
                         CORBA::ORB_ptr orb,
-                        TargetManagerImpl_Context *context
-                       )
+                        TargetManagerImpl_Context *context)
     : _exec (exec),
       orb_ (CORBA::ORB::_duplicate (orb)),
       context_ (context)
@@ -35,18 +27,16 @@ namespace CIDL_TargetManager_i
 
     // get its own obj ref , then call
 
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: getting ccm object\n"));
     CORBA::Object_var object = context_->get_CCM_object ();
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: narrowing target_impl\n"));
     CIAO::TargetManagerImpl_var target_impl =
             CIAO::TargetManagerImpl::_narrow (object.in ());
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: provide target manager\n"));
     ::Deployment::TargetManager_var target =
             target_impl->provide_targetMgr ();
-    //    dataManager_.reset (new CIAO::DomainDataManager (orb, target.in ()));
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: creating domain data manager\n"));
-    CIAO::DomainDataManager::create (orb, target.in());
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: DDD created!\n"));
+
+    // Create Domain Data here
+
+    CIAO::DomainDataManager::create (orb_.in (), target.in ());
+//    CIAO::Domain_Singleton::instance ();
   }
 
   TargetManager_exec_i::~TargetManager_exec_i (void)
@@ -57,7 +47,6 @@ namespace CIDL_TargetManager_i
 
   ::Deployment::Domain *
   TargetManager_exec_i::getAllResources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
       get_data_manager ()->get_initial_domain ();
@@ -65,7 +54,6 @@ namespace CIDL_TargetManager_i
 
   ::Deployment::Domain *
   TargetManager_exec_i::getAvailableResources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
       get_data_manager ()->get_current_domain ();
@@ -74,10 +62,6 @@ namespace CIDL_TargetManager_i
   void
   TargetManager_exec_i::commitResources (
   const ::Deployment::DeploymentPlan & plan)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Deployment::ResourceNotAvailable,
-  ::Deployment::PlanError))
   {
     return CIAO::DomainDataManager::
       get_data_manager ()->commitResources (plan);
@@ -86,7 +70,6 @@ namespace CIDL_TargetManager_i
   void
   TargetManager_exec_i::releaseResources (
   const ::Deployment::DeploymentPlan &  plan)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
       get_data_manager ()->releaseResources (plan);
@@ -97,20 +80,13 @@ namespace CIDL_TargetManager_i
   const ::CORBA::StringSeq &  elements ,
   const ::Deployment::Domain &  domainSubset ,
   ::Deployment::DomainUpdateKind  updateKind)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
-      }
-
     CIAO::DomainDataManager::
       get_data_manager ()->update_domain (
                     elements,
                     domainSubset,
-                    updateKind
-                    );
+                    updateKind);
 
     // here tell the planner about the changes
 
@@ -120,97 +96,49 @@ 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"));
-          }
-
         CIAO::Domain_Changed_Event_var changed_event =
           new OBV_CIAO::Domain_Changed_Event ();
 
         ::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"));
-          }
-
         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"));
-          }
-
         context_->push_changes (changed_event);
-
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
-          }
       }
 
   }
 
-  //==================================================================
-  // Facet Executor Implementation Class:   TargetManagerExt_exec_i
-  // required for RACE
-  //==================================================================
-
-  TargetManagerExt_exec_i::TargetManagerExt_exec_i (void)
-  {
-  }
-
-  TargetManagerExt_exec_i::~TargetManagerExt_exec_i (void)
+  ::Deployment::ResourceCommitmentManager_ptr
+  TargetManager_exec_i::createResourceCommitment (
+  const ::Deployment::ResourceAllocations& manager)
   {
-  }
-
-  // Operations from ::CIAO::TargetManagerExt
 
-  ::CORBA::Long
-  TargetManagerExt_exec_i::get_pid (
-                                    const char * component_uuid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get PID :: Skeleton Impl"));
-    return CIAO::DomainDataManager::
-      get_data_manager ()->get_pid (component_uuid);
-  }
+    CIAO::ResourceCommitmentManager_i *commit_servant =
+      new CIAO::ResourceCommitmentManager_i ();
 
-  ::CIAO::Host_Infos *
-  TargetManagerExt_exec_i::get_host_cpu ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get host cpu :: Skeleton Impl entering\n"));
-    return CIAO::DomainDataManager::
-      get_data_manager ()->get_cpu_info ();
-  }
+    // Standard owner transfer mechanisms.
+    //
+    PortableServer::ServantBase_var safe_daemon (commit_servant);
 
-  ::CIAO::Component_Infos *
-  TargetManagerExt_exec_i::get_component_cpu ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl"));
+    commit_servant->commitResources (manager);
 
-    // todo
+    Deployment::ResourceCommitmentManager_var mgrv =
+      commit_servant->_this ();
 
-    return 0;
+    return mgrv._retn ();
   }
 
-  ::CIAO::Host_NodeManager_seq *
-  TargetManagerExt_exec_i::get_all_node_managers
-  ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  void
+  TargetManager_exec_i::destroyResourceCommitment (
+  ::Deployment::ResourceCommitmentManager_ptr resources)
   {
-    return CIAO::DomainDataManager::
-      get_data_manager ()->get_node_managers ();
+    ::Deployment::ResourceAllocations res;
+    res.length (0);
+    resources->releaseResources (res);
+    return;
   }
-
   //==================================================================
   // Component Executor Implementation Class:   TargetManagerImpl_exec_i
   //==================================================================
@@ -232,49 +160,27 @@ namespace CIDL_TargetManager_i
 
   ::Deployment::CCM_TargetManager_ptr
   TargetManagerImpl_exec_i::get_targetMgr ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Calling TM constructor"));
-    }
 
-    if (CORBA::is_nil (this->exec_ext_object_.in ()))
+    if (CORBA::is_nil (this->exec_object_.in ()))
       {
         this->exec_object_ = new TargetManager_exec_i(this,
                       context_->_ciao_the_Container()->the_ORB(),
-                      context_
-                      );
+                      context_);
       }
 
     return ::Deployment::CCM_TargetManager::_duplicate (this->exec_object_.in ());
   }
 
-  ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i
-  ::get_target_manager_ext (
-                            ) 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 ());
-  }
-
   // Operations from Components::SessionComponent
 
   void
   TargetManagerImpl_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
-    TargetManagerImpl_Context::_narrow (
-    ctx);
+    TargetManagerImpl_Context::_narrow (ctx);
 
     if (this->context_ == 0)
     {
@@ -284,18 +190,12 @@ namespace CIDL_TargetManager_i
 
   void
   TargetManagerImpl_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   TargetManagerImpl_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
@@ -303,39 +203,24 @@ namespace CIDL_TargetManager_i
 
   void
   TargetManagerImpl_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n"));
-    }
     this->get_targetMgr ();
   }
 
   void
   TargetManagerImpl_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   TargetManagerImpl_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
-    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , calling LeaveDomain\n"));
 
     //CIAO::DomainDataManager::get_data_manager ()->stop_monitors ();
 
-    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , After calling LeaveDomain\n"));
     return;
   }
 
@@ -364,9 +249,6 @@ namespace CIDL_TargetManager_i
 
   ::Components::EnterpriseComponent_ptr
   TargetManagerHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
index fe419bdab8b..0e1b32ea68b 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -24,6 +24,9 @@
 #include "tao/LocalObject.h"
 #include "DomainDataManager.h"
 
+/**
+ * TargetManager Executor namespace
+ */
 namespace CIDL_TargetManager_i
 {
   class TargetManager_exec_i;
@@ -43,52 +46,23 @@ namespace CIDL_TargetManager_i
     // Port operations.
 
     virtual ::Deployment::CCM_TargetManager_ptr
-    get_targetMgr ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::CIAO::CCM_TargetManagerExt_ptr
-      get_target_manager_ext (
-                              )
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+    get_targetMgr ();
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
-    virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-   ::Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    virtual void ccm_remove ();
 
   protected:
     /// The service context pointer
@@ -96,83 +70,44 @@ namespace CIDL_TargetManager_i
 
     /// The exec Object
     ::Deployment::CCM_TargetManager_var exec_object_;
-
-    ::CIAO::CCM_TargetManagerExt_var exec_ext_object_;
   };
-
-  class TARGETMANAGER_EXEC_Export TargetManagerExt_exec_i
-    : public virtual ::CIAO::CCM_TargetManagerExt,
-  public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      TargetManagerExt_exec_i (void);
-      virtual ~TargetManagerExt_exec_i (void);
-
-      // Operations from ::CIAO::TargetManagerExt
-
-      virtual ::CORBA::Long
-        get_pid (
-      const char * component_uuid)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::CIAO::Host_Infos *
-        get_host_cpu ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::CIAO::Component_Infos *
-        get_component_cpu ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::CIAO::Host_NodeManager_seq *
-        get_all_node_managers ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    };
-
- class TARGETMANAGER_EXEC_Export TargetManager_exec_i
+  class TARGETMANAGER_EXEC_Export TargetManager_exec_i
   : public virtual ::Deployment::CCM_TargetManager,
   public virtual TAO_Local_RefCounted_Object
   {
     public:
     TargetManager_exec_i (TargetManagerImpl_exec_i* exec,
                           CORBA::ORB_ptr orb,
-                          TargetManagerImpl_Context *context
-                          );
+                          TargetManagerImpl_Context *context);
     virtual ~TargetManager_exec_i (void);
 
     // Operations from ::Deployment::TargetManager
 
-    virtual ::Deployment::Domain *
-    getAllResources ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::Domain * getAllResources ();
 
-    virtual ::Deployment::Domain *
-    getAvailableResources ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::Deployment::Domain * getAvailableResources ();
 
-    virtual void
-    commitResources (
-    const ::Deployment::DeploymentPlan & plan)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Deployment::ResourceNotAvailable,
-    ::Deployment::PlanError));
+    virtual void commitResources (const ::Deployment::DeploymentPlan & plan);
 
-    virtual void
-    releaseResources (
-    const ::Deployment::DeploymentPlan & argname)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void releaseResources (const ::Deployment::DeploymentPlan & argname);
 
     virtual void
     updateDomain (
     const ::CORBA::StringSeq & elements,
     const ::Deployment::Domain & domainSubset,
-    ::Deployment::DomainUpdateKind updateKind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ::Deployment::DomainUpdateKind updateKind);
+
+    virtual ::Deployment::ResourceCommitmentManager_ptr
+    createResourceCommitment (const ::Deployment::ResourceAllocations& manager);
+
+    virtual void
+    destroyResourceCommitment (
+    ::Deployment::ResourceCommitmentManager_ptr resources);
 
   private:
     TargetManagerImpl_exec_i * _exec;
 
-    ///The pointer to the Domain Manager
+    /// The pointer to the Domain Manager
     auto_ptr<CIAO::DomainDataManager> dataManager_;
 
     /// The CORBA ORB ...
@@ -203,10 +138,7 @@ namespace CIDL_TargetManager_i
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl b/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
index a98401ef296..760a67d063b 100644
--- a/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
+++ b/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
@@ -56,9 +56,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -94,7 +94,7 @@ $ns_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -111,7 +111,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
 
 $E->SpawnWaitKill (5000);
@@ -134,7 +134,7 @@ $call_num = 5;
 for ($i = 0; $i < $call_num; ++$i)
 {
   print "Invoking the client\n";
-  $tmclient = new PerlACE::Process ("../CmpClient", "file://TargetManager.ior");
+  $tmclient = new PerlACE::Process ("../CmpClient", "-t file://TargetManager.ior");
   $result = $tmclient->SpawnWaitKill (3000);
 
   if ($result != 0) {
@@ -147,7 +147,7 @@ for ($i = 0; $i < $call_num; ++$i)
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index d1ff9b8f67e..0c4da950558 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 "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "CompNum: %d\n",comp_num));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CIAO::Client_init (orb.in ());
 
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 0969c9ec055..4feda3109de 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 "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 484e854113d..28cf0fdc557 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 "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "ciao/Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index d239a8db5c5..1670995ad58 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 "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
index 8cbd9270bd0..044e6acc8af 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
@@ -21,21 +21,18 @@ namespace CIDL_RoundTrip_Impl
 
   NodeAppTest::CCM_LatencyTest_ptr
   RoundTrip_exec_i::get_facet_1 ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new LatencyTest_Impl;
   }
 
   NodeAppTest::CCM_LatencyTest_ptr
   RoundTrip_exec_i::get_facet_2 ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new LatencyTest_Impl;
   }
 
   CORBA::Long
   RoundTrip_exec_i::cube_long (CORBA::Long data)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return data * data * data;
   }
@@ -43,8 +40,6 @@ namespace CIDL_RoundTrip_Impl
   // Operations from Components::SessionComponent
   void
   RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -55,8 +50,6 @@ namespace CIDL_RoundTrip_Impl
 
   void
   RoundTrip_exec_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -67,8 +60,6 @@ namespace CIDL_RoundTrip_Impl
 
   void
   RoundTrip_exec_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -78,8 +69,6 @@ namespace CIDL_RoundTrip_Impl
 
   void
   RoundTrip_exec_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -89,8 +78,6 @@ namespace CIDL_RoundTrip_Impl
 
   void
   RoundTrip_exec_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -101,8 +88,6 @@ namespace CIDL_RoundTrip_Impl
 
   void
   RoundTrip_exec_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     if (CIAO::debug_level () > 0)
       {
@@ -120,8 +105,6 @@ namespace CIDL_RoundTrip_Impl
 
   ::Components::EnterpriseComponent_ptr
   RoundTripHome_exec_i::create ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     return new RoundTrip_exec_i;
   }
@@ -129,7 +112,6 @@ namespace CIDL_RoundTrip_Impl
   // Implementation for the probided inferface.
   CORBA::Long
   LatencyTest_Impl::cube_long (CORBA::Long data)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return data*data*data;
   }
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index 2df0ce868c8..7e9916e14cc 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -38,52 +38,35 @@ namespace CIDL_RoundTrip_Impl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-    virtual CORBA::Long cube_long (CORBA::Long data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data);
 
     /*
       virtual ::NodeAppTest::CCM_LatencyTest*
-      get_latency ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      get_latency ();
     */
 
-    NodeAppTest::CCM_LatencyTest_ptr
-    get_facet_1()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    NodeAppTest::CCM_LatencyTest_ptr get_facet_1();
 
 
     NodeAppTest::CCM_LatencyTest_ptr
-    get_facet_2()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_facet_2();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     /// Helper function to be called back by timeout_Handler
     void pulse (void);
 
     // CIAO defined methods
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
   protected:
 
@@ -107,8 +90,7 @@ namespace CIDL_RoundTrip_Impl
     {
     }
 
-    virtual CORBA::Long cube_long (CORBA::Long data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data);
   };
 
   /**
@@ -127,9 +109,7 @@ namespace CIDL_RoundTrip_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
 
   protected:
 
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl b/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
index 11d7801b133..e8778af9d79 100755
--- a/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("../../NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/bin/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client",
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl b/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
index 0fd413091f0..dfe37643354 100755
--- a/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("../../NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/bin/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client_ex",
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl b/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
index c1811abee9d..b81f72846ac 100755
--- a/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("../../NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/bin/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client_simple",
diff --git a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
index 59d86f5c9f1..1fb23e511a0 100755
--- a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+++ b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
@@ -34,23 +34,23 @@ unlink $iorfile5;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:10000 -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:20000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:30000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:50000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
diff --git a/CIAO/MPC/config/ciao_client_dnc.mpb b/CIAO/MPC/config/ciao_client_dnc.mpb
index 8e12607cf37..5ea0d00d35b 100644
--- a/CIAO/MPC/config/ciao_client_dnc.mpb
+++ b/CIAO/MPC/config/ciao_client_dnc.mpb
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : ifr_client, valuetype, pi, codecfactory {
-  after    += CIAO_DnC_Client
+project : ifr_client, valuetype, pi, codecfactory, ciao_vc8warnings {
+  after    += CIAO_Client
   includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
   idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao
-  libs     += CIAO_DnC_Client
+  libs     += CIAO_Client
 }
diff --git a/CIAO/MPC/config/ciao_component_dnc.mpb b/CIAO/MPC/config/ciao_component_dnc.mpb
index 9cabf46cf83..9749679bfcb 100644
--- a/CIAO/MPC/config/ciao_component_dnc.mpb
+++ b/CIAO/MPC/config/ciao_component_dnc.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : portableserver, ciao_server_dnc, ciao_events_dnc {
-  after    += CIAO_DnC_Container
-  libs     += CIAO_DnC_Container
+  after    += CIAO_Container
+  libs     += CIAO_Container
 }
diff --git a/CIAO/MPC/config/ciao_container_dnc.mpb b/CIAO/MPC/config/ciao_container_dnc.mpb
index 43365e736e3..1d4c2770456 100644
--- a/CIAO/MPC/config/ciao_container_dnc.mpb
+++ b/CIAO/MPC/config/ciao_container_dnc.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : portableserver, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
-  after    += CIAO_DnC_Container
-  libs     += CIAO_DnC_Container
+  after    += CIAO_Container
+  libs     += CIAO_Container
 }
diff --git a/CIAO/MPC/config/ciao_events_base_dnc.mpb b/CIAO/MPC/config/ciao_events_base_dnc.mpb
index de2c8d5a7b9..9553e9fd826 100644
--- a/CIAO/MPC/config/ciao_events_base_dnc.mpb
+++ b/CIAO/MPC/config/ciao_events_base_dnc.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : orbsvcslib, ciao_container_dnc, ciao_client_dnc {
-  libs     += CIAO_DnC_Events_Base
-  after    += CIAO_DnC_Events_Base
+  libs     += CIAO_Events_Base
+  after    += CIAO_Events_Base
 }
diff --git a/CIAO/MPC/config/ciao_events_dnc.mpb b/CIAO/MPC/config/ciao_events_dnc.mpb
index 50ec7aad402..b54b68b2cb8 100644
--- a/CIAO/MPC/config/ciao_events_dnc.mpb
+++ b/CIAO/MPC/config/ciao_events_dnc.mpb
@@ -4,6 +4,6 @@
 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
+  libs     += CIAO_Events
+  after    += CIAO_Events
 }
diff --git a/CIAO/MPC/config/ciao_nodeapp_configurator.mpb b/CIAO/MPC/config/ciao_nodeapp_configurator.mpb
new file mode 100644
index 00000000000..5c3315dd477
--- /dev/null
+++ b/CIAO/MPC/config/ciao_nodeapp_configurator.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_deployment_stub {
+  libs += CIAO_NodeApp_Configurator
+  after += NodeApp_Configurator
+}
diff --git a/CIAO/MPC/config/ciao_nodeapplication.mpb b/CIAO/MPC/config/ciao_nodeapplication.mpb
index 7c47eb723c6..a21c68e7896 100644
--- a/CIAO/MPC/config/ciao_nodeapplication.mpb
+++ b/CIAO/MPC/config/ciao_nodeapplication.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_deployment_stub, ciao_noop_configurator {
+project : ciao_deployment_stub, ciao_nodeapp_configurator {
   libs  += CIAO_NodeApplication
   after += NodeApplicationLib
 }
diff --git a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb
index b3740720386..9b0f3dd1e83 100644
--- a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb
+++ b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_nodemanager_stub {
-  libs  += NodeManager CIAO_NoOp_Configurator
+project : ciao_nodemanager_stub, ciao_noop_configurator {
+  libs  += NodeManager
   after += NodeManager_svnt
 }
diff --git a/CIAO/MPC/config/ciao_race_component.mpb b/CIAO/MPC/config/ciao_race_component.mpb
deleted file mode 100644
index dc78b44764f..00000000000
--- a/CIAO/MPC/config/ciao_race_component.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-project : ciaocidldefaults {
-  after += RACE_common_stub
-  libs  += RACE_common_stub CIAO_Deployment_stub
-  includes += $(CIAO_ROOT)/RACE
-  idlflags += -I$(CIAO_ROOT)/RACE
-}
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_servant_dnc.mpb b/CIAO/MPC/config/ciao_servant_dnc.mpb
index 6bc5c8d52a0..c6edf00271b 100644
--- a/CIAO/MPC/config/ciao_servant_dnc.mpb
+++ b/CIAO/MPC/config/ciao_servant_dnc.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming {
-  after += CIAO_DnC_Server
-  libs  += CIAO_DnC_Server
+  after += CIAO_Server
+  libs  += CIAO_Server
 }
diff --git a/CIAO/MPC/config/ciao_server_dnc.mpb b/CIAO/MPC/config/ciao_server_dnc.mpb
index c35042c2c4a..7b19cab3743 100644
--- a/CIAO/MPC/config/ciao_server_dnc.mpb
+++ b/CIAO/MPC/config/ciao_server_dnc.mpb
@@ -2,6 +2,6 @@
 // $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
+  after += CIAO_Server
+  libs  += CIAO_Server
 }
diff --git a/CIAO/MPC/config/ciao_vc8warnings.mpb b/CIAO/MPC/config/ciao_vc8warnings.mpb
new file mode 100644
index 00000000000..e4268729cf8
--- /dev/null
+++ b/CIAO/MPC/config/ciao_vc8warnings.mpb
@@ -0,0 +1,20 @@
+// -*- MPC -*-
+// $Id$
+
+// This file contains optional features that disable VC8 warnings that were
+// not present in earlier versions. Some people may consider these superfluous
+// or have already checked code to be sure it causes no trouble. So these
+// warnings are disabled by default. To enable them, generate your projects
+// with the feature set to 0.
+
+feature(vc8_avoid_deprecated_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4996
+  }
+}
+
+feature(vc8_avoid_dominance_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4250
+  }
+}
diff --git a/CIAO/MPC/config/ciaoexe.mpb b/CIAO/MPC/config/ciaoexe.mpb
new file mode 100644
index 00000000000..69433807610
--- /dev/null
+++ b/CIAO/MPC/config/ciaoexe.mpb
@@ -0,0 +1,4 @@
+// $Id$
+project {
+   install = $(CIAO_ROOT)/bin
+}
diff --git a/CIAO/MPC/config/cidlc.mpb b/CIAO/MPC/config/cidlc.mpb
index 38fa6d65e0d..83300b38eb7 100644
--- a/CIAO/MPC/config/cidlc.mpb
+++ b/CIAO/MPC/config/cidlc.mpb
@@ -6,7 +6,7 @@ project: boost_filesystem, boost_regex, exceptions {
   libpaths += $(CIAO_ROOT)/CCF/CCF $(ACE_ROOT)/lib
 
   specific(nmake, vc71, vc8) {
-    compile_flags += /wd4290 /wd4800 /wd4250 /wd4355
+    compile_flags += /wd4290 /wd4800 /wd4250 /wd4355 /wd4996
   }
 
   verbatim(gnuace, top) {
diff --git a/CIAO/MPC/config/xscdefaults.mpb b/CIAO/MPC/config/xscdefaults.mpb
new file mode 100644
index 00000000000..e53f1eeedbf
--- /dev/null
+++ b/CIAO/MPC/config/xscdefaults.mpb
@@ -0,0 +1,21 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+        specific {
+          xsc_bin = $(XSC_ROOT)/bin/xsc-binary
+          xsc_dep = $(XSC_ROOT)/bin/xsc-binary
+          xsc_flags = --backend cxx --cxx-char-type ACE_TCHAR --cxx-generate-writer-types
+        }
+
+        Define_Custom(XSC) {
+          automatic         = 0
+          dependent         = $(XSC_DEP)
+          command           = $(XSC_BIN)
+          commandflags      = $(XSC_FLAGS)
+          inputext          = .xsd
+          source_outputext  = .cpp
+          header_outputext  = .hpp
+          keyword xscflags  = commandflags
+        }
+}
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 60bdd8b110f..56a0c46b39e 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -1,3 +1,13 @@
+PLANNED MAJOR CHANGES FOR NEXT RELEASE (i.e., after 0.5.7)
+===========================================================================
+. Start update of IDL/semantics to conform to 06-04-01 specification.  
+  This will immediately break most CIAO specific extensions, such as shared
+  components and ReDaC.  
+
+. Expand support for complex types in deployment XML.
+
+. Enable use of CDR encoded deployment plans.
+
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
@@ -61,8 +71,48 @@ 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.6 and CIAO-0.5.7
+======================================================
+
+. Removed ACE_THROW_RETURN
+
+. Remove exception specifications from ORB mediated operations (C++
+  mapping requirement)
+
+. All DAnCE core idl files are moved to DAnCE/Deployment
+
+. QoS4CCM IDL files are moved to ciao/extension
+
+. RACE has been fully removed from the distribution, a new version
+  is work in progress and will be added again to the distribution
+  when it is ready
+
+. MPC base projects that contained _dnc_ have been renamed to not
+  include that string. 
+
+. DAnCE executables are now installed into $CIAO_ROOT/bin
+
+. Added a new TAO policy for specifying the DiffServ code points
+ (DSCP) to be added to request and reply IP packets of an
+ application. The policy can be added at the following levels: OBJECT,
+ THREAD, and ORB.
+
+. Extended the CIAOServerResources schema to allow the specification
+  of request and reply DSCPs to be added to the IP packets of an
+  application. Extended CIAO NodeApplication libraries, to read the
+  CIAOServerResources specification, to create DiffServ policies on the
+  objects, to allow automatic addition of DSCPs on the CCM port
+  objects.
+
+. Updated the Target Manager interface to comply with the latest OMG
+  specification. This includes the addition of a new entity,
+  ResourceCommitmentManager for the management of committed resources.
+
 USER VISIBLE CHANGES BETWEEN CIAO-0.5.5 and CIAO-0.5.6
 ======================================================
+. Updated the Target Manager interface to comply with the latest OMG
+  specification. This includes the addition of a new entity,
+  ResourceCommitmentManager for the management of committed resources.
 
 . Removed all exception environment macros except ACE_THROW_RETURN
   and ACE_THROW_SPEC
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index 181e00f306d..e0e28fabaac 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.6
-    TAO VERSION : 1.5.6
-    ACE VERSION : 5.5.6
+    CIAO VERSION: 0.5.7
+    TAO VERSION : 1.5.7
+    ACE VERSION : 5.5.7
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/RACE/Controller/Component/Controller.cidl b/CIAO/RACE/Controller/Component/Controller.cidl
deleted file mode 100644
index 0122563c69a..00000000000
--- a/CIAO/RACE/Controller/Component/Controller.cidl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#ifndef RACE_CONTROLLER_CIDL
-#define RACE_CONTROLLER_CIDL
-
-/*
- * @file Controller.cidl
- * @brief This file contains the Controller component implementation defination.
- */
-
-#include "Controller.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Controller_Impl
-    {
-      home executor Controller_Home_Exec
-        {
-          implements Controller_Home;
-          manages    Controller_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_CONTROLLER_CIDL */
diff --git a/CIAO/RACE/Controller/Component/Controller.idl b/CIAO/RACE/Controller/Component/Controller.idl
deleted file mode 100644
index 3d2959995df..00000000000
--- a/CIAO/RACE/Controller/Component/Controller.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-#ifndef RACE_CONTROLLER_IDL
-#define RACE_CONTROLLER_IDL
-
-/**
- * @file Controller.idl
- *
- * @brief Controller Component of RACE.
- *
- * This file declares a Controller of the RACE framework.
- *
- * @author Nishanth Shankaran <nshankar@dre.vanderbilt.edu>
- */
-
-#include <Components.idl>
-#include "ciao/Deployment_Target_Data.idl"
-#include "DAnCE/TargetManager/TargetManagerExt.idl"
-
-/**
- * @module CIAO
- * @brief The CIAO module.
- */
-module CIAO
-{
-  module RACE
-  {
-
-    /**
-     * @interface Trigger
-     * @brief This interface is used to start and stop
-     * the feedback loop of the controller.
-     */
-    interface Trigger
-    {
-      oneway void start ();
-
-      oneway void stop ();
-    };
-
-    /**
-     * @component Controller
-     * @brief The Controller component of RACE.
-     */
-
-    component Controller supports Trigger
-    {
-      uses TargetManagerExt target_mgr_ext;
-      uses ::Deployment::TargetManager targer_mgr;
-
-      /// @todo Need to integrate the receptacle for the BDC facet into
-      /// the controller.
-      //      uses BDC_QoS bdc;
-
-      /// The sampling period of the controller.
-      readonly attribute double sampling_period;
-    };
-
-    home Controller_Home manages Controller
-    {
-    };
-  };
-};
-#endif /* RACE_CONTROLLER_IDL */
diff --git a/CIAO/RACE/Controller/Component/Controller.mpc b/CIAO/RACE/Controller/Component/Controller.mpc
deleted file mode 100644
index aa1a77e0495..00000000000
--- a/CIAO/RACE/Controller/Component/Controller.mpc
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl Controller"
-
-project(Controller_stub): ciao_deployment_stub {
-
-  after += CIAO_TargetManager_stub
-  sharedname = Controller_stub
-  libs += TargetManager_stub NodeManager_stub
-  idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \
-              -Wb,stub_export_include=Controller_stub_export.h \
-              -Wb,skel_export_macro=CONTROLLER_SVNT_Export \
-              -Wb,skel_export_include=Controller_svnt_export.h
-  dynamicflags   = CONTROLLER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Controller.idl
-  }
-
-  Source_Files {
-    ControllerC.cpp
-  }
-}
-
-project(Controller_svnt) : ciao_servant_dnc {
-  after +=  Controller_stub CIAO_TargetManager_svnt
-  sharedname  = Controller_svnt
-  libs    += Controller_stub TargetManager_stub TargetManager_svnt NodeManager_stub
-
-  idlflags  +=  -Wb,export_macro=CONTROLLER_SVNT_Export \
-                -Wb,export_include=Controller_svnt_export.h
-  dynamicflags = CONTROLLER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Controller.cidl
-  }
-
-  IDL_Files {
-    ControllerE.idl
-  }
-
-  Source_Files {
-    ControllerEC.cpp
-    ControllerS.cpp
-    Controller_svnt.cpp
-  }
-}
-
-
-project(Controller_exec) : ciao_component_dnc {
-  after   += Controller_svnt
-  sharedname = Controller_exec
-  libs      += Controller_stub Controller_svnt TargetManager_stub TargetManager_svnt NodeManager_stub
-
-  idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export \
-                -Wb,export_include=Controller_exec_export.h
-  dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Controller_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.cpp b/CIAO/RACE/Controller/Component/Controller_exec.cpp
deleted file mode 100644
index 1606e03a867..00000000000
--- a/CIAO/RACE/Controller/Component/Controller_exec.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// $Id$
-#include "Controller_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Controller_Impl
-    {
-      Controller_exec_i::Controller_exec_i (void)
-      {
-      }
-
-      Controller_exec_i::~Controller_exec_i (void)
-      {
-      }
-
-      // Supported operations.
-      void
-      Controller_exec_i::start ()
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-      {}
-
-      void
-      Controller_exec_i::stop ()
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-      {}
-
-      // Attribute operations.
-
-      ::CORBA::Double
-      Controller_exec_i::sampling_period ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0.0;
-      }
-
-      // Port operations.
-
-      // Operations from Components::SessionComponent
-
-      void
-      Controller_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        this->context_ =
-        Controller_Context::_narrow (
-          ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      Controller_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   Controller_Home_exec_i
-      //==================================================================
-
-      Controller_Home_exec_i::Controller_Home_exec_i (void)
-      {
-      }
-
-      Controller_Home_exec_i::~Controller_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      Controller_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-          retval,
-          Controller_exec_i,
-          CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_Controller_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-          retval,
-          Controller_Home_exec_i,
-          ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.h b/CIAO/RACE/Controller/Component/Controller_exec.h
deleted file mode 100644
index def356fef65..00000000000
--- a/CIAO/RACE/Controller/Component/Controller_exec.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// $Id$
-#ifndef CIAO_CONTROLLER_EXEC_H
-#define CIAO_CONTROLLER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Controller_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Controller_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Controller_Impl
-    {
-      class CONTROLLER_EXEC_Export Controller_exec_i
-      : public virtual Controller_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Controller_exec_i (void);
-        virtual ~Controller_exec_i (void);
-
-        // Supported operations.
-        virtual void start ()
-        ACE_THROW_SPEC ((::CORBA::SystemException));
-
-        virtual void stop ()
-        ACE_THROW_SPEC ((::CORBA::SystemException));
-
-        // Attribute operations.
-        virtual ::CORBA::Double
-        sampling_period ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Port operations.
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-          ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        protected:
-        Controller_Context *context_;
-      };
-
-      class CONTROLLER_EXEC_Export Controller_Home_exec_i
-      : public virtual Controller_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Controller_Home_exec_i (void);
-        virtual ~Controller_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-      };
-
-      extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_Controller_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_CONTROLLER_EXEC_H */
diff --git a/CIAO/RACE/Controller/Component/Controller_exec_export.h b/CIAO/RACE/Controller/Component/Controller_exec_export.h
deleted file mode 100644
index 080ecb25a44..00000000000
--- a/CIAO/RACE/Controller/Component/Controller_exec_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 CONTROLLER_EXEC
-// ------------------------------
-#ifndef CONTROLLER_EXEC_EXPORT_H
-#define CONTROLLER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_EXEC_HAS_DLL)
-#  define CONTROLLER_EXEC_HAS_DLL 1
-#endif /* ! CONTROLLER_EXEC_HAS_DLL */
-
-#if defined (CONTROLLER_EXEC_HAS_DLL) && (CONTROLLER_EXEC_HAS_DLL == 1)
-#  if defined (CONTROLLER_EXEC_BUILD_DLL)
-#    define CONTROLLER_EXEC_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_EXEC_BUILD_DLL */
-#    define CONTROLLER_EXEC_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_EXEC_BUILD_DLL */
-#else /* CONTROLLER_EXEC_HAS_DLL == 1 */
-#  define CONTROLLER_EXEC_Export
-#  define CONTROLLER_EXEC_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_EXEC_HAS_DLL == 1 */
-
-// Set CONTROLLER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_EXEC_NTRACE */
-
-#if (CONTROLLER_EXEC_NTRACE == 1)
-#  define CONTROLLER_EXEC_TRACE(X)
-#else /* (CONTROLLER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_EXEC_NTRACE == 1) */
-
-#endif /* CONTROLLER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Controller/Component/Controller_stub_export.h b/CIAO/RACE/Controller/Component/Controller_stub_export.h
deleted file mode 100644
index 65a430401a8..00000000000
--- a/CIAO/RACE/Controller/Component/Controller_stub_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 CONTROLLER_STUB
-// ------------------------------
-#ifndef CONTROLLER_STUB_EXPORT_H
-#define CONTROLLER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_STUB_HAS_DLL)
-#  define CONTROLLER_STUB_HAS_DLL 1
-#endif /* ! CONTROLLER_STUB_HAS_DLL */
-
-#if defined (CONTROLLER_STUB_HAS_DLL) && (CONTROLLER_STUB_HAS_DLL == 1)
-#  if defined (CONTROLLER_STUB_BUILD_DLL)
-#    define CONTROLLER_STUB_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_STUB_BUILD_DLL */
-#    define CONTROLLER_STUB_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_STUB_BUILD_DLL */
-#else /* CONTROLLER_STUB_HAS_DLL == 1 */
-#  define CONTROLLER_STUB_Export
-#  define CONTROLLER_STUB_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_STUB_HAS_DLL == 1 */
-
-// Set CONTROLLER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_STUB_NTRACE */
-
-#if (CONTROLLER_STUB_NTRACE == 1)
-#  define CONTROLLER_STUB_TRACE(X)
-#else /* (CONTROLLER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_STUB_NTRACE == 1) */
-
-#endif /* CONTROLLER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Controller/Component/Controller_svnt_export.h b/CIAO/RACE/Controller/Component/Controller_svnt_export.h
deleted file mode 100644
index d5e7c6aa42d..00000000000
--- a/CIAO/RACE/Controller/Component/Controller_svnt_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 CONTROLLER_SVNT
-// ------------------------------
-#ifndef CONTROLLER_SVNT_EXPORT_H
-#define CONTROLLER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_SVNT_HAS_DLL)
-#  define CONTROLLER_SVNT_HAS_DLL 1
-#endif /* ! CONTROLLER_SVNT_HAS_DLL */
-
-#if defined (CONTROLLER_SVNT_HAS_DLL) && (CONTROLLER_SVNT_HAS_DLL == 1)
-#  if defined (CONTROLLER_SVNT_BUILD_DLL)
-#    define CONTROLLER_SVNT_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_SVNT_BUILD_DLL */
-#    define CONTROLLER_SVNT_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_SVNT_BUILD_DLL */
-#else /* CONTROLLER_SVNT_HAS_DLL == 1 */
-#  define CONTROLLER_SVNT_Export
-#  define CONTROLLER_SVNT_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_SVNT_HAS_DLL == 1 */
-
-// Set CONTROLLER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_SVNT_NTRACE */
-
-#if (CONTROLLER_SVNT_NTRACE == 1)
-#  define CONTROLLER_SVNT_TRACE(X)
-#else /* (CONTROLLER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_SVNT_NTRACE == 1) */
-
-#endif /* CONTROLLER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl
deleted file mode 100644
index b1c3f7f0ddb..00000000000
--- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-//$Id$
-//Input_Adapter.idl
-
-#ifndef RACE_INPUT_ADAPTER_IDL
-#define RACE_INPUT_ADAPTER_IDL
-
-#include <Components.idl>
-#include "../../Plan_Analyzer/Interface/PlanIngress.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    component Input_Adapter
-    {
-      uses PlanIngress ingress;
-    };
-  };
-};
-
-#endif /* RACE_INPUT_ADAPTER_IDL */
diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
deleted file mode 100644
index 8ef8d7bf6d8..00000000000
--- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
+++ /dev/null
@@ -1,59 +0,0 @@
-// $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 \
-              -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
-  dynamicflags   = INPUT_ADAPTER_STUB_BUILD_DLL
-  libs += Plan_Analyzer_Interface_stub
-
-  IDL_Files {
-    Input_Adapter.idl
-  }
-
-  Source_Files {
-    Input_AdapterC.cpp
-  }
-
-  Header_Files {
-    Input_AdapterC.h
-  }
-
-  Inline_Files {
-    Input_AdapterC.inl
-  }
-}
-
-project(Input_Adapter_svnt) : ciao_servant_dnc {
-
-  after +=  Input_Adapter_stub
-  sharedname  = Input_Adapter_svnt
-  libs    += Input_Adapter_stub Plan_Analyzer_Interface_stub
-
-  idlflags += -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
-  dynamicflags = INPUT_ADAPTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-    Input_Adapter.idl
-  }
-
-  Source_Files {
-    Input_AdapterS.cpp
-  }
-
-  Header_Files {
-    Input_AdapterS.h
-  }
-
-  Inline_Files {
-    Input_AdapterS.inl
-  }
-}
diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_export.h b/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_export.h
deleted file mode 100644
index 546b8e64659..00000000000
--- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_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 INPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef INPUT_ADAPTER_STUB_EXPORT_H
-#define INPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (INPUT_ADAPTER_STUB_HAS_DLL)
-#  define INPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! INPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (INPUT_ADAPTER_STUB_HAS_DLL) && (INPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (INPUT_ADAPTER_STUB_BUILD_DLL)
-#    define INPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INPUT_ADAPTER_STUB_BUILD_DLL */
-#    define INPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define INPUT_ADAPTER_STUB_Export
-#  define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set INPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INPUT_ADAPTER_STUB_NTRACE */
-
-#if (INPUT_ADAPTER_STUB_NTRACE == 1)
-#  define INPUT_ADAPTER_STUB_TRACE(X)
-#else /* (INPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* INPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h b/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h
deleted file mode 100644
index 0d7bf2fc787..00000000000
--- a/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_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 INPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef INPUT_ADAPTER_SVNT_EXPORT_H
-#define INPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (INPUT_ADAPTER_SVNT_HAS_DLL)
-#  define INPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! INPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (INPUT_ADAPTER_SVNT_HAS_DLL) && (INPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (INPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define INPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define INPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define INPUT_ADAPTER_SVNT_Export
-#  define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set INPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INPUT_ADAPTER_SVNT_NTRACE */
-
-#if (INPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define INPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (INPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* INPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
deleted file mode 100644
index 2bbbe6037c6..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
+++ /dev/null
@@ -1,25 +0,0 @@
-//$Id$
-//Interactive_Input_Adapter.cidl
-
-#ifndef RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
-#define RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
-
-#include "Interactive_Input_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Interactive_Input_Adapter_Impl
-    {
-      home executor Interactive_Input_Adapter_Home_Exec
-        {
-          implements RACE::Interactive_Input_Adapter_Home;
-          manages    Interactive_Input_Adapter_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_INTERACTIVE_INPUT_ADAPTER_CIDL */
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
deleted file mode 100644
index d027b608c8b..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-//$Id$
-#ifndef RACE_INTERACTIVE_INPUT_ADAPTER_IDL
-#define RACE_INTERACTIVE_INPUT_ADAPTER_IDL
-
-#include <Components.idl>
-#include "../Base/Input_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    component Interactive_Input_Adapter : Input_Adapter
-    {
-    };
-    
-    home Interactive_Input_Adapter_Home manages Interactive_Input_Adapter
-    {
-    };
-  };
-};
-
-#endif /* RACE_INTERACTIVE_INPUT_ADAPTER_IDL */
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
deleted file mode 100644
index 2df82ac4a2f..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+++ /dev/null
@@ -1,95 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-
-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 \
-              -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
-  dynamicflags   = INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL
-  libs += Input_Adapter_stub \
-          Plan_Analyzer_Interface_stub
-
-  IDL_Files {
-    Interactive_Input_Adapter.idl
-  }
-
-  Source_Files {
-    Interactive_Input_AdapterC.cpp
-  }
-
-  Header_Files {
-    Interactive_Input_AdapterC.h
-  }
-
-  Inline_Files {
-    Interactive_Input_AdapterC.inl
-  }
-}
-
-project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc {
-  after += Interactive_Input_Adapter_stub \
-           Input_Adapter_svnt
-  sharedname  = Interactive_Input_Adapter_svnt
-  libs    += Interactive_Input_Adapter_stub \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub
-
-  idlflags  +=  -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
-                -Wb,export_include=Interactive_Input_Adapter_svnt_export.h
-
-  dynamicflags = INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Interactive_Input_Adapter.cidl
-  }
-
-  IDL_Files {
-    Interactive_Input_AdapterE.idl
-  }
-
-  Source_Files {
-    Interactive_Input_AdapterEC.cpp
-    Interactive_Input_AdapterS.cpp
-    Interactive_Input_Adapter_svnt.cpp
-  }
-
-  Header_Files {
-    Interactive_Input_AdapterEC.h
-    Interactive_Input_AdapterS.h
-    Interactive_Input_Adapter_svnt.h
-  }
-
-  Inline_Files {
-    Interactive_Input_AdapterEC.inl
-    Interactive_Input_AdapterS.inl
-    Interactive_Input_Adapter_svnt.inl
-  }
-}
-
-
-project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handlers {
-  after   += Interactive_Input_Adapter_svnt XSC_Config_Handlers
-  sharedname = Interactive_Input_Adapter_exec
-  libs    += Interactive_Input_Adapter_stub \
-             Interactive_Input_Adapter_svnt \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub \
-             XSC_Config_Handlers
-
-  idlflags  +=  -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 {
-    Interactive_Input_Adapter_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
deleted file mode 100644
index 9d1603361ab..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "Interactive_Input_Adapter_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Interactive_Input_Adapter_Impl
-    {
-      //==================================================================
-      // Component Executor Implementation Class:   Interactive_Input_Adapter_exec_i
-      //==================================================================
-
-      Interactive_Input_Adapter_exec_i::Interactive_Input_Adapter_exec_i (void)
-      {
-      }
-
-      Interactive_Input_Adapter_exec_i::~Interactive_Input_Adapter_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      // Port operations.
-
-      // Operations from Components::SessionComponent
-
-      void
-      Interactive_Input_Adapter_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        this->context_ =
-        Interactive_Input_Adapter_Context::_narrow (
-        ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      Interactive_Input_Adapter_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Interactive_Input_Adapter_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Interactive_Input_Adapter_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Interactive_Input_Adapter_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Interactive_Input_Adapter_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   Interactive_Input_Adapter_Home_exec_i
-      //==================================================================
-
-      Interactive_Input_Adapter_Home_exec_i::Interactive_Input_Adapter_Home_exec_i (void)
-      {
-      }
-
-      Interactive_Input_Adapter_Home_exec_i::~Interactive_Input_Adapter_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      Interactive_Input_Adapter_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-        retval,
-        Interactive_Input_Adapter_exec_i,
-        CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" INTERACTIVE_INPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createInteractive_Input_Adapter_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-        retval,
-        Interactive_Input_Adapter_Home_exec_i,
-        ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
deleted file mode 100644
index d16fbb76110..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_INTERACTIVE_INPUT_ADAPTER_EXEC_H
-#define CIAO_INTERACTIVE_INPUT_ADAPTER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Interactive_Input_Adapter_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Interactive_Input_Adapter_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Interactive_Input_Adapter_Impl
-    {
-      class INTERACTIVE_INPUT_ADAPTER_EXEC_Export Interactive_Input_Adapter_exec_i
-      : public virtual Interactive_Input_Adapter_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Interactive_Input_Adapter_exec_i (void);
-        virtual ~Interactive_Input_Adapter_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        // Port operations.
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-        ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        protected:
-        Interactive_Input_Adapter_Context *context_;
-      };
-
-      class INTERACTIVE_INPUT_ADAPTER_EXEC_Export Interactive_Input_Adapter_Home_exec_i
-      : public virtual Interactive_Input_Adapter_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Interactive_Input_Adapter_Home_exec_i (void);
-        virtual ~Interactive_Input_Adapter_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-      };
-
-      extern "C" INTERACTIVE_INPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createInteractive_Input_Adapter_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_INTERACTIVE_INPUT_ADAPTER_EXEC_H */
-
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h
deleted file mode 100644
index 147e914cb7c..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_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 INTERACTIVE_INPUT_ADAPTER_EXEC
-// ------------------------------
-#ifndef INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H
-#define INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL)
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL 1
-#endif /* ! INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL */
-
-#if defined (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1)
-#  if defined (INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL)
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL */
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL */
-#else /* INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_Export
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-
-// Set INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE */
-
-#if (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1)
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_TRACE(X)
-#else /* (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INTERACTIVE_INPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1) */
-
-#endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h
deleted file mode 100644
index 381f5d69197..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_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 INTERACTIVE_INPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H
-#define INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL)
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL)
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL */
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_Export
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE */
-
-#if (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1)
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_TRACE(X)
-#else /* (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INTERACTIVE_INPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h
deleted file mode 100644
index e50838b8e2f..00000000000
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_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 INTERACTIVE_INPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H
-#define INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL)
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_Export
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE */
-
-#if (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INTERACTIVE_INPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/Injector.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/Injector.cpp
deleted file mode 100644
index 7b22e519922..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/Injector.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * @file Injector.cpp
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * $Id$
- */
-
-#include "Input_Adapters/LocationUpdater/LocationUpdaterC.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/Auto_Ptr.h"
-
-#include <iostream>
-using namespace std;
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace Injector
-    {
-      const char *package_uri = 0;
-      const char *plan_uri = 0;
-      const char *iia_ior_file = 0;
-      const char *iia_name = "RACE::InteractiveInput";
-
-      bool teardown = false;
-
-      static void
-      usage (const ACE_TCHAR* program)
-      {
-  ACE_ERROR ((LM_ERROR,
-        ACE_TEXT ("Usage %s\n")
-        ACE_TEXT ("-d <Flatten deployment plan URI>\n")
-        ACE_TEXT ("-p <Toplevel Package URI>\n")
-        ACE_TEXT ("-t <Teardown plan>\n")
-        ACE_TEXT ("-k <Interactive_Input_Adaptor IOR, "
-                              "use naming service if not present\n"),
-                    program));
-      }
-
-      static bool
-      parse_args (int argc,
-      ACE_TCHAR *argv[])
-      {
-  ACE_Get_Opt get_opt (argc,
-           argv,
-           ACE_TEXT ("d:p:k:thn:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-        case 'd':
-    plan_uri = get_opt.opt_arg ();
-    break;
-
-        case 'p':
-    package_uri = get_opt.opt_arg ();
-    break;
-
-        case 'k':
-    iia_ior_file = get_opt.opt_arg ();
-    break;
-
-              case 't':
-                teardown = true;
-    break;
-
-              case 'n':
-                iia_name = get_opt.opt_arg ();
-
-        case 'h':
-        default:
-    usage (argv[0]);
-    return false;
-        }
-    }
-
-  return true;
-      }
-
-      CORBA::Object_ptr
-      fetch_reference_naming (CORBA::ORB_ptr orb,
-            const  ACE_CString &name)
-      {
-  ACE_ERROR ((LM_ERROR, "Resolving via nameservice...\n"));
-  using namespace CosNaming;
-  // Resolve naming service
-  CORBA::Object_var tmp =
-    orb->resolve_initial_references ("NameService");
-
-  NamingContext_var pns =
-    NamingContext::_narrow (tmp.in ());
-
-        Name ns_name;
-  CORBA::ULong i = 0;
-
-        ACE_Tokenizer tok ( name.rep ());
-        tok.delimiter_replace (':', 0);
-        tok.delimiter_replace ('/', 0);
-
-        char *name_element = 0;
-        while ((name_element = tok.next ()) != 0)
-          {
-            ns_name.length (ns_name.length () + 1);
-            ns_name[i].id = CORBA::string_dup (name_element);
-            ++i;
-          }
-
-
-  return pns->resolve (ns_name);
-      }
-
-      static int
-      run_main_implementation (int argc,  ACE_TCHAR *argv[])
-      {
-  try
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
-
-      if (!parse_args (argc, argv))
-        return -1;
-
-
-      // Resolve our input adapter...
-      CORBA::Object_var tmp;
-
-      cout << "resolving: " << iia_ior_file << endl;
-
-      if (iia_ior_file != 0)
-        tmp = orb->string_to_object (iia_ior_file);
-      else // must be a name....
-        tmp = fetch_reference_naming (orb.in (), iia_name);
-
-      CIAO::RACE::LocationUpdater_var iia
-        = CIAO::RACE::LocationUpdater::_narrow (tmp.in ());
-
-      // Create deploy input event.
-      CIAO::RACE::Deploy_Input_var input =
-        new OBV_CIAO::RACE::Deploy_Input;
-
-      input->plan_uri (plan_uri);
-      input->package_uri (package_uri);
-
-            if (teardown)
-              {
-                input->command (::CIAO::RACE::TEARDOWN);
-              }
-            else
-              {
-                input->command (::CIAO::RACE::DEPLOY);
-              }
-
-
-
-      // Get the consumer for the IIA
-      ::CIAO::RACE::Deploy_InputConsumer_var consumer =
-    iia->get_consumer_deployment ();
-
-      // push the event
-      consumer->push_Deploy_Input (input.in ());
-
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR,
-      "(%P|%t) Injector: Unknown exception\n"));
-      return -1;
-    }
-
-      return 0;
-      }
-    }
-  }
-}
-
-int main (int argc, ACE_TCHAR **argv)
-{
-  return CIAO::RACE::Injector::run_main_implementation (argc, argv);
-}
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp
deleted file mode 100644
index 4e72dd5a6c9..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp
+++ /dev/null
@@ -1,97 +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">
-
-  <UUID>1D2C2C63-CE33-4088-9443-781D080D8857</UUID>
-
-  <implementation id="_73898E70-9FB1-4881-9313-A2DE181EE48E">
-    <name>RT1H_Combined.RA_ComponentImplementations.LocationUpdaterImplementation.LocationUpdaterMonolithicImpl</name>
-    <source/>
-    <artifact>__AD4B52E0-103C-49E2-BE47-29CAE978676F</artifact>
-    <artifact>__E4AF24BF-5A39-46B1-8217-6343D7D53298</artifact>
-    <artifact>__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C</artifact>
-  </implementation>
-
-  <instance id="_2BD4D476-2F5B-41CA-A8CF-311084273028">
-    <name>RT1H_Combined.ComponentImplementations.RACE.RACE.LocationUpdater</name>
-    <node>blade36</node>
-    <source/>
-    <implementation>_73898E70-9FB1-4881-9313-A2DE181EE48E</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LocationUpdater.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>InteractiveAdapter.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RACE::InteractiveInput</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact id="__AD4B52E0-103C-49E2-BE47-29CAE978676F">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.LocationUpdaterArtifacts.LocationUpdater_stub</name>
-    <source/>
-    <node/>
-    <location>LocationUpdater_stub</location>
-  </artifact>
-
-  <artifact id="__E4AF24BF-5A39-46B1-8217-6343D7D53298">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.LocationUpdaterArtifacts.LocationUpdater_svnt</name>
-    <source/>
-    <node/>
-    <location>LocationUpdater_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CIAO_RACE_LocationUpdater_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.LocationUpdaterArtifacts.LocationUpdater_exec</name>
-    <source/>
-    <node/>
-    <location>LocationUpdater_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CIAO_RACE_LocationUpdater_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl
deleted file mode 100644
index fce16e1ac29..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl
+++ /dev/null
@@ -1,27 +0,0 @@
-//LOCATION_UPDATING_INPUT_ADAPTER.cidl,v 1.1 spaunov Exp
-//LocationUpdater.cidl
-//Author: Stoyan Paunov
-//$Id$
-
-#ifndef RACE_LOCATION_UPDATING_INPUT_ADAPTER_CIDL
-#define RACE_LOCATION_UPDATING_INPUT_ADAPTER_CIDL
-
-#include "LocationUpdater.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session LocationUpdater_Impl
-    {
-      home executor LocationUpdater_Home_Exec
-        {
-          implements RACE::LocationUpdater_Home;
-          manages    LocationUpdater_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_LOCATION_UPDATING_INPUT_ADAPTER_CIDL */
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl
deleted file mode 100644
index 3cc0f26d215..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-//LocationUpdater.idl,v 1.1 spaunov Exp
-//Author: Stoyan Paunov
-//$Id$
-
-#ifndef RACE_LOCATION_UPDATING_INPUT_ADAPTER_IDL
-#define RACE_LOCATION_UPDATING_INPUT_ADAPTER_IDL
-
-#include <Components.idl>
-#include "Input_Adapters/Base/Input_Adapter.idl"
-#include "common/RACE_common.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    eventtype Deploy_Input
-    {
-      public string plan_uri;
-      public string package_uri;
-      public Action command;
-    };
-
-    component LocationUpdater : Input_Adapter
-    {
-      consumes Deploy_Input deployment;
-    };
-
-    home LocationUpdater_Home manages LocationUpdater
-    {
-    };
-  };
-};
-
-#endif /* RACE_LOCATION_UPDATING_INPUT_ADAPTER_IDL */
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat
deleted file mode 100644
index a5a465169b8..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat
+++ /dev/null
@@ -1 +0,0 @@
-LocationUpdater      corbaloc:iiop:localhost:50000/NodeManager
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
deleted file mode 100644
index 4318902bc32..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-// $Id$
-//Author: Stoyan Paunov
-
-
-#include "LocationUpdater_exec.h"
-#include "ciao/CIAO_common.h"
-#include "Config_Handlers/XML_File_Intf.h"
-#include "Config_Handlers/Package_Handlers/PCD_Handler.h"
-#include "Config_Handlers/Common.h"
-
-#include "DAnCE/RepositoryManager/RepositoryManagerDaemonC.h"
-#include "PlanUpdater.h"
-
-#include <iostream>
-using namespace std;
-
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_LocationUpdater_Impl
-    {
-      //==================================================================
-      // Component Executor Implementation Class:
-      // LocationUpdater_exec_i
-      //==================================================================
-
-      LocationUpdater_exec_i::LocationUpdater_exec_i (void)
-      {
-      }
-
-      LocationUpdater_exec_i::~LocationUpdater_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      // Port operations.
-
-      void
-      LocationUpdater_exec_i::push_deployment (
-        ::CIAO::RACE::Deploy_Input * ev)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        bool plan_exists = false;
-
-        try
-        {
-          ACE_Auto_Ptr < ::Deployment::DeploymentPlan > dp;
-          ACE_Auto_Ptr < ::Deployment::PackageConfiguration > pcd;
-
-          if (ev->plan_uri () != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Opening the plan\n"));
-
-            Config_Handlers::XML_File_Intf xfi (ev->plan_uri ());
-
-            dp.reset ( xfi.get_plan ());
-
-            plan_exists = true;
-          }
-          else
-          {
-             dp.reset ( new ::Deployment::DeploymentPlan );
-          }
-
-
-          pcd.reset (new ::Deployment::PackageConfiguration);
-
-          if ((ACE_OS::strcmp (ev->package_uri (), "") != 0))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Opening the package descriptor: :%s:\n",
-                        ev->package_uri ()));
-
-            Config_Handlers::Packaging::PCD_Handler::package_config
-                  (ev->package_uri (), *pcd);
-           }
-
-           //Get the IOR of the RepoMan from the naming service
-
-           //Obtain a ref to the orb
-           CORBA::ORB_ptr orb = this->context_->_ciao_the_Container ()->the_ORB ();
-
-           //form the path to the RepoMan IOR file
-           ACE_CString RepoMan_ior = ("file://");
-           RepoMan_ior += ACE_OS::getenv ("CIAO_ROOT");
-           RepoMan_ior += "/DAnCE/RepositoryManager/RepositoryManagerDeamon.ior";
-
-           cout << "RepoMan ior file: " << RepoMan_ior.c_str () << endl;
-
-           CORBA::Object_var obj =
-                  orb->string_to_object (RepoMan_ior.c_str ());//RM_ior);
-
-           CIAO::RepositoryManagerDaemon_var rm =
-                 CIAO::RepositoryManagerDaemon::_narrow (obj.in ());
-
-           if (CORBA::is_nil (rm.in ()))
-           {
-             ACE_ERROR ((LM_ERROR,
-                         "Unable to acquire RepositoryManagerDaemon's objref\n"));
-
-             throw CORBA::INTERNAL ();
-           }
-
-           //now obtian the corresponding PackageConfiguration from
-           //the RepositoryManager
-
-           Deployment::PackageConfiguration_var rmpc;
-
-           try
-           {
-             //retrieve the curresponding PackageConfiguration
-             //from the RepoMan
-             rmpc = rm->findPackageByUUID (pcd->UUID);
-
-             ACE_DEBUG ((LM_INFO,
-                        "The package was found!\nUUID: %s\n",
-                         rmpc->UUID));
-           }
-           catch (Deployment::NoSuchName &)
-           {
-             ACE_ERROR ((LM_ERROR,
-                 "Error! Package not found! Location update failed!\n"));
-
-             throw CORBA::INTERNAL ();
-
-           }
-           catch (CORBA::Exception &)
-           {
-             ACE_ERROR ((LM_ERROR,
-                 "Error! General exception! Location update failed!\n"));
-
-             throw CORBA::INTERNAL ();
-           }
-
-          //now update the plan
-          if (plan_exists)
-          {
-            cout << "Updating plan ..." << endl;
-
-            PlanUpdater updater (*dp, *rmpc);
-            if (!updater.Visit ())
-               ACE_ERROR ((LM_ERROR,
-                   "Partial location update error possible!\n"));
-
-            cout << "Updating plan ... DONE!" << endl;
-
-            size_t add_len = dp->artifact.length ();
-
-            cout << "Updated location: \n";
-            for (size_t i = 0; i < add_len; ++i)
-            {
-               Deployment::ArtifactDeploymentDescription& add = dp->artifact[i];
-               if (ACE_OS::strstr (add.location[0], "http://"))
-                  cout << add.location[0] << endl;
-            }
-          }
-          //Done with the location updating
-
-          //do not call the plan analyzer just yet
-          return;
-
-          //creat an action sequence and populate it
-          ::CIAO::RACE::Plan_Actions plan_action_seq;
-
-           /// Create a Plan_Action_seq structure of length 1.
-           plan_action_seq.length (1);
-
-           /// Now populate the Plan_Action_seq structure.
-           plan_action_seq [0].command = ev->command ();
-           plan_action_seq [0].plan = *dp;
-           plan_action_seq [0].package = *pcd;
-
-           /// Now invoke the plan_analyzer.
-           this->context_->get_connection_ingress  ()
-               ->analyze_plan (plan_action_seq);
-        }
-        catch (CIAO::Config_Handlers::Config_Error &ex)
-        {
-          ACE_ERROR ((LM_ERROR, "Config_Error exception caught in "
-                      "LocationUpdater::push_deployment: %s, %s\n",
-                      ex.error_.c_str (),
-                      ex.name_.c_str ()));
-        }
-        catch (...)
-        {
-          ACE_ERROR ((LM_ERROR, "Exception caught in push_deployment\n"));
-        }
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      LocationUpdater_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        this->context_ =
-        LocationUpdater_Context::_narrow (
-          ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      LocationUpdater_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      LocationUpdater_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      LocationUpdater_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      LocationUpdater_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      LocationUpdater_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   LocationUpdater_Home_exec_i
-      //==================================================================
-
-      LocationUpdater_Home_exec_i::LocationUpdater_Home_exec_i (void)
-      {
-      }
-
-      LocationUpdater_Home_exec_i::~LocationUpdater_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      LocationUpdater_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-          retval,
-          LocationUpdater_exec_i,
-          CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" LOCATIONUPDATER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_LocationUpdater_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-          retval,
-          LocationUpdater_Home_exec_i,
-          ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h
deleted file mode 100644
index e3eb2f92fb2..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-//Author: Stoyan Paunov
-
-
-#ifndef CIAO_LOCATIONUPDATER_EXEC_H
-#define CIAO_LOCATIONUPDATER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "LocationUpdater_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LocationUpdater_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_LocationUpdater_Impl
-    {
-      class LOCATIONUPDATER_EXEC_Export LocationUpdater_exec_i
-      : public virtual LocationUpdater_Exec,
-        public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        LocationUpdater_exec_i (void);
-        virtual ~LocationUpdater_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        // Port operations.
-
-        virtual void
-        push_deployment (
-          ::CIAO::RACE::Deploy_Input *ev)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-          ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        protected:
-        LocationUpdater_Context *context_;
-      };
-
-      class LOCATIONUPDATER_EXEC_Export LocationUpdater_Home_exec_i
-      : public virtual LocationUpdater_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        LocationUpdater_Home_exec_i (void);
-        virtual ~LocationUpdater_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-      };
-
-      extern "C" LOCATIONUPDATER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_LocationUpdater_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_LOCATIONUPDATER_EXEC_H */
-
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h
deleted file mode 100644
index d24b1fc3538..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_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 LOCATIONUPDATER_EXEC
-// ------------------------------
-#ifndef LOCATIONUPDATER_EXEC_EXPORT_H
-#define LOCATIONUPDATER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (LOCATIONUPDATER_EXEC_HAS_DLL)
-#  define LOCATIONUPDATER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && LOCATIONUPDATER_EXEC_HAS_DLL */
-
-#if !defined (LOCATIONUPDATER_EXEC_HAS_DLL)
-#  define LOCATIONUPDATER_EXEC_HAS_DLL 1
-#endif /* ! LOCATIONUPDATER_EXEC_HAS_DLL */
-
-#if defined (LOCATIONUPDATER_EXEC_HAS_DLL) && (LOCATIONUPDATER_EXEC_HAS_DLL == 1)
-#  if defined (LOCATIONUPDATER_EXEC_BUILD_DLL)
-#    define LOCATIONUPDATER_EXEC_Export ACE_Proper_Export_Flag
-#    define LOCATIONUPDATER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* LOCATIONUPDATER_EXEC_BUILD_DLL */
-#    define LOCATIONUPDATER_EXEC_Export ACE_Proper_Import_Flag
-#    define LOCATIONUPDATER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* LOCATIONUPDATER_EXEC_BUILD_DLL */
-#else /* LOCATIONUPDATER_EXEC_HAS_DLL == 1 */
-#  define LOCATIONUPDATER_EXEC_Export
-#  define LOCATIONUPDATER_EXEC_SINGLETON_DECLARATION(T)
-#  define LOCATIONUPDATER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* LOCATIONUPDATER_EXEC_HAS_DLL == 1 */
-
-// Set LOCATIONUPDATER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (LOCATIONUPDATER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define LOCATIONUPDATER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define LOCATIONUPDATER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !LOCATIONUPDATER_EXEC_NTRACE */
-
-#if (LOCATIONUPDATER_EXEC_NTRACE == 1)
-#  define LOCATIONUPDATER_EXEC_TRACE(X)
-#else /* (LOCATIONUPDATER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define LOCATIONUPDATER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (LOCATIONUPDATER_EXEC_NTRACE == 1) */
-
-#endif /* LOCATIONUPDATER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h
deleted file mode 100644
index a7318989a5f..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_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 LOCATIONUPDATER_STUB
-// ------------------------------
-#ifndef LOCATIONUPDATER_STUB_EXPORT_H
-#define LOCATIONUPDATER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (LOCATIONUPDATER_STUB_HAS_DLL)
-#  define LOCATIONUPDATER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && LOCATIONUPDATER_STUB_HAS_DLL */
-
-#if !defined (LOCATIONUPDATER_STUB_HAS_DLL)
-#  define LOCATIONUPDATER_STUB_HAS_DLL 1
-#endif /* ! LOCATIONUPDATER_STUB_HAS_DLL */
-
-#if defined (LOCATIONUPDATER_STUB_HAS_DLL) && (LOCATIONUPDATER_STUB_HAS_DLL == 1)
-#  if defined (LOCATIONUPDATER_STUB_BUILD_DLL)
-#    define LOCATIONUPDATER_STUB_Export ACE_Proper_Export_Flag
-#    define LOCATIONUPDATER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* LOCATIONUPDATER_STUB_BUILD_DLL */
-#    define LOCATIONUPDATER_STUB_Export ACE_Proper_Import_Flag
-#    define LOCATIONUPDATER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* LOCATIONUPDATER_STUB_BUILD_DLL */
-#else /* LOCATIONUPDATER_STUB_HAS_DLL == 1 */
-#  define LOCATIONUPDATER_STUB_Export
-#  define LOCATIONUPDATER_STUB_SINGLETON_DECLARATION(T)
-#  define LOCATIONUPDATER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* LOCATIONUPDATER_STUB_HAS_DLL == 1 */
-
-// Set LOCATIONUPDATER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (LOCATIONUPDATER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define LOCATIONUPDATER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define LOCATIONUPDATER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !LOCATIONUPDATER_STUB_NTRACE */
-
-#if (LOCATIONUPDATER_STUB_NTRACE == 1)
-#  define LOCATIONUPDATER_STUB_TRACE(X)
-#else /* (LOCATIONUPDATER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define LOCATIONUPDATER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (LOCATIONUPDATER_STUB_NTRACE == 1) */
-
-#endif /* LOCATIONUPDATER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h
deleted file mode 100644
index 2bd7f8a87ca..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_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 LOCATIONUPDATER_SVNT
-// ------------------------------
-#ifndef LOCATIONUPDATER_SVNT_EXPORT_H
-#define LOCATIONUPDATER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (LOCATIONUPDATER_SVNT_HAS_DLL)
-#  define LOCATIONUPDATER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && LOCATIONUPDATER_SVNT_HAS_DLL */
-
-#if !defined (LOCATIONUPDATER_SVNT_HAS_DLL)
-#  define LOCATIONUPDATER_SVNT_HAS_DLL 1
-#endif /* ! LOCATIONUPDATER_SVNT_HAS_DLL */
-
-#if defined (LOCATIONUPDATER_SVNT_HAS_DLL) && (LOCATIONUPDATER_SVNT_HAS_DLL == 1)
-#  if defined (LOCATIONUPDATER_SVNT_BUILD_DLL)
-#    define LOCATIONUPDATER_SVNT_Export ACE_Proper_Export_Flag
-#    define LOCATIONUPDATER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* LOCATIONUPDATER_SVNT_BUILD_DLL */
-#    define LOCATIONUPDATER_SVNT_Export ACE_Proper_Import_Flag
-#    define LOCATIONUPDATER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define LOCATIONUPDATER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* LOCATIONUPDATER_SVNT_BUILD_DLL */
-#else /* LOCATIONUPDATER_SVNT_HAS_DLL == 1 */
-#  define LOCATIONUPDATER_SVNT_Export
-#  define LOCATIONUPDATER_SVNT_SINGLETON_DECLARATION(T)
-#  define LOCATIONUPDATER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* LOCATIONUPDATER_SVNT_HAS_DLL == 1 */
-
-// Set LOCATIONUPDATER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (LOCATIONUPDATER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define LOCATIONUPDATER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define LOCATIONUPDATER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !LOCATIONUPDATER_SVNT_NTRACE */
-
-#if (LOCATIONUPDATER_SVNT_NTRACE == 1)
-#  define LOCATIONUPDATER_SVNT_TRACE(X)
-#else /* (LOCATIONUPDATER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define LOCATIONUPDATER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (LOCATIONUPDATER_SVNT_NTRACE == 1) */
-
-#endif /* LOCATIONUPDATER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable b/CIAO/RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable
deleted file mode 100644
index 7a404ce4129..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable
+++ /dev/null
@@ -1,119 +0,0 @@
-// generate_component_mpc.pl
-//LocationUpdater.mpc, spaunov Exp
-//Author: Stoyan Paunov
-// $Id$
-
-
-project(LocationUpdater_stub): ciao_deployment_stub, ciao_race_component {
-  after += Input_Adapter_stub
-  sharedname = LocationUpdater_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=LOCATIONUPDATER_STUB_Export \
-              -Wb,stub_export_include=LocationUpdater_stub_export.h \
-              -Wb,skel_export_macro=LOCATIONUPDATER_SVNT_Export \
-              -Wb,skel_export_include=LocationUpdater_svnt_export.h
-  dynamicflags   = LOCATIONUPDATER_STUB_BUILD_DLL
-  libs += Input_Adapter_stub \
-          Plan_Analyzer_Interface_stub
-
-  IDL_Files {
-    LocationUpdater.idl
-  }
-
-  Source_Files {
-    LocationUpdaterC.cpp
-  }
-
-  Header_Files {
-    LocationUpdaterC.h
-  }
-
-  Inline_Files {
-    LocationUpdaterC.inl
-  }
-}
-
-project(LocationUpdater_svnt) : ciao_servant_dnc, ciao_race_component {
-  after += LocationUpdater_stub \
-           Input_Adapter_svnt
-  sharedname  = LocationUpdater_svnt
-  libs    += LocationUpdater_stub \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub
-
-  idlflags  +=  -Sc \
-                -Wb,export_macro=LOCATIONUPDATER_SVNT_Export \
-                -Wb,export_include=LocationUpdater_svnt_export.h
-
-  dynamicflags = LOCATIONUPDATER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    LocationUpdater.cidl
-  }
-
-  IDL_Files {
-    LocationUpdaterE.idl
-  }
-
-  Source_Files {
-    LocationUpdaterEC.cpp
-    LocationUpdaterS.cpp
-    LocationUpdater_svnt.cpp
-  }
-
-  Header_Files {
-    LocationUpdaterEC.h
-    LocationUpdaterS.h
-    LocationUpdater_svnt.h
-  }
-
-  Inline_Files {
-    LocationUpdaterEC.inl
-    LocationUpdaterS.inl
-    LocationUpdater_svnt.inl
-  }
-}
-
-
-project(LocationUpdater_exec) : ciao_component_dnc, ciao_config_handlers, ciao_race_component {
-  after   += LocationUpdater_svnt XSC_Config_Handlers
-  sharedname = LocationUpdater_exec
-  libs    += LocationUpdater_stub \
-             LocationUpdater_svnt \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub \
-  
-  idlflags  +=  -Sc \
-                -Wb,export_macro=LOCATIONUPDATER_EXEC_Export \
-                -Wb,export_include=LocationUpdater_exec_export.h
-  dynamicflags   = LOCATIONUPDATER_EXEC_BUILD_DLL
-
-  requires += RepositoryManager
-  after += RepositoryManager
-  includes += $(CIAO_ROOT)/DAnCE/RepositoryManager
-
-  IDL_Files {
-    
-  }
-
-  Source_Files {
-    LocationUpdater_exec.cpp
-    PCVisitorBase.cpp
-    PlanUpdater.cpp
-    $(CIAO_ROOT)/DAnCE/RepositoryManager/RepositoryManagerDaemonC.cpp
-  }
-}
-
-project(LocationUpdater_Injector) : ciao_component_dnc, ciao_race_component, taoexe {
-   exename = injector
-
-   libs += LocationUpdater_stub
-
-   IDL_Files {
-   }
-   Source_Files {
-      Injector.cpp
-   }
-}
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp
deleted file mode 100644
index 040ecb9eb45..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  PCVisitorBase.cpp
- *
- * $Id$
- *
- *  This file is a dummy which either includes the PCVisitorBase.inl or
- *  is ignored.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//========================================================================
-
-#include "PCVisitorBase.h"
-
-    PCVisitorBase::PCVisitorBase (void)
-    {
-    }
-
-#if !defined (__ACE_INLINE__)
-#include "PCVisitorBase.inl"
-#endif /* __ACE_INLINE__ */
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h b/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h
deleted file mode 100644
index cd3cb2b8752..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/**
- *  file  PCVisitorBase.h
- *
- *  $Id$
- *
- *  This file contains the virtual base class for the PackageConfiguration
- *  Visitor which is used to traverse the PackageConfiguration element
- *  defined in the PackagingData.idl. The PackageConfiguration has a
- *  number of sequence elements. This class actually implements the
- *  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>
- */
-//========================================================================
-
-#ifndef PC_VISITOR_BASE_H
-#define PC_VISITOR_BASE_H
-
-#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-#include "ace/SString.h"             //for the ACE_CString
-#include "ace/Containers_T.h"        //for ACE_Unbounded_Stack
-
-
-//forward declaration
-class PCVisitorBase;
-
-//========================================================================
-/**
- *  class PCAdapter
- *
- *  This class is used as an Adapter around the CIAO::Depolyment elements
- *  which are part of the PackageConfiguration traversal hierarchy in
- *  order to adapt each element to exhibit 'Visitor Node'-like structure.
- *  This allows us to use the Visitor double-dispatch traversal paradigm.
- */
-//========================================================================
-
-template <typename E>
-class PCAdapter
-{
-public:
-   PCAdapter (E& element) : element_ (element) {}
-   void Accept (PCVisitorBase &v) {v.Visit (*this);}
-   E& get () {return this-element_;}
-
-private:
-   E &element_;
-};
-
-
-template <typename T>
-void Accept (PCVisitorBase &v, T& element_to_visit)
-{
-  v.Visit (element_to_visit);
-}
-
-//========================================================================
-/**
- *  function - visit_sequence
- *
- *  This function is used to handle sequences of elements where each
- *  element takes the form of a Visitor Node.
- */
-//========================================================================
-
-
-/// I am using this to dispatch sequences
-template <typename SEQ>
-void visit_sequence (SEQ &seq, PCVisitorBase& v)
-{
-   const CORBA::ULong size = seq.length ();
-
-   for (CORBA::ULong i = 0; i < size; ++i)
-   {
-     Accept(v, seq[i]);
-   }
-}
-
-//========================================================================
-/**
- *  class PCVisitorBase
- *
- *  This class is a virtual base class for the PackageConfiguration Visitor
- *  The operation which deal with sequences are implemented here by means
- *  of the visit_sequence function above, in order to make the logic of
- *  derived classes easier to write. Writers of derived classes need only
- *  overload the functions which deal with single elements. Sequences are
- *  always handled here.
- */
-//========================================================================
-
-
-class  PCVisitorBase
-{
-public:
-
-  //constructor
-  PCVisitorBase (void);
-
-  ///function what dispatches sequences
-  template <typename SEQ>
-  friend void visit_sequence (SEQ &seq, PCVisitorBase& v);
-
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  virtual
-  void Visit (Deployment::PackageConfiguration &pc) = 0;
-  void Visit (Deployment::PackageConfigurations &pcs);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-  virtual
-  void Visit (Deployment::ComponentPackageDescription &cpd) = 0;
-  void Visit (Deployment::ComponentPackageDescriptions &cpds);
-
-  virtual
-  void Visit (Deployment::ComponentInterfaceDescription &cid) = 0;
-  //void Visit (Deployment::ComponentInterfaceDescriptions &cids);
-
-  virtual
-  void Visit (Deployment::PackagedComponentImplementation &pci) = 0;
-  void Visit (Deployment::PackagedComponentImplementations &pcis);
-
-  virtual
-  void Visit (Deployment::ComponentImplementationDescription &cid) = 0;
-  //void Visit (Deployment::ComponentImplementationDescriptions &cids);
-
-  virtual
-  void Visit (Deployment::ComponentAssemblyDescription &cad) = 0;
-  void Visit (Deployment::ComponentAssemblyDescriptions &cads);
-
-  virtual
-  void Visit (Deployment::SubcomponentInstantiationDescription &sid) = 0;
-  void Visit (Deployment::SubcomponentInstantiationDescriptions &sids);
-
-  virtual
-  void Visit (Deployment::MonolithicImplementationDescription &mid) = 0;
-  void Visit (Deployment::MonolithicImplementationDescriptions &mids);
-
-  virtual
-  void Visit (Deployment::NamedImplementationArtifact &nia) = 0;
-  void Visit (Deployment::NamedImplementationArtifacts &nias);
-
-  virtual
-  void Visit (Deployment::ImplementationArtifactDescription &iad) = 0;
-  //void Visit (Deployment::ImplementationArtifactDescriptions &iads);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-  virtual
-  void Visit (Deployment::ComponentPackageReference &cpr) = 0;
-  void Visit (Deployment::ComponentPackageReferences &cprs);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-  virtual
-  void Visit (Deployment::AssemblyPropertyMapping &apm) = 0;
-  void Visit (Deployment::AssemblyPropertyMappings &apms);
-
-  virtual
-  void Visit (Deployment::Property &property) = 0;
-  void Visit (Deployment::Properties &properties);
-
-
-  //requirements & capabilities
-  virtual
-  void Visit (Deployment::Requirement &requirement) = 0;
-  void Visit (Deployment::Requirements &requirements);
-
-  virtual
-  void Visit (Deployment::Capability &capability) = 0;
-  void Visit (Deployment::Capabilities &capabilities);
-
-  virtual
-  void Visit (Deployment::ImplementationRequirement &ir) = 0;
-  void Visit (Deployment::ImplementationRequirements &irs);
-
-  virtual
-  void Visit (Deployment::ImplementationDependency &id) = 0;
-  void Visit (Deployment::ImplementationDependencies &ids);
-
-  //ports and connections
-  virtual
-  void Visit (Deployment::AssemblyConnectionDescription &acd) = 0;
-  void Visit (Deployment::AssemblyConnectionDescriptions &acds);
-
-  virtual
-  void Visit (Deployment::SubcomponentPortEndpoint &spe) = 0;
-  void Visit (Deployment::SubcomponentPortEndpoints &spes);
-
-  virtual
-  void Visit (Deployment::ComponentExternalPortEndpoint &cepe) = 0;
-  void Visit (Deployment::ComponentExternalPortEndpoints &cepes);
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "PCVisitorBase.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* PC_VISITOR_BASE_H */
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl b/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl
deleted file mode 100644
index f6787601353..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  PCVisitorBase.inl
- *
- * $Id$
- *
- *  This file contains the implementation of the sequence-based
- *  PackageConfiguration Visitor functions. By implementing these
- *  we relieve developers of derived classes of the burden of handling
- *  the correct traversal of sequence-based elements. This implementation
- *  used the visit_sequence templatized function to do the heavy lifting.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu
- */
-//========================================================================
-
-
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  ACE_INLINE void PCVisitorBase::Visit
-    (Deployment::PackageConfigurations &pcs)
-  {
-    visit_sequence (pcs, *this);
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentPackageDescriptions &cpds)
-  {
-    visit_sequence (cpds, *this);
-  }
-
-  //NOT a member of Deployment
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ComponentInterfaceDescriptions &cids)
-  //{
-  //  visit_sequence (cids, *this);
-  //}
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::PackagedComponentImplementations &pcis)
-  {
-    visit_sequence (pcis, *this);
-  }
-
-  //NOT a member of Deployment
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ComponentImplementationDescriptions &cids)
-  //{
-  //  visit_sequence (cids, *this);
-  //}
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentAssemblyDescriptions &cads)
-  {
-    visit_sequence (cads, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::SubcomponentInstantiationDescriptions &sids)
-  {
-    visit_sequence (sids, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::MonolithicImplementationDescriptions &mids)
-  {
-    visit_sequence (mids, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::NamedImplementationArtifacts &nias)
-  {
-    visit_sequence (nias, *this);
-  }
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ImplementationArtifactDescriptions &iads)
-  //{
-  //  visit_sequence (iads, *this);
-  //}
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentPackageReferences &cprs)
-  {
-    visit_sequence (cprs, *this);
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::AssemblyPropertyMappings &apms)
-  {
-    visit_sequence (apms, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Properties &properties)
-  {
-    visit_sequence (properties, *this);
-  }
-
-  //requirements & capabilities
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Requirements &requirements)
-  {
-    visit_sequence (requirements, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Capabilities &capabilities)
-  {
-    visit_sequence (capabilities, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ImplementationRequirements &irs)
-  {
-    visit_sequence (irs, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ImplementationDependencies &ids)
-  {
-    visit_sequence (ids, *this);
-  }
-
-  //ports and connections
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::AssemblyConnectionDescriptions &acds)
-  {
-    visit_sequence (acds, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::SubcomponentPortEndpoints &spes)
-  {
-    visit_sequence (spes, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentExternalPortEndpoints &cepes)
-  {
-    visit_sequence (cepes, *this);
-  }
-
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp
deleted file mode 100644
index 939d015c817..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  PlanUpdater.cpp
- *
- *  $Id$
- *
- *  This file contains the implementation of the PackageConfiguration
- *  Visitor class PlanUpdater which derives from PCVisitorBase and attempts
- *  to update the location fields in the received DeploymentPlan to reflect
- *  the locations of the implementation artifacts as outlined in the
- *  PackageConfiguration which are downloadable via HTTP. Each Visit
- *  function focuses on the functionality necessary to process the
- *  PackageConfiguration element which is passed to it as an argument
- *  and on dispatching the next sequence of calls in the correct order!
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu
- */
-//========================================================================
-
-#include "PCVisitorBase.h"
-#include "PlanUpdater.h"
-
-#include "ace/OS_Memory.h"         //for ACE_NEW* macros
-#include "ace/SString.h"           //for ACE_CString
-
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-
-#include "Config_Handlers/DnC_Dump.h"
-
-//#include <iostream>
-//using namespace std;
-
-  //Constructor
-  PlanUpdater::PlanUpdater (Deployment::DeploymentPlan &plan,
-                        Deployment::PackageConfiguration &pc)
-    : PCVisitorBase (),
-      plan_ (plan),
-      pc_ (pc),
-      status_ (true)
-  {
-  }
-
-  //entry point for the protected visitor to get it do start
-  //the visitation process
-  bool PlanUpdater::Visit ()
-  {
-    Accept (*this, this->pc_);
-
-    return this->status_;
-
-  }
-
-  // A whole slew of overloaded routines for different IDL
-  // data types part of the PackageConfiguration.
-
-
-  void PlanUpdater::Visit (Deployment::PackageConfiguration &pc)
-  {
-    //visit the ComponentPackageDescription
-    if (pc.basePackage.length ())
-    {
-      //currently no support for that anywhere
-      //for (size_t r = 0; r = pc.selectRequirement.length (); ++r);
-
-      Accept (*this, pc.basePackage);
-    }
-    else
-      ACE_DEBUG ((LM_WARNING,
-                 "[PlanUpdater - PackageConfiguration] We currently "
-                 "do NOT support package references, specializedConfigs",
-                 "or imports!\n"));
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-
-  void PlanUpdater::Visit (Deployment::ComponentPackageDescription &cpd)
-  {
-    //do not need to visit the interface
-    //Accept (*this, cpd.realizes);
-
-    //visit the implementations
-    Accept (*this, cpd.implementation);
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ComponentInterfaceDescription &cid)
-  {
-    //Might want to populate this too once PICML starts supporting it
-  }
-
-
-  void PlanUpdater::Visit (Deployment::PackagedComponentImplementation &pci)
-  {
-    //visit the referencedImplementationArtifact
-    Accept (*this, pci.referencedImplementation);
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ComponentImplementationDescription &cid)
-  {
-    if (cid.assemblyImpl.length ())
-       //visit the component assembly
-       Accept (*this, cid.assemblyImpl);
-    else
-       //visit the monolithic component
-       Accept (*this, cid.monolithicImpl);
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ComponentAssemblyDescription &cad)
-  {
-    //visit the SubcomponentInstantiationDescription
-    Accept (*this, cad.instance);
-
-    //do not need to visit the connections
-    //Accept (*this, cad.connection);
-  }
-
-
-  void PlanUpdater::Visit (Deployment::SubcomponentInstantiationDescription &sid)
-  {
-    //visit the ComponentPackageDescription (again)
-    if (sid.basePackage.length ())
-      //visit the base package in the subcomponent
-      Accept (*this, sid.basePackage);
-    else
-      ACE_DEBUG ((LM_WARNING,
-                  "[PlanUpdater - SubcomponentInstantiationDescription] ",
-                  "We currently do NOT support package references, ",
-                  "specializedConfigs or imports!\n"));
-  }
-
-
-  void PlanUpdater::Visit (Deployment::MonolithicImplementationDescription &mid)
-  {
-    //NOTE: There are usually 3 NamedImplementationArtifacts per
-    //MonolithicImplementationDescription *_stub, *_svnt & *_exec
-
-    //visit the NamedImplementationArtifacts
-    Accept (*this, mid.primaryArtifact);
-  }
-
-
-  void PlanUpdater::Visit (Deployment::NamedImplementationArtifact &nia)
-  {
-    //visit the actual ImplementationArtifactDescriptor
-    Accept (*this, nia.referencedArtifact);
-  }
-
-
-  //This function attempts to update the location of the artifact deployment
-  //descriptions to reflect the once in the RepositoryManager.
-  //
-  //Not sure what the input is here! I am assuming that the
-  //location came from the descriptor files, so it just holds
-  //the name of the library. If this code evolves, we will need to
-  //update the string matching mechanism with a more complicated one.
-
-
-  void PlanUpdater::Visit (Deployment::ImplementationArtifactDescription &iad)
-  {
-    //some heavy lifting here!
-    static size_t iters = 0;
-    ++iters;
-    ACE_CString iad_loc (iad.location[0]);
-
-    size_t add_len = this->plan_.artifact.length ();
-
-    for (size_t i = 0; i < add_len; ++i)
-    {
-      Deployment::ArtifactDeploymentDescription& add = this->plan_.artifact[i];
-
-      //NOTE: Right now we only populate location[0]
-      //When this evolves, check needs to evolve as well.
-      ACE_CString add_loc (add.location[0]);
-
-      //check if the add location has already been updated
-      if (ACE_OS::strstr (add_loc.c_str (), "http://"))//, add_loc.length ()))
-        continue;
-
-      //check for a match and update the location
-      if (ACE_OS::strstr (iad_loc.c_str (), add_loc.c_str ()))//, iad_loc.length ()))
-      {
-        //if there is a match substitute one for the other
-        add.location[0] = CORBA::string_dup (iad_loc.c_str ());
-
-        //ACE_OS::printf ("Matching %s with %s\n",
-        //                 iad_loc.c_str (),
-        //                 add_loc.c_str ());
-
-      }
-
-    }
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-
-  void PlanUpdater::Visit (Deployment::ComponentPackageReference &cpr)
-  {
-    //not implemented
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-
-  void PlanUpdater::Visit (Deployment::AssemblyPropertyMapping &apm)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::Property &property)
-  {
-     //not needed
-  }
-
-
-  //requirements & capabilities
-
-  void PlanUpdater::Visit (Deployment::Requirement &requirement)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::Capability &capability)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ImplementationRequirement &ir)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ImplementationDependency &id)
-  {
-    //not needed
-  }
-
-  //ports and connections
-
-  void PlanUpdater::Visit (Deployment::AssemblyConnectionDescription &acd)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::SubcomponentPortEndpoint &spe)
-  {
-    //not needed
-  }
-
-
-  void PlanUpdater::Visit (Deployment::ComponentExternalPortEndpoint &cepe)
-  {
-    //not needed
-  }
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.h b/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.h
deleted file mode 100644
index 298b1b92fbb..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/PlanUpdater.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/**
- *  file  PlanUpdater.h
- *
- * $Id$
- *
- *  This file contains a Visitor classes which are used to traverse a
- *  PackageConfiguration and update the location fields in a corresponding
- *  DeploymentPlan.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//========================================================================
-
-#ifndef PLAN_UPDATER_H
-#define PLAN_UPDATER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/SString.h"             //for the ACE_CString
-
-#include "PCVisitorBase.h"           //for the base visitor
-//#include "Node_T.h"                  //Node
-#include "ace/Containers_T.h"        //for ACE_Double_Linked_List
-
-
-
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_BaseC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-
-//namespace {
-////Definition of various Node elements parametrized by
-////Deployment specific types
-//  typedef Node<Deployment::Node> NNode;
-//  typedef Node<Deployment::MonolithicImplementationDescription> MNode;
-//
-////Definition of various stacks used to store information
-////about the elements being parsed at various levels
-//  typedef ACE_Bounded_Stack<int> INDEX_STACK;
-//
-////definition of a Node which takes an ACE_CString
-//  typedef Node<ACE_CString> SNode;
-//}
-
-//===========================================================================
-/**
- *  class PlanUpdater
- *
- *  This class takes in a Deployment Plan and a PackageConfiguration and
- *  attempts to update the location fields in the deployment plan to reflect
- *  the locations available via HTTP as outlined in the passed Package-
- *  Configuration. It derives from PCVisitorBase and overloads the functions
- *  which deal with single elements. Sequences are handled in the base class.
- */
-//===========================================================================
-
-
-class  PlanUpdater : public PCVisitorBase
-{
-public:
-
-  //constructor
-  PlanUpdater (Deployment::DeploymentPlan &plan,
-               Deployment::PackageConfiguration &pc);
-
-  ///Entry point to protected Visitor functions
-  bool Visit ();
-
-protected:
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  virtual
-  void Visit (Deployment::PackageConfiguration &pc);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-  virtual
-  void Visit (Deployment::ComponentPackageDescription &cpd);
-
-  virtual
-  void Visit (Deployment::ComponentInterfaceDescription &cid);
-
-  virtual
-  void Visit (Deployment::PackagedComponentImplementation &pci);
-
-  virtual
-  void Visit (Deployment::ComponentImplementationDescription &cid);
-
-  virtual
-  void Visit (Deployment::ComponentAssemblyDescription &cad);
-
-  virtual
-  void Visit (Deployment::SubcomponentInstantiationDescription &sid);
-
-  virtual
-  void Visit (Deployment::MonolithicImplementationDescription &mid);
-
-  virtual
-  void Visit (Deployment::NamedImplementationArtifact &nia);
-
-  virtual
-  void Visit (Deployment::ImplementationArtifactDescription &iad);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-  virtual
-  void Visit (Deployment::ComponentPackageReference &cpr);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-  virtual
-  void Visit (Deployment::AssemblyPropertyMapping &apm);
-
-  virtual
-  void Visit (Deployment::Property &property);
-
-
-  //requirements & capabilities
-  virtual
-  void Visit (Deployment::Requirement &requirement);
-
-  virtual
-  void Visit (Deployment::Capability &capability);
-
-  virtual
-  void Visit (Deployment::ImplementationRequirement &ir);
-
-  virtual
-  void Visit (Deployment::ImplementationDependency &id);
-
-  //ports and connections
-  virtual
-  void Visit (Deployment::AssemblyConnectionDescription &acd);
-
-  virtual
-  void Visit (Deployment::SubcomponentPortEndpoint &spe);
-
-  virtual
-  void Visit (Deployment::ComponentExternalPortEndpoint &cepe);
-
-
-private:
-
-  Deployment::DeploymentPlan& plan_;
-  Deployment::PackageConfiguration& pc_;
-  bool status_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* PLAN_UPDATER_H */
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/README.txt b/CIAO/RACE/Input_Adapters/LocationUpdater/README.txt
deleted file mode 100644
index fc35c1a633c..00000000000
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-//Author: Stoyan Paunov
-
-This is the README for the LocationUpdater Input Adapter for RACE. This input
-adapter has similar functionality to the Interactive Input Adapter, however
-instead of using only the descriptors on disk, it uses the UUID from the
-parsed PackageConfiguration to retrieve its counterpart from the Repository
-Manager and updates the location of the implementation artifact to point to
-the HTTP server. This way the files can then be retrieved by DAnCE at
-deployment.
-
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/Injector.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/Injector.cpp
deleted file mode 100644
index a0eaa7bbb9b..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/Injector.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * @file Injector.cpp
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- * @author Stoyan Paunov
- *
- * $Id$
- */
-
-#include "Input_Adapters/PlanGenerator/PlanGeneratorC.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/Auto_Ptr.h"
-
-#include <iostream>
-using namespace std;
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace Injector
-    {
-      const char *package_name = 0;
-      const char *iia_ior_file = 0;
-      const char *iia_name = "RACE::InteractiveInput";
-
-      bool teardown = false;
-
-      static void
-      usage (const ACE_TCHAR* program)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Usage %s\n")
-                    ACE_TEXT ("-p <Name of package to fetch from the RepoMan>\n")
-                    ACE_TEXT ("-t <Teardown plan>\n")
-                    ACE_TEXT ("-k <Interactive_Input_Adaptor IOR, "
-                              "use naming service if not present\n"),
-                              program));
-      }
-
-      static bool
-      parse_args (int argc,
-      ACE_TCHAR *argv[])
-      {
-        ACE_Get_Opt get_opt (argc,
-                             argv,
-                             ACE_TEXT ("p:k:thn:"));
-        int c;
-
-        while ((c = get_opt ()) != EOF)
-        {
-          switch (c)
-          {
-          case 'p':
-            package_name = get_opt.opt_arg ();
-            break;
-
-          case 'k':
-            iia_ior_file = get_opt.opt_arg ();
-            break;
-
-          case 't':
-            teardown = true;
-            break;
-
-          case 'n':
-            iia_name = get_opt.opt_arg ();
-
-          case 'h':
-          default:
-            usage (argv[0]);
-            return false;
-          }
-        }
-
-        return true;
-    }
-
-    CORBA::Object_ptr
-    fetch_reference_naming (CORBA::ORB_ptr orb,
-                            const  ACE_CString &name)
-    {
-      ACE_ERROR ((LM_ERROR, "Resolving via nameservice...\n"));
-      using namespace CosNaming;
-
-      // Resolve naming service
-      CORBA::Object_var tmp =
-          orb->resolve_initial_references ("NameService");
-
-      NamingContext_var pns =
-        NamingContext::_narrow (tmp.in ());
-
-      Name ns_name;
-      CORBA::ULong i = 0;
-
-      ACE_Tokenizer tok ( name.rep ());
-      tok.delimiter_replace (':', 0);
-      tok.delimiter_replace ('/', 0);
-
-      char *name_element = 0;
-      while ((name_element = tok.next ()) != 0)
-      {
-         ns_name.length (ns_name.length () + 1);
-         ns_name[i].id = CORBA::string_dup (name_element);
-         ++i;
-      }
-
-
-      return pns->resolve (ns_name);
-    }
-
-    static int
-    run_main_implementation (int argc,  ACE_TCHAR *argv[])
-    {
-      try
-      {
-        CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "");
-
-        if (!parse_args (argc, argv))
-           return -1;
-
-
-        // Resolve our input adapter...
-        CORBA::Object_var tmp;
-
-        cout << "resolving: " << iia_ior_file << endl;
-
-        if (iia_ior_file != 0)
-          tmp = orb->string_to_object (iia_ior_file);
-        else // must be a name....
-          tmp = fetch_reference_naming (orb.in (), iia_name);
-
-        CIAO::RACE::PlanGenerator_var iia
-             = CIAO::RACE::PlanGenerator::_narrow (tmp.in ());
-
-        // Create deploy input event.
-        CIAO::RACE::Deploy_Input_var input =
-                    new OBV_CIAO::RACE::Deploy_Input;
-
-        input->package_name (package_name);
-
-        if (teardown)
-        {
-          input->command (::CIAO::RACE::TEARDOWN);
-        }
-        else
-        {
-          input->command (::CIAO::RACE::DEPLOY);
-        }
-
-        // Get the consumer for the IIA
-        ::CIAO::RACE::Deploy_InputConsumer_var consumer =
-        iia->get_consumer_deployment ();
-
-        // push the event
-        consumer->push_Deploy_Input (input.in ());
-
-      }
-      catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-        "(%P|%t) Injector: Unknown exception\n"));
-        return -1;
-      }
-
-      return 0;
-    }
-
-  } //namespace Injector
- } //namespace RACE
-} //Namespace CIAO
-
-int main (int argc, ACE_TCHAR **argv)
-{
-  return CIAO::RACE::Injector::run_main_implementation (argc, argv);
-}
-
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp
deleted file mode 100644
index 040ecb9eb45..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  PCVisitorBase.cpp
- *
- * $Id$
- *
- *  This file is a dummy which either includes the PCVisitorBase.inl or
- *  is ignored.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//========================================================================
-
-#include "PCVisitorBase.h"
-
-    PCVisitorBase::PCVisitorBase (void)
-    {
-    }
-
-#if !defined (__ACE_INLINE__)
-#include "PCVisitorBase.inl"
-#endif /* __ACE_INLINE__ */
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h
deleted file mode 100644
index cd3cb2b8752..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/**
- *  file  PCVisitorBase.h
- *
- *  $Id$
- *
- *  This file contains the virtual base class for the PackageConfiguration
- *  Visitor which is used to traverse the PackageConfiguration element
- *  defined in the PackagingData.idl. The PackageConfiguration has a
- *  number of sequence elements. This class actually implements the
- *  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>
- */
-//========================================================================
-
-#ifndef PC_VISITOR_BASE_H
-#define PC_VISITOR_BASE_H
-
-#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-#include "ace/SString.h"             //for the ACE_CString
-#include "ace/Containers_T.h"        //for ACE_Unbounded_Stack
-
-
-//forward declaration
-class PCVisitorBase;
-
-//========================================================================
-/**
- *  class PCAdapter
- *
- *  This class is used as an Adapter around the CIAO::Depolyment elements
- *  which are part of the PackageConfiguration traversal hierarchy in
- *  order to adapt each element to exhibit 'Visitor Node'-like structure.
- *  This allows us to use the Visitor double-dispatch traversal paradigm.
- */
-//========================================================================
-
-template <typename E>
-class PCAdapter
-{
-public:
-   PCAdapter (E& element) : element_ (element) {}
-   void Accept (PCVisitorBase &v) {v.Visit (*this);}
-   E& get () {return this-element_;}
-
-private:
-   E &element_;
-};
-
-
-template <typename T>
-void Accept (PCVisitorBase &v, T& element_to_visit)
-{
-  v.Visit (element_to_visit);
-}
-
-//========================================================================
-/**
- *  function - visit_sequence
- *
- *  This function is used to handle sequences of elements where each
- *  element takes the form of a Visitor Node.
- */
-//========================================================================
-
-
-/// I am using this to dispatch sequences
-template <typename SEQ>
-void visit_sequence (SEQ &seq, PCVisitorBase& v)
-{
-   const CORBA::ULong size = seq.length ();
-
-   for (CORBA::ULong i = 0; i < size; ++i)
-   {
-     Accept(v, seq[i]);
-   }
-}
-
-//========================================================================
-/**
- *  class PCVisitorBase
- *
- *  This class is a virtual base class for the PackageConfiguration Visitor
- *  The operation which deal with sequences are implemented here by means
- *  of the visit_sequence function above, in order to make the logic of
- *  derived classes easier to write. Writers of derived classes need only
- *  overload the functions which deal with single elements. Sequences are
- *  always handled here.
- */
-//========================================================================
-
-
-class  PCVisitorBase
-{
-public:
-
-  //constructor
-  PCVisitorBase (void);
-
-  ///function what dispatches sequences
-  template <typename SEQ>
-  friend void visit_sequence (SEQ &seq, PCVisitorBase& v);
-
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  virtual
-  void Visit (Deployment::PackageConfiguration &pc) = 0;
-  void Visit (Deployment::PackageConfigurations &pcs);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-  virtual
-  void Visit (Deployment::ComponentPackageDescription &cpd) = 0;
-  void Visit (Deployment::ComponentPackageDescriptions &cpds);
-
-  virtual
-  void Visit (Deployment::ComponentInterfaceDescription &cid) = 0;
-  //void Visit (Deployment::ComponentInterfaceDescriptions &cids);
-
-  virtual
-  void Visit (Deployment::PackagedComponentImplementation &pci) = 0;
-  void Visit (Deployment::PackagedComponentImplementations &pcis);
-
-  virtual
-  void Visit (Deployment::ComponentImplementationDescription &cid) = 0;
-  //void Visit (Deployment::ComponentImplementationDescriptions &cids);
-
-  virtual
-  void Visit (Deployment::ComponentAssemblyDescription &cad) = 0;
-  void Visit (Deployment::ComponentAssemblyDescriptions &cads);
-
-  virtual
-  void Visit (Deployment::SubcomponentInstantiationDescription &sid) = 0;
-  void Visit (Deployment::SubcomponentInstantiationDescriptions &sids);
-
-  virtual
-  void Visit (Deployment::MonolithicImplementationDescription &mid) = 0;
-  void Visit (Deployment::MonolithicImplementationDescriptions &mids);
-
-  virtual
-  void Visit (Deployment::NamedImplementationArtifact &nia) = 0;
-  void Visit (Deployment::NamedImplementationArtifacts &nias);
-
-  virtual
-  void Visit (Deployment::ImplementationArtifactDescription &iad) = 0;
-  //void Visit (Deployment::ImplementationArtifactDescriptions &iads);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-  virtual
-  void Visit (Deployment::ComponentPackageReference &cpr) = 0;
-  void Visit (Deployment::ComponentPackageReferences &cprs);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-  virtual
-  void Visit (Deployment::AssemblyPropertyMapping &apm) = 0;
-  void Visit (Deployment::AssemblyPropertyMappings &apms);
-
-  virtual
-  void Visit (Deployment::Property &property) = 0;
-  void Visit (Deployment::Properties &properties);
-
-
-  //requirements & capabilities
-  virtual
-  void Visit (Deployment::Requirement &requirement) = 0;
-  void Visit (Deployment::Requirements &requirements);
-
-  virtual
-  void Visit (Deployment::Capability &capability) = 0;
-  void Visit (Deployment::Capabilities &capabilities);
-
-  virtual
-  void Visit (Deployment::ImplementationRequirement &ir) = 0;
-  void Visit (Deployment::ImplementationRequirements &irs);
-
-  virtual
-  void Visit (Deployment::ImplementationDependency &id) = 0;
-  void Visit (Deployment::ImplementationDependencies &ids);
-
-  //ports and connections
-  virtual
-  void Visit (Deployment::AssemblyConnectionDescription &acd) = 0;
-  void Visit (Deployment::AssemblyConnectionDescriptions &acds);
-
-  virtual
-  void Visit (Deployment::SubcomponentPortEndpoint &spe) = 0;
-  void Visit (Deployment::SubcomponentPortEndpoints &spes);
-
-  virtual
-  void Visit (Deployment::ComponentExternalPortEndpoint &cepe) = 0;
-  void Visit (Deployment::ComponentExternalPortEndpoints &cepes);
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "PCVisitorBase.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* PC_VISITOR_BASE_H */
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl b/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl
deleted file mode 100644
index f6787601353..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  PCVisitorBase.inl
- *
- * $Id$
- *
- *  This file contains the implementation of the sequence-based
- *  PackageConfiguration Visitor functions. By implementing these
- *  we relieve developers of derived classes of the burden of handling
- *  the correct traversal of sequence-based elements. This implementation
- *  used the visit_sequence templatized function to do the heavy lifting.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu
- */
-//========================================================================
-
-
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  ACE_INLINE void PCVisitorBase::Visit
-    (Deployment::PackageConfigurations &pcs)
-  {
-    visit_sequence (pcs, *this);
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentPackageDescriptions &cpds)
-  {
-    visit_sequence (cpds, *this);
-  }
-
-  //NOT a member of Deployment
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ComponentInterfaceDescriptions &cids)
-  //{
-  //  visit_sequence (cids, *this);
-  //}
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::PackagedComponentImplementations &pcis)
-  {
-    visit_sequence (pcis, *this);
-  }
-
-  //NOT a member of Deployment
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ComponentImplementationDescriptions &cids)
-  //{
-  //  visit_sequence (cids, *this);
-  //}
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentAssemblyDescriptions &cads)
-  {
-    visit_sequence (cads, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::SubcomponentInstantiationDescriptions &sids)
-  {
-    visit_sequence (sids, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::MonolithicImplementationDescriptions &mids)
-  {
-    visit_sequence (mids, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::NamedImplementationArtifacts &nias)
-  {
-    visit_sequence (nias, *this);
-  }
-
-  //ACE_INLINE void PCVisitorBase::Visit
-  //    (Deployment::ImplementationArtifactDescriptions &iads)
-  //{
-  //  visit_sequence (iads, *this);
-  //}
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentPackageReferences &cprs)
-  {
-    visit_sequence (cprs, *this);
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::AssemblyPropertyMappings &apms)
-  {
-    visit_sequence (apms, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Properties &properties)
-  {
-    visit_sequence (properties, *this);
-  }
-
-  //requirements & capabilities
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Requirements &requirements)
-  {
-    visit_sequence (requirements, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::Capabilities &capabilities)
-  {
-    visit_sequence (capabilities, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ImplementationRequirements &irs)
-  {
-    visit_sequence (irs, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ImplementationDependencies &ids)
-  {
-    visit_sequence (ids, *this);
-  }
-
-  //ports and connections
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::AssemblyConnectionDescriptions &acds)
-  {
-    visit_sequence (acds, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::SubcomponentPortEndpoints &spes)
-  {
-    visit_sequence (spes, *this);
-  }
-
-  ACE_INLINE void PCVisitorBase::Visit
-      (Deployment::ComponentExternalPortEndpoints &cepes)
-  {
-    visit_sequence (cepes, *this);
-  }
-
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp
deleted file mode 100644
index 56ab62c4cb6..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp
+++ /dev/null
@@ -1,86 +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">
-
-  <UUID>1D2C2C63-CE33-4088-9443-781F080D8888</UUID>
-
-  <implementation id="_73898E70-9FF1-4881-9313-A2DE181EEEEE">
-    <name>RT1H_Combined.RA_ComponentImplementations.PlanGeneratorImplementation.PlanGeneratorMonolithicImpl</name>
-    <source/>
-    <artifact>__AD4B52E0-111C-49E2-BE47-29CFF978676F</artifact>
-    <artifact>__E4AF24BF-5A39-BBB1-8217-6343D7D55598</artifact>
-    <artifact>__76A0CEFE-22F7-FFF7-BB91-F309FFFAD33C</artifact>
-  </implementation>
-
-  <instance id="_2BD4D476-2F5B-4CCC-A8CF-311084273028">
-    <name>RT1H_Combined.ComponentImplementations.RACE.RACE.PlanGenerator</name>
-    <node>PlanGenerator</node>
-    <source/>
-    <implementation>_73898E70-9FF1-4881-9313-A2DE181EEEEE</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PlanGenerator.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RACE::InteractiveInput</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact id="__AD4B52E0-111C-49E2-BE47-29CFF978676F">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.PlanGeneratorArtifacts.PlanGenerator_stub</name>
-    <source/>
-    <node/>
-    <location>PlanGenerator_stub</location>
-  </artifact>
-
-  <artifact id="__E4AF24BF-5A39-BBB1-8217-6343D7D55598">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.PlanGeneratorArtifacts.PlanGenerator_svnt</name>
-    <source/>
-    <node/>
-    <location>PlanGenerator_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CIAO_RACE_PlanGenerator_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="__76A0CEFE-22F7-FFF7-BB91-F309FFFAD33C">
-    <name>RT1H_Combined.RA_ImplementationArtifacts.PlanGeneratorArtifacts.PlanGenerator_exec</name>
-    <source/>
-    <node/>
-    <location>PlanGenerator_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CIAO_RACE_PlanGenerator_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl
deleted file mode 100644
index 9ceb659e753..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl
+++ /dev/null
@@ -1,26 +0,0 @@
-//PlanGenerator.cidl,v 1.1 spaunov Exp
-//Author: Stoyan Paunov
-//$Id$
-
-#ifndef RACE_PLAN_GENERATOR_INPUT_ADAPTER_CIDL
-#define RACE_PLAN_GENERATOR_INPUT_ADAPTER_CIDL
-
-#include "PlanGenerator.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session PlanGenerator_Impl
-    {
-      home executor PlanGenerator_Home_Exec
-        {
-          implements RACE::PlanGenerator_Home;
-          manages    PlanGenerator_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_PLAN_GENERATOR_INPUT_ADAPTER_CIDL */
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp
deleted file mode 100644
index eb761275c6e..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/*
- *  file  Plan_Generator.cpp
- *
- * $Id$
- *
- *  This file contains the implementation of the PackageConfiguration
- *  Visitor class Plan_Generator which derives from PCVisitorBase. Each
- *  Visit function focuses on the functionality necessary to process
- *  the PackageConfiguration element which is passed to it as an argument
- *  and on dispatching the next sequence of calls in the correct order!
- *
- *  This implementation takes a PackageConfiguration and tries to grow
- *  a DeploymentPlan out of it by expanding the latter in width and depth
- *  simultaneously. At each level of the PackageConfiguration the
- *  Plan_Generator first expands the DeploymentPlan vertically at the
- *  corrsponding level and then dispatches the children of the current
- *  PackageConfiguration element. This in turn might and most probably
- *  will cause another vertical expansion of the DeploymentPlan, however
- *  for a different element. This effect is produced due to the flattened
- *  structure of the DeploymentPlan.
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu
- */
-//========================================================================
-
-#include "PCVisitorBase.h"
-#include "PlanGenerator.h"
-
-#include "ace/OS_Memory.h"         //for ACE_NEW* macros
-#include "ace/SString.h"           //for ACE_CString
-
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-
-#include "Config_Handlers/DnC_Dump.h"
-
-#include <iostream>
-using namespace std;
-
-  //Constructor
-  Plan_Generator::Plan_Generator (Deployment::DeploymentPlan &plan,
-                        Deployment::PackageConfiguration &pc)
-    : PCVisitorBase (),
-      plan_ (plan),
-      pc_ (pc),
-      last_cad_ (0)
-  {
-  }
-
-  //entry point for the protected visitor to get it do start
-  //the visitation process
-  void Plan_Generator::Visit ()
-  {
-    Accept (*this, this->pc_);
-  }
-
-  // A whole slew of overloaded routines for different IDL
-  // data types part of the PackageConfiguration.
-
-
-  void Plan_Generator::Visit (Deployment::PackageConfiguration &pc)
-  {
-
-    //visit the ComponentPackageDescription
-    if (pc.basePackage.length ())
-    {
-      //currently no support for that anywhere
-      //for (size_t r = 0; r = pc.selectRequirement.length (); ++r);
-
-      Accept (*this, pc.basePackage);
-    }
-    else
-      ACE_DEBUG ((LM_WARNING,
-                 "[Plan_Generator - PackageConfiguration] We currently "
-                 "do NOT support package references, specializedConfigs",
-                 "or imports!\n"));
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-
-  void Plan_Generator::Visit (Deployment::ComponentPackageDescription &cpd)
-  {
-    Accept (*this, cpd.realizes);
-    //for (size_t impl = 0; impl < cpd.implementation.length (); ++impl)
-    Accept (*this, cpd.implementation[0]);
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ComponentInterfaceDescription &cid)
-  {
-    //Might want to populate this too once PICML starts supporting it
-  }
-
-
-  void Plan_Generator::Visit (Deployment::PackagedComponentImplementation &pci)
-  {
-    Accept (*this, pci.referencedImplementation);
-
-    size_t plan_impl_len = plan_.implementation.length ();
-    size_t plan_inst_len = plan_.instance.length ();
-
-    //NOTE: order here matters. Need to populate the
-    //MonolithicDeploymentDescription and the
-    //InstanceDeploymentDescription first,
-    //then call the update_configProperty
-    if (plan_impl_len > 0 && plan_inst_len > 0)
-       update_configProperty (pci,
-                    plan_.implementation[plan_impl_len - 1],
-                    plan_.instance[plan_inst_len - 1]);
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ComponentImplementationDescription &cid)
-  {
-    if (cid.assemblyImpl.length ())
-       Accept (*this, cid.assemblyImpl);
-    else
-       //;//Do nothing - monolithic component deployment not supported
-       Accept (*this, cid.monolithicImpl);
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ComponentAssemblyDescription &cad)
-  {
-    //NOTE: order matters for these calls. We need to populate
-    //the instances before we try to polulate the connections
-
-    //set the last ComponentAssemblyDescription
-    this->last_cad_ = &cad;
-
-    //visit the SubcomponentInstantiationDescription
-    Accept (*this, cad.instance);
-    //visit the connections
-    Accept (*this, cad.connection);
-
-    //reset the last ComponentAssemblyDescription
-    this->last_cad_ = NULL;
-  }
-
-
-  void Plan_Generator::Visit (Deployment::SubcomponentInstantiationDescription &sid)
-  {
-    //visit the ComponentPackageDescription (again)
-    if (sid.basePackage.length ())
-    {
-      size_t inst_len = plan_.instance.length ();
-      plan_.instance.length (inst_len + 1);
-
-      update_configProperty (sid, plan_.instance[inst_len]);
-
-      plan_.instance[inst_len].name = sid.name;
-      size_t impl_len = plan_.implementation.length ();
-      plan_.implementation.length (impl_len + 1);
-
-      ACE_CString mdname (plan_.instance[inst_len].name);
-      mdname += "-mdd";
-      plan_.implementation[impl_len].name = mdname.c_str ();
-
-      plan_.instance[inst_len].implementationRef = impl_len;
-
-      Accept (*this, sid.basePackage);
-    }
-    else
-      ACE_DEBUG ((LM_WARNING,
-                  "[Plan_Generator - SubcomponentInstantiationDescription] ",
-                  "We currently do NOT support package references, ",
-                  "specializedConfigs or imports!\n"));
-  }
-
-
-  void Plan_Generator::Visit (Deployment::MonolithicImplementationDescription &mid)
-  {
-    //NOTE: There are usually 3 NamedImplementationArtifacts per
-    //MonolithicImplementationDescription *_stub, *_svnt & *_exec
-
-    //visit the NamedImplementationArtifacts
-    Accept (*this, mid.primaryArtifact);
-  }
-
-
-  void Plan_Generator::Visit (Deployment::NamedImplementationArtifact &nia)
-  {
-    //increase the artifact length by one
-    size_t arti_len = plan_.artifact.length ();
-    plan_.artifact.length (arti_len + 1);
-    plan_.artifact[arti_len].name = nia.name;
-
-    //increase the artifactRef length by one and
-    //update the reference
-
-    //get the index of the last MonolithicDeploymentDescription
-    size_t last_mdd = plan_.implementation.length () - 1;
-    Deployment::MonolithicDeploymentDescription& mdd = plan_.implementation[last_mdd];
-    size_t ref_len = mdd.artifactRef.length ();
-    mdd.artifactRef.length (ref_len + 1);
-    mdd.artifactRef[ref_len] = arti_len;
-
-    //visit the actual ImplementationArtifactDescriptor
-    Accept (*this, nia.referencedArtifact);
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ImplementationArtifactDescription &iad)
-  {
-
-    size_t last_arti = plan_.artifact.length ();
-    size_t plan_loc_len = plan_.artifact[last_arti - 1].location.length ();
-    size_t num_loc = iad.location.length ();
-    for (size_t i = 0; i < num_loc; ++i)
-    {
-      Deployment::ArtifactDeploymentDescription& add = plan_.artifact[last_arti - 1];
-      add.location.length (plan_loc_len + 1);
-      add.location[plan_loc_len] = iad.location[i];
-      ++plan_loc_len;
-
-    //update execParameter
-      update_execParameter (iad, add);
-    }
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-
-  void Plan_Generator::Visit (Deployment::ComponentPackageReference &cpr)
-  {
-    //not implemented
-  }
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-
-  void Plan_Generator::Visit (Deployment::AssemblyPropertyMapping &apm)
-  {
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::Property &property)
-  {
-
-  }
-
-
-  //requirements & capabilities
-
-  void Plan_Generator::Visit (Deployment::Requirement &requirement)
-  {
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::Capability &capability)
-  {
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ImplementationRequirement &ir)
-  {
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ImplementationDependency &id)
-  {
-
-  }
-
-  //ports and connections
-
-  void Plan_Generator::Visit (Deployment::AssemblyConnectionDescription &acd)
-  {
-    if (!this->last_cad_)
-      return;
-
-    Deployment::ComponentAssemblyDescription& cad = *(this->last_cad_);
-
-    size_t plan_conn_len = plan_.connection.length ();
-    plan_.connection.length (plan_conn_len + 1);
-    plan_.connection[plan_conn_len].name = acd.name;
-
-    size_t iep_len = acd.internalEndpoint.length ();
-    size_t plan_iep_len =
-           plan_.connection[plan_conn_len].internalEndpoint.length ();
-
-    //cout << "==> " << acd.name << " has " << iep_len << " and "
-    //     << acd.externalEndpoint.length () << endl << endl ;
-
-    plan_.connection[plan_conn_len].internalEndpoint.length (plan_iep_len + iep_len);
-
-    for (size_t i = 0; i < iep_len; ++i)
-    {
-      plan_.connection[plan_conn_len]
-           .internalEndpoint[plan_iep_len + i].portName =
-                       acd.internalEndpoint[i].portName;
-
-      size_t inst_ref = acd.internalEndpoint[i].instanceRef;
-      const char* inst_name = cad.instance[inst_ref].name;
-      size_t plan_inst_len = plan_.instance.length ();
-
-      for (size_t j = 0; j < plan_inst_len; ++j)
-      {
-        const char* plan_inst_name = plan_.instance[j].name;
-        if (ACE_OS::strcmp (plan_inst_name, inst_name) == 0)
-        {
-          plan_.connection[plan_conn_len]
-               .internalEndpoint[plan_iep_len + i].instanceRef = j;
-          break;
-        }
-      }
-
-      //Now traverse the interface
-
-      //NOTE: move these up and refactor!
-      Deployment::SubcomponentInstantiationDescription& scid =
-          cad.instance[inst_ref];
-      Deployment::PlanSubcomponentPortEndpoint& pspe =
-                  plan_.connection[plan_conn_len]
-                       .internalEndpoint[plan_iep_len + i];
-
-      size_t pkg_len = scid.basePackage.length ();
-      for (size_t k = 0; k < pkg_len; ++k)
-      {
-        Deployment::ComponentPackageDescription& package = scid.basePackage[k];
-
-        //empty unfortunately
-        Deployment::ComponentInterfaceDescription cid = package.realizes;
-        //cid = package.implementation[0].referencedImplementation.implements;
-
-        size_t port_len = cid.port.length ();
-        for (size_t p = 0; p < port_len; ++p)
-        {
-          const char* cid_pname = cid.port[p].name;
-          const char* pspe_pname = pspe.portName;
-          //cout << "CMP: " << pspe_pname << " <=> " << cid_pname << endl;
-          if (ACE_OS::strcmp (cid_pname, pspe_pname) == 0)
-          {
-            pspe.kind = cid.port[p].kind;
-
-            //cout << "-->" << pspe_pname << " Port kind is "
-            //     << pspe.kind << endl;
-
-            goto interface_end;
-            break; // ???
-          }
-        }
-      }
-
-interface_end:
-    //cout << endl;
-    ;
-
-    }
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::SubcomponentPortEndpoint &spe)
-  {
-
-  }
-
-
-  void Plan_Generator::Visit (Deployment::ComponentExternalPortEndpoint &cepe)
-  {
-
-  }
-
-//several helper functions
-
-  void Plan_Generator::
-  update_execParameter (Deployment::ImplementationArtifactDescription& iad,
-                        Deployment::ArtifactDeploymentDescription& add)
-  {
-    //update execParameters
-    size_t num_execP = iad.execParameter.length ();
-    for (size_t j = 0; j < num_execP; ++j)
-    {
-      size_t execP_len = add.execParameter.length ();
-      add.execParameter.length (execP_len + 1);
-      add.execParameter[execP_len] = iad.execParameter[j];
-      ++execP_len;
-    }
-  }
-
-  void Plan_Generator::
-  update_configProperty (Deployment::SubcomponentInstantiationDescription &scid,
-                         Deployment::InstanceDeploymentDescription &idd)
-  {
-    size_t scid_plen =
-    scid.configProperty.length ();
-
-    size_t idd_plen = idd.configProperty.length ();
-    idd.configProperty.length (idd_plen + scid_plen);
-
-    for (size_t i = 0; i < scid_plen; ++i)
-         idd.configProperty[idd_plen + i] =
-                   scid.configProperty[i];
-
-  }
-
-  void Plan_Generator::
-  update_configProperty (Deployment::PackagedComponentImplementation& pcid,
-                         Deployment::MonolithicDeploymentDescription& mid,
-                         Deployment::InstanceDeploymentDescription& idd)
-  {
-    bool update;
-    size_t pcid_plen = pcid.referencedImplementation
-                           .configProperty.length ();
-
-    size_t mid_eplen = mid.execParameter.length ();
-    mid.execParameter.length (mid_eplen + pcid_plen);
-
-    for (size_t i = 0; i < pcid_plen; ++i)
-    {
-      update = true;
-      mid.execParameter[mid_eplen + i] = pcid.referencedImplementation
-                                             .configProperty[i];
-
-      const char* pname = pcid.referencedImplementation
-                              .configProperty[i].name;
-
-      size_t idd_plen = idd.configProperty.length ();
-
-      for (size_t j = 0; j < idd_plen; ++j)
-      {
-        const char* idd_pname = idd.configProperty[j].name;
-        if (ACE_OS::strcmp (idd_pname, pname) == 0)
-        {
-          update = false;
-          break;
-        }
-      }
-
-      if (update)
-      {
-        idd.configProperty.length (idd_plen + 1);
-        idd.configProperty[idd_plen] =
-            pcid.referencedImplementation.configProperty[i];
-      }
-    }
-  }
-
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.h
deleted file mode 100644
index 3117540082c..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- C++ -*- */
-
-//========================================================================
-/**
- *  file  PlanGenerator.h
- *
- * $Id$
- *
- *  This file contains a number of Visitor classes which are used to
- *  traverse the PackageConfiguration element defined in the
- *  PackagingData.idl
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//========================================================================
-
-#ifndef PLAN_GENERATOR_H
-#define PLAN_GENERATOR_H
-
-#include "PCVisitorBase.h"           //for the base visitor
-
-#include /**/ "ace/pre.h"
-#include "ace/SString.h"             //for the ACE_CString
-
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_BaseC.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-
-
-//===========================================================================
-/**
- *  class Plan_Generator
- *
- *  This class is is the actual implementation for the PackageConfiguration
- *  Visitor. It derives from PCVisitorBase and overloads the functions which
- *  deal with single elements. Sequences are handled in the base class.
- */
-//===========================================================================
-
-
-class  Plan_Generator : public PCVisitorBase
-{
-public:
-
-  //constructor
-  Plan_Generator (Deployment::DeploymentPlan &plan,
-                  Deployment::PackageConfiguration &pc);
-
-  ///Entry point to protected Visitor functions
-  void Visit ();
-
-protected:
-  /// A whole slew of overloaded routines for different IDL
-  /// data types part of the PackageConfiguration.
-
-  virtual
-  void Visit (Deployment::PackageConfiguration &pc);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageDescription descendents
-  virtual
-  void Visit (Deployment::ComponentPackageDescription &cpd);
-
-  virtual
-  void Visit (Deployment::ComponentInterfaceDescription &cid);
-
-  virtual
-  void Visit (Deployment::PackagedComponentImplementation &pci);
-
-  virtual
-  void Visit (Deployment::ComponentImplementationDescription &cid);
-
-  virtual
-  void Visit (Deployment::ComponentAssemblyDescription &cad);
-
-  virtual
-  void Visit (Deployment::SubcomponentInstantiationDescription &sid);
-
-  virtual
-  void Visit (Deployment::MonolithicImplementationDescription &mid);
-
-  virtual
-  void Visit (Deployment::NamedImplementationArtifact &nia);
-
-  virtual
-  void Visit (Deployment::ImplementationArtifactDescription &iad);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //ComponentPackageReference descendents
-  virtual
-  void Visit (Deployment::ComponentPackageReference &cpr);
-
-  //!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
-
-  //properties
-  virtual
-  void Visit (Deployment::AssemblyPropertyMapping &apm);
-
-  virtual
-  void Visit (Deployment::Property &property);
-
-
-  //requirements & capabilities
-  virtual
-  void Visit (Deployment::Requirement &requirement);
-
-  virtual
-  void Visit (Deployment::Capability &capability);
-
-  virtual
-  void Visit (Deployment::ImplementationRequirement &ir);
-
-  virtual
-  void Visit (Deployment::ImplementationDependency &id);
-
-  //ports and connections
-  virtual
-  void Visit (Deployment::AssemblyConnectionDescription &acd);
-
-  virtual
-  void Visit (Deployment::SubcomponentPortEndpoint &spe);
-
-  virtual
-  void Visit (Deployment::ComponentExternalPortEndpoint &cepe);
-
-protected:
-  ///several helper functions
-  void update_execParameter (Deployment::ImplementationArtifactDescription& iad,
-                             Deployment::ArtifactDeploymentDescription& add);
-
-  void update_configProperty (Deployment::SubcomponentInstantiationDescription &scid,
-                              Deployment::InstanceDeploymentDescription &idd);
-
-  void update_configProperty (Deployment::PackagedComponentImplementation& pcid,
-                              Deployment::MonolithicDeploymentDescription& mid,
-                              Deployment::InstanceDeploymentDescription& idd);
-
-private:
-
-  Deployment::DeploymentPlan& plan_;
-  Deployment::PackageConfiguration& pc_;
-  Deployment::ComponentAssemblyDescription* last_cad_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* PLAN_GENERATOR_H */
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl
deleted file mode 100644
index 3dd220b9b8b..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-//PlanGenerator.idl,v 1.1 spaunov Exp
-//Author: Stoyan Paunov
-//$Id$
-
-#ifndef RACE_PLAN_GENERATOR_INPUT_ADAPTER_IDL
-#define RACE_PLAN_GENERATOR_INPUT_ADAPTER_IDL
-
-#include <Components.idl>
-#include "Input_Adapters/Base/Input_Adapter.idl"
-#include "common/RACE_common.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    eventtype Deploy_Input
-    {
-      public string package_name;
-      public Action command;
-    };
-
-    component PlanGenerator : Input_Adapter
-    {
-      consumes Deploy_Input deployment;
-    };
-
-    home PlanGenerator_Home manages PlanGenerator
-    {
-    };
-  };
-};
-
-#endif /* RACE_PLAN_GENERATOR_INPUT_ADAPTER_IDL */
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable
deleted file mode 100644
index fdb014ef9cc..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable
+++ /dev/null
@@ -1,118 +0,0 @@
-// generate_component_mpc.pl
-//Author: Stoyan Paunov
-//PlanGenerator.mpc, spaunov
-//$Id$
-
-project(PlanGenerator_stub): ciao_deployment_stub, ciao_race_component {
-  after += Input_Adapter_stub
-  sharedname = PlanGenerator_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANGENERATOR_STUB_Export \
-              -Wb,stub_export_include=PlanGenerator_stub_export.h \
-              -Wb,skel_export_macro=PLANGENERATOR_SVNT_Export \
-              -Wb,skel_export_include=PlanGenerator_svnt_export.h
-  dynamicflags   = PLANGENERATOR_STUB_BUILD_DLL
-  libs += Input_Adapter_stub \
-          Plan_Analyzer_Interface_stub
-
-  IDL_Files {
-    PlanGenerator.idl
-  }
-
-  Source_Files {
-    PlanGeneratorC.cpp
-  }
-
-  Header_Files {
-    PlanGeneratorC.h
-  }
-
-  Inline_Files {
-    PlanGeneratorC.inl
-  }
-}
-
-project(PlanGenerator_svnt) : ciao_servant_dnc, ciao_race_component {
-  after += PlanGenerator_stub \
-           Input_Adapter_svnt
-  sharedname  = PlanGenerator_svnt
-  libs    += PlanGenerator_stub \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub
-
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLANGENERATOR_SVNT_Export \
-                -Wb,export_include=PlanGenerator_svnt_export.h
-
-  dynamicflags = PLANGENERATOR_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    PlanGenerator.cidl
-  }
-
-  IDL_Files {
-    PlanGeneratorE.idl
-  }
-
-  Source_Files {
-    PlanGeneratorEC.cpp
-    PlanGeneratorS.cpp
-    PlanGenerator_svnt.cpp
-  }
-
-  Header_Files {
-    PlanGeneratorEC.h
-    PlanGeneratorS.h
-    PlanGenerator_svnt.h
-  }
-
-  Inline_Files {
-    PlanGeneratorEC.inl
-    PlanGeneratorS.inl
-    PlanGenerator_svnt.inl
-  }
-}
-
-
-project(PlanGenerator_exec) : ciao_component_dnc, ciao_config_handlers, ciao_race_component {
-  after   += PlanGenerator_svnt XSC_Config_Handlers
-  sharedname = PlanGenerator_exec
-  libs    += PlanGenerator_stub \
-             PlanGenerator_svnt \
-             Input_Adapter_stub \
-             Input_Adapter_svnt \
-             Plan_Analyzer_Interface_stub \
-  
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLANGENERATOR_EXEC_Export \
-                -Wb,export_include=PlanGenerator_exec_export.h
-  dynamicflags   = PLANGENERATOR_EXEC_BUILD_DLL
-
-  requires += RepositoryManager
-  after += RepositoryManager
-  includes += $(CIAO_ROOT)/DAnCE/RepositoryManager
-
-  IDL_Files {
-    
-  }
-
-  Source_Files {
-    PlanGenerator_exec.cpp
-    PCVisitorBase.cpp
-    PlanGenerator.cpp
-    $(CIAO_ROOT)/DAnCE/RepositoryManager/RepositoryManagerDaemonC.cpp
-  }
-}
-
-project(PlanGenerator_Injector) : ciao_component_dnc, ciao_race_component, taoexe {
-   exename = injector
-
-   libs += PlanGenerator_stub
-
-   IDL_Files {
-   }
-   Source_Files {
-      Injector.cpp
-   }
-}
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat
deleted file mode 100644
index 3621981b2c8..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat
+++ /dev/null
@@ -1 +0,0 @@
-PlanGenerator      corbaloc:iiop:localhost:50000/NodeManager
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
deleted file mode 100644
index dd78aafb8b5..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// $Id$
-// Author: Stoyan Paunov
-
-#include "PlanGenerator_exec.h"
-#include "ciao/CIAO_common.h"
-#include "Config_Handlers/XML_File_Intf.h"
-#include "Config_Handlers/Package_Handlers/PCD_Handler.h"
-#include "Config_Handlers/Common.h"
-#include "Config_Handlers/DnC_Dump.h"
-
-#include "DAnCE/RepositoryManager/RepositoryManagerDaemonC.h"
-#include "PlanGenerator.h"
-
-#include <iostream>
-using namespace std;
-
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_PlanGenerator_Impl
-    {
-      //==================================================================
-      // Component Executor Implementation Class:
-      // PlanGenerator_exec_i
-      //==================================================================
-
-      PlanGenerator_exec_i::PlanGenerator_exec_i (void)
-      {
-      }
-
-      PlanGenerator_exec_i::~PlanGenerator_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      // Port operations.
-
-      void
-      PlanGenerator_exec_i::push_deployment (
-        ::CIAO::RACE::Deploy_Input * ev)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        try
-        {
-
-          //Get the IOR of the RepoMan from the naming service
-
-          //Obtain a ref to the orb
-          CORBA::ORB_ptr orb = this->context_->_ciao_the_Container ()->the_ORB ();
-
-          //form the path to the RepoMan IOR file
-          ACE_CString RepoMan_ior = ("file://");
-          RepoMan_ior += ACE_OS::getenv ("CIAO_ROOT");
-          RepoMan_ior += "/DAnCE/RepositoryManager/RepositoryManagerDeamon.ior";
-
-          cout << "RepoMan ior file: " << RepoMan_ior.c_str () << endl;
-
-          CORBA::Object_var obj =
-                    orb->string_to_object (RepoMan_ior.c_str ());
-
-          CIAO::RepositoryManagerDaemon_var rm =
-                   CIAO::RepositoryManagerDaemon::_narrow (obj.in ());
-
-          if (CORBA::is_nil (rm.in ()))
-          {
-            ACE_ERROR ((LM_ERROR,
-                        "Unable to acquire RepositoryManagerDaemon's objref\n"));
-
-            throw CORBA::INTERNAL ();
-          }
-
-          //now obtian the corresponding PackageConfiguration from
-          //the RepositoryManager
-
-          Deployment::PackageConfiguration* rmpc;
-
-          try
-          {
-            //retrieve the curresponding PackageConfiguration
-            //from the RepoMan
-            rmpc = rm->findPackageByName (ev->package_name ());
-
-            ACE_DEBUG ((LM_INFO,
-                       "The package was found!\nUUID: %s\n",
-                        rmpc->UUID));
-          }
-          catch (Deployment::NoSuchName &)
-          {
-            ACE_ERROR ((LM_ERROR,
-                       "Error! Package not found! Location update failed!\n"));
-
-            throw CORBA::INTERNAL ();
-
-          }
-          catch (CORBA::Exception &)
-          {
-            ACE_ERROR ((LM_ERROR,
-                       "Error! General exception! Location update failed!\n"));
-
-            throw CORBA::INTERNAL ();
-          }
-
-          //now create the plan
-
-          Deployment::DeploymentPlan* plan = 0;
-          ACE_NEW_THROW_EX (plan,
-                            Deployment::DeploymentPlan (),
-                            CORBA::INTERNAL ());
-
-          Plan_Generator pgen (*plan, *rmpc);
-
-          //start the generation
-          pgen.Visit ();
-
-          //So now what?
-          ::Deployment::DnC_Dump::dump (*plan);
-
-          //do not call the plan analyzer just yet
-          return;
-
-          //creat an action sequence and populate it
-          ::CIAO::RACE::Plan_Actions plan_action_seq;
-
-           /// Create a Plan_Action_seq structure of length 1.
-           plan_action_seq.length (1);
-
-           /// Now populate the Plan_Action_seq structure.
-           plan_action_seq [0].command = ev->command ();
-           plan_action_seq [0].plan = *plan;
-           plan_action_seq [0].package = *rmpc;
-
-           /// Now invoke the plan_analyzer.
-           this->context_->get_connection_ingress  ()
-               ->analyze_plan (plan_action_seq);
-        }
-        catch (...)
-        {
-          ACE_ERROR ((LM_ERROR, "Exception caught in push_deployment\n"));
-        }
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      PlanGenerator_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        this->context_ =
-        PlanGenerator_Context::_narrow (
-          ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      PlanGenerator_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      PlanGenerator_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      PlanGenerator_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      PlanGenerator_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      PlanGenerator_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   PlanGenerator_Home_exec_i
-      //==================================================================
-
-      PlanGenerator_Home_exec_i::PlanGenerator_Home_exec_i (void)
-      {
-      }
-
-      PlanGenerator_Home_exec_i::~PlanGenerator_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      PlanGenerator_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-          retval,
-          PlanGenerator_exec_i,
-          CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" PLANGENERATOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_PlanGenerator_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-          retval,
-          PlanGenerator_Home_exec_i,
-          ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h
deleted file mode 100644
index 76fd200c58b..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-//Author: Stoyan Paunov
-
-
-#ifndef CIAO_PLANGENERATOR_EXEC_H
-#define CIAO_PLANGENERATOR_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "PlanGenerator_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PlanGenerator_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_PlanGenerator_Impl
-    {
-      class PLANGENERATOR_EXEC_Export PlanGenerator_exec_i
-      : public virtual PlanGenerator_Exec,
-        public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        PlanGenerator_exec_i (void);
-        virtual ~PlanGenerator_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        // Port operations.
-
-        virtual void
-        push_deployment (
-          ::CIAO::RACE::Deploy_Input *ev)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-          ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        protected:
-        PlanGenerator_Context *context_;
-      };
-
-      class PLANGENERATOR_EXEC_Export PlanGenerator_Home_exec_i
-      : public virtual PlanGenerator_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        PlanGenerator_Home_exec_i (void);
-        virtual ~PlanGenerator_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-      };
-
-      extern "C" PLANGENERATOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_PlanGenerator_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_PLANGENERATOR_EXEC_H */
-
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h
deleted file mode 100644
index b4bb3c8e00d..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_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 PLANGENERATOR_EXEC
-// ------------------------------
-#ifndef PLANGENERATOR_EXEC_EXPORT_H
-#define PLANGENERATOR_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PLANGENERATOR_EXEC_HAS_DLL)
-#  define PLANGENERATOR_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PLANGENERATOR_EXEC_HAS_DLL */
-
-#if !defined (PLANGENERATOR_EXEC_HAS_DLL)
-#  define PLANGENERATOR_EXEC_HAS_DLL 1
-#endif /* ! PLANGENERATOR_EXEC_HAS_DLL */
-
-#if defined (PLANGENERATOR_EXEC_HAS_DLL) && (PLANGENERATOR_EXEC_HAS_DLL == 1)
-#  if defined (PLANGENERATOR_EXEC_BUILD_DLL)
-#    define PLANGENERATOR_EXEC_Export ACE_Proper_Export_Flag
-#    define PLANGENERATOR_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANGENERATOR_EXEC_BUILD_DLL */
-#    define PLANGENERATOR_EXEC_Export ACE_Proper_Import_Flag
-#    define PLANGENERATOR_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANGENERATOR_EXEC_BUILD_DLL */
-#else /* PLANGENERATOR_EXEC_HAS_DLL == 1 */
-#  define PLANGENERATOR_EXEC_Export
-#  define PLANGENERATOR_EXEC_SINGLETON_DECLARATION(T)
-#  define PLANGENERATOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANGENERATOR_EXEC_HAS_DLL == 1 */
-
-// Set PLANGENERATOR_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANGENERATOR_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANGENERATOR_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANGENERATOR_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANGENERATOR_EXEC_NTRACE */
-
-#if (PLANGENERATOR_EXEC_NTRACE == 1)
-#  define PLANGENERATOR_EXEC_TRACE(X)
-#else /* (PLANGENERATOR_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANGENERATOR_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANGENERATOR_EXEC_NTRACE == 1) */
-
-#endif /* PLANGENERATOR_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h
deleted file mode 100644
index 2a3f42d0fd4..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_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 PLANGENERATOR_STUB
-// ------------------------------
-#ifndef PLANGENERATOR_STUB_EXPORT_H
-#define PLANGENERATOR_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PLANGENERATOR_STUB_HAS_DLL)
-#  define PLANGENERATOR_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PLANGENERATOR_STUB_HAS_DLL */
-
-#if !defined (PLANGENERATOR_STUB_HAS_DLL)
-#  define PLANGENERATOR_STUB_HAS_DLL 1
-#endif /* ! PLANGENERATOR_STUB_HAS_DLL */
-
-#if defined (PLANGENERATOR_STUB_HAS_DLL) && (PLANGENERATOR_STUB_HAS_DLL == 1)
-#  if defined (PLANGENERATOR_STUB_BUILD_DLL)
-#    define PLANGENERATOR_STUB_Export ACE_Proper_Export_Flag
-#    define PLANGENERATOR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANGENERATOR_STUB_BUILD_DLL */
-#    define PLANGENERATOR_STUB_Export ACE_Proper_Import_Flag
-#    define PLANGENERATOR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANGENERATOR_STUB_BUILD_DLL */
-#else /* PLANGENERATOR_STUB_HAS_DLL == 1 */
-#  define PLANGENERATOR_STUB_Export
-#  define PLANGENERATOR_STUB_SINGLETON_DECLARATION(T)
-#  define PLANGENERATOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANGENERATOR_STUB_HAS_DLL == 1 */
-
-// Set PLANGENERATOR_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANGENERATOR_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANGENERATOR_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANGENERATOR_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANGENERATOR_STUB_NTRACE */
-
-#if (PLANGENERATOR_STUB_NTRACE == 1)
-#  define PLANGENERATOR_STUB_TRACE(X)
-#else /* (PLANGENERATOR_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANGENERATOR_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANGENERATOR_STUB_NTRACE == 1) */
-
-#endif /* PLANGENERATOR_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h
deleted file mode 100644
index 212dd57a8e9..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_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 PLANGENERATOR_SVNT
-// ------------------------------
-#ifndef PLANGENERATOR_SVNT_EXPORT_H
-#define PLANGENERATOR_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PLANGENERATOR_SVNT_HAS_DLL)
-#  define PLANGENERATOR_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PLANGENERATOR_SVNT_HAS_DLL */
-
-#if !defined (PLANGENERATOR_SVNT_HAS_DLL)
-#  define PLANGENERATOR_SVNT_HAS_DLL 1
-#endif /* ! PLANGENERATOR_SVNT_HAS_DLL */
-
-#if defined (PLANGENERATOR_SVNT_HAS_DLL) && (PLANGENERATOR_SVNT_HAS_DLL == 1)
-#  if defined (PLANGENERATOR_SVNT_BUILD_DLL)
-#    define PLANGENERATOR_SVNT_Export ACE_Proper_Export_Flag
-#    define PLANGENERATOR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANGENERATOR_SVNT_BUILD_DLL */
-#    define PLANGENERATOR_SVNT_Export ACE_Proper_Import_Flag
-#    define PLANGENERATOR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANGENERATOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANGENERATOR_SVNT_BUILD_DLL */
-#else /* PLANGENERATOR_SVNT_HAS_DLL == 1 */
-#  define PLANGENERATOR_SVNT_Export
-#  define PLANGENERATOR_SVNT_SINGLETON_DECLARATION(T)
-#  define PLANGENERATOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANGENERATOR_SVNT_HAS_DLL == 1 */
-
-// Set PLANGENERATOR_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANGENERATOR_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANGENERATOR_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANGENERATOR_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANGENERATOR_SVNT_NTRACE */
-
-#if (PLANGENERATOR_SVNT_NTRACE == 1)
-#  define PLANGENERATOR_SVNT_TRACE(X)
-#else /* (PLANGENERATOR_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANGENERATOR_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANGENERATOR_SVNT_NTRACE == 1) */
-
-#endif /* PLANGENERATOR_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/README.txt b/CIAO/RACE/Input_Adapters/PlanGenerator/README.txt
deleted file mode 100644
index 8cbc5665f85..00000000000
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-//Author: Stoyan Paunov
-
-This is the README for the PlanGenerator Input Adapter for RACE. This input
-adapter has similar functionality to the Interactive Input Adapter, however
-instead of parsing the descriptors on disk, it takes the provided by the
-injector package name, retrieves the corresponding PackageConfiguration, and
-finally build a DeploymentPlan in memory. Due to the fact that the XML parsing
-is avoided, the operation takes a lot less time than its counterpart in the
-Interactive Input Adapter. An added benefit is that the implementation arti-
-facts in the constructed DeploymentPlan to point to the HTTP server collocated
-with the RepositoryManager.
-
-
diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl
deleted file mode 100644
index 61235b33959..00000000000
--- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-//$Id$
-#ifndef RACE_OUTPUT_ADAPTER_IDL
-#define RACE_OUTPUT_ADAPTER_IDL
-
-#include <Components.idl>
-#include "../Interface/PlanEgress.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    component Output_Adapter
-    {
-      provides PlanEgress plan_egress;
-    };
-  };
-};
-
-#endif /* RACE_OUTPUT_ADAPTER_IDL */
diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc b/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
deleted file mode 100644
index 32368cb1845..00000000000
--- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
+++ /dev/null
@@ -1,60 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Planner"
-
-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 \
-              -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
-  dynamicflags   = OUTPUT_ADAPTER_STUB_BUILD_DLL
-  libs += Output_Adapter_Interface_stub
-
-  IDL_Files {
-    Output_Adapter.idl
-  }
-
-  Source_Files {
-    Output_AdapterC.cpp
-  }
-
-  Header_Files {
-    Output_AdapterC.h
-  }
-
-  Inline_Files {
-    Output_AdapterC.inl
-  }
-}
-
-project(Output_Adapter_svnt) : ciao_servant_dnc {
-
-  after +=  Output_Adapter_stub Output_Adapter_Interface_svnt
-  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 \
-              -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
-  dynamicflags = OUTPUT_ADAPTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-    Output_Adapter.idl
-  }
-
-  Source_Files {
-    Output_AdapterS.cpp
-  }
-
-  Header_Files {
-    Output_AdapterS.h
-  }
-
-  Inline_Files {
-    Output_AdapterS.inl
-  }
-}
diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_export.h b/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_export.h
deleted file mode 100644
index 2956242afb3..00000000000
--- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_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 OUTPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_STUB_EXPORT_H
-#define OUTPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_STUB_HAS_DLL)
-#  define OUTPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_STUB_HAS_DLL) && (OUTPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_STUB_BUILD_DLL)
-#    define OUTPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#    define OUTPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_STUB_Export
-#  define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_STUB_NTRACE */
-
-#if (OUTPUT_ADAPTER_STUB_NTRACE == 1)
-#  define OUTPUT_ADAPTER_STUB_TRACE(X)
-#else /* (OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h b/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h
deleted file mode 100644
index d64111d83d2..00000000000
--- a/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_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 OUTPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_SVNT_EXPORT_H
-#define OUTPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_SVNT_HAS_DLL)
-#  define OUTPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_SVNT_Export
-#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_SVNT_NTRACE */
-
-#if (OUTPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define OUTPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl b/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
deleted file mode 100644
index 6f0199494f5..00000000000
--- a/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-//$Id$
-#ifndef RACE_OUTPUT_MANAGER_IDL
-#define RACE_OUTPUT_MANAGER_IDL
-
-#include <Components.idl>
-
-module CIAO
-{
-  module RACE
-  {
-    component Output_Manager
-    {
-      provides PlanEgress output;
-      uses multiple PlanEgress adapters;
-    };
-    
-  };
-};
diff --git a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
deleted file mode 100644
index 26d14b54196..00000000000
--- a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Output_Adapter_Interface"
-
-project(Output_Adapter_Interface_stub): ciao_deployment_stub {
-
-  sharedname = Output_Adapter_Interface_stub
-  idlflags += -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
-  dynamicflags   = OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL
-
-  IDL_Files {
-    PlanEgress.idl
-  }
-
-  Source_Files {
-    PlanEgressC.cpp
-  }
-
-  Header_Files {
-    PlanEgressC.h
-  }
-
-  Inline_Files {
-    PlanEgressC.inl
-  }
-}
-
-project(Output_Adapter_Interface_svnt) : ciao_servant_dnc {
-
-  after +=  Output_Adapter_Interface_stub
-  sharedname  = Output_Adapter_Interface_svnt
-  libs    += Output_Adapter_Interface_stub
-
-  idlflags += -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
-  dynamicflags = OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL
-
-  IDL_Files {
-    PlanEgress.idl
-  }
-
-  Source_Files {
-    PlanEgressS.cpp
-  }
-
-  Header_Files {
-    PlanEgressS.h
-  }
-
-  Inline_Files {
-    PlanEgressS.inl
-  }
-}
diff --git a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h
deleted file mode 100644
index 3a36a07de87..00000000000
--- a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_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 OUTPUT_ADAPTER_INTERFACE_STUB
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
-#define OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_Export
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE */
-
-#if (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X)
-#else /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h b/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h
deleted file mode 100644
index f180492dceb..00000000000
--- a/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_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 OUTPUT_ADAPTER_INTERFACE_SVNT
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
-#define OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_Export
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE */
-
-#if (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X)
-#else /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
deleted file mode 100644
index 911c9966f06..00000000000
--- a/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-//$Id$
-#ifndef RACE_PLAN_EGRESS_IDL
-#define RACE_PLAN_EGRESS_IDL
-
-#ifndef INCLUDED_DEPLOYMENT_DATA
-#define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
-#endif
-
-module CIAO
-{
-
-  module RACE
-  {
-    interface PlanEgress
-    {
-      boolean output_plan (in Deployment::DeploymentPlan plan);
-    };
-  };
-};
-
-#endif /* RACE_PLAN_EGRESS_IDL */
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
deleted file mode 100644
index bfd889a8dd3..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
+++ /dev/null
@@ -1,25 +0,0 @@
-//$Id$
-//XML_Output_Adapter.cidl
-
-#ifndef RACE_XML_OUTPUT_ADAPTER_CIDL
-#define RACE_XML_OUTPUT_ADAPTER_CIDL
-
-#include "XML_Output_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session XML_Output_Adapter_Impl
-    {
-      home executor XML_Output_Adapter_Home_Exec
-        {
-          implements RACE::XML_Output_Adapter_Home;
-          manages XML_Output_Adapter_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_XML_OUTPUT_ADAPTER_CIDL */
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
deleted file mode 100644
index 818e1626111..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-//$Id$
-#ifndef RACE_XML_OUTPUT_ADAPTER_IDL
-#define RACE_XML_OUTPUT_ADAPTER_IDL
-
-#include "../Base/Output_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    component XML_Output_Adapter : Output_Adapter
-    {
-    };
-    
-    home XML_Output_Adapter_Home manages XML_Output_Adapter
-    {
-    };
-  };
-};
-
-#endif /* RACE_XML_OUTPUT_ADAPTER_IDL */
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
deleted file mode 100644
index fca465a75fd..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
+++ /dev/null
@@ -1,76 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -p Output_Adapter XML_Output_Adapter"
-
-project(XML_Output_Adapter_stub): ciao_deployment_stub {
-  after += Output_Adapter_stub
-  sharedname = XML_Output_Adapter_stub
-  idlflags += -Wb,stub_export_macro=XML_OUTPUT_ADAPTER_STUB_Export \
-              -Wb,stub_export_include=XML_Output_Adapter_stub_export.h \
-              -Wb,skel_export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \
-              -Wb,skel_export_include=XML_Output_Adapter_svnt_export.h
-  dynamicflags   = XML_OUTPUT_ADAPTER_STUB_BUILD_DLL
-  libs += Output_Adapter_stub \
-          Output_Adapter_Interface_stub
-
-  IDL_Files {
-    XML_Output_Adapter.idl
-  }
-
-  Source_Files {
-    XML_Output_AdapterC.cpp
-  }
-}
-
-project(XML_Output_Adapter_svnt) : ciao_servant_dnc {
-  after += Output_Adapter_svnt XML_Output_Adapter_stub
-  sharedname  = XML_Output_Adapter_svnt
-  libs    += XML_Output_Adapter_stub \
-             Output_Adapter_stub \
-             Output_Adapter_svnt \
-             Output_Adapter_Interface_stub \
-             Output_Adapter_Interface_svnt
-  
-  idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \
-                -Wb,export_include=XML_Output_Adapter_svnt_export.h
-  dynamicflags = XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    XML_Output_Adapter.cidl
-  }
-
-  IDL_Files {
-    XML_Output_AdapterE.idl
-  }
-
-  Source_Files {
-    XML_Output_AdapterEC.cpp
-    XML_Output_AdapterS.cpp
-    XML_Output_Adapter_svnt.cpp
-  }
-}
-
-
-project(XML_Output_Adapter_exec) : ciao_component_dnc {
-  after   += XML_Output_Adapter_svnt
-  sharedname = XML_Output_Adapter_exec
-  libs    += XML_Output_Adapter_stub \
-             XML_Output_Adapter_svnt \
-             Output_Adapter_stub \
-             Output_Adapter_svnt \
-             Output_Adapter_Interface_stub \
-             Output_Adapter_Interface_svnt
-  
-  idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_EXEC_Export \
-                -Wb,export_include=XML_Output_Adapter_exec_export.h
-  dynamicflags   = XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL
-
-  IDL_Files {
-    
-  }
-
-  Source_Files {
-    
-    XML_Output_Adapter_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
deleted file mode 100644
index 26288a3b96c..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "XML_Output_Adapter_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_XML_Output_Adapter_Impl
-    {
-      //==================================================================
-      // Facet Executor Implementation Class:   PlanEgress_exec_i
-      //==================================================================
-
-      PlanEgress_exec_i::PlanEgress_exec_i (void)
-      {
-      }
-
-      PlanEgress_exec_i::~PlanEgress_exec_i (void)
-      {
-      }
-
-      // Operations from ::CIAO::RACE::PlanEgress
-
-      ::CORBA::Boolean
-      PlanEgress_exec_i::output_plan (
-      const ::Deployment::DeploymentPlan & /* plan */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return false;
-      }
-
-      //==================================================================
-      // Component Executor Implementation Class:   XML_Output_Adapter_exec_i
-      //==================================================================
-
-      XML_Output_Adapter_exec_i::XML_Output_Adapter_exec_i (void)
-      {
-      }
-
-      XML_Output_Adapter_exec_i::~XML_Output_Adapter_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      // Port operations.
-
-      ::CIAO::RACE::CCM_PlanEgress_ptr
-      XML_Output_Adapter_exec_i::get_plan_egress ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return ::CIAO::RACE::CCM_PlanEgress::_nil ();
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      XML_Output_Adapter_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        this->context_ =
-        XML_Output_Adapter_Context::_narrow (
-        ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      XML_Output_Adapter_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      XML_Output_Adapter_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      XML_Output_Adapter_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      XML_Output_Adapter_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      XML_Output_Adapter_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   XML_Output_Adapter_Home_exec_i
-      //==================================================================
-
-      XML_Output_Adapter_Home_exec_i::XML_Output_Adapter_Home_exec_i (void)
-      {
-      }
-
-      XML_Output_Adapter_Home_exec_i::~XML_Output_Adapter_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      XML_Output_Adapter_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-        retval,
-        XML_Output_Adapter_exec_i,
-        CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" XML_OUTPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createXML_Output_Adapter_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-        retval,
-        XML_Output_Adapter_Home_exec_i,
-        ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
deleted file mode 100644
index 2dc45207a3e..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_XML_OUTPUT_ADAPTER_EXEC_H
-#define CIAO_XML_OUTPUT_ADAPTER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "XML_Output_Adapter_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "XML_Output_Adapter_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_XML_Output_Adapter_Impl
-    {
-      class XML_OUTPUT_ADAPTER_EXEC_Export PlanEgress_exec_i
-      : public virtual ::CIAO::RACE::CCM_PlanEgress,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        PlanEgress_exec_i (void);
-        virtual ~PlanEgress_exec_i (void);
-
-        // Operations from ::CIAO::RACE::PlanEgress
-
-        virtual ::CORBA::Boolean
-        output_plan (
-        const ::Deployment::DeploymentPlan & plan)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      };
-
-      class XML_OUTPUT_ADAPTER_EXEC_Export XML_Output_Adapter_exec_i
-      : public virtual XML_Output_Adapter_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        XML_Output_Adapter_exec_i (void);
-        virtual ~XML_Output_Adapter_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        // Port operations.
-
-        virtual ::CIAO::RACE::CCM_PlanEgress_ptr
-        get_plan_egress ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-        ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        protected:
-        XML_Output_Adapter_Context *context_;
-      };
-
-      class XML_OUTPUT_ADAPTER_EXEC_Export XML_Output_Adapter_Home_exec_i
-      : public virtual XML_Output_Adapter_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        XML_Output_Adapter_Home_exec_i (void);
-        virtual ~XML_Output_Adapter_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-      };
-
-      extern "C" XML_OUTPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createXML_Output_Adapter_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_XML_OUTPUT_ADAPTER_EXEC_H */
-
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h
deleted file mode 100644
index 6fdbd02c910..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_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 XML_OUTPUT_ADAPTER_EXEC
-// ------------------------------
-#ifndef XML_OUTPUT_ADAPTER_EXEC_EXPORT_H
-#define XML_OUTPUT_ADAPTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL)
-#  define XML_OUTPUT_ADAPTER_EXEC_HAS_DLL 1
-#endif /* ! XML_OUTPUT_ADAPTER_EXEC_HAS_DLL */
-
-#if defined (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL) && (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1)
-#  if defined (XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL)
-#    define XML_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
-#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
-#    define XML_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
-#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
-#else /* XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-#  define XML_OUTPUT_ADAPTER_EXEC_Export
-#  define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
-#  define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-
-// Set XML_OUTPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (XML_OUTPUT_ADAPTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define XML_OUTPUT_ADAPTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define XML_OUTPUT_ADAPTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !XML_OUTPUT_ADAPTER_EXEC_NTRACE */
-
-#if (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1)
-#  define XML_OUTPUT_ADAPTER_EXEC_TRACE(X)
-#else /* (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define XML_OUTPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
-
-#endif /* XML_OUTPUT_ADAPTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h
deleted file mode 100644
index 40bf6add478..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_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 XML_OUTPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef XML_OUTPUT_ADAPTER_STUB_EXPORT_H
-#define XML_OUTPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (XML_OUTPUT_ADAPTER_STUB_HAS_DLL)
-#  define XML_OUTPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! XML_OUTPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (XML_OUTPUT_ADAPTER_STUB_HAS_DLL) && (XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (XML_OUTPUT_ADAPTER_STUB_BUILD_DLL)
-#    define XML_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* XML_OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#    define XML_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* XML_OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define XML_OUTPUT_ADAPTER_STUB_Export
-#  define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set XML_OUTPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (XML_OUTPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define XML_OUTPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define XML_OUTPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !XML_OUTPUT_ADAPTER_STUB_NTRACE */
-
-#if (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1)
-#  define XML_OUTPUT_ADAPTER_STUB_TRACE(X)
-#else /* (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define XML_OUTPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* XML_OUTPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h
deleted file mode 100644
index 7c563fadf8a..00000000000
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_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 XML_OUTPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef XML_OUTPUT_ADAPTER_SVNT_EXPORT_H
-#define XML_OUTPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL)
-#  define XML_OUTPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! XML_OUTPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL) && (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define XML_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define XML_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define XML_OUTPUT_ADAPTER_SVNT_Export
-#  define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set XML_OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (XML_OUTPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define XML_OUTPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define XML_OUTPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !XML_OUTPUT_ADAPTER_SVNT_NTRACE */
-
-#if (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define XML_OUTPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define XML_OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* XML_OUTPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl
deleted file mode 100644
index abb90746baa..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl
+++ /dev/null
@@ -1,25 +0,0 @@
-//$Id$
-//Plan_Analyzer.cidl
-
-#ifndef RACE_PLAN_ANALYZER_CIDL
-#define RACE_PLAN_ANALYZER_CIDL
-
-#include "Plan_Analyzer.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Plan_Analyzer_Impl
-    {
-      home executor Plan_Analyzer_Home_Exec
-        {
-          implements RACE::Plan_Analyzer_Home;
-          manages    Plan_Analyzer_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_PLAN_ANALYZER_CIDL */
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
deleted file mode 100644
index 9f4fdd4668d..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-#ifndef RACE_PLAN_ANALYZER_IDL
-#define RACE_PLAN_ANALYZER_IDL
-
-#include <Components.idl>
-#include "../Interface/PlanIngress.idl"
-#include "../../Planner_Manager/Interface/Planner_Manager_I.idl"
-
-module CIAO
-{
-  
-  module RACE
-  {
-    component Plan_Analyzer
-    {
-      provides PlanIngress plan_ingress;
-      uses Planner_Manager_I planner_manager_i;
-
-      readonly attribute RACE_Classifications classes;
-
-      // provides PlannerInfo pinfo;
-      // uses multiple Analyzer plugins;
-    };
-
-    home Plan_Analyzer_Home manages Plan_Analyzer
-    {
-    };
-  };
-};
-
-
-#endif /* RACE_PLAN_ANALYZER_IDL */
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
deleted file mode 100644
index ccf3d9dae17..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
+++ /dev/null
@@ -1,100 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl Plan_Analyzer"
-
-project(Plan_Analyzer_stub): ciao_deployment_stub {
-  after += Plan_Analyzer_Interface_stub \
-           RACE_common_stub \
-           Planner_Manager_Interface_stub
-  sharedname = Plan_Analyzer_stub
-  idlflags += -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
-  dynamicflags   = PLAN_ANALYZER_STUB_BUILD_DLL
-  libs += Plan_Analyzer_Interface_stub \
-          RACE_common_stub \
-          Planner_Manager_Interface_stub
-
-  IDL_Files {
-    Plan_Analyzer.idl
-  }
-
-  Source_Files {
-    Plan_AnalyzerC.cpp
-  }
-
-  Header_Files {
-    Plan_AnalyzerC.h
-  }
-
-  Inline_Files {
-    Plan_AnalyzerC.inl
-  }
-}
-
-project(Plan_Analyzer_svnt) : ciao_servant_dnc {
-  after += Plan_Analyzer_stub \
-           Plan_Analyzer_Interface_svnt
-  sharedname  = Plan_Analyzer_svnt
-  libs    += Plan_Analyzer_stub \
-             RACE_common_stub \
-             Plan_Analyzer_Interface_stub \
-             Plan_Analyzer_Interface_svnt \
-             Planner_Manager_Interface_stub
-
-  idlflags  +=  -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
-                -Wb,export_include=Plan_Analyzer_svnt_export.h
-
-  dynamicflags = PLAN_ANALYZER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Plan_Analyzer.cidl
-  }
-
-  IDL_Files {
-    Plan_AnalyzerE.idl
-  }
-
-  Source_Files {
-    Plan_AnalyzerEC.cpp
-    Plan_AnalyzerS.cpp
-    Plan_Analyzer_svnt.cpp
-  }
-
-  Header_Files {
-    Plan_AnalyzerEC.h
-    Plan_AnalyzerS.h
-    Plan_Analyzer_svnt.h
-  }
-
-  Inline_Files {
-    Plan_AnalyzerEC.inl
-    Plan_AnalyzerS.inl
-    Plan_Analyzer_svnt.inl
-  }
-}
-
-
-project(Plan_Analyzer_exec) : ciao_component_dnc {
-  after   += Plan_Analyzer_svnt
-  sharedname = Plan_Analyzer_exec
-  libs    += Plan_Analyzer_stub \
-             Plan_Analyzer_svnt \
-             RACE_common_stub \
-             Plan_Analyzer_Interface_stub \
-             Plan_Analyzer_Interface_svnt \
-             Planner_Manager_Interface_stub
-
-  idlflags  +=  -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 {
-    Plan_Analyzer_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
deleted file mode 100644
index 09e976afbbe..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "Plan_Analyzer_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Plan_Analyzer_Impl
-    {
-      //==================================================================
-      // Facet Executor Implementation Class:   PlanIngress_exec_i
-      //==================================================================
-
-      PlanIngress_exec_i::PlanIngress_exec_i (void)
-      {
-      }
-
-      PlanIngress_exec_i::~PlanIngress_exec_i (void)
-      {
-      }
-
-      // Operations from ::CIAO::RACE::PlanIngress
-
-      void
-      PlanIngress_exec_i::analyze_plan (
-      const ::Deployment::DeploymentPlan & /* plan */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Component Executor Implementation Class:   Plan_Analyzer_exec_i
-      //==================================================================
-
-      Plan_Analyzer_exec_i::Plan_Analyzer_exec_i (void)
-      {
-      }
-
-      Plan_Analyzer_exec_i::~Plan_Analyzer_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      ::CIAO::RACE::RACE_Classifications *
-      Plan_Analyzer_exec_i::classes ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0;
-      }
-
-      // Port operations.
-
-      ::CIAO::RACE::CCM_PlanIngress_ptr
-      Plan_Analyzer_exec_i::get_plan_ingress ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return ::CIAO::RACE::CCM_PlanIngress::_nil ();
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      Plan_Analyzer_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        this->context_ =
-        Plan_Analyzer_Context::_narrow (
-        ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      Plan_Analyzer_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Plan_Analyzer_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Plan_Analyzer_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Plan_Analyzer_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Plan_Analyzer_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   Plan_Analyzer_Home_exec_i
-      //==================================================================
-
-      Plan_Analyzer_Home_exec_i::Plan_Analyzer_Home_exec_i (void)
-      {
-      }
-
-      Plan_Analyzer_Home_exec_i::~Plan_Analyzer_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      Plan_Analyzer_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-        retval,
-        Plan_Analyzer_exec_i,
-        CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" PLAN_ANALYZER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createPlan_Analyzer_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-        retval,
-        Plan_Analyzer_Home_exec_i,
-        ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
deleted file mode 100644
index 93318713481..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_PLAN_ANALYZER_EXEC_H
-#define CIAO_PLAN_ANALYZER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Plan_Analyzer_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Plan_Analyzer_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Plan_Analyzer_Impl
-    {
-      class PLAN_ANALYZER_EXEC_Export PlanIngress_exec_i
-      : public virtual ::CIAO::RACE::CCM_PlanIngress,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        PlanIngress_exec_i (void);
-        virtual ~PlanIngress_exec_i (void);
-
-        // Operations from ::CIAO::RACE::PlanIngress
-
-        virtual void
-        analyze_plan (
-        const ::Deployment::DeploymentPlan & plan)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      };
-
-      class PLAN_ANALYZER_EXEC_Export Plan_Analyzer_exec_i
-      : public virtual Plan_Analyzer_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Plan_Analyzer_exec_i (void);
-        virtual ~Plan_Analyzer_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        virtual ::CIAO::RACE::RACE_Classifications *
-        classes ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Port operations.
-
-        virtual ::CIAO::RACE::CCM_PlanIngress_ptr
-        get_plan_ingress ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-        ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        protected:
-        Plan_Analyzer_Context *context_;
-      };
-
-      class PLAN_ANALYZER_EXEC_Export Plan_Analyzer_Home_exec_i
-      : public virtual Plan_Analyzer_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Plan_Analyzer_Home_exec_i (void);
-        virtual ~Plan_Analyzer_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-      };
-
-      extern "C" PLAN_ANALYZER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createPlan_Analyzer_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_PLAN_ANALYZER_EXEC_H */
-
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h
deleted file mode 100644
index d2449edd9e7..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_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 PLAN_ANALYZER_EXEC
-// ------------------------------
-#ifndef PLAN_ANALYZER_EXEC_EXPORT_H
-#define PLAN_ANALYZER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLAN_ANALYZER_EXEC_HAS_DLL)
-#  define PLAN_ANALYZER_EXEC_HAS_DLL 1
-#endif /* ! PLAN_ANALYZER_EXEC_HAS_DLL */
-
-#if defined (PLAN_ANALYZER_EXEC_HAS_DLL) && (PLAN_ANALYZER_EXEC_HAS_DLL == 1)
-#  if defined (PLAN_ANALYZER_EXEC_BUILD_DLL)
-#    define PLAN_ANALYZER_EXEC_Export ACE_Proper_Export_Flag
-#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLAN_ANALYZER_EXEC_BUILD_DLL */
-#    define PLAN_ANALYZER_EXEC_Export ACE_Proper_Import_Flag
-#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLAN_ANALYZER_EXEC_BUILD_DLL */
-#else /* PLAN_ANALYZER_EXEC_HAS_DLL == 1 */
-#  define PLAN_ANALYZER_EXEC_Export
-#  define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T)
-#  define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLAN_ANALYZER_EXEC_HAS_DLL == 1 */
-
-// Set PLAN_ANALYZER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLAN_ANALYZER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLAN_ANALYZER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLAN_ANALYZER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLAN_ANALYZER_EXEC_NTRACE */
-
-#if (PLAN_ANALYZER_EXEC_NTRACE == 1)
-#  define PLAN_ANALYZER_EXEC_TRACE(X)
-#else /* (PLAN_ANALYZER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLAN_ANALYZER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLAN_ANALYZER_EXEC_NTRACE == 1) */
-
-#endif /* PLAN_ANALYZER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h
deleted file mode 100644
index 90b041f89a8..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_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 PLAN_ANALYZER_STUB
-// ------------------------------
-#ifndef PLAN_ANALYZER_STUB_EXPORT_H
-#define PLAN_ANALYZER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLAN_ANALYZER_STUB_HAS_DLL)
-#  define PLAN_ANALYZER_STUB_HAS_DLL 1
-#endif /* ! PLAN_ANALYZER_STUB_HAS_DLL */
-
-#if defined (PLAN_ANALYZER_STUB_HAS_DLL) && (PLAN_ANALYZER_STUB_HAS_DLL == 1)
-#  if defined (PLAN_ANALYZER_STUB_BUILD_DLL)
-#    define PLAN_ANALYZER_STUB_Export ACE_Proper_Export_Flag
-#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLAN_ANALYZER_STUB_BUILD_DLL */
-#    define PLAN_ANALYZER_STUB_Export ACE_Proper_Import_Flag
-#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLAN_ANALYZER_STUB_BUILD_DLL */
-#else /* PLAN_ANALYZER_STUB_HAS_DLL == 1 */
-#  define PLAN_ANALYZER_STUB_Export
-#  define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T)
-#  define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLAN_ANALYZER_STUB_HAS_DLL == 1 */
-
-// Set PLAN_ANALYZER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLAN_ANALYZER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLAN_ANALYZER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLAN_ANALYZER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLAN_ANALYZER_STUB_NTRACE */
-
-#if (PLAN_ANALYZER_STUB_NTRACE == 1)
-#  define PLAN_ANALYZER_STUB_TRACE(X)
-#else /* (PLAN_ANALYZER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLAN_ANALYZER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLAN_ANALYZER_STUB_NTRACE == 1) */
-
-#endif /* PLAN_ANALYZER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h
deleted file mode 100644
index 13f0c025860..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_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 PLAN_ANALYZER_SVNT
-// ------------------------------
-#ifndef PLAN_ANALYZER_SVNT_EXPORT_H
-#define PLAN_ANALYZER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLAN_ANALYZER_SVNT_HAS_DLL)
-#  define PLAN_ANALYZER_SVNT_HAS_DLL 1
-#endif /* ! PLAN_ANALYZER_SVNT_HAS_DLL */
-
-#if defined (PLAN_ANALYZER_SVNT_HAS_DLL) && (PLAN_ANALYZER_SVNT_HAS_DLL == 1)
-#  if defined (PLAN_ANALYZER_SVNT_BUILD_DLL)
-#    define PLAN_ANALYZER_SVNT_Export ACE_Proper_Export_Flag
-#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLAN_ANALYZER_SVNT_BUILD_DLL */
-#    define PLAN_ANALYZER_SVNT_Export ACE_Proper_Import_Flag
-#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLAN_ANALYZER_SVNT_BUILD_DLL */
-#else /* PLAN_ANALYZER_SVNT_HAS_DLL == 1 */
-#  define PLAN_ANALYZER_SVNT_Export
-#  define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T)
-#  define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLAN_ANALYZER_SVNT_HAS_DLL == 1 */
-
-// Set PLAN_ANALYZER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLAN_ANALYZER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLAN_ANALYZER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLAN_ANALYZER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLAN_ANALYZER_SVNT_NTRACE */
-
-#if (PLAN_ANALYZER_SVNT_NTRACE == 1)
-#  define PLAN_ANALYZER_SVNT_TRACE(X)
-#else /* (PLAN_ANALYZER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLAN_ANALYZER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLAN_ANALYZER_SVNT_NTRACE == 1) */
-
-#endif /* PLAN_ANALYZER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl b/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
deleted file mode 100644
index 1074b4f4da3..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-//$Id$
-#ifndef RACE_PLAN_INGRESS_IDL
-#define RACE_PLAN_INGRESS_IDL
-
-#ifndef INCLUDED_DEPLOYMENT_DATA
-#define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
-#endif
-
-module CIAO
-{
-  module RACE
-  {
-    interface PlanIngress
-    {
-      void analyze_plan (in Deployment::DeploymentPlan plan);
-    };
-  };
-};
-
-
-#endif /* RACE_PLAN_INGRESS_IDL */
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
deleted file mode 100644
index 0b7e6b2bfc9..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Planner_Manager_Interface"
-
-project(Plan_Analyzer_Interface_stub): ciao_deployment_stub {
-
-  sharedname = Plan_Analyzer_Interface_stub
-  idlflags += -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
-  dynamicflags   = PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL
-
-  IDL_Files {
-    PlanIngress.idl
-  }
-
-  Source_Files {
-    PlanIngressC.cpp
-  }
-
-  Header_Files {
-    PlanIngressC.h
-  }
-
-  Inline_Files {
-    PlanIngressC.inl
-  }
-}
-
-project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc {
-
-  after +=  Plan_Analyzer_Interface_stub
-  sharedname  = Plan_Analyzer_Interface_svnt
-  libs    += Plan_Analyzer_Interface_stub
-
-  idlflags += -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
-  dynamicflags = PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL
-
-  IDL_Files {
-    PlanIngress.idl
-  }
-
-  Source_Files {
-    PlanIngressS.cpp
-  }
-
-  Header_Files {
-    PlanIngressS.h
-  }
-
-  Inline_Files {
-    PlanIngressS.inl
-  }
-}
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h
deleted file mode 100644
index 7cbca0251fc..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_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 PLAN_ANALYZER_INTERFACE_STUB
-// ------------------------------
-#ifndef PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H
-#define PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL)
-#  define PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL 1
-#endif /* ! PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL */
-
-#if defined (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL) && (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1)
-#  if defined (PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL)
-#    define PLAN_ANALYZER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
-#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL */
-#    define PLAN_ANALYZER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
-#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL */
-#else /* PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1 */
-#  define PLAN_ANALYZER_INTERFACE_STUB_Export
-#  define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
-#  define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1 */
-
-// Set PLAN_ANALYZER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLAN_ANALYZER_INTERFACE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLAN_ANALYZER_INTERFACE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLAN_ANALYZER_INTERFACE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLAN_ANALYZER_INTERFACE_STUB_NTRACE */
-
-#if (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1)
-#  define PLAN_ANALYZER_INTERFACE_STUB_TRACE(X)
-#else /* (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLAN_ANALYZER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1) */
-
-#endif /* PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h b/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h
deleted file mode 100644
index ceb90e37efb..00000000000
--- a/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_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 PLAN_ANALYZER_INTERFACE_SVNT
-// ------------------------------
-#ifndef PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H
-#define PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL)
-#  define PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL) && (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL)
-#    define PLAN_ANALYZER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL */
-#    define PLAN_ANALYZER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL */
-#else /* PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define PLAN_ANALYZER_INTERFACE_SVNT_Export
-#  define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set PLAN_ANALYZER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLAN_ANALYZER_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLAN_ANALYZER_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLAN_ANALYZER_INTERFACE_SVNT_NTRACE */
-
-#if (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1)
-#  define PLAN_ANALYZER_INTERFACE_SVNT_TRACE(X)
-#else /* (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLAN_ANALYZER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
deleted file mode 100644
index dcf42d8218c..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
+++ /dev/null
@@ -1,28 +0,0 @@
-//$Id$
-//Planner_Manager.cidl
-
-#ifndef RACE_PLANNER_MANAGER_CIDL
-#define RACE_PLANNER_MANAGER_CIDL
-
-#include "Planner_Manager.idl"
-
-#include "../../Planners/Interface/Planner_I.idl"
-#include "../../Output_Adapters/Interface/PlanEgress.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    
-    composition session Planner_Manager_Impl
-    {
-      home executor Planner_Manager_Home_Exec
-        {
-          implements RACE::Planner_Manager_Home;
-          manages    Planner_Manager_Exec;
-        };
-    };
-  };
-};
-
-#endif /* RACE_PLANNER_MANAGER_CIDL */
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
deleted file mode 100644
index 24bc92644f5..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-#ifndef RACE_PLANNER_MANAGER_IDL
-#define RACE_PLANNER_MANAGER_IDL
-
-#include <Components.idl>
-#include "../Interface/Planner_Manager_I.idl"
-
-#include "../../Planners/Interface/Planner_I.idl"
-#include "../../Output_Adapters/Interface/PlanEgress.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    interface Planner_I;
-    interface PlanEgress;
-
-    component Planner_Manager
-    {
-      provides Planner_Manager_I planner_manager_i;
-      uses multiple Planner_I planners;
-      uses multiple PlanEgress outputs;
-      readonly attribute RACE_Classifications classes;
-    };
-
-    home Planner_Manager_Home manages Planner_Manager
-    {
-    };
-  };
-};
-
-#endif /* RACE_PLANNER_MANAGER_IDL */
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
deleted file mode 100644
index 25f925c196a..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
+++ /dev/null
@@ -1,103 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl Planner_Manager"
-
-project(Planner_Manager_stub): ciao_deployment_stub {
-  after += Planner_Manager_Interface_stub \
-           Planner_Interface_stub \
-           Output_Adapter_Interface_stub
-  sharedname = Planner_Manager_stub
-  idlflags += -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
-  dynamicflags   = PLANNER_MANAGER_STUB_BUILD_DLL
-  libs += RACE_common_stub \
-          Planner_Manager_Interface_stub \
-          Planner_Interface_stub \
-          Output_Adapter_Interface_stub
-
-  IDL_Files {
-    Planner_Manager.idl
-  }
-
-  Source_Files {
-    Planner_ManagerC.cpp
-  }
-
-  Header_Files {
-    Planner_ManagerC.h
-  }
-
-  Inline_Files {
-    Planner_ManagerC.inl
-  }
-}
-
-project(Planner_Manager_svnt) : ciao_servant_dnc {
-  after += Planner_Manager_stub \
-           Planner_Manager_Interface_svnt
-  sharedname  = Planner_Manager_svnt
-  libs    += Planner_Manager_stub \
-             RACE_common_stub \
-             Planner_Manager_Interface_stub \
-             Planner_Manager_Interface_svnt \
-             Planner_Interface_stub \
-             Output_Adapter_Interface_stub
-  idlflags  +=  -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
-                -Wb,export_include=Planner_Manager_svnt_export.h
-
-  dynamicflags = PLANNER_MANAGER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Planner_Manager.cidl
-  }
-
-  IDL_Files {
-    Planner_ManagerE.idl
-  }
-
-  Source_Files {
-    Planner_ManagerEC.cpp
-    Planner_ManagerS.cpp
-    Planner_Manager_svnt.cpp
-  }
-
-  Header_Files {
-    Planner_ManagerEC.h
-    Planner_ManagerS.h
-    Planner_Manager_svnt.h
-  }
-
-  Inline_Files {
-    Planner_ManagerEC.inl
-    Planner_ManagerS.inl
-    Planner_Manager_svnt.inl
-  }
-}
-
-
-project(Planner_Manager_exec) : ciao_component_dnc {
-  after   += Planner_Manager_svnt Planner_stub
-  sharedname = Planner_Manager_exec
-  libs    += Planner_Manager_stub \
-             Planner_Manager_svnt \
-             RACE_common_stub \
-             Planner_Manager_Interface_stub \
-             Planner_Manager_Interface_svnt \
-             Planner_Interface_stub \
-             Planner_stub \
-             Output_Adapter_Interface_stub
-
-  idlflags  +=  -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 {
-    Planner_Manager_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
deleted file mode 100644
index a149a785ce6..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "Planner_Manager_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Planner_Manager_Impl
-    {
-      //==================================================================
-      // Facet Executor Implementation Class:   Planner_Manager_I_exec_i
-      //==================================================================
-
-      Planner_Manager_I_exec_i::Planner_Manager_I_exec_i (void)
-      {
-      }
-
-      Planner_Manager_I_exec_i::~Planner_Manager_I_exec_i (void)
-      {
-      }
-
-      // Operations from ::CIAO::RACE::Planner_Manager_I
-
-      void
-      Planner_Manager_I_exec_i::execute_planners (
-      const ::Deployment::DeploymentPlan & /* plan */,
-      const ::CIAO::RACE::PlannerFlow & /* flow */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Component Executor Implementation Class:   Planner_Manager_exec_i
-      //==================================================================
-
-      Planner_Manager_exec_i::Planner_Manager_exec_i (void)
-      {
-      }
-
-      Planner_Manager_exec_i::~Planner_Manager_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      ::CIAO::RACE::RACE_Classifications *
-      Planner_Manager_exec_i::classes ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0;
-      }
-
-      // Port operations.
-
-      ::CIAO::RACE::CCM_Planner_Manager_I_ptr
-      Planner_Manager_exec_i::get_planner_manager_i ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return ::CIAO::RACE::CCM_Planner_Manager_I::_nil ();
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      Planner_Manager_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        this->context_ =
-        Planner_Manager_Context::_narrow (
-        ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      Planner_Manager_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Planner_Manager_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Planner_Manager_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Planner_Manager_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Planner_Manager_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   Planner_Manager_Home_exec_i
-      //==================================================================
-
-      Planner_Manager_Home_exec_i::Planner_Manager_Home_exec_i (void)
-      {
-      }
-
-      Planner_Manager_Home_exec_i::~Planner_Manager_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      Planner_Manager_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-        retval,
-        Planner_Manager_exec_i,
-        CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" PLANNER_MANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createPlanner_Manager_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-        retval,
-        Planner_Manager_Home_exec_i,
-        ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
deleted file mode 100644
index 1ca6114e850..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_PLANNER_MANAGER_EXEC_H
-#define CIAO_PLANNER_MANAGER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Planner_Manager_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Planner_Manager_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Planner_Manager_Impl
-    {
-      class PLANNER_MANAGER_EXEC_Export Planner_Manager_I_exec_i
-      : public virtual ::CIAO::RACE::CCM_Planner_Manager_I,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Planner_Manager_I_exec_i (void);
-        virtual ~Planner_Manager_I_exec_i (void);
-
-        // Operations from ::CIAO::RACE::Planner_Manager_I
-
-        virtual void
-        execute_planners (
-        const ::Deployment::DeploymentPlan & plan,
-        const ::CIAO::RACE::PlannerFlow & flow)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      };
-
-      class PLANNER_MANAGER_EXEC_Export Planner_Manager_exec_i
-      : public virtual Planner_Manager_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Planner_Manager_exec_i (void);
-        virtual ~Planner_Manager_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        virtual ::CIAO::RACE::RACE_Classifications *
-        classes ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Port operations.
-
-        virtual ::CIAO::RACE::CCM_Planner_Manager_I_ptr
-        get_planner_manager_i ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-        ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        protected:
-        Planner_Manager_Context *context_;
-      };
-
-      class PLANNER_MANAGER_EXEC_Export Planner_Manager_Home_exec_i
-      : public virtual Planner_Manager_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Planner_Manager_Home_exec_i (void);
-        virtual ~Planner_Manager_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-      };
-
-      extern "C" PLANNER_MANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createPlanner_Manager_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_PLANNER_MANAGER_EXEC_H */
-
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_export.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_export.h
deleted file mode 100644
index 776022c36d3..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_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 PLANNER_MANAGER_EXEC
-// ------------------------------
-#ifndef PLANNER_MANAGER_EXEC_EXPORT_H
-#define PLANNER_MANAGER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_MANAGER_EXEC_HAS_DLL)
-#  define PLANNER_MANAGER_EXEC_HAS_DLL 1
-#endif /* ! PLANNER_MANAGER_EXEC_HAS_DLL */
-
-#if defined (PLANNER_MANAGER_EXEC_HAS_DLL) && (PLANNER_MANAGER_EXEC_HAS_DLL == 1)
-#  if defined (PLANNER_MANAGER_EXEC_BUILD_DLL)
-#    define PLANNER_MANAGER_EXEC_Export ACE_Proper_Export_Flag
-#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_MANAGER_EXEC_BUILD_DLL */
-#    define PLANNER_MANAGER_EXEC_Export ACE_Proper_Import_Flag
-#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_MANAGER_EXEC_BUILD_DLL */
-#else /* PLANNER_MANAGER_EXEC_HAS_DLL == 1 */
-#  define PLANNER_MANAGER_EXEC_Export
-#  define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T)
-#  define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_MANAGER_EXEC_HAS_DLL == 1 */
-
-// Set PLANNER_MANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_MANAGER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_MANAGER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_MANAGER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_MANAGER_EXEC_NTRACE */
-
-#if (PLANNER_MANAGER_EXEC_NTRACE == 1)
-#  define PLANNER_MANAGER_EXEC_TRACE(X)
-#else /* (PLANNER_MANAGER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_MANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_MANAGER_EXEC_NTRACE == 1) */
-
-#endif /* PLANNER_MANAGER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_export.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_export.h
deleted file mode 100644
index 17a15f1cf30..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_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 PLANNER_MANAGER_STUB
-// ------------------------------
-#ifndef PLANNER_MANAGER_STUB_EXPORT_H
-#define PLANNER_MANAGER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_MANAGER_STUB_HAS_DLL)
-#  define PLANNER_MANAGER_STUB_HAS_DLL 1
-#endif /* ! PLANNER_MANAGER_STUB_HAS_DLL */
-
-#if defined (PLANNER_MANAGER_STUB_HAS_DLL) && (PLANNER_MANAGER_STUB_HAS_DLL == 1)
-#  if defined (PLANNER_MANAGER_STUB_BUILD_DLL)
-#    define PLANNER_MANAGER_STUB_Export ACE_Proper_Export_Flag
-#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_MANAGER_STUB_BUILD_DLL */
-#    define PLANNER_MANAGER_STUB_Export ACE_Proper_Import_Flag
-#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_MANAGER_STUB_BUILD_DLL */
-#else /* PLANNER_MANAGER_STUB_HAS_DLL == 1 */
-#  define PLANNER_MANAGER_STUB_Export
-#  define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T)
-#  define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_MANAGER_STUB_HAS_DLL == 1 */
-
-// Set PLANNER_MANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_MANAGER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_MANAGER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_MANAGER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_MANAGER_STUB_NTRACE */
-
-#if (PLANNER_MANAGER_STUB_NTRACE == 1)
-#  define PLANNER_MANAGER_STUB_TRACE(X)
-#else /* (PLANNER_MANAGER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_MANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_MANAGER_STUB_NTRACE == 1) */
-
-#endif /* PLANNER_MANAGER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h
deleted file mode 100644
index bdc3cfac970..00000000000
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_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 PLANNER_MANAGER_SVNT
-// ------------------------------
-#ifndef PLANNER_MANAGER_SVNT_EXPORT_H
-#define PLANNER_MANAGER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_MANAGER_SVNT_HAS_DLL)
-#  define PLANNER_MANAGER_SVNT_HAS_DLL 1
-#endif /* ! PLANNER_MANAGER_SVNT_HAS_DLL */
-
-#if defined (PLANNER_MANAGER_SVNT_HAS_DLL) && (PLANNER_MANAGER_SVNT_HAS_DLL == 1)
-#  if defined (PLANNER_MANAGER_SVNT_BUILD_DLL)
-#    define PLANNER_MANAGER_SVNT_Export ACE_Proper_Export_Flag
-#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_MANAGER_SVNT_BUILD_DLL */
-#    define PLANNER_MANAGER_SVNT_Export ACE_Proper_Import_Flag
-#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_MANAGER_SVNT_BUILD_DLL */
-#else /* PLANNER_MANAGER_SVNT_HAS_DLL == 1 */
-#  define PLANNER_MANAGER_SVNT_Export
-#  define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T)
-#  define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_MANAGER_SVNT_HAS_DLL == 1 */
-
-// Set PLANNER_MANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_MANAGER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_MANAGER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_MANAGER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_MANAGER_SVNT_NTRACE */
-
-#if (PLANNER_MANAGER_SVNT_NTRACE == 1)
-#  define PLANNER_MANAGER_SVNT_TRACE(X)
-#else /* (PLANNER_MANAGER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_MANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_MANAGER_SVNT_NTRACE == 1) */
-
-#endif /* PLANNER_MANAGER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
deleted file mode 100644
index 7ad88444a52..00000000000
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-//$Id$
-#ifndef RACE_PLANNER_MANAGER_I_IDL
-#define RACE_PLANNER_MANAGER_I_IDL
-
-#ifndef INCLUDED_DEPLOYMENT_DATA
-#define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
-#endif
-
-#include "../../common/RACE_common.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    interface Planner_Manager_I
-    {
-      void execute_planners (in Deployment::DeploymentPlan plan,
-                             in PlannerFlow flow);
-    };
-  };
-};
-
-#endif /* RACE_PLANNER_MANAGER_I_IDL */
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
deleted file mode 100644
index fb145b6fc6d..00000000000
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
+++ /dev/null
@@ -1,60 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Planner_Manager_Interface"
-
-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 \
-              -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
-  dynamicflags   = PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL
-  libs += RACE_common_stub
-
-  IDL_Files {
-    Planner_Manager_I.idl
-  }
-
-  Source_Files {
-    Planner_Manager_IC.cpp
-  }
-
-  Header_Files {
-    Planner_Manager_IC.h
-  }
-
-  Inline_Files {
-    Planner_Manager_IC.inl
-  }
-}
-
-project(Planner_Manager_Interface_svnt) : ciao_servant_dnc {
-
-  after +=  Planner_Manager_Interface_stub
-  sharedname  = Planner_Manager_Interface_svnt
-  libs    += Planner_Manager_Interface_stub RACE_common_stub
-
-  idlflags += -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
-  dynamicflags = PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL
-
-  IDL_Files {
-    Planner_Manager_I.idl
-  }
-
-  Source_Files {
-    Planner_Manager_IS.cpp
-  }
-
-  Header_Files {
-    Planner_Manager_IS.h
-  }
-
-  Inline_Files {
-    Planner_Manager_IS.inl
-  }
-}
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h
deleted file mode 100644
index 32a583b5346..00000000000
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_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 PLANNER_MANAGER_INTERFACE_STUB
-// ------------------------------
-#ifndef PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H
-#define PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL)
-#  define PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL 1
-#endif /* ! PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL */
-
-#if defined (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL) && (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1)
-#  if defined (PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL)
-#    define PLANNER_MANAGER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
-#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL */
-#    define PLANNER_MANAGER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
-#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL */
-#else /* PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1 */
-#  define PLANNER_MANAGER_INTERFACE_STUB_Export
-#  define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
-#  define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1 */
-
-// Set PLANNER_MANAGER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_MANAGER_INTERFACE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_MANAGER_INTERFACE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_MANAGER_INTERFACE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_MANAGER_INTERFACE_STUB_NTRACE */
-
-#if (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1)
-#  define PLANNER_MANAGER_INTERFACE_STUB_TRACE(X)
-#else /* (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_MANAGER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1) */
-
-#endif /* PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h b/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h
deleted file mode 100644
index 6e554a1d5ed..00000000000
--- a/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_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 PLANNER_MANAGER_INTERFACE_SVNT
-// ------------------------------
-#ifndef PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H
-#define PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL)
-#  define PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL) && (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL)
-#    define PLANNER_MANAGER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL */
-#    define PLANNER_MANAGER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL */
-#else /* PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define PLANNER_MANAGER_INTERFACE_SVNT_Export
-#  define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set PLANNER_MANAGER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_MANAGER_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_MANAGER_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_MANAGER_INTERFACE_SVNT_NTRACE */
-
-#if (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1)
-#  define PLANNER_MANAGER_INTERFACE_SVNT_TRACE(X)
-#else /* (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_MANAGER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/Base/Planner.idl b/CIAO/RACE/Planners/Base/Planner.idl
deleted file mode 100644
index ae81074d5e7..00000000000
--- a/CIAO/RACE/Planners/Base/Planner.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-#ifndef RACE_PLANNER_IDL
-#define RACE_PLANNER_IDL
-
-#include <Components.idl>
-#include "../Interface/Planner_I.idl"
-#include "../../common/RACE_common.idl"
-
-module CIAO
-{
-  
-  module RACE
-  {
-    component Planner
-    {
-      provides Planner_I planner_i;
-      attribute string name;
-      attribute RACE_Classification type;
-    };
-  };
-  
-};
-
-#endif /* RACE_PLANNER_IDL */
diff --git a/CIAO/RACE/Planners/Base/Planner.mpc b/CIAO/RACE/Planners/Base/Planner.mpc
deleted file mode 100644
index 698cb689cb5..00000000000
--- a/CIAO/RACE/Planners/Base/Planner.mpc
+++ /dev/null
@@ -1,60 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Planner"
-
-project(Planner_stub): ciao_deployment_stub {
-
-  after += Planner_Interface_stub RACE_common_stub
-  sharedname = Planner_stub
-  idlflags += -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
-  dynamicflags   = PLANNER_STUB_BUILD_DLL
-  libs += Planner_Interface_stub RACE_common_stub
-
-  IDL_Files {
-    Planner.idl
-  }
-
-  Source_Files {
-    PlannerC.cpp
-  }
-
-  Header_Files {
-    PlannerC.h
-  }
-
-  Inline_Files {
-    PlannerC.inl
-  }
-}
-
-project(Planner_svnt) : ciao_servant_dnc {
-
-  after +=  Planner_Interface_svnt Planner_stub
-  sharedname  = Planner_svnt
-  libs    += Planner_Interface_stub Planner_Interface_svnt Planner_stub RACE_common_stub
-
-  idlflags += -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
-  dynamicflags = PLANNER_SVNT_BUILD_DLL
-
-  IDL_Files {
-    Planner.idl
-  }
-
-  Source_Files {
-    PlannerS.cpp
-  }
-
-  Header_Files {
-    PlannerS.h
-  }
-
-  Inline_Files {
-    PlannerS.inl
-  }
-}
diff --git a/CIAO/RACE/Planners/Base/Planner_stub_export.h b/CIAO/RACE/Planners/Base/Planner_stub_export.h
deleted file mode 100644
index d9c9c352052..00000000000
--- a/CIAO/RACE/Planners/Base/Planner_stub_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 PLANNER_STUB
-// ------------------------------
-#ifndef PLANNER_STUB_EXPORT_H
-#define PLANNER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_STUB_HAS_DLL)
-#  define PLANNER_STUB_HAS_DLL 1
-#endif /* ! PLANNER_STUB_HAS_DLL */
-
-#if defined (PLANNER_STUB_HAS_DLL) && (PLANNER_STUB_HAS_DLL == 1)
-#  if defined (PLANNER_STUB_BUILD_DLL)
-#    define PLANNER_STUB_Export ACE_Proper_Export_Flag
-#    define PLANNER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_STUB_BUILD_DLL */
-#    define PLANNER_STUB_Export ACE_Proper_Import_Flag
-#    define PLANNER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_STUB_BUILD_DLL */
-#else /* PLANNER_STUB_HAS_DLL == 1 */
-#  define PLANNER_STUB_Export
-#  define PLANNER_STUB_SINGLETON_DECLARATION(T)
-#  define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_STUB_HAS_DLL == 1 */
-
-// Set PLANNER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_STUB_NTRACE */
-
-#if (PLANNER_STUB_NTRACE == 1)
-#  define PLANNER_STUB_TRACE(X)
-#else /* (PLANNER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_STUB_NTRACE == 1) */
-
-#endif /* PLANNER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/Base/Planner_svnt_export.h b/CIAO/RACE/Planners/Base/Planner_svnt_export.h
deleted file mode 100644
index 1773748e72b..00000000000
--- a/CIAO/RACE/Planners/Base/Planner_svnt_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 PLANNER_SVNT
-// ------------------------------
-#ifndef PLANNER_SVNT_EXPORT_H
-#define PLANNER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_SVNT_HAS_DLL)
-#  define PLANNER_SVNT_HAS_DLL 1
-#endif /* ! PLANNER_SVNT_HAS_DLL */
-
-#if defined (PLANNER_SVNT_HAS_DLL) && (PLANNER_SVNT_HAS_DLL == 1)
-#  if defined (PLANNER_SVNT_BUILD_DLL)
-#    define PLANNER_SVNT_Export ACE_Proper_Export_Flag
-#    define PLANNER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_SVNT_BUILD_DLL */
-#    define PLANNER_SVNT_Export ACE_Proper_Import_Flag
-#    define PLANNER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_SVNT_BUILD_DLL */
-#else /* PLANNER_SVNT_HAS_DLL == 1 */
-#  define PLANNER_SVNT_Export
-#  define PLANNER_SVNT_SINGLETON_DECLARATION(T)
-#  define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_SVNT_HAS_DLL == 1 */
-
-// Set PLANNER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_SVNT_NTRACE */
-
-#if (PLANNER_SVNT_NTRACE == 1)
-#  define PLANNER_SVNT_TRACE(X)
-#else /* (PLANNER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_SVNT_NTRACE == 1) */
-
-#endif /* PLANNER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/Interface/Planner_I.idl b/CIAO/RACE/Planners/Interface/Planner_I.idl
deleted file mode 100644
index 954a61f5269..00000000000
--- a/CIAO/RACE/Planners/Interface/Planner_I.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-#ifndef RACE_PLANNER_I_IDL
-#define RACE_PLANNER_I_IDL
-
-#ifndef INCLUDED_DEPLOYMENT_DATA
-#define INCLUDED_DEPLOYMENT_DATA
-#include "Deployment_DeploymentPlan.idl"
-#endif
-
-module CIAO
-{
-
-  module RACE
-  {
-    interface Planner_I
-    {
-      boolean process_plan (inout Deployment::DeploymentPlan plan);
-    };
-  };
-};
-
-#endif /* RACE_PLANNER_I_IDL */
diff --git a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc b/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
deleted file mode 100644
index 3549de0fa64..00000000000
--- a/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n Planner_I"
-
-project(Planner_Interface_stub): ciao_deployment_stub {
-
-  sharedname = Planner_Interface_stub
-  idlflags += -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
-  dynamicflags   = PLANNER_INTERFACE_STUB_BUILD_DLL
-
-  IDL_Files {
-    Planner_I.idl
-  }
-
-  Source_Files {
-    Planner_IC.cpp
-  }
-
-  Header_Files {
-    Planner_IC.h
-  }
-
-  Inline_Files {
-    Planner_IC.inl
-  }
-}
-
-project(Planner_Interface_svnt) : ciao_servant_dnc {
-
-  after +=  Planner_Interface_stub
-  sharedname  = Planner_Interface_svnt
-  libs    += Planner_Interface_stub
-
-  idlflags += -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
-  dynamicflags = PLANNER_INTERFACE_SVNT_BUILD_DLL
-
-  IDL_Files {
-    Planner_I.idl
-  }
-
-  Source_Files {
-    Planner_IS.cpp
-  }
-
-  Header_Files {
-    Planner_IS.h
-  }
-
-  Inline_Files {
-    Planner_IS.inl
-  }
-}
diff --git a/CIAO/RACE/Planners/Interface/Planner_Interface_stub_export.h b/CIAO/RACE/Planners/Interface/Planner_Interface_stub_export.h
deleted file mode 100644
index 70e6da56ba0..00000000000
--- a/CIAO/RACE/Planners/Interface/Planner_Interface_stub_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 PLANNER_INTERFACE_STUB
-// ------------------------------
-#ifndef PLANNER_INTERFACE_STUB_EXPORT_H
-#define PLANNER_INTERFACE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_INTERFACE_STUB_HAS_DLL)
-#  define PLANNER_INTERFACE_STUB_HAS_DLL 1
-#endif /* ! PLANNER_INTERFACE_STUB_HAS_DLL */
-
-#if defined (PLANNER_INTERFACE_STUB_HAS_DLL) && (PLANNER_INTERFACE_STUB_HAS_DLL == 1)
-#  if defined (PLANNER_INTERFACE_STUB_BUILD_DLL)
-#    define PLANNER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
-#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_INTERFACE_STUB_BUILD_DLL */
-#    define PLANNER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
-#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_INTERFACE_STUB_BUILD_DLL */
-#else /* PLANNER_INTERFACE_STUB_HAS_DLL == 1 */
-#  define PLANNER_INTERFACE_STUB_Export
-#  define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
-#  define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_INTERFACE_STUB_HAS_DLL == 1 */
-
-// Set PLANNER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_INTERFACE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_INTERFACE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_INTERFACE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_INTERFACE_STUB_NTRACE */
-
-#if (PLANNER_INTERFACE_STUB_NTRACE == 1)
-#  define PLANNER_INTERFACE_STUB_TRACE(X)
-#else /* (PLANNER_INTERFACE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_INTERFACE_STUB_NTRACE == 1) */
-
-#endif /* PLANNER_INTERFACE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_export.h b/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_export.h
deleted file mode 100644
index 5ff8283551c..00000000000
--- a/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_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 PLANNER_INTERFACE_SVNT
-// ------------------------------
-#ifndef PLANNER_INTERFACE_SVNT_EXPORT_H
-#define PLANNER_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PLANNER_INTERFACE_SVNT_HAS_DLL)
-#  define PLANNER_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! PLANNER_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (PLANNER_INTERFACE_SVNT_HAS_DLL) && (PLANNER_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (PLANNER_INTERFACE_SVNT_BUILD_DLL)
-#    define PLANNER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PLANNER_INTERFACE_SVNT_BUILD_DLL */
-#    define PLANNER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PLANNER_INTERFACE_SVNT_BUILD_DLL */
-#else /* PLANNER_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define PLANNER_INTERFACE_SVNT_Export
-#  define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PLANNER_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set PLANNER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PLANNER_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PLANNER_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PLANNER_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PLANNER_INTERFACE_SVNT_NTRACE */
-
-#if (PLANNER_INTERFACE_SVNT_NTRACE == 1)
-#  define PLANNER_INTERFACE_SVNT_TRACE(X)
-#else /* (PLANNER_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PLANNER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PLANNER_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* PLANNER_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl
deleted file mode 100644
index a3ddd75b824..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl
+++ /dev/null
@@ -1,25 +0,0 @@
-//SimpleBinPacker.cidl
-// $Id$
-
-#ifndef RACE_SIMPLE_BIN_PACKER_CIDL
-#define RACE_SIMPLE_BIN_PACKER_CIDL
-
-#include "SimpleBinPacker.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session SimpleBinPacker_Impl
-    {
-      home executor SimpleBinPacker_Home_Exec
-        {
-          implements RACE::SimpleBinPacker_Home;
-          manages    SimpleBinPacker_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_SIMPLE_BIN_PACKER_CIDL */
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
deleted file mode 100644
index bb1a67e4a79..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-//$Id$
-
-#ifndef RACE_SIMPLE_BIN_PACKER_IDL
-#define RACE_SIMPLE_BIN_PACKER_IDL
-
-#include <Components.idl>
-#include "../Base/Planner.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    component SimpleBinPacker : Planner
-    {
-    };
-    
-    home SimpleBinPacker_Home manages SimpleBinPacker
-    {
-    };
-  };
-};
-
-#endif /* RACE_SIMPLE_BIN_PACKER_IDL */
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
deleted file mode 100644
index 149f735b073..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
+++ /dev/null
@@ -1,100 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -p Planner_Interface SimpleBinPacker"
-
-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 \
-              -Wb,stub_export_include=SimpleBinPacker_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEBINPACKER_SVNT_Export \
-              -Wb,skel_export_include=SimpleBinPacker_svnt_export.h
-  dynamicflags   = SIMPLEBINPACKER_STUB_BUILD_DLL
-  libs += Planner_Interface_stub Planner_stub RACE_common_stub
-
-  IDL_Files {
-    SimpleBinPacker.idl
-  }
-
-  Source_Files {
-    SimpleBinPackerC.cpp
-  }
-
-  Header_Files {
-    SimpleBinPackerC.h
-  }
-
-  Inline_Files {
-    SimpleBinPackerC.inl
-  }
-}
-
-project(SimpleBinPacker_svnt) : ciao_servant_dnc {
-  after += Planner_Interface_svnt \
-           SimpleBinPacker_stub \
-           Planner_svnt
-  sharedname  = SimpleBinPacker_svnt
-  libs    += SimpleBinPacker_stub \
-             Planner_Interface_stub \
-             Planner_Interface_svnt \
-             Planner_stub \
-             Planner_svnt \
-             RACE_common_stub
-  idlflags  +=  -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \
-                -Wb,export_include=SimpleBinPacker_svnt_export.h
-
-  dynamicflags = SIMPLEBINPACKER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    SimpleBinPacker.cidl
-  }
-
-  IDL_Files {
-    SimpleBinPackerE.idl
-  }
-
-  Source_Files {
-    SimpleBinPackerEC.cpp
-    SimpleBinPackerS.cpp
-    SimpleBinPacker_svnt.cpp
-  }
-
-  Header_Files {
-    SimpleBinPackerEC.h
-    SimpleBinPackerS.h
-    SimpleBinPacker_svnt.h
-  }
-
-  Inline_Files {
-    SimpleBinPackerEC.inl
-    SimpleBinPackerS.inl
-    SimpleBinPacker_svnt.inl
-  }
-}
-
-
-project(SimpleBinPacker_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
-  after   += SimpleBinPacker_svnt
-  sharedname = SimpleBinPacker_exec
-  libs      += SimpleBinPacker_stub \
-               SimpleBinPacker_svnt \
-               Planner_Interface_stub \
-               Planner_Interface_svnt \
-               Planner_stub \
-               Planner_svnt \
-               RACE_common_stub
-
-  idlflags  +=  -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \
-                -Wb,export_include=SimpleBinPacker_exec_export.h
-  dynamicflags   = SIMPLEBINPACKER_EXEC_BUILD_DLL
-
-  IDL_Files {
-
-  }
-
-  Source_Files {
-    SimpleBinPacker_exec.cpp
-  }
-}
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
deleted file mode 100644
index ad3370c4366..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleBinPacker_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_SimpleBinPacker_Impl
-    {
-      //==================================================================
-      // Facet Executor Implementation Class:   Planner_I_exec_i
-      //==================================================================
-
-      Planner_I_exec_i::Planner_I_exec_i (void)
-      {
-      }
-
-      Planner_I_exec_i::~Planner_I_exec_i (void)
-      {
-      }
-
-      // Operations from ::CIAO::RACE::Planner_I
-
-      ::CORBA::Boolean
-      Planner_I_exec_i::process_plan (
-      ::Deployment::DeploymentPlan & /* plan */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return false;
-      }
-
-      //==================================================================
-      // Component Executor Implementation Class:   SimpleBinPacker_exec_i
-      //==================================================================
-
-      SimpleBinPacker_exec_i::SimpleBinPacker_exec_i (void)
-      {
-      }
-
-      SimpleBinPacker_exec_i::~SimpleBinPacker_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Attribute operations.
-
-      char *
-      SimpleBinPacker_exec_i::name ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0;
-      }
-
-      void
-      SimpleBinPacker_exec_i::name (
-      const char * /* name */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-      }
-
-      char *
-      SimpleBinPacker_exec_i::type ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0;
-      }
-
-      void
-      SimpleBinPacker_exec_i::type (
-      const char * /* type */)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-      }
-
-      // Port operations.
-
-      ::CIAO::RACE::CCM_Planner_I_ptr
-      SimpleBinPacker_exec_i::get_planner_i ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return ::CIAO::RACE::CCM_Planner_I::_nil ();
-      }
-
-      // Operations from Components::SessionComponent
-
-      void
-      SimpleBinPacker_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        this->context_ =
-        SimpleBinPacker_Context::_narrow (
-        ctx);
-
-        if (this->context_ == 0)
-        {
-          throw CORBA::INTERNAL ();
-        }
-      }
-
-      void
-      SimpleBinPacker_exec_i::ciao_preactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      SimpleBinPacker_exec_i::ciao_postactivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      SimpleBinPacker_exec_i::ccm_activate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      SimpleBinPacker_exec_i::ccm_passivate ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      SimpleBinPacker_exec_i::ccm_remove ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   SimpleBinPacker_Home_exec_i
-      //==================================================================
-
-      SimpleBinPacker_Home_exec_i::SimpleBinPacker_Home_exec_i (void)
-      {
-      }
-
-      SimpleBinPacker_Home_exec_i::~SimpleBinPacker_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      SimpleBinPacker_Home_exec_i::create ()
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-        retval,
-        SimpleBinPacker_exec_i,
-        CORBA::NO_MEMORY ());
-
-        return retval;
-      }
-
-      extern "C" SIMPLEBINPACKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createSimpleBinPacker_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-        retval,
-        SimpleBinPacker_Home_exec_i,
-        ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
-
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
deleted file mode 100644
index b0b70703c79..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
+++ /dev/null
@@ -1,170 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEBINPACKER_EXEC_H
-#define CIAO_SIMPLEBINPACKER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleBinPacker_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleBinPacker_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_SimpleBinPacker_Impl
-    {
-      class SIMPLEBINPACKER_EXEC_Export Planner_I_exec_i
-      : public virtual ::CIAO::RACE::CCM_Planner_I,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Planner_I_exec_i (void);
-        virtual ~Planner_I_exec_i (void);
-
-        // Operations from ::CIAO::RACE::Planner_I
-
-        virtual ::CORBA::Boolean
-        process_plan (
-        ::Deployment::DeploymentPlan & plan)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      };
-
-      class SIMPLEBINPACKER_EXEC_Export SimpleBinPacker_exec_i
-      : public virtual SimpleBinPacker_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        SimpleBinPacker_exec_i (void);
-        virtual ~SimpleBinPacker_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Attribute operations.
-
-        virtual char *
-        name ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        virtual void
-        name (
-        const char *)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        virtual char *
-        type ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        virtual void
-        type (
-        const char *)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Port operations.
-
-        virtual ::CIAO::RACE::CCM_Planner_I_ptr
-        get_planner_i ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Operations from Components::SessionComponent
-
-        virtual void
-        set_session_context (
-        ::Components::SessionContext_ptr ctx)
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_preactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ciao_postactivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_activate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_passivate ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        virtual void
-        ccm_remove ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-
-        protected:
-        SimpleBinPacker_Context *context_;
-      };
-
-      class SIMPLEBINPACKER_EXEC_Export SimpleBinPacker_Home_exec_i
-      : public virtual SimpleBinPacker_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        SimpleBinPacker_Home_exec_i (void);
-        virtual ~SimpleBinPacker_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
-        ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::CCMException));
-      };
-
-      extern "C" SIMPLEBINPACKER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      createSimpleBinPacker_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEBINPACKER_EXEC_H */
-
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h
deleted file mode 100644
index 48c6c1ee4d3..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_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 SIMPLEBINPACKER_EXEC
-// ------------------------------
-#ifndef SIMPLEBINPACKER_EXEC_EXPORT_H
-#define SIMPLEBINPACKER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SIMPLEBINPACKER_EXEC_HAS_DLL)
-#  define SIMPLEBINPACKER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEBINPACKER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEBINPACKER_EXEC_HAS_DLL) && (SIMPLEBINPACKER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEBINPACKER_EXEC_BUILD_DLL)
-#    define SIMPLEBINPACKER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEBINPACKER_EXEC_BUILD_DLL */
-#    define SIMPLEBINPACKER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEBINPACKER_EXEC_BUILD_DLL */
-#else /* SIMPLEBINPACKER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEBINPACKER_EXEC_Export
-#  define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEBINPACKER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEBINPACKER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEBINPACKER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEBINPACKER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEBINPACKER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEBINPACKER_EXEC_NTRACE */
-
-#if (SIMPLEBINPACKER_EXEC_NTRACE == 1)
-#  define SIMPLEBINPACKER_EXEC_TRACE(X)
-#else /* (SIMPLEBINPACKER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEBINPACKER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEBINPACKER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEBINPACKER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h
deleted file mode 100644
index eae6bd3e06b..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_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 SIMPLEBINPACKER_STUB
-// ------------------------------
-#ifndef SIMPLEBINPACKER_STUB_EXPORT_H
-#define SIMPLEBINPACKER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SIMPLEBINPACKER_STUB_HAS_DLL)
-#  define SIMPLEBINPACKER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEBINPACKER_STUB_HAS_DLL */
-
-#if defined (SIMPLEBINPACKER_STUB_HAS_DLL) && (SIMPLEBINPACKER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEBINPACKER_STUB_BUILD_DLL)
-#    define SIMPLEBINPACKER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEBINPACKER_STUB_BUILD_DLL */
-#    define SIMPLEBINPACKER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEBINPACKER_STUB_BUILD_DLL */
-#else /* SIMPLEBINPACKER_STUB_HAS_DLL == 1 */
-#  define SIMPLEBINPACKER_STUB_Export
-#  define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEBINPACKER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEBINPACKER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEBINPACKER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEBINPACKER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEBINPACKER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEBINPACKER_STUB_NTRACE */
-
-#if (SIMPLEBINPACKER_STUB_NTRACE == 1)
-#  define SIMPLEBINPACKER_STUB_TRACE(X)
-#else /* (SIMPLEBINPACKER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEBINPACKER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEBINPACKER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEBINPACKER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h
deleted file mode 100644
index 1b97afc372e..00000000000
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_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 SIMPLEBINPACKER_SVNT
-// ------------------------------
-#ifndef SIMPLEBINPACKER_SVNT_EXPORT_H
-#define SIMPLEBINPACKER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (SIMPLEBINPACKER_SVNT_HAS_DLL)
-#  define SIMPLEBINPACKER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEBINPACKER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEBINPACKER_SVNT_HAS_DLL) && (SIMPLEBINPACKER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEBINPACKER_SVNT_BUILD_DLL)
-#    define SIMPLEBINPACKER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEBINPACKER_SVNT_BUILD_DLL */
-#    define SIMPLEBINPACKER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEBINPACKER_SVNT_BUILD_DLL */
-#else /* SIMPLEBINPACKER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEBINPACKER_SVNT_Export
-#  define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEBINPACKER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEBINPACKER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEBINPACKER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEBINPACKER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEBINPACKER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEBINPACKER_SVNT_NTRACE */
-
-#if (SIMPLEBINPACKER_SVNT_NTRACE == 1)
-#  define SIMPLEBINPACKER_SVNT_TRACE(X)
-#else /* (SIMPLEBINPACKER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEBINPACKER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEBINPACKER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEBINPACKER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/common/RACE_common.idl b/CIAO/RACE/common/RACE_common.idl
deleted file mode 100644
index ec712c402e9..00000000000
--- a/CIAO/RACE/common/RACE_common.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-//$Id$
-#ifndef RACE_COMMON_IDL
-#define RACE_COMMON_IDL
-
-#include "tao/StringSeq.pidl"
-
-module CIAO
-{
-  module RACE
-    {
-      typedef string RACE_Classification;
-      typedef sequence <RACE_Classification> RACE_Classifications;
-      typedef CORBA::StringSeq PlannerFlow;
-    };
-};
-
-#endif /* RACE_COMMON_IDL */
diff --git a/CIAO/RACE/common/RACE_common.mpc b/CIAO/RACE/common/RACE_common.mpc
deleted file mode 100644
index 38253d218d7..00000000000
--- a/CIAO/RACE/common/RACE_common.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//$Id$
-// This file is generated with "generate_component_mpc.pl -n RACE_common"
-
-project(RACE_common_stub): taolib_with_idl, anytypecode {
-
-  sharedname = RACE_common_stub
-  idlflags += -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
-  dynamicflags   = RACE_COMMON_STUB_BUILD_DLL
-
-  IDL_Files {
-    RACE_common.idl
-  }
-
-  Source_Files {
-    RACE_commonC.cpp
-  }
-
-  Header_Files {
-    RACE_commonC.h
-  }
-
-  Inline_Files {
-    RACE_commonC.inl
-  }
-}
-
-// project(RACE_common_svnt) : ciao_servant_dnc {
-
-//   after +=  RACE_common_stub
-//   sharedname  = RACE_common_svnt
-//   libs    += RACE_common_stub
-
-//   idlflags += -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
-//   dynamicflags = RACE_COMMON_SVNT_BUILD_DLL
-
-//   IDL_Files {
-//     RACE_common.idl
-//   }
-
-//   Source_Files {
-//     RACE_commonS.cpp
-//   }
-
-//   Header_Files {
-//     RACE_commonS.h
-//   }
-
-//   Inline_Files {
-//     RACE_commonS.inl
-//   }
-// }
diff --git a/CIAO/RACE/common/RACE_common_stub_export.h b/CIAO/RACE/common/RACE_common_stub_export.h
deleted file mode 100644
index d6c33fc61f6..00000000000
--- a/CIAO/RACE/common/RACE_common_stub_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 RACE_COMMON_STUB
-// ------------------------------
-#ifndef RACE_COMMON_STUB_EXPORT_H
-#define RACE_COMMON_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RACE_COMMON_STUB_HAS_DLL)
-#  define RACE_COMMON_STUB_HAS_DLL 1
-#endif /* ! RACE_COMMON_STUB_HAS_DLL */
-
-#if defined (RACE_COMMON_STUB_HAS_DLL) && (RACE_COMMON_STUB_HAS_DLL == 1)
-#  if defined (RACE_COMMON_STUB_BUILD_DLL)
-#    define RACE_COMMON_STUB_Export ACE_Proper_Export_Flag
-#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RACE_COMMON_STUB_BUILD_DLL */
-#    define RACE_COMMON_STUB_Export ACE_Proper_Import_Flag
-#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RACE_COMMON_STUB_BUILD_DLL */
-#else /* RACE_COMMON_STUB_HAS_DLL == 1 */
-#  define RACE_COMMON_STUB_Export
-#  define RACE_COMMON_STUB_SINGLETON_DECLARATION(T)
-#  define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RACE_COMMON_STUB_HAS_DLL == 1 */
-
-// Set RACE_COMMON_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RACE_COMMON_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RACE_COMMON_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RACE_COMMON_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RACE_COMMON_STUB_NTRACE */
-
-#if (RACE_COMMON_STUB_NTRACE == 1)
-#  define RACE_COMMON_STUB_TRACE(X)
-#else /* (RACE_COMMON_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RACE_COMMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RACE_COMMON_STUB_NTRACE == 1) */
-
-#endif /* RACE_COMMON_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/common/RACE_common_svnt_export.h b/CIAO/RACE/common/RACE_common_svnt_export.h
deleted file mode 100644
index 96790b41c7d..00000000000
--- a/CIAO/RACE/common/RACE_common_svnt_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 RACE_COMMON_SVNT
-// ------------------------------
-#ifndef RACE_COMMON_SVNT_EXPORT_H
-#define RACE_COMMON_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RACE_COMMON_SVNT_HAS_DLL)
-#  define RACE_COMMON_SVNT_HAS_DLL 1
-#endif /* ! RACE_COMMON_SVNT_HAS_DLL */
-
-#if defined (RACE_COMMON_SVNT_HAS_DLL) && (RACE_COMMON_SVNT_HAS_DLL == 1)
-#  if defined (RACE_COMMON_SVNT_BUILD_DLL)
-#    define RACE_COMMON_SVNT_Export ACE_Proper_Export_Flag
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RACE_COMMON_SVNT_BUILD_DLL */
-#    define RACE_COMMON_SVNT_Export ACE_Proper_Import_Flag
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RACE_COMMON_SVNT_BUILD_DLL */
-#else /* RACE_COMMON_SVNT_HAS_DLL == 1 */
-#  define RACE_COMMON_SVNT_Export
-#  define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T)
-#  define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RACE_COMMON_SVNT_HAS_DLL == 1 */
-
-// Set RACE_COMMON_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RACE_COMMON_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RACE_COMMON_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RACE_COMMON_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RACE_COMMON_SVNT_NTRACE */
-
-#if (RACE_COMMON_SVNT_NTRACE == 1)
-#  define RACE_COMMON_SVNT_TRACE(X)
-#else /* (RACE_COMMON_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RACE_COMMON_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RACE_COMMON_SVNT_NTRACE == 1) */
-
-#endif /* RACE_COMMON_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/RACE/descriptors/Deployment.xsd b/CIAO/RACE/descriptors/Deployment.xsd
deleted file mode 100644
index c8a6399730b..00000000000
--- a/CIAO/RACE/descriptors/Deployment.xsd
+++ /dev/null
@@ -1,776 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xmi="http://www.omg.org/XMI"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-  <xsd:import namespace="http://www.omg.org/XMI" schemaLocation="XMI.xsd" />
-
-
-  <xsd:complexType name="Any">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Any" type="Deployment:Any"/>
-  <xsd:complexType name="DataType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="kind" type="Deployment:TCKind"/>
-      <xsd:element name="enum" type="Deployment:EnumType"/>
-      <xsd:element name="objref" type="Deployment:ObjrefType"/>
-      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
-      <xsd:element name="fixed" type="Deployment:FixedType"/>
-      <xsd:element name="array" type="Deployment:ArrayType"/>
-      <xsd:element name="sequence" type="Deployment:SequenceType"/>
-      <xsd:element name="alias" type="Deployment:AliasType"/>
-      <xsd:element name="struct" type="Deployment:StructType"/>
-      <xsd:element name="value" type="Deployment:ValueType"/>
-      <xsd:element name="union" type="Deployment:UnionType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DataType" type="Deployment:DataType"/>
-  <xsd:complexType name="DataValue">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="short" type="xsd:short"/>
-      <xsd:element name="long" type="xsd:int"/>
-      <xsd:element name="ushort" type="xsd:unsignedShort"/>
-      <xsd:element name="ulong" type="xsd:unsignedInt"/>
-      <xsd:element name="float" type="xsd:float"/>
-      <xsd:element name="double" type="xsd:double"/>
-      <xsd:element name="boolean" type="xsd:boolean"/>
-      <xsd:element name="octet" type="xsd:unsignedByte"/>
-      <xsd:element name="opaque" type="xsd:base64Binary"/>
-      <xsd:element name="objref" type="xsd:string"/>
-      <xsd:element name="enum" type="xsd:string"/>
-      <xsd:element name="string" type="xsd:string"/>
-      <xsd:element name="longlong" type="xsd:long"/>
-      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
-      <xsd:element name="longdouble" type="xsd:double"/>
-      <xsd:element name="fixed" type="xsd:string"/>
-      <xsd:element name="any" type="Deployment:Any"/>
-      <xsd:element name="typecode" type="Deployment:DataType"/>
-      <xsd:element name="element" type="Deployment:DataValue"/>
-      <xsd:element name="discriminator" type="Deployment:DataValue"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>
-      <xsd:element name="boxedValue" type="Deployment:DataValue"/>
-      <xsd:element name="member" type="Deployment:NamedValue"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DataValue" type="Deployment:DataValue"/>
-
-
-  <xsd:complexType name="EnumType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="EnumType" type="Deployment:EnumType"/>
-  <xsd:complexType name="ObjrefType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-
-
-  <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/>
-  <xsd:complexType name="BoundedStringType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/>
-  <xsd:complexType name="FixedType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="FixedType" type="Deployment:FixedType"/>
-  <xsd:complexType name="ArrayType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ArrayType" type="Deployment:ArrayType"/>
-  <xsd:complexType name="SequenceType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SequenceType" type="Deployment:SequenceType"/>
-  <xsd:complexType name="AliasType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AliasType" type="Deployment:AliasType"/>
-  <xsd:complexType name="StructType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="StructType" type="Deployment:StructType"/>
-  <xsd:complexType name="StructMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/>
-  <xsd:complexType name="ValueType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="modifier" type="xsd:string"/>
-      <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ValueType" type="Deployment:ValueType"/>
-  <xsd:complexType name="ValueMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/>
-  <xsd:complexType name="UnionType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="default" type="Deployment:UnionMemberType"/>
-      <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="UnionType" type="Deployment:UnionType"/>
-  <xsd:complexType name="UnionMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/>
-  <xsd:complexType name="NamedValue">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="NamedValue" type="Deployment:NamedValue"/>
-  <xsd:complexType name="Bridge">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="connect" type="Deployment:Interconnect"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Bridge" type="Deployment:Bridge"/>
-  <xsd:complexType name="Interconnect">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="connection" type="Deployment:Bridge"/>
-      <xsd:element name="connect" type="Deployment:Node"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Interconnect" type="Deployment:Interconnect"/>
-  <xsd:complexType name="Node">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="connection" type="Deployment:Interconnect"/>
-      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Node" type="Deployment:Node"/>
-  <xsd:complexType name="Resource">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Resource" type="Deployment:Resource"/>
-  <xsd:complexType name="SharedResource">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SharedResource" type="Deployment:SharedResource"/>
-  <xsd:complexType name="Domain">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="UUID" type="xsd:string"/>  
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
-      <xsd:element name="bridge" type="Deployment:Bridge"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Domain" type="Deployment:Domain"/>
-  <xsd:complexType name="PlanPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/>
-  <xsd:complexType name="PlanSubcomponentPropertyReference">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/>
-  <xsd:complexType name="PlanSubcomponentPortEndpoint">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
-  <xsd:complexType name="PlanConnectionDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
-      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/>
-  <xsd:complexType name="InstanceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>
-      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/>
-  <xsd:complexType name="MonolithicDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/>
-  <xsd:complexType name="ArtifactDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="location" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/>
-
-
-  <xsd:complexType name="DeploymentPlan">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-    <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
-      <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/>
-      <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
-      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/>
-
-
-  <xsd:complexType name="ResourceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/>
-  <xsd:complexType name="InstanceResourceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/>
-  <xsd:complexType name="ConnectionResourceDeploymentDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="targetName" type="xsd:string"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/>
-  <xsd:complexType name="Capability">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Capability" type="Deployment:Capability"/>
-  <xsd:complexType name="ComponentPropertyDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/>
-  <xsd:complexType name="ComponentPortDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <xsd:element name="exclusiveProvider" type="xsd:string"/>
-      <xsd:element name="exclusiveUser" type="xsd:string"/>
-      <xsd:element name="optional" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/>
-  <xsd:complexType name="ComponentInterfaceDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="idlFile" type="xsd:string"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>
-      <xsd:element name="port" type="Deployment:ComponentPortDescription"/>
-      <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:complexType name="ImplementationArtifactDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="location" type="xsd:string"/>
-      <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/>
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/>
-  <xsd:complexType name="AssemblyPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/>
-  <xsd:complexType name="SubcomponentPropertyReference">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/>
-  <xsd:complexType name="SubcomponentPortEndpoint">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
-  <xsd:complexType name="AssemblyConnectionDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
-      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/>
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/>
-  <xsd:complexType name="ComponentAssemblyDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
-      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/>
-  <xsd:complexType name="ComponentImplementationDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
-      <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>
-      <xsd:element name="capability" type="Deployment:Capability"/>
-      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:complexType name="ComponentPackageReference">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="requiredUUID" type="xsd:string"/>
-      <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/>
-  <xsd:complexType name="ComponentPackageDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>
-      <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:complexType name="PackageConfiguration">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>
-      <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
-      <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:complexType name="PackagedComponentImplementation">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/>
-  <xsd:complexType name="NamedImplementationArtifact">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/>
-  <xsd:complexType name="ImplementationRequirement">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="resourcePort" type="xsd:string"/>
-      <xsd:element name="componentPort" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/>
-  <xsd:complexType name="RequirementSatisfier">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/>
-  <xsd:complexType name="SatisfierProperty">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/>
-  <xsd:complexType name="Requirement">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Requirement" type="Deployment:Requirement"/>
-  <xsd:complexType name="Property">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="Property" type="Deployment:Property"/>
-  <xsd:complexType name="ExternalReferenceEndpoint">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="location" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/>
-  <xsd:complexType name="ComponentExternalPortEndpoint">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="portName" type="xsd:string"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
-  <xsd:complexType name="ImplementationDependency">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="requiredType" type="xsd:string"/>     
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/>
-  <xsd:complexType name="TopLevelPackageDescription">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="package" type="Deployment:PackageConfiguration"/>      
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-  <xsd:simpleType name="TCKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="tk_null"/>
-      <xsd:enumeration value="tk_void"/>
-      <xsd:enumeration value="tk_short"/>
-      <xsd:enumeration value="tk_long"/>
-      <xsd:enumeration value="tk_ushort"/>
-      <xsd:enumeration value="tk_ulong"/>
-      <xsd:enumeration value="tk_float"/>
-      <xsd:enumeration value="tk_double"/>
-      <xsd:enumeration value="tk_boolean"/>
-      <xsd:enumeration value="tk_char"/>
-      <xsd:enumeration value="tk_octet"/>
-      <xsd:enumeration value="tk_any"/>
-      <xsd:enumeration value="tk_TypeCode"/>
-      <xsd:enumeration value="tk_Principal"/>
-      <xsd:enumeration value="tk_objref"/>
-      <xsd:enumeration value="tk_struct"/>
-      <xsd:enumeration value="tk_union"/>
-      <xsd:enumeration value="tk_enum"/>
-      <xsd:enumeration value="tk_string"/>
-      <xsd:enumeration value="tk_sequence"/>
-      <xsd:enumeration value="tk_array"/>
-      <xsd:enumeration value="tk_alias"/>
-      <xsd:enumeration value="tk_except"/>
-      <xsd:enumeration value="tk_longlong"/>
-      <xsd:enumeration value="tk_ulonglong"/>
-      <xsd:enumeration value="tk_longdouble"/>
-      <xsd:enumeration value="tk_wchar"/>
-      <xsd:enumeration value="tk_wstring"/>
-      <xsd:enumeration value="tk_wfixed"/>
-      <xsd:enumeration value="tk_value"/>
-      <xsd:enumeration value="tk_value_box"/>
-      <xsd:enumeration value="tk_native"/>
-      <xsd:enumeration value="tk_abstract_interface"/>
-      <xsd:enumeration value="tk_local_interface"/>
-      <xsd:enumeration value="tk_component"/>
-      <xsd:enumeration value="tk_home"/>
-      <xsd:enumeration value="tk_event"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ResourceUsageKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="None"/>
-      <xsd:enumeration value="InstanceUsesResource"/>
-      <xsd:enumeration value="ResourceUsesInstance"/>
-      <xsd:enumeration value="PortUsesResource"/>
-      <xsd:enumeration value="ResourceUsesPort"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="CCMComponentPortKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Facet"/>
-      <xsd:enumeration value="SimplexReceptacle"/>
-      <xsd:enumeration value="MultiplexReceptacle"/>
-      <xsd:enumeration value="EventEmitter"/>
-      <xsd:enumeration value="EventPublisher"/>
-      <xsd:enumeration value="EventConsumer"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="SatisfierPropertyKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Quantity"/>
-      <xsd:enumeration value="Capacity"/>
-      <xsd:enumeration value="Minimum"/>
-      <xsd:enumeration value="Maximum"/>
-      <xsd:enumeration value="Attribute"/>
-      <xsd:enumeration value="Selection"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/CIAO/RACE/descriptors/Modified_Deployment.xsd b/CIAO/RACE/descriptors/Modified_Deployment.xsd
deleted file mode 100644
index b73077b0980..00000000000
--- a/CIAO/RACE/descriptors/Modified_Deployment.xsd
+++ /dev/null
@@ -1,790 +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:simpleType name="TCKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="tk_null"/>
-      <xsd:enumeration value="tk_void"/>
-      <xsd:enumeration value="tk_short"/>
-      <xsd:enumeration value="tk_long"/>
-      <xsd:enumeration value="tk_ushort"/>
-      <xsd:enumeration value="tk_ulong"/>
-      <xsd:enumeration value="tk_float"/>
-      <xsd:enumeration value="tk_double"/>
-      <xsd:enumeration value="tk_boolean"/>
-      <xsd:enumeration value="tk_char"/>
-      <xsd:enumeration value="tk_octet"/>
-      <xsd:enumeration value="tk_any"/>
-      <xsd:enumeration value="tk_TypeCode"/>
-      <xsd:enumeration value="tk_Principal"/>
-      <xsd:enumeration value="tk_objref"/>
-      <xsd:enumeration value="tk_struct"/>
-      <xsd:enumeration value="tk_union"/>
-      <xsd:enumeration value="tk_enum"/>
-      <xsd:enumeration value="tk_string"/>
-      <xsd:enumeration value="tk_sequence"/>
-      <xsd:enumeration value="tk_array"/>
-      <xsd:enumeration value="tk_alias"/>
-      <xsd:enumeration value="tk_except"/>
-      <xsd:enumeration value="tk_longlong"/>
-      <xsd:enumeration value="tk_ulonglong"/>
-      <xsd:enumeration value="tk_longdouble"/>
-      <xsd:enumeration value="tk_wchar"/>
-      <xsd:enumeration value="tk_wstring"/>
-      <xsd:enumeration value="tk_wfixed"/>
-      <xsd:enumeration value="tk_value"/>
-      <xsd:enumeration value="tk_value_box"/>
-      <xsd:enumeration value="tk_native"/>
-      <xsd:enumeration value="tk_abstract_interface"/>
-      <xsd:enumeration value="tk_local_interface"/>
-      <xsd:enumeration value="tk_component"/>
-      <xsd:enumeration value="tk_home"/>
-      <xsd:enumeration value="tk_event"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="DataType">
-    <xsd:choice>
-      <xsd:element name="kind" type="Deployment:TCKind"/>
-<!--      
-@@ not used, what for?
-
-      <xsd:element name="enum" type="Deployment:EnumType"/>
-      <xsd:element name="objref" type="Deployment:ObjrefType"/>
-      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
-      <xsd:element name="fixed" type="Deployment:FixedType"/>
-      <xsd:element name="array" type="Deployment:ArrayType"/>
-      <xsd:element name="sequence" type="Deployment:SequenceType"/>
-      <xsd:element name="alias" type="Deployment:AliasType"/>
-      <xsd:element name="struct" type="Deployment:StructType"/>
-      <xsd:element name="value" type="Deployment:ValueType"/>
-      <xsd:element name="union" type="Deployment:UnionType"/>
--->
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="DataValue">
-    <xsd:choice>
-      <xsd:element name="short" type="xsd:short"/>
-      <xsd:element name="long" type="xsd:int"/>
-      <xsd:element name="ushort" type="xsd:unsignedShort"/>
-      <xsd:element name="ulong" type="xsd:unsignedInt"/>
-      <xsd:element name="float" type="xsd:float"/>
-      <xsd:element name="double" type="xsd:double"/>
-      <xsd:element name="boolean" type="xsd:boolean"/>
-      <xsd:element name="octet" type="xsd:unsignedByte"/>
-      <!-- xsd:element name="opaque" type="xsd:base64Binary"/ -->
-      <xsd:element name="objref" type="xsd:string"/>
-      <xsd:element name="enum" type="xsd:string"/>
-      <xsd:element name="string" type="xsd:string"/>
-      <xsd:element name="longlong" type="xsd:long"/>
-      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
-      <xsd:element name="longdouble" type="xsd:double"/>
-      <xsd:element name="fixed" type="xsd:string"/>
-
-<!--
-@@ recursive
-      <xsd:element name="any" type="Deployment:Any"/>
--->
-
-      <xsd:element name="typecode" type="Deployment:DataType"/>
-
-<!--
-@@ recursive
-      <xsd:element name="element" type="Deployment:DataValue"/>
-      <xsd:element name="discriminator" type="Deployment:DataValue"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>
-      <xsd:element name="boxedValue" type="Deployment:DataValue"/>
-      <xsd:element name="member" type="Deployment:NamedValue"/>
--->
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Any">
-    <xsd:sequence>
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Property">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- End of base definitions. -->
-  
-  <xsd:complexType name="Node">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-<!--
-@@ recursive, not used
-      <xsd:element name="connection" type="Deployment:Interconnect"/>
-      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
--->
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:simpleType name="SatisfierPropertyKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Quantity"/>
-      <xsd:enumeration value="Capacity"/>
-      <xsd:enumeration value="Minimum"/>
-      <xsd:enumeration value="Maximum"/>
-      <xsd:enumeration value="Attribute"/>
-      <xsd:enumeration value="Selection"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="SatisfierProperty">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Resource">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SharedResource">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Domain">
-    <xsd:sequence>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>       
-      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/>
-      <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/>
-<!--
-@@ recursive, not used
-      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
-      <xsd:element name="bridge" type="Deployment:Bridge"/>
--->
-      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Requirement">
-    <xsd:sequence>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- Deployment -->
-
-  <xsd:complexType name="ResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ArtifactDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="MonolithicDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="artifact" type="xsd:IDREF" maxOccurs="unbounded"/> <!-- ArtifactDeploymentDescription -->
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="ResourceUsageKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="None"/>
-      <xsd:enumeration value="InstanceUsesResource"/>
-      <xsd:enumeration value="ResourceUsesInstance"/>
-      <xsd:enumeration value="PortUsesResource"/>
-      <xsd:enumeration value="ResourceUsesPort"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="InstanceResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="InstanceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:simpleType name="CCMComponentPortKind">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="Facet"/>
-      <xsd:enumeration value="SimplexReceptacle"/>
-      <xsd:enumeration value="MultiplexReceptacle"/>
-      <xsd:enumeration value="EventEmitter"/>
-      <xsd:enumeration value="EventPublisher"/>
-      <xsd:enumeration value="EventConsumer"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-  <xsd:complexType name="ComponentPortDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <xsd:element name="exclusiveProvider" type="xsd:string"/>
-      <xsd:element name="exclusiveUser" type="xsd:string"/>
-      <xsd:element name="optional" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPropertyDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentInterfaceDescription">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="specificType" type="xsd:string"/>
-        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded" />
-        <xsd:element name="idlFile" type="xsd:string" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="port" type="Deployment:ComponentPortDescription" maxOccurs="unbounded"/>
-        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentExternalPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanSubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="xsd:IDREF"/> <!-- InstanceDeploymentDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ExternalReferenceEndpoint">
-    <xsd:sequence>
-      <xsd:element name="location" type="xsd:string"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ConnectionResourceDeploymentDescription">
-    <xsd:sequence>
-      <xsd:element name="targetName" type="xsd:string"/>
-      <xsd:element name="requirementName" type="xsd:string"/>
-      <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationDependency">
-    <xsd:sequence>
-      <xsd:element name="requiredType" type="xsd:string"/>     
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="DeploymentPlan">
-   <xsd:sequence>
-     <xsd:element name="label" type="xsd:string" minOccurs="0"/>
-     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/>     
-     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
-     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-     <!-- potentially recursive, not used
-          <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-     -->
-     <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-     <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-     <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  
-
-
-
-<!-- Implementation -->
-
-
-  <xsd:complexType name="Capability">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="NamedImplementationArtifact">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>     
-      <!-- @@ recursive NIA->IAD->NIA -->
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationArtifactDescription">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-
-        <!-- @@ There probably should be only one location? -->
-        <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-        <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-        <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ImplementationRequirement">
-    <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="resourcePort" type="xsd:string"/>
-      <xsd:element name="componentPort" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <xsd:sequence>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PackagedComponentImplementation">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->   
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPackageDescription">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentPackageReference">
-    <xsd:sequence>
-      <xsd:element name="requiredUUID" type="xsd:string"/>
-      <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentPortEndpoint">
-    <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="xsd:IDREF"/> <!-- SubcomponentInstantiationDescription -->
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="AssemblyConnectionDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="SubcomponentPropertyReference">
-    <xsd:sequence>
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="AssemblyPropertyMapping">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentAssemblyDescription">
-    <xsd:sequence>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/>
-      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> 
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ComponentImplementationDescription">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
-        <xsd:choice>
-          <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
-          <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
-        </xsd:choice>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/>
-        <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-<!-- Package -->
-
-
-  <xsd:complexType name="PackageConfiguration">
-    <xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-<!--
-@@ recursive, not used
-        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
--->
-
-        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
-        <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:element name="contentLocation" type="xsd:string"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="TopLevelPackageDescription">
-    <xsd:sequence>
-      <xsd:element name="package" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- 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"/>
-
-
-
-<!-- VAULT 
-
-Place for strange things. Nobody knows what they are for...
-
--->
-
-<!--
-
-  <xsd:complexType name="EnumType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ObjrefType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="BoundedStringType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="FixedType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="ArrayType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="SequenceType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="AliasType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="StructMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="modifier" type="xsd:string"/>
-      <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="ValueMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="default" type="Deployment:UnionMemberType"/>
-      <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="UnionMemberType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="NamedValue">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="Bridge">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="connect" type="Deployment:Interconnect"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="Interconnect">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="connection" type="Deployment:Bridge"/>
-      <xsd:element name="connect" type="Deployment:Node"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="PlanPropertyMapping">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-  <xsd:complexType name="PlanSubcomponentPropertyReference">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
-    </xsd:choice>
-  </xsd:complexType>
-
--->
-
-<!--
-
-  This type is not referenced anywhere. 
-
-  <xsd:complexType name="RequirementSatisfier">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
-    </xsd:choice>
-  </xsd:complexType>
-
--->
-
-</xsd:schema>
diff --git a/CIAO/RACE/descriptors/XMI.xsd b/CIAO/RACE/descriptors/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/CIAO/RACE/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/RACE/descriptors/deployment.dat b/CIAO/RACE/descriptors/deployment.dat
deleted file mode 100644
index d0aec354bad..00000000000
--- a/CIAO/RACE/descriptors/deployment.dat
+++ /dev/null
@@ -1 +0,0 @@
-SoleNode      corbaloc:iiop:localhost:30000/NodeManager
diff --git a/CIAO/RACE/descriptors/flattened_deploymentplan.cdp b/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
deleted file mode 100644
index 0648c10eab8..00000000000
--- a/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
+++ /dev/null
@@ -1,361 +0,0 @@
-<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 Modified_Deployment.xsd">
-
-  <label>DeploymentManager-DeploymentPlan</label>
-  <!-- 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>deployment_stage_port</name>
-      <specificType>IDL:RACE/deployment_stage:1.0</specificType>
-      <supportedType>IDL:RACE/deployment_stage:1.0</supportedType>
-      <provider>false></provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="RACE-Interactive_Input_Adapter-mdd">
-    <name>RACE-Interactive_Input_Adapter-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>RACE-Interactive_Input_Adapter_exec</artifact>
-    <artifact>RACE-Interactive_Input_Adapter_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="RACE-Plan_Analyzer-mdd">
-    <name>RACE-Plan_Analyzer-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>RACE-Plan_Analyzer_exec</artifact>
-    <artifact>RACE-Plan_Analyzer_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="RACE-Planner_Manager-mdd">
-    <name>RACE-Planner_Manager-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>RACE-Planner_Manager_exec</artifact>
-    <artifact>RACE-Planner_Manager_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="RACE-SimpleBinPacker-mdd">
-    <name>RACE-SimpleBinPacker-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>RACE-SimpleBinPacker_exec</artifact>
-    <artifact>RACE-SimpleBinPacker_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="RACE-XML_Output_Adapter-mdd">
-    <name>RACE-XML_Output_Adapter-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>RACE-XML_Output_Adapter_exec</artifact>
-    <artifact>RACE-XML_Output_Adapter_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="RACE-Interactive_Input_Adapter-idd">
-    <name>RACE-Interactive_Input_Adapter-idd</name>
-    <node>SoleNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>RACE-Interactive_Input_Adapter-mdd</implementation>
-  </instance>
-
-  <instance id="RACE-Plan_Analyzer-idd">
-    <name>RACE-Plan_Analyzer-idd</name>
-    <node>SoleNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>RACE-Plan_Analyzer-mdd</implementation>
-  </instance>
-
-  <instance id="RACE-Planner_Manager-idd">
-    <name>RACE-Planner_Manager-idd</name>
-    <node>SoleNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>RACE-Planner_Manager-mdd</implementation>
-  </instance>
-
-  <instance id="RACE-SimpleBinPacker-idd">
-    <name>RACE-SimpleBinPacker-idd</name>
-    <node>SoleNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>RACE-SimpleBinPacker-mdd</implementation>
-  </instance>
-
-  <instance id="RACE-XML_Output_Adapter-idd">
-    <name>RACE-XML_Output_Adapter-idd</name>
-    <node>SoleNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>RACE-XML_Output_Adapter-mdd</implementation>
-  </instance>
-
-  <!-- BEGIN Connections -->
-
-  <connection>
-    <name>forward_Plan_Analyzer</name>
-    <internalEndpoint>
-      <portName>plan_ingress</portName>
-      <kind>Facet</kind>
-      <instance>RACE-Plan_Analyzer-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>ingress</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>RACE-Interactive_Input_Adapter-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>forward_Planner_Manager</name>
-    <internalEndpoint>
-      <portName>planner_manager_i</portName>
-      <kind>Facet</kind>
-      <instance>RACE-Planner_Manager-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>planner_manager_i</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>RACE-Plan_Analyzer-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>access_SimpleBinPacker</name>
-    <internalEndpoint>
-      <portName>planner_i</portName>
-      <kind>Facet</kind>
-      <instance>RACE-SimpleBinPacker-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>planners</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>RACE-Planner_Manager-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>forward_XML_Output_Adapter</name>
-    <internalEndpoint>
-      <portName>plan_egress</portName>
-      <kind>Facet</kind>
-      <instance>RACE-XML_Output_Adapter-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>outputs</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>RACE-Planner_Manager-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <!-- END Connections -->
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="RACE-Interactive_Input_Adapter_exec">
-    <name>Interactive_Input_Adapter_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Interactive_Input_Adapter_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createInteractive_Input_Adapter_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="RACE-Interactive_Input_Adapter_svnt">
-    <name>Interactive_Input_Adapter_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Interactive_Input_Adapter_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createInteractive_Input_Adapter_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="RACE-Plan_Analyzer_exec">
-    <name>Plan_Analyzer_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Plan_Analyzer_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createPlan_Analyzer_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="RACE-Plan_Analyzer_svnt">
-    <name>Plan_Analyzer_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Plan_Analyzer_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createPlan_Analyzer_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="RACE-Planner_Manager_exec">
-    <name>Planner_Manager_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Planner_Manager_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createPlanner_Manager_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="RACE-Planner_Manager_svnt">
-    <name>Planner_Manager_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Planner_Manager_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createPlanner_Manager_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="RACE-SimpleBinPacker_exec">
-    <name>SimpleBinPacker_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>SimpleBinPacker_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSimpleBinPacker_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="RACE-SimpleBinPacker_svnt">
-    <name>SimpleBinPacker_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>SimpleBinPacker_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSimpleBinPacker_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="RACE-XML_Output_Adapter_exec">
-    <name>XML_Output_Adapter_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>XML_Output_Adapter_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createXML_Output_Adapter_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="RACE-XML_Output_Adapter_svnt">
-    <name>XML_Output_Adapter_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>XML_Output_Adapter_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createXML_Output_Adapter_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>  
diff --git a/CIAO/VERSION b/CIAO/VERSION
index c4fce05941d..ff61d14befa 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.5.6, released Sun Jan 28 19:59:14 2007.
+This is CIAO version 0.5.7, released Wed Mar 21 12:12:26 CDT 2007
 
 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/ACE/bin/msvc_cidlc.pl b/CIAO/bin/msvc_cidlc.pl
index 3d7283b3385..3d7283b3385 100755
--- a/ACE/bin/msvc_cidlc.pl
+++ b/CIAO/bin/msvc_cidlc.pl
diff --git a/CIAO/ciao/CCM_CCMException.idl b/CIAO/ciao/CCM_CCMException.idl
index 850de8f6d48..012f3dd24ff 100644
--- a/CIAO/ciao/CCM_CCMException.idl
+++ b/CIAO/ciao/CCM_CCMException.idl
@@ -26,11 +26,10 @@ module Components
     DUPLICATE_KEY,
     FIND_ERROR,
     OBJECT_NOT_FOUND,
-    NO_SUCH_ENTITY
-    /* extended by QoS4CCM
+    NO_SUCH_ENTITY,
     QOS_ERROR,
     REGISTRATION_ERROR,
-    SERVICE_INSTALLATION_ERROR */
+    SERVICE_INSTALLATION_ERROR
   };
 
   exception CCMException
diff --git a/CIAO/ciao/CCM_Context.idl b/CIAO/ciao/CCM_Context.idl
index 52efd23bad0..e5eb75c218f 100644
--- a/CIAO/ciao/CCM_Context.idl
+++ b/CIAO/ciao/CCM_Context.idl
@@ -6,6 +6,7 @@
 #include "ciao/Security.idl"
 #include "ciao/CCM_Transaction.idl"
 #include "ciao/CCM_Home.idl"
+#include "ciao/CCM_CCMException.idl"
 
 // *************** Basic Container interfaces ***************
 
@@ -35,10 +36,10 @@ module Components
       raises (IllegalState);
 
     /**
-     * @todo Add for QoS4CCM
-     * Object resolve_service_reference(in string service_id)
-     *    raises (CCMException);
+     * Added for QoS4CCM
      */
+    Object resolve_service_reference(in string service_id)
+      raises (CCMException);
   };
 };
 #endif /* CCM_CONTEXT_IDL */
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index 5bd4fa487ba..31e8ce1fdd9 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
-  sharedname  = CIAO_DnC_Client
+project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
+  sharedname  = CIAO_Client
   idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h
   idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export
   idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h
@@ -80,8 +80,8 @@ 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 {
-  sharedname  = CIAO_DnC_Container
+project (CIAO_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
+  sharedname  = CIAO_Container
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
@@ -171,118 +171,9 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client
 
 }
 
-// Valuetype library must be linked for this project.
-// Please don't remove.
-project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc {
-  sharedname   =  CIAO_Deployment_stub
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
-  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
-
-  dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
-
-  IDL_Files {
-    idlflags += -SS -Sci
-    Deployment_Packaging_Data.idl
-    Deployment_Target_Data.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
-    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
-    Deployment.idl
-    Deployment_NodeManager.idl
-    Deployment_ApplicationManager.idl
-    Deployment_NodeApplicationManager.idl
-    Deployment_DomainApplicationManager.idl
-    Deployment_ExecutionManager.idl
-    Deployment_RepositoryManager.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
-    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
-    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 {
-  sharedname   =  CIAO_Deployment_svnt
-  dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
-  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Deployment_CoreS.cpp
-    Deployment_ApplicationS.cpp
-    Deployment_NodeApplicationS.cpp
-    Deployment_ContainerS.cpp
-    DeploymentS.cpp
-    Deployment_RepositoryManagerS.cpp
-    Deployment_NodeManagerS.cpp
-    Deployment_NodeApplicationManagerS.cpp
-    Deployment_ApplicationManagerS.cpp
-    Deployment_DomainApplicationManagerS.cpp
-    Deployment_ExecutionManagerS.cpp
-    NodeApp_CB_Impl.cpp
-    Deployment_TargetManagerS.cpp
-    CIAO_NodeApplication_CallBackS.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_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 {
   includes     += $(CIAO_ROOT)
-  sharedname   =  CIAO_DnC_Server
+  sharedname   =  CIAO_Server
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
@@ -291,6 +182,7 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c
 
   Source_Files {
     Container_Base.cpp
+    Session_Container.cpp
     Swapping_Container.cpp
     Context_Impl_Base.cpp
     Home_Servant_Impl_Base.cpp
diff --git a/CIAO/ciao/CCM_Events.idl b/CIAO/ciao/CCM_Events.idl
index 4abc6ca4115..de0f894daf2 100644
--- a/CIAO/ciao/CCM_Events.idl
+++ b/CIAO/ciao/CCM_Events.idl
@@ -57,14 +57,9 @@ module Components
     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);
 
diff --git a/CIAO/ciao/Container_Base.cpp b/CIAO/ciao/Container_Base.cpp
index 63507fede32..1a991cd45a6 100644
--- a/CIAO/ciao/Container_Base.cpp
+++ b/CIAO/ciao/Container_Base.cpp
@@ -2,14 +2,6 @@
 
 #include "Container_Base.h"
 #include "CIAO_common.h"
-#include "ace/DLL.h"
-#include "tao/Utils/PolicyList_Destroyer.h"
-#include "ace/OS_NS_stdio.h"
-#include "Servant_Activator.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Container_Base.inl"
-#endif /* __ACE_INLINE__ */
 
 namespace CIAO
 {
@@ -31,587 +23,44 @@ namespace CIAO
   {
   }
 
-  PortableServer::POA_ptr
-  Container::the_POA (void) const
-  {
-    return this->component_poa_.in ();
-  }
-
-  PortableServer::POA_ptr
-  Container::the_facet_cons_POA (void) const
-  {
-    return this->facet_cons_poa_.in ();
-  }
-
-  CORBA::ORB_ptr
-  Container::the_ORB (void) const
-  {
-    return this->orb_.in ();
-  }
-
-  ///////////////////////////////////////////////////////////////
-
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
-  Session_Container::serial_number_ (0);
-
-  Session_Container::Session_Container (CORBA::ORB_ptr o,
-                                        Container_Impl *container_impl,
-                                        bool static_config_flag,
-                                        const Static_Config_EntryPoints_Maps* maps)
-  : Container (o, container_impl),
-    number_ (0),
-    static_config_flag_ (static_config_flag),
-    static_entrypts_maps_ (maps),
-    sa_ (0)
-  {
-  }
-
-  Session_Container::~Session_Container (void)
-  {
-    if (! CORBA::is_nil (this->component_poa_.in ()))
-      {
-        this->component_poa_->destroy (1, 1);
-      }
-
-    if (! CORBA::is_nil (this->facet_cons_poa_.in ()))
-      {
-        this->facet_cons_poa_->destroy (1, 1);
-      }
-
-    if (! CORBA::is_nil (this->home_servant_poa_.in ()))
-      {
-        this->home_servant_poa_->destroy (1, 1);
-      }
-
-    delete this->sa_;
-  }
-
-  int
-  Session_Container::init (const char *name,
-                           const CORBA::PolicyList *more_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::init");
-
-    char buffer[MAXPATHLEN];
-
-    if (name == 0)
-      {
-        this->number_ = ++Session_Container::serial_number_;
-        ACE_OS::sprintf (buffer,
-                         "CIAO::Session_Container-%ld",
-                         this->number_);
-        name = buffer;
-      }
-
-    CORBA::Object_var poa_object =
-      this->orb_->resolve_initial_references("RootPOA");
-
-    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 ());
-
-    this->create_component_POA (name,
-                                more_policies,
-                                root_poa.in ());
-
-    ACE_CString port_poa_name (name);
-    port_poa_name += ":Port_POA";
-    this->create_facet_consumer_POA (port_poa_name.c_str (),
-                                     more_policies,
-                                     root_poa.in ());
-
-    PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager ();
-
-    poa_manager->activate ();
-
-    return 0;
-  }
-
-  void
-  Session_Container::create_component_POA (const char *name,
-                                           const CORBA::PolicyList *p,
-                                           PortableServer::POA_ptr root)
-  {
-    CIAO_TRACE ("Session_Container::create_component_POA");
-
-    // Set up proper poa policies here.  Default policies seems to be
-    // fine for session container.  If you add some other default
-    // policies here, then you need to "add" more_policies below
-    // instead of simply assigning more_policies to the init policy
-    // list.
-    CORBA::PolicyList policies (0);
-
-    if (p != 0)
-      {
-        policies = *p;
-      }
-
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager ();
-
-    this->component_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies);
-  }
-
   void
-  Session_Container::create_facet_consumer_POA (
-                                                const char *name,
-                                                const CORBA::PolicyList *p,
-                                                PortableServer::POA_ptr root)
+  Container::set_receptacle_policy_map (::CIAO::REC_POL_MAP &rec_pol_map)
   {
-    CIAO_TRACE ("Session_Container::create_facet_consumer_POA");
-
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager ();
-
-    CORBA::ULong p_length = 0;
-    if (p != 0)
-      {
-        p_length = p->length ();
-      }
-
-    TAO::Utils::PolicyList_Destroyer policies (p_length + 3);
-    policies.length (p_length + 3);
-
-    policies[0] =
-      root->create_id_assignment_policy (PortableServer::USER_ID);
-
-    // Servant Manager Policy
-    policies[1] =
-      root->create_request_processing_policy
-      (PortableServer::USE_SERVANT_MANAGER);
-
-    // Servant Retention Policy
-    policies[2] =
-      root->create_servant_retention_policy (PortableServer::RETAIN);
-
-    for (CORBA::ULong i = 0; i < p_length; ++i)
+    for (::CIAO::REC_POL_MAP_ITERATOR it = rec_pol_map.begin ();
+         it != rec_pol_map.end (); ++it)
       {
-        policies[i+3] = (*p)[i];
+        this->rec_pol_map_.bind ((*it).ext_id_, (*it).int_id_);
       }
-
-    this->facet_cons_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies);
-
-    ACE_NEW_THROW_EX (this->sa_,
-                      Servant_Activator (this->orb_.in ()),
-                      CORBA::NO_MEMORY ());
-
-    this->facet_cons_poa_->set_servant_manager (
-                                                this->sa_
-                                                );
   }
 
-  CORBA::Object_ptr
-  Session_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  CORBA::PolicyList
+  Container::get_receptacle_policy (const char* name)
   {
-    CIAO_TRACE ("Session_Container::install_servant");
-
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      {
-        tmp = this->component_poa_.in ();
-      }
-    else
+    CORBA::PolicyList policy_list;
+    if (this->rec_pol_map_.find (name, policy_list) != 0)
       {
-        tmp = this->facet_cons_poa_.in ();
+        ACE_DEBUG ((LM_DEBUG, "Unable to find policies "
+                    "for the receptacle %s\n", name));
+        policy_list.length (0);
       }
-
-    PortableServer::ObjectId_var oid =
-      tmp->activate_object (p);
-
-    CORBA::Object_var objref =
-      tmp->id_to_reference (oid.in ());
-
-    return objref._retn ();
-  }
-
-  CORBA::Object_ptr
-  Session_Container::install_component (PortableServer::Servant p,
-                                        PortableServer::ObjectId_out oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::install_component");
-    PortableServer::ObjectId_var id =
-      this->component_poa_->activate_object (p);
-
-    CORBA::Object_var objref =
-      this->component_poa_->id_to_reference (id.in ());
-
-    oid = id._retn ();
-
-    return objref._retn ();
+    return policy_list;
   }
 
-
-  //@@ Apparently we need to be cautious when handling the exception
-  //   thrown here. We should make sure that new DnC interfaces
-  //   NodeApplication/NodeApplicationManager etc will cache the new
-  //   exceptions--> rethrow of new exceptions is needed.
-  //                                            --Tao
-  Components::CCMHome_ptr
-  Session_Container::ciao_install_home (const char *exe_dll_name,
-                                        const char *exe_entrypt,
-                                        const char *sv_dll_name,
-                                        const char *sv_entrypt,
-                                        const char *ins_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Deployment::UnknownImplId,
-                     Deployment::ImplEntryPointNotFound,
-                     Deployment::InstallationFailure))
-  {
-    CIAO_TRACE ("Session_Container::ciao_install_home");
-
-    HomeFactory hcreator = 0;
-    ServantFactory screator = 0;
-
-    if (this->static_config_flag_ == false)
-      {
-        ACE_DLL executor_dll, servant_dll;
-
-        if (exe_dll_name == 0 || sv_dll_name == 0)
-          {
-            ACE_CString exception;
-
-            if (exe_dll_name == 0)
-              {
-                exception = "Null component executor DLL name";
-              }
-
-            if (sv_dll_name == 0)
-              {
-                exception = "Null component servant DLL name";
-              }
-
-            ACE_ERROR ((LM_ERROR,
-                        "CIAO (%P|%t) Container_Base.cpp -"
-                        "Session_Container::ciao_install_home -"
-                        "ERROR: %s\n",
-                        exception.c_str ()));
-
-            ACE_THROW_RETURN
-              (Deployment::UnknownImplId (
-                 "Session_Container::ciao_install_home",
-            exception.c_str ()),
-                  Components::CCMHome::_nil ());
-          }
-
-        if (executor_dll.open (exe_dll_name,
-                               ACE_DEFAULT_SHLIB_MODE,
-                               0) != 0)
-          {
-            ACE_CString error ("Failed to open executor DLL: ");
-            error += exe_dll_name;
-
-            ACE_ERROR ((LM_ERROR,
-                        "CIAO (%P|%t) Container_Base.cpp -"
-                        "Session_Container::ciao_install_home -"
-                        "ERROR in opening the executor DLL [%s] \n",
-                        exe_dll_name));
-
-            ACE_THROW_RETURN
-              (Deployment::UnknownImplId
-               ("Session_Container::ciao_install_home",
-                error.c_str ()), Components::CCMHome::_nil ());
-          }
-
-        if (servant_dll.open (sv_dll_name,
-                              ACE_DEFAULT_SHLIB_MODE,
-                              0) != 0)
-          {
-            ACE_CString error ("Failed to open executor DLL: ");
-            error += sv_dll_name;
-
-            ACE_ERROR ((LM_ERROR,
-                        "CIAO (%P|%t) Container_Base.cpp -"
-                        "Session_Container::ciao_install_home -"
-                        "ERROR in opening the servant DLL [%s] \n",
-                        sv_dll_name));
-
-            ACE_THROW_RETURN
-              (Deployment::UnknownImplId
-               ("Session_Container::ciao_install_home",
-                error.c_str ()), Components::CCMHome::_nil ());
-          }
-
-        if (exe_entrypt == 0 || sv_entrypt == 0)
-          {
-            ACE_CString error ("Entry point is null for ");
-
-            if (exe_entrypt == 0)
-              {
-                ACE_ERROR ((LM_ERROR,
-                            "CIAO (%P|%t) Container_Base.cpp -"
-                            "Session_Container::ciao_install_home -"
-                            "ERROR in opening the executor entry point "
-                            "for executor DLL [%s] \n",
-                            exe_dll_name));
-                error += exe_dll_name;
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR,
-                            "CIAO (%P|%t) Container_Base.cpp -"
-                            "Session_Container::ciao_install_home -"
-                            "ERROR in opening the servant entry point "
-                            "for servant DLL [%s] \n",
-                            sv_dll_name));
-                error += sv_dll_name;
-              }
-
-            ACE_THROW_RETURN
-              (Deployment::ImplEntryPointNotFound
-               ("Session_Container::ciao_install_home",
-                error.c_str ()), Components::CCMHome::_nil ());
-          }
-
-        // We have to do this casting in two steps because the C++
-        // standard forbids casting a pointer-to-object (including
-        // void*) directly to a pointer-to-function.
-        void *void_ptr = executor_dll.symbol (exe_entrypt);
-        ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
-        hcreator = reinterpret_cast<HomeFactory> (tmp_ptr);
-
-        void_ptr = servant_dll.symbol (sv_entrypt);
-        tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
-        screator = reinterpret_cast<ServantFactory> (tmp_ptr);
-      }
-    else
-      {
-        if (static_entrypts_maps_ == 0
-            || static_entrypts_maps_->home_creator_funcptr_map_ == 0
-            || static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
-          {
-            ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
-                              Components::CCMHome::_nil ());
-          }
-
-        ACE_CString exe_entrypt_str (exe_entrypt);
-        static_entrypts_maps_->home_creator_funcptr_map_->find (
-                                                                exe_entrypt_str,
-                                                                hcreator
-                                                                );
-
-        ACE_CString sv_entrypt_str (sv_entrypt);
-        static_entrypts_maps_->home_servant_creator_funcptr_map_->find (
-                                                                        sv_entrypt_str,
-                                                                        screator
-                                                                        );
-      }
-
-    if (hcreator == 0 || screator == 0)
-      {
-        ACE_CString error ("Entry point ");
-
-        if (hcreator == 0)
-          {
-            error += exe_entrypt;
-            error += " invalid in dll ";
-            error += exe_dll_name;
-          }
-        else
-          {
-            error += sv_entrypt;
-            error += " invalid in dll ";
-            error += sv_dll_name;
-          }
-
-        ACE_THROW_RETURN
-          (Deployment::ImplEntryPointNotFound
-           ("SessionContainer::ciao_install_home",
-            error.c_str ()), Components::CCMHome::_nil ());
-      }
-
-    Components::HomeExecutorBase_var home_executor = hcreator ();
-
-    if (CORBA::is_nil (home_executor.in ()))
-      {
-        ACE_THROW_RETURN
-          (Deployment::InstallationFailure
-           ("SessionContainer::ciao_install_home",
-            "Executor entrypoint failed to create a home."),
-           Components::CCMHome::_nil ());
-      }
-
-    PortableServer::Servant home_servant = screator (home_executor.in (),
-                                                     this,
-                                                     ins_name);
-
-    if (home_servant == 0)
-      {
-        ACE_THROW_RETURN
-          (Deployment::InstallationFailure
-           ("SessionContainer::ciao_install_home",
-            "Servant entrypoing failed to create a home."),
-           Components::CCMHome::_nil ());
-      }
-
-    PortableServer::ServantBase_var safe (home_servant);
-
-    CORBA::Object_var objref =
-      this->install_servant (home_servant,
-                             Container::Component);
-
-    Components::CCMHome_var homeref =
-      Components::CCMHome::_narrow (objref.in ());
-
-    return homeref._retn ();
-  }
-
-  void
-  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::ciao_uninstall_home");
-
-    this->uninstall (homeref,
-                     Container::Component);
-  }
-
-  void
-  Session_Container::uninstall (CORBA::Object_ptr objref,
-                                Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::uninstall");
-
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      {
-        tmp = this->component_poa_.in ();
-      }
-    else
-      {
-        tmp = this->facet_cons_poa_.in ();
-      }
-
-    PortableServer::ObjectId_var oid =
-      tmp->reference_to_id (objref);
-
-    tmp->deactivate_object (oid.in ());
-  }
-
-  void
-  Session_Container::uninstall (PortableServer::Servant svt,
-                                Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::uninstall");
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      {
-        tmp = this->component_poa_.in ();
-      }
-    else
-      {
-        tmp = this->facet_cons_poa_.in ();
-      }
-
-    PortableServer::ObjectId_var oid
-      = tmp->servant_to_id (svt);
-
-    tmp->deactivate_object (oid.in ());
-  }
-
-  void
-  Session_Container::uninstall_component (Components::CCMObject_ptr objref,
-                                          PortableServer::ObjectId_out oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::uninstall_component");
-
-    PortableServer::ObjectId_var id =
-      this->component_poa_->reference_to_id (objref);
-
-    this->component_poa_->deactivate_object (id.in ());
-
-    oid = id._retn ();
-  }
-
-  void
-  Session_Container::add_servant_map (
-                                      PortableServer::ObjectId &,
-                                      Dynamic_Component_Servant_Base*
-                                      )
-  {
-    CIAO_TRACE ("Session_Container::add_servant_map");
-  }
-
-  void
-  Session_Container::deactivate_facet (const PortableServer::ObjectId &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    CIAO_TRACE ("Session_Container::deactivate_facet");
-  }
-
-  void
-  Session_Container::delete_servant_map (
-                                         PortableServer::ObjectId &
-                                         )
+  PortableServer::POA_ptr
+  Container::the_POA (void) const
   {
-    CIAO_TRACE ("Session_Container::delete_servant_map");
+    return this->component_poa_.in ();
   }
 
-  CORBA::Object_ptr
-  Session_Container::get_home_objref (PortableServer::Servant)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  PortableServer::POA_ptr
+  Container::the_facet_cons_POA (void) const
   {
-    CIAO_TRACE ("Session_Container::get_home_objref");
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    return this->facet_cons_poa_.in ();
   }
 
-  CORBA::Object_ptr
-  Session_Container::generate_reference (const char *obj_id,
-                                         const char *repo_id,
-                                         Container::OA_Type t)
+  CORBA::ORB_ptr
+  Container::the_ORB (void) const
   {
-    CIAO_TRACE ("Session_Container::generate_reference");
-
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      {
-        tmp = this->component_poa_.in ();
-      }
-    else
-      {
-        tmp = this->facet_cons_poa_.in ();
-      }
-
-    PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId (obj_id);
-
-    CORBA::String_var str =
-      PortableServer::ObjectId_to_string (oid.in ());
-
-    if (t == Container::Facet_Consumer)
-      {
-        //if (CIAO::debug_level () > 9)
-        //  ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
-        //              str.in ()));
-      }
-
-    CORBA::Object_var objref =
-      tmp->create_reference_with_id (oid.in (),
-                                     repo_id);
-
-    return objref._retn ();
+    return this->orb_.in ();
   }
 }
diff --git a/CIAO/ciao/Container_Base.h b/CIAO/ciao/Container_Base.h
index 551a1670d5b..efc039d74e7 100644
--- a/CIAO/ciao/Container_Base.h
+++ b/CIAO/ciao/Container_Base.h
@@ -20,11 +20,10 @@
 #include /**/ "ace/pre.h"
 
 #include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
+
 #include "ciao/CIAO_Server_Export.h"
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #include "tao/ORB.h"
 
@@ -36,10 +35,18 @@
 
 namespace CIAO
 {
-  class Servant_Activator;
   class Dynamic_Component_Servant_Base;
   class Container_Impl;
 
+  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                  CORBA::PolicyList,
+                                  ACE_Hash<ACE_CString>,
+                                  ACE_Equal_To<ACE_CString>,
+                                  ACE_Null_Mutex> REC_POL_MAP;
+  typedef ACE_Hash_Map_Iterator<ACE_CString,
+                                CORBA::PolicyList,
+                                ACE_Null_Mutex> REC_POL_MAP_ITERATOR;
+
   /**
    * @class Container
    *
@@ -73,10 +80,15 @@ namespace CIAO
     /// Get a reference to the underlying ORB.
     CORBA::ORB_ptr the_ORB (void) const;
 
+    /// Set the policy map for all the receptacles hosted in this container.
+    void set_receptacle_policy_map (::CIAO::REC_POL_MAP &rec_pol_map);
+
+    /// get the receptacle policy given the receptacle name
+    CORBA::PolicyList get_receptacle_policy (const char *name);
+
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+                      const CORBA::PolicyList *more_policies = 0) = 0;
 
     /// Install a new home
     virtual Components::CCMHome_ptr ciao_install_home (
@@ -84,31 +96,21 @@ namespace CIAO
         const char *exe_entrypt,
         const char *sv_dll_name,
         const char *sv_entrypt,
-        const char *ins_name
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::UnknownImplId,
-                       Deployment::ImplEntryPointNotFound,
-                       Deployment::InstallationFailure)) = 0;
+        const char *ins_name) = 0;
 
     // Uninstall a servant for component or home.
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref) = 0;
 
     // Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+                                      PortableServer::ObjectId_out oid) = 0;
 
-    // @@Jai, please see the Session Container class for comments.
-    // @@ Jai, do you really need the environment variable?
-    virtual void add_servant_map (PortableServer::ObjectId &oid,
-                                  Dynamic_Component_Servant_Base* servant) = 0;
+    virtual void add_servant_to_map (PortableServer::ObjectId &oid,
+                                     Dynamic_Component_Servant_Base* servant) = 0;
 
-    virtual void delete_servant_map (PortableServer::ObjectId &oid) = 0;
+    virtual void delete_servant_from_map (PortableServer::ObjectId &oid) = 0;
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p) = 0;
 
   protected:
     /// Reference to the ORB
@@ -128,183 +130,11 @@ namespace CIAO
 
     PortableServer::POA_var home_servant_poa_;
     Container_Impl *container_impl_;
+    ::CIAO::REC_POL_MAP rec_pol_map_;
   private:
     /// Not allowed to be used
     Container (void);
   };
-
-  class Session_Container;
-
-  typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void);
-  typedef ::PortableServer::Servant (*ServantFactory)
-    (::Components::HomeExecutorBase_ptr p,
-     ::CIAO::Session_Container *c,
-     const char *ins_name
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-    );
-
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                  HomeFactory,
-                                  ACE_Hash<ACE_CString>,
-                                  ACE_Equal_To<ACE_CString>,
-                                  ACE_Null_Mutex> HOMECREATOR_FUNCPTR_MAP;
-
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                  ServantFactory,
-                                  ACE_Hash<ACE_CString>,
-                                  ACE_Equal_To<ACE_CString>,
-                                  ACE_Null_Mutex> HOMESERVANTCREATOR_FUNCPTR_MAP;
-
-  struct Static_Config_EntryPoints_Maps
-  {
-    /// Map of home creator entry point name and func ptr
-    HOMECREATOR_FUNCPTR_MAP* home_creator_funcptr_map_;
-
-    /// Map of home servant creator entry point name and func ptr
-    HOMESERVANTCREATOR_FUNCPTR_MAP* home_servant_creator_funcptr_map_;
-  };
-
-  class CIAO_SERVER_Export Session_Container : public Container
-  {
-  public:
-    Session_Container (CORBA::ORB_ptr o,
-                       Container_Impl *container_impl,
-                       bool static_config_flag = false,
-                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
-
-    virtual ~Session_Container (void);
-
-    /// Initialize the container with a name.
-    virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0)
-
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /**
-     * @brief Simply installing a home executor into the component.
-     *
-     * This operation install a home executor into the component.  It
-     * requires the name of the DLLs to executor and the servant glue
-     * code, and the entry points to the respective DLLs.  Currently,
-     * we don't try to manage the lifetime of DLL objects, but we
-     * should at some later point.
-     *
-     * @retval Home objref of the installed home.
-     */
-    virtual Components::CCMHome_ptr ciao_install_home (
-        const char *exe_dll_name,
-        const char *exe_entrypt,
-        const char *sv_dll_name,
-        const char *sv_entrypt,
-        const char *ins_name
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::UnknownImplId,
-                       Deployment::ImplEntryPointNotFound,
-                       Deployment::InstallationFailure));
-
-    /// Uninstall a servant for component or home.
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Uninstall a servant for component.
-    virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Install a servant for component or home.
-    virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                       Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Install a component servant.
-    CORBA::Object_ptr install_component (PortableServer::Servant p,
-                                         PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Get an object reference to a component or home from the servant.
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Uninstall a servant for component or home.
-    void uninstall (CORBA::Object_ptr objref,
-                    Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Uninstall a servant for component or home.
-    void uninstall (PortableServer::Servant svt,
-                    Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    // @@Jai, please consider naming this method as
-    // "add_servant_to_map ()" to be more descriptive.
-    virtual void add_servant_map (PortableServer::ObjectId &oid,
-                                  Dynamic_Component_Servant_Base* servant);
-
-    // @@Jai, please consider naming this method as
-    // "delete_servant_from_map ()" to be more descriptive.
-    virtual void delete_servant_map (PortableServer::ObjectId &oid);
-
-    // @@Jai, could yo please add documentation?
-    /*
-     * @@Jai, you may want to consider moving these away from the
-     * container interface. I know what you are going to say
-     * :-). Consider using dynamic_cast <> to access
-     * add_servant_to_map, delete_servant_from_map and
-     * deactivate_facet from the Swapping_Conatiner's interface. It
-     * would make the base container interface much cleaner.
-     */
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Analog of the POA method that creates an object reference from
-    /// an object id string.
-    CORBA::Object_ptr generate_reference (const char *obj_id,
-                                          const char *repo_id,
-                                          Container::OA_Type t);
-
-    /// Return the servant activator factory that activates the
-    /// servants for facets and consumers.
-    Servant_Activator *ports_servant_activator (void) const;
-
-  private:
-
-    /// Create POA for the component.
-    /**
-     * This is the POA that is returned to the component applications
-     * if they need one.
-     */
-    void create_component_POA (const char *name,
-                               const CORBA::PolicyList *p,
-                               PortableServer::POA_ptr root);
-
-    /// Create POA for the facets and consumers alone.
-    void create_facet_consumer_POA (const char *name,
-                                    const CORBA::PolicyList *p,
-                                    PortableServer::POA_ptr root);
-
-    /// Not allowed to be
-    Session_Container (void);
-
-  protected:
-    unsigned long number_;
-
-    /// Static variable to store the highest number we have given out until
-    /// now
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
-
-    const bool static_config_flag_;
-    const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-
-    /// The servant activator factory used to activate facets and
-    /// consumer servants.
-    Servant_Activator *sa_;
-  };
 }
 
 // Macro for registration of an OBV factory in the generated
@@ -325,9 +155,5 @@ namespace CIAO
     CORBA::add_ref (factory);  \
   }
 
-#if defined (__ACE_INLINE__)
-# include "Container_Base.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* CIAO_CONTAINER_BASE_H */
diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp
index 9c377124e60..77089fb5048 100644
--- a/CIAO/ciao/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Context_Impl_Base.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Context_Impl_Base.h"
+#include "Container_Base.h"
 
 namespace CIAO
 {
@@ -23,55 +24,43 @@ namespace CIAO
   // Operations from ::Components::CCMContext.
 
   Components::Principal_ptr
-  Context_Impl_Base::get_caller_principal (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Context_Impl_Base::get_caller_principal (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      Components::Principal::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   Components::CCMHome_ptr
-  Context_Impl_Base::get_CCM_home (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Context_Impl_Base::get_CCM_home (void)
   {
     return Components::CCMHome::_duplicate (this->home_.in ());
   }
 
   CORBA::Boolean
-  Context_Impl_Base::get_rollback_only (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
+  Context_Impl_Base::get_rollback_only (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   Components::Transaction::UserTransaction_ptr
-  Context_Impl_Base::get_user_transaction (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
+  Context_Impl_Base::get_user_transaction (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      Components::Transaction::UserTransaction::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::Boolean
-  Context_Impl_Base::is_caller_in_role (
-      const char * /* role */
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Context_Impl_Base::is_caller_in_role (const char * /* role */)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   void
-  Context_Impl_Base::set_rollback_only (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
+  Context_Impl_Base::set_rollback_only (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  CORBA::Object_ptr
+  Context_Impl_Base::resolve_service_reference(const char *)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index 189a9f3aba2..1c5bcf9ea4b 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -60,39 +60,25 @@ namespace CIAO
     /// the compilers want it, have to sort this out in detail.
     Context_Impl_Base (void);
 
-    Context_Impl_Base (Components::CCMHome_ptr home,
-                       Session_Container * c);
+    Context_Impl_Base (Components::CCMHome_ptr home, Session_Container * c);
 
     virtual ~Context_Impl_Base (void);
 
     // Operations from ::Components::CCMContext.
 
-    virtual Components::Principal_ptr
-    get_caller_principal ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Components::Principal_ptr get_caller_principal ();
 
-    virtual Components::CCMHome_ptr
-    get_CCM_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Components::CCMHome_ptr get_CCM_home ();
 
-    virtual CORBA::Boolean
-    get_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    virtual CORBA::Boolean get_rollback_only ();
 
-    virtual Components::Transaction::UserTransaction_ptr
-    get_user_transaction ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    virtual Components::Transaction::UserTransaction_ptr get_user_transaction ();
 
-    virtual CORBA::Boolean
-    is_caller_in_role (const char *role)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean is_caller_in_role (const char *role);
 
-    virtual void
-    set_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    virtual void set_rollback_only ();
+
+    virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
 
     // CIAO-specific.
 
diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp
index 94bc0ac65eb..29558dafb0b 100644
--- a/CIAO/ciao/Context_Impl_T.cpp
+++ b/CIAO/ciao/Context_Impl_T.cpp
@@ -9,22 +9,20 @@ namespace CIAO
 {
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::Context_Impl (
-      Components::CCMHome_ptr home,
+            typename COMP>
+  Context_Impl<BASE_CTX, SVNT, COMP>::Context_Impl (
+      Components::CCMHome_ptr the_home,
       Session_Container *c,
       SVNT *sv)
-    : Context_Impl_Base (home, c),
+    : Context_Impl_Base (the_home, c),
       servant_ (sv)
   {
   }
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::~Context_Impl (void)
+            typename COMP>
+  Context_Impl<BASE_CTX, SVNT, COMP>::~Context_Impl (void)
   {
   }
 
@@ -32,38 +30,31 @@ namespace CIAO
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   CORBA::Object_ptr
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
+  Context_Impl<BASE_CTX, SVNT, COMP>::get_CCM_object (void)
   {
     if (CORBA::is_nil (this->component_.in ()))
-    {
-      CORBA::Object_var obj;
-
-      try
-        {
-          obj =
-            this->container_->get_objref (this->servant_);
-        }
-      catch (const CORBA::Exception& ex)
-        {
-          ex._tao_print_exception ("Caught Exception \n");
-          return CORBA::Object::_nil ();
-        }
-
-
-      this->component_ = COMP::_narrow (obj.in ());
-
-      if (CORBA::is_nil (this->component_.in ()))
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          CORBA::Object::_nil ());
+        CORBA::Object_var obj;
+
+        try
+          {
+            obj = this->container_->get_objref (this->servant_);
+          }
+        catch (const CORBA::Exception& ex)
+          {
+            ex._tao_print_exception ("Caught Exception \n");
+            return CORBA::Object::_nil ();
+          }
+
+        this->component_ = COMP::_narrow (obj.in ());
+
+        if (CORBA::is_nil (this->component_.in ()))
+          {
+            throw CORBA::INTERNAL ();
+          }
       }
-    }
 
     return COMP::_duplicate (this->component_.in ());
   }
diff --git a/CIAO/ciao/Context_Impl_T.h b/CIAO/ciao/Context_Impl_T.h
index a9918af0d36..d4e0deb4cba 100644
--- a/CIAO/ciao/Context_Impl_T.h
+++ b/CIAO/ciao/Context_Impl_T.h
@@ -66,14 +66,13 @@ namespace CIAO
    */
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   class Context_Impl : public virtual BASE_CTX,
                        public virtual Context_Impl_Base,
                        public virtual TAO_Local_RefCounted_Object
   {
   public:
-    Context_Impl (Components::CCMHome_ptr home,
+    Context_Impl (Components::CCMHome_ptr the_home,
                   Session_Container *c,
                   SVNT *sv);
 
@@ -81,14 +80,11 @@ namespace CIAO
 
     // Operations from ::Components::SessionContext.
 
-    virtual CORBA::Object_ptr
-    get_CCM_object ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    virtual CORBA::Object_ptr get_CCM_object ();
 
   protected:
     SVNT *servant_;
-    COMP_VAR component_;
+    typename COMP::_var_type component_;
   };
 }
 
diff --git a/CIAO/ciao/Cookies.cpp b/CIAO/ciao/Cookies.cpp
index 74d02a3cd18..7679f31401b 100644
--- a/CIAO/ciao/Cookies.cpp
+++ b/CIAO/ciao/Cookies.cpp
@@ -11,62 +11,57 @@ ACE_RCSID (ciao,
 
 namespace CIAO
 {
-  Map_Key_Cookie::Map_Key_Cookie (const ACE_Active_Map_Manager_Key &key)
+  Cookie_Impl::Cookie_Impl (CORBA::ULong const &key)
   {
-    this->cookieValue ().length (ACE_Active_Map_Manager_Key::size ());
-    key.encode (this->cookieValue ().get_buffer (0));
+    this->cookieValue ().length (sizeof (CORBA::ULong));
+    ACE_OS::memcpy (this->cookieValue ().get_buffer (false),
+                    &key,
+                    sizeof (CORBA::ULong));
   }
 
-  Map_Key_Cookie::~Map_Key_Cookie (void)
+  Cookie_Impl::~Cookie_Impl (void)
   {
   }
 
   bool
-  Map_Key_Cookie::insert (ACE_Active_Map_Manager_Key &key)
+  Cookie_Impl::extract (Components::Cookie const * const ck,
+                        CORBA::ULong &key)
   {
-    this->cookieValue ().length (ACE_Active_Map_Manager_Key::size ());
-    key.encode (this->cookieValue ().get_buffer (0));
-    return true;
-  }
-
-  bool
-  Map_Key_Cookie::extract (::Components::Cookie *ck,
-                           ACE_Active_Map_Manager_Key &key)
-  {
-    Map_Key_Cookie *c =
-      dynamic_cast <Map_Key_Cookie *> (ck);
+    Cookie_Impl const * const c =
+      dynamic_cast <Cookie_Impl const * const> (ck);
 
     if (c == 0)
-      return false;
+      {
+        return false;
+      }
 
-    ::CORBA::OctetSeq *x = c->get_cookie ();
+    CORBA::OctetSeq const &x = c->cookieValue ();
 
-    if (x->length () != ACE_Active_Map_Manager_Key::size ())
-      return false;
+    if (x.length () != sizeof (CORBA::ULong))
+      {
+        return false;
+      }
 
-    key.decode (x->get_buffer ());
+    key = *reinterpret_cast<const CORBA::ULong *> (x.get_buffer ());
 
     return true;
   }
 
-  ::CORBA::OctetSeq *
-  Map_Key_Cookie::get_cookie (void)
-  {
-    return &this->cookieValue ();
-  }
-
   //========================================================
+
   CORBA::ValueBase *
-  Map_Key_Cookie_init::create_for_unmarshal ()
+  Cookie_Impl_init::create_for_unmarshal (void)
   {
     CORBA::ValueBase *ret_val = 0;
 
     ACE_NEW_THROW_EX (ret_val,
-                      CIAO::Map_Key_Cookie,
+                      CIAO::Cookie_Impl,
                       CORBA::NO_MEMORY ());
 
     return ret_val;
   }
 
-
+  Cookie_Impl_init::~Cookie_Impl_init (void)
+  {
+  }
 }
diff --git a/CIAO/ciao/Cookies.h b/CIAO/ciao/Cookies.h
index 72cad6f5744..55200008d38 100644
--- a/CIAO/ciao/Cookies.h
+++ b/CIAO/ciao/Cookies.h
@@ -24,44 +24,37 @@
 namespace CIAO
 {
   /**
-   * @class Map_Key_Cookie
+   * @class Cookie_Impl
    *
-   * @brief A internal cookie valuetype implementation.
+   * @brief A cookie implementation using CORBA::ULong
    */
-  class CIAO_CONTAINER_Export Map_Key_Cookie
+  class CIAO_CONTAINER_Export Cookie_Impl
     : public virtual OBV_Components::Cookie
   {
   public:
-    Map_Key_Cookie (void);
+    Cookie_Impl (void);
+    virtual ~Cookie_Impl (void);
 
-    virtual ~Map_Key_Cookie (void);
+    /// Initialize a @c Cookie with a @c CORBA::ULong
+    Cookie_Impl (CORBA::ULong const &key);
 
-    /// Initialize a @c Cookie with an @c ACE_Active_Map_Manager_Key
-    Map_Key_Cookie (const ACE_Active_Map_Manager_Key &key);
-
-    /// Insert the @c ACE_Active_Map_Manager_Key
-    bool insert (ACE_Active_Map_Manager_Key &key);
-
-    /// Operation on the valuetype
-    CORBA::OctetSeq * get_cookie (void);
-
-    /// Extract the @c ACE_Active_Map_Manager_Key
-    static bool extract (::Components::Cookie *c,
-                         ACE_Active_Map_Manager_Key &key);
+    /// Extract the @c CORBA::ULong
+    static bool extract (Components::Cookie const * const c,
+                         CORBA::ULong &key);
   };
 
   /**
-   * @class Map_Key_Cookie_init
+   * @class Cookie_Impl_init
    *
-   * @brief Valuefactory implementation for Cookies.
+   * @brief Valuefactory implementation for Cookie_Impl.
    */
-  class CIAO_CONTAINER_Export Map_Key_Cookie_init :
-    public virtual ::Components::Cookie_init
+  class CIAO_CONTAINER_Export Cookie_Impl_init :
+    public virtual Components::Cookie_init
   {
   public:
-    virtual ~Map_Key_Cookie_init (void);
+    virtual ~Cookie_Impl_init (void);
 
-    virtual CORBA::ValueBase *create_for_unmarshal ();
+    virtual CORBA::ValueBase *create_for_unmarshal (void);
   };
 }
 
diff --git a/CIAO/ciao/Cookies.inl b/CIAO/ciao/Cookies.inl
index e4d89f595c7..406485110c4 100644
--- a/CIAO/ciao/Cookies.inl
+++ b/CIAO/ciao/Cookies.inl
@@ -4,13 +4,7 @@
 namespace CIAO
 {
   ACE_INLINE
-  Map_Key_Cookie::Map_Key_Cookie (void)
-  {
-  }
-
-  // ========================================
-  ACE_INLINE
-  Map_Key_Cookie_init::~Map_Key_Cookie_init ()
+  Cookie_Impl::Cookie_Impl (void)
   {
   }
 }
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/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index cdce36fb96f..ba1dae03d74 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -21,9 +21,7 @@ namespace CIAO
 
   PortableServer::Servant
   Dynamic_Component_Activator::incarnate (const PortableServer::ObjectId &oid,
-                                PortableServer::POA_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest))
+                                          PortableServer::POA_ptr)
   {
     Dynamic_Component_Servant_Base* servant = 0;
     PortableServer::ObjectId new_oid (oid);
@@ -43,18 +41,17 @@ namespace CIAO
     PortableServer::Servant ,
     CORBA::Boolean ,
     CORBA::Boolean)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
-  void Dynamic_Component_Activator::add_servant_map
+  void Dynamic_Component_Activator::add_servant_to_map
     (PortableServer::ObjectId &oid,
      Dynamic_Component_Servant_Base* servant)
   {
     this->servant_map_.bind (oid, servant);
   }
 
-  void Dynamic_Component_Activator::delete_servant_map
+  void Dynamic_Component_Activator::delete_servant_from_map
     (PortableServer::ObjectId &oid)
   {
     Dynamic_Component_Servant_Base* servant = 0;
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index aec2aaf79f5..4046fda3b02 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -65,21 +64,18 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::ForwardRequest));
+      PortableServer::POA_ptr poa);
 
     void etherealize (const PortableServer::ObjectId &oid,
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Boolean remaining_activations);
 
-    void add_servant_map (PortableServer::ObjectId &oid,
-                          Dynamic_Component_Servant_Base* servant);
+    void add_servant_to_map (PortableServer::ObjectId &oid,
+                             Dynamic_Component_Servant_Base* servant);
 
-    void delete_servant_map (PortableServer::ObjectId &oid);
+    void delete_servant_from_map (PortableServer::ObjectId &oid);
 
   private:
     /// Pointer to our ORB
diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.h b/CIAO/ciao/Dynamic_Component_Servant_Base.h
index ac849ad9e53..6357c5d1154 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_Base.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_Base.h
@@ -17,12 +17,12 @@
 
 #include "ciao/CIAO_Server_Export.h"
 
+#include "tao/PortableServer/PortableServer.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServer.h"
-
 namespace CIAO
 {
   class Session_Container;
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h
index 6d38bf85399..759ea1c524a 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.h
@@ -44,8 +44,7 @@ namespace CIAO
 
     virtual ~Dynamic_Component_Servant (void);
 
-    virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid);
+    virtual PortableServer::Servant create (PortableServer::ObjectId &oid);
 
     virtual void destroy (PortableServer::ObjectId &oid);
 
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp
index f96c2ac684d..8829f170d90 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -16,21 +16,15 @@ namespace CIAO
   // Operations for CCMHome interface.
 
   CORBA::IRObject_ptr
-  Home_Servant_Impl_Base::get_component_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Home_Servant_Impl_Base::get_component_def (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
-  Home_Servant_Impl_Base::get_home_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Home_Servant_Impl_Base::get_home_def (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
 }
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h
index f7744ea6b48..12ad7105e12 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -49,13 +49,9 @@ namespace CIAO
 
     // Operations for CCMHome interface.
 
-    virtual ::CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr  get_component_def (void);
 
-    virtual ::CORBA::IRObject_ptr
-    get_home_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr get_home_def (void);
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid) = 0;
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index 5dc7e68243b..02e53985f11 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -52,10 +52,7 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::remove_component (
-      ::Components::CCMObject_ptr comp
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
+      ::Components::CCMObject_ptr comp)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
 
@@ -82,7 +79,7 @@ namespace CIAO
 
     if (CIAO::debug_level () > 3)
       {
-        ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+        ACE_DEBUG ((LM_DEBUG, "Removed the component\n"));
       }
   }
 
@@ -115,10 +112,7 @@ namespace CIAO
   Components::CCMObject_ptr
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    COMP_SVNT>::create_component (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
+                    COMP_SVNT>::create_component (void)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create_component");
 
@@ -133,23 +127,19 @@ namespace CIAO
   typename COMP_SVNT::_stub_ptr_type
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    COMP_SVNT>::create (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
+                    COMP_SVNT>::create (void)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create");
 
     if (this->executor_.in () == 0)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          COMP_SVNT::_stub_type::_nil ());
+        throw CORBA::INTERNAL ();
       }
 
     ::Components::EnterpriseComponent_var _ciao_ec =
       this->executor_->create ();
 
-	typedef typename COMP_SVNT::_exec_type exec_type;
+    typedef typename COMP_SVNT::_exec_type exec_type;
     typename COMP_SVNT::_exec_type::_var_type _ciao_comp =
       exec_type::_narrow (_ciao_ec.in ());
 
@@ -165,14 +155,11 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::_ciao_activate_component (
-      typename COMP_SVNT::_exec_type::_ptr_type exe
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+      typename COMP_SVNT::_exec_type::_ptr_type exe)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
 
-    CORBA::Object_var hobj =
-      this->container_->get_objref (this);
+    CORBA::Object_var hobj = this->container_->get_objref (this);
 
     Components::CCMHome_var home =
       Components::CCMHome::_narrow (hobj.in ());
@@ -191,12 +178,10 @@ namespace CIAO
     PortableServer::ObjectId_var oid;
 
     CORBA::Object_var objref =
-      this->container_->install_component (svt,
-                                           oid.out ());
+      this->container_->install_component (svt, oid.out ());
 
     typedef typename COMP_SVNT::_stub_type stub_type;
-    typename COMP_SVNT::_stub_var_type ho =
-      stub_type::_narrow (objref.in ());
+    typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ());
 
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ());
@@ -215,15 +200,12 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::_ciao_passivate_component (
-      typename COMP_SVNT::_stub_ptr_type comp
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+      typename COMP_SVNT::_stub_ptr_type comp)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
 
     PortableServer::ObjectId_var oid;
-    this->container_->uninstall_component (comp,
-                                           oid.out ());
+    this->container_->uninstall_component (comp, oid.out ());
   }
 }
 
diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h
index c29ba00615a..439490ab829 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Home_Servant_Impl_T.h
@@ -56,24 +56,15 @@ namespace CIAO
 
     // Operations for CCMHome interface.
 
-    virtual void
-    remove_component (Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    virtual void remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
 
-    virtual ::Components::CCMObject_ptr
-    create_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    virtual ::Components::CCMObject_ptr create_component ();
 
     // Operations for implicit home interface.
 
-    virtual typename COMP_SVNT::_stub_ptr_type
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    virtual typename COMP_SVNT::_stub_ptr_type create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
@@ -82,12 +73,10 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe);
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp);
 
   protected:
     const char *ins_name_;
diff --git a/CIAO/ciao/Object_Set_T.h b/CIAO/ciao/Object_Set_T.h
index b11632a5e1b..bdfdbbc49fa 100644
--- a/CIAO/ciao/Object_Set_T.h
+++ b/CIAO/ciao/Object_Set_T.h
@@ -74,8 +74,7 @@ namespace CIAO
      *
      * @retval actual number of objrefs copied into @c buffer.
      */
-    CORBA::ULong copy (CORBA::ULong size,
-                       T **buffer);
+    CORBA::ULong copy (CORBA::ULong size, T **buffer);
 
     /**
      * Check if an object is in the set.  Return 0 if false.
diff --git a/CIAO/ciao/Port_Activator.h b/CIAO/ciao/Port_Activator.h
index f3914d7d786..ddbc66954ad 100644
--- a/CIAO/ciao/Port_Activator.h
+++ b/CIAO/ciao/Port_Activator.h
@@ -45,9 +45,7 @@ namespace CIAO
         Sink
       };
 
-    Port_Activator (const char *oid,
-                    const char *name,
-                    Type t);
+    Port_Activator (const char *oid, const char *name, Type t);
 
     virtual ~Port_Activator (void);
 
@@ -69,8 +67,7 @@ namespace CIAO
     virtual PortableServer::Servant activate (
         const PortableServer::ObjectId &oid) = 0;
 
-    virtual void deactivate (
-        const PortableServer::Servant servant) = 0;
+    virtual void deactivate (const PortableServer::Servant servant) = 0;
 
   protected:
     /// The object ID that is used to activate the servant within the
diff --git a/CIAO/ciao/Port_Activator_T.cpp b/CIAO/ciao/Port_Activator_T.cpp
index b6bc950a642..c32d80af942 100644
--- a/CIAO/ciao/Port_Activator_T.cpp
+++ b/CIAO/ciao/Port_Activator_T.cpp
@@ -54,11 +54,9 @@ namespace CIAO
 
     // An additional check, may not be necessary. Being on the safe
     // side.
-    if (ACE_OS::strcmp (this->oid_.in (),
-                        str.in ()) == 0)
+    if (ACE_OS::strcmp (this->oid_.in (), str.in ()) == 0)
       {
-        if (this->executor_ == 0 &&
-            this->t_ == Port_Activator::Facet)
+        if (this->executor_ == 0 && this->t_ == Port_Activator::Facet)
           {
             CORBA::Object_var tmp =
               this->comp_serv_->get_facet_executor (this->name_.in ());
@@ -75,8 +73,7 @@ namespace CIAO
         return s;
       }
 
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 }
 
diff --git a/CIAO/ciao/Port_Activator_T.h b/CIAO/ciao/Port_Activator_T.h
index bf159c89b4e..cb6635a6baa 100644
--- a/CIAO/ciao/Port_Activator_T.h
+++ b/CIAO/ciao/Port_Activator_T.h
@@ -55,8 +55,7 @@ namespace CIAO
     PortableServer::Servant activate (
         const PortableServer::ObjectId &oid);
 
-    void deactivate (
-        const PortableServer::Servant servant);
+    void deactivate (const PortableServer::Servant servant);
 
   private:
     /// The executor
@@ -65,7 +64,7 @@ namespace CIAO
     /// Context classes
     CONTEXT *context_;
 
-    /// COmponent servant which created <this>
+    /// Component servant which created <this>
     COMP_SERV *comp_serv_;
   };
 }
diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp
index c0e1bc93d9d..284cfadf435 100644
--- a/CIAO/ciao/Servant_Activator.cpp
+++ b/CIAO/ciao/Servant_Activator.cpp
@@ -39,7 +39,6 @@ namespace CIAO
   bool
   Servant_Activator::update_port_activator (
     const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
@@ -66,8 +65,6 @@ namespace CIAO
   PortableServer::Servant
   Servant_Activator::incarnate (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
@@ -91,8 +88,7 @@ namespace CIAO
       for (size_t t = 0; t != sz; ++t)
         {
           if (this->pa_.get (tmp, t) == -1)
-            ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                              0);
+            throw CORBA::OBJECT_NOT_EXIST ();
 
           if (tmp == 0)
             {
@@ -116,8 +112,7 @@ namespace CIAO
             }
         }
     }
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   void
@@ -126,7 +121,6 @@ namespace CIAO
                                   PortableServer::Servant servant,
                                   CORBA::Boolean ,
                                   CORBA::Boolean)
-      ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h
index 9a3cfc58644..6cfd3d979d8 100644
--- a/CIAO/ciao/Servant_Activator.h
+++ b/CIAO/ciao/Servant_Activator.h
@@ -57,8 +57,7 @@ namespace CIAO
 
     virtual ~Servant_Activator (void);
 
-    bool update_port_activator (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    bool update_port_activator (const PortableServer::ObjectId &oid);
 
     /// Template methods overridden to get callbacks.
     /**
@@ -68,16 +67,13 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::ForwardRequest));
+      PortableServer::POA_ptr poa);
 
     void etherealize (const PortableServer::ObjectId &oid,
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Boolean remaining_activations);
 
     /// Local helper methods
     bool register_port_activator (Port_Activator *pa);
diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp
index 7ea606c2c7b..2de37eeef1f 100644
--- a/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servant_Impl_Base.cpp
@@ -2,7 +2,7 @@
 
 #include "Servant_Impl_Base.h"
 #include "StandardConfigurator_Impl.h"
-#include "Container_Base.h"
+#include "Session_Container.h"
 
 namespace CIAO
 {
@@ -22,43 +22,30 @@ namespace CIAO
   // Operations for CCMObject interface.
 
   ::Components::PrimaryKeyBase *
-  Servant_Impl_Base::get_primary_key (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
+  Servant_Impl_Base::get_primary_key (void)
   {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+    throw ::Components::NoKeyAvailable ();
   }
 
   CORBA::IRObject_ptr
-  Servant_Impl_Base::get_component_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Servant_Impl_Base::get_component_def (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   void
-  Servant_Impl_Base::configuration_complete (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidConfiguration))
+  Servant_Impl_Base::configuration_complete (void)
   {
     // CIAO to-do
   }
 
   void
-  Servant_Impl_Base::remove (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
+  Servant_Impl_Base::remove (void)
   {
     try
     {
       // Removing Facets
-      Components::FacetDescriptions_var facets =
-        this->get_all_facets ();
+      Components::FacetDescriptions_var facets = this->get_all_facets ();
 
       CORBA::ULong const facet_len = facets->length ();
       for (CORBA::ULong i = 0; i < facet_len; ++i)
@@ -120,19 +107,13 @@ namespace CIAO
   }
 
   ::Components::ConnectionDescriptions *
-  Servant_Impl_Base::get_connections (
-      const char * /* name */
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+  Servant_Impl_Base::get_connections (const char * /* name */)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::ComponentPortDescription *
-  Servant_Impl_Base::get_all_ports (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Servant_Impl_Base::get_all_ports (void)
   {
     OBV_Components::ComponentPortDescription *cps = 0;
     ACE_NEW_RETURN (cps,
@@ -165,24 +146,18 @@ namespace CIAO
   }
 
   CORBA::Object_ptr
-  Servant_Impl_Base::provide_facet (
-      const char *name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+  Servant_Impl_Base::provide_facet (const char *name)
   {
     if (0 == name)
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
+        throw Components::InvalidName ();
       }
 
     CORBA::Object_ptr retval = this->lookup_facet (name);
 
     if (CORBA::is_nil (retval))
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
+        throw Components::InvalidName ();
       }
 
     return retval;
@@ -190,10 +165,7 @@ namespace CIAO
 
   Components::FacetDescriptions *
   Servant_Impl_Base::get_named_facets (
-      const ::Components::NameList & names
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+      const ::Components::NameList & names)
   {
     Components::FacetDescriptions *retval = 0;
     ACE_NEW_RETURN (retval,
@@ -210,8 +182,7 @@ namespace CIAO
 
         if (0 == tmp)
           {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
+            throw Components::InvalidName ();
           }
 
         safe_retval[i] = tmp;
@@ -221,9 +192,7 @@ namespace CIAO
   }
 
   ::Components::FacetDescriptions *
-  Servant_Impl_Base::get_all_facets (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Servant_Impl_Base::get_all_facets (void)
   {
     ::Components::FacetDescriptions *tmp = 0;
     ACE_NEW_RETURN (tmp,
@@ -233,14 +202,13 @@ namespace CIAO
     ::Components::FacetDescriptions_var retval = tmp;
 
     retval->length (this->facet_table_.size ());
-    CORBA::ULong i = 0;
+    CORBA::ULong i = 0UL;
 
     for (FacetTable::const_iterator iter = this->facet_table_.begin ();
          iter != this->facet_table_.end ();
          ++iter, ++i)
       {
-        FacetTable::const_reference entry = *iter;
-        retval[i] = entry.second;
+        retval[i] = iter->second;
       }
 
     return retval._retn ();
@@ -248,9 +216,7 @@ namespace CIAO
 
 
   ::Components::ConsumerDescriptions *
-  Servant_Impl_Base::get_all_consumers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Servant_Impl_Base::get_all_consumers (void)
   {
     ::Components::ConsumerDescriptions *tmp = 0;
     ACE_NEW_THROW_EX (tmp,
@@ -261,14 +227,13 @@ namespace CIAO
     ::Components::ConsumerDescriptions_var retval = tmp;
 
     retval->length (this->consumer_table_.size ());
-    CORBA::ULong i = 0;
+    CORBA::ULong i = 0UL;
 
     for (ConsumerTable::const_iterator iter = this->consumer_table_.begin ();
          iter != this->consumer_table_.end ();
          ++iter, ++i)
       {
-        ConsumerTable::const_reference entry = *iter;
-        retval[i] = entry.second;
+        retval[i] = iter->second;
       }
 
     return retval._retn ();
@@ -276,16 +241,11 @@ namespace CIAO
 
 
   ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::get_consumer (
-      const char *sink_name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+  Servant_Impl_Base::get_consumer (const char *sink_name)
   {
     if (0 == sink_name)
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
+        throw Components::InvalidName ();
       }
 
     Components::EventConsumerBase_ptr retval =
@@ -293,8 +253,7 @@ namespace CIAO
 
     if (CORBA::is_nil (retval))
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
+        throw Components::InvalidName ();
       }
 
     return retval;
@@ -302,10 +261,7 @@ namespace CIAO
 
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_named_consumers (
-      const ::Components::NameList & names
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+      const ::Components::NameList & names)
   {
     Components::ConsumerDescriptions *retval = 0;
     ACE_NEW_RETURN (retval,
@@ -322,8 +278,7 @@ namespace CIAO
 
         if (0 == tmp)
           {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
+            throw Components::InvalidName ();
           }
 
         safe_retval[i] = tmp;
@@ -334,19 +289,15 @@ namespace CIAO
 
   ::Components::EmitterDescriptions *
   Servant_Impl_Base::get_named_emitters (
-      const ::Components::NameList & /* names */
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+      const ::Components::NameList & /* names */)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::ReceptacleDescriptions *
 
   Servant_Impl_Base::get_all_receptacles (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::get_all_receptacles\n"));
 
@@ -378,29 +329,22 @@ namespace CIAO
 
   ::Components::ReceptacleDescriptions *
   Servant_Impl_Base::get_named_receptacles (
-      const ::Components::NameList & /* names */
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+      const ::Components::NameList & /* names */)
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    throw ::CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::PublisherDescriptions *
   Servant_Impl_Base::get_named_publishers (
-      const ::Components::NameList & /* names */
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+      const ::Components::NameList & /* names */)
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    throw ::CORBA::NO_IMPLEMENT ();
   }
 
   /// Protected operations.
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 ::CORBA::Object_ptr port_ref)
-    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
@@ -518,7 +462,9 @@ namespace CIAO
     }
     else
     {
-      ACE_DEBUG ((LM_DEBUG, "Found a receptacle named (%s)\n", receptacle_name));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Found a receptacle named (%s)\n",
+                  receptacle_name));
       rd = safe.inout ();
 
       ::Components::ConnectionDescription *cd = 0;
@@ -533,12 +479,16 @@ namespace CIAO
       cds.length (old_length + 1);
       ACE_DEBUG ((LM_DEBUG, "New length  %d\n", cds.length ()));
       cds [old_length] = cd_safe;
-      ACE_DEBUG ((LM_DEBUG, "Added new connection to receptacle named  (%s)\n", receptacle_name));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Added new connection to receptacle named  (%s)\n",
+                  receptacle_name));
     }
 
     if (this->receptacle_table_.bind (receptacle_name, safe) == 0)
       {
-        ACE_DEBUG ((LM_DEBUG, "Successfully added new receptacle named (%s)\n", receptacle_name));
+        ACE_DEBUG ((LM_DEBUG,
+                    "Successfully added new receptacle named (%s)\n",
+                    receptacle_name));
       }
   }
 
@@ -547,7 +497,6 @@ namespace CIAO
       const char *port_name,
       ::Components::EventConsumerBase_ptr port_ref
     )
-    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
@@ -633,7 +582,6 @@ namespace CIAO
 
   ::Components::StandardConfigurator_ptr
   Servant_Impl_Base::get_standard_configurator ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Create the configurator servant.
     StandardConfigurator_Impl *config_impl = 0;
diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h
index 89e5293264f..b6f222d7de2 100644
--- a/CIAO/ciao/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servant_Impl_Base.h
@@ -25,7 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Active_Map_Manager_T.h"
 #include "ace/Thread_Mutex.h"
 
 #include "CCM_EventsC.h"
@@ -61,93 +60,65 @@ namespace CIAO
     /// Operations for CCMObject interface.
 
     virtual ::Components::PrimaryKeyBase *
-    get_primary_key ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::NoKeyAvailable));
+    get_primary_key ();
 
     virtual CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_component_def ();
 
     virtual Components::SessionComponent_ptr
     get_executor ()
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
     virtual void
-    configuration_complete ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidConfiguration));
+    configuration_complete ();
 
     virtual void
-    remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove ();
 
     virtual ::Components::ConnectionDescriptions *
-    get_connections (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_connections (const char *name);
 
     virtual ::Components::ComponentPortDescription *
-    get_all_ports ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_ports ();
 
     virtual CORBA::Object_ptr
-    provide_facet (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    provide_facet (const char *name);
 
     virtual ::Components::FacetDescriptions *
-    get_named_facets (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_facets (const ::Components::NameList & names);
 
     virtual ::Components::FacetDescriptions *
-    get_all_facets ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_facets ();
 
 
     virtual ::Components::ConsumerDescriptions *
-    get_all_consumers ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_consumers ();
 
 
     virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char *sink_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_consumer (const char *sink_name);
 
     virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_consumers (const ::Components::NameList & names);
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_emitters (const ::Components::NameList & names);
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_receptacles (const ::Components::NameList & names);
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_receptacles ();
 
     virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_publishers (const ::Components::NameList & names);
 
     /// Operation to set attributes on the component.
     virtual void set_attributes (const Components::ConfigValues &descr) = 0;
 
     // Creates and returns the StandardConfigurator for the component.
     virtual ::Components::StandardConfigurator_ptr
-    get_standard_configurator ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_standard_configurator ();
 
     /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
@@ -157,8 +128,7 @@ namespace CIAO
 
   protected:
     void add_facet (const char *port_name,
-                    ::CORBA::Object_ptr port_ref)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                    ::CORBA::Object_ptr port_ref);
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
@@ -171,8 +141,7 @@ namespace CIAO
                          ::Components::Cookie * cookie);
 
     void add_consumer (const char *port_name,
-                       ::Components::EventConsumerBase_ptr port_ref)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                       ::Components::EventConsumerBase_ptr port_ref);
 
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
@@ -198,7 +167,7 @@ namespace CIAO
     static void describe_multiplex_receptacle (
         const char *port_name,
         const char *port_type_repo_id,
-        ACE_Active_Map_Manager<T_var> &objrefs,
+        ACE_Array_Map<CORBA::ULong, T_var> &objrefs,
         ::Components::ReceptacleDescriptions_var &descriptions,
         CORBA::ULong slot
       );
@@ -207,7 +176,7 @@ namespace CIAO
     static void describe_pub_event_source (
         const char *port_name,
         const char *port_type_repo_id,
-        ACE_Active_Map_Manager<T_var> &consumers,
+        ACE_Array_Map<CORBA::ULong, T_var> &consumers,
         ::Components::PublisherDescriptions_var &descriptions,
         CORBA::ULong slot
       );
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp
index 8925ce3b213..81eb60789d6 100644
--- a/CIAO/ciao/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servant_Impl_T.cpp
@@ -62,11 +62,10 @@ namespace CIAO
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component (
       CORBA::Object_ptr object_ref
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (::CORBA::is_nil (object_ref))
       {
-        ACE_THROW_RETURN (::CORBA::BAD_PARAM (), 0);
+        throw ::CORBA::BAD_PARAM ();
       }
 
     ::CORBA::Object_var the_other =
@@ -85,7 +84,6 @@ namespace CIAO
   ::Components::CCMHome_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->context_->get_CCM_home ();
   }
@@ -96,7 +94,6 @@ namespace CIAO
   Components::SessionComponent_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -111,7 +108,6 @@ namespace CIAO
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (
@@ -133,8 +129,7 @@ namespace CIAO
         return ec->get_CCM_object ();
       }
 
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      ::CORBA::Object::_nil ());
+    throw CORBA::INTERNAL ();
   }
 
   // CIAO-specific operations.
@@ -145,7 +140,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->is_activated () == 0)
       {
@@ -163,7 +157,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -185,7 +178,6 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -208,7 +200,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -231,7 +222,6 @@ namespace CIAO
   CORBA::Boolean
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated (
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->pre_activated_;
   }
@@ -242,7 +232,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate (
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // @@ Jai, could you please see why this is required?
     ::Components::SessionComponent_var temp =
diff --git a/CIAO/ciao/Servant_Impl_T.h b/CIAO/ciao/Servant_Impl_T.h
index 5fb7f7c3cf3..f86fcd0c046 100644
--- a/CIAO/ciao/Servant_Impl_T.h
+++ b/CIAO/ciao/Servant_Impl_T.h
@@ -55,47 +55,37 @@ namespace CIAO
     // Operations for CCMObject interface.
 
     virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    same_component (CORBA::Object_ptr object_ref);
 
     virtual ::Components::CCMHome_ptr
-    get_ccm_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_ccm_home ();
 
     virtual CORBA::Object_ptr
-    _get_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _get_component ();
 
     virtual Components::SessionComponent_ptr
-    get_executor ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_executor ();
 
    // CIAO-specific operations.
 
     void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_preactivate ();
 
     void
-    ciao_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_activate ();
 
     void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_postactivate ();
 
     /// @@NOTE: The busted operation.
     void
-    ciao_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_passivate ();
 
     CORBA::Boolean
-    is_activated ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    is_activated ();
 
     void
-    activate_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    activate_component ();
 
   protected:
 
diff --git a/CIAO/ciao/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servant_Impl_Utils_T.cpp
index ba292da07ea..eddbdc41a2c 100644
--- a/CIAO/ciao/Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servant_Impl_Utils_T.cpp
@@ -15,8 +15,7 @@ namespace CIAO
       const char *port_type_repo_id,
       T_var &connection,
       ::Components::ReceptacleDescriptions_var &descriptions,
-      CORBA::ULong slot
-    )
+      CORBA::ULong slot)
   {
     ::Components::ReceptacleDescription *elem = 0;
     ACE_NEW (elem,
@@ -44,7 +43,7 @@ namespace CIAO
   Servant_Impl_Base::describe_multiplex_receptacle (
       const char *port_name,
       const char *port_type_repo_id,
-      ACE_Active_Map_Manager<T_var> &objrefs,
+      ACE_Array_Map<CORBA::ULong, T_var> &objrefs,
       ::Components::ReceptacleDescriptions_var &descriptions,
       CORBA::ULong slot
     )
@@ -57,32 +56,33 @@ namespace CIAO
     elem->name (port_name);
     elem->type_id (port_type_repo_id);
     elem->is_multiple (true);
-    elem->connections ().length (objrefs.current_size ());
+    elem->connections ().length (objrefs.size ());
 
-    CORBA::ULong map_slot = 0UL;
+    CORBA::ULong seq_slot = 0UL;
     ::Components::ConnectionDescription *conn = 0;
 
-    for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             objrefs
-           );
-         0 == iter.done ();
-         iter.advance (), ++map_slot)
+    typedef typename ACE_Array_Map<CORBA::ULong, T_var>::const_iterator
+      CONST_ITERATOR;
+
+    for (CONST_ITERATOR iter = objrefs.begin ();
+         iter != objrefs.end ();
+         ++iter, ++seq_slot)
       {
         ACE_NEW (conn,
                  ::OBV_Components::ConnectionDescription);
         ::Components::ConnectionDescription_var safe_conn = conn;
 
-        ::Components::Cookie *cookie_from_key = 0;
-        ACE_NEW (cookie_from_key,
-                 ::CIAO::Map_Key_Cookie ((*iter).ext_id_));
+        ::Components::Cookie *key_cookie = 0;
+        ACE_NEW (key_cookie,
+                 CIAO::Cookie_Impl (iter->first));
 
         // Valuetype member set operation calls add_ref.
-        conn->ck (cookie_from_key);
-        CORBA::remove_ref (cookie_from_key);
+        conn->ck (key_cookie);
+        CORBA::remove_ref (key_cookie);
 
-        conn->objref ((*iter).int_id_.in ());
+        conn->objref (iter->second.in ());
 
-        elem->connections ()[map_slot] = safe_conn._retn ();
+        elem->connections ()[seq_slot] = safe_conn._retn ();
       }
 
     descriptions[slot] = safe_elem._retn ();
@@ -93,7 +93,7 @@ namespace CIAO
   Servant_Impl_Base::describe_pub_event_source (
       const char *port_name,
       const char *port_type_repo_id,
-      ACE_Active_Map_Manager<T_var> &consumers,
+      ACE_Array_Map<CORBA::ULong, T_var> &consumers,
       ::Components::PublisherDescriptions_var &descriptions,
       CORBA::ULong slot
     )
@@ -105,30 +105,31 @@ namespace CIAO
 
     elem->name (port_name);
     elem->type_id (port_type_repo_id);
-    elem->consumer ().length (consumers.current_size ());
+    elem->consumer ().length (consumers.size ());
 
     CORBA::ULong map_slot = 0UL;
     ::Components::SubscriberDescription *sub = 0;
 
-    for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             consumers
-           );
-         0 == iter.done ();
-         iter.advance (), ++map_slot)
+    typedef typename ACE_Array_Map<CORBA::ULong, T_var>::const_iterator
+      CONST_ITERATOR;
+
+    for (CONST_ITERATOR iter = consumers.begin ();
+         iter != consumers.end ();
+         ++iter, ++map_slot)
       {
         ACE_NEW (sub,
                  ::OBV_Components::SubscriberDescription);
         ::Components::SubscriberDescription_var safe_sub = sub;
 
-        ::Components::Cookie *cookie_from_key = 0;
-        ACE_NEW (cookie_from_key,
-                 ::CIAO::Map_Key_Cookie ((*iter).ext_id_));
+        ::Components::Cookie *key_cookie = 0;
+        ACE_NEW (key_cookie,
+                 CIAO::Cookie_Impl (iter->first));
 
         // Valuetype member set operation calls add_ref.
-        sub->ck (cookie_from_key);
-        CORBA::remove_ref (cookie_from_key);
+        sub->ck (key_cookie);
+        CORBA::remove_ref (key_cookie);
 
-        sub->consumer ((*iter).int_id_.in ());
+        sub->consumer (iter->second.in ());
 
         elem->consumer ()[map_slot] = safe_sub._retn ();
       }
diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp
index 790b3b7b963..73f445c3114 100644
--- a/CIAO/ciao/Server_init.cpp
+++ b/CIAO/ciao/Server_init.cpp
@@ -12,7 +12,7 @@ namespace CIAO
   int
   Server_init (CORBA::ORB_ptr o)
   {
-    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Cookie_Impl_init,
                                 Components::Cookie);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
                                 Components::PortDescription);
@@ -114,7 +114,7 @@ namespace CIAO
     //---------------------------------------------------------------------------------------------
     void NameUtility::BindObjectPath (const CosNaming::NamingContextExt_ptr nc,
                                       const CosNaming::Name& name,
-                                      const CORBA::Object_var obj)
+                                      const CORBA::Object_ptr obj)
     {
       CosNaming::Name tmpName;
       CORBA::String_var newSCName = nc->to_string(name);
diff --git a/CIAO/ciao/Server_init.h b/CIAO/ciao/Server_init.h
index c5fe53ed77d..8e0ba15561b 100644
--- a/CIAO/ciao/Server_init.h
+++ b/CIAO/ciao/Server_init.h
@@ -70,7 +70,7 @@ namespace CIAO
       /// reference 'obj'.
       static  void BindObjectPath (const CosNaming::NamingContextExt_ptr,
                                    const CosNaming::Name&,
-                                   const CORBA::Object_var);
+                                   const CORBA::Object_ptr);
 
       /// Get a list of all bindings under the given context, up to
       /// max_list_size.
diff --git a/CIAO/ciao/Session_Container.cpp b/CIAO/ciao/Session_Container.cpp
new file mode 100644
index 00000000000..a75a0913635
--- /dev/null
+++ b/CIAO/ciao/Session_Container.cpp
@@ -0,0 +1,548 @@
+// $Id$
+
+#include "Session_Container.h"
+#include "CIAO_common.h"
+#include "ace/DLL.h"
+#include "tao/Utils/PolicyList_Destroyer.h"
+#include "ace/OS_NS_stdio.h"
+#include "Servant_Activator.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Session_Container.inl"
+#endif /* __ACE_INLINE__ */
+
+namespace CIAO
+{
+  ///////////////////////////////////////////////////////////////
+
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
+  Session_Container::serial_number_ (0);
+
+  Session_Container::Session_Container (CORBA::ORB_ptr o,
+                                        Container_Impl *container_impl,
+                                        bool static_config_flag,
+                                        const Static_Config_EntryPoints_Maps* maps)
+  : Container (o, container_impl),
+    number_ (0),
+    static_config_flag_ (static_config_flag),
+    static_entrypts_maps_ (maps),
+    sa_ (0)
+  {
+  }
+
+  Session_Container::~Session_Container (void)
+  {
+    if (! CORBA::is_nil (this->component_poa_.in ()))
+      {
+        this->component_poa_->destroy (1, 1);
+      }
+
+    if (! CORBA::is_nil (this->facet_cons_poa_.in ()))
+      {
+        this->facet_cons_poa_->destroy (1, 1);
+      }
+
+    if (! CORBA::is_nil (this->home_servant_poa_.in ()))
+      {
+        this->home_servant_poa_->destroy (1, 1);
+      }
+
+    delete this->sa_;
+  }
+
+  int
+  Session_Container::init (const char *name,
+                           const CORBA::PolicyList *more_policies)
+  {
+    CIAO_TRACE ("Session_Container::init");
+
+    char buffer[MAXPATHLEN];
+
+    if (name == 0)
+      {
+        this->number_ = ++Session_Container::serial_number_;
+        ACE_OS::sprintf (buffer,
+                         "CIAO::Session_Container-%ld",
+                         this->number_);
+        name = buffer;
+      }
+
+    CORBA::Object_var poa_object =
+      this->orb_->resolve_initial_references("RootPOA");
+
+    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 ());
+
+    this->create_component_POA (name,
+                                more_policies,
+                                root_poa.in ());
+
+    ACE_CString port_poa_name (name);
+    port_poa_name += ":Port_POA";
+    this->create_facet_consumer_POA (port_poa_name.c_str (),
+                                     more_policies,
+                                     root_poa.in ());
+
+    PortableServer::POAManager_var poa_manager =
+      root_poa->the_POAManager ();
+
+    poa_manager->activate ();
+
+    return 0;
+  }
+
+  void
+  Session_Container::create_component_POA (const char *name,
+                                           const CORBA::PolicyList *p,
+                                           PortableServer::POA_ptr root)
+  {
+    CIAO_TRACE ("Session_Container::create_component_POA");
+
+    // Set up proper poa policies here.  Default policies seems to be
+    // fine for session container.  If you add some other default
+    // policies here, then you need to "add" more_policies below
+    // instead of simply assigning more_policies to the init policy
+    // list.
+    CORBA::PolicyList policies (0);
+
+    if (p != 0)
+      {
+        policies = *p;
+      }
+
+    PortableServer::POAManager_var poa_manager =
+      root->the_POAManager ();
+
+    this->component_poa_ =
+      root->create_POA (name,
+                        poa_manager.in (),
+                        policies);
+  }
+
+  void
+  Session_Container::create_facet_consumer_POA (const char *name,
+                                                const CORBA::PolicyList *p,
+                                                PortableServer::POA_ptr root)
+  {
+    CIAO_TRACE ("Session_Container::create_facet_consumer_POA");
+
+    PortableServer::POAManager_var poa_manager = root->the_POAManager ();
+
+    CORBA::ULong p_length = 0;
+    if (p != 0)
+      {
+        p_length = p->length ();
+      }
+
+    TAO::Utils::PolicyList_Destroyer policies (p_length + 3);
+    policies.length (p_length + 3);
+
+    policies[0] =
+      root->create_id_assignment_policy (PortableServer::USER_ID);
+
+    // Servant Manager Policy
+    policies[1] =
+      root->create_request_processing_policy
+      (PortableServer::USE_SERVANT_MANAGER);
+
+    // Servant Retention Policy
+    policies[2] =
+      root->create_servant_retention_policy (PortableServer::RETAIN);
+
+    for (CORBA::ULong i = 0; i < p_length; ++i)
+      {
+        policies[i+3] = (*p)[i];
+      }
+
+    this->facet_cons_poa_ =
+      root->create_POA (name,
+                        poa_manager.in (),
+                        policies);
+
+    ACE_NEW_THROW_EX (this->sa_,
+                      Servant_Activator (this->orb_.in ()),
+                      CORBA::NO_MEMORY ());
+
+    this->facet_cons_poa_->set_servant_manager (
+                                                this->sa_
+                                                );
+  }
+
+  CORBA::Object_ptr
+  Session_Container::install_servant (PortableServer::Servant p,
+                                      Container::OA_Type t)
+  {
+    CIAO_TRACE ("Session_Container::install_servant");
+
+    PortableServer::POA_ptr tmp = 0;
+
+    if (t == Container::Component)
+      {
+        tmp = this->component_poa_.in ();
+      }
+    else
+      {
+        tmp = this->facet_cons_poa_.in ();
+      }
+
+    PortableServer::ObjectId_var oid =
+      tmp->activate_object (p);
+
+    CORBA::Object_var objref =
+      tmp->id_to_reference (oid.in ());
+
+    return objref._retn ();
+  }
+
+  CORBA::Object_ptr
+  Session_Container::install_component (PortableServer::Servant p,
+                                        PortableServer::ObjectId_out oid)
+  {
+    CIAO_TRACE ("Session_Container::install_component");
+    PortableServer::ObjectId_var id =
+      this->component_poa_->activate_object (p);
+
+    CORBA::Object_var objref =
+      this->component_poa_->id_to_reference (id.in ());
+
+    oid = id._retn ();
+
+    return objref._retn ();
+  }
+
+
+  //@@ Apparently we need to be cautious when handling the exception
+  //   thrown here. We should make sure that new DnC interfaces
+  //   NodeApplication/NodeApplicationManager etc will cache the new
+  //   exceptions--> rethrow of new exceptions is needed.
+  //                                            --Tao
+  Components::CCMHome_ptr
+  Session_Container::ciao_install_home (const char *exe_dll_name,
+                                        const char *exe_entrypt,
+                                        const char *sv_dll_name,
+                                        const char *sv_entrypt,
+                                        const char *ins_name)
+  {
+    CIAO_TRACE ("Session_Container::ciao_install_home");
+
+    HomeFactory hcreator = 0;
+    ServantFactory screator = 0;
+
+    if (this->static_config_flag_ == false)
+      {
+        ACE_DLL executor_dll, servant_dll;
+
+        if (exe_dll_name == 0 || sv_dll_name == 0)
+          {
+            ACE_CString exception;
+
+            if (exe_dll_name == 0)
+              {
+                exception = "Null component executor DLL name";
+              }
+
+            if (sv_dll_name == 0)
+              {
+                exception = "Null component servant DLL name";
+              }
+
+            ACE_ERROR ((LM_ERROR,
+                        "CIAO (%P|%t) Container_Base.cpp -"
+                        "Session_Container::ciao_install_home -"
+                        "ERROR: %s\n",
+                        exception.c_str ()));
+
+            throw Deployment::UnknownImplId (
+                 "Session_Container::ciao_install_home",
+                 exception.c_str ());
+          }
+
+        if (executor_dll.open (exe_dll_name,
+                               ACE_DEFAULT_SHLIB_MODE,
+                               0) != 0)
+          {
+            ACE_CString error ("Failed to open executor DLL: ");
+            error += exe_dll_name;
+
+            ACE_ERROR ((LM_ERROR,
+                        "CIAO (%P|%t) Container_Base.cpp -"
+                        "Session_Container::ciao_install_home -"
+                        "ERROR in opening the executor DLL [%s] \n",
+                        exe_dll_name));
+
+            throw Deployment::UnknownImplId
+               ("Session_Container::ciao_install_home",
+                error.c_str ());
+          }
+
+        if (servant_dll.open (sv_dll_name,
+                              ACE_DEFAULT_SHLIB_MODE,
+                              0) != 0)
+          {
+            ACE_CString error ("Failed to open executor DLL: ");
+            error += sv_dll_name;
+
+            ACE_ERROR ((LM_ERROR,
+                        "CIAO (%P|%t) Container_Base.cpp -"
+                        "Session_Container::ciao_install_home -"
+                        "ERROR in opening the servant DLL [%s] \n",
+                        sv_dll_name));
+
+            throw Deployment::UnknownImplId
+               ("Session_Container::ciao_install_home",
+                error.c_str ());
+          }
+
+        if (exe_entrypt == 0 || sv_entrypt == 0)
+          {
+            ACE_CString error ("Entry point is null for ");
+
+            if (exe_entrypt == 0)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "CIAO (%P|%t) Container_Base.cpp -"
+                            "Session_Container::ciao_install_home -"
+                            "ERROR in opening the executor entry point "
+                            "for executor DLL [%s] \n",
+                            exe_dll_name));
+                error += exe_dll_name;
+              }
+            else
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "CIAO (%P|%t) Container_Base.cpp -"
+                            "Session_Container::ciao_install_home -"
+                            "ERROR in opening the servant entry point "
+                            "for servant DLL [%s] \n",
+                            sv_dll_name));
+                error += sv_dll_name;
+              }
+
+            throw Deployment::ImplEntryPointNotFound
+               ("Session_Container::ciao_install_home",
+                error.c_str ());
+          }
+
+        // We have to do this casting in two steps because the C++
+        // standard forbids casting a pointer-to-object (including
+        // void*) directly to a pointer-to-function.
+        void *void_ptr = executor_dll.symbol (exe_entrypt);
+        ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
+        hcreator = reinterpret_cast<HomeFactory> (tmp_ptr);
+
+        void_ptr = servant_dll.symbol (sv_entrypt);
+        tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
+        screator = reinterpret_cast<ServantFactory> (tmp_ptr);
+      }
+    else
+      {
+        if (static_entrypts_maps_ == 0
+            || static_entrypts_maps_->home_creator_funcptr_map_ == 0
+            || static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
+          {
+            throw Deployment::ImplEntryPointNotFound ();
+          }
+
+        ACE_CString exe_entrypt_str (exe_entrypt);
+        static_entrypts_maps_->home_creator_funcptr_map_->find (exe_entrypt_str,
+                                                                hcreator);
+
+        ACE_CString sv_entrypt_str (sv_entrypt);
+        static_entrypts_maps_->home_servant_creator_funcptr_map_->find (
+                                                                        sv_entrypt_str,
+                                                                        screator
+                                                                        );
+      }
+
+    if (hcreator == 0 || screator == 0)
+      {
+        ACE_CString error ("Entry point ");
+
+        if (hcreator == 0)
+          {
+            error += exe_entrypt;
+            error += " invalid in dll ";
+            error += exe_dll_name;
+          }
+        else
+          {
+            error += sv_entrypt;
+            error += " invalid in dll ";
+            error += sv_dll_name;
+          }
+
+        throw Deployment::ImplEntryPointNotFound
+           ("SessionContainer::ciao_install_home",
+            error.c_str ());
+      }
+
+    Components::HomeExecutorBase_var home_executor = hcreator ();
+
+    if (CORBA::is_nil (home_executor.in ()))
+      {
+        throw Deployment::InstallationFailure
+           ("SessionContainer::ciao_install_home",
+            "Executor entrypoint failed to create a home.");
+      }
+
+    PortableServer::Servant home_servant = screator (home_executor.in (),
+                                                     this,
+                                                     ins_name);
+
+    if (home_servant == 0)
+      {
+        throw Deployment::InstallationFailure
+           ("SessionContainer::ciao_install_home",
+            "Servant entrypoing failed to create a home.");
+      }
+
+    PortableServer::ServantBase_var safe (home_servant);
+
+    CORBA::Object_var objref =
+      this->install_servant (home_servant,
+                             Container::Component);
+
+    Components::CCMHome_var homeref =
+      Components::CCMHome::_narrow (objref.in ());
+
+    return homeref._retn ();
+  }
+
+  void
+  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
+  {
+    CIAO_TRACE ("Session_Container::ciao_uninstall_home");
+
+    this->uninstall (homeref,
+                     Container::Component);
+  }
+
+  void
+  Session_Container::uninstall (CORBA::Object_ptr objref,
+                                Container::OA_Type t)
+  {
+    CIAO_TRACE ("Session_Container::uninstall");
+
+    PortableServer::POA_ptr tmp = 0;
+
+    if (t == Container::Component)
+      {
+        tmp = this->component_poa_.in ();
+      }
+    else
+      {
+        tmp = this->facet_cons_poa_.in ();
+      }
+
+    PortableServer::ObjectId_var oid =
+      tmp->reference_to_id (objref);
+
+    tmp->deactivate_object (oid.in ());
+  }
+
+  void
+  Session_Container::uninstall (PortableServer::Servant svt,
+                                Container::OA_Type t)
+  {
+    CIAO_TRACE ("Session_Container::uninstall");
+    PortableServer::POA_ptr tmp = 0;
+
+    if (t == Container::Component)
+      {
+        tmp = this->component_poa_.in ();
+      }
+    else
+      {
+        tmp = this->facet_cons_poa_.in ();
+      }
+
+    PortableServer::ObjectId_var oid = tmp->servant_to_id (svt);
+
+    tmp->deactivate_object (oid.in ());
+  }
+
+  void
+  Session_Container::uninstall_component (Components::CCMObject_ptr objref,
+                                          PortableServer::ObjectId_out oid)
+  {
+    CIAO_TRACE ("Session_Container::uninstall_component");
+
+    PortableServer::ObjectId_var id =
+      this->component_poa_->reference_to_id (objref);
+
+    this->component_poa_->deactivate_object (id.in ());
+
+    oid = id._retn ();
+  }
+
+  void
+  Session_Container::add_servant_to_map (PortableServer::ObjectId &,
+                                      Dynamic_Component_Servant_Base*)
+  {
+    CIAO_TRACE ("Session_Container::add_servant_to_map");
+  }
+
+  void
+  Session_Container::deactivate_facet (const PortableServer::ObjectId &)
+  {
+    CIAO_TRACE ("Session_Container::deactivate_facet");
+  }
+
+  void
+  Session_Container::delete_servant_from_map (PortableServer::ObjectId &)
+  {
+    CIAO_TRACE ("Session_Container::delete_servant_from_map");
+  }
+
+  CORBA::Object_ptr
+  Session_Container::get_home_objref (PortableServer::Servant)
+  {
+    CIAO_TRACE ("Session_Container::get_home_objref");
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  CORBA::Object_ptr
+  Session_Container::generate_reference (const char *obj_id,
+                                         const char *repo_id,
+                                         Container::OA_Type t)
+  {
+    CIAO_TRACE ("Session_Container::generate_reference");
+
+    PortableServer::POA_ptr tmp = 0;
+
+    if (t == Container::Component)
+      {
+        tmp = this->component_poa_.in ();
+      }
+    else
+      {
+        tmp = this->facet_cons_poa_.in ();
+      }
+
+    PortableServer::ObjectId_var oid =
+      PortableServer::string_to_ObjectId (obj_id);
+
+    CORBA::String_var str =
+      PortableServer::ObjectId_to_string (oid.in ());
+
+    if (t == Container::Facet_Consumer)
+      {
+        //if (CIAO::debug_level () > 9)
+        //  ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
+        //              str.in ()));
+      }
+
+    CORBA::Object_var objref =
+      tmp->create_reference_with_id (oid.in (), repo_id);
+
+    return objref._retn ();
+  }
+}
diff --git a/CIAO/ciao/Session_Container.h b/CIAO/ciao/Session_Container.h
new file mode 100644
index 00000000000..797b52c8268
--- /dev/null
+++ b/CIAO/ciao/Session_Container.h
@@ -0,0 +1,191 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Session_Container.h
+ *
+ *  $Id$
+ *
+ *  Header file for CIAO's container implementations
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ *  @author Gan Deng <dengg@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+
+#ifndef CIAO_SESSION_CONTAINER_H
+#define CIAO_SESSION_CONTAINER_H
+
+#include /**/ "ace/pre.h"
+
+#include "ciao/Container_Base.h"
+
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+
+#include "tao/ORB.h"
+
+#include "ace/Hash_Map_Manager_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+  class Session_Container;
+  class Servant_Activator;
+
+  typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void);
+  typedef ::PortableServer::Servant (*ServantFactory)
+    (::Components::HomeExecutorBase_ptr p,
+     ::CIAO::Session_Container *c,
+     const char *ins_name);
+
+  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                  HomeFactory,
+                                  ACE_Hash<ACE_CString>,
+                                  ACE_Equal_To<ACE_CString>,
+                                  ACE_Null_Mutex> HOMECREATOR_FUNCPTR_MAP;
+
+  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                  ServantFactory,
+                                  ACE_Hash<ACE_CString>,
+                                  ACE_Equal_To<ACE_CString>,
+                                  ACE_Null_Mutex> HOMESERVANTCREATOR_FUNCPTR_MAP;
+
+  struct Static_Config_EntryPoints_Maps
+  {
+    /// Map of home creator entry point name and func ptr
+    HOMECREATOR_FUNCPTR_MAP* home_creator_funcptr_map_;
+
+    /// Map of home servant creator entry point name and func ptr
+    HOMESERVANTCREATOR_FUNCPTR_MAP* home_servant_creator_funcptr_map_;
+  };
+
+  class CIAO_SERVER_Export Session_Container : public Container
+  {
+  public:
+    Session_Container (CORBA::ORB_ptr o,
+                       Container_Impl *container_impl,
+                       bool static_config_flag = false,
+                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
+
+    virtual ~Session_Container (void);
+
+    /// Initialize the container with a name.
+    virtual int init (const char *name = 0,
+                      const CORBA::PolicyList *more_policies = 0);
+
+    /**
+     * @brief Simply installing a home executor into the component.
+     *
+     * This operation install a home executor into the component.  It
+     * requires the name of the DLLs to executor and the servant glue
+     * code, and the entry points to the respective DLLs.  Currently,
+     * we don't try to manage the lifetime of DLL objects, but we
+     * should at some later point.
+     *
+     * @retval Home objref of the installed home.
+     */
+    virtual Components::CCMHome_ptr ciao_install_home (
+        const char *exe_dll_name,
+        const char *exe_entrypt,
+        const char *sv_dll_name,
+        const char *sv_entrypt,
+        const char *ins_name);
+
+    /// Uninstall a servant for component or home.
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref);
+
+    /// Uninstall a servant for component.
+    virtual void uninstall_component (::Components::CCMObject_ptr objref,
+                                      PortableServer::ObjectId_out oid);
+
+    /// Install a servant for component or home.
+    virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
+                                       Container::OA_Type t);
+
+    /// Install a component servant.
+    CORBA::Object_ptr install_component (PortableServer::Servant p,
+                                         PortableServer::ObjectId_out oid);
+
+    /// Get an object reference to a component or home from the servant.
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p);
+
+    /// Uninstall a servant for component or home.
+    void uninstall (CORBA::Object_ptr objref, Container::OA_Type t);
+
+    /// Uninstall a servant for component or home.
+    void uninstall (PortableServer::Servant svt, Container::OA_Type t);
+
+    virtual void add_servant_to_map (PortableServer::ObjectId &oid,
+                                     Dynamic_Component_Servant_Base* servant);
+
+    virtual void delete_servant_from_map (PortableServer::ObjectId &oid);
+
+    // @@Jai, could yo please add documentation?
+    /*
+     * @@Jai, you may want to consider moving these away from the
+     * container interface. I know what you are going to say
+     * :-). Consider using dynamic_cast <> to access
+     * add_servant_to_map, delete_servant_from_map and
+     * deactivate_facet from the Swapping_Conatiner's interface. It
+     * would make the base container interface much cleaner.
+     */
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid);
+
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p);
+
+    /// Analog of the POA method that creates an object reference from
+    /// an object id string.
+    CORBA::Object_ptr generate_reference (const char *obj_id,
+                                          const char *repo_id,
+                                          Container::OA_Type t);
+
+    /// Return the servant activator factory that activates the
+    /// servants for facets and consumers.
+    Servant_Activator *ports_servant_activator (void) const;
+
+  private:
+
+    /// Create POA for the component.
+    /**
+     * This is the POA that is returned to the component applications
+     * if they need one.
+     */
+    void create_component_POA (const char *name,
+                               const CORBA::PolicyList *p,
+                               PortableServer::POA_ptr root);
+
+    /// Create POA for the facets and consumers alone.
+    void create_facet_consumer_POA (const char *name,
+                                    const CORBA::PolicyList *p,
+                                    PortableServer::POA_ptr root);
+
+    /// Not allowed to be
+    Session_Container (void);
+
+  protected:
+    unsigned long number_;
+
+    /// Static variable to store the highest number we have given out until
+    /// now
+    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
+
+    const bool static_config_flag_;
+    const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
+
+    /// The servant activator factory used to activate facets and
+    /// consumer servants.
+    Servant_Activator *sa_;
+  };
+}
+
+#if defined (__ACE_INLINE__)
+# include "Session_Container.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_SESSION_CONTAINER_H */
diff --git a/CIAO/ciao/Container_Base.inl b/CIAO/ciao/Session_Container.inl
index 5d178c2024c..1c6bc7a075c 100644
--- a/CIAO/ciao/Container_Base.inl
+++ b/CIAO/ciao/Session_Container.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE CORBA::Object_ptr
 CIAO::Session_Container::get_objref (PortableServer::Servant p)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->the_POA ()->servant_to_reference (p);
 }
diff --git a/CIAO/ciao/StandardConfigurator_Impl.cpp b/CIAO/ciao/StandardConfigurator_Impl.cpp
index b1ca2033d21..b737c5f5b7c 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/StandardConfigurator_Impl.cpp
@@ -23,17 +23,12 @@ namespace CIAO
   void
   StandardConfigurator_Impl::set_configuration (
       const Components::ConfigValues &descr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->component_->set_attributes (descr);
   }
 
   void
-  StandardConfigurator_Impl::configure (
-    Components::CCMObject_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::WrongComponentType))
+  StandardConfigurator_Impl::configure (Components::CCMObject_ptr)
   {
-
   }
 }
diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h
index 1c1f800d6c2..dd4df6f4f98 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/StandardConfigurator_Impl.h
@@ -29,8 +29,6 @@
 
 namespace CIAO
 {
-
-
   /**
    * @class StandardConfigurator_Impl
    *
@@ -54,14 +52,9 @@ namespace CIAO
     /// This method will call set_attributes on the component that is
     /// being configured, i.e, the template method from
     /// StandardConfigurator interface.
-    virtual void set_configuration (
-        const Components::ConfigValues & descr)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void set_configuration (const Components::ConfigValues & descr);
 
-    void configure (
-        Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::WrongComponentType));
+    void configure (Components::CCMObject_ptr comp);
 
   private:
     /// The component whose attributes are going to be configured via
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index aff7ab93113..5e8816d0c47 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -5,6 +5,7 @@
 #include "ace/DLL.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
+#include "DAnCE/Deployment//Deployment_CoreC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Swapping_Container.inl"
@@ -35,14 +36,12 @@ namespace CIAO
 
   CORBA::Object_ptr
   Swapping_Container::get_home_objref (PortableServer::Servant p)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->the_home_servant_POA ()->servant_to_reference (p);
   }
 
   void
   Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->the_facet_cons_POA ()->deactivate_object (oid);
   }
@@ -50,7 +49,6 @@ namespace CIAO
   int
   Swapping_Container::init (const char *name,
                             const CORBA::PolicyList *more_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     char buffer[MAXPATHLEN];
 
@@ -73,12 +71,7 @@ namespace CIAO
     PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (poa_object.in ());
 
-
-    this->create_servant_POA (name,
-                              more_policies,
-                              root_poa.in ());
-
-
+    this->create_servant_POA (name, more_policies, root_poa.in ());
 
     this->create_home_servant_POA ("home servant POA",
                                    more_policies,
@@ -86,8 +79,7 @@ namespace CIAO
 
     this->create_connections_POA (root_poa.in ());
 
-    PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager ();
+    PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
     poa_manager->activate ();
 
@@ -95,18 +87,18 @@ namespace CIAO
   }
 
   void
-  Swapping_Container::add_servant_map
+  Swapping_Container::add_servant_to_map
     (PortableServer::ObjectId &oid,
      Dynamic_Component_Servant_Base* servant)
   {
-    this->dsa_->add_servant_map (oid, servant);
+    this->dsa_->add_servant_to_map (oid, servant);
   }
 
   void
-  Swapping_Container::delete_servant_map
+  Swapping_Container::delete_servant_from_map
     (PortableServer::ObjectId &oid)
   {
-    this->dsa_->delete_servant_map (oid);
+    this->dsa_->delete_servant_from_map (oid);
   }
 
   void
@@ -119,19 +111,15 @@ namespace CIAO
     if (p != 0)
       policies = *p;
 
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager ();
-
+    PortableServer::POAManager_var poa_manager = root->the_POAManager ();
 
-    this->home_servant_poa_ =
-      root->create_POA (name,
+    this->home_servant_poa_ = root->create_POA (name,
                         poa_manager.in (),
                         policies);
   }
 
   void
-  Swapping_Container::create_connections_POA (
-      PortableServer::POA_ptr root)
+  Swapping_Container::create_connections_POA (PortableServer::POA_ptr root)
   {
     PortableServer::POAManager_var poa_manager =
       root->the_POAManager ();
@@ -160,9 +148,7 @@ namespace CIAO
                       Servant_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
-    this->facet_cons_poa_->set_servant_manager (
-        this->sa_);
-
+    this->facet_cons_poa_->set_servant_manager (this->sa_);
   }
 
   void
@@ -197,23 +183,17 @@ namespace CIAO
     policies[policy_length] =
       root->create_servant_retention_policy (PortableServer::RETAIN);
 
-    this->component_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies);
+    this->component_poa_ = root->create_POA (name, poa_manager.in (), policies);
 
     ACE_NEW_THROW_EX (this->dsa_,
                       Dynamic_Component_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
-    this->component_poa_->set_servant_manager (
-        this->dsa_);
-
+    this->component_poa_->set_servant_manager (this->dsa_);
   }
 
   void
   Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::POA_ptr tmp = this->home_servant_poa_.in ();
     PortableServer::ObjectId_var oid =
@@ -224,8 +204,7 @@ namespace CIAO
 
   CORBA::Object_ptr
   Swapping_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                                       Container::OA_Type t)
   {
     PortableServer::POA_ptr tmp = 0;
 
@@ -234,13 +213,13 @@ namespace CIAO
         tmp = this->home_servant_poa_.in ();
       }
     else
-      tmp = this->facet_cons_poa_.in ();
+      {
+        tmp = this->facet_cons_poa_.in ();
+      }
 
-    PortableServer::ObjectId_var oid
-      = tmp->activate_object (p);
+    PortableServer::ObjectId_var oid = tmp->activate_object (p);
 
-    CORBA::Object_var objref
-      = tmp->id_to_reference (oid.in ());
+    CORBA::Object_var objref = tmp->id_to_reference (oid.in ());
 
     return objref._retn ();
   }
diff --git a/CIAO/ciao/Swapping_Container.h b/CIAO/ciao/Swapping_Container.h
index 98231eef33c..fe149ab8c6a 100644
--- a/CIAO/ciao/Swapping_Container.h
+++ b/CIAO/ciao/Swapping_Container.h
@@ -23,9 +23,7 @@
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
-#include "ciao/CCM_ContainerC.h"
-#include "ciao/Container_Base.h"
-#include "ciao/Deployment_CoreC.h"
+#include "ciao/Session_Container.h"
 #include "ciao/Dynamic_Component_Activator.h"
 #include "ciao/CIAO_Server_Export.h"
 #include "ciao/Servant_Activator.h"
@@ -48,29 +46,23 @@ namespace CIAO
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      const CORBA::PolicyList *more_policies = 0);
 
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                               Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                               Container::OA_Type t);
 
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p);
 
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref);
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p);
 
-    virtual void add_servant_map (PortableServer::ObjectId &oid,
+    virtual void add_servant_to_map (PortableServer::ObjectId &oid,
                                   Dynamic_Component_Servant_Base* servant);
 
-    virtual void delete_servant_map (PortableServer::ObjectId &oid);
+    virtual void delete_servant_from_map (PortableServer::ObjectId &oid);
 
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid);
 
     PortableServer::POA_ptr the_home_servant_POA (void) const;
 
diff --git a/CIAO/ciao/Swapping_Container.inl b/CIAO/ciao/Swapping_Container.inl
index 079569724d7..698eec0324d 100644
--- a/CIAO/ciao/Swapping_Container.inl
+++ b/CIAO/ciao/Swapping_Container.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE CORBA::Object_ptr
 CIAO::Swapping_Container::get_objref (PortableServer::Servant p)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->the_POA ()->servant_to_reference (p);
 }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
index 3f1caa25d71..919c70e6df9 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -17,21 +17,15 @@ namespace CIAO
   // Operations for CCMHome interface.
 
   CORBA::IRObject_ptr
-  Swapping_Home_Servant_Impl_Base::get_component_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Swapping_Home_Servant_Impl_Base::get_component_def (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
-  Swapping_Home_Servant_Impl_Base::get_home_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Swapping_Home_Servant_Impl_Base::get_home_def (void)
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
 }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
index 8302d80d16f..a6ee1575aaa 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -46,13 +46,9 @@ namespace CIAO
     virtual ~Swapping_Home_Servant_Impl_Base (void);
 
     // Operations for CCMHome interface.
-    virtual ::CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr get_component_def (void);
 
-    virtual ::CORBA::IRObject_ptr
-    get_home_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr get_home_def (void);
 
   protected:
     Swapping_Container *container_;
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index a349718949e..fbc804ca1aa 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -42,7 +42,7 @@ namespace CIAO
 
     try
       {
-        this->container_->delete_servant_map (oid);
+        this->container_->delete_servant_from_map (oid);
       }
       catch (const CORBA::Exception& ex)
       {
@@ -68,8 +68,6 @@ namespace CIAO
                              COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
   {
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
@@ -92,8 +90,6 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::create_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     return this->create ();
   }
@@ -108,13 +104,10 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::create (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     if (this->executor_.in () == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        COMP_SVNT::_stub_type::_nil ());
+      throw CORBA::INTERNAL ();
     }
 
 
@@ -135,7 +128,6 @@ namespace CIAO
                              COMP_SVNT>::_ciao_activate_component (
       ::Components::EnterpriseComponent_ptr ec
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::Object_var hobj =
       this->container_->get_home_objref (this);
@@ -159,7 +151,7 @@ namespace CIAO
                                                 this,
                                                 this->container_);
 
-    this->container_->add_servant_map (oid, svt);
+    this->container_->add_servant_to_map (oid, svt);
 
     this->dynamic_servant_map_.bind (oid.in (), svt);
 
@@ -199,7 +191,6 @@ namespace CIAO
                              COMP_SVNT>::_ciao_passivate_component (
       typename COMP_SVNT::_stub_ptr_type comp
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid;
 
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index db85bbce784..7fd6bb4a33c 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -59,23 +59,15 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual void
-    remove_component (Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
 
-    virtual ::Components::CCMObject_ptr
-    create_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    virtual ::Components::CCMObject_ptr create_component ();
 
     // Operations for implicit home interface.
 
-    virtual typename COMP_SVNT::_stub_ptr_type
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    virtual typename COMP_SVNT::_stub_ptr_type create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
@@ -84,12 +76,10 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec);
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp);
 
   protected:
     typename EXEC::_var_type executor_;
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index 9431da4c67a..e2afdaeab8b 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -9,58 +9,41 @@ namespace CIAO
 {
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-      Upgradeable_Context_Impl (
-              Components::CCMHome_ptr home,
-              Session_Container *c,
-              SVNT *sv)
-    : session_context (home, c, sv),
-      servant_ (sv)
+            typename COMP>
+  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::Upgradeable_Context_Impl (
+    Components::CCMHome_ptr the_home,
+    Session_Container *c,
+    SVNT *sv)
+    : Context_Impl<BASE_CTX, SVNT, COMP> (the_home, c, sv)
   {
   }
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-       ~Upgradeable_Context_Impl (void)
+            typename COMP>
+  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::~Upgradeable_Context_Impl (void)
   {
   }
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   void
-  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet (
-      const PortableServer::ObjectId &oid
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::deactivate_facet (
+      const PortableServer::ObjectId &oid)
   {
-    /*
-    PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId (obj_id);
-    */
-
     this->container_->deactivate_facet (oid);
   }
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   void
-  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-     remove_facet (
-           CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::remove_facet (
+      CORBA::Object_ptr reference)
   {
     PortableServer::ObjectId_var oid =
-      this->container_->the_facet_cons_POA ()->reference_to_id
-         (reference);
+      this->container_->the_facet_cons_POA ()->reference_to_id (reference);
 
     this->update_port_activator (oid.in ());
 
@@ -69,21 +52,13 @@ namespace CIAO
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   void
-  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-     update_port_activator (
-           const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::update_port_activator (
+      const PortableServer::ObjectId &oid)
   {
-    /*
-    PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId (obj_id);
-    */
-
     CIAO::Servant_Activator *sa =
-        this->container_->ports_servant_activator ();
+      this->container_->ports_servant_activator ();
     sa->update_port_activator (oid);
   }
 
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 53e171b8eda..2d1e1845f52 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -33,40 +33,29 @@ namespace CIAO
 {
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  class Upgradeable_Context_Impl : public virtual Context_Impl<
-                                   BASE_CTX, SVNT, COMP, COMP_VAR>
+            typename COMP>
+  class Upgradeable_Context_Impl
+    : public virtual Context_Impl<BASE_CTX, SVNT, COMP>
   {
   public:
-    Upgradeable_Context_Impl (Components::CCMHome_ptr home,
+    Upgradeable_Context_Impl (Components::CCMHome_ptr the_home,
                               Session_Container *c,
                               SVNT *sv);
 
     virtual ~Upgradeable_Context_Impl (void);
 
     virtual void
-    deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    deactivate_facet (const PortableServer::ObjectId &oid);
 
     virtual void
-    update_port_activator (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    update_port_activator (const PortableServer::ObjectId &oid);
 
     virtual void
-    remove_facet (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    remove_facet (CORBA::Object_ptr reference);
 
     virtual ::Components::ConsumerDescriptions *
-    get_registered_consumers (const char *publisher_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidName,
-                       ::Components::InvalidConnection)) = 0;
-
-  protected:
-    SVNT *servant_;
-    COMP_VAR component_;
-    typedef Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR> session_context;
+    get_registered_consumers (const char *publisher_name) = 0;
+
   private:
     /// Not to be used
     Upgradeable_Context_Impl (void);
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index 0e6c663ed5d..ab16249f04d 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -1,9 +1,9 @@
+
 // -*- C++ -*-
 // $Id$
-
-// This is file was automatically generated by $ACE_ROOT/bin/make_release.
+// 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 6 
-#define CIAO_VERSION "0.5.6"
+#define CIAO_MINOR_VERSION 5
+#define CIAO_BETA_VERSION 7
+#define CIAO_VERSION "0.5.7"
diff --git a/CIAO/ciao/CCM_ClientContainerInterceptor.idl b/CIAO/ciao/extension/CCM_ClientContainerInterceptor.idl
index 27a5fdc8929..27a5fdc8929 100644
--- a/CIAO/ciao/CCM_ClientContainerInterceptor.idl
+++ b/CIAO/ciao/extension/CCM_ClientContainerInterceptor.idl
diff --git a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl b/CIAO/ciao/extension/CCM_ClientContainerInterceptorRegistration.idl
index 031f06f1a0f..031f06f1a0f 100644
--- a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl
+++ b/CIAO/ciao/extension/CCM_ClientContainerInterceptorRegistration.idl
diff --git a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl b/CIAO/ciao/extension/CCM_ContainerClientRequestInfo.idl
index b44dac880b8..b44dac880b8 100644
--- a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl
+++ b/CIAO/ciao/extension/CCM_ContainerClientRequestInfo.idl
diff --git a/CIAO/ciao/CCM_ContainerInterceptor.idl b/CIAO/ciao/extension/CCM_ContainerInterceptor.idl
index b5ccdf52fae..b5ccdf52fae 100644
--- a/CIAO/ciao/CCM_ContainerInterceptor.idl
+++ b/CIAO/ciao/extension/CCM_ContainerInterceptor.idl
diff --git a/CIAO/ciao/CCM_ContainerRequestInfo.idl b/CIAO/ciao/extension/CCM_ContainerRequestInfo.idl
index 3fb590acc16..3fb590acc16 100644
--- a/CIAO/ciao/CCM_ContainerRequestInfo.idl
+++ b/CIAO/ciao/extension/CCM_ContainerRequestInfo.idl
diff --git a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl b/CIAO/ciao/extension/CCM_ContainerServantRequestInfo.idl
index 0a3348b8f7e..0a3348b8f7e 100644
--- a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl
+++ b/CIAO/ciao/extension/CCM_ContainerServantRequestInfo.idl
diff --git a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl b/CIAO/ciao/extension/CCM_ContainerServerRequestInfo.idl
index 4868e6a2e8d..4868e6a2e8d 100644
--- a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl
+++ b/CIAO/ciao/extension/CCM_ContainerServerRequestInfo.idl
diff --git a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl b/CIAO/ciao/extension/CCM_ContainerStubRequestInfo.idl
index da14afa9e08..da14afa9e08 100644
--- a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl
+++ b/CIAO/ciao/extension/CCM_ContainerStubRequestInfo.idl
diff --git a/CIAO/ciao/CCM_ExtensionComponent.idl b/CIAO/ciao/extension/CCM_ExtensionComponent.idl
index 585e5e85f64..585e5e85f64 100644
--- a/CIAO/ciao/CCM_ExtensionComponent.idl
+++ b/CIAO/ciao/extension/CCM_ExtensionComponent.idl
diff --git a/CIAO/ciao/CCM_ExtensionContext.idl b/CIAO/ciao/extension/CCM_ExtensionContext.idl
index 33fa969b436..33fa969b436 100644
--- a/CIAO/ciao/CCM_ExtensionContext.idl
+++ b/CIAO/ciao/extension/CCM_ExtensionContext.idl
diff --git a/CIAO/ciao/CCM_InvalidRegistration.idl b/CIAO/ciao/extension/CCM_InvalidRegistration.idl
index a5dc36c640e..a5dc36c640e 100644
--- a/CIAO/ciao/CCM_InvalidRegistration.idl
+++ b/CIAO/ciao/extension/CCM_InvalidRegistration.idl
diff --git a/CIAO/ciao/CCM_QoS.idl b/CIAO/ciao/extension/CCM_QoS.idl
index f78f98d3665..f78f98d3665 100644
--- a/CIAO/ciao/CCM_QoS.idl
+++ b/CIAO/ciao/extension/CCM_QoS.idl
diff --git a/CIAO/ciao/CCM_ServantContainerInterceptor.idl b/CIAO/ciao/extension/CCM_ServantContainerInterceptor.idl
index 884a1af2599..884a1af2599 100644
--- a/CIAO/ciao/CCM_ServantContainerInterceptor.idl
+++ b/CIAO/ciao/extension/CCM_ServantContainerInterceptor.idl
diff --git a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl b/CIAO/ciao/extension/CCM_ServantContainerInterceptorRegistration.idl
index 39448de9a58..39448de9a58 100644
--- a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl
+++ b/CIAO/ciao/extension/CCM_ServantContainerInterceptorRegistration.idl
diff --git a/CIAO/ciao/CCM_ServerContainerInterceptor.idl b/CIAO/ciao/extension/CCM_ServerContainerInterceptor.idl
index 58ce5cc69a7..58ce5cc69a7 100644
--- a/CIAO/ciao/CCM_ServerContainerInterceptor.idl
+++ b/CIAO/ciao/extension/CCM_ServerContainerInterceptor.idl
diff --git a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl b/CIAO/ciao/extension/CCM_ServerContainerInterceptorRegistration.idl
index b4a3dafac26..b4a3dafac26 100644
--- a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl
+++ b/CIAO/ciao/extension/CCM_ServerContainerInterceptorRegistration.idl
diff --git a/CIAO/ciao/CCM_StubContainerInterceptor.idl b/CIAO/ciao/extension/CCM_StubContainerInterceptor.idl
index c183801af86..c183801af86 100644
--- a/CIAO/ciao/CCM_StubContainerInterceptor.idl
+++ b/CIAO/ciao/extension/CCM_StubContainerInterceptor.idl
diff --git a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl b/CIAO/ciao/extension/CCM_StubContainerInterceptorRegistration.idl
index 61ae62f51fa..61ae62f51fa 100644
--- a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl
+++ b/CIAO/ciao/extension/CCM_StubContainerInterceptorRegistration.idl
diff --git a/CIAO/ciao/extension/ExtensionContext.cpp b/CIAO/ciao/extension/ExtensionContext.cpp
new file mode 100644
index 00000000000..7592e2b97d2
--- /dev/null
+++ b/CIAO/ciao/extension/ExtensionContext.cpp
@@ -0,0 +1,98 @@
+// $Id$
+
+#include "ExtensionContext.h"
+
+namespace CIAO
+{
+  ExtensionContext_Impl::ExtensionContext_Impl (Components::CCMHome_ptr home,
+                                                Session_Container * c)
+    : CIAO::Context_Impl_Base (home, c)
+  {
+  }
+
+  ExtensionContext_Impl::~ExtensionContext_Impl (void)
+  {
+  }
+
+  ::Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_client_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_server_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_stub_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_servant_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::Cookie *
+  ExtensionContext_Impl::install_service_reference (
+        const char * /*service_id*/,
+        ::CORBA::Object_ptr /*objref*/)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::CORBA::Object_ptr
+  ExtensionContext_Impl::uninstall_service_reference (::Components::Cookie * /*ck*/)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  // Operations from ::Components::CCMContext.
+
+  Components::Principal_ptr
+  ExtensionContext_Impl::get_caller_principal (void)
+  {
+    return CIAO::Context_Impl_Base::get_caller_principal ();
+  }
+
+  Components::CCMHome_ptr
+  ExtensionContext_Impl::get_CCM_home (void)
+  {
+    return CIAO::Context_Impl_Base::get_CCM_home ();
+  }
+
+  CORBA::Boolean
+  ExtensionContext_Impl::get_rollback_only (void)
+  {
+    return CIAO::Context_Impl_Base::get_rollback_only ();
+  }
+
+  Components::Transaction::UserTransaction_ptr
+  ExtensionContext_Impl::get_user_transaction (void)
+  {
+    return CIAO::Context_Impl_Base::get_user_transaction ();
+  }
+
+  CORBA::Boolean
+  ExtensionContext_Impl::is_caller_in_role (const char * role)
+  {
+    return CIAO::Context_Impl_Base::is_caller_in_role (role);
+  }
+
+  void
+  ExtensionContext_Impl::set_rollback_only (void)
+  {
+    CIAO::Context_Impl_Base::set_rollback_only ();
+  }
+
+  CORBA::Object_ptr
+  ExtensionContext_Impl::resolve_service_reference(const char *service_id)
+  {
+    return CIAO::Context_Impl_Base::resolve_service_reference (service_id);
+  }
+}
diff --git a/CIAO/ciao/extension/ExtensionContext.h b/CIAO/ciao/extension/ExtensionContext.h
new file mode 100644
index 00000000000..d2ea1ee9948
--- /dev/null
+++ b/CIAO/ciao/extension/ExtensionContext.h
@@ -0,0 +1,90 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ExtensionContext.h
+ *
+ *  $Id$
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef CIAO_EXTENSIONCONTEXT_H
+#define CIAO_EXTENSIONCONTEXT_H
+
+#include /**/ "ace/pre.h"
+
+#include "CIAO_Server_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ciao/CCM_ExtensionContextC.h"
+#include "ciao/Context_Impl_Base.h"
+#include "tao/Objref_VarOut_T.h"
+
+namespace Components
+{
+  class CCMHome;
+  typedef CCMHome *CCMHome_ptr;
+
+  typedef
+    TAO_Objref_Var_T<
+        CCMHome
+      >
+    CCMHome_var;
+}
+
+namespace CIAO
+{
+  class CIAO_SERVER_Export ExtensionContext_Impl
+    : public virtual Components::ExtensionContext,
+      public virtual CIAO::Context_Impl_Base
+  {
+  public:
+    ExtensionContext_Impl(Components::CCMHome_ptr home, Session_Container * c);
+
+    virtual ~ExtensionContext_Impl (void);
+
+    // Operations from ::Components::CCMContext.
+
+    virtual Components::Principal_ptr get_caller_principal (void);
+
+    virtual Components::CCMHome_ptr get_CCM_home (void);
+
+    virtual CORBA::Boolean get_rollback_only (void);
+
+    virtual Components::Transaction::UserTransaction_ptr get_user_transaction (void);
+
+    virtual CORBA::Boolean is_caller_in_role (const char *role);
+
+    virtual void set_rollback_only (void);
+
+    virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
+
+    virtual ::Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration_ptr get_client_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration_ptr get_server_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration_ptr get_stub_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration_ptr get_servant_interceptor_registration (void);
+
+    virtual ::Components::Cookie * install_service_reference (
+        const char * service_id,
+        ::CORBA::Object_ptr objref);
+
+    virtual ::CORBA::Object_ptr uninstall_service_reference (
+        ::Components::Cookie * ck);
+
+  private:
+    ExtensionContext_Impl (void);
+  };
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_CONTEXT_IMPL_BASE_H */
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index a5a1417673e..7a9d37a309a 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
+project (CIAO_Events) : orbsvcslib, ciao_rtevent_dnc {
 
-  sharedname  = CIAO_DnC_Events
+  sharedname  = CIAO_Events
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
 
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
index 9f6729ea0ef..98a9eb38a2b 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
@@ -26,9 +26,6 @@ namespace CIAO
       ::Components::EventBase * evt,
       const char * source_id,
       ::CORBA::TypeCode_ptr tc)
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::BadEventType))
    {
       ACE_UNUSED_ARG (evt);
       ACE_UNUSED_ARG (source_id);
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
index be9e8f68e36..062026bb3f0 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
@@ -40,14 +40,10 @@ namespace CIAO
     virtual ~EventServiceBase (void);
 
     /// A factory method for Supplier_Config objects
-    virtual Supplier_Config_ptr
-    create_supplier_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    virtual Supplier_Config_ptr create_supplier_config (void) = 0;
 
     /// A factory method for Consumer_Config objects
-    virtual Consumer_Config_ptr
-    create_consumer_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    virtual Consumer_Config_ptr create_consumer_config (void) = 0;
 
     /**
      * @fn void connect_event_supplier (Supplier_Config_ptr supplier_config)
@@ -55,10 +51,7 @@ namespace CIAO
      * Connects an event supplier using the options specified by
      * @c supplier_config.
      */
-    virtual void connect_event_supplier (
-        Supplier_Config_ptr supplier_config)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
+    virtual void connect_event_supplier (Supplier_Config_ptr supplier_config) = 0;
 
     /**
      * @fn void connect_event_consumer (Consumer_Config_ptr consumer_config)
@@ -66,42 +59,28 @@ namespace CIAO
      * Connects an event consumer using the options specified by
      * @c consumer_config.
      */
-    virtual void connect_event_consumer (
-        Consumer_Config_ptr consumer_config)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
+    virtual void connect_event_consumer (Consumer_Config_ptr consumer_config) = 0;
 
     /**
      * @fn void disconnect_event_supplier ()
      *
      * Disconnects the event supplier associated with this object.
      */
-    virtual void disconnect_event_supplier (
-        const char * consumer_id)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection)) = 0;
+    virtual void disconnect_event_supplier (const char * consumer_id) = 0;
 
     /**
      * @fn void disconnect_event_consumer (CONNECTION_ID consumer_id)
      *
      * Disconnects the event consumer with UUID @c consumer_id.
      */
-    virtual void disconnect_event_consumer (
-        const char * consumer_id)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection)) = 0;
+    virtual void disconnect_event_consumer (const char * consumer_id) = 0;
 
     /**
      * @fn void push_event (Components::EventBase * ev)
      *
      * Pushes event @c ev to all consumers.
      */
-    virtual void push_event (
-        Components::EventBase * ev)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
+    virtual void push_event (Components::EventBase * ev) = 0;
 
     /**
      * Pushes event @c ev to all consumers. The source id of the
@@ -110,31 +89,20 @@ namespace CIAO
     virtual void ciao_push_event (
         ::Components::EventBase * evt,
         const char * source_id,
-        ::CORBA::TypeCode_ptr tc)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::BadEventType));
+        ::CORBA::TypeCode_ptr tc);
   };
 
   class Event_Consumer_Config_Base :
     public virtual POA_CIAO::Consumer_Config
   {
   public:
-    virtual void start_conjunction_group (
-        ::CORBA::Long size)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
+    virtual void start_conjunction_group (::CORBA::Long size) = 0;
 
-    virtual void start_disjunction_group (
-        ::CORBA::Long size)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
+    virtual void start_disjunction_group (::CORBA::Long size) = 0;
 
-    virtual void insert_source (
-        const char * source_id)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
+    virtual void insert_source (const char * source_id) = 0;
 
-    virtual void insert_type (
-        ::CORBA::Long  event_type)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
+    virtual void insert_type (::CORBA::Long event_type) = 0;
   };
 }
 
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
index ef9688d0d5b..e7602e2e0ac 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -2,9 +2,9 @@
 // $Id$
 
 
-project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
+project (CIAO_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
 
-  sharedname  = CIAO_DnC_Events_Base
+  sharedname  = CIAO_Events_Base
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
 
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index 1ef5b1ad889..91d79b12383 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -41,7 +41,6 @@ namespace CIAO
 
   Supplier_Config_ptr
   RTEventService::create_supplier_config (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     RTEvent_Supplier_Config_impl * supplier_config = 0;
     ACE_NEW_RETURN (supplier_config,
@@ -55,7 +54,6 @@ namespace CIAO
 
   Consumer_Config_ptr
   RTEventService::create_consumer_config (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     RTEvent_Consumer_Config_impl * consumer_config = 0;
     ACE_NEW_RETURN (consumer_config,
@@ -72,8 +70,6 @@ namespace CIAO
   void
   RTEventService::connect_event_supplier (
       Supplier_Config_ptr supplier_config)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 9)
       {
@@ -125,8 +121,6 @@ namespace CIAO
   void
   RTEventService::connect_event_consumer (
       Consumer_Config_ptr consumer_config)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 9)
       {
@@ -193,9 +187,6 @@ namespace CIAO
   void
   RTEventService::disconnect_event_supplier (
       const char * connection_id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Components::InvalidConnection))
   {
     ACE_UNUSED_ARG (connection_id);
 
@@ -209,9 +200,6 @@ namespace CIAO
   void
   RTEventService::disconnect_event_consumer (
       const char * connection_id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Components::InvalidConnection))
   {
     RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier;
 
@@ -223,8 +211,6 @@ namespace CIAO
   void
   RTEventService::push_event (
       Components::EventBase * ev)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     ACE_UNUSED_ARG (ev);
     if (CIAO::debug_level () > 10)
@@ -238,9 +224,6 @@ namespace CIAO
       Components::EventBase * ev,
       const char * source_id,
       CORBA::TypeCode_ptr tc)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Components::BadEventType))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -288,8 +271,6 @@ namespace CIAO
 
   void
   RTEventService::create_rt_event_channel (const char * ec_name)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -323,8 +304,6 @@ namespace CIAO
         const char * name,
         ::CORBA::UShort port,
         const char * address)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException))
   {
     ACE_DEBUG ((LM_ERROR, "Create an address server using port [%d]\n", port));
 
@@ -370,8 +349,6 @@ namespace CIAO
   ::CORBA::Boolean
   RTEventService::create_sender (
         const char * addr_serv_id)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Create a Sender object with addr_serv_id: %s\n",addr_serv_id ));
 
@@ -410,8 +387,6 @@ namespace CIAO
         const char * addr_serv_id,
         ::CORBA::Boolean is_multicast,
         ::CORBA::UShort listen_port)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Create a receiver object with addr_serv_id: %s\n",addr_serv_id ));
 
@@ -490,7 +465,6 @@ namespace CIAO
 
   ::RtecEventChannelAdmin::EventChannel_ptr
   RTEventService::tao_rt_event_channel ()
-    ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     return this->rt_event_channel_.in ();
   }
@@ -507,8 +481,6 @@ namespace CIAO
 
   void
   RTEventServiceSupplier_impl::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((
-         CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
     this->poa_->deactivate_object (oid);
@@ -529,7 +501,6 @@ namespace CIAO
 
   void
   RTEventServiceConsumer_impl::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -575,7 +546,6 @@ namespace CIAO
 
   void
   RTEventServiceConsumer_impl::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -610,8 +580,6 @@ namespace CIAO
   void
   RTEvent_Supplier_Config_impl::supplier_id (
       const char * supplier_id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
   if (CIAO::debug_level () > 10)
     {
@@ -642,24 +610,18 @@ namespace CIAO
 
   CONNECTION_ID
   RTEvent_Supplier_Config_impl::supplier_id ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     return CORBA::string_dup (this->supplier_id_.c_str ());
   }
 
   EventServiceType
   RTEvent_Supplier_Config_impl::service_type ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     return this->service_type_;
   }
 
   RtecEventChannelAdmin::SupplierQOS *
   RTEvent_Supplier_Config_impl::rt_event_qos ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     RtecEventChannelAdmin::SupplierQOS * supplier_qos = 0;
     ACE_NEW_RETURN (supplier_qos,
@@ -670,8 +632,6 @@ namespace CIAO
 
   void
   RTEvent_Supplier_Config_impl::destroy ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
     this->poa_->deactivate_object (oid);
@@ -697,8 +657,6 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::start_conjunction_group (
       CORBA::Long size)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     ACE_DEBUG
       ((LM_DEBUG, "RTEvent_Consumer_Config_impl::start_conjunction_group\n"));
@@ -709,8 +667,6 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::start_disjunction_group (
       CORBA::Long size)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     // Note, since we only support basic builder here...
     if (size == 0L)
@@ -722,8 +678,6 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::insert_source (
       const char * source_id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     ACE_Hash<ACE_CString> hasher;
     RtecEventComm::EventSourceID int_source_id = hasher (source_id);
@@ -737,7 +691,6 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::insert_type (
         ::CORBA::Long event_type)
-      ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     if (event_type == 0L)
       this->qos_.insert_type (ACE_ES_EVENT_ANY, 0);
@@ -749,8 +702,6 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::consumer_id (
       const char * consumer_id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -766,16 +717,12 @@ namespace CIAO
   void
   RTEvent_Consumer_Config_impl::consumer (
       Components::EventConsumerBase_ptr consumer)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     this->consumer_ = Components::EventConsumerBase::_duplicate (consumer);
   }
 
   CONNECTION_ID
   RTEvent_Consumer_Config_impl::consumer_id ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     return CORBA::string_dup (this->consumer_id_.c_str ());
   }
@@ -783,16 +730,12 @@ namespace CIAO
 
   EventServiceType
   RTEvent_Consumer_Config_impl::service_type ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     return this->service_type_;
   }
 
   Components::EventConsumerBase_ptr
   RTEvent_Consumer_Config_impl::consumer ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
@@ -804,8 +747,6 @@ namespace CIAO
 
   RtecEventChannelAdmin::ConsumerQOS *
   RTEvent_Consumer_Config_impl::rt_event_qos ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     RtecEventChannelAdmin::ConsumerQOS * consumer_qos = 0;
     ACE_NEW_RETURN (consumer_qos,
@@ -817,8 +758,6 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::destroy ()
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
   {
     if (CIAO::debug_level () > 10)
       {
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
index 7737643b0a4..47d5e0b9bbc 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
@@ -61,78 +61,52 @@ namespace CIAO
     virtual ~RTEventService (void);
 
     virtual Supplier_Config_ptr
-    create_supplier_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    create_supplier_config (void);
 
     virtual Consumer_Config_ptr
-    create_consumer_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    create_consumer_config (void);
 
     virtual void connect_event_supplier (
-        CIAO::Supplier_Config_ptr supplier_config)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+        CIAO::Supplier_Config_ptr supplier_config);
 
     virtual void connect_event_consumer (
-        CIAO::Consumer_Config_ptr consumer_config)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+        CIAO::Consumer_Config_ptr consumer_config);
 
     virtual void
     disconnect_event_supplier (
-        const char * consumer_id)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection));
+        const char * consumer_id);
 
     virtual void disconnect_event_consumer (
-        const char * connection_id)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection));
+        const char * connection_id);
 
     virtual void push_event (
-        Components::EventBase * ev)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+        Components::EventBase * ev);
 
     virtual void ciao_push_event (
         Components::EventBase * evt,
         const char * source_id,
-        CORBA::TypeCode_ptr tc)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Components::BadEventType));
+        CORBA::TypeCode_ptr tc);
 
     virtual ::CORBA::Boolean create_addr_serv (
         const char * name,
         ::CORBA::UShort port,
-        const char * address)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException));
+        const char * address);
 
     virtual ::CORBA::Boolean create_sender (
-        const char * addr_serv_id)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException));
+        const char * addr_serv_id);
 
     virtual ::CORBA::Boolean create_receiver (
         const char * addr_serv_id,
         ::CORBA::Boolean is_multicast,
-        ::CORBA::UShort listen_port)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException));
+        ::CORBA::UShort listen_port);
 
     virtual ::RtecEventChannelAdmin::EventChannel_ptr tao_rt_event_channel (
-      )
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+      );
 
   private:
     // @@ (GD) This is the place where use could provide a parameter
     //         which specifies the event channel service configuration file.
-    void create_rt_event_channel (const char * ec_name)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+    void create_rt_event_channel (const char * ec_name);
 
   private:
 
@@ -198,9 +172,7 @@ namespace CIAO
     RTEventServiceSupplier_impl (
       PortableServer::POA_ptr poa);
 
-    virtual void disconnect_push_supplier ()
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+    virtual void disconnect_push_supplier ();
 
   private:
 
@@ -222,13 +194,9 @@ namespace CIAO
       Components::EventConsumerBase_ptr consumer);
 
     virtual void push (
-      const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException));
+      const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer ()
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+    virtual void disconnect_push_consumer ();
 
   private:
 
@@ -255,47 +223,30 @@ namespace CIAO
 
     virtual ~RTEvent_Consumer_Config_impl (void);
 
-    virtual void start_conjunction_group (CORBA::Long size)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start_conjunction_group (CORBA::Long size);
 
-    virtual void start_disjunction_group (CORBA::Long size)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start_disjunction_group (CORBA::Long size);
 
-    virtual void insert_source (const char * source_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void insert_source (const char * source_id);
 
-    virtual void insert_type (::CORBA::Long event_type)
-      ACE_THROW_SPEC ((::CORBA::SystemException));
+    virtual void insert_type (::CORBA::Long event_type);
 
-    virtual void consumer_id (const char * consumer_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void consumer_id (const char * consumer_id);
 
-    virtual CONNECTION_ID consumer_id ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CONNECTION_ID consumer_id ();
 
-    //virtual void supplier_id (const char * supplier_id)
-    //  ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void consumer (Components::EventConsumerBase_ptr consumer);
 
-    //virtual CONNECTION_ID supplier_id ()
-    //  ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Components::EventConsumerBase_ptr consumer ();
 
-    virtual void consumer (Components::EventConsumerBase_ptr consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Components::EventConsumerBase_ptr consumer ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual EventServiceType service_type ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual EventServiceType service_type ();
 
     //@@ (GD) There should be a place where the deployment tool could
   //        set up the rt_event_qos properties for Consumer Config.
 
-    virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos ();
 
-    virtual void destroy ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy ();
 
   private:
 
@@ -326,23 +277,18 @@ namespace CIAO
 
     virtual ~RTEvent_Supplier_Config_impl (void);
 
-    void supplier_id (const char * supplier_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void supplier_id (const char * supplier_id);
 
-    CONNECTION_ID supplier_id ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CONNECTION_ID supplier_id ();
 
-    EventServiceType service_type ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    EventServiceType service_type ();
 
     //@@ (GD) There should be a place where the deployment tool could
     //        set up the rt_event_qos properties for Supplier Config.
 
-    RtecEventChannelAdmin::SupplierQOS * rt_event_qos ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    RtecEventChannelAdmin::SupplierQOS * rt_event_qos ();
 
-    virtual void destroy ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy ();
 
   private:
     ACE_CString supplier_id_;
diff --git a/CIAO/docs/schema/Basic_Deployment_Data.xsd b/CIAO/docs/schema/Basic_Deployment_Data.xsd
index 1d386841ea5..c857bd54858 100644
--- a/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ b/CIAO/docs/schema/Basic_Deployment_Data.xsd
@@ -49,7 +49,13 @@
   <xsd:complexType name="DataType">
     <xsd:sequence>
       <xsd:element name="kind" type="Deployment:TCKind"/>
-      <xsd:element name="enum" type="Deployment:EnumType" minOccurs="0"/>
+      <xsd:choice minOccurs="0">
+        <xsd:element name="enum" type="Deployment:EnumType" />
+        <xsd:element name="struct" type="Deployment:StructType"/>
+        <xsd:element name="value" type="Deployment:ValueType"/>
+        <xsd:element name="sequence" type="Deployment:SequenceType"/>
+       </xsd:choice>
+
 <!--
 @@ not supported now..
 
@@ -57,13 +63,11 @@
       <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
       <xsd:element name="fixed" type="Deployment:FixedType"/>
       <xsd:element name="array" type="Deployment:ArrayType"/>
-      <xsd:element name="sequence" type="Deployment:SequenceType"/>
       <xsd:element name="alias" type="Deployment:AliasType"/>
-      <xsd:element name="struct" type="Deployment:StructType"/>
-      <xsd:element name="value" type="Deployment:ValueType"/>
       <xsd:element name="union" type="Deployment:UnionType"/>
 -->
     </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
   <xsd:complexType name="DataValue">
@@ -90,7 +94,7 @@
       <!-- <xsd:element name="discriminator" type="Deployment:DataValue"/> -->
       <!-- <xsd:element name="value" type="Deployment:DataValue"/> -->
       <!-- <xsd:element name="boxedValue" type="Deployment:DataValue"/> -->
-      <!-- <xsd:element name="member" type="Deployment:NamedValue"/> -->
+      <xsd:element name="member" type="Deployment:NamedValue"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -102,6 +106,53 @@
     </xsd:sequence>
   </xsd:complexType>
 
+  <xsd:complexType name="StructType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="member" type="Deployment:StructMemberType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="StructMemberType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ValueType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="modifier" type="xsd:string"/>
+      <xsd:element name="baseType" type="Deployment:DataType"/>
+      <xsd:element name="member" type="Deployment:ValueMemberType" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ValueMemberType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="visibility" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="NamedValue">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="SequenceType">
+    <xsd:sequence>
+      <xsd:element name="bound" type="xsd:string" minOccurs="0" />
+      <xsd:element name="elementType" type="Deployment:DataType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
   <xsd:complexType name="Any">
     <xsd:sequence>
       <xsd:element name="type" type="Deployment:DataType"/>
@@ -214,7 +265,7 @@
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
       <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
+      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
diff --git a/CIAO/docs/schema/CIAOServerResources.xsd b/CIAO/docs/schema/CIAOServerResources.xsd
index d9fb63da88f..7a62a0e6eab 100644
--- a/CIAO/docs/schema/CIAOServerResources.xsd
+++ b/CIAO/docs/schema/CIAOServerResources.xsd
@@ -171,6 +171,8 @@
     </xsd:annotation>
     <xsd:choice maxOccurs="unbounded">
       <xsd:element name="priorityModel" type="CIAO:PriorityModelPolicyDef"/>
+      <xsd:element name="nwpriorityModel" type="CIAO:NWPriorityModelPolicyDef"/>
+      <xsd:element name="cnwpriorityModel" type="CIAO:CNWPriorityModelPolicyDef"/>
       <xsd:element name="threadpool" type="xsd:IDREF"/>
       <xsd:element name="priorityBandedConnection" type="xsd:IDREF"/>
     </xsd:choice>
@@ -184,6 +186,13 @@
     </xsd:restriction>
   </xsd:simpleType>
 
+  <xsd:simpleType name="NWPriorityModel">
+    <xsd:restriction base="xsd:NCName">
+      <xsd:enumeration value="SERVER_DECLARED_NWPRIORITY"/>
+      <xsd:enumeration value="CLIENT_PROPAGATED_NWPRIORITY"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
   <xsd:complexType name="PriorityModelPolicyDef">
     <xsd:sequence>
       <xsd:element name="priority_model" type="CIAO:PriorityModel"/>
@@ -191,4 +200,19 @@
     <xsd:attribute name="server_priority" type="CIAO:Priority"/>
   </xsd:complexType>
 
+  <xsd:complexType name="NWPriorityModelPolicyDef">
+    <xsd:sequence>
+      <xsd:element name="nw_priority_model" type="CIAO:NWPriorityModel"/>
+      <xsd:element name="request_dscp" type="xsd:long"/>
+      <xsd:element name="reply_dscp" type="xsd:long"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CNWPriorityModelPolicyDef">
+    <xsd:sequence>
+      <xsd:element name="request_dscp" type="xsd:long"/>
+      <xsd:element name="reply_dscp" type="xsd:long"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
 </xsd:schema>
diff --git a/CIAO/docs/schema/ServerResourceUsage.txt b/CIAO/docs/schema/ServerResourceUsage.txt
index 061e2cc4422..d8fc47ca7b3 100644
--- a/CIAO/docs/schema/ServerResourceUsage.txt
+++ b/CIAO/docs/schema/ServerResourceUsage.txt
@@ -1,7 +1,7 @@
                   How to use CIAOServerResources.xsd
 
 Assuming we store two CIAO:ServerResources documents in two XML files
-called "RTLinuxServerConfig.xml" and "RTwIN32ServerConfig.xml"
+called "RTLinuxServerConfig.csr" and "RTwIN32ServerConfig.csr"
 respectively.  Two things need to happen in order to use the
 PolicySet's defined in these files.  First, we need to tell the DnC
 tools what are all the CIAOServerResources files a DeploymentPlan
@@ -21,7 +21,7 @@ filenames.
           <kind>tk_string</kind>
         </type>
         <value>
-         <string>RTLinuxServerConfig.xml</string>
+         <string>RTLinuxServerConfig.csr</string>
         </value>
      </value>
 
@@ -31,14 +31,14 @@ filenames.
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>RTWin32ServerConfig.xml</string>
+          <string>RTWin32ServerConfig.csr</string>
         </value>
      </value>
    </infoProperty>
 
 Second, we can now use the policy sets defined in these files by
 associating a policy set with the entity the policy set will be
-applied.  Currently, only associations with component instances are
+applied on.  Currently, only associations with component instances are
 supported.  A component instance in deployment plan can specify the
 policy set it wishes to be instantiated with.  A PolicySet is
 referenced by its name and the CIAO:ServerResources name.
@@ -47,13 +47,16 @@ referenced by its name and the CIAO:ServerResources name.
      ....
      <instance ...>
 
-     
        <deployedResource>
          <resourceUsage>InstanceUsesResource</resourceUsage>
-         <requirementName>CIAO:ServerResources</requirementName>
+         <requirementName>CIAO:PolicySet</requirementName>
          <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
          <property>
-           <name>CIAO:PolicySetName</name>
+// 
+// name could be CIAO:InstancePolicy or CIAO:ReceptaclePolicy.
+// Here we show an example of an CIAO::InstancePolicy.
+//
+           <name>CIAO:InstancePolicy</name>
            <value>
              <type>tk_string</type>
              <value>
@@ -63,6 +66,43 @@ referenced by its name and the CIAO:ServerResources name.
          </property>
        </deployedResource>
 
+// Now we show an example of a CIAO:ReceptaclePolicy.
+//
+       <deployedResource>
+         <resourceUsage>InstanceUsesResource</resourceUsage>
+         <requirementName>CIAO:PolicySet</requirementName>
+         <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
+//
+// First we specify that we are going to define a receptacle policy.
+//
+         <property>
+//
+// Note the name of the policy.
+//
+           <name>CIAO:ReceptaclePolicy</name>
+           <value>
+             <type>tk_string</type>
+             <value>
+               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
+             </value>
+           </value>
+         </property>
+//
+// Now we specify the receptacle (using the receptacle name) that is going to
+// be associated with this policy.
+//
+         <property>
+           <name>receptacle name from the .ccd file</name>
+           <value>
+             <type>tk_string</type>
+             <value>
+               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
+             </value>
+           </value>
+         </property>
+       </deployedResource>
+
+     </instance>
      </instance>
    </deploymentplan>
   
diff --git a/CIAO/docs/schema/cid.xsd b/CIAO/docs/schema/cid.xsd
index 7e5233d770f..d01247061d3 100644
--- a/CIAO/docs/schema/cid.xsd
+++ b/CIAO/docs/schema/cid.xsd
@@ -5,9 +5,10 @@
             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="iad.xsd" />
   <xsd:include schemaLocation="pcd.xsd" />
+  <xsd:include schemaLocation="cpd.xsd" />
 
   <xsd:complexType name="SubcomponentInstantiationDescription">
     <xsd:sequence>
diff --git a/CIAO/docs/schema/cpd.xsd b/CIAO/docs/schema/cpd.xsd
index 6f049fa839b..ab976dceb72 100644
--- a/CIAO/docs/schema/cpd.xsd
+++ b/CIAO/docs/schema/cpd.xsd
@@ -4,8 +4,8 @@
             xmlns:Deployment="http://www.omg.org/Deployment"
             targetNamespace="http://www.omg.org/Deployment">
 
-            <xsd:include schemaLocation="ccd.xsd" />
             <xsd:include schemaLocation="cid.xsd" />
+            <xsd:include schemaLocation="ccd.xsd" />
 
   <xsd:complexType name="PackagedComponentImplementation">
     <xsd:sequence>
diff --git a/CIAO/docs/schema/xsc-banner.h b/CIAO/docs/schema/xsc-banner.h
index 9f433e2a68a..30370e90f40 100644
--- a/CIAO/docs/schema/xsc-banner.h
+++ b/CIAO/docs/schema/xsc-banner.h
@@ -15,4 +15,3 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
index aedbcd3769b..72bd5704e61 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
@@ -34,7 +34,6 @@
 // get_component implementation.
 CORBA::Object_ptr
 [ciao module name]::[facet type]_Servant::_get_component ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (this->ctx_.in ());
@@ -48,7 +47,7 @@ CORBA::Object_ptr
   if (! CORBA::is_nil(ec.in ()))
     return ec->get_CCM_object ();
 
-  ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  throw CORBA::INTERNAL ();
 }
 
 ##end foreach [facet type]
@@ -65,7 +64,6 @@ CORBA::Object_ptr
     // struct [receptacle name]Connection.
 [receptacle name]Connections *
 [ciao module name]::[component name]_Context::get_connections_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Strategized locking here.
 
@@ -94,7 +92,6 @@ CORBA::Object_ptr
 ##foreach [event name] with [eventtype] in (list of all event sources) generate:
 void
 [ciao module name]::[component name]_Context::push_[event name] ([eventtype] *ev)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 ##  if [event name] belongs to an 'emits' port
   this->ciao_emits_[event name]_consumer_->push_[event name] (ev);
@@ -122,11 +119,9 @@ void
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
 ::Components::Cookie *
 [ciao module name]::[component name]_Context::subscribe_[publish name] ([eventtype]Consumer_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::ExceededConnectionLimit))
 {
   if (CORBA::is_nil (c))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   [eventtype]Consumer_var sub
     = [eventtype]Consumer::_duplicate (c);
@@ -143,19 +138,17 @@ void
 
 [eventtype]Consumer_ptr
 [ciao module name]::[component name]_Context::unsubscribe_[publish name] (::Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::InvalidConnection))
 {
   [eventtype]Consumer_var retv;
 
   ACE_Active_Map_Manager_Key key;
   if (ck == 0 ||
       CIAO::Map_Key_Cookie::extract (ck, key) == -1)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   if (this->ciao_publishes_[publish name]_map_.unbind (key,
                                                        retv) != 0)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   return retv._retn ();
 }
@@ -168,7 +161,6 @@ void
 
 [uses type]_ptr
 [ciao module name]::[component name]_Context::get_connection_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return [uses type]::_duplicate (this->ciao_uses_[receptacle name]_.in ());
 }
@@ -176,9 +168,6 @@ void
 // Simplex [receptacle name] connection management operations
 void
 [ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::AlreadyConnected,
-                   ::Components::InvalidConnection))
 {
   if (! CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ()))
     throw ::Components::AlreadyConnected ();
@@ -192,8 +181,6 @@ void
 
 [uses type]_ptr
 [ciao module name]::[component name]_Context::disconnect_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::NoConnection))
 {
   if (CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ()))
     throw ::Components::NoConnection ();
@@ -205,12 +192,9 @@ void
 // Multiplex [receptacle name] connection management operations
 ::Components::Cookie *
 [ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::ExceedConnectionLimit,
-                       ::Components::InvalidConnection))
 {
   if (CORBA::is_nil (c))
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   [uses type]_var conn
     = [uses type]::_duplicate (c);
@@ -227,19 +211,17 @@ void
 
 [uses type]_ptr
 [ciao module name]::[component name]_Context::disconnect_[receptacle name] (::Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::InvalidConnection))
 {
   [uses type]_var retv;
 
   ACE_Active_Map_Manager_Key key;
   if (ck == 0 ||
       CIAO::Map_Key_Cookie::extract (ck, key) == -1)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   if (this->ciao_muses_[receptacle name]_.unbind (key,
                                                   retv) != 0)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   return retv._retn ();
 }
@@ -250,8 +232,6 @@ void
 // Operations for ::Components::SessionContext interface
 CORBA::Object_ptr
 [ciao module name]::[component name]_Context::get_CCM_object ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::IllegalState))
 {
   // @@ How do I check for IllegalState here?  When it's not in a
   //    callback operation...
@@ -264,7 +244,7 @@ CORBA::Object_ptr
       this->component_ = [component name]::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->component_.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0); // This should not happen...
+        throw CORBA::INTERNAL (); // This should not happen...
     }
   return [component name]::_duplicate (this->component_.in ());
 }
@@ -319,14 +299,13 @@ CORBA::Object_ptr
 
 [facet type]_ptr
 [ciao module name]::[component name]_Servant::provide_[facet name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->provide_[facet name]_.in ()))
     {
       CCM_[facet type]_var fexe = this->executor_->get_[facet name] ();
 
       if (CORBA::is_nil (fexe.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+        throw CORBA::INTERNAL ();
 
       [ciao module name]::[facet type]_Servant *svt =
         new [ciao module name]::[facet type]_Servant (fexe.in (),
@@ -352,8 +331,6 @@ CORBA::Object_ptr
 // Inherit from ::Compopnents::EventBConsumerBase
 void
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_event (EventBase *ev)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::BadEventType))
 {
   [eventtype]_var ev_type = [eventtype]::_downcast (ev);
   if (ev_type != 0)
@@ -370,7 +347,6 @@ void
 // get_component implementation.
 [eventtype]Consumer_ptr
 [ciao module name]::[component name]_Servant::get_consumer_[consumer name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumes_[consumer name]_.in ()))
     {
@@ -394,11 +370,9 @@ void
 // Operations for Navigation interface
 CORBA::Object_ptr
 [ciao module name]::[component name]_Servant::provide_facet (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException ,
-                   Components::InvalidName))
 {
   if (name == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   // We simply iterate thru all the facets this component provides
   // now.  We can also use a hash map along with perfect hashing
@@ -410,12 +384,11 @@ CORBA::Object_ptr
     return this->provide_[facet name] ();
 ##end foreach [facet name] with [facet type]
 
-  ACE_THROW_RETURN (::Components::InvalidName (), 0);
+  throw ::Components::InvalidName ();
 }
 
 ::Components::FacetDescriptions *
 [ciao module name]::[component name]_Servant::get_all_facets ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::FacetDescriptions_var collection
       = new ::Components::FacetDescriptions (#99); // #99 = number of all provided
@@ -444,8 +417,6 @@ CORBA::Object_ptr
 
 ::Components::FacetDescriptions *
 [ciao module name]::[component name]_Servant::get_named_facets (const Components::NameList & names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   ::Components::FacetDescriptions_var collection
       = new ::Components::FacetDescriptions (names.length ());
@@ -467,7 +438,7 @@ CORBA::Object_ptr
         }
 ##end foreach [facet name] with [facet type]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
 
       collection[i] = x._retn ();
     }
@@ -476,10 +447,9 @@ CORBA::Object_ptr
 
 CORBA::Boolean
 [ciao module name]::[component name]_Servant::same_component (CORBA::Object_ptr object_ref)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (object_ref))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   CORBA::Object_var the_other = object_ref->_get_component ();
 
@@ -492,15 +462,10 @@ CORBA::Boolean
 ::Components::Cookie *
 [ciao module name]::[component name]_Servant::connect (const char * name,
                                                        CORBA::Object_ptr connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::InvalidConnection,
-                   Components::AlreadyConnected,
-                   Components::ExceededConnectionLimit))
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -509,7 +474,7 @@ CORBA::Boolean
         [uses type]::_narrow (connection);
 
       if (CORBA::is_nil (_ciao_conn.in ()))
-        ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+        throw ::Components::InvalidConnection ();
 
 ##  if [receptacle name] is a simplex receptacle ('uses')
       this->connect_[receptacle name] (_caio_conn.in ());
@@ -520,7 +485,7 @@ CORBA::Boolean
     }
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 /*
@@ -534,15 +499,10 @@ CORBA::Boolean
 CORBA::Object_ptr
 [ciao module name]::[component name]_Servant::disconnect (const char * name,
                                                           Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::InvalidConnection,
-                   Components::CookieRequired,
-                   Components::NoConnection))
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -553,17 +513,15 @@ CORBA::Object_ptr
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ConnectionDescriptions *
 [ciao module name]::[component name]_Servant::get_connections (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -585,12 +543,11 @@ CORBA::Object_ptr
     }
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ReceptacleDescriptions *
 [ciao module name]::[component name]_Servant::get_all_receptacles ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ReceptacleDescriptions_var retv =
       new ::Components::ReceptacleDescriptions (#99); // #99 is number of receptacles
@@ -617,8 +574,6 @@ CORBA::Object_ptr
 
 ::Components::ReceptacleDescriptions *
 [ciao module name]::[component name]_Servant::get_named_receptacles (const Components::NameList & names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   ::Components::ReceptacleDescriptions_var retv =
       new ::Components::ReceptacleDescriptions (names.length ());
@@ -642,7 +597,7 @@ CORBA::Object_ptr
         }
 ##end foreach [receptacle name] with [uses type]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
@@ -650,31 +605,25 @@ CORBA::Object_ptr
 // Operations for Events interface
 ::Components::EventConsumerBase_ptr
 [ciao module name]::[component name]_Servant::get_consumer (const char * sink_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   // @@ We can omit this if clause if there's no event sinks in this component.
   if (sink_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [consumer name] with [eventtype] in (list of all consumers) generate:
   if (ACE_OS_String::strcmp (sink_name, "[consumer name]") == 0)
     return this->get_consumer_[consumer name] ();
 ##end foreach [consumer name] with [eventtype]
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::Cookie *
 [ciao module name]::[component name]_Servant::subscribe (const char * publisher_name,
                                                          Components::EventConsumerBase_ptr subscriber)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::InvalidConnection,
-                   Components::ExceededConnectionLimit))
 {
   // @@ We can omit this if clause if there's no publisher in this component.
   if (publisher_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
@@ -683,25 +632,22 @@ CORBA::Object_ptr
         [eventtype]Consumer::_narrow (subscriber);
 
       if (CORBA::is_nil (_ciao_consumer.in ()))
-        ACE_THROW_RETURN (Components::InvalidConnection (), 0);
+        throw Components::InvalidConnection ();
 
       return this->subscribe_[publish name] (_ciao_consumer.in ());
     }
 ##end foreach [publish name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::EventConsumerBase_ptr
 [ciao module name]::[component name]_Servant::unsubscribe (const char * publisher_name,
                                                            Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::InvalidConnection))
 {
   // @@ We can omit this if clause if there's no publisher in this component.
   if (publisher_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
@@ -710,16 +656,12 @@ CORBA::Object_ptr
     }
 ##end foreach [publish name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 void
 [ciao module name]::[component name]_Servant::connect_consumer (const char * emitter_name,
                                                                 Components::EventConsumerBase_ptr consumer)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::AlreadyConnected,
-                   Components::InvalidConnection))
 {
   // @@ We can omit this if clause if there's no emitter in this component.
   if (emitter_name == 0)
@@ -744,13 +686,10 @@ void
 
 ::Components::EventConsumerBase_ptr
 [ciao module name]::[component name]_Servant::disconnect_consumer (const char * source_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName,
-                   Components::NoConnection))
 {
   // @@ We can omit this if clause if there's no emitter in this component.
   if (source_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
   if (ACE_OS_String::strcmp (source_name, "[emit name]") == 0)
@@ -759,12 +698,11 @@ void
     }
 ##end foreach [emit name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ConsumerDescriptions *
 [ciao module name]::[component name]_Servant::get_all_consumers ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ConsumerDescriptions_var retv =
       new ::Components::ConsumerDescriptions (#99); // #99 is the number of consumers
@@ -789,8 +727,6 @@ void
 
 ::Components::ConsumerDescriptions *
 [ciao module name]::[component name]_Servant::get_named_consumers (const Components::NameList & names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   ::Components::ConsumerDescriptions_var retv =
       new ::Components::ConsumerDescriptions (names.length ());
@@ -813,14 +749,13 @@ void
         }
 ##end foreach [consumer name] with [eventtype]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
 
 ::Components::EmitterDescriptions *
 [ciao module name]::[component name]_Servant::get_all_emitters ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::EmitterDescriptions_var retv =
       new ::Components::EmitterDescriptions (#99); // #99 is the number of emitters
@@ -842,8 +777,6 @@ void
 
 ::Components::EmitterDescriptions *
 [ciao module name]::[component name]_Servant::get_named_emitters (const Components::NameList & names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   ::Components::EmitterDescriptions_var retv =
       new ::Components::EmitterDescriptions (names.length ());
@@ -863,63 +796,54 @@ void
         }
 ##end foreach [consumer name] with [eventtype]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
 
 ::Components::PublisherDescriptions *
 [ciao module name]::[component name]_Servant::get_all_publishers ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ to-do
 
   // Need to add interfaces in the Context class to gather the information.
   // Or we can just relay it to the Context object.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::Components::PublisherDescriptions *
 [ciao module name]::[component name]_Servant::get_named_publishers (const Components::NameList & names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidName))
 {
   // @@ to-do
 
   // Need to add interfaces in the Context class to gather the information.
   // Or we can just relay it to the Context object.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 // Operations for CCMObject interface
 ::CORBA::IRObject_ptr
 [ciao module name]::[component name]_Servant::get_component_def ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ to-do: Connect to an IfR?
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::Components::CCMHome_ptr
 [ciao module name]::[component name]_Servant::get_ccm_home ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->context_->get_CCM_home ();
 }
 
 ::Components::PrimaryKeyBase *
 [ciao module name]::[component name]_Servant::get_primary_key ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::NoKeyAvailable))
 {
   // This is a keyless component.
-  ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+  throw ::Components::NoKeyAvailable ();
 }
 
 void
 [ciao module name]::[component name]_Servant::configuration_complete ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::InvalidConfiguration))
 {
   // @@ to-do
   // No-op.  Don't know how to pass this info to monolithic executor.
@@ -927,8 +851,6 @@ void
 
 void
 [ciao module name]::[component name]_Servant::remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   // @@ to-do
   // Need to figure out what to do here.  E.g., tear down the all the connections
@@ -937,7 +859,6 @@ void
 
 ::Components::ComponentPortDescription *
 [ciao module name]::[component name]_Servant::get_all_ports ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ComponentPortDescription_var retv =
     new OBV_Components::ComponentPortDescription;
@@ -969,7 +890,6 @@ void
 // get_component implementation.
 CORBA::Object_ptr
 [ciao module name]::[component name]_Servant::_get_component ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (this->context_);
@@ -985,12 +905,11 @@ CORBA::Object_ptr
   if (! CORBA::is_nil(ec.in ()))
     return ec->get_CCM_object ();
 
-  ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  throw CORBA::INTERNAL ();
 }
 
 void
 [ciao module name]::[component name]_Servant::_ciao_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (this->executor_.in ());
@@ -1001,7 +920,6 @@ void
 
 void
 [ciao module name]::[component name]_Servant::_ciao_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (this->executor_.in ());
@@ -1016,7 +934,6 @@ void
 
 [component name]_ptr
 [ciao module name]::[home name]_Servant::_ciao_activate_component (CCM_[component name]_ptr exe)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var hobj
     = this->container_->get_objref (this);
@@ -1050,7 +967,6 @@ void
 
 void
 [ciao module name]::[home name]_Servant::_ciao_passivate_component ([component name]_ptr comp)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid;
 
@@ -1070,11 +986,9 @@ void
 // Operations for Implicit Home interface
 [component name]_ptr
 [ciao module name]::[home name]_Servant::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CreateFailure))
 {
   if (this->executor_.in () == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   Components::EnterpriseComponent_var _ciao_ec =
     this->executor_->create ();
@@ -1088,8 +1002,6 @@ void
 // Operations for CCMHome interface
 void
 [ciao module name]::[home name]_Servant::remove_component (Components::CCMObject_ptr comp)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
 {
   [component name]_var _ciao_comp
     = [component name]::_narrow (comp);
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.h b/CIAO/docs/templates/CIAO_Glue_Session_Template.h
index 25c7813db53..c1344c06ab8 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.h
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.h
@@ -70,8 +70,7 @@ namespace CIAO_GLUE
 
     // get_component implementation.
     virtual CORBA::Object_ptr
-    _get_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _get_component ();
 
   protected:
     // Facet executor.
@@ -108,55 +107,41 @@ namespace CIAO_GLUE
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
 ##  if [receptacle name] is a simplex receptacle ('uses')
     [uses type]_ptr
-    get_connection_[receptacle name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_connection_[receptacle name] ();
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // [receptacle name]Connections typedef'ed as a sequence of
     // struct [receptacle name]Connection.
     [receptacle name]Connections *
-    get_connections_[receptacle name] ();
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_connections_[receptacle name] ();;
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
 ##foreach [event name] with [eventtype] in (list of all event sources) generate:
-    void push_[event name] ([eventtype] *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void push_[event name] ([eventtype] *ev);
 ##end foreach [event name] with [eventtype]
 
     // Operations for ::Components::CCMContext
     virtual ::Components::Principal_ptr
-    get_caller_principal ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_caller_principal ();
 
     virtual ::Components::CCMHome_ptr
-    get_CCM_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_CCM_home ();
 
     virtual CORBA::Boolean
-    get_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_rollback_only ();
 
     virtual ::Components::Transaction::UserTransaction_ptr
-    get_user_transaction ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_user_transaction ();
 
     virtual CORBA::Boolean
-    is_caller_in_role (const char * role)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    is_caller_in_role (const char * role);
 
     virtual void
-    set_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    set_rollback_only ();
 
     // Operations for ::Components::SessionContext interface
     virtual CORBA::Object_ptr
-    get_CCM_object ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_CCM_object ();
   protected:
     // We need to generate, in protected section, stuff that manage
     // connections and consumers of this component.
@@ -165,15 +150,10 @@ namespace CIAO_GLUE
 ##  if [receptacle name] is a simplex receptacle ('uses')
     // Simplex [receptacle name] connection management operations
     void
-    connect_[receptacle name] ([uses type]_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::AlreadyConnected,
-                       ::Components::InvalidConnection));
+    connect_[receptacle name] ([uses type]_ptr c);
 
     [uses type]_ptr
-    disconnect_[receptacle name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoConnection));
+    disconnect_[receptacle name] ();
 
     // Simplex [receptacle name] connection
     [uses type]_var ciao_uses_[receptacle name]_;
@@ -181,15 +161,10 @@ namespace CIAO_GLUE
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // Multiplex [receptacle name] connection management operations
     ::Components::Cookie *
-    connect_[receptacle name] ([uses type]_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::ExceedConnectionLimit,
-                       ::Components::InvalidConnection));
+    connect_[receptacle name] ([uses type]_ptr c);
 
     [uses type]_ptr
-    disconnect_[receptacle name] (::Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidConnection));
+    disconnect_[receptacle name] (::Components::Cookie *ck);
 
     // Multiplex [receptacle name] connections
 
@@ -200,14 +175,10 @@ namespace CIAO_GLUE
     // Operations for emits interfaces.
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
     void
-    connect_[emit name] ([eventtype]Consumer_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::AlreadyConnected));
+    connect_[emit name] ([eventtype]Consumer_ptr c);
 
     [eventtype]Consumer_ptr
-    disconnect_[emit name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoConnection));
+    disconnect_[emit name] ();
 
     [eventtype]Consumer_var ciao_emits_[emit name]_consumer_;
 ##end foreach [emit name] with [eventtype]
@@ -215,14 +186,10 @@ namespace CIAO_GLUE
     // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
       ::Components::Cookie *
-      subscribe_[publish name] ([eventtype]Consumer_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::ExceededConnectionLimit));
+      subscribe_[publish name] ([eventtype]Consumer_ptr c);
 
       [eventtype]Consumer_ptr
-      unsubscribe_[publish name] (::Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidConnection));
+      unsubscribe_[publish name] (::Components::Cookie *ck);
 
     ACE_Active_Map_Manager<[eventtype]Consumer_var> ciao_publishes_[publish name]_map_;
 ##end foreach [publish name] with [eventtype]
@@ -265,8 +232,7 @@ namespace CIAO_GLUE
     // Operations for provides interfaces.
 ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate:
     virtual [facet type]_ptr
-    provide_[facet name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    provide_[facet name] ();
 ##end foreach [facet name] with [facet type]
 
     // Operations for receptacles interfaces.
@@ -275,35 +241,23 @@ namespace CIAO_GLUE
 ##  if [receptacle name] is a simplex receptacle ('uses')
     // Simplex [receptacle name] connection management operations
     virtual void
-    connect_[receptacle name] ([uses type]_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::AlreadyConnected,
-                       ::Components::InvalidConnection));
+    connect_[receptacle name] ([uses type]_ptr c);
 
     virtual [uses type]_ptr
-    disconnect_[receptacle name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoConnection));
+    disconnect_[receptacle name] ();
 
     virtual [uses type]_ptr
-    get_connection_[receptacle name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_connection_[receptacle name] ();
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // Multiplex [receptacle name] connection management operations
     virtual ::Components::Cookie *
-    connect_[receptacle name] ([uses type]_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::ExceedConnectionLimit,
-                       ::Components::InvalidConnection));
+    connect_[receptacle name] ([uses type]_ptr c);
 
     virtual [uses type]_ptr
-    disconnect_[receptacle name] (::Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidConnection));
+    disconnect_[receptacle name] (::Components::Cookie *ck);
 
     virtual [receptacle name]Connections *
-    get_connections_[receptacle name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_connections_[receptacle name] ();
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
@@ -322,19 +276,15 @@ namespace CIAO_GLUE
       ~[event type]Consumer_[consumer name]_Servant ();
 
 ##  foreach [type] in ([eventtype] and all its parent eventtype, if any)
-      virtual void push_[type] ([type] *evt)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void push_[type] ([type] *evt);
 ##  end [type]
 
       // Inherit from ::Compopnents::EventConsumerBase
-      virtual void push_event (::Components::EventBase *ev)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         ::Components::BadEventType));
+      virtual void push_event (::Components::EventBase *ev);
 
     // get_component implementation.
       virtual CORBA::Object_ptr
-      _get_component ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      _get_component ();
 
     protected:
       // Executor
@@ -345,193 +295,126 @@ namespace CIAO_GLUE
     };
 
     virtual [eventtype]Consumer_ptr
-    get_consumer_[consumer name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_consumer_[consumer name] ();
 ##end foreach [consumer name] with [eventtype]
 
     // Operations for emits interfaces.
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
     virtual void
-    connect_[emit name] ([eventtype]Consumer_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException
-                       ::Components::AlreadyConnected));
+    connect_[emit name] ([eventtype]Consumer_ptr c);
 
     virtual [eventtype]Consumer_ptr
-    disconnect_[emit name] ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoConnection));
+    disconnect_[emit name] ();
 ##end foreach [emit name] with [eventtype]
 
     // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
     virtual ::Components::Cookie *
-    subscribe_[publish name] ([eventtype]Consumer_ptr c)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::ExceededConnectionLimit));
+    subscribe_[publish name] ([eventtype]Consumer_ptr c);
 
     virtual [eventtype]Consumer_ptr
-    unsubscribe_[publish name] (::Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidConnection));
+    unsubscribe_[publish name] (::Components::Cookie *ck);
 ##end foreach [publish name] with [eventtype]
 
     // Operations for Navigation interface
     virtual CORBA::Object_ptr
-    provide_facet (const char * name)
-      ACE_THROW_SPEC ((CORBA::SystemException ,
-                       Components::InvalidName)) ;
+    provide_facet (const char * name);
 
     virtual ::Components::FacetDescriptions *
-    get_all_facets ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_facets ();
 
     virtual ::Components::FacetDescriptions *
-    get_named_facets (const Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException ,
-                       Components::InvalidName));
+    get_named_facets (const Components::NameList & names);
 
     virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    same_component (CORBA::Object_ptr object_ref);
 
     // Operations for Receptacles interface
     virtual ::Components::Cookie *
     connect (const char * name,
-             CORBA::Object_ptr connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::InvalidConnection,
-                       Components::AlreadyConnected,
-                       Components::ExceededConnectionLimit));
+             CORBA::Object_ptr connection);
 
     virtual CORBA::Object_ptr
     disconnect (const char * name,
-                Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::InvalidConnection,
-                       Components::CookieRequired,
-                       Components::NoConnection));
+                Components::Cookie *ck);
 
     virtual ::Components::ConnectionDescriptions *
-    get_connections (const char * name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_connections (const char * name);
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_receptacles ();
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_receptacles (const Components::NameList & names);
 
     // Operations for Events interface
     virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char * sink_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_consumer (const char * sink_name);
 
     virtual ::Components::Cookie *
     subscribe (const char * publisher_name,
-               Components::EventConsumerBase_ptr subscriber)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::InvalidConnection,
-                       Components::ExceededConnectionLimit));
+               Components::EventConsumerBase_ptr subscriber);
 
     virtual ::Components::EventConsumerBase_ptr
     unsubscribe (const char * publisher_name,
-                 Components::Cookie *ck)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::InvalidConnection));
+                 Components::Cookie *ck);
 
     virtual void
     connect_consumer (const char * emitter_name,
-                      Components::EventConsumerBase_ptr consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::AlreadyConnected,
-                       Components::InvalidConnection));
+                      Components::EventConsumerBase_ptr consumer);
 
     virtual ::Components::EventConsumerBase_ptr
-    disconnect_consumer (const char * source_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::NoConnection));
+    disconnect_consumer (const char * source_name);
 
     virtual ::Components::ConsumerDescriptions *
-    get_all_consumers ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_consumers ();
 
     virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_consumers (const Components::NameList & names);
 
     virtual ::Components::EmitterDescriptions *
-    get_all_emitters ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_emitters ();
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_emitters (const Components::NameList & names);
 
     virtual ::Components::PublisherDescriptions *
-    get_all_publishers ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_publishers ();
 
     virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_publishers (const Components::NameList & names);
 
     // Operations for CCMObject interface
     virtual ::CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_component_def ();
 
     virtual ::Components::CCMHome_ptr
-    get_ccm_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_ccm_home ();
 
     virtual ::Components::PrimaryKeyBase *
-    get_primary_key ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::NoKeyAvailable));
+    get_primary_key ();
 
     virtual void
-    configuration_complete ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidConfiguration));
+    configuration_complete ();
 
     virtual void
-    remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove ();
 
     virtual ::Components::ComponentPortDescription *
-    get_all_ports ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_ports ();
 
     // get_component implementation.
     virtual CORBA::Object_ptr
-    _get_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _get_component ();
 
     // CIAO specific operations.
 
     // Activate the object in the container_
     void
-    _ciao_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_activate ();
 
     void
-    _ciao_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate ();
 
   protected:
     // My Executor.
@@ -582,10 +465,7 @@ namespace CIAO_GLUE
     // for factory operations inherit from parent home(s), they should return
     // the corresponding component types their homes manage
     virtual [component name]_ptr
-    [factory name] (....)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::CreateFailure,
-                       ....));
+    [factory name] (....);
 ##end foreach [factory name]
 
     // Finder operations
@@ -593,77 +473,51 @@ namespace CIAO_GLUE
     // for finder operations inherit from parent home(s), they should return
     // the corresponding component types their homes manage
     virtual [component name]_ptr
-    [finder name] (....)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::FinderFailure,
-                       ....));
+    [finder name] (....);
 ##end foreach [finder name]
 
 ##  if [home name] is a keyless home
 
     // Operations for KeylessHome interface
     virtual ::Components::CCMObject_ptr
-    create_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create_component ();
 
 ##  else [home basename] is keyed home with [key type]
 
     // We do not support key'ed home at the moment but we might
     // as well generate the mapping.
-    virtual [component name]_ptr create ([key type] *key)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::CreationFailure,
-                       ::Components::DuplicateKeyValue,
-                       ::Components::InvalidKey));
+    virtual [component name]_ptr create ([key type] *key);
 
     virtual [component name]_ptr
-    find_by_primary_key ([key type] *key)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::FinderFailure,
-                       ::Components::UnknownKeyValue,
-                       ::Components::InvalidKey));
-
-    virtual void remove ([key type] *key)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::RemoveFailure,
-                       ::Components::UnknownKeyValue,
-                       ::Components::InvalidKey));
+    find_by_primary_key ([key type] *key);
+
+    virtual void remove ([key type] *key);
 
     virtual [key type] *
-    get_primary_key ([component name]_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_primary_key ([component name]_ptr comp);
 
 ##  endif (keyed or keyless home)
 
     // Operations for Implicit Home interface
     virtual [component name]_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create ();
 
     // Operations for CCMHome interface
     virtual ::CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_component_def ();
 
     virtual ::CORBA::IRObject_ptr
-    get_home_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_home_def ();
 
-    virtual void remove_component (Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    virtual void remove_component (Components::CCMObject_ptr comp);
 
   protected:
     // Helper method for factory operations.
      [component name]_ptr
-     _ciao_activate_component (CCM_[component name]_ptr exe)
-       ACE_THROW_SPEC ((CORBA::SystemException));
+     _ciao_activate_component (CCM_[component name]_ptr exe);
 
     void
-    _ciao_passivate_component ([component name]_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate_component ([component name]_ptr comp);
 
     // My Executor.
     CCM_[home name]_var executor_;
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
index 1cb07a064ae..8e8c93e2095 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
@@ -79,8 +79,6 @@ ACE_INLINE
 
 ACE_INLINE void
 [ciao module name]::[component name]_Context::connect_[emit name] ([eventtype]Consumer_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::AlreadyConnected))
 {
   if (CORBA::is_nil (c))
     throw CORBA::BAD_PARAM ();
@@ -93,8 +91,6 @@ ACE_INLINE void
 
 ACE_INLINE [eventtype]Consumer_ptr
 [ciao module name]::[component name]_Context::disconnect_[emit name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::NoConnection))
 {
   if (CORBA::is_nil (this->ciao_emits_[emit name]_consumer_.in ()))
     throw ::Components::NoConnection ();
@@ -107,51 +103,42 @@ ACE_INLINE [eventtype]Consumer_ptr
 // Operations for ::Components::CCMContext
 ACE_INLINE ::Components::Principal_ptr
 [ciao module name]::[component name]_Context::get_caller_principal ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ We don't support Security in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE ::Components::CCMHome_ptr
 [ciao module name]::[component name]_Context::get_CCM_home ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Components::CCMHome::_duplicate (this->home_.in ());
 }
 
 ACE_INLINE CORBA::Boolean
 [ciao module name]::[component name]_Context::get_rollback_only ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE ::Components::Transaction::UserTransaction_ptr
 [ciao module name]::[component name]_Context::get_user_transaction ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE CORBA::Boolean
 [ciao module name]::[component name]_Context::is_caller_in_role (const char * role)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (role);
 
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE void
 [ciao module name]::[component name]_Context::set_rollback_only ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
   throw CORBA::NO_IMPLEMENT ();
@@ -180,24 +167,18 @@ ACE_INLINE [operation return_type]
 // Simplex [receptacle name] connection management operations
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::AlreadyConnected,
-                   ::Components::InvalidConnection))
 {
   this->context_->connect_[receptacle name] (c);
 }
 
 ACE_INLINE [uses type]_ptr
 [ciao module name]::[component name]_Servant::disconnect_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::NoConnection))
 {
   return this->context_->disconnect_[receptacle name] ();
 }
 
 ACE_INLINE [uses type]_ptr
 [ciao module name]::[component name]_Servant::get_connection_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->context_->get_connection_[receptacle name] ();
 }
@@ -206,24 +187,18 @@ ACE_INLINE [uses type]_ptr
 // Multiplex [receptacle name] connection management operations
 ACE_INLINE ::Components::Cookie *
 [ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::ExceedConnectionLimit,
-                   ::Components::InvalidConnection))
 {
   return this->context_->connect_[receptacle name] (c);
 }
 
 ACE_INLINE [uses type]_ptr
 [ciao module name]::[component name]_Servant::disconnect_[receptacle name] (::Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::InvalidConnection))
 {
   return this->context_->disconnect_[receptacle name] (ck);
 }
 
 ACE_INLINE [receptacle name]Connections *
 [ciao module name]::[component name]_Servant::get_connections_[receptacle name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->context_->get_connections_[receptacle name] ();
 }
@@ -260,7 +235,6 @@ ACE_INLINE
 
 ACE_INLINE CORBA::Object_ptr
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::_get_component ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ctx_->get_CCM_object ();
 }
@@ -268,7 +242,6 @@ ACE_INLINE CORBA::Object_ptr
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[eventtype]
   ([eventtype] *evt)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->executor_->push_[consumer name] (evt);
 }
@@ -277,7 +250,6 @@ ACE_INLINE void
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[type]
   ([type] *evt)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Problem, there's no way to handle this case.
 
@@ -292,16 +264,12 @@ ACE_INLINE void
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::connect_[emit name] ([eventtype]Consumer_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException
-                   ::Components::AlreadyConnected))
 {
   this->context_->connect_[emit name] (c);
 }
 
 ACE_INLINE [eventtype]Consumer_ptr
 [ciao module name]::[component name]_Servant::disconnect_[emit name] ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::NoConnection))
 {
   return this->context_->disconnect_[emit name] ();
 }
@@ -311,16 +279,12 @@ ACE_INLINE [eventtype]Consumer_ptr
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
 ACE_INLINE ::Components::Cookie *
 [ciao module name]::[component name]_Servant::subscribe_[publish name] ([eventtype]Consumer_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::ExceededConnectionLimit))
 {
   return this->context_->subscribe_[publish name] (c);
 }
 
 ACE_INLINE [eventtype]Consumer_ptr
 [ciao module name]::[component name]_Servant::unsubscribe_[publish name] (::Components::Cookie *ck)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::InvalidConnection))
 {
   return this->context_->unsubscribe_[publish name] (ck);
 }
@@ -354,9 +318,6 @@ ACE_INLINE
 // the corresponding component types their homes manage
 ACE_INLINE [component name]_ptr
 [ciao module name]::[home name]_Servant::[factory name] (....)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::CreateFailure,
-                   ....))
 {
   Components::EnterpriseComponent_var _ciao_ec =
     this->executor_->[factory name] (....);
@@ -373,9 +334,6 @@ ACE_INLINE [component name]_ptr
 // the corresponding component types their homes manage
 ACE_INLINE [component name]_ptr
 [ciao module name]::[home name]_Servant::[finder name] (....)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::FinderFailure,
-                   ....))
 {
   Components::EnterpriseComponent_var com =
     this->executor_->[finder name] (....);
@@ -391,8 +349,6 @@ ACE_INLINE [component name]_ptr
 // Operations for KeylessHome interface
 ACE_INLINE ::Components::CCMObject_ptr
 [ciao module name]::[home name]_Servant::create_component ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CreateFailure))
 {
   // Simply forward to the create method.
   return this->create ();
@@ -404,35 +360,23 @@ ACE_INLINE ::Components::CCMObject_ptr
 // as well generate the mapping.
 ACE_INLINE [component name]_ptr
 [ciao module name]::[home name]_Servant::create ([key type] *key)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::CreationFailure,
-                   ::Components::DuplicateKeyValue,
-                   ::Components::InvalidKey))
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE [component name]_ptr
 [ciao module name]::[home name]_Servant::find_by_primary_key ([key type] *key)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::FinderFailure,
-                   ::Components::UnknownKeyValue,
-                   ::Components::InvalidKey))
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 
 ACE_INLINE void
 [ciao module name]::[home name]_Servant::remove ([key type] *key)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ::Components::RemoveFailure,
-                   ::Components::UnknownKeyValue,
-                   ::Components::InvalidKey))
 {
   // @@ TO-DO when we suppor keyed home.
 
@@ -441,11 +385,10 @@ ACE_INLINE void
 
 ACE_INLINE [key type] *
 [ciao module name]::[home name]_Servant::get_primary_key ([component name]_ptr comp)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ##  endif (keyed or keyless home)
@@ -454,18 +397,16 @@ ACE_INLINE [key type] *
 // Operations for CCMHome interface
 ACE_INLINE ::CORBA::IRObject_ptr
 [ciao module name]::[home name]_Servant::get_component_def ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TO-DO.  Contact IfR?
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE CORBA::IRObject_ptr
 [ciao module name]::[home name]_Servant::get_home_def ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TO-DO.  Contact IfR?
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/CIAO/docs/tutorials/CoSMIC/01.html b/CIAO/docs/tutorials/CoSMIC/01.html
deleted file mode 100644
index 73db63f7236..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/01.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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" />
-<!-- $Id$ -->
-  
-
-  
-  <title>Getting Started</title>
-</head>
-
-
-
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link="#000fff" vlink="#ff0f0f">
-
-  
-<h3>Getting Started<br />
-</h3>
-<b>Writing IDL files</b><br />
-
-  <br />
-
-  We will start from writing the idl file for each component.<br />
-
-
-  
-<ol>
-
-    <li>Create a directory named <code><span style="font-style: italic;">MyQuoter</span></code><span style="font-style: italic;">.</span></li>
-
-
-    <li>In <code style="font-style: italic;">MyQuoter</code>
-    directory, create one directory <span style="font-style: italic;">Stock_Base</span> for the base idl and
-    two more directories <span style="font-style: italic;">Broker</span>, <span style="font-style: italic;">Distributor</span> for each component. In
-    <code style="font-style: italic;">MyQuoter/Stock_Base</code>,
-    place an idl file <code style="font-style: italic;">Stock_Base.idl</code> that you could copy
-    from <a href="../Quoter/Simple/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.</li>
-
-
-    <li style="list-style-type: none; list-style-image: none; list-style-position: outside;">We put together the common
-    interface definitions so the base library can be shared by both
-    components, reducing the size of "real" components.<br />
-  </li>
-
-
-    <li>In <code style="font-style: italic;">MyQuoter/Distributor</code>, place an idl
-    file <code style="font-style: italic;">Distributor.idl</code>
-    that looks like <a href="../Quoter/Simple/Distributor/Distributor.idl">this</a>. This
-    file defines the StockDistributor component
-    interfaces.<br />
-  </li>
-
-
-    <li>In <code style="font-style: italic;">MyQuoter/Broker</code>
-    place an idl file <code><span style="font-style: italic;">Broker.id</span>l</code> that looks like
-    <a href="../Quoter/Simple/Broker/Broker.idl">this</a>. This
-    file defines the StockBroker component interface.<br />
-  </li>
-
-  
-</ol>
-<br />
-
-  <b>Importing IDL to PICML</b><br />
-
-  <br />
-
-  &nbsp;&nbsp; To quick start our Stock Quoter modeling process in
-  GME, CoSMIC introduces <em>idl_to_picml</em> , which is an
-  executable program that imports the IDL files you just created
-  into PICML.<br />
-
-
-  
-<ol>
-
-    <li>Make sure <code>%COSMIC_ROOT%\bin</code> is included in the
-    PATH variable, e.g., c:\Program
-    Files\ISIS\CoSMIC\bin.<br />
-  </li>
-
-
-    <li>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 style="font-style: italic;">idl_to_picml</span> works properly.<br />
-
-    in my machine, VCVARS32.bat is in C:\Program Files\Microsoft
-    Visual Studio .NET 2003\Vc7\bin<br />
-  </li>
-
-
-    <li>In the same command prompt, change directory to
-    <code>MyQuoter\</code>, and type the following command:<br />
-
-    &nbsp;&nbsp; &gt; <kbd>idl_to_picml -x MyQuoter -r . -I
-    .\Stock_Base</kbd><br />
-
-    &nbsp;&nbsp; (if the above command does not work, you may also
-    try this<br />
-
-    &nbsp;&nbsp; &gt;<kbd>idl_to_picml -x MyQuoter -r .&nbsp;-I .\Stock_Base -I
-    %TAO_ROOT% -I %TAO_ROOT%\orbsvcs -I
-    %CIAO_ROOT%\ciao)</kbd><br />
-
-    &nbsp; <em>idl_to_picml</em> will parse your IDL files and
-    generated a <code>MyQuoter.xme</code> file in the
-    <code>MyQuoter</code> directory. Note that if -x option is not
-    used, the default xme file name will be
-    <code>PICML_default_xme_file.xme.</code><br />
-
-    4. Start GME, select <strong>File-&gt;Import xml..</strong>,
-    and choose the xme file just generated. You should be able to
-    see an imported PICML model similar to the one shown in Figure
-    2.<br />
-  </li>
-
-  
-</ol>
-<br />
-
-
-  
-<div style="text-align: center;">
-    <img alt="" src="Images/fig2.jpg" style="width: 781px; height: 635px;" /><br />
-
-    <br />
-
-    Figure 2<br />
-
-  </div>
-
-
-  
-<p>&nbsp; In the Browser of the generated model, the
-  <em>PredefinedTypes</em> folder contains a bunch of atomic
-  datatype elements that will be referenced by other modeling parts
-  later. You don't have to worry about them for now. The models in
-  <em>InterfaceDefinitions</em> folder are the PICML
-  representations ofthe 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;FileRef&gt;&gt; instance and a
-  yellow box-shaped entity representing a &lt;&lt;Package&gt;&gt;
-  instance. Their equivalent representations in IDL files are
-  "#include" and "module" respectively. Figure 3 gives you a clear
-  view of GME representation of all the 3 idl files created. We
-  will cover the other folders in the next section.</p>
-
-
-  
-<div style="text-align: center;">
-    <img alt="" src="Images/fig3.jpg" style="width: 223px; height: 336px;" /><br />
-
-    <br />
-
-    Figure 3<br />
-
-    <br />
-
-  </div>
-Now we are ready to model the rest of the Stock Quoter
-  systems.<br />
-
-  <br />
-
-  <br />
-
-  <br />
-
-  
-<hr />
-
-  
-<address>
-    <a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br />
-</a>
-  </address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 -->
-  <!-- hhmts start -->
-  Last modified:<!-- hhmts end -->
-</body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/02.html b/CIAO/docs/tutorials/CoSMIC/02.html
deleted file mode 100644
index 8f4e7decc11..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/02.html
+++ /dev/null
@@ -1,554 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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$ -->
-  <link rel="stylesheet" type="text/css" href="style.css" />
-
-</head>
-
-
-
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link="#000fff" vlink="#ff0f0f">
-
-<h3>Building Stock Quoter system in PICML</h3>
-
-<br />
-
-<p>This section describes modeling the Quoter application using
-PICML. If you have trouble producing a functioning model from this
-tutorial, please see the, <a href="Model/Quoter.xme">pre-built
-Quoter model</a> which is provided for your reference. This model
-contains all elements created as part of this tutorial.</p>
-
-<div class="important"> <strong>Note:</strong>
-To import an XML file in GME, select <em>File-&gt;Import
-XML..</em> from GME and choose your XML model<br />
-
-</div>
-
-<p>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">DAnCE
-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, Abdulah for pointing this out).
-In addition, it is also helpful to read through Chapter 32 of TAO's
-Developer's Guide 1.4a (CIAO and CCM) which thoroughly describes the
-various descriptors required for a component (*.iad, *.ccd, *.cid,
-etc). </p>
-<h3>Table of Contents</h3>
-
-<ul>
-
-  <li><a href="#1">ImplementationArtifacts</a></li>
-
-  <li><a href="#2">ComponentImplementations</a></li>
-
-  <li><a href="#3">ComponentPackages</a></li>
-
-  <li><a href="#4">PackageConfiguration</a></li>
-
-  <li><a href="#5">TopLevelPackage</a></li>
-
-  <li><a href="#6">Targets</a></li>
-
-  <li><a href="#7">DeploymentPlan</a></li>
-
-</ul>
-
-<hr />
-<p>The complete PICML Quoter model consists of modeling elements
-distributed across various folders. If you used <em>idl_to_picml</em>
-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.</p>
-
-<div class="important"> <strong>Important:</strong>
-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. </div>
-
-<h3><a name="1">ImplementationArtifacts</a></h3>
-
-<p>This folder contains implementation artifacts associated with
-components. <em>idl_to_picml</em> has created these
-artifacts for us, with their dependency relationships correctly
-captured. Figure 4 shows the Implementation Artifacts for <em>Broker</em>.</p>
-
-<div style="text-align: center;"> <img alt="" src="Images/fig4.jpg" style="border: 1px solid ; width: 891px; height: 552px;" /><a name="1"><br />
-
-Figure 4.<br />
-
-</a><br />
-
-</div>
-
-<a name="1"></a>
-<hr />
-<h3><a name="2">ComponentImplementation</a></h3>
-
-<p>This folder contains models that describe the implementations
-of component interfaces. In the Quoter example, we will have two
-monolithic component implementations - named <em>StockDistributorImplementation</em>
-and <em>StockBrokerImplementation</em> - and an assembly
-component implementation named <em>StockQuoter</em>, which
-is an assembly of <em>StockDistributorImplementation</em>
-and <em>StockBrokerImplementaion</em>. <em>idl_to_picml</em>
-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 Quoter system.</p>
-
-<div style="text-align: center;"> <img alt="" src="Images/fig5.jpg" style="border: 1px solid ; width: 922px; height: 639px;" /><br />
-
-Figure 5<br />
-
-</div>
-
-<p>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 <code>MonolithicImplementation</code>.
-Instead, <em>instances</em> of other components are placed
-within the assembly and connected. Let's try to assemble the <em>StockQuoter</em>.</p>
-
-<ol>
-
-  <li>Right click the <em>ComponentImplementations</em>
-folder, choose <strong>Insert
-Model-&gt;ComponentImplementationContainer</strong>, rename
-it as "StockQuoterImplementation" in the Attribute Panel. Double click
-to open it.</li>
-
-  <li>From the Part Browser, drag a
-&lt;&lt;ComponentAssembly&gt;&gt; to the modeling
-window, name it "StockQuoter". Double click to open it.</li>
-
-  <li>Now we will create two instances for interfaces <em>StockBroker</em>
-and <em>StockDistributor</em>. To do that, expand the
-folder <code><em>InterfaceDefinitions</em></code>,
-then expand the <code><em>InterfaceDefinitions/</em></code>
-    <em>Broker</em>, then <code><em>InterfaceDefinitions/</em></code>
-    <em>Broker/ Stock</em> until the interface definition
-of <em>StockBroker</em> shows. While expanding the tree,
-always keep the "StockQuoter"
-&lt;&lt;ComponentAssembly&gt;&gt; window open. Then
-drag <code>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</code>
-in the browser to the "StockQuoter"
-&lt;&lt;ComponentAssembly&gt;&gt; window while pressing
-ALT key. Repeat the same steps for <code>MyQuoter/InterfaceDefinitions/Distributor/Stock/StockDistributor</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)<br />
-
-  </li>
-
-</ol>
-
-<br />
-
-<div style="text-align: center;"> <img alt="" src="Images/fig6.jpg" style="width: 972px; height: 714px;" /><br />
-
-<br />
-
-Figure 6<br />
-
-</div>
-
-<ol>
-
-  <li value="4">Create an
-&lt;&lt;PublishConnector&gt;&gt;.<br />
-
-  </li>
-
-  <li>Now assemble the components together according to <a href="Images/fig1.jpg">Figure 1</a>(make sure you
-change to connect mode <img alt="" src="Icons/AddConnMode.gif" style="width: 20px; height: 17px;" />
-) and the resulting assembly model should look like Figure 7. Note that
-to create connections between StockDistributor.notify_out and
-StockBroker.notify_in, you will need the intermediate connector
-&lt;&lt;PublishConnector&gt;&gt;.<br />
-
-  </li>
-
-</ol>
-
-<img alt="" src="Images/fig7.jpg" style="width: 724px; height: 402px;" /><br />
-
-<br />
-
-Figure 7<br />
-
-<hr /> <a name="3"></a>
-<h3>ComponentPackage<br />
-
-</h3>
-
-This folder contains deployable component packages. Every instance in
-an assembly should have a corresponding monolithic implementation and
-packaged in a ComponentPackagebe To create a package for <em>StockBroker</em>.instance<br />
-
-<ol>
-
-  <li>Right click folder <em>ComponentPackage</em>s
-, insert a &lt;&lt;PackageContainer&gt;&gt;, name it
-"Broker"; Double click to open it.<br />
-
-  </li>
-
-  <li>From the PartBrowser, add the following:<br />
-
-    <ul>
-
-      <li>a &lt;&lt;ComponentPackage&gt;&gt;
-named "Broker";</li>
-
-      <li>a
-&lt;&lt;ComponentImplementationReference&gt;&gt; named
-"Broker";</li>
-
-      <li>a &lt;&lt;ComponentRef&gt;&gt; named
-"Broker";</li>
-
-    </ul>
-
-  </li>
-
-  <li>Refer the
-&lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker</em>
-to <code>MyQuoter/ComponentImplementations/StockBroker</code>Implementation/StockBrokerMonolithicImpl.
-Refer the &lt;&lt;ComponentRef&gt;&gt; <em>Broker</em>
-to <code>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</code>.
-To create a reference in GME, simply drag the tree node in the Browser
-"into" the reference model. For example, you should drag the tree node <code>MyQuoter/ComponentImplementations/StockBroker</code>Implementation/StockBrokerMonolithicImpl
-into &lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker.</em>
-Check GME manual(tutorials) for more information.</li>
-
-  <li>Switch to Connect Mode and create two connections according
-to the following relationship.<br />
-
-    <ul>
-
-      <li>&lt;&lt;ComponentImplementationReference&gt;&gt;
-        <em>Broker</em> implements
-&lt;&lt;ComponentPackage&gt;&gt; <em>Broker</em>;</li>
-
-      <li>&lt;&lt;ComponentPackage&gt;&gt; <em>Broker</em>
-realizes &lt;&lt;ComponentRef&gt;&gt; <em>Broker</em>.</li>
-
-    </ul>
-
-    <br />
-
-    <br />
-
-&nbsp;&nbsp;&nbsp;&nbsp; The model you built should
-resemble Figure 8.<br />
-
-    <br />
-
-    <div style="text-align: center;"> <img alt="" src="Images/fig8.jpg" style="width: 675px; height: 497px;" /><br />
-
-    <br />
-
-Figure 8<br />
-
-    <br />
-
-    </div>
-
-Now create a ComponentPackage/StockDistributor following the same
-steps. </li>
-
-  <li style="list-style-type: none; list-style-image: none; list-style-position: outside;">
-    <br />
-
-We will also need to create a package for the assembly component
-StockQuoter. Remember assembly component is a virtual component, it
-does not "realize" a certain interface, so different from the Broker
-and Distributor packages, the StockQuoter does not need a
-&lt;&lt;ComponentRef&gt;&gt;. To create this model:
-    <ol>
-
-      <li>Insert a
-&lt;&lt;ComponentPackage&gt;&gt; named "StockQuoter"<br />
-
-      </li>
-
-      <li>Add a
-&lt;&lt;ComponentImplementationReference&gt;&gt; named
-"StockQuoter", refer it to MyQuoter<code>/ComponentImplementations/StockQuoter/StockQuoter</code></li>
-
-      <li>Switch to connect mode and connect
-&lt;&lt;ComponentImplementationReference&gt;&gt;
-StockQuoter with &lt;&lt;ComponentPackage&gt;&gt;
-StockQuoter, as in Figure 9.<br />
-
-      </li>
-
-    </ol>
-
-  </li>
-
-</ol>
-
-<div style="text-align: center;"> <img alt="" src="Images/fig9.jpg" style="width: 549px; height: 354px;" /><br />
-
-<br />
-
-Figure 9<br />
-
-<br />
-
-</div>
-
-<hr /> <a name="4"></a>
-<h3>PackageConfiguration<br />
-
-</h3>
-
-This folder contains just one model capturing specific configuration of
-Component packages.<br />
-
-<ol>
-
-  <li>In the folder <em>PackageConfiguratio</em>n,
-and create a
-&lt;&lt;PackageConfigurationContainer&gt;&gt;, name it
-"Default", click to open it.<br />
-
-  </li>
-
-  <li>Add a &lt;&lt;PackageConfiguration&gt;&gt;
-named "default" and a
-&lt;&lt;ComponentPackageReference&gt;&gt;, name it
-"StockQuoter", connect "Default" to "StockQuoter"<br />
-
-  </li>
-
-  <li>Refer
-&lt;&lt;ComponentPackageReference&gt;&gt; StockQuoter
-to &lt;&lt;ComponentPackage&gt;&gt; <code>MyQuoter/ComponentPackage/StockQuoter/StockQuoter<br />
-
-(Not &lt;&lt;ComponentImplementationReference&gt;&gt;</code>
-    <code>MyQuoter/ComponentPackage/StockQuoter/StockQuoter!)&nbsp;</code></li>
-
-</ol>
-
-<br />
-
-<hr /> <a name="5"></a>
-<h3>ToplevelPackage<br />
-
-</h3>
-
-This folder contains one model capturing information about the
-top-level element that will be fed to the application.<br />
-
-<ol>
-
-  <li>In the folder <em>ToplevelPackage</em>, and
-create a &lt;&lt;ToplevelPackageContainer&gt;&gt;, name
-it "Default", double click to open it.<br />
-
-  </li>
-
-  <li>Add a &lt;&lt;ToplevelPackage&gt;&gt; named
-"ToplevelPackage" and a
-&lt;&lt;PackageConfigurationReference&gt;&gt;, name it
-"Default", connect "ToplevelPackage" to "Default"<br />
-
-  </li>
-
-  <li>Refer "Default" to My<code>Quoter/PackageConfiguration/Default/Default</code><br />
-
-  </li>
-
-</ol>
-
-<br />
-
-<hr /> <a name="6"></a>
-<h3>Targets<br />
-
-</h3>
-
-This folder contains domain-specific models capturing information about
-the target environment in which component-based application will be
-deployed. In this Quoter example, we can either deploy the two
-components into ONE host, or into TWO different host. We will deploy
-the Quoter into two different host.<br />
-
-<ol>
-
-  <li>In the folder <span style="font-style: italic;">Targets</span>,
-insert a new &lt;&lt;Domain&gt;&gt; named "Domain";
-double click to open it.<br />
-
-  </li>
-
-  <li>From the Part Browser, add two
-&lt;&lt;Node&gt;&gt; named "Broker" and "Distributor"
-respectively.<br />
-
-  </li>
-
-</ol>
-
-<br />
-
-Now we are ready to deploy our Components to the actual physical
-environment.<br />
-
-<hr /> <a name="7"></a>
-<h3>DeploymentPlan<br />
-
-</h3>
-
-This folder contains a plan model that captures information about the
-assignment of component to nodes.<br />
-
-<ol>
-
-  <li>In the folder <em>DeploymentPlan</em>, insert
-a model &lt;&lt;DeploymentPlan&gt;&gt;; name it "Plan",
-click to open it<br />
-
-  </li>
-
-  <li>From the PartBrowser, add the following:<br />
-
-    <ul>
-
-      <li>Two &lt;&lt;CollocationGroup&gt;&gt;</li>
-
-      <li>Two &lt;&lt;NodeReference&gt;&gt; named
-"Node_Broker" and "Node_Distributor" respectively, refering to <code>MyQuoter/Targets/Domain/Broker</code>
-and <code>MyQuoter/Targets/Domain/Distributor</code>
-respectively</li>
-
-      <li>Two &lt;&lt;ComponentRef&gt;&gt; named
-"StockBroker" and "StockDistributor" respectively, refering to <code>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockBroker</code>
-and <code>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockDistributor</code>
-respectively. Note that the
-&lt;&lt;ComponentRef&gt;&gt; in DeploymentPlan is not
-referring to the interface, but rather the actual instance of the
-implementation.</li>
-
-    </ul>
-
-  </li>
-
-  <li>Switch to Connect Mode, connect one
-&lt;&lt;CollocationGroup&gt;&gt; to
-&lt;&lt;NodeReference&gt;&gt; <em>Node_Broker</em>,
-connect another &lt;&lt;CollocationGroup&gt;&gt; to
-&lt;&lt;NodeReference&gt;&gt; <em>Node_</em><em>Distributor</em>.
-Now the model looks like the following.<br />
-
-    <br />
-
-    <div style="text-align: center;"> <img alt="" src="Images/fig10.jpg" style="width: 752px; height: 530px;" /><br />
-
-    <br />
-
-Figure 10.<br />
-
-    <br />
-
-    </div>
-
-  </li>
-
-  <li>Now we need to associate
-&lt;&lt;ComponentRef&gt;&gt; StockBroker to the
-&lt;&lt;CollocationGroup&gt;&gt; running on the
-&lt;&lt;NodeReference&gt;&gt; Broker, and
-&lt;&lt;ComponentRef&gt;&gt; StockDistributor to the
-&lt;&lt;CollocationGroup&gt;&gt; running on the
-&lt;&lt;NodeReference&gt;&gt; Distributor. To do that,
-switch the Edit Mode Bar to Set Mode (<img alt="" src="Icons/SetMode.gif" style="width: 20px; height: 17px;" />),
-and move the cursor to the
-&lt;&lt;CollocationGroup&gt;&gt; running on
-&lt;&lt;NodeReference&gt;&gt; Distributor, right-click
-on it. You will find the cursor is changed to set mode cursor, and only
-the &lt;&lt;CollocationGroup&gt;&gt; you clicked in is
-highlighted, as shown in Figure 11.<br />
-
-    <br />
-
-  </li>
-
-</ol>
-
-<div style="text-align: center;"> <img alt="" src="Images/fig11.jpg" style="width: 672px; height: 505px;" /><br />
-
-<br />
-
-Figure 11<br />
-
-<br />
-
-</div>
-
-<p>Now move your cursor to
-&lt;&lt;ComponentRef&gt;&gt;&nbsp;
-StockDistributor, and left-click it, so that it looks like Figure 12.<br />
-
-</p>
-
-<div style="text-align: center;"> <img alt="" src="Images/fig12.jpg" style="width: 672px; height: 505px;" /><br />
-
-<br />
-
-Figure 12<br />
-
-<br />
-
-</div>
-
-<p>This operation associates <em>StockDistributor</em>
-component to the &lt;&lt;CollocationGroup&gt;&gt;
-running on <em>Distributor</em> node. To do the same with
-Broker, just right-click on another
-&lt;&lt;CollocationGroup&gt;&gt;, and left-click on
-StockBroker &lt;&lt;CollocationGroup&gt;&gt; which is
-highlighted.<br />
-
-<br />
-
-</p>
-
-<hr /> <a name="8"></a>
-<p>Up to this point, we are basically done with the modeling
-part. Before we generate anything from this model though, please <span style="font-weight: bold;">DO</span> remember to check
-the constraints of the model as we mentioned earlier.</p>
-
-<p>After we are done with the modeling, the
-flattened_deploymentplan interpreter that comes along with PICML will
-help us to generate a flattened_deploymentplan.cdp file. Please make
-sure you generate this file to MyQuoter/descriptors. Note that to get the example working<span style="font-family: monospace;">,</span>a Node Map file should be created to map logical<span style="font-family: monospace;"> </span>nodes to NodeManager object references,e.g:<br />
-</p>
-<pre wrap="">DistributorNode corbaloc:iiop:localhost:30000/NodeManager<br />BrokerNode      corbaloc:iiop:localhost:40000/NodeManager</pre>
-
-<address> <br />
-
-<a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br />
-
-</a> </address>
-
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->
-Last modified:<!-- hhmts end -->
-</body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/03.html b/CIAO/docs/tutorials/CoSMIC/03.html
deleted file mode 100644
index c2da3726762..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/03.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-
-  <title>Building a Stock Quoter with TAO - A Tutorial</title>
-  <!-- $Id$ -->
-</head>
-
-<body style=
-"color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link=
-"#000FFF" vlink="#FF0F0F">
-  <h3>Implementing Quoter Components with DAnCE<br /></h3>We
-  discuss this section after the PICML modeling only because we
-  would like to focus our attention more on the modeling stage. It
-  does not indicate that the implementation of components has to be
-  subsequent to the work we've done under GME. They are totally
-  orthogonal to each other. In fact, they are so orthogonal&nbsp;
-  that we won't go into details as to how DAnCE programming should
-  be done. We'll briefly go through the functionality of each
-  component and provides the links to their implementations
-  respectively. For a hands on experience on DAnCE programming,
-  please refer to $CIAO_ROOT/examples/Hello.<br />
-  <br />
-  <big><big><small>Broker Component<br />
-  &nbsp;&nbsp;&nbsp;</small></big></big> The Broker component
-  waits to be notified by the Distributor component about stock
-  changes. When a stock change event arrives,&nbsp; it will go back
-  to Distributor component and retrieve the information it interest
-  in and output them to the console. The users are allowed to
-  subscribe to the interested stock value through the interface
-  supported by Broker component. Here's the complete version of
-  <a href="../Quoter/Simple/Broker/Broker_exec.h">Broker_exec.h</a>
-  and <a href=
-  "../Quoter/Simple/Broker/Broker_exec.cpp">Broker_exec.cpp</a>.<br />
-
-  <br />
-  <big><big><small>Distributor Component<br />
-  &nbsp;&nbsp;</small></big></big> The Distributor component
-  monitors the real time stock database and publishes events
-  whenever it detects stock change. In our program, we use a
-  ACE_Task&nbsp; to simulate this real-life activity. The task
-  will run in a separate thread and periodically increment the
-  stock value by 1. In the same time the stock value is
-  incremented, an <span style=
-  "font-style: italic;">StockName</span> event along with the name
-  of the changed stock will be sent. Here's the complete version of
-  <a href=
-  "../Quoter/Simple/Distributor/Distributor_exec.h">Distributor_exec.h</a>
-  and <a href=
-  "../Quoter/Simple/Distributor/Distributor_exec.cpp">Distributor_exec.cpp</a><br />
-
-  <big><big><small><br />
-  Broker client<br />
-  &nbsp;&nbsp;&nbsp;</small></big></big> The Broker client program
-  is the driver program for client to control Broker component,
-  subscribe and unsubscribe to a specific stock. Here's the
-  complete version of <a href=
-  "../Quoter/Simple/Broker/Broker.cpp">Broker.cpp</a><br />
-  <br /><big><big><small>
-  Distributor client</small></big></big><br />
-  &nbsp;&nbsp;&nbsp;&nbsp; The Distributor
-  client program is the driver program for client to control
-  Distributor component, turn on and off the distribution service,
-  set up the frequency, etc. Here's the complete version of
-  <a href="../Quoter/Simple/Distributor/Distributor.cpp">Distributor.cpp</a>
-  <a name="2" /><br />
-  <br /><br />
-
-
-  <address>
-    <a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br /></a>
-  </address><!-- Created: Sat Nov 27 15:25:06 CST 1999 -->
-  <!-- hhmts start -->
-  <a href="mailto:ming.xiong@vanderbilt.edu">Last modified: 
-  <!-- hhmts end --></a>
-</body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/04.html b/CIAO/docs/tutorials/CoSMIC/04.html
deleted file mode 100644
index dce2fb1364c..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/04.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<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>
-
-<body style=
-"color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link=
-"#000FFF" vlink="#FF0F0F">
-  <h3>Running the application<br /></h3>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
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors/</code>
-  directory:
-
-  <ul>
-    <li>Start NodeManagers (NodeDameon) by running
-    <code>runNodeDaemon.pl</code></li>
-
-    <li>Start the execution manager
-    <code>%CIAO_ROOT%/DAnCE/ExecutionManager/Execution_Manager -o
-    ior -i Stock.dat</code>&nbsp;</li>
-  </ul>
-
-  <p>The <code>Stock.dat</code> 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 "destination" and the
-  corresponding IOR for the CIAO_Daemon.</p>
-
-  <ul type="square">
-    <li><em>NOTE</em>: As one can see, we use the "Stock.dat" 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.</li>
-  </ul>
-
-  <ul>
-    <li>Start the plan_launcher by running
-    <code>%CIAO_ROOT%/DAnCE/Plan_Launcher/Plan_Launcher -p
-    flattened_deploymentplan.cdp -k file://ior</code></li>
-
-    <li>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<br /></li>
-  </ul>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe
-  -o</code><br />
-  <br />
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
-  -s MSFT</code><br />
-  <br />
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
-  -s IBM</code><br />
-  <br />
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe
-  -u MSFT</code><br />
-  <br />
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe
-  -f</code><br />
-  <br />
-</body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
deleted file mode 100644
index a8550fe1176..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
deleted file mode 100644
index 3db5ac174e0..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
deleted file mode 100644
index c5eaf705384..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg
deleted file mode 100644
index ea2a885af6b..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
deleted file mode 100644
index 49d6f90c3b0..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
deleted file mode 100644
index 0559dc7382b..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
deleted file mode 100644
index 8fb89eccb57..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
deleted file mode 100644
index e847b9290d6..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
deleted file mode 100644
index 0a214c84ea8..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
deleted file mode 100644
index 67d90b775b0..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
deleted file mode 100644
index a565c2ab989..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg b/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
deleted file mode 100644
index 996d90d800b..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
+++ /dev/null
diff --git a/CIAO/docs/tutorials/CoSMIC/index.html b/CIAO/docs/tutorials/CoSMIC/index.html
deleted file mode 100644
index 74547224422..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/index.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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>
-
-
-
-<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>
-  framework. The example application used in this tutorial is a
-  Stock Quoter that consists of two components; the
-  <em>StockDistributor</em> and the <em>StockBroker</em>. The
-  <em>StockDistributor</em> notifies one or more stock brokers
-  whenever a stock price changes. Upon receiving the notification,
-  the <em>StockBroker</em> fetches information about a particular
-  stock from the <em>StockDistributor</em>. 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>.<br />
-</p>
-
-
-
-<div style="text-align: center;">
-    <img alt="" src="Images/fig1.jpg" style="width: 362px; height: 193px;" /><br />
-
-    <br />
-
-    Stock Quoter application Diagram<br />
-
-  </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
-  to build a component-based application model via <a href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> toolkit are
-  documented here.</p>
-
-
-
-<blockquote>
-
-  <hr />
-    <strong>Note:</strong><br />
-
-    1. Although the descriptor files generated by CoSMIC toolkits
-    are portable, the modeling environment required by CoSMIC (GME)
-    only supports Microsoft Windows platforms.<br />
-
-    2. The CIAO/DAnCE codes used for this tutorial can be found in
-    <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple</code>.<br />
-
-    3. The current tutorial is tested under GME 5.9.21, and&nbsp;
-    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 />
-
-  <br />
-
-  &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
-    the latest ACE + TAO + CIAO and click <a href="../../../../../ACE-Install.html">
-    here</a> for information on how to build ACE+TAO+CIAO.</li>
-
-
-    <li><strong>Generic Modeling Environment (GME).</strong> 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.</li>
-
-
-    <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
-      package you have downloaded requires. Attempts to use earlier
-      or later versions may result in undefined behavior.</li>
-
-
-      <li>Make sure you install GME before you install CoSMIC.</li>
-
-
-  </ol>
-
-
-  <hr />
-  </blockquote>
-<strong><a href="01.html">Getting
-  Started</a></strong><br />
-
-  <br />
-
-  &nbsp;&nbsp; This section describes the IDL files used by the
-  example and shows you how to import IDL into <a href="http://www.cs.wustl.edu/%7Eschmidt/PDF/RTAS05-PICML.pdf">PICML
-  (Platform-Independent Component Modeling Language)</a>; a
-  domain-specific modeling language which is defined using GME.
-  PICML is designed to help to bridge the gap between design-time
-  verification and model-checking tools and the deployment of
-  component implementations.<br />
-
-  <br />
-
-  <strong><a href="02.html">Modeling StockQuoter system with
-  PICML</a></strong><br />
-
-  <br />
-
-  &nbsp;&nbsp;&nbsp; This section describes how to model the Stock
-  Quoter components in PICML.<br />
-
-  &nbsp;&nbsp;&nbsp;&nbsp;<br />
-
-  <a href="03.html"><strong>Implementing Quoter components with
-  DAnCE</strong></a><br />
-
-  <br />
-
-  &nbsp;&nbsp;&nbsp; This section provides codes for the Quoter
-  example.<br />
-
-  <br />
-
-  <strong><a href="04.html">Running the
-  application</a></strong><br />
-
-  <br />
-
-  &nbsp;&nbsp; After all the components and descriptors generated
-  by PICML are in place. You are ready to compile and run the
-  application.<br />
-
-  <br />
-
-
-<hr />
-
-
-<address>
-    <a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br />
-</a>
-  </address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 -->
-  <!-- hhmts start -->
-  Last modified: Fri May 5 21:29:07 CDT 2006 <!-- hhmts end -->
-</body>
-</html>
diff --git a/CIAO/docs/tutorials/CoSMIC/style.css b/CIAO/docs/tutorials/CoSMIC/style.css
deleted file mode 100644
index b86b9ceb671..00000000000
--- a/CIAO/docs/tutorials/CoSMIC/style.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/* Important Node */
-div.important {
-	position: center;
-	width: 75%;
-	text-align: left;
-	border: 1;
-	background: #FAEBD7;
-}
-
-div.important strong {
-	font-weight: bold;
-	color: red;
-	font-variant: small-caps;
-}
diff --git a/CIAO/docs/tutorials/Quoter/Simple/01.html b/CIAO/docs/tutorials/Quoter/Simple/01.html
index fb33ed38008..6bbf3ac15b0 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/01.html
+++ b/CIAO/docs/tutorials/Quoter/Simple/01.html
@@ -26,23 +26,21 @@ w\:* {behavior:url(#default#VML);}
  <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:Revision>24</o:Revision>
+  <o:TotalTime>250</o:TotalTime>
   <o:Created>2006-10-09T18:21:00Z</o:Created>
-  <o:LastSaved>2006-12-01T17:30:00Z</o:LastSaved>
+  <o:LastSaved>2007-03-08T01:16:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
-  <o:Words>859</o:Words>
-  <o:Characters>4900</o:Characters>
+  <o:Words>878</o:Words>
+  <o:Characters>5011</o:Characters>
   <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>40</o:Lines>
+  <o:Lines>41</o:Lines>
   <o:Paragraphs>11</o:Paragraphs>
-  <o:CharactersWithSpaces>5748</o:CharactersWithSpaces>
-  <o:Version>11.8107</o:Version>
+  <o:CharactersWithSpaces>5878</o:CharactersWithSpaces>
+  <o:Version>11.5606</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>
@@ -120,12 +118,6 @@ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
 	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;
@@ -381,7 +373,7 @@ ul
 	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"/>
+ <o:shapedefaults v:ext="edit" spidmax="10242"/>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
@@ -399,22 +391,21 @@ 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>
+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>
+mso-bidi-font-weight:bold'>Please make sure to read the following article to under
+the Stock Quoter 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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>
@@ -429,15 +420,12 @@ style='font-size:12.0pt;line-height:150%;color:black'>Directory Structure:<o: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'>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>
+structure. Create Quoter 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>
+mso-bidi-font-weight:bold'>Quoter<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;
@@ -449,13 +437,13 @@ style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&
 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>
+</span>|---- Stock_Base<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>
+style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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;
@@ -475,7 +463,7 @@ margin-bottom:.0001pt;text-indent:-.25in;line-height:150%;mso-list:l0 level1 lfo
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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
@@ -486,19 +474,17 @@ following:<o:p></o:p></span></h3>
 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>
+style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&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'>MPC <a
+href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">Chapter</a> in
+TAO&#8217;s Developer&#8217;s Guide 1.4a.<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;
+style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&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>
 
@@ -509,13 +495,11 @@ Design:</span></b><span style='color:black'><o:p></o:p></span></p>
 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='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
+style='color:black'>In the <i style='mso-bidi-font-style:normal'>Quoter/<span
+style='mso-bidi-font-style:italic'>Stock_Base </span></i><span
+style='mso-bidi-font-style:italic'>sub-</span>directory, place an idl file </span><code><i><span
+style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl</span></i></code><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
@@ -526,47 +510,42 @@ both components, reducing the size of &quot;real&quot; components.<o:p></o:p></s
 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>
+style='font:7.0pt "Times New Roman"'>&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 <i style='mso-bidi-font-style:normal'>Quoter/<span
+style='mso-bidi-font-style:italic'>Stock_Base</span></i><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>
+&#8211;n -e Stock_Base<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>
+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><code><i><span
+style='font-size:10.0pt;line-height:150%;color:black'>Stock_Base.idl </span></i></code><span
+style='color:black;mso-bidi-font-style:italic'>uses eventtypes. If our idl file
+did not use eventtypes, 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>
+style='color:black;mso-bidi-font-style:italic'>not 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>
+a <i>Stock_Base.mpc</i> file that contains two projects <i>Stock_Base_stub </i>and
+<i>Stock_Base_skel </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>
@@ -578,12 +557,12 @@ 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>
+</span>generate_export_file.pl STOCK_BASE_STUB &gt; Stock_Base_stub_export.h<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>
+style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+</span>generate_export_file.pl STOCK_BASE_SKEL &gt; Stock_Base_skel_export.h<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>
@@ -592,11 +571,10 @@ style='font-family:"Courier New";color:black;mso-bidi-font-style:italic'><o:p>&n
 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>
+style='font:7.0pt "Times New Roman"'>&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>
@@ -612,49 +590,43 @@ style='color:black'>&nbsp;&nbsp;&nbsp;<o:p></o:p></span></p>
 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='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
+style='color:black'>In the </span><code><i><span style='font-size:10.0pt;
+line-height:150%;color:black'>Quoter/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>
+style='color:black'>, place an idl file </span><code><i><span style='font-size:
+10.0pt;line-height:150%;color:black'>Distributor.idl</span></i></code><span
+style='color:black'> that looks like <a href="Distributor/Distributor.idl">this</a>.
+This file defines the StockDistributor 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='font:7.0pt "Times New Roman"'>&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 <i style='mso-bidi-font-style:normal'>Quoter/<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>
+style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p
+Stock_Base 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>
+a <i>Distirubotor.mpc</i> file that contains three projects <i>Distributor_stub,
+Distributor_svnt, and Distributor_exec </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:
@@ -667,17 +639,17 @@ 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>
+</span>generate_export_file.pl DISTRIBUTOR_STUB &gt; Distributor_stub_export.h<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>
+</span>generate_export_file.pl DISTRIBUTOR_SVNT &gt; Distributor_svnt_export.h<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>
+</span>generate_export_file.pl DISTRIBUTOR_EXEC &gt; Distributor_exec_export.h<o:p></o:p></span></p>
 
 <p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
@@ -689,14 +661,13 @@ project later in the tutorial.<o:p></o:p></span></p>
 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='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
+style='color:black;mso-bidi-font-style:italic'>The </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Distributor_stub</span></i><span
+style='color:black;mso-bidi-font-style:italic'>, </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Distributor_svnt</span></i><span
+style='color:black;mso-bidi-font-style:italic'>, and </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Distributor_exec</span></i><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>
@@ -710,47 +681,42 @@ style='mso-bidi-font-weight:normal'><span style='color:black'>Broker:<o:p></o:p>
 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='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
+style='color:black'>In the </span><code><i><span style='font-size:10.0pt;
+line-height:150%;color:black'>Quoter/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>
+place an idl file </span><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 style='color:black'> that
+looks like <a href="Broker/Broker.idl">this</a>. This file defines the
+StockBroker 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>
+style='font:7.0pt "Times New Roman"'>&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 <i style='mso-bidi-font-style:normal'>Quoter/<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>
+style='font-family:"Courier New";color:black'>generate_component_mpc.pl -p
+Stock_Base 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>
+a <i>Broker.mpc</i> file that contains three projects <i>Broker_stub,
+Broker_svnt, and Broker_exec </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:
@@ -763,17 +729,17 @@ 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>
+</span>generate_export_file.pl BROKER_STUB &gt; Broker_stub_export.h<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>
+</span>generate_export_file.pl BROKER_SVNT &gt; Broker_svnt_export.h<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>
+</span>generate_export_file.pl BROKER_EXEC &gt; Broker_exec_export.h<o:p></o:p></span></p>
 
 <p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
@@ -785,14 +751,13 @@ project later in the tutorial.<o:p></o:p></span></p>
 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='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
+style='color:black;mso-bidi-font-style:italic'>The </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Broker_stub</span></i><span
+style='color:black;mso-bidi-font-style:italic'>, </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Broker_svnt</span></i><span
+style='color:black;mso-bidi-font-style:italic'>, and </span><i><span
+style='font-family:"Courier New";color:black'>Stock_Base_Broker_exec</span></i><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>
@@ -800,20 +765,24 @@ look like <a href="Broker/Broker.mpc">this</a>. </span><span style='font-family:
 <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='color:black'>To
+understand the meaning of different parameters passed to </span><span
+style='font-family:"Courier New";color:black'>generate_component_mpc.pl<span
+style='mso-bidi-font-style:italic'> </span></span><span style='color:black;
+mso-bidi-font-style:italic'>click <a href="../../../generate_component_mpc.html">here</a>
+or 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'>
+color:black'>generate_component_mpc.pl<span style='mso-bidi-font-style:italic'>
+-h</span></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>
+<![endif]><o:p></o:p></span></p>
 
-<p class=MsoNormal style='line-height:150%'><span style='color:black'>&nbsp;&nbsp;&nbsp;
-<o:p></o:p></span></p>
+<p class=MsoNormal align=center style='text-align:center;line-height:150%'><span
+style='color:black'><a href="index.html">Previous</a><span style='mso-tab-count:
+8'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><a
+href="02.html">Next</a><o:p></o:p></span></p>
 
 <div class=MsoNormal align=center style='text-align:center;line-height:150%'><span
 style='color:black'>
@@ -826,10 +795,7 @@ style='color:black'>
 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>
+<p class=MsoNormal style='line-height:150%'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
 </div>
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/02.html b/CIAO/docs/tutorials/Quoter/Simple/02.html
index 9892e9722c8..fe66bfa5d47 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/02.html
+++ b/CIAO/docs/tutorials/Quoter/Simple/02.html
@@ -26,18 +26,18 @@ w\:* {behavior:url(#default#VML);}
  <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:Revision>11</o:Revision>
+  <o:TotalTime>90</o:TotalTime>
   <o:Created>2006-10-09T19:28:00Z</o:Created>
-  <o:LastSaved>2006-10-09T21:48:00Z</o:LastSaved>
+  <o:LastSaved>2007-03-08T01:17:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
-  <o:Words>415</o:Words>
-  <o:Characters>2370</o:Characters>
+  <o:Words>443</o:Words>
+  <o:Characters>2531</o:Characters>
   <o:Company>Maritime Systems &amp; Sensors</o:Company>
-  <o:Lines>19</o:Lines>
+  <o:Lines>21</o:Lines>
   <o:Paragraphs>5</o:Paragraphs>
-  <o:CharactersWithSpaces>2780</o:CharactersWithSpaces>
-  <o:Version>11.8036</o:Version>
+  <o:CharactersWithSpaces>2969</o:CharactersWithSpaces>
+  <o:Version>11.5606</o:Version>
  </o:DocumentProperties>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <w:WordDocument>
@@ -53,14 +53,6 @@ w\:* {behavior:url(#default#VML);}
 </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:"";
@@ -120,6 +112,38 @@ div.Section1
 	margin-left:1.25in;
 	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;}
 ol
 	{margin-bottom:0in;}
 ul
@@ -146,7 +170,7 @@ ul
 	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"/>
+ <o:shapedefaults v:ext="edit" spidmax="5122"/>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
@@ -162,7 +186,7 @@ ul
 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>
+width=634 height=376 id="_x0000_i1025" 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>
@@ -171,27 +195,27 @@ CIDL files:<o:p></o:p></span></b></p>
 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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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>
+style='font:7.0pt "Times New Roman"'>&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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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>
+style='font:7.0pt "Times New Roman"'>&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;
@@ -214,27 +238,26 @@ 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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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>
+style='font:7.0pt "Times New Roman"'>&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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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>
+style='font:7.0pt "Times New Roman"'>&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;
@@ -252,8 +275,9 @@ later in the tutorial to insert our business logic in the Broker component.<o:p>
 <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>
+understand the meaning of different parameters passed to the CIDLC compiler
+click <a href="../../../cidlc.html">here</a> or <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:
@@ -269,14 +293,13 @@ the Components:<o:p></o:p></span></b></p>
 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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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
+style='font:7.0pt "Times New Roman"'>&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
@@ -288,14 +311,13 @@ 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
+margin-left:1.25in;text-indent:-.25in;mso-list:l0 level1 lfo2;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
+style='font:7.0pt "Times New Roman"'>&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>
@@ -303,7 +325,10 @@ into <i style='mso-bidi-font-style:normal'><a href="Broker/Broker_exec.h">Broker
 
 <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>
+<p class=MsoNormal align=center style='text-align:center'><span
+style='color:black'><a href="01.html">Previous</a><span style='mso-tab-count:
+8'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><a
+href="03.html">Next</a><o:p></o:p></span></p>
 
 <div class=MsoNormal align=center style='text-align:center'><span
 style='color:black'>
@@ -314,10 +339,9 @@ style='color:black'>
 
 <address><span style='color:black'><a href="mailto:ming.xiong@vanderbilt.edu">Ming
 Xiong<br>
-</a><o:p></o:p></span></address>
+</a></span><a href="mailto:abdullah.sowayan@lmco.com">Abdullah Sowayan</a></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>
+<p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
 </div>
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/03.html b/CIAO/docs/tutorials/Quoter/Simple/03.html
index 5a60e6fa73b..875b90a03b4 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/03.html
+++ b/CIAO/docs/tutorials/Quoter/Simple/03.html
@@ -1,3 +1,4 @@
+<!-- $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"
@@ -23,32 +24,30 @@ w\:* {behavior:url(#default#VML);}
 <![endif]-->
 <title>Getting Started</title>
 <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="PlaceName"/>
+ name="place"/>
 <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
  name="PlaceType"/>
 <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="place"/>
+ name="PlaceName"/>
 <!--[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:Revision>13</o:Revision>
+  <o:TotalTime>54</o:TotalTime>
   <o:Created>2006-10-09T22:26:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:25:00Z</o:LastSaved>
+  <o:LastSaved>2007-03-08T01:18:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
-  <o:Words>2514</o:Words>
-  <o:Characters>14330</o:Characters>
+  <o:Words>2585</o:Words>
+  <o:Characters>14741</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:Lines>122</o:Lines>
+  <o:Paragraphs>34</o:Paragraphs>
+  <o:CharactersWithSpaces>17292</o:CharactersWithSpaces>
+  <o:Version>11.5606</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>
@@ -66,14 +65,6 @@ st1\:*{behavior:url(#ieooui) }
 <![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:"";
@@ -137,12 +128,6 @@ pre
 	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;
@@ -236,31 +221,9 @@ div.Section1
 	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
+@list l2:level1
 	{mso-level-number-format:bullet;
 	mso-level-text:\F0B7;
 	mso-level-tab-stop:.5in;
@@ -268,213 +231,202 @@ div.Section1
 	text-indent:-.25in;
 	mso-ansi-font-size:10.0pt;
 	font-family:Symbol;}
-@list l4:level2
+@list l2:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level3
+@list l2:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level4
+@list l2:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level5
+@list l2:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level6
+@list l2:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level7
+@list l2:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level8
+@list l2:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l4:level9
+@list l2:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5
+@list l3
 	{mso-list-id:907959882;
 	mso-list-template-ids:323885252;}
-@list l5:level1
+@list l3:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level2
+@list l3:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level3
+@list l3:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level4
+@list l3:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level5
+@list l3:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level6
+@list l3:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level7
+@list l3:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level8
+@list l3:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l5:level9
+@list l3:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6
+@list l4
 	{mso-list-id:1065254837;
 	mso-list-template-ids:1089662206;}
-@list l6:level1
+@list l4:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level2
+@list l4:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level3
+@list l4:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level4
+@list l4:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level5
+@list l4:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level6
+@list l4:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level7
+@list l4:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level8
+@list l4:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l6:level9
+@list l4:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7
+@list l5
 	{mso-list-id:1084494006;
 	mso-list-template-ids:-1504120978;}
-@list l7:level1
+@list l5:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level2
+@list l5:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level3
+@list l5:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level4
+@list l5:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level5
+@list l5:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level6
+@list l5:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level7
+@list l5:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level8
+@list l5:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l7:level9
+@list l5:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8
+@list l6
 	{mso-list-id:1153565371;
 	mso-list-template-ids:-169696680;}
-@list l8:level1
+@list l6:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level2
+@list l6:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level3
+@list l6:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level4
+@list l6:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level5
+@list l6:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level6
+@list l6:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level7
+@list l6:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level8
+@list l6:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l8:level9
+@list l6: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
+@list l7
 	{mso-list-id:1832599161;
 	mso-list-template-ids:-966728002;}
-@list l10:level1
+@list l7:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level2
+@list l7:level2
 	{mso-level-number-format:bullet;
 	mso-level-text:o;
 	mso-level-tab-stop:1.0in;
@@ -483,115 +435,115 @@ div.Section1
 	mso-ansi-font-size:10.0pt;
 	font-family:"Courier New";
 	mso-bidi-font-family:"Times New Roman";}
-@list l10:level3
+@list l7:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level4
+@list l7:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level5
+@list l7:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level6
+@list l7:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level7
+@list l7:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level8
+@list l7:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l10:level9
+@list l7:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11
+@list l8
 	{mso-list-id:1956401533;
 	mso-list-template-ids:-909756440;}
-@list l11:level1
+@list l8:level1
 	{mso-level-tab-stop:.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level2
+@list l8:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level3
+@list l8:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level4
+@list l8:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level5
+@list l8:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level6
+@list l8:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level7
+@list l8:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level8
+@list l8:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level9
+@list l8:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12
+@list l9
 	{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
+@list l9:level1
 	{mso-level-tab-stop:39.0pt;
 	mso-level-number-position:left;
 	margin-left:39.0pt;
 	text-indent:-.25in;}
-@list l12:level2
+@list l9:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level3
+@list l9:level3
 	{mso-level-tab-stop:1.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level4
+@list l9:level4
 	{mso-level-tab-stop:2.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level5
+@list l9:level5
 	{mso-level-tab-stop:2.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level6
+@list l9:level6
 	{mso-level-tab-stop:3.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level7
+@list l9:level7
 	{mso-level-tab-stop:3.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level8
+@list l9:level8
 	{mso-level-tab-stop:4.0in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l12:level9
+@list l9:level9
 	{mso-level-tab-stop:4.5in;
 	mso-level-number-position:left;
 	text-indent:-.25in;}
-@list l11:level1 lfo5
+@list l8:level1 lfo5
 	{mso-level-start-at:4;}
 @list l1:level2 lfo7
 	{mso-level-number-format:arabic;
@@ -630,7 +582,7 @@ ul
 	mso-bidi-language:#0400;}
 </style>
 <![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="4098"/>
+ <o:shapedefaults v:ext="edit" spidmax="6146"/>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
@@ -646,65 +598,58 @@ ul
 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>
+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><b>Brief Introduction to CosMIC:<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>
+Component Synthesis using Model Integrated Computing (CoSMIC) 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;
+<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l9 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;
+style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&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>
+and embedded application functionality and QoS requirements.</p>
 
-<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l12 level1 lfo1;
+<p class=MsoNormal style='margin-left:39.0pt;text-indent:-.25in;mso-list:l9 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;
+style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&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>
+required to deliver end-to-end QoS 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
+<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'>The
+CoSMIC toolsuite provides modeling of DRE systems, their QoS requirements, and
+QoS adaptation policies used for DRE application QoS management. The component
+behavior, their interactions, and QoS 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>
+Configuration (D&amp;C) specification (ptc/2003-07-08)</a></span>. CoSMIC
+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>
+prone. We therefore utilize CosMIC (we specifically use a subset of CosMIC
+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>
+more information on CosMIC, 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>
+href="http://www.cs.wustl.edu/~schmidt/PDF/mamad2003.pdf">CoSMIC: 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>
@@ -722,79 +667,70 @@ 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>
+&nbsp;&nbsp; To quick start our Stock Quoter modeling process in GME, CoSMIC
+introduces <em>idl_to_picml</em> , 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
+     auto;mso-list:l3 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>
+     the PATH variable, e.g., c:\Program Files\ISIS\CoSMIC\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,
+     auto;mso-list:l3 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>
+     set the environment for using Microsoft Visual Studio .NET tools so that <i>idl_to_picml</i>
+     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>
+     auto;mso-list:l3 level1 lfo2;tab-stops:list .5in'>In the same command
+     prompt, change directory to <code><span style='font-size:10.0pt'>MyQuoter\</span></code>,
+     and type the following command:<br>
+     &nbsp;&nbsp; &gt; <kbd><span style='font-size:10.0pt'>idl_to_picml -x
+     MyQuoter -r . -I .\Stock_Base</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>
+     &nbsp;&nbsp; &gt;<kbd><span style='font-size:10.0pt'>idl_to_picml -x
+     MyQuoter -r .&nbsp;-I .\Stock_Base -I %TAO_ROOT% -I %TAO_ROOT%\orbsvcs -I
+     %CIAO_ROOT%\ciao)</span></kbd><br>
+     &nbsp; <em>idl_to_picml</em> will parse your IDL files and generated a <code><span
+     style='font-size:10.0pt'>MyQuoter.xme</span></code> file in the <code><span
+     style='font-size:10.0pt'>MyQuoter</span></code> directory. Note that if -x
+     option is not used, the default xme file name will be <code><span
+     style='font-size:10.0pt'>PICML_default_xme_file.xme.</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>
+     the xme 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"
+style='color:black'><img border=0 width=781 height=636 id="_x0000_i1027"
 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><span style='color:black'>&nbsp; In the Browser of the generated model, the <em>PredefinedTypes</em>
+folder contains a bunch of atomic datatype elements that will be referenced by
+other modeling parts later. You don't have to worry about them for now. The
+models in <em>InterfaceDefinitions</em> folder are the PICML representations
+ofthe 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;FileRef&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 idl 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"
+style='color:black'><img border=0 width=223 height=336 id="_x0000_i1028"
 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>
+we are ready to model the rest of the Stock Quoter 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>
@@ -806,15 +742,13 @@ style='color:black'>
 
 </span></div>
 
-<h3>Building Stock <span class=SpellE>Quoter</span> system in PICML<span
-style='color:black'><o:p></o:p></span></h3>
+<h3>Building Stock Quoter 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>
+<p><span style='color:black'>This section describes modeling the Quoter
+application using PICML. If you have trouble producing a functioning model from
+this tutorial, please see the, <a href="Model/Quoter.xme">pre-built Quoter
+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>
 
@@ -826,44 +760,35 @@ XML..</em> from GME and choose your XML model<o:p></o:p></span></p>
 
 <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
+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">DAnCE 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>
+D&amp;C and CCM</a> can help to reduce the learning curve. In addition, it is
+also helpful to read through Chapter 32 of TAO's Developer's Guide 1.4a (CIAO
+and CCM) which thoroughly describes the various descriptors required for a
+component (*.iad, *.ccd, *.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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#1">ImplementationArtifacts</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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#2">ComponentImplementations</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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#3">ComponentPackages</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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#4">PackageConfiguration</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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#5">TopLevelPackage</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>
+     auto;mso-list:l2 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>
+     auto;mso-list:l2 level1 lfo3;tab-stops:list .5in'><a href="#7">DeploymentPlan</a><o:p></o:p></li>
 </ul>
 
 <div class=MsoNormal align=center style='text-align:center'><span
@@ -873,13 +798,13 @@ style='color:black'>
 
 </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><span style='color:black'>The complete PICML Quoter model consists of
+modeling elements distributed across various folders. If you used <em>idl_to_picml</em>
+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:
@@ -890,18 +815,17 @@ 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>
+<h3><span style='color:black'>ImplementationArtifacts<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>
+associated with components. <em>idl_to_picml</em> 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"
+style='color:black'><img border=0 width=891 height=552 id="_x0000_i1031"
 src="Images/fig4.jpg"><br>
-<span class=GramE>Figure 4.</span><o:p></o:p></span></p>
+Figure 4.<o:p></o:p></span></p>
 
 <div class=MsoNormal align=center style='text-align:center'><a name=1></a><span
 style='color:black'>
@@ -910,71 +834,57 @@ style='color:black'>
 
 </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>
+<h3><span style='color:black'>ComponentImplementation<a name=2></a><o:p></o:p></span></h3>
+
+<p><span style='color:black'>This folder contains models that describe the implementations
+of component interfaces. In the Quoter example, we will have two monolithic
+component implementations - named <em>StockDistributorImplementation</em> and <em>StockBrokerImplementation</em>
+- and an assembly component implementation named <em>StockQuoter</em>, which is
+an assembly of <em>StockDistributorImplementation</em> and <em>StockBrokerImplementaion</em>.
+<em>idl_to_picml</em> 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 Quoter 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"
+style='color:black'><img border=0 width=922 height=639 id="_x0000_i1033"
 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>
+<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><code><span style='font-size:10.0pt;
+color:black'>MonolithicImplementation</span></code><span style='color:black'>.
+Instead, <em>instances</em> of other components are placed within the assembly
+and connected. Let's try to assemble the <em>StockQuoter</em>.<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>
+     auto;mso-list:l0 level1 lfo4;tab-stops:list .5in'>Right click the <em>ComponentImplementations</em>
+     folder, choose <strong>Insert Model-&gt;ComponentImplementationContainer</strong>,
+     rename it as &quot;StockQuoterImplementation&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>
+     drag a &lt;&lt;ComponentAssembly&gt;&gt; to the modeling window, name it
+     &quot;StockQuoter&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>,
+     instances for interfaces <em>StockBroker</em> and <em>StockDistributor</em>.
+     To do that, expand the folder <em><span style='font-size:10.0pt;
+     font-family:"Courier New"'>InterfaceDefinitions</span></em>, then expand
+     the <em><span style='font-size:10.0pt;font-family:"Courier New"'>InterfaceDefinitions/</span></em>
+     <em>Broker</em>, then <em><span style='font-size:10.0pt;font-family:"Courier New"'>InterfaceDefinitions/</span></em>
+     <em>Broker/ Stock</em> until the interface definition of <em>StockBroker</em>
+     shows. While expanding the tree, always keep the &quot;StockQuoter&quot;
+     &lt;&lt;ComponentAssembly&gt;&gt; window open. Then drag <code><span
+     style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code>
+     in the browser to the &quot;StockQuoter&quot;
+     &lt;&lt;ComponentAssembly&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>
@@ -983,28 +893,27 @@ class=SpellE><em>StockQuoter</em></span>.<o:p></o:p></span></p>
 <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"
+style='color:black'><img border=0 width=972 height=714 id="_x0000_i1034"
 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>
+     auto;mso-list:l8 level1 lfo5;tab-stops:list .5in'>Create an
+     &lt;&lt;PublishConnector&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
+     auto;mso-list:l8 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>
+     sure you change to connect mode <img border=0 width=32 height=32
+     id="_x0000_i1035" src="Icons/AddConnMode.gif">) and the resulting assembly
+     model should look like Figure 7. Note that to create connections between
+     StockDistributor.notify_out and StockBroker.notify_in, you will need the
+     intermediate connector &lt;&lt;PublishConnector&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"
+style='color:black'><img border=0 width=724 height=402 id="_x0000_i1036"
 src="Images/fig7.jpg"><!-- hhmts end -->&gt;<br>
 <br>
 Figure 7<o:p></o:p></span></p>
@@ -1016,58 +925,54 @@ style='color:black'>
 
 </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>
+<h3><a name=3></a><span style='color:black'>ComponentPackage<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>
+component packages. Every instance in an assembly should have a corresponding
+monolithic implementation and packaged in a ComponentPackagebe To create a
+package for <em>StockBroker</em>.instance<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;;
+     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Right click folder <em>ComponentPackage</em>s
+     , insert a &lt;&lt;PackageContainer&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>
+     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>From the PartBrowser,
+     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>
+      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a &lt;&lt;ComponentPackage&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
+      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a
+      &lt;&lt;ComponentImplementationReference&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>
+      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>a
+      &lt;&lt;ComponentRef&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>.
+     auto;mso-list:l1 level1 lfo6;tab-stops:list .5in'>Refer the
+     &lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker</em> to <code><span
+     style='font-size:10.0pt'>MyQuoter/ComponentImplementations/StockBroker</span></code>Implementation/StockBrokerMonolithicImpl.
+     Refer the &lt;&lt;ComponentRef&gt;&gt; <em>Broker</em> to <code><span
+     style='font-size:10.0pt'>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</span></code>.
      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>
+     into &lt;&lt;ComponentImplementationReference&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>
+     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>
+      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>&lt;&lt;ComponentImplementationReference&gt;&gt;
+      <em>Broker</em> implements &lt;&lt;ComponentPackage&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>
+      auto;mso-list:l1 level2 lfo6;tab-stops:list 1.0in'>&lt;&lt;ComponentPackage&gt;&gt;
+      <em>Broker</em> realizes &lt;&lt;ComponentRef&gt;&gt; <em>Broker</em>.<o:p></o:p></li>
  </ul>
 </ol>
 
@@ -1078,23 +983,22 @@ margin-left:.5in'><span style='color:black'><br>
 
 <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>
+border=0 width=675 height=497 id="_x0000_i1038" 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>
+margin-left:.5in'><span style='color:black'>Now create a
+ComponentPackage/StockDistributor 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>
+     We will also need to create a package for the assembly component
+     StockQuoter. 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 StockQuoter does not need a
+     &lt;&lt;ComponentRef&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;
@@ -1102,30 +1006,30 @@ margin-left:.5in;text-indent:-.25in;mso-list:l1 level2 lfo7'><![if !supportLists
 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>
+style='color:black'>Insert a &lt;&lt;ComponentPackage&gt;&gt; named
+&quot;StockQuoter&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>
+style='color:black'>Add a &lt;&lt;ComponentImplementationReference&gt;&gt;
+named &quot;StockQuoter&quot;, refer it to MyQuoter</span><code><span
+style='font-size:10.0pt;color:black'>/ComponentImplementations/StockQuoter/StockQuoter</span></code><span
+style='color:black'><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>
+style='color:black'>Switch to connect mode and connect
+&lt;&lt;ComponentImplementationReference&gt;&gt; StockQuoter with
+&lt;&lt;ComponentPackage&gt;&gt; StockQuoter, 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"
+style='color:black'><img border=0 width=549 height=354 id="_x0000_i1039"
 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>
@@ -1137,33 +1041,29 @@ style='color:black'>
 
 </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>
+<h3><a name=4></a><span style='color:black'>PackageConfiguration<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
+     auto;mso-list:l6 level1 lfo8;tab-stops:list .5in'>In the folder <em>PackageConfiguratio</em>n,
+     and create a &lt;&lt;PackageConfigurationContainer&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>
+     auto;mso-list:l6 level1 lfo8;tab-stops:list .5in'>Add a
+     &lt;&lt;PackageConfiguration&gt;&gt; named &quot;default&quot; and a
+     &lt;&lt;ComponentPackageReference&gt;&gt;, name it
+     &quot;StockQuoter&quot;, connect &quot;Default&quot; to
+     &quot;StockQuoter&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
+     auto;mso-list:l6 level1 lfo8;tab-stops:list .5in'>Refer
+     &lt;&lt;ComponentPackageReference&gt;&gt; StockQuoter to
+     &lt;&lt;ComponentPackage&gt;&gt; <code><span style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter</span></code><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>
+     <code>(Not &lt;&lt;ComponentImplementationReference&gt;&gt;</code></span> <code><span
+     style='font-size:10.0pt'>MyQuoter/ComponentPackage/StockQuoter/StockQuoter!)&nbsp;</span></code><o:p></o:p></li>
 </ol>
 
 <p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
@@ -1175,8 +1075,7 @@ style='color:black'>
 
 </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>
+<h3><a name=5></a><span style='color:black'>ToplevelPackage<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
@@ -1184,21 +1083,18 @@ 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
+     auto;mso-list:l4 level1 lfo9;tab-stops:list .5in'>In the folder <em>ToplevelPackage</em>,
+     and create a &lt;&lt;ToplevelPackageContainer&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>
+     auto;mso-list:l4 level1 lfo9;tab-stops:list .5in'>Add a
+     &lt;&lt;ToplevelPackage&gt;&gt; named &quot;ToplevelPackage&quot; and a
+     &lt;&lt;PackageConfigurationReference&gt;&gt;, name it
+     &quot;Default&quot;, connect &quot;ToplevelPackage&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>
+     auto;mso-list:l4 level1 lfo9;tab-stops:list .5in'>Refer
+     &quot;Default&quot; to My<code><span style='font-size:10.0pt'>Quoter/PackageConfiguration/Default/Default</span></code><o:p></o:p></li>
 </ol>
 
 <p class=MsoNormal><span style='color:black'><o:p>&nbsp;</o:p></span></p>
@@ -1214,18 +1110,17 @@ style='color:black'>
 
 <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>
+which component-based application will be deployed. In this Quoter example, we
+can either deploy the two components into ONE host, or into TWO different host.
+We will deploy the Quoter 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>,
+     auto;mso-list:l5 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,
+     auto;mso-list:l5 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>
@@ -1240,91 +1135,82 @@ style='color:black'>
 
 </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>
+<h3><a name=7></a><span style='color:black'>DeploymentPlan<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>
+<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;,
+     auto;mso-list:l7 level1 lfo11;tab-stops:list .5in'>In the folder <em>DeploymentPlan</em>,
+     insert a model &lt;&lt;DeploymentPlan&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>
+     auto;mso-list:l7 level1 lfo11;tab-stops:list .5in'>From the PartBrowser,
+     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>
+      auto;mso-list:l7 level2 lfo11;tab-stops:list 1.0in'>Two
+      &lt;&lt;CollocationGroup&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>
+      auto;mso-list:l7 level2 lfo11;tab-stops:list 1.0in'>Two
+      &lt;&lt;NodeReference&gt;&gt; named &quot;Node_Broker&quot; and
+      &quot;Node_Distributor&quot; respectively, refering to <code><span
+      style='font-size:10.0pt'>MyQuoter/Targets/Domain/Broker</span></code> and
+      <code><span style='font-size:10.0pt'>MyQuoter/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>
+      auto;mso-list:l7 level2 lfo11;tab-stops:list 1.0in'>Two
+      &lt;&lt;ComponentRef&gt;&gt; named &quot;StockBroker&quot; and
+      &quot;StockDistributor&quot; respectively, refering 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>
+      respectively. Note that the &lt;&lt;ComponentRef&gt;&gt; in
+      DeploymentPlan 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>.
+     12.0pt;mso-list:l7 level1 lfo11;tab-stops:list .5in'>Switch to Connect
+     Mode, connect one &lt;&lt;CollocationGroup&gt;&gt; to
+     &lt;&lt;NodeReference&gt;&gt; <em>Node_Broker</em>, connect another
+     &lt;&lt;CollocationGroup&gt;&gt; to &lt;&lt;NodeReference&gt;&gt; <em>Node_Distributor</em>.
      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>
+border=0 width=752 height=530 id="_x0000_i1044" src="Images/fig10.jpg"><br>
 <br>
-<span class=GramE>Figure 10.</span><o:p></o:p></span></p>
+Figure 10.<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;
+     12.0pt;mso-list:l7 level1 lfo11;tab-stops:list .5in'>Now we need to
+     associate &lt;&lt;ComponentRef&gt;&gt; StockBroker to the
+     &lt;&lt;CollocationGroup&gt;&gt; running on the
+     &lt;&lt;NodeReference&gt;&gt; Broker, and &lt;&lt;ComponentRef&gt;&gt;
+     StockDistributor to the &lt;&lt;CollocationGroup&gt;&gt; running on the
+     &lt;&lt;NodeReference&gt;&gt; Distributor. To do that, switch the Edit
+     Mode Bar to Set Mode (<img border=0 width=32 height=32 id="_x0000_i1045"
+     src="Icons/SetMode.gif">), and move the cursor to the
+     &lt;&lt;CollocationGroup&gt;&gt; running on &lt;&lt;NodeReference&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>
+     mode cursor, and only the &lt;&lt;CollocationGroup&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"
+style='color:black'><img border=0 width=672 height=505 id="_x0000_i1046"
 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><span style='color:black'>Now move your cursor to
+&lt;&lt;ComponentRef&gt;&gt;&nbsp; StockDistributor, 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"
+style='color:black'><img border=0 width=672 height=505 id="_x0000_i1047"
 src="Images/fig12.jpg">
 
 <!doctype HTML>
@@ -1334,12 +1220,11 @@ src="Images/fig12.jpg">
 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>
+associates <em>StockDistributor</em> component to the
+&lt;&lt;CollocationGroup&gt;&gt; running on <em>Distributor</em> node. To do
+the same with Broker, just right-click on another
+&lt;&lt;CollocationGroup&gt;&gt;, and left-click on StockBroker
+&lt;&lt;CollocationGroup&gt;&gt; which is highlighted.<o:p></o:p></span></p>
 
 <div class=MsoNormal align=center style='text-align:center'><span
 style='color:black'>
@@ -1353,34 +1238,38 @@ 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
+<p><span style='color:black'>After we are done with the modeling, the
+flattened_deploymentplan interpreter that comes along with PICML will help us
+to generate a flattened_deploymentplan.cdp file. Please make sure you generate
+this file to MyQuoter/descriptors. Note that to get the example working</span><span
+style='font-family:"Courier New";color:black'>,</span><span style='color:black'>a
+Node Map file should be created to map logicalnodes to NodeManager object
+references,e.g:<o:p></o:p></span></p>
+
+<pre wrap=""><span style='color:black'>DistributorNode corbaloc:iiop:localhost:30000/NodeManager<o:p></o:p></span></pre><pre><span
+style='color:black'>BrokerNode<span style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>corbaloc:iiop:localhost:40000/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>
 
+<p class=MsoNormal align=center style='text-align:center;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="02.html">Previous</a><span style='mso-tab-count:
+8'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><a
+href="04.html">Next</a><o:p></o:p></span></p>
+
+<div class=MsoNormal align=center style='text-align:center;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'>
+
+<hr size=2 width="100%" align=center>
+
+</span></div>
+
 <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>
+style='color:black'><o:p>&nbsp;</o:p></span></p>
 
-</div>
+<pre style='text-align:center'><o:p>&nbsp;</o:p></pre></div>
 
 </body>
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/04.html b/CIAO/docs/tutorials/Quoter/Simple/04.html
index 4e259355ba1..f56639f5657 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/04.html
+++ b/CIAO/docs/tutorials/Quoter/Simple/04.html
@@ -1,3 +1,4 @@
+<!-- $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"
@@ -25,18 +26,18 @@ w\:* {behavior:url(#default#VML);}
  <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:Revision>5</o:Revision>
+  <o:TotalTime>4</o:TotalTime>
   <o:Created>2006-11-06T21:26:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:34:00Z</o:LastSaved>
+  <o:LastSaved>2007-03-08T01:20:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
-  <o:Words>285</o:Words>
-  <o:Characters>1629</o:Characters>
+  <o:Words>292</o:Words>
+  <o:Characters>1668</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:CharactersWithSpaces>1957</o:CharactersWithSpaces>
+  <o:Version>11.5606</o:Version>
  </o:DocumentProperties>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <w:WordDocument>
@@ -119,8 +120,8 @@ div.Section1
 	{page:Section1;}
  /* List Definitions */
  @list l0
-	{mso-list-id:20934335;
-	mso-list-template-ids:-306000872;}
+	{mso-list-id:67775701;
+	mso-list-template-ids:1355323582;}
 @list l0:level1
 	{mso-level-number-format:bullet;
 	mso-level-text:\F0B7;
@@ -129,9 +130,41 @@ div.Section1
 	text-indent:-.25in;
 	mso-ansi-font-size:10.0pt;
 	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:67775701;
-	mso-list-template-ids:1355323582;}
+	{mso-list-id:170876734;
+	mso-list-template-ids:1310460404;}
 @list l1:level1
 	{mso-level-number-format:bullet;
 	mso-level-text:\F0B7;
@@ -173,16 +206,16 @@ div.Section1
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l2
-	{mso-list-id:170876734;
-	mso-list-template-ids:1310460404;}
+	{mso-list-id:333609146;
+	mso-list-template-ids:-1273693138;}
 @list l2:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
+	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:Symbol;}
+	font-family:Wingdings;}
 @list l2:level2
 	{mso-level-tab-stop:1.0in;
 	mso-level-number-position:left;
@@ -216,70 +249,38 @@ div.Section1
 	mso-level-number-position:left;
 	text-indent:-.25in;}
 @list l3
-	{mso-list-id:232472744;
-	mso-list-template-ids:1463160066;}
+	{mso-list-id:909120102;
+	mso-list-template-ids:116433128;}
 @list l3:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:\F0A7;
+	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:Wingdings;}
+	font-family:Symbol;}
 @list l4
-	{mso-list-id:333609146;
-	mso-list-template-ids:-1273693138;}
+	{mso-list-id:1387752558;
+	mso-list-template-ids:245692192;}
 @list l4:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:\F0A7;
+	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: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;}
+	font-family:Symbol;}
 @list l5
-	{mso-list-id:1166676480;
-	mso-list-template-ids:-2033257756;}
+	{mso-list-id:1450973280;
+	mso-list-template-ids:2147393542;}
 @list l5:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:\F0B7;
+	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:Symbol;}
+	font-family:Wingdings;}
 ol
 	{margin-bottom:0in;}
 ul
@@ -306,7 +307,7 @@ ul
 	mso-bidi-language:#0400;}
 </style>
 <![endif]--><!-- $Id$ --><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="3074"/>
+ <o:shapedefaults v:ext="edit" spidmax="5122"/>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
@@ -318,16 +319,15 @@ ul
 
 <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'>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>
+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>
+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
@@ -335,11 +335,11 @@ 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
+     auto;mso-list:l1 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
+     auto;mso-list:l1 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>
 
@@ -352,7 +352,7 @@ 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
+     auto;mso-list:l2 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
@@ -361,11 +361,11 @@ CIAO_Daemon.<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:l1 level1 lfo9;tab-stops:list .5in'>Start the plan_launcher
+     auto;mso-list:l0 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
+     auto;mso-list:l0 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>
@@ -391,18 +391,24 @@ CIAO_Daemon.<o:p></o:p></span></p>
 &#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>
+10.0pt'><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>
+<p class=MsoNormal align=center style='text-align:center'><span
+style='color:black'><a href="03.html">Previous</a><span style='mso-tab-count:
+8'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><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>
 
-<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>
+</span></div>
+
+<address><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>
 
-<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><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
 <p class=MsoNormal style='margin-bottom:12.0pt'><span style='color:black'><o:p>&nbsp;</o:p></span></p>
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
index 4e85274ce8c..86160c6907e 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
@@ -29,8 +29,6 @@ namespace CIDL_StockBroker_Impl
   void
   StockBroker_exec_i::stock_subscribe (
   const char * stock_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Stock::Invalid_Stock))
   {
     if ((strcmp (stock_name, "MSFT") == 0) || (strcmp (stock_name, "IBM") == 0))
     {
@@ -49,8 +47,6 @@ namespace CIDL_StockBroker_Impl
   void
   StockBroker_exec_i::stock_unsubscribe (
   const char * stock_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Stock::Invalid_Stock))
   {
     if ((strcmp (stock_name, "MSFT") == 0) || (strcmp (stock_name, "IBM") == 0))
     {
@@ -71,7 +67,6 @@ namespace CIDL_StockBroker_Impl
   void
   StockBroker_exec_i::push_notify_in (
   Stock::StockName *ev)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
 
     ACE_DEBUG ((LM_INFO,
@@ -102,9 +97,6 @@ namespace CIDL_StockBroker_Impl
   void
   StockBroker_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ = StockBroker_Context::_narrow (ctx);
 
@@ -116,41 +108,26 @@ namespace CIDL_StockBroker_Impl
 
   void
   StockBroker_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockBroker_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockBroker_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockBroker_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockBroker_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
@@ -168,9 +145,6 @@ namespace CIDL_StockBroker_Impl
 
   ::Components::EnterpriseComponent_ptr
   StockBrokerHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
index 020acf28a12..fe54b423801 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
@@ -47,59 +47,36 @@ namespace CIDL_StockBroker_Impl
 
     virtual void
     stock_subscribe (
-    const char * stock_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Stock::Invalid_Stock));
+    const char * stock_name);
 
     virtual void
     stock_unsubscribe (
-    const char * stock_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Stock::Invalid_Stock));
+    const char * stock_name);
 
     virtual void
     push_notify_in (
-    ::Stock::StockName *ev)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ::Stock::StockName *ev);
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     StockBroker_Context *context_;
@@ -125,10 +102,7 @@ namespace CIDL_StockBroker_Impl
     virtual ~StockBrokerHome_exec_i (void);
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" BROKER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
index 1eaafa0027d..996d7bd7a5b 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
@@ -143,9 +143,6 @@ namespace CIDL_StockDistributor_Impl
 
   ::Stock::StockInfo *
   StockQuoter_exec_i::get_stock_info (const char *stock_name)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Stock::Invalid_Stock))
   {
     if (strcmp (stock_name, "MSFT") == 0)
     {
@@ -167,7 +164,7 @@ namespace CIDL_StockDistributor_Impl
     }
     else
     {
-      ACE_THROW_RETURN (Stock::Invalid_Stock (), 0);
+      throw Stock::Invalid_Stock ();
     }
   }
 
@@ -188,7 +185,6 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->rate_ == 0 || this->pulser_.active())
     {
@@ -200,7 +196,6 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::stop ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (! this->pulser_.active ())
     {
@@ -214,7 +209,6 @@ namespace CIDL_StockDistributor_Impl
 
   ::CORBA::Long
   StockDistributor_exec_i::rate ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->rate_;
   }
@@ -222,7 +216,6 @@ namespace CIDL_StockDistributor_Impl
   void
   StockDistributor_exec_i::rate (
   ::CORBA::Long rate)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->rate_ = rate;
   }
@@ -231,14 +224,12 @@ namespace CIDL_StockDistributor_Impl
 
   ::Stock::CCM_StockQuoter_ptr
   StockDistributor_exec_i::get_push_quoter ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new StockQuoter_exec_i (*this);
   }
 
   void
   StockDistributor_exec_i::push_notify_out ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->msft_++;
     this->ibm_++;
@@ -257,9 +248,6 @@ namespace CIDL_StockDistributor_Impl
   void
   StockDistributor_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ = StockDistributor_Context::_narrow (ctx);
 
@@ -271,25 +259,16 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockDistributor_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
   void
   StockDistributor_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Start the active object
     this->pulser_.open_h ();
@@ -297,9 +276,6 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Deactivate the active object
     this->pulser_.close_h ();
@@ -307,9 +283,6 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
   }
 
@@ -327,9 +300,6 @@ namespace CIDL_StockDistributor_Impl
 
   ::Components::EnterpriseComponent_ptr
   StockDistributorHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
index b890eb0365f..2ea8f04def2 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
@@ -52,10 +52,7 @@ namespace CIDL_StockDistributor_Impl
 
     virtual ::Stock::StockInfo *
     get_stock_info (
-    const char * stock_name)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Stock::Invalid_Stock));
+    const char * stock_name);
 
     /// User defined
 
@@ -134,68 +131,45 @@ namespace CIDL_StockDistributor_Impl
     // Supported or inherited operations.
 
     virtual void
-    start ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    start ();
 
     virtual void
-    stop ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    stop ();
 
     // Attribute operations.
 
     virtual ::CORBA::Long
-    rate ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    rate ();
 
     virtual void
     rate (
-    ::CORBA::Long)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ::CORBA::Long);
 
     // Port operations.
 
     virtual ::Stock::CCM_StockQuoter_ptr
-    get_push_quoter ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_push_quoter ();
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     StockDistributor_Context *context_;
@@ -204,10 +178,7 @@ namespace CIDL_StockDistributor_Impl
     public:
 
     /// push event to all subscribers
-    void push_notify_out ()
-    ACE_THROW_SPEC ((
-	::CORBA::SystemException
-    ));
+    void push_notify_out ();
 
     private:
     /// pulse generation rate
@@ -242,10 +213,7 @@ namespace CIDL_StockDistributor_Impl
     virtual ~StockDistributorHome_exec_i (void);
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" DISTRIBUTOR_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif b/CIAO/docs/tutorials/Quoter/Simple/Icons/AddConnMode.gif
index 3604d32946d..3604d32946d 100644
--- a/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
+++ b/CIAO/docs/tutorials/Quoter/Simple/Icons/AddConnMode.gif
diff --git a/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif b/CIAO/docs/tutorials/Quoter/Simple/Icons/SetMode.gif
index 6dcad861f07..6dcad861f07 100644
--- a/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
+++ b/CIAO/docs/tutorials/Quoter/Simple/Icons/SetMode.gif
diff --git a/CIAO/docs/tutorials/CoSMIC/Model/Quoter.xme b/CIAO/docs/tutorials/Quoter/Simple/Model/Quoter.xme
index 10f968f69ca..10f968f69ca 100644
--- a/CIAO/docs/tutorials/CoSMIC/Model/Quoter.xme
+++ b/CIAO/docs/tutorials/Quoter/Simple/Model/Quoter.xme
diff --git a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
index 7437f0ed341..cdcc4e7657f 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
+++ b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV1->Spawn ();
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/step1.jpg
index b0346ee841b..b0346ee841b 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step1.JPG
+++ b/CIAO/docs/tutorials/Quoter/Simple/images/step1.jpg
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/step2.jpg
index a4526901307..a4526901307 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step2.JPG
+++ b/CIAO/docs/tutorials/Quoter/Simple/images/step2.jpg
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/step3.jpg
index d7687394851..d7687394851 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step3.JPG
+++ b/CIAO/docs/tutorials/Quoter/Simple/images/step3.jpg
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG b/CIAO/docs/tutorials/Quoter/Simple/images/step6.jpg
index e1e3b28055d..e1e3b28055d 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Step6.JPG
+++ b/CIAO/docs/tutorials/Quoter/Simple/images/step6.jpg
diff --git a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg b/CIAO/docs/tutorials/Quoter/Simple/images/steps.jpg
index ddccdc2b373..ddccdc2b373 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/images/Steps for Developing CCM Applications.jpg
+++ b/CIAO/docs/tutorials/Quoter/Simple/images/steps.jpg
diff --git a/CIAO/docs/tutorials/Quoter/Simple/index.html b/CIAO/docs/tutorials/Quoter/Simple/index.html
index f865a43cc6c..30b39e72370 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/index.html
+++ b/CIAO/docs/tutorials/Quoter/Simple/index.html
@@ -26,18 +26,18 @@ w\:* {behavior:url(#default#VML);}
  <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:Revision>14</o:Revision>
+  <o:TotalTime>65</o:TotalTime>
   <o:Created>2006-10-06T22:35:00Z</o:Created>
-  <o:LastSaved>2006-11-06T21:35:00Z</o:LastSaved>
+  <o:LastSaved>2007-03-08T01:23:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
-  <o:Words>851</o:Words>
-  <o:Characters>4851</o:Characters>
+  <o:Words>849</o:Words>
+  <o:Characters>4845</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:CharactersWithSpaces>5683</o:CharactersWithSpaces>
+  <o:Version>11.5606</o:Version>
  </o:DocumentProperties>
 </xml><![endif]--><!--[if gte mso 9]><xml>
  <w:WordDocument>
@@ -353,7 +353,7 @@ ul
 	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"/>
+ <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"/>
@@ -410,7 +410,7 @@ describe the example:<o:p></o:p></span></p>
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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>
@@ -419,7 +419,7 @@ Component Model, Part 1: Evolving Towards Component Middleware</a></p>
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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>
@@ -428,7 +428,7 @@ Component Model, Part 2: Defining Components with the IDL 3.x Types</a></p>
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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
@@ -438,7 +438,7 @@ Implementation Framework</a></p>
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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
@@ -456,7 +456,7 @@ help you follow through this tutorial:<o:p></o:p></span></p>
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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>
@@ -465,7 +465,7 @@ Component Deployment and Conguration Engine</a><span style='color:black'><o:p></
 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;
+style='mso-list:Ignore'>&middot;<span style='font:7.0pt "Times New Roman"'>&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>
 
@@ -482,13 +482,12 @@ following: <o:p></o:p></span></p>
 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
+style='font:7.0pt "Times New Roman"'>&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>
 
@@ -496,11 +495,11 @@ for information on how to build ACE+TAO+CIAO.<o:p></o:p></span></p>
 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
+style='font:7.0pt "Times New Roman"'>&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>
 
@@ -508,10 +507,10 @@ download GME.<o:p></o:p></span></p>
 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>
+style='font:7.0pt "Times New Roman"'>&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'>
 
@@ -532,10 +531,10 @@ style='color:black'>Note:</span></strong><strong><span style='font-weight:normal
 <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
+style='font:7.0pt "Times New Roman"'>&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>
@@ -543,7 +542,7 @@ 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;
+style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&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>
 
@@ -572,7 +571,7 @@ normal'><span style='font-size:14.0pt;line-height:150%;color:black'><o:p>&nbsp;<
 <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>
+src="images/steps.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>
@@ -645,9 +644,6 @@ style='color:black'>
 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>
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index fb92bb2ea66..5efbe619db8 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -23,14 +23,12 @@ MyImpl::BMClosedED_exec_i::~BMClosedED_exec_i ()
 
 BasicSP::CCM_ReadData_ptr
 MyImpl::BMClosedED_exec_i::get_dataout ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return BasicSP::CCM_ReadData::_duplicate (this);
 }
 
 void
 MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (CIAO::debug_level () > 0)
@@ -80,7 +78,6 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
 
 char *
 MyImpl::BMClosedED_exec_i::get_data ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->str_.inout ());
 }
@@ -90,8 +87,6 @@ void
 MyImpl::BMClosedED_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -111,15 +106,11 @@ MyImpl::BMClosedED_exec_i::set_session_context (
 
 void
 MyImpl::BMClosedED_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMClosedED_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -131,15 +122,11 @@ MyImpl::BMClosedED_exec_i::ccm_activate ()
 
 void
 MyImpl::BMClosedED_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMClosedED_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   //  if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -148,8 +135,6 @@ MyImpl::BMClosedED_exec_i::ccm_passivate ()
 
 void
 MyImpl::BMClosedED_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   //  if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -172,8 +157,6 @@ MyImpl::BMClosedEDHome_exec_i::~BMClosedEDHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::BMClosedEDHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   Components::EnterpriseComponent_ptr tmp =
     Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
index c6f9c0ff1fe..ab4502480ca 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
@@ -41,50 +41,35 @@ namespace MyImpl
     // Operations from HUDisplay::BMClosedED
 
     virtual BasicSP::CCM_ReadData_ptr
-    get_dataout ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_dataout ();
 
     virtual void
-    push_in_avail (BasicSP::DataAvailable *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_in_avail (BasicSP::DataAvailable *ev);
 
     // Operations from HUDisplay::position
     virtual char *
-    get_data ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_data ();
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     CORBA::String_var str_;
 
@@ -113,9 +98,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index 5f401e2de5d..a2ca9c93617 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -19,14 +19,12 @@ MyImpl::BMDevice_exec_i::~BMDevice_exec_i ()
 
 BasicSP::CCM_ReadData_ptr
 MyImpl::BMDevice_exec_i::get_data_read ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return BasicSP::CCM_ReadData::_duplicate (this);
 }
 
 void
 MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Nitify others
   BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable;
@@ -42,14 +40,12 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *)
 
 char *
 MyImpl::BMDevice_exec_i::data_read ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->str_);
 }
 
 char *
 MyImpl::BMDevice_exec_i::get_data ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->data_read ();
 }
@@ -59,8 +55,6 @@ void
 MyImpl::BMDevice_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -80,15 +74,11 @@ MyImpl::BMDevice_exec_i::set_session_context (
 
 void
 MyImpl::BMDevice_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMDevice_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -100,15 +90,11 @@ MyImpl::BMDevice_exec_i::ccm_activate ()
 
 void
 MyImpl::BMDevice_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMDevice_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -119,8 +105,6 @@ MyImpl::BMDevice_exec_i::ccm_passivate ()
 
 void
 MyImpl::BMDevice_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -145,8 +129,6 @@ MyImpl::BMDeviceHome_exec_i::~BMDeviceHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::BMDeviceHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   Components::EnterpriseComponent_ptr tmp= 0;
   ACE_NEW_THROW_EX (tmp,
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
index 6ad460faee4..54e0b4d2679 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
@@ -39,54 +39,38 @@ namespace MyImpl
     // Operations from BasicSP::BMDevice
 
     virtual BasicSP::CCM_ReadData_ptr
-    get_data_read ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_data_read ();
 
     virtual void
-    push_timeout (BasicSP::TimeOut *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_timeout (BasicSP::TimeOut *ev);
 
     // Operations from BasicSP::position
 
     virtual char *
-    data_read ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    data_read ();
 
     virtual char *
-    get_data ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_data ();
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     const char *str_;
 
@@ -115,9 +99,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index 227c26b41a4..f5f536c36bb 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -19,7 +19,6 @@ void
 MyImpl::BMDisplay_exec_impl::push_data_ready (
     BasicSP::DataAvailable *ev
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ev);
 
@@ -53,8 +52,6 @@ void
 MyImpl::BMDisplay_exec_impl::set_session_context (
     Components::SessionContext_ptr ctx
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -73,15 +70,11 @@ MyImpl::BMDisplay_exec_impl::set_session_context (
 void
 MyImpl::BMDisplay_exec_impl::ciao_preactivate (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMDisplay_exec_impl::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -94,16 +87,12 @@ MyImpl::BMDisplay_exec_impl::ccm_activate ()
 void
 MyImpl::BMDisplay_exec_impl::ciao_postactivate (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::BMDisplay_exec_impl::ccm_passivate (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -114,8 +103,6 @@ MyImpl::BMDisplay_exec_impl::ccm_passivate (
 
 void
 MyImpl::BMDisplay_exec_impl::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -140,8 +127,6 @@ MyImpl::BMDisplayHome_exec_impl::~BMDisplayHome_exec_impl ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::BMDisplayHome_exec_impl::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::BMDisplay_exec_impl;
 }
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
index 4d1f1e9e1a0..09fb4ee8f0b 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
@@ -38,40 +38,27 @@ namespace MyImpl
     // Operations from BasicSP::BMDisplay
 
     virtual void
-    push_data_ready (BasicSP::DataAvailable *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_data_ready (BasicSP::DataAvailable *ev);
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     /// Copmponent specific context
     BasicSP::CCM_BMDisplay_Context_var context_;
@@ -98,9 +85,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.cpp b/CIAO/examples/BasicSP/EC/EC_exec.cpp
index 89a3a57edfd..12a100aad99 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.cpp
+++ b/CIAO/examples/BasicSP/EC/EC_exec.cpp
@@ -136,14 +136,12 @@ MyImpl::EC_exec_i::~EC_exec_i ()
 
 CORBA::Long
 MyImpl::EC_exec_i::hertz ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hertz_;
 }
 
 void
 MyImpl::EC_exec_i::hertz (CORBA::Long hertz)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->hertz_ = hertz;
 }
@@ -152,7 +150,6 @@ MyImpl::EC_exec_i::hertz (CORBA::Long hertz)
 
 void
 MyImpl::EC_exec_i::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->hertz_ == 0 || this->pulser_.active())
     throw CORBA::BAD_INV_ORDER ();
@@ -163,7 +160,6 @@ MyImpl::EC_exec_i::start ()
 
 void
 MyImpl::EC_exec_i::stop ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (! this->pulser_.active ())
     throw CORBA::BAD_INV_ORDER ();
@@ -174,7 +170,6 @@ MyImpl::EC_exec_i::stop ()
 
 CORBA::Boolean
 MyImpl::EC_exec_i::active ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pulser_.active ();
 }
@@ -183,8 +178,6 @@ MyImpl::EC_exec_i::active ()
 
 void
 MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n"));
@@ -200,15 +193,11 @@ MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx)
 
 void
 MyImpl::EC_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::EC_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n"));
@@ -218,15 +207,11 @@ MyImpl::EC_exec_i::ccm_activate ()
 
 void
 MyImpl::EC_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::EC_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n"));
@@ -235,8 +220,6 @@ MyImpl::EC_exec_i::ccm_passivate ()
 
 void
 MyImpl::EC_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_remove\n"));
@@ -272,15 +255,12 @@ MyImpl::ECHome_exec_i::~ECHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return new MyImpl::EC_exec_i (hertz);
 }
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::ECHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::EC_exec_i ();
 }
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h
index dfc68f19dce..69d54ac7d42 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.h
+++ b/CIAO/examples/BasicSP/EC/EC_exec.h
@@ -90,49 +90,32 @@ namespace MyImpl
 
     // Attribute operations.
 
-    virtual CORBA::Long hertz ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long hertz ();
 
-    virtual void hertz (CORBA::Long hertz)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void hertz (CORBA::Long hertz);
 
     // Operations from supported interface(s)
 
-    virtual void start ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
-    virtual void stop ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void stop ();
 
-    virtual CORBA::Boolean active ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean active ();
 
     // Operations from Components::SessionComponent
 
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     /// Helper function to be called back by timeout_Handler
     void pulse (void);
@@ -168,15 +151,12 @@ namespace MyImpl
     // Explicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    new_EC (CORBA::Long hertz)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    new_EC (CORBA::Long hertz);
 
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp
index 62354cbe814..54f11be8fd2 100644
--- a/CIAO/examples/BasicSP/EC/client.cpp
+++ b/CIAO/examples/BasicSP/EC/client.cpp
@@ -21,7 +21,7 @@ main (int argc, char *argv[])
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
 
diff --git a/CIAO/examples/BasicSP/README.html b/CIAO/examples/BasicSP/README.html
index 00c785c7c2f..9bd740215e1 100644
--- a/CIAO/examples/BasicSP/README.html
+++ b/CIAO/examples/BasicSP/README.html
@@ -38,8 +38,8 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 
   <LI> Generate the project/make files for the <em> BasicSP </em> example directory:
     <UL>
-    <LI> <em> linux: </em> <code> [in $CIAO_ROOT/DAnCE/examples/BasicSP] mwc.pl </code> </LI>
-    <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/DAnCE/examples/BasicSP] mwc.pl -type vc71</code> </LI>
+    <LI> <em> linux: </em> <code> [in $CIAO_ROOT/examples/BasicSP] mwc.pl -type gnuace</code> </LI>
+    <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/examples/BasicSP] mwc.pl -type vc71</code> </LI>
     </UL>
   </LI>
 
@@ -51,7 +51,7 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 
 <UL>
 
-  <LI> Change into the $CIAO_ROOT/DAnCE/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
+  <LI> Change into the $CIAO_ROOT/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
   
   <LI> Start the execution manager:
   <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code>
@@ -60,7 +60,7 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
   <LI> Start the executor:
   <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code>
   
-  <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/BasicSP/EC/controller to start the application.
+  <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/examples/BasicSP/EC/controller to start the application.
        Please make sure that the component IOR file for the EC component is present when you run this client.
 
   <BR/>
diff --git a/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl b/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
index 42bcff41f14..7fe5eac49fc 100755
--- a/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
+++ b/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
@@ -34,19 +34,19 @@ unlink $iorfile5;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:20000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:30000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
                              
-$SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
 $SV1->Spawn ();
 $SV2->Spawn ();
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
new file mode 100755
index 00000000000..5687e040723
--- /dev/null
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -0,0 +1,175 @@
+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;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+$daemons = 5;
+@ports = ( 10000, 20000, 30000, 40000, 50000 );
+@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior", "NodeApp4.ior", "NodeApp5.ior" );
+$status = 0;
+$dat_file = "NodeManagerMap.dat";
+$cdp_file = "flattern_deploymentplan.cdp";
+$controller_exec = "$CIAO_ROOT/examples/BasicSP/EC/controller";
+
+$nsior = PerlACE::LocalFile ("ns.ior");
+
+unlink $nsior;
+
+$E = 0;
+$EM = 0;
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $daemons; ++$i) {
+        unlink $iorfiles[$i];
+    }
+    unlink PerlACE::LocalFile ("EM.ior");
+    unlink PerlACE::LocalFile ("Receiver.ior");
+    unlink PerlACE::LocalFile ("Sender.ior");
+    unlink PerlACE::LocalFile ("DAM.ior");
+    unlink PerlACE::LocalFile ("ns.ior");
+}
+
+sub kill_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i) {
+    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemons ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill ();
+    $EM->TimedWait (1);
+  }
+
+  if ($ns_running == 1) {
+    $NS->Kill ();
+    $NS->TimedWait (1);
+  }
+
+}
+
+# Invoke naming service
+
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
+
+$NS->Spawn ();
+
+print STDERR "Starting Naming Service\n";
+
+if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
+{
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill ();
+    exit 1;
+}
+
+$ns_running = 1;
+
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+
+sub run_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i)
+  {
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
+
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
+
+      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
+      $result = $Daemons[$i]->Spawn ();
+      push(@processes, $Daemons[$i]);
+
+      if (PerlACE::waitforfile_timed ($iorfile,
+                          $PerlACE::wait_interval_for_process_creation) == -1) {
+          print STDERR
+            "ERROR: The ior file of node daemon $i could not be found\n";
+          for (; $i >= 0; --$i) {
+            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  return 0;
+}
+
+delete_ior_files ();
+
+# Invoke node daemons.
+print "Invoking node daemons\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+  print STDERR "ERROR: Unable to execute the node daemons\n";
+  kill_open_processes ();
+  exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager\n";
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
+                            "-o EM.ior -i $dat_file");
+$EM->Spawn ();
+
+if (PerlACE::waitforfile_timed ("EM.ior",
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+sleep (10);
+
+# Invoke executor - start the application -.
+print "Invoking executor - start the application -\n";
+$E =
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
+                        "-p flattened_deploymentplan.cdp -k file://EM.ior");
+
+$E->SpawnWaitKill (60);
+
+sleep (10);
+
+print "Invoking the controller\n";
+$controller = new PerlACE::Process ("$controller_exec", "");
+$result = $controller->SpawnWaitKill (3000);
+
+if ($result != 0) {
+    print STDERR "ERROR: The controller returned $result\n";
+    $status = 1;
+}
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+$E =
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
+                        "-p flattern_deploymentplan.cdp -k file://EM.ior");
+$E->SpawnWaitKill (3000);
+
+sleep (99999999999);
diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp
index f86e6226bad..26aeee200fc 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_exec.cpp
@@ -10,14 +10,12 @@
 // Operations from HUDisplay::position
 CORBA::Long
 MyImpl::Position_Impl::posx ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posx();
 }
 
 CORBA::Long
 MyImpl::Position_Impl::posy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posy();
 }
@@ -39,7 +37,6 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
 // Operations from HUDisplay::GPS
   HUDisplay::CCM_position_ptr
   MyImpl::GPS_exec_i::get_MyLocation ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
 //     ACE_DEBUG ((LM_DEBUG,
 //                 "GPS_exec::get_MyLocation called\n "));
@@ -48,7 +45,6 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
 
 void
 MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //   ACE_DEBUG ((LM_DEBUG,
 // 	      ACE_TEXT ("GPS: Received Refresh Event\n")));
@@ -65,14 +61,12 @@ MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *)
 
 CORBA::Long
 MyImpl::GPS_exec_i::posx ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positionx_;
 }
 
 CORBA::Long
 MyImpl::GPS_exec_i::posy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positiony_;
 }
@@ -81,8 +75,6 @@ MyImpl::GPS_exec_i::posy ()
 // Operations from Components::SessionComponent
 void
 MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n"));
@@ -97,15 +89,11 @@ MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx)
 
 void
 MyImpl::GPS_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::GPS_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_activate\n"));
@@ -113,15 +101,11 @@ MyImpl::GPS_exec_i::ccm_activate ()
 
 void
 MyImpl::GPS_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::GPS_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_passivate\n"));
@@ -129,8 +113,6 @@ MyImpl::GPS_exec_i::ccm_passivate ()
 
 void
 MyImpl::GPS_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_remove\n"));
@@ -152,8 +134,6 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::GPSHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::GPS_exec_i;
 }
diff --git a/CIAO/examples/Display/GPS/GPS_exec.h b/CIAO/examples/Display/GPS/GPS_exec.h
index d4b8a0b777e..b6bd23a283b 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_exec.h
@@ -36,43 +36,27 @@ namespace MyImpl
     ~GPS_exec_i ();
 
     // Operations from HUDisplay::GPS
-    HUDisplay::CCM_position_ptr get_MyLocation ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    HUDisplay::CCM_position_ptr get_MyLocation ();
 
-    void push_Refresh (HUDisplay::tick *)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void push_Refresh (HUDisplay::tick *);
 
     // Operations from HUDisplay::position
-    CORBA::Long posx ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long posx ();
 
-    CORBA::Long posy ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long posy ();
 
     // Operations from Components::SessionComponent
-    void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void set_session_context (Components::SessionContext_ptr ctx);
 
-    void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void ciao_preactivate ();
 
-    void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void ccm_activate ();
 
-    void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void ciao_postactivate ();
 
-    void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void ccm_passivate ();
 
-    void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    void ccm_remove ();
 
    protected:
     // Component specific context
@@ -89,7 +73,7 @@ namespace MyImpl
    * GPS home executor implementation class.
    */
     class GPS_EXEC_Export GPSHome_exec_i :
-    public virtual HUDisplay::CCM_GPSHome,
+      public virtual HUDisplay::CCM_GPSHome,
       public virtual TAO_Local_RefCounted_Object
   {
   public:
@@ -99,16 +83,8 @@ namespace MyImpl
     /// Default dtor.
     ~GPSHome_exec_i ();
 
-    // Explicit home operations
-/*     virtual ::Components::EnterpriseComponent_ptr */
-/*       new_GPS () */
-/*       ACE_THROW_SPEC ((CORBA::SystemException)); */
-
     // Implicit home operations
-    virtual ::Components::EnterpriseComponent_ptr
-      create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-		       Components::CCMException));
+    virtual ::Components::EnterpriseComponent_ptr create ();
   };
 
 
@@ -122,11 +98,9 @@ namespace MyImpl
     }
 
     // Operations from HUDisplay::position
-    CORBA::Long posx ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long posx ();
 
-    CORBA::Long posy ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long posy ();
 
   private:
     GPS_exec_i& component_;
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
index 98b52c9ac74..4a5b7374180 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
@@ -25,14 +25,12 @@ MyImpl::GPS_tracing_exec_i::~GPS_tracing_exec_i ()
 
 HUDisplay::CCM_position_ptr
 MyImpl::GPS_tracing_exec_i::get_MyLocation ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return HUDisplay::CCM_position::_duplicate (this);
 }
 
 void
 MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Refresh position
   if(this->positionx_ > 500) this->dx_ = -1;
@@ -53,14 +51,12 @@ MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *)
 
 CORBA::Long
 MyImpl::GPS_tracing_exec_i::posx ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positionx_;
 }
 
 CORBA::Long
 MyImpl::GPS_tracing_exec_i::posy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positiony_;
 }
@@ -69,8 +65,6 @@ MyImpl::GPS_tracing_exec_i::posy ()
 void
 MyImpl::GPS_tracing_exec_i::set_session_context (
     Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -86,15 +80,11 @@ MyImpl::GPS_tracing_exec_i::set_session_context (
 
 void
 MyImpl::GPS_tracing_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::GPS_tracing_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_activate\n"));
@@ -102,15 +92,11 @@ MyImpl::GPS_tracing_exec_i::ccm_activate ()
 
 void
 MyImpl::GPS_tracing_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::GPS_tracing_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_passivate\n"));
@@ -118,8 +104,6 @@ MyImpl::GPS_tracing_exec_i::ccm_passivate ()
 
 void
 MyImpl::GPS_tracing_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_remove\n"));
@@ -141,8 +125,6 @@ MyImpl::GPSHome_tracing_exec_i::~GPSHome_tracing_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::GPSHome_tracing_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::GPS_tracing_exec_i;
 }
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.h b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
index c6b67a34767..6b03e2d1288 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
@@ -36,54 +36,38 @@ namespace MyImpl
     // Operations from HUDisplay::GPS
 
     virtual HUDisplay::CCM_position_ptr
-    get_MyLocation ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_MyLocation ();
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_Refresh (HUDisplay::tick *ev);
 
     // Operations from HUDisplay::position
 
     virtual CORBA::Long
-    posx ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    posx ();
 
     virtual CORBA::Long
-    posy ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    posy ();
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     /// Current GPS reading.
     CORBA::Long positionx_;
@@ -118,9 +102,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
index 06d1d8c213b..89b18ad58f1 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
@@ -17,7 +17,6 @@ MyImpl::NavDisplay_exec_impl::~NavDisplay_exec_impl ()
 
 void
 MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ev);
 
@@ -47,8 +46,6 @@ void
 MyImpl::NavDisplay_exec_impl::set_session_context (
     Components::SessionContext_ptr ctx
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -69,15 +66,11 @@ MyImpl::NavDisplay_exec_impl::set_session_context (
 void
 MyImpl::NavDisplay_exec_impl::ciao_preactivate (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::NavDisplay_exec_impl::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -89,15 +82,11 @@ MyImpl::NavDisplay_exec_impl::ccm_activate ()
 void
 MyImpl::NavDisplay_exec_impl::ciao_postactivate (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::NavDisplay_exec_impl::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -108,8 +97,6 @@ MyImpl::NavDisplay_exec_impl::ccm_passivate ()
 
 void
 MyImpl::NavDisplay_exec_impl::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -134,8 +121,6 @@ MyImpl::NavDisplayHome_exec_impl::~NavDisplayHome_exec_impl ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::NavDisplayHome_exec_impl::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::NavDisplay_exec_impl;
 }
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
index 3c5ca68d40d..7a4bdd73d45 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
@@ -37,39 +37,26 @@ namespace MyImpl
     // Operations from HUDisplay::NavDisplay
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_Refresh (HUDisplay::tick *ev);
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     /// Copmponent specific context
     HUDisplay::CCM_NavDisplay_Context_var context_;
@@ -96,9 +83,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index 32a4ebea140..9d2d6efd693 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -35,7 +35,6 @@ MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl ()
 void
 MyImpl::NavDisplayGUI_exec_impl::push_Refresh (
     HUDisplay::tick * /* ev */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::push_Refresh()\n"));
 
@@ -73,8 +72,6 @@ MyImpl::NavDisplayGUI_exec_impl::push_Refresh (
 // Operations from Components::SessionComponent
 void
 MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::set_session_context\n"));
@@ -89,15 +86,11 @@ MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext
 
 void
 MyImpl::NavDisplayGUI_exec_impl::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::NavDisplayGUI_exec_impl::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
@@ -125,15 +118,11 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate ()
 
 void
 MyImpl::NavDisplayGUI_exec_impl::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::NavDisplayGUI_exec_impl::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_passivate\n"));
@@ -152,8 +141,6 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_passivate ()
 
 void
 MyImpl::NavDisplayGUI_exec_impl::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_remove\n"));
@@ -181,8 +168,6 @@ MyImpl::NavDisplayGUIHome_exec_impl::~NavDisplayGUIHome_exec_impl ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::NavDisplayGUIHome_exec_impl::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index e41de4c68d9..ffa24be2d18 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -42,40 +42,27 @@ namespace MyImpl
     // Operations from HUDisplay::NavDisplay
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_Refresh (HUDisplay::tick *ev);
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    set_session_context (Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    ccm_remove ();
   protected:
     /// Copmponent specific context
     HUDisplay::CCM_NavDisplay_Context_var context_;
@@ -106,9 +93,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.cpp b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
index a03c7bc3acc..41782966074 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.cpp
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
@@ -147,14 +147,12 @@ MyImpl::RateGen_exec_i::~RateGen_exec_i ()
 
 CORBA::Long
 MyImpl::RateGen_exec_i::hertz ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hertz_;
 }
 
 void
 MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->hertz_ = hertz;
 }
@@ -163,7 +161,6 @@ MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz)
 
 void
 MyImpl::RateGen_exec_i::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->hertz_ == 0 || this->pulser_.active())
     {
@@ -176,7 +173,6 @@ MyImpl::RateGen_exec_i::start ()
 
 void
 MyImpl::RateGen_exec_i::stop ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (! this->pulser_.active ())
     {
@@ -189,7 +185,6 @@ MyImpl::RateGen_exec_i::stop ()
 
 CORBA::Boolean
 MyImpl::RateGen_exec_i::active ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pulser_.active ();
 }
@@ -200,8 +195,6 @@ void
 MyImpl::RateGen_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -222,15 +215,11 @@ MyImpl::RateGen_exec_i::set_session_context (
 
 void
 MyImpl::RateGen_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::RateGen_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -243,15 +232,11 @@ MyImpl::RateGen_exec_i::ccm_activate ()
 
 void
 MyImpl::RateGen_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::RateGen_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -264,8 +249,6 @@ MyImpl::RateGen_exec_i::ccm_passivate ()
 
 void
 MyImpl::RateGen_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
@@ -306,7 +289,6 @@ MyImpl::RateGenHome_exec_i::~RateGenHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Components::EnterpriseComponent_ptr tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -318,8 +300,6 @@ MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */)
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::RateGenHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::RateGen_exec_i ();
 }
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h
index 68c54c180c0..9e92a0c5095 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.h
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.h
@@ -89,48 +89,31 @@ namespace MyImpl
 
     // Attribute operations.
 
-    virtual CORBA::Long hertz ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long hertz ();
 
-    virtual void hertz (CORBA::Long hertz)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void hertz (CORBA::Long hertz);
 
     // Operations from supported interface(s)
 
-    virtual void start ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
-    virtual void stop ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void stop ();
 
-    virtual CORBA::Boolean active ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean active ();
 
     // Operations from Components::SessionComponent
 
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     /// Helper function to be called back by Pulse_Handler
     void pulse (void);
@@ -166,15 +149,12 @@ namespace MyImpl
     // Explicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    new_RateGen (CORBA::Long hertz)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    new_RateGen (CORBA::Long hertz);
 
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
index 6bdb1c85e03..8a48fdd35dd 100755
--- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
+++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
@@ -34,19 +34,19 @@ unlink $iorfile5;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:20000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:30000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
                              
-$SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
 $SV1->Spawn ();
 $SV2->Spawn ();
diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
index 008c87f6e35..bc17b0972fd 100755
--- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
+++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:10001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:20001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Display/descriptors/run_test_without_ns.pl b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
index c4323252d1b..f170e905fd3 100755
--- a/CIAO/examples/Display/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
@@ -59,9 +59,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -97,7 +97,7 @@ $ns_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -114,7 +114,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
  
 $E->SpawnWaitKill (5000);
@@ -160,7 +160,7 @@ sleep (2);
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index f8e55decc14..b23303d504c 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -20,7 +20,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::push_click_in (Hello::TimeOut * ev)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     //Get the message from the Sender first.
     ACE_DEBUG ((LM_DEBUG,
@@ -45,8 +44,6 @@ namespace CIDL_Receiver_Impl
   // Operations from Components::SessionComponen
   void
   Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n"));
 
@@ -59,8 +56,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver_exec_i::ciao_preactivate\n"));
@@ -68,16 +63,12 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate\n"));
   }
 
   void
   Receiver_exec_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver_exec_i::ciao_postactivate\n"));
@@ -85,16 +76,12 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n"));
   }
 
   void
   Receiver_exec_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove\n"));
   }
@@ -110,8 +97,6 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverHome_exec_i::create ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     Components::EnterpriseComponent_ptr tmp;
     ACE_NEW_THROW_EX (tmp,
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h
index 1322eb8d1a2..0100c459f43 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h
@@ -37,34 +37,21 @@ namespace CIDL_Receiver_Impl
 
     // Operation which will be called upon receiving the timeout event.
     virtual void
-    push_click_in (Hello::TimeOut *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_click_in (Hello::TimeOut *ev);
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
   protected:
     /// Copmponent specific context
@@ -92,9 +79,7 @@ namespace CIDL_Receiver_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp
index ad4a4143b8d..7e41fa3efeb 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -6,7 +6,6 @@ namespace CIDL_Sender_Impl
 {
   char*
   Message_Impl::get_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender sending out message: [%s]\n", component_.message_.in ()));
     return CORBA::string_dup (component_.message_.in ());
@@ -18,21 +17,18 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::local_message (const char * local_message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
   Sender_exec_i::local_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (message_.in ());
   }
 
   void
   Sender_exec_i::hertz (CORBA::Long hertz)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->hertz_ = hertz;
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::Hertz:%d\n", this->hertz_));
@@ -40,14 +36,12 @@ namespace CIDL_Sender_Impl
 
   CORBA::Long
   Sender_exec_i::hertz ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->hertz_;
   }
 
   ::Hello::COLOR_SELECTION
   Sender_exec_i::color ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
     return this->color_;
@@ -56,14 +50,12 @@ namespace CIDL_Sender_Impl
   void
   Sender_exec_i::color (
   ::Hello::COLOR_SELECTION color)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->color_ = color;
   }
 
   Hello::CCM_ReadMessage_ptr
   Sender_exec_i::get_push_message ()
-        ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec.i::get_push_message called\n "));
@@ -72,7 +64,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::start ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     event->data ("ACE/TAO/CIAO");
@@ -107,8 +98,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n"));
 
@@ -123,8 +112,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ciao_preactivate\n"));
@@ -132,8 +119,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ccm_activate\n"));
@@ -141,8 +126,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ciao_postactivate\n"));
@@ -150,16 +133,12 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_passivate\n"));
   }
 
   void
   Sender_exec_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_remove\n"));
   }
@@ -174,8 +153,6 @@ namespace CIDL_Sender_Impl
 
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating SenderHome \n"));
     return new Sender_exec_i;
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h
index 23949e7c80d..533e0b7ac70 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -46,20 +46,16 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_i ();
 
     /// Operation to set the value of the attribute "local_message"
-    virtual void local_message (const char * local_message)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void local_message (const char * local_message);
 
     /// Operation to get the value of the attribute "local_message"
-    virtual char * local_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * local_message ();
 
     /// Operation to set the value of the attribute "hertz"
-    virtual void hertz (CORBA::Long hertz)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void hertz (CORBA::Long hertz);
 
     /// Operation to get the value of the attribute "hertz"
-    virtual CORBA::Long hertz ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long hertz ();
 
     /* Operations for obtaining the interface reference. */
     /* This method will be used in the assembly face so the
@@ -68,45 +64,29 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_push_message ();
 
     virtual ::Hello::COLOR_SELECTION
-    color ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    color ();
 
     virtual void
-    color (::Hello::COLOR_SELECTION)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    color (::Hello::COLOR_SELECTION);
 
     // Operation inside of the trigger interface.
-    virtual void start ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
   protected:
     /// Copmponent specific context
@@ -136,8 +116,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_message ();
 
   private:
     Sender_exec_i& component_;
@@ -162,9 +141,7 @@ namespace CIDL_Sender_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
   extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
index d5e956ade06..a8038e3492a 100644
--- a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
+++ b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index 29baefcca38..1801093f2b3 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -71,9 +71,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -130,7 +130,7 @@ $daemons_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -147,7 +147,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
 
 $E->SpawnWaitKill (5000);
@@ -179,7 +179,7 @@ if ($result != 0) {
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 25be260cd32..e5c0f1e8ca9 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -58,9 +58,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -96,7 +96,7 @@ $ns_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -113,7 +113,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior");
 
 $E->SpawnWaitKill (5000);
@@ -145,7 +145,7 @@ if ($result != 0) {
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
index 6dc5b078d58..852ffbba5b3 100644
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
@@ -104,7 +104,7 @@
       <requirementName>CIAO:PolicySet</requirementName>
       <resourceName>test_server_resource_id</resourceName>
       <property>
-        <name>CIAO:PolicySetName</name>
+        <name>CIAO:InstancePolicy</name>
         <value>
           <type>
             <kind>tk_string</kind>
@@ -140,7 +140,7 @@
       <requirementName>CIAO:PolicySet</requirementName>
       <resourceName>test_server_resource_id</resourceName>
       <property>
-        <name>CIAO:PolicySetName</name>
+        <name>CIAO:InstancePolicy</name>
         <value>
           <type>
             <kind>tk_string</kind>
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index a790fef1be0..fa9c22c7345 100755
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
@@ -7,8 +7,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "$ENV{'ACE_ROOT'}/bin";
 use PerlACE::Run_Test;
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
+$CIAO_ROOT = $PerlACE::CIAO_ROOT;
+$DAnCE = "$CIAO_ROOT/DAnCE";
 
 $daemons_running = 0;
 $em_running = 0;
@@ -58,9 +58,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
 
       # NON-RT
 #      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
@@ -101,7 +101,7 @@ $ns_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -118,7 +118,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p rt-example.cdp -k file://EM.ior -o DAM.ior");
  
 $E->SpawnWaitKill (5000);
@@ -150,7 +150,7 @@ if ($result != 0) {
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl
index 3e0e4787659..8d76c400579 100755
--- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl
index 0b9ba5c4b6a..8cdc79b11bd 100755
--- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl
@@ -30,10 +30,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -c rtec.conf");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -c rtec.conf");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl
index a83b4dc1638..24d630d66f6 100644
--- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://129.59.129.181:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
                              "-ORBEndpoint iiop://129.59.129.181:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.cpp b/CIAO/examples/Null_Component/Null_Component_exec.cpp
index c48ebb2ea0b..77a5577e8d5 100644
--- a/CIAO/examples/Null_Component/Null_Component_exec.cpp
+++ b/CIAO/examples/Null_Component/Null_Component_exec.cpp
@@ -39,7 +39,6 @@ namespace CIDL_Null_Component_Impl
 
   void
   Null_Interface_exec_i::null_operation ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     // Your code here.
   }
@@ -64,7 +63,6 @@ namespace CIDL_Null_Component_Impl
 
   ::CCM_Null_Interface_ptr
   Null_Component_exec_i::get_null_facet ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     // Your code here.
     return ::CCM_Null_Interface::_nil ();
@@ -75,8 +73,6 @@ namespace CIDL_Null_Component_Impl
   void
   Null_Component_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     this->context_ =
       Null_Component_Context::_narrow (
@@ -90,40 +86,30 @@ namespace CIDL_Null_Component_Impl
 
   void
   Null_Component_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Null_Component_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Null_Component_exec_i::ccm_activate ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Null_Component_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Null_Component_exec_i::ccm_remove ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     // Your code here.
   }
@@ -152,8 +138,6 @@ namespace CIDL_Null_Component_Impl
 
   ::Components::EnterpriseComponent_ptr
   Null_Component_Home_exec_i::create ()
-  ACE_THROW_SPEC (( ::CORBA::SystemException,
-                   ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h
index 22026431a93..254dc890eda 100644
--- a/CIAO/examples/Null_Component/Null_Component_exec.h
+++ b/CIAO/examples/Null_Component/Null_Component_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Null_Component_Impl
     // Operations from ::Null_Interface
 
     virtual void
-    null_operation ()
-    ACE_THROW_SPEC (( ::CORBA::SystemException));
+    null_operation ();
   };
 
   class NULL_COMPONENT_EXEC_Export Null_Component_exec_i
@@ -64,47 +63,28 @@ namespace CIDL_Null_Component_Impl
     // Port operations.
 
     virtual ::CCM_Null_Interface_ptr
-    get_null_facet ()
-    ACE_THROW_SPEC (( ::CORBA::SystemException));
+    get_null_facet ();
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-      ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+      ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     Null_Component_Context *context_;
@@ -129,10 +109,7 @@ namespace CIDL_Null_Component_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-                      ::CORBA::SystemException,
-                      ::Components::CCMException));
+    create ();
   };
 
   extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
index 4f50720ec1e..9f6e4572475 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Container_Base.h"
+#include "Session_Container.h"
 #include "NodeManager/NodeManager_Impl.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
index cf63cc2140c..ba90f31b2d5 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
@@ -20,14 +20,12 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverSwap_exec_i::incarnate ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new Receiver_exec_i;
   }
 
   ::Components::EnterpriseComponent_ptr
   ReceiverSwap_exec_i::etherealize ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new Receiver_exec_i;
   }
@@ -42,7 +40,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::push_click_in (Hello::TimeOut *)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     //Get the message from the Sender first.
     ACE_DEBUG ((LM_DEBUG,
@@ -68,8 +65,6 @@ namespace CIDL_Receiver_Impl
   // Operations from Components::SessionComponen
   void
   Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n"));
 
@@ -84,8 +79,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver_exec_i::ciao_preactivate\n"));
@@ -93,16 +86,12 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate\n"));
   }
 
   void
   Receiver_exec_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver_exec_i::ciao_postactivate\n"));
@@ -110,8 +99,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n"));
     /*
@@ -141,8 +128,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove\n"));
   }
@@ -158,8 +143,6 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverHome_exec_i::create ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     Components::EnterpriseComponent_ptr tmp;
 
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
index d04a4092d0a..f5896f9e60f 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
@@ -34,12 +34,10 @@ namespace CIDL_Receiver_Impl
     ~ReceiverSwap_exec_i ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    incarnate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    incarnate ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    etherealize ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    etherealize ();
   };
 
   class RECEIVER_EXEC_Export Receiver_exec_i :
@@ -56,34 +54,21 @@ namespace CIDL_Receiver_Impl
 
     // Operation which will be called upon receiving the timeout event.
     virtual void
-    push_click_in (Hello::TimeOut *ev)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    push_click_in (Hello::TimeOut *ev);
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
   protected:
     /// Copmponent specific context
@@ -111,9 +96,7 @@ namespace CIDL_Receiver_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.cpp b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
index 1f0cba9a91d..eeacef71fd2 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
@@ -11,7 +11,6 @@ namespace CIDL_Sender_Impl
 {
   char*
   Message_Impl::get_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n"));
     return CORBA::string_dup (component_.message_.in ());
@@ -23,21 +22,18 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::local_message (const char * local_message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
   Sender_exec_i::local_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_. in());
   }
 
   Hello::CCM_ReadMessage_ptr
   Sender_exec_i::get_push_message ()
-        ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec.i::get_push_message called\n "));
@@ -46,7 +42,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::start ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
@@ -55,8 +50,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n"));
 
@@ -71,8 +64,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ciao_preactivate\n"));
@@ -80,8 +71,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ccm_activate\n"));
@@ -89,8 +78,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_i::ciao_postactivate\n"));
@@ -98,16 +85,12 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_passivate\n"));
   }
 
   void
   Sender_exec_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_remove\n"));
   }
@@ -132,7 +115,6 @@ namespace CIDL_Sender_Impl
 
   ::Components::EnterpriseComponent_ptr
   SenderSwap_exec_i::incarnate ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ExecFactory first_exec_creator = 0;
     ExecFactory second_exec_creator = 0;
@@ -194,15 +176,12 @@ namespace CIDL_Sender_Impl
 
   ::Components::EnterpriseComponent_ptr
   SenderSwap_exec_i::etherealize ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return 0;
   }
 
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n"));
     return new SenderSwap_exec_i;
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h
index add761ed988..734991a1311 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.h
@@ -41,12 +41,10 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void local_message (const char * local_message);
 
     /// Operation to get the value of the attribute
-    virtual char * local_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * local_message ();
 
     /* Operations for obtaining the interface reference. */
     /* This method will be used in the assembly face so the
@@ -55,38 +53,24 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_push_message ();
 
 
     // Operation inside of the trigger interface.
-    virtual void start ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
   protected:
     /// Copmponent specific context
@@ -112,8 +96,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_message ();
 
   private:
     Sender_exec_i& component_;
@@ -140,12 +123,10 @@ namespace CIDL_Sender_Impl
     ~SenderSwap_exec_i ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    incarnate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    incarnate ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    etherealize ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    etherealize ();
 
     void  consumers (::Components::ConsumerDescriptions *p)
     {
@@ -177,9 +158,7 @@ namespace CIDL_Sender_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
 
 
   };
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
index f98e5390df3..c6534ba1125 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
@@ -8,7 +8,6 @@ namespace CIDL_Sender_Impl
 {
   char*
   Message_Impl_1::get_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender 1 sending out message. \n"));
     return CORBA::string_dup (component_.message_.in ());
@@ -20,21 +19,18 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::local_message (const char * local_message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
   Sender_exec_1_i::local_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
   Sender_exec_1_i::get_push_message ()
-        ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_1_i::get_push_message called\n"));
@@ -43,7 +39,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::start ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender 1 initiates the process.\n"));
@@ -52,8 +47,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::set_session_context\n"));
 
@@ -68,8 +61,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_1_i::ciao_preactivate\n"));
@@ -77,8 +68,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_1_i::ccm_activate\n"));
@@ -89,8 +78,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_1_i::ciao_postactivate\n"));
@@ -98,8 +85,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::ccm_passivate\n"));
 
@@ -138,8 +123,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_1_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::ccm_remove\n"));
   }
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
index 352ea6ec1b4..a86088af781 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
@@ -41,12 +41,10 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_1_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void local_message (const char * local_message);
 
     /// Operation to get the value of the attribute
-    virtual char * local_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * local_message ();
 
     /* Operations for obtaining the interface reference. */
     /* This method will be used in the assembly face so the
@@ -55,38 +53,24 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_push_message ();
 
 
     // Operation inside of the trigger interface.
-    virtual void start ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     void swap_exec (SenderSwap_exec_i *p)
     {
@@ -116,8 +100,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_message ();
 
   private:
     Sender_exec_1_i& component_;
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
index 6b273012098..7063a79eb4f 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
@@ -7,7 +7,6 @@ namespace CIDL_Sender_Impl
 {
   char*
   Message_Impl_2::get_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender 2 sending out message. \n"));
     return CORBA::string_dup (component_.message_.in ());
@@ -19,21 +18,18 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::local_message (const char * local_message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
   Sender_exec_2_i::local_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
   Sender_exec_2_i::get_push_message ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_2_i::get_push_message called\n"));
@@ -42,7 +38,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::start ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender 2 initiates the process.\n"));
@@ -51,8 +46,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::set_session_context (Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_2_i::set_session_context\n"));
 
@@ -67,8 +60,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::ciao_preactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_2_i::ciao_preactivate\n"));
@@ -76,8 +67,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::ccm_activate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_2_i::ccm_activate\n"));
@@ -105,8 +94,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::ciao_postactivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec_2_i::ciao_postactivate\n"));
@@ -114,16 +101,12 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_2_i::ccm_passivate ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_2_i::ccm_passivate\n"));
   }
 
   void
   Sender_exec_2_i::ccm_remove ()
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_2_i::ccm_remove\n"));
   }
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
index 9b548cf6626..a1184736587 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
@@ -43,12 +43,10 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_2_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void local_message (const char * local_message);
 
     /// Operation to get the value of the attribute
-    virtual char * local_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * local_message ();
 
     /* Operations for obtaining the interface reference. */
     /* This method will be used in the assembly face so the
@@ -57,38 +55,24 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_push_message ();
 
 
     // Operation inside of the trigger interface.
-    virtual void start ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     void swap_exec (SenderSwap_exec_i *p)
     {
@@ -117,8 +101,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_message ();
 
   private:
     Sender_exec_2_i& component_;
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
index 443506298bb..2de09618b8f 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
@@ -11,14 +11,12 @@ LatencyTest::LatencyTest (CORBA::ORB_ptr orb)
 
 CORBA::Long
 LatencyTest::makeCall (CORBA::Long send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 LatencyTest::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.h b/CIAO/performance-tests/Benchmark/LatencyTest.h
index 7bd3de194bf..bafda6e76c0 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.h
@@ -17,11 +17,9 @@ class LatencyTest
   LatencyTest (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long makeCall (CORBA::Long send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long makeCall (CORBA::Long send_time);
 
-  virtual void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown ();
 
  private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
index 07dd8d48095..23bc35c438d 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
@@ -47,7 +47,6 @@ MyImpl::RoundTrip_exec_i::~RoundTrip_exec_i ()
 
 ::Benchmark::CCM_LatencyTest *
 MyImpl::RoundTrip_exec_i::get_latency ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Benchmark::CCM_LatencyTest::_duplicate (this);
 }
@@ -55,7 +54,6 @@ MyImpl::RoundTrip_exec_i::get_latency ()
 /* Main method that invokes the octet_sequence */
 CORBA::Long
 MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return data * data * data;
 }
@@ -64,8 +62,6 @@ MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data)
 void
 MyImpl::RoundTrip_exec_i::set_session_context (
     Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTrip_exec_i::set_session_context\n"));
@@ -81,15 +77,11 @@ MyImpl::RoundTrip_exec_i::set_session_context (
 
 void
 MyImpl::RoundTrip_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::RoundTrip_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTrip_exec_i::ccm_activate\n"));
@@ -101,16 +93,12 @@ MyImpl::RoundTrip_exec_i::ccm_activate ()
 
 void
 MyImpl::RoundTrip_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 
 }
 
 void
 MyImpl::RoundTrip_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTrip_exec_i::ccm_passivate\n"));
@@ -118,8 +106,6 @@ MyImpl::RoundTrip_exec_i::ccm_passivate ()
 
 void
 MyImpl::RoundTrip_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTrip_exec_i::ccm_remove\n"));
@@ -136,8 +122,6 @@ MyImpl::RoundTripHome_exec_i::~RoundTripHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::RoundTripHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::RoundTrip_exec_i;
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
index e2262581bd7..c4881d7515f 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
@@ -40,37 +40,23 @@ namespace MyImpl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-    virtual CORBA::Long makeCall (CORBA::Long data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long makeCall (CORBA::Long data);
 
     virtual ::Benchmark::CCM_LatencyTest*
-                        get_latency ()
-                ACE_THROW_SPEC ((CORBA::SystemException));
+                        get_latency ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate  ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate  ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     /// Helper function to be called back by timeout_Handler
     void pulse (void);
@@ -102,9 +88,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
 
   protected:
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index ab8ede89b50..7374ff2c72e 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -24,8 +24,6 @@ MyImpl::RoundTripClient_exec_i::~RoundTripClient_exec_i ()
 void
 MyImpl::RoundTripClient_exec_i::set_session_context (
     Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -46,15 +44,11 @@ MyImpl::RoundTripClient_exec_i::set_session_context (
 //Start the collocated test here
 void
 MyImpl::RoundTripClient_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::RoundTripClient_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTripClient_exec_i::ccm_activate\n"));
@@ -62,14 +56,11 @@ MyImpl::RoundTripClient_exec_i::ccm_activate ()
 
 void
 MyImpl::RoundTripClient_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
 }
 
 void
 MyImpl::RoundTripClient_exec_i::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ///////////// Start test /////////////////////////////////////////
 
@@ -132,7 +123,6 @@ MyImpl::RoundTripClient_exec_i::start ()
 
 ::Benchmark::CCM_Controller_ptr
 MyImpl::RoundTripClient_exec_i::get_controller ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Benchmark::CCM_Controller::_duplicate (this);
 }
@@ -140,8 +130,6 @@ MyImpl::RoundTripClient_exec_i::get_controller ()
 
 void
 MyImpl::RoundTripClient_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTripClient_exec_i::ccm_passivate\n"));
@@ -149,8 +137,6 @@ MyImpl::RoundTripClient_exec_i::ccm_passivate ()
 
 void
 MyImpl::RoundTripClient_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::RoundTripClient_exec_i::ccm_remove\n"));
@@ -167,8 +153,6 @@ MyImpl::RoundTripClientHome_exec_i::~RoundTripClientHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::RoundTripClientHome_exec_i::create ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::CCMException))
 {
   return new MyImpl::RoundTripClient_exec_i;
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
index 127684294f4..c718d8ab2c2 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
@@ -40,36 +40,22 @@ namespace MyImpl
     ~RoundTripClient_exec_i ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_preactivate ();
 
-    virtual void ccm_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ciao_postactivate ();
 
-    virtual void ccm_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_passivate ();
 
-    virtual void ccm_remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    virtual void ccm_remove ();
 
     virtual ::Benchmark::CCM_Controller_ptr
-                        get_controller ()
-                ACE_THROW_SPEC ((CORBA::SystemException));
+                        get_controller ();
 
-    virtual void start ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void start ();
 
 
   protected:
@@ -97,9 +83,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CCMException));
+    create ();
   };
 
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
index a1e3ed4f588..a3aed5e135f 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
@@ -12,7 +12,6 @@ LatencyTest_Impl::LatencyTest_Impl (CORBA::ORB_ptr orb)
 
 CORBA::Long
 LatencyTest_Impl::makeCall (CORBA::Long send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "Sending Time back \n"));
@@ -22,7 +21,6 @@ LatencyTest_Impl::makeCall (CORBA::Long send_time)
 
 void
 LatencyTest_Impl::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
index 9a13823eefe..e2dbaf7cc0e 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
@@ -22,11 +22,9 @@ public:
   LatencyTest_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long makeCall (CORBA::Long send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long makeCall (CORBA::Long send_time);
 
-  virtual void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index 7259a966207..5b592728bec 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -36,7 +36,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/CIAO/performance-tests/Benchmark/server.cpp b/CIAO/performance-tests/Benchmark/server.cpp
index c7f39d42809..4c3a0cc4870 100644
--- a/CIAO/performance-tests/Benchmark/server.cpp
+++ b/CIAO/performance-tests/Benchmark/server.cpp
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 2ea3c57a1c3..c277cf72cea 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
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..8de487816bb 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -54,17 +54,17 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 }
 
 
-project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
+project(TSEC_CheckPoint_exec) : ciao_component_dnc, event, ciao_server_dnc {
   avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
   after   += ENW_skel ENW_stub
 
-  includes   += ../interfaces 
+  includes   += ../interfaces
 
   sharedname = TSEC_CheckPoint_exec
-  libpaths  += ../interfaces 
+  libpaths  += ../interfaces
   libs      += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt
-  libs      += ENW_stub ENW_skel CIAO_DnC_Server TAO_CosNaming
+  libs      += ENW_stub ENW_skel
 
   idlflags  -= -GT
   idlflags  +=  -SS -St \
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
index 005b183df40..11f1fc27962 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
@@ -110,7 +110,7 @@ Impl::TSEC_Session_impl::hash
 CORBA::Long
 Impl::TSEC_Session_impl::getIdent
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 );
 
@@ -125,7 +125,7 @@ Impl::TSEC_Session_impl::getIdent
 CORBA::Boolean
 Impl::TSEC_Session_impl::isInUse
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE );
   return _isInUse;
@@ -183,7 +183,7 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::getObjRef
 (
   PortableServer::Servant Servant
-) ACE_THROW_SPEC( (CORBA::SystemException ) )
+)
 {
   return this->_p_sessionContainer->get_objref( Servant );
 }
@@ -196,7 +196,7 @@ Impl::TSEC_CheckPoint_exec_i::getObjRef
 int
 Impl::TSEC_CheckPoint_exec_i::init
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   ACE_DEBUG ((LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::init\n"));
 
@@ -219,7 +219,7 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::installServant
 (
   PortableServer::Servant Servant
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   assert( this->_p_sessionContainer );
 
@@ -236,7 +236,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::uninstallServant
 (
   CORBA::Object_ptr ObjRef
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   assert( this->_p_sessionContainer );
 
@@ -251,7 +251,7 @@ Impl::TSEC_CheckPoint_exec_i::uninstallServant
 ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::createSession
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   static long cnt = 0L;
 
@@ -279,7 +279,7 @@ Impl::TSEC_CheckPoint_exec_i::createSession
 Impl::TSEC_CheckPoint_exec_i::destroySession
 (
   ENW::TSession_ptr Session
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) );
 
@@ -303,8 +303,7 @@ ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::acquireSession
 (
   CORBA::Long Ident
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownIdent ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::acquireSession...\n" ) );
 
@@ -355,8 +354,7 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 (
   CORBA::Long Ident,
   ENW::TSession_ptr Session
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownSession ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...\n" ) );
 
@@ -407,7 +405,7 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 ENW::CCM_ISessionService_ptr
 Impl::TSEC_CheckPoint_exec_i::get_sessionService
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   return ENW::CCM_ISessionService::_duplicate( this );
 }
@@ -421,8 +419,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::set_session_context
 (
   Components::SessionContext_ptr Ctx
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG,
                "Impl::TSEC_CheckPoint_exec_i::set_session_context\n" ) );
@@ -461,7 +458,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 (
   ENW::ET_LifeToken* /* Event */
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   _awaitingLifeToken = false;
 }
@@ -474,8 +471,7 @@ Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_preactivate\n" ) );
 }
@@ -488,8 +484,7 @@ Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_activate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_activate\n" ) );
 
@@ -517,8 +512,7 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_postactivate\n" ) );
 }
@@ -531,8 +525,7 @@ Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_passivate\n" ) );
   _isActivated = false;
@@ -546,8 +539,7 @@ Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_remove
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_remove\n" ) );
   _isActivated = false;
@@ -580,7 +572,7 @@ Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i()
 Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 (
   const char* Version
-  ) ACE_THROW_SPEC( ( CORBA::SystemException ))
+  )
 {
   return new Impl::TSEC_CheckPoint_exec_i( Version );
 }
@@ -593,8 +585,7 @@ Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 ::Components::EnterpriseComponent_ptr
 Impl::TSEC_CheckPointHome_exec_i::create
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
 
   return new Impl::TSEC_CheckPoint_exec_i();
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
index 5e5c3809813..bdafdd2ed94 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
@@ -20,7 +20,7 @@
 
 #include "tao/LocalObject.h"
 
-#include "ciao/Container_Base.h"
+#include "ciao/Session_Container.h"
 
 #include "ENWS.h"
 #include "TSEC_CheckPointEIC.h"
@@ -69,8 +69,8 @@ namespace Impl
 
     virtual ~TSEC_Session_impl();
 
-    CORBA::Long getIdent() ACE_THROW_SPEC( ( CORBA::SystemException ) );
-    CORBA::Boolean isInUse() ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    CORBA::Long getIdent();
+    CORBA::Boolean isInUse();
     void isInUse( CORBA::Boolean Flag ) { _isInUse = Flag; }
 
   protected:
@@ -121,30 +121,28 @@ namespace Impl
 
     virtual ENW::CCM_ISessionService_ptr get_sessionService
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
 
     virtual ENW::TSession_ptr createSession
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     virtual CORBA::Boolean destroySession
     (
       ENW::TSession_ptr Session
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     virtual ENW::TSession_ptr acquireSession
     (
       CORBA::Long Ident
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        ENW::EUnknownIdent ) );
+    );
 
     virtual CORBA::Boolean releaseSession
     (
       CORBA::Long       Ident,
       ENW::TSession_ptr Session
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        ENW::EUnknownSession ) );
+    );
 
 
     // Events
@@ -153,7 +151,7 @@ namespace Impl
     virtual void push_lifeTokenIn
     (
       ENW::ET_LifeToken* Event
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
 
     // Operations from Components::SessionComponent
@@ -162,52 +160,46 @@ namespace Impl
     virtual void set_session_context
     (
       Components::SessionContext_ptr ctx
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
     virtual void ciao_preactivate
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
     virtual void ccm_activate
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
     virtual void ciao_postactivate
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
 
     virtual void ccm_passivate
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
     virtual void ccm_remove
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
 
     CORBA::Object_ptr getObjRef
     (
       PortableServer::Servant Servant
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     int init(
-    )ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     CORBA::Object_ptr installServant
     (
       PortableServer::Servant Servant
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     void uninstallServant
     (
       CORBA::Object_ptr ObjRef
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
+    );
 
     TMutex& getMutex() { return _mutex; }
 
@@ -244,13 +236,12 @@ namespace Impl
     virtual ::Components::EnterpriseComponent_ptr new_TSEC_CheckPoint
     (
       const char* Version
-      ) ACE_THROW_SPEC(( CORBA::SystemException));
+      );
 
     // Implicit home operations.
     virtual ::Components::EnterpriseComponent_ptr create
     (
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
+    );
   };
 }  // Impl
 
diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
index 6688e0a224f..733c3d7183c 100644
--- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
+++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
@@ -58,9 +58,9 @@ sub run_node_daemons {
       $port = $ports[$i];
 
       $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+      $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -a \"-r\"";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -99,7 +99,7 @@ $ns_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager",
                             "-o EM.ior -i $dat_file");
 $EM->Spawn ();
 
@@ -116,7 +116,7 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior");
 
 $E->SpawnWaitKill (5000);
@@ -164,7 +164,7 @@ if ($result != 0) {
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
 $E->SpawnWaitKill (3000);
 
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
index cc07a3f12e9..8b020a77e54 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
@@ -9,31 +9,31 @@
 
 module VerySimple
 {
-  
+
   component Foo
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
 };
 
 module SupportsInterface
 {
-  interface foo_interface 
+  interface foo_interface
     {
     };
-  
+
   component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
 };
 
 
@@ -42,15 +42,15 @@ module SupportsMultiple
   interface foo_interface
     {
     };
-  
+
   interface bar_interface
     {
     };
-  
+
   component FooBar supports foo_interface, bar_interface
     {
     };
-  
+
   home FooBarHome manages FooBar
     {
     };
@@ -65,19 +65,19 @@ module Inheritance
   interface Bar_interface
     {
     };
-  
+
   component Foo supports foo_interface
     {
     };
-  
+
   component Bar : Foo
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
   home BarHome manages Bar
     {
     };
@@ -85,3 +85,12 @@ module Inheritance
 
 };
 
+module Bug_2790_Regression
+{
+  // It is legal for a derived component to support an interface
+  interface Wibble {};
+  interface Wobble {};
+  component Bobble {};
+  component Bibble : Bobble supports Wibble, Wobble {};
+};
+
diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp
index 77551725735..0bc63cba33d 100644
--- a/CIAO/tests/IDL3/Events/Any/main.cpp
+++ b/CIAO/tests/IDL3/Events/Any/main.cpp
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      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 (),
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index 3aca5735ae0..3c21751ba6d 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -46,9 +46,6 @@ namespace CIDL_Receiver_Impl
   void
   Receiver_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Receiver_Context::_narrow (
@@ -62,45 +59,30 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
@@ -129,9 +111,6 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index a90c6941de7..b76d69f4f23 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -52,40 +52,22 @@ namespace CIDL_Receiver_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     Receiver_Context *context_;
@@ -110,10 +92,7 @@ namespace CIDL_Receiver_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
index b8b1a1c516e..b5c3211e8ae 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
@@ -39,7 +39,6 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::bar ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
   }
@@ -53,9 +52,6 @@ namespace CIDL_Sender_Impl
   void
   Sender_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Sender_Context::_narrow (
@@ -69,45 +65,30 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Sender_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Sender_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Sender_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Sender_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
@@ -136,9 +117,6 @@ namespace CIDL_Sender_Impl
 
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h
index 179bb6453a8..955c1353afb 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.h
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Sender_Impl
     // Supported or inherited operations.
 
     virtual void
-    bar ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    bar ();
 
     // Attribute operations.
 
@@ -56,40 +55,22 @@ namespace CIDL_Sender_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     Sender_Context *context_;
@@ -114,10 +95,7 @@ namespace CIDL_Sender_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index d844226c9ef..cc1fe6fc020 100644
--- a/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "ADD_Handler.h"
 #include "cdp.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ace/UUID.h"
 
diff --git a/CIAO/tools/Config_Handlers/BasicSP.cdp b/CIAO/tools/Config_Handlers/BasicSP.cdp
deleted file mode 100644
index dee3dc87fcf..00000000000
--- a/CIAO/tools/Config_Handlers/BasicSP.cdp
+++ /dev/null
@@ -1,489 +0,0 @@
-<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 Modified_Deployment.xsd">
-
-<label>BasicSP-DeploymentPlan</label>
-<UUID><!-- @@ fill in --> </UUID>
-<!-- Exactly one realizes
-This realizes section may also not be right. -->
-<realizes>
-<label>BasicSP-realizes-cid</label>
-<UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-<specificType><!-- @@ What does here? --></specificType>
-<supportedType>IDL:BasicSP/BMClosedED:1.0</supportedType>
-<supportedType>IDL:BasicSP/BMDevice:1.0</supportedType>
-<supportedType>IDL:BasicSP/BMDisplay:1.0</supportedType>
-<supportedType>IDL:BasicSP/EC:1.0</supportedType>
-<!--
-<idlFile></idlFile>
-<configProperty></configProperty>
--->
-
-<port>
-<name>in_avail</name>
-<specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-<supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-<provider>false</provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>EventConsumer</kind>
-</port>
-
-<port>
-<name>out_avail</name>
-<specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-<supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-<provider>true</provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>EventPublisher</kind>
-</port>
-
-<port>
-<name>dataout</name>
-<specificType>IDL:BasicSP/ReadData:1.0</specificType>
-<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-<provider>true</provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>Facet</kind>
-</port>
-
-<port>
-<name>datain</name>
-<specificType>IDL:BasicSP/ReadData:1.0</specificType>
-<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-<provider>true</provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>SimplexReceptacle</kind>
-</port>
-
-<port>
-<name>data_read</name>
-<specificType>IDL:BasicSP/ReadData:1.0</specificType>
-<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-<provider>false></provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>EventPublisher</kind>
-</port>
-
-<port>
-<name>timeout</name>
-<specificType>IDL:BasicSP/TimeOut:1.0</specificType>
-<supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
-<provider>false></provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>EventConsumer</kind>
-</port>
-
-<port>
-<name>comp_data</name>
-<specificType>IDL:BasicSP/ReadData:1.0</specificType>
-<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-<provider>false</provider>
-<exclusiveProvider>false</exclusiveProvider>
-<exclusiveUser>false</exclusiveUser>
-<optional>false</optional>
-<kind>SimplexReceptacle</kind>
-</port>
-
-<!--
-<property></property>
-<infoProperty></infoProperty>
--->
-</realizes>
-
-<implementation id="BasicSP-BMClosedED-mdd">
-<name>BasicSP-BMClosedED-mdd</name>
-<source><!-- @@ Don't know what goes here --></source>
-<artifact>BasicSP-BMClosedED_DnC_svnt</artifact>
-<artifact>BasicSP-BMClosedED_DnC_stub</artifact>
-<artifact>BasicSP-BMClosedED_DnC_exec</artifact>
-<!--
-<execParameter></execParameter>
-<deployRequirement></deployRequirement>
--->
-</implementation>
-
-<implementation id="BasicSP-BMDevice-mdd">
-<name>BasicSP-BMDevice-mdd</name>
-<source><!-- @@ Don't know what goes here --></source>
-
-<artifact>BasicSP-BMDevice_DnC_exec</artifact>
-<artifact>BasicSP-BMDevice_DnC_stub</artifact>
-<artifact>BasicSP-BMDevice_DnC_svnt</artifact>
-<!--
-<execParameter></execParameter>
-<deployRequirement></deployRequirement>
--->
-</implementation>
-
-<implementation id="BasicSP-BMDisplay-mdd">
-<name>BasicSP-BMDisplay-mdd</name>
-<source><!-- @@ Don't know what goes here --></source>
-<artifact>BasicSP-BMDisplay_DnC_exec</artifact>
-<artifact>BasicSP-BMDisplay_DnC_svnt</artifact>
-<artifact>BasicSP-BMDisplay_DnC_stub</artifact>
-
-<!--
-<execParameter></execParameter>
-<deployRequirement></deployRequirement>
--->
-</implementation>
-
-<implementation id="BasicSP-EC-mdd">
-<name>BasicSP-EC-mdd</name>
-<source><!-- @@ Don't know what goes here --></source>
-
-<artifact>BasicSP-EC_DnC_stub</artifact>
-<artifact>BasicSP-EC_DnC_svnt</artifact>
-<artifact>BasicSP-EC_DnC_exec</artifact>
-
-<!--
-<execParameter></execParameter>
-<deployRequirement></deployRequirement>
--->
-</implementation>
-
-<instance id="BasicSP-BMClosedED-idd">
-<name>BasicSP-BMClosedED-idd</name>
-<node>BMDisplay</node>
-<source><!-- @@ What goes here --></source>
-<implementation>BasicSP-BMClosedED-mdd</implementation>
-<configProperty>
-<name>ComponentIOR</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>BMClosedED.ior</string>
-</value>
-</value>
-</configProperty>
-</instance>
-
-<instance id="BasicSP-BMDevice-idd">
-<name>BasicSP-BMDevice-idd</name>
-<node>BMDisplay</node>
-<source><!-- @@ What goes here --></source>
-<implementation>BasicSP-BMDevice-mdd</implementation>
-<configProperty>
-<name>ComponentIOR</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>BMDevice.ior</string>
-</value>
-</value>
-</configProperty>
-</instance>
-
-<instance id="BasicSP-BMDisplay-idd">
-<name>BasicSP-BMDisplay-idd</name>
-<node>BMDisplay</node>
-<source><!-- @@ What goes here --></source>
-<implementation>BasicSP-BMDisplay-mdd</implementation>
-<configProperty>
-<name>ComponentIOR</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>BMDisplay.ior</string>
-</value>
-</value>
-</configProperty>
-</instance>
-
-<instance id="BasicSP-EC-idd">
-<name>BasicSP-EC-idd</name>
-<node>EC</node>
-<source><!-- @@ What goes here --></source>
-<implementation>BasicSP-EC-mdd</implementation>
-<configProperty>
-<name>ComponentIOR</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>EC.ior</string>
-</value>
-</value>
-</configProperty>
-</instance>
-
-<connection>
-<name>datain_data_read</name>
-<internalEndpoint>
-<portName>data_read</portName>
-<kind>Facet</kind>
-<instance>BasicSP-BMDevice-idd</instance>
-</internalEndpoint>
-<internalEndpoint>
-<portName>datain</portName>
-<kind>SimplexReceptacle</kind>
-<instance>BasicSP-BMClosedED-idd</instance>
-</internalEndpoint>
-</connection>
-
-<connection>
-<name>comp_data_dataout</name>
-<internalEndpoint>
-<portName>dataout</portName>
-<kind>Facet</kind>
-<instance>BasicSP-BMClosedED-idd</instance>
-</internalEndpoint>
-<internalEndpoint>
-<portName>comp_data</portName>
-<kind>SimplexReceptacle</kind>
-<instance>BasicSP-BMDisplay-idd</instance>
-</internalEndpoint>
-</connection>
-
-<connection>
-<name>timeout_timeout</name>
-<internalEndpoint>
-<portName>timeout</portName>
-<kind>EventPublisher</kind>
-<instance>BasicSP-EC-idd</instance>
-</internalEndpoint>
-<internalEndpoint>
-<portName>timeout</portName>
-<kind>EventConsumer</kind>
-<instance>BasicSP-BMDevice-idd</instance>
-</internalEndpoint>
-</connection>
-
-<connection>
-<name>in_avail_data_available</name>
-<internalEndpoint>
-<portName>data_available</portName>
-<kind>EventPublisher</kind>
-<instance>BasicSP-BMDevice-idd</instance>
-</internalEndpoint>
-<internalEndpoint>
-<portName>in_avail</portName>
-<kind>EventConsumer</kind>
-<instance>BasicSP-BMClosedED-idd</instance>
-</internalEndpoint>
-</connection>
-
-<connection>
-<name>data_ready_out_avail</name>
-<internalEndpoint>
-<portName>out_avail</portName>
-<kind>EventPublisher</kind>
-<instance>BasicSP-BMClosedED-idd</instance>
-</internalEndpoint>
-<internalEndpoint>
-<portName>data_ready</portName>
-<kind>EventConsumer</kind>
-<instance>BasicSP-BMDisplay-idd</instance>
-</internalEndpoint>
-</connection>
-
-<artifact id="BasicSP-BMClosedED_DnC_exec">
-<name>BMClosedED_DnC_exec</name>
-<source><!-- @@ Not sure about this--></source>
-<node><!-- blank --></node>
-<location>BMClosedED_DnC_exec</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMClosedEDHome_Impl</string>
-</value>
-</value>
-</execParameter>
-
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMClosedED_DnC_svnt">
-<name>BMClosedED_DnC_svnt</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMClosedED_DnC_svnt</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMClosedEDHome_Servant</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMClosedED_DnC_stub">
-<name>BMClosedED_DnC_stub</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMClosedED_DnC_stub</location>
-
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDevice_DnC_exec">
-<name>BMDevice_DnC_exec</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDevice_DnC_exec</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMDeviceHome_Impl</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDevice_DnC_stub">
-<name>BMDevice_DnC_stub</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDevice_DnC_stub</location>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDevice_DnC_svnt">
-<name>BMDevice_DnC_svnt</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDevice_DnC_svnt</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMDeviceHome_Servant</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDisplay_DnC_exec">
-<name>BMDisplay_DnC_exec</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDisplay_DnC_exec</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMDisplayHome_Impl</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDisplay_DnC_svnt">
-<name>BMDisplay_DnC_svnt</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDisplay_DnC_svnt</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createBMDisplayHome_Servant</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-BMDisplay_DnC_stub">
-<name>BMDisplay_DnC_stub</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>BMDisplay_DnC_stub</location>
-
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-EC_DnC_stub">
-<name>EC_DnC_stub</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>EC_DnC_stub</location>
-
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-EC_DnC_svnt">
-<name>EC_DnC_svnt</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>EC_DnC_svnt</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createECHome_Servant</string>
-</value>
-</value>
-</execParameter>
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-
-<artifact id="BasicSP-EC_DnC_exec">
-<name>EC_DnC_exec</name>
-<source><!-- @@ Not sure --></source>
-<node><!-- blank --></node>
-<location>EC_DnC_exec</location>
-<execParameter>
-<name>entryPoint</name>
-<value>
-<type>
-<kind>tk_string</kind>
-</type>
-<value>
-<string>createECHome_Impl</string>
-</value>
-</value>
-</execParameter>
-
-<!-- @@ This has dependancies that need to be specified, how? -->
-</artifact>
-</Deployment:deploymentPlan>
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 25191d1daaf..969cbc06c53 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "Basic_Deployment_Data.hpp"
 
 namespace CIAO
@@ -16,7 +22,7 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TCKind
-    //
+    // 
 
     TCKind::Value TCKind::
     integral () const
@@ -38,33 +44,41 @@ namespace CIAO
 
     TCKind::
     TCKind (TCKind::Value v)
-      : v_ (v)
+    : v_ (v)
     {
     }
 
     // DataType
-    //
+    // 
 
     DataType::
     DataType (::CIAO::Config_Handlers::TCKind const& kind__)
-      :
-      ::XSCRT::Type (),
-      kind_ (new ::CIAO::Config_Handlers::TCKind (kind__)),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    kind_ (new ::CIAO::Config_Handlers::TCKind (kind__)),
+    regulator__ ()
     {
       kind_->container (this);
     }
 
     DataType::
     DataType (::CIAO::Config_Handlers::DataType const& s)
-      :
-      ::XSCRT::Type (),
-      kind_ (new ::CIAO::Config_Handlers::TCKind (*s.kind_)),
-      enum__ (s.enum__.get () ? new ::CIAO::Config_Handlers::EnumType (*s.enum__) : 0),
-      regulator__ ()
+    :
+    ::XSCRT::Type (),
+    kind_ (new ::CIAO::Config_Handlers::TCKind (*s.kind_)),
+    enum__ (s.enum__.get () ? new ::CIAO::Config_Handlers::EnumType (*s.enum__) : 0),
+    struct__ (s.struct__.get () ? new ::CIAO::Config_Handlers::StructType (*s.struct__) : 0),
+    value_ (s.value_.get () ? new ::CIAO::Config_Handlers::ValueType (*s.value_) : 0),
+    sequence_ (s.sequence_.get () ? new ::CIAO::Config_Handlers::SequenceType (*s.sequence_) : 0),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
     {
       kind_->container (this);
       if (enum__.get ()) enum__->container (this);
+      if (struct__.get ()) struct__->container (this);
+      if (value_.get ()) value_->container (this);
+      if (sequence_.get ()) sequence_->container (this);
+      if (id_.get ()) id_->container (this);
     }
 
     ::CIAO::Config_Handlers::DataType& DataType::
@@ -75,12 +89,24 @@ namespace CIAO
       if (s.enum__.get ()) enum_ (*(s.enum__));
       else enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (0);
 
+      if (s.struct__.get ()) struct_ (*(s.struct__));
+      else struct__ = ::std::auto_ptr< ::CIAO::Config_Handlers::StructType > (0);
+
+      if (s.value_.get ()) value (*(s.value_));
+      else value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ValueType > (0);
+
+      if (s.sequence_.get ()) sequence (*(s.sequence_));
+      else sequence_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > (0);
+
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+
       return *this;
     }
 
 
     // DataType
-    //
+    // 
     ::CIAO::Config_Handlers::TCKind const& DataType::
     kind () const
     {
@@ -94,7 +120,7 @@ namespace CIAO
     }
 
     // DataType
-    //
+    // 
     bool DataType::
     enum_p () const
     {
@@ -111,34 +137,156 @@ namespace CIAO
     enum_ (::CIAO::Config_Handlers::EnumType const& e)
     {
       if (enum__.get ())
-        {
-          *enum__ = e;
-        }
+      {
+        *enum__ = e;
+      }
 
       else
-        {
-          enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (new ::CIAO::Config_Handlers::EnumType (e));
-          enum__->container (this);
-        }
+      {
+        enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (new ::CIAO::Config_Handlers::EnumType (e));
+        enum__->container (this);
+      }
+    }
+
+    // DataType
+    // 
+    bool DataType::
+    struct_p () const
+    {
+      return struct__.get () != 0;
+    }
+
+    ::CIAO::Config_Handlers::StructType const& DataType::
+    struct_ () const
+    {
+      return *struct__;
+    }
+
+    void DataType::
+    struct_ (::CIAO::Config_Handlers::StructType const& e)
+    {
+      if (struct__.get ())
+      {
+        *struct__ = e;
+      }
+
+      else
+      {
+        struct__ = ::std::auto_ptr< ::CIAO::Config_Handlers::StructType > (new ::CIAO::Config_Handlers::StructType (e));
+        struct__->container (this);
+      }
+    }
+
+    // DataType
+    // 
+    bool DataType::
+    value_p () const
+    {
+      return value_.get () != 0;
+    }
+
+    ::CIAO::Config_Handlers::ValueType const& DataType::
+    value () const
+    {
+      return *value_;
+    }
+
+    void DataType::
+    value (::CIAO::Config_Handlers::ValueType const& e)
+    {
+      if (value_.get ())
+      {
+        *value_ = e;
+      }
+
+      else
+      {
+        value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ValueType > (new ::CIAO::Config_Handlers::ValueType (e));
+        value_->container (this);
+      }
+    }
+
+    // DataType
+    // 
+    bool DataType::
+    sequence_p () const
+    {
+      return sequence_.get () != 0;
+    }
+
+    ::CIAO::Config_Handlers::SequenceType const& DataType::
+    sequence () const
+    {
+      return *sequence_;
+    }
+
+    void DataType::
+    sequence (::CIAO::Config_Handlers::SequenceType const& e)
+    {
+      if (sequence_.get ())
+      {
+        *sequence_ = e;
+      }
+
+      else
+      {
+        sequence_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > (new ::CIAO::Config_Handlers::SequenceType (e));
+        sequence_->container (this);
+      }
+    }
+
+    // DataType
+    // 
+    bool DataType::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
+
+    ::XMLSchema::ID< ACE_TCHAR > const& DataType::
+    id () const
+    {
+      return *id_;
+    }
+
+    ::XMLSchema::ID< ACE_TCHAR >& DataType::
+    id ()
+    {
+      return *id_;
+    }
+
+    void DataType::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
+      {
+        *id_ = e;
+      }
+
+      else
+      {
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
+      }
     }
 
 
     // DataValue
-    //
+    // 
 
     DataValue::
     DataValue ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     DataValue::
     DataValue (::CIAO::Config_Handlers::DataValue const& s)
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    :
+    ::XSCRT::Type (),
+    regulator__ ()
     {
       {
         for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i);
@@ -191,6 +339,10 @@ namespace CIAO
       {
         for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i);
       }
+
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
     }
 
     ::CIAO::Config_Handlers::DataValue& DataValue::
@@ -261,12 +413,17 @@ namespace CIAO
         for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i);
       }
 
+      member_.clear ();
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
+
       return *this;
     }
 
 
     // DataValue
-    //
+    // 
     DataValue::short_iterator DataValue::
     begin_short ()
     {
@@ -304,7 +461,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::long_iterator DataValue::
     begin_long ()
     {
@@ -342,7 +499,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::ushort_iterator DataValue::
     begin_ushort ()
     {
@@ -380,7 +537,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::ulong_iterator DataValue::
     begin_ulong ()
     {
@@ -418,7 +575,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::float_iterator DataValue::
     begin_float ()
     {
@@ -456,7 +613,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::double_iterator DataValue::
     begin_double ()
     {
@@ -494,7 +651,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::boolean_iterator DataValue::
     begin_boolean ()
     {
@@ -532,7 +689,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::octet_iterator DataValue::
     begin_octet ()
     {
@@ -570,7 +727,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::enum_iterator DataValue::
     begin_enum ()
     {
@@ -608,7 +765,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::string_iterator DataValue::
     begin_string ()
     {
@@ -646,7 +803,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::longlong_iterator DataValue::
     begin_longlong ()
     {
@@ -684,7 +841,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::ulonglong_iterator DataValue::
     begin_ulonglong ()
     {
@@ -722,7 +879,7 @@ namespace CIAO
     }
 
     // DataValue
-    //
+    // 
     DataValue::longdouble_iterator DataValue::
     begin_longdouble ()
     {
@@ -759,13328 +916,15525 @@ namespace CIAO
       return longdouble_.size ();
     }
 
+    // DataValue
+    // 
+    DataValue::member_iterator DataValue::
+    begin_member ()
+    {
+      return member_.begin ();
+    }
+
+    DataValue::member_iterator DataValue::
+    end_member ()
+    {
+      return member_.end ();
+    }
+
+    DataValue::member_const_iterator DataValue::
+    begin_member () const
+    {
+      return member_.begin ();
+    }
+
+    DataValue::member_const_iterator DataValue::
+    end_member () const
+    {
+      return member_.end ();
+    }
+
+    void DataValue::
+    add_member (::CIAO::Config_Handlers::NamedValue const& e)
+    {
+      member_.push_back (e);
+    }
+
+    size_t DataValue::
+    count_member(void) const
+    {
+      return member_.size ();
+    }
+
 
     // EnumType
-    //
+    // 
 
     EnumType::
     EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
               ::XMLSchema::string< ACE_TCHAR > const& typeId__)
-      :
-      ::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
-regulator__ ()
-{
-name_->container (this);
-typeId_->container (this);
-}
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+    }
 
-EnumType::
-EnumType (::CIAO::Config_Handlers::EnumType const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
-regulator__ ()
-{
-name_->container (this);
-typeId_->container (this);
-{
-for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
-}
-}
+    EnumType::
+    EnumType (::CIAO::Config_Handlers::EnumType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::EnumType& EnumType::
-operator= (::CIAO::Config_Handlers::EnumType const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::EnumType& EnumType::
+    operator= (::CIAO::Config_Handlers::EnumType const& s)
+    {
+      name (s.name ());
 
-typeId (s.typeId ());
+      typeId (s.typeId ());
 
-member_.clear ();
-{
-for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
-}
+      member_.clear ();
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// EnumType
-//
-::XMLSchema::string< ACE_TCHAR > const& EnumType::
-name () const
-{
-return *name_;
-}
+    // EnumType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& EnumType::
+    name () const
+    {
+      return *name_;
+    }
 
-void EnumType::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void EnumType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// EnumType
-//
-::XMLSchema::string< ACE_TCHAR > const& EnumType::
-typeId () const
-{
-return *typeId_;
-}
+    // EnumType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& EnumType::
+    typeId () const
+    {
+      return *typeId_;
+    }
 
-void EnumType::
-typeId (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*typeId_ = e;
-}
+    void EnumType::
+    typeId (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *typeId_ = e;
+    }
 
-// EnumType
-//
-EnumType::member_iterator EnumType::
-begin_member ()
-{
-return member_.begin ();
-}
+    // EnumType
+    // 
+    EnumType::member_iterator EnumType::
+    begin_member ()
+    {
+      return member_.begin ();
+    }
 
-EnumType::member_iterator EnumType::
-end_member ()
-{
-return member_.end ();
-}
+    EnumType::member_iterator EnumType::
+    end_member ()
+    {
+      return member_.end ();
+    }
 
-EnumType::member_const_iterator EnumType::
-begin_member () const
-{
-return member_.begin ();
-}
+    EnumType::member_const_iterator EnumType::
+    begin_member () const
+    {
+      return member_.begin ();
+    }
 
-EnumType::member_const_iterator EnumType::
-end_member () const
-{
-return member_.end ();
-}
+    EnumType::member_const_iterator EnumType::
+    end_member () const
+    {
+      return member_.end ();
+    }
 
-void EnumType::
-add_member (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-member_.push_back (e);
-}
+    void EnumType::
+    add_member (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      member_.push_back (e);
+    }
 
-size_t EnumType::
-count_member(void) const
-{
-return member_.size ();
-}
+    size_t EnumType::
+    count_member(void) const
+    {
+      return member_.size ();
+    }
 
 
-// Any
-//
+    // StructType
+    // 
 
-Any::
-Any (::CIAO::Config_Handlers::DataType const& type__,
-::CIAO::Config_Handlers::DataValue const& value__)
-:
-::XSCRT::Type (),
-type_ (new ::CIAO::Config_Handlers::DataType (type__)),
-value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
-regulator__ ()
-{
-type_->container (this);
-value_->container (this);
-}
+    StructType::
+    StructType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                ::XMLSchema::string< ACE_TCHAR > const& typeId__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+    }
 
-Any::
-Any (::CIAO::Config_Handlers::Any const& s)
-:
-::XSCRT::Type (),
-type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
-regulator__ ()
-{
-type_->container (this);
-value_->container (this);
-}
+    StructType::
+    StructType (::CIAO::Config_Handlers::StructType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::Any& Any::
-operator= (::CIAO::Config_Handlers::Any const& s)
-{
-type (s.type ());
+    ::CIAO::Config_Handlers::StructType& StructType::
+    operator= (::CIAO::Config_Handlers::StructType const& s)
+    {
+      name (s.name ());
 
-value (s.value ());
+      typeId (s.typeId ());
 
-return *this;
-}
+      member_.clear ();
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
 
+      return *this;
+    }
 
-// Any
-//
-::CIAO::Config_Handlers::DataType const& Any::
-type () const
-{
-return *type_;
-}
 
-void Any::
-type (::CIAO::Config_Handlers::DataType const& e)
-{
-*type_ = e;
-}
+    // StructType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& StructType::
+    name () const
+    {
+      return *name_;
+    }
 
-// Any
-//
-::CIAO::Config_Handlers::DataValue const& Any::
-value () const
-{
-return *value_;
-}
+    void StructType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-void Any::
-value (::CIAO::Config_Handlers::DataValue const& e)
-{
-*value_ = e;
-}
+    // StructType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& StructType::
+    typeId () const
+    {
+      return *typeId_;
+    }
 
+    void StructType::
+    typeId (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *typeId_ = e;
+    }
 
-// Property
-//
+    // StructType
+    // 
+    StructType::member_iterator StructType::
+    begin_member ()
+    {
+      return member_.begin ();
+    }
 
-Property::
-Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::Any const& value__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-value_ (new ::CIAO::Config_Handlers::Any (value__)),
-regulator__ ()
-{
-name_->container (this);
-value_->container (this);
-}
+    StructType::member_iterator StructType::
+    end_member ()
+    {
+      return member_.end ();
+    }
 
-Property::
-Property (::CIAO::Config_Handlers::Property const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-regulator__ ()
-{
-name_->container (this);
-value_->container (this);
-}
+    StructType::member_const_iterator StructType::
+    begin_member () const
+    {
+      return member_.begin ();
+    }
 
-::CIAO::Config_Handlers::Property& Property::
-operator= (::CIAO::Config_Handlers::Property const& s)
-{
-name (s.name ());
+    StructType::member_const_iterator StructType::
+    end_member () const
+    {
+      return member_.end ();
+    }
 
-value (s.value ());
+    void StructType::
+    add_member (::CIAO::Config_Handlers::StructMemberType const& e)
+    {
+      member_.push_back (e);
+    }
 
-return *this;
-}
+    size_t StructType::
+    count_member(void) const
+    {
+      return member_.size ();
+    }
 
 
-// Property
-//
-::XMLSchema::string< ACE_TCHAR > const& Property::
-name () const
-{
-return *name_;
-}
+    // StructMemberType
+    // 
 
-void Property::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    StructMemberType::
+    StructMemberType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                      ::CIAO::Config_Handlers::DataType const& type__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
+    }
 
-// Property
-//
-::CIAO::Config_Handlers::Any const& Property::
-value () const
-{
-return *value_;
-}
+    StructMemberType::
+    StructMemberType (::CIAO::Config_Handlers::StructMemberType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
+    }
 
-void Property::
-value (::CIAO::Config_Handlers::Any const& e)
-{
-*value_ = e;
-}
+    ::CIAO::Config_Handlers::StructMemberType& StructMemberType::
+    operator= (::CIAO::Config_Handlers::StructMemberType const& s)
+    {
+      name (s.name ());
 
+      type (s.type ());
 
-// SatisfierPropertyKind
-//
+      return *this;
+    }
 
-SatisfierPropertyKind::Value SatisfierPropertyKind::
-integral () const
-{
-return v_;
-}
 
-bool
-operator== (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-{
-return a.v_ == b.v_;
-}
+    // StructMemberType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& StructMemberType::
+    name () const
+    {
+      return *name_;
+    }
 
-bool
-operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-{
-return a.v_ != b.v_;
-}
+    void StructMemberType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-SatisfierPropertyKind::
-SatisfierPropertyKind (SatisfierPropertyKind::Value v)
-: v_ (v)
-{
-}
+    // StructMemberType
+    // 
+    ::CIAO::Config_Handlers::DataType const& StructMemberType::
+    type () const
+    {
+      return *type_;
+    }
 
-// SatisfierProperty
-//
-
-SatisfierProperty::
-SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-::XMLSchema::boolean const& dynamic__,
-::CIAO::Config_Handlers::Any const& value__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
-dynamic_ (new ::XMLSchema::boolean (dynamic__)),
-value_ (new ::CIAO::Config_Handlers::Any (value__)),
-regulator__ ()
-{
-name_->container (this);
-kind_->container (this);
-dynamic_->container (this);
-value_->container (this);
-}
+    void StructMemberType::
+    type (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *type_ = e;
+    }
 
-SatisfierProperty::
-SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
-dynamic_ (new ::XMLSchema::boolean (*s.dynamic_)),
-value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-regulator__ ()
-{
-name_->container (this);
-kind_->container (this);
-dynamic_->container (this);
-value_->container (this);
-}
 
-::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
-operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
-{
-name (s.name ());
+    // ValueType
+    // 
+
+    ValueType::
+    ValueType (::XMLSchema::string< ACE_TCHAR > const& name__,
+               ::XMLSchema::string< ACE_TCHAR > const& typeId__,
+               ::XMLSchema::string< ACE_TCHAR > const& modifier__,
+               ::CIAO::Config_Handlers::DataType const& baseType__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
+    modifier_ (new ::XMLSchema::string< ACE_TCHAR > (modifier__)),
+    baseType_ (new ::CIAO::Config_Handlers::DataType (baseType__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      modifier_->container (this);
+      baseType_->container (this);
+    }
 
-kind (s.kind ());
+    ValueType::
+    ValueType (::CIAO::Config_Handlers::ValueType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
+    modifier_ (new ::XMLSchema::string< ACE_TCHAR > (*s.modifier_)),
+    baseType_ (new ::CIAO::Config_Handlers::DataType (*s.baseType_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      modifier_->container (this);
+      baseType_->container (this);
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
+    }
 
-dynamic (s.dynamic ());
+    ::CIAO::Config_Handlers::ValueType& ValueType::
+    operator= (::CIAO::Config_Handlers::ValueType const& s)
+    {
+      name (s.name ());
 
-value (s.value ());
+      typeId (s.typeId ());
 
-return *this;
-}
+      modifier (s.modifier ());
 
+      baseType (s.baseType ());
 
-// SatisfierProperty
-//
-::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
-name () const
-{
-return *name_;
-}
+      member_.clear ();
+      {
+        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+      }
 
-void SatisfierProperty::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+      return *this;
+    }
 
-// SatisfierProperty
-//
-::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
-kind () const
-{
-return *kind_;
-}
 
-void SatisfierProperty::
-kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
-{
-*kind_ = e;
-}
+    // ValueType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ValueType::
+    name () const
+    {
+      return *name_;
+    }
 
-// SatisfierProperty
-//
-::XMLSchema::boolean const& SatisfierProperty::
-dynamic () const
-{
-return *dynamic_;
-}
+    void ValueType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-void SatisfierProperty::
-dynamic (::XMLSchema::boolean const& e)
-{
-*dynamic_ = e;
-}
+    // ValueType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ValueType::
+    typeId () const
+    {
+      return *typeId_;
+    }
 
-// SatisfierProperty
-//
-::CIAO::Config_Handlers::Any const& SatisfierProperty::
-value () const
-{
-return *value_;
-}
+    void ValueType::
+    typeId (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *typeId_ = e;
+    }
 
-void SatisfierProperty::
-value (::CIAO::Config_Handlers::Any const& e)
-{
-*value_ = e;
-}
+    // ValueType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ValueType::
+    modifier () const
+    {
+      return *modifier_;
+    }
 
+    void ValueType::
+    modifier (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *modifier_ = e;
+    }
 
-// Resource
-//
+    // ValueType
+    // 
+    ::CIAO::Config_Handlers::DataType const& ValueType::
+    baseType () const
+    {
+      return *baseType_;
+    }
 
-Resource::
-Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    void ValueType::
+    baseType (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *baseType_ = e;
+    }
 
-Resource::
-Resource (::CIAO::Config_Handlers::Resource const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-regulator__ ()
-{
-name_->container (this);
-{
-for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-}
+    // ValueType
+    // 
+    ValueType::member_iterator ValueType::
+    begin_member ()
+    {
+      return member_.begin ();
+    }
 
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    ValueType::member_iterator ValueType::
+    end_member ()
+    {
+      return member_.end ();
+    }
 
-::CIAO::Config_Handlers::Resource& Resource::
-operator= (::CIAO::Config_Handlers::Resource const& s)
-{
-name (s.name ());
+    ValueType::member_const_iterator ValueType::
+    begin_member () const
+    {
+      return member_.begin ();
+    }
 
-resourceType_.clear ();
-{
-for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-}
+    ValueType::member_const_iterator ValueType::
+    end_member () const
+    {
+      return member_.end ();
+    }
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+    void ValueType::
+    add_member (::CIAO::Config_Handlers::ValueMemberType const& e)
+    {
+      member_.push_back (e);
+    }
 
-return *this;
-}
+    size_t ValueType::
+    count_member(void) const
+    {
+      return member_.size ();
+    }
 
 
-// Resource
-//
-::XMLSchema::string< ACE_TCHAR > const& Resource::
-name () const
-{
-return *name_;
-}
+    // ValueMemberType
+    // 
 
-void Resource::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    ValueMemberType::
+    ValueMemberType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                     ::XMLSchema::string< ACE_TCHAR > const& visibility__,
+                     ::CIAO::Config_Handlers::DataType const& type__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    visibility_ (new ::XMLSchema::string< ACE_TCHAR > (visibility__)),
+    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      visibility_->container (this);
+      type_->container (this);
+    }
 
-// Resource
-//
-Resource::resourceType_iterator Resource::
-begin_resourceType ()
-{
-return resourceType_.begin ();
-}
+    ValueMemberType::
+    ValueMemberType (::CIAO::Config_Handlers::ValueMemberType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    visibility_ (new ::XMLSchema::string< ACE_TCHAR > (*s.visibility_)),
+    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      visibility_->container (this);
+      type_->container (this);
+    }
 
-Resource::resourceType_iterator Resource::
-end_resourceType ()
-{
-return resourceType_.end ();
-}
+    ::CIAO::Config_Handlers::ValueMemberType& ValueMemberType::
+    operator= (::CIAO::Config_Handlers::ValueMemberType const& s)
+    {
+      name (s.name ());
 
-Resource::resourceType_const_iterator Resource::
-begin_resourceType () const
-{
-return resourceType_.begin ();
-}
+      visibility (s.visibility ());
 
-Resource::resourceType_const_iterator Resource::
-end_resourceType () const
-{
-return resourceType_.end ();
-}
+      type (s.type ());
 
-void Resource::
-add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-resourceType_.push_back (e);
-}
+      return *this;
+    }
 
-size_t Resource::
-count_resourceType(void) const
-{
-return resourceType_.size ();
-}
 
-// Resource
-//
-Resource::property_iterator Resource::
-begin_property ()
-{
-return property_.begin ();
-}
+    // ValueMemberType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ValueMemberType::
+    name () const
+    {
+      return *name_;
+    }
 
-Resource::property_iterator Resource::
-end_property ()
-{
-return property_.end ();
-}
+    void ValueMemberType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-Resource::property_const_iterator Resource::
-begin_property () const
-{
-return property_.begin ();
-}
+    // ValueMemberType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ValueMemberType::
+    visibility () const
+    {
+      return *visibility_;
+    }
 
-Resource::property_const_iterator Resource::
-end_property () const
-{
-return property_.end ();
-}
+    void ValueMemberType::
+    visibility (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *visibility_ = e;
+    }
 
-void Resource::
-add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-{
-property_.push_back (e);
-}
+    // ValueMemberType
+    // 
+    ::CIAO::Config_Handlers::DataType const& ValueMemberType::
+    type () const
+    {
+      return *type_;
+    }
 
-size_t Resource::
-count_property(void) const
-{
-return property_.size ();
-}
+    void ValueMemberType::
+    type (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *type_ = e;
+    }
 
 
-// Requirement
-//
+    // NamedValue
+    // 
 
-Requirement::
-Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-resourceType_->container (this);
-name_->container (this);
-}
+    NamedValue::
+    NamedValue (::XMLSchema::string< ACE_TCHAR > const& name__,
+                ::CIAO::Config_Handlers::DataValue const& value__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      value_->container (this);
+    }
 
-Requirement::
-Requirement (::CIAO::Config_Handlers::Requirement const& s)
-:
-::XSCRT::Type (),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-regulator__ ()
-{
-resourceType_->container (this);
-name_->container (this);
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    NamedValue::
+    NamedValue (::CIAO::Config_Handlers::NamedValue const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      value_->container (this);
+    }
 
-::CIAO::Config_Handlers::Requirement& Requirement::
-operator= (::CIAO::Config_Handlers::Requirement const& s)
-{
-resourceType (s.resourceType ());
+    ::CIAO::Config_Handlers::NamedValue& NamedValue::
+    operator= (::CIAO::Config_Handlers::NamedValue const& s)
+    {
+      name (s.name ());
 
-name (s.name ());
+      value (s.value ());
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+      return *this;
+    }
 
-return *this;
-}
 
+    // NamedValue
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& NamedValue::
+    name () const
+    {
+      return *name_;
+    }
 
-// Requirement
-//
-::XMLSchema::string< ACE_TCHAR > const& Requirement::
-resourceType () const
-{
-return *resourceType_;
-}
+    void NamedValue::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-void Requirement::
-resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceType_ = e;
-}
+    // NamedValue
+    // 
+    ::CIAO::Config_Handlers::DataValue const& NamedValue::
+    value () const
+    {
+      return *value_;
+    }
 
-// Requirement
-//
-::XMLSchema::string< ACE_TCHAR > const& Requirement::
-name () const
-{
-return *name_;
-}
+    void NamedValue::
+    value (::CIAO::Config_Handlers::DataValue const& e)
+    {
+      *value_ = e;
+    }
 
-void Requirement::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
 
-// Requirement
-//
-Requirement::property_iterator Requirement::
-begin_property ()
-{
-return property_.begin ();
-}
+    // SequenceType
+    // 
 
-Requirement::property_iterator Requirement::
-end_property ()
-{
-return property_.end ();
-}
+    SequenceType::
+    SequenceType (::CIAO::Config_Handlers::DataType const& elementType__)
+    : 
+    ::XSCRT::Type (), 
+    elementType_ (new ::CIAO::Config_Handlers::DataType (elementType__)),
+    regulator__ ()
+    {
+      elementType_->container (this);
+    }
 
-Requirement::property_const_iterator Requirement::
-begin_property () const
-{
-return property_.begin ();
-}
+    SequenceType::
+    SequenceType (::CIAO::Config_Handlers::SequenceType const& s)
+    :
+    ::XSCRT::Type (),
+    bound_ (s.bound_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.bound_) : 0),
+    elementType_ (new ::CIAO::Config_Handlers::DataType (*s.elementType_)),
+    regulator__ ()
+    {
+      if (bound_.get ()) bound_->container (this);
+      elementType_->container (this);
+    }
 
-Requirement::property_const_iterator Requirement::
-end_property () const
-{
-return property_.end ();
-}
+    ::CIAO::Config_Handlers::SequenceType& SequenceType::
+    operator= (::CIAO::Config_Handlers::SequenceType const& s)
+    {
+      if (s.bound_.get ()) bound (*(s.bound_));
+      else bound_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-void Requirement::
-add_property (::CIAO::Config_Handlers::Property const& e)
-{
-property_.push_back (e);
-}
+      elementType (s.elementType ());
 
-size_t Requirement::
-count_property(void) const
-{
-return property_.size ();
-}
+      return *this;
+    }
 
 
-// ResourceDeploymentDescription
-//
+    // SequenceType
+    // 
+    bool SequenceType::
+    bound_p () const
+    {
+      return bound_.get () != 0;
+    }
 
-ResourceDeploymentDescription::
-ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__)
-:
-::XSCRT::Type (),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-regulator__ ()
-{
-requirementName_->container (this);
-resourceName_->container (this);
-}
+    ::XMLSchema::string< ACE_TCHAR > const& SequenceType::
+    bound () const
+    {
+      return *bound_;
+    }
 
-ResourceDeploymentDescription::
-ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-regulator__ ()
-{
-requirementName_->container (this);
-resourceName_->container (this);
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    void SequenceType::
+    bound (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (bound_.get ())
+      {
+        *bound_ = e;
+      }
 
-::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
-operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-{
-requirementName (s.requirementName ());
+      else
+      {
+        bound_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        bound_->container (this);
+      }
+    }
 
-resourceName (s.resourceName ());
+    // SequenceType
+    // 
+    ::CIAO::Config_Handlers::DataType const& SequenceType::
+    elementType () const
+    {
+      return *elementType_;
+    }
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+    void SequenceType::
+    elementType (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *elementType_ = e;
+    }
 
-return *this;
-}
 
+    // Any
+    // 
 
-// ResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-requirementName () const
-{
-return *requirementName_;
-}
+    Any::
+    Any (::CIAO::Config_Handlers::DataType const& type__,
+         ::CIAO::Config_Handlers::DataValue const& value__)
+    : 
+    ::XSCRT::Type (), 
+    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+    value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
+    regulator__ ()
+    {
+      type_->container (this);
+      value_->container (this);
+    }
 
-void ResourceDeploymentDescription::
-requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*requirementName_ = e;
-}
+    Any::
+    Any (::CIAO::Config_Handlers::Any const& s)
+    :
+    ::XSCRT::Type (),
+    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+    value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
+    regulator__ ()
+    {
+      type_->container (this);
+      value_->container (this);
+    }
 
-// ResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-resourceName () const
-{
-return *resourceName_;
-}
+    ::CIAO::Config_Handlers::Any& Any::
+    operator= (::CIAO::Config_Handlers::Any const& s)
+    {
+      type (s.type ());
 
-void ResourceDeploymentDescription::
-resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceName_ = e;
-}
+      value (s.value ());
 
-// ResourceDeploymentDescription
-//
-ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
-begin_property ()
-{
-return property_.begin ();
-}
+      return *this;
+    }
 
-ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
-end_property ()
-{
-return property_.end ();
-}
 
-ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
-begin_property () const
-{
-return property_.begin ();
-}
+    // Any
+    // 
+    ::CIAO::Config_Handlers::DataType const& Any::
+    type () const
+    {
+      return *type_;
+    }
 
-ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
-end_property () const
-{
-return property_.end ();
-}
+    void Any::
+    type (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *type_ = e;
+    }
 
-void ResourceDeploymentDescription::
-add_property (::CIAO::Config_Handlers::Property const& e)
-{
-property_.push_back (e);
-}
+    // Any
+    // 
+    ::CIAO::Config_Handlers::DataValue const& Any::
+    value () const
+    {
+      return *value_;
+    }
 
-size_t ResourceDeploymentDescription::
-count_property(void) const
-{
-return property_.size ();
-}
+    void Any::
+    value (::CIAO::Config_Handlers::DataValue const& e)
+    {
+      *value_ = e;
+    }
 
 
-// ArtifactDeploymentDescription
-//
+    // Property
+    // 
 
-ArtifactDeploymentDescription::
-ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& node__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-regulator__ ()
-{
-name_->container (this);
-node_->container (this);
-}
+    Property::
+    Property (::XMLSchema::string< ACE_TCHAR > const& name__,
+              ::CIAO::Config_Handlers::Any const& value__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    value_ (new ::CIAO::Config_Handlers::Any (value__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      value_->container (this);
+    }
 
-ArtifactDeploymentDescription::
-ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-regulator__ ()
-{
-name_->container (this);
-{
-for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-}
+    Property::
+    Property (::CIAO::Config_Handlers::Property const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      value_->container (this);
+    }
 
-node_->container (this);
-{
-for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-}
+    ::CIAO::Config_Handlers::Property& Property::
+    operator= (::CIAO::Config_Handlers::Property const& s)
+    {
+      name (s.name ());
 
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+      value (s.value ());
 
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      return *this;
+    }
 
-{
-for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-}
 
-if (id_.get ()) id_->container (this);
-}
+    // Property
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Property::
+    name () const
+    {
+      return *name_;
+    }
 
-::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
-operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-{
-name (s.name ());
+    void Property::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-source_.clear ();
-{
-for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-}
+    // Property
+    // 
+    ::CIAO::Config_Handlers::Any const& Property::
+    value () const
+    {
+      return *value_;
+    }
 
-node (s.node ());
+    void Property::
+    value (::CIAO::Config_Handlers::Any const& e)
+    {
+      *value_ = e;
+    }
 
-location_.clear ();
-{
-for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-}
 
-execParameter_.clear ();
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+    // SatisfierPropertyKind
+    // 
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+    SatisfierPropertyKind::Value SatisfierPropertyKind::
+    integral () const
+    {
+      return v_;
+    }
 
-deployedResource_.clear ();
-{
-for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-}
+    bool
+    operator== (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+    {
+      return a.v_ == b.v_;
+    }
 
-if (s.id_.get ()) id (*(s.id_));
-else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    bool
+    operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+    {
+      return a.v_ != b.v_;
+    }
 
-return *this;
-}
+    SatisfierPropertyKind::
+    SatisfierPropertyKind (SatisfierPropertyKind::Value v)
+    : v_ (v)
+    {
+    }
 
+    // SatisfierProperty
+    // 
+
+    SatisfierProperty::
+    SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
+                       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+                       ::XMLSchema::boolean const& dynamic__,
+                       ::CIAO::Config_Handlers::Any const& value__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
+    dynamic_ (new ::XMLSchema::boolean (dynamic__)),
+    value_ (new ::CIAO::Config_Handlers::Any (value__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      kind_->container (this);
+      dynamic_->container (this);
+      value_->container (this);
+    }
 
-// ArtifactDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-name () const
-{
-return *name_;
-}
+    SatisfierProperty::
+    SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
+    dynamic_ (new ::XMLSchema::boolean (*s.dynamic_)),
+    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      kind_->container (this);
+      dynamic_->container (this);
+      value_->container (this);
+    }
 
-void ArtifactDeploymentDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    ::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
+    operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
+    {
+      name (s.name ());
 
-// ArtifactDeploymentDescription
-//
-ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-begin_source ()
-{
-return source_.begin ();
-}
+      kind (s.kind ());
 
-ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-end_source ()
-{
-return source_.end ();
-}
+      dynamic (s.dynamic ());
 
-ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-begin_source () const
-{
-return source_.begin ();
-}
+      value (s.value ());
 
-ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-end_source () const
-{
-return source_.end ();
-}
+      return *this;
+    }
 
-void ArtifactDeploymentDescription::
-add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-source_.push_back (e);
-}
 
-size_t ArtifactDeploymentDescription::
-count_source(void) const
-{
-return source_.size ();
-}
+    // SatisfierProperty
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
+    name () const
+    {
+      return *name_;
+    }
 
-// ArtifactDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-node () const
-{
-return *node_;
-}
+    void SatisfierProperty::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-void ArtifactDeploymentDescription::
-node (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*node_ = e;
-}
+    // SatisfierProperty
+    // 
+    ::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
+    kind () const
+    {
+      return *kind_;
+    }
 
-// ArtifactDeploymentDescription
-//
-ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-begin_location ()
-{
-return location_.begin ();
-}
+    void SatisfierProperty::
+    kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
+    {
+      *kind_ = e;
+    }
 
-ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-end_location ()
-{
-return location_.end ();
-}
+    // SatisfierProperty
+    // 
+    ::XMLSchema::boolean const& SatisfierProperty::
+    dynamic () const
+    {
+      return *dynamic_;
+    }
 
-ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-begin_location () const
-{
-return location_.begin ();
-}
+    void SatisfierProperty::
+    dynamic (::XMLSchema::boolean const& e)
+    {
+      *dynamic_ = e;
+    }
 
-ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-end_location () const
-{
-return location_.end ();
-}
+    // SatisfierProperty
+    // 
+    ::CIAO::Config_Handlers::Any const& SatisfierProperty::
+    value () const
+    {
+      return *value_;
+    }
 
-void ArtifactDeploymentDescription::
-add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-location_.push_back (e);
-}
+    void SatisfierProperty::
+    value (::CIAO::Config_Handlers::Any const& e)
+    {
+      *value_ = e;
+    }
 
-size_t ArtifactDeploymentDescription::
-count_location(void) const
-{
-return location_.size ();
-}
 
-// ArtifactDeploymentDescription
-//
-ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-begin_execParameter ()
-{
-return execParameter_.begin ();
-}
+    // Resource
+    // 
 
-ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-end_execParameter ()
-{
-return execParameter_.end ();
-}
+    Resource::
+    Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-begin_execParameter () const
-{
-return execParameter_.begin ();
-}
+    Resource::
+    Resource (::CIAO::Config_Handlers::Resource const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      {
+        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+      }
 
-ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-end_execParameter () const
-{
-return execParameter_.end ();
-}
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-void ArtifactDeploymentDescription::
-add_execParameter (::CIAO::Config_Handlers::Property const& e)
-{
-execParameter_.push_back (e);
-}
+    ::CIAO::Config_Handlers::Resource& Resource::
+    operator= (::CIAO::Config_Handlers::Resource const& s)
+    {
+      name (s.name ());
 
-size_t ArtifactDeploymentDescription::
-count_execParameter(void) const
-{
-return execParameter_.size ();
-}
+      resourceType_.clear ();
+      {
+        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+      }
 
-// ArtifactDeploymentDescription
-//
-ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
-ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+      return *this;
+    }
 
-ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
 
-ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    // Resource
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Resource::
+    name () const
+    {
+      return *name_;
+    }
 
-void ArtifactDeploymentDescription::
-add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-{
-deployRequirement_.push_back (e);
-}
+    void Resource::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-size_t ArtifactDeploymentDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    // Resource
+    // 
+    Resource::resourceType_iterator Resource::
+    begin_resourceType ()
+    {
+      return resourceType_.begin ();
+    }
 
-// ArtifactDeploymentDescription
-//
-ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-begin_deployedResource ()
-{
-return deployedResource_.begin ();
-}
+    Resource::resourceType_iterator Resource::
+    end_resourceType ()
+    {
+      return resourceType_.end ();
+    }
 
-ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-end_deployedResource ()
-{
-return deployedResource_.end ();
-}
+    Resource::resourceType_const_iterator Resource::
+    begin_resourceType () const
+    {
+      return resourceType_.begin ();
+    }
 
-ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-begin_deployedResource () const
-{
-return deployedResource_.begin ();
-}
+    Resource::resourceType_const_iterator Resource::
+    end_resourceType () const
+    {
+      return resourceType_.end ();
+    }
 
-ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-end_deployedResource () const
-{
-return deployedResource_.end ();
-}
+    void Resource::
+    add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      resourceType_.push_back (e);
+    }
 
-void ArtifactDeploymentDescription::
-add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
-{
-deployedResource_.push_back (e);
-}
+    size_t Resource::
+    count_resourceType(void) const
+    {
+      return resourceType_.size ();
+    }
 
-size_t ArtifactDeploymentDescription::
-count_deployedResource(void) const
-{
-return deployedResource_.size ();
-}
+    // Resource
+    // 
+    Resource::property_iterator Resource::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-// ArtifactDeploymentDescription
-//
-bool ArtifactDeploymentDescription::
-id_p () const
-{
-return id_.get () != 0;
-}
+    Resource::property_iterator Resource::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
-::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
-id () const
-{
-return *id_;
-}
+    Resource::property_const_iterator Resource::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
-id ()
-{
-return *id_;
-}
+    Resource::property_const_iterator Resource::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
-void ArtifactDeploymentDescription::
-id (::XMLSchema::ID< ACE_TCHAR > const& e)
-{
-if (id_.get ())
-{
-*id_ = e;
-}
+    void Resource::
+    add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+    {
+      property_.push_back (e);
+    }
 
-else
-{
-id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-id_->container (this);
-}
-}
+    size_t Resource::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
 
-// MonolithicDeploymentDescription
-//
+    // Requirement
+    // 
 
-MonolithicDeploymentDescription::
-MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    Requirement::
+    Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                 ::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      resourceType_->container (this);
+      name_->container (this);
+    }
 
-MonolithicDeploymentDescription::
-MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-regulator__ ()
-{
-name_->container (this);
-{
-for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-}
+    Requirement::
+    Requirement (::CIAO::Config_Handlers::Requirement const& s)
+    :
+    ::XSCRT::Type (),
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    regulator__ ()
+    {
+      resourceType_->container (this);
+      name_->container (this);
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-{
-for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
-}
+    ::CIAO::Config_Handlers::Requirement& Requirement::
+    operator= (::CIAO::Config_Handlers::Requirement const& s)
+    {
+      resourceType (s.resourceType ());
 
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+      name (s.name ());
 
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
-if (id_.get ()) id_->container (this);
-}
+      return *this;
+    }
 
-::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
-operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-{
-name (s.name ());
 
-source_.clear ();
-{
-for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-}
+    // Requirement
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
+    resourceType () const
+    {
+      return *resourceType_;
+    }
 
-artifact_.clear ();
-{
-for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
-}
+    void Requirement::
+    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceType_ = e;
+    }
 
-execParameter_.clear ();
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+    // Requirement
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
+    name () const
+    {
+      return *name_;
+    }
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+    void Requirement::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-if (s.id_.get ()) id (*(s.id_));
-else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    // Requirement
+    // 
+    Requirement::property_iterator Requirement::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-return *this;
-}
+    Requirement::property_iterator Requirement::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
+    Requirement::property_const_iterator Requirement::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-// MonolithicDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
-name () const
-{
-return *name_;
-}
+    Requirement::property_const_iterator Requirement::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
-void MonolithicDeploymentDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void Requirement::
+    add_property (::CIAO::Config_Handlers::Property const& e)
+    {
+      property_.push_back (e);
+    }
 
-// MonolithicDeploymentDescription
-//
-MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-begin_source ()
-{
-return source_.begin ();
-}
+    size_t Requirement::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
-MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-end_source ()
-{
-return source_.end ();
-}
 
-MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-begin_source () const
-{
-return source_.begin ();
-}
+    // ResourceDeploymentDescription
+    // 
 
-MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-end_source () const
-{
-return source_.end ();
-}
+    ResourceDeploymentDescription::
+    ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                   ::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+    : 
+    ::XSCRT::Type (), 
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+    regulator__ ()
+    {
+      requirementName_->container (this);
+      resourceName_->container (this);
+    }
 
-void MonolithicDeploymentDescription::
-add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-source_.push_back (e);
-}
+    ResourceDeploymentDescription::
+    ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+    regulator__ ()
+    {
+      requirementName_->container (this);
+      resourceName_->container (this);
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-size_t MonolithicDeploymentDescription::
-count_source(void) const
-{
-return source_.size ();
-}
+    ::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
+    {
+      requirementName (s.requirementName ());
 
-// MonolithicDeploymentDescription
-//
-MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-begin_artifact ()
-{
-return artifact_.begin ();
-}
+      resourceName (s.resourceName ());
 
-MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-end_artifact ()
-{
-return artifact_.end ();
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
-MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-begin_artifact () const
-{
-return artifact_.begin ();
-}
+      return *this;
+    }
 
-MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-end_artifact () const
-{
-return artifact_.end ();
-}
 
-void MonolithicDeploymentDescription::
-add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-{
-artifact_.push_back (e);
-}
+    // ResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+    requirementName () const
+    {
+      return *requirementName_;
+    }
 
-size_t MonolithicDeploymentDescription::
-count_artifact(void) const
-{
-return artifact_.size ();
-}
+    void ResourceDeploymentDescription::
+    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *requirementName_ = e;
+    }
 
-// MonolithicDeploymentDescription
-//
-MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-begin_execParameter ()
-{
-return execParameter_.begin ();
-}
+    // ResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+    resourceName () const
+    {
+      return *resourceName_;
+    }
 
-MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-end_execParameter ()
-{
-return execParameter_.end ();
-}
+    void ResourceDeploymentDescription::
+    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceName_ = e;
+    }
 
-MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-begin_execParameter () const
-{
-return execParameter_.begin ();
-}
+    // ResourceDeploymentDescription
+    // 
+    ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-end_execParameter () const
-{
-return execParameter_.end ();
-}
+    ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
-void MonolithicDeploymentDescription::
-add_execParameter (::CIAO::Config_Handlers::Property const& e)
-{
-execParameter_.push_back (e);
-}
+    ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-size_t MonolithicDeploymentDescription::
-count_execParameter(void) const
-{
-return execParameter_.size ();
-}
+    ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
-// MonolithicDeploymentDescription
-//
-MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+    void ResourceDeploymentDescription::
+    add_property (::CIAO::Config_Handlers::Property const& e)
+    {
+      property_.push_back (e);
+    }
 
-MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+    size_t ResourceDeploymentDescription::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
-MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
 
-MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    // ArtifactDeploymentDescription
+    // 
 
-void MonolithicDeploymentDescription::
-add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-{
-deployRequirement_.push_back (e);
-}
+    ArtifactDeploymentDescription::
+    ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                   ::XMLSchema::string< ACE_TCHAR > const& node__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      node_->container (this);
+    }
 
-size_t MonolithicDeploymentDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    ArtifactDeploymentDescription::
+    ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      {
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+      }
 
-// MonolithicDeploymentDescription
-//
-bool MonolithicDeploymentDescription::
-id_p () const
-{
-return id_.get () != 0;
-}
+      node_->container (this);
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
 
-::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
-id () const
-{
-return *id_;
-}
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
 
-::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
-id ()
-{
-return *id_;
-}
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-void MonolithicDeploymentDescription::
-id (::XMLSchema::ID< ACE_TCHAR > const& e)
-{
-if (id_.get ())
-{
-*id_ = e;
-}
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
-else
-{
-id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-id_->container (this);
-}
-}
+      if (id_.get ()) id_->container (this);
+    }
 
+    ::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
+    {
+      name (s.name ());
 
-// ResourceUsageKind
-//
+      source_.clear ();
+      {
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+      }
 
-ResourceUsageKind::Value ResourceUsageKind::
-integral () const
-{
-return v_;
-}
+      node (s.node ());
 
-bool
-operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-{
-return a.v_ == b.v_;
-}
+      location_.clear ();
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
 
-bool
-operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-{
-return a.v_ != b.v_;
-}
+      execParameter_.clear ();
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
 
-ResourceUsageKind::
-ResourceUsageKind (ResourceUsageKind::Value v)
-: v_ (v)
-{
-}
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-// InstanceResourceDeploymentDescription
-//
-
-InstanceResourceDeploymentDescription::
-InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__)
-:
-::XSCRT::Type (),
-resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-regulator__ ()
-{
-resourceUsage_->container (this);
-requirementName_->container (this);
-resourceName_->container (this);
-}
+      deployedResource_.clear ();
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
-InstanceResourceDeploymentDescription::
-InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-regulator__ ()
-{
-resourceUsage_->container (this);
-requirementName_->container (this);
-resourceName_->container (this);
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
-operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-{
-resourceUsage (s.resourceUsage ());
+      return *this;
+    }
 
-requirementName (s.requirementName ());
 
-resourceName (s.resourceName ());
+    // ArtifactDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+    void ArtifactDeploymentDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-return *this;
-}
+    // ArtifactDeploymentDescription
+    // 
+    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+    begin_source ()
+    {
+      return source_.begin ();
+    }
 
+    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+    end_source ()
+    {
+      return source_.end ();
+    }
 
-// InstanceResourceDeploymentDescription
-//
-::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
-resourceUsage () const
-{
-return *resourceUsage_;
-}
+    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+    begin_source () const
+    {
+      return source_.begin ();
+    }
 
-void InstanceResourceDeploymentDescription::
-resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-{
-*resourceUsage_ = e;
-}
+    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+    end_source () const
+    {
+      return source_.end ();
+    }
 
-// InstanceResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-requirementName () const
-{
-return *requirementName_;
-}
+    void ArtifactDeploymentDescription::
+    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      source_.push_back (e);
+    }
 
-void InstanceResourceDeploymentDescription::
-requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*requirementName_ = e;
-}
+    size_t ArtifactDeploymentDescription::
+    count_source(void) const
+    {
+      return source_.size ();
+    }
 
-// InstanceResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-resourceName () const
-{
-return *resourceName_;
-}
+    // ArtifactDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+    node () const
+    {
+      return *node_;
+    }
 
-void InstanceResourceDeploymentDescription::
-resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceName_ = e;
-}
+    void ArtifactDeploymentDescription::
+    node (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *node_ = e;
+    }
 
-// InstanceResourceDeploymentDescription
-//
-InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
-begin_property ()
-{
-return property_.begin ();
-}
+    // ArtifactDeploymentDescription
+    // 
+    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+    begin_location ()
+    {
+      return location_.begin ();
+    }
 
-InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
-end_property ()
-{
-return property_.end ();
-}
+    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+    end_location ()
+    {
+      return location_.end ();
+    }
 
-InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
-begin_property () const
-{
-return property_.begin ();
-}
+    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+    begin_location () const
+    {
+      return location_.begin ();
+    }
 
-InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
-end_property () const
-{
-return property_.end ();
-}
+    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+    end_location () const
+    {
+      return location_.end ();
+    }
 
-void InstanceResourceDeploymentDescription::
-add_property (::CIAO::Config_Handlers::Property const& e)
-{
-property_.push_back (e);
-}
+    void ArtifactDeploymentDescription::
+    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      location_.push_back (e);
+    }
 
-size_t InstanceResourceDeploymentDescription::
-count_property(void) const
-{
-return property_.size ();
-}
+    size_t ArtifactDeploymentDescription::
+    count_location(void) const
+    {
+      return location_.size ();
+    }
 
+    // ArtifactDeploymentDescription
+    // 
+    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+    begin_execParameter ()
+    {
+      return execParameter_.begin ();
+    }
 
-// InstanceDeploymentDescription
-//
-
-InstanceDeploymentDescription::
-InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& node__,
-::XMLSchema::string< ACE_TCHAR > const& source__,
-::XMLSchema::IDREF< ACE_TCHAR > const& implementation__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
-implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (implementation__)),
-regulator__ ()
-{
-name_->container (this);
-node_->container (this);
-source_->container (this);
-implementation_->container (this);
-}
+    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+    end_execParameter ()
+    {
+      return execParameter_.end ();
+    }
 
-InstanceDeploymentDescription::
-InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
-implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
-deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedResource_) : 0),
-deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
-id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-regulator__ ()
-{
-name_->container (this);
-node_->container (this);
-source_->container (this);
-implementation_->container (this);
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
+    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+    begin_execParameter () const
+    {
+      return execParameter_.begin ();
+    }
 
-if (deployedResource_.get ()) deployedResource_->container (this);
-if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
-if (id_.get ()) id_->container (this);
-}
+    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+    end_execParameter () const
+    {
+      return execParameter_.end ();
+    }
 
-::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
-operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-{
-name (s.name ());
+    void ArtifactDeploymentDescription::
+    add_execParameter (::CIAO::Config_Handlers::Property const& e)
+    {
+      execParameter_.push_back (e);
+    }
 
-node (s.node ());
+    size_t ArtifactDeploymentDescription::
+    count_execParameter(void) const
+    {
+      return execParameter_.size ();
+    }
 
-source (s.source ());
+    // ArtifactDeploymentDescription
+    // 
+    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
 
-implementation (s.implementation ());
+    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
 
-configProperty_.clear ();
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
+    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
 
-if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
 
-if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
-else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+    void ArtifactDeploymentDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
 
-if (s.id_.get ()) id (*(s.id_));
-else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    size_t ArtifactDeploymentDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
 
-return *this;
-}
+    // ArtifactDeploymentDescription
+    // 
+    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+    begin_deployedResource ()
+    {
+      return deployedResource_.begin ();
+    }
 
+    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+    end_deployedResource ()
+    {
+      return deployedResource_.end ();
+    }
 
-// InstanceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-name () const
-{
-return *name_;
-}
+    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+    begin_deployedResource () const
+    {
+      return deployedResource_.begin ();
+    }
 
-void InstanceDeploymentDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+    end_deployedResource () const
+    {
+      return deployedResource_.end ();
+    }
 
-// InstanceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-node () const
-{
-return *node_;
-}
+    void ArtifactDeploymentDescription::
+    add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
+    {
+      deployedResource_.push_back (e);
+    }
 
-void InstanceDeploymentDescription::
-node (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*node_ = e;
-}
+    size_t ArtifactDeploymentDescription::
+    count_deployedResource(void) const
+    {
+      return deployedResource_.size ();
+    }
 
-// InstanceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-source () const
-{
-return *source_;
-}
+    // ArtifactDeploymentDescription
+    // 
+    bool ArtifactDeploymentDescription::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
-void InstanceDeploymentDescription::
-source (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*source_ = e;
-}
+    ::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
+    id () const
+    {
+      return *id_;
+    }
 
-// InstanceDeploymentDescription
-//
-::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
-implementation () const
-{
-return *implementation_;
-}
+    ::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
+    id ()
+    {
+      return *id_;
+    }
 
-void InstanceDeploymentDescription::
-implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-{
-*implementation_ = e;
-}
+    void ArtifactDeploymentDescription::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
+      {
+        *id_ = e;
+      }
 
-// InstanceDeploymentDescription
-//
-InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-begin_configProperty ()
-{
-return configProperty_.begin ();
-}
+      else
+      {
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
+      }
+    }
 
-InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-end_configProperty ()
-{
-return configProperty_.end ();
-}
 
-InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-begin_configProperty () const
-{
-return configProperty_.begin ();
-}
+    // MonolithicDeploymentDescription
+    // 
 
-InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-end_configProperty () const
-{
-return configProperty_.end ();
-}
+    MonolithicDeploymentDescription::
+    MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-void InstanceDeploymentDescription::
-add_configProperty (::CIAO::Config_Handlers::Property const& e)
-{
-configProperty_.push_back (e);
-}
+    MonolithicDeploymentDescription::
+    MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      {
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+      }
 
-size_t InstanceDeploymentDescription::
-count_configProperty(void) const
-{
-return configProperty_.size ();
-}
+      {
+        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+      }
 
-// InstanceDeploymentDescription
-//
-bool InstanceDeploymentDescription::
-deployedResource_p () const
-{
-return deployedResource_.get () != 0;
-}
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
 
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-deployedResource () const
-{
-return *deployedResource_;
-}
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-void InstanceDeploymentDescription::
-deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-{
-if (deployedResource_.get ())
-{
-*deployedResource_ = e;
-}
+      if (id_.get ()) id_->container (this);
+    }
 
-else
-{
-deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-deployedResource_->container (this);
-}
-}
+    ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
+    {
+      name (s.name ());
 
-// InstanceDeploymentDescription
-//
-bool InstanceDeploymentDescription::
-deployedSharedResource_p () const
-{
-return deployedSharedResource_.get () != 0;
-}
+      source_.clear ();
+      {
+        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+      }
 
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-deployedSharedResource () const
-{
-return *deployedSharedResource_;
-}
+      artifact_.clear ();
+      {
+        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+      }
 
-void InstanceDeploymentDescription::
-deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-{
-if (deployedSharedResource_.get ())
-{
-*deployedSharedResource_ = e;
-}
+      execParameter_.clear ();
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
 
-else
-{
-deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-deployedSharedResource_->container (this);
-}
-}
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-// InstanceDeploymentDescription
-//
-bool InstanceDeploymentDescription::
-id_p () const
-{
-return id_.get () != 0;
-}
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
-id () const
-{
-return *id_;
-}
+      return *this;
+    }
 
-::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
-id ()
-{
-return *id_;
-}
 
-void InstanceDeploymentDescription::
-id (::XMLSchema::ID< ACE_TCHAR > const& e)
-{
-if (id_.get ())
-{
-*id_ = e;
-}
+    // MonolithicDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-else
-{
-id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-id_->container (this);
-}
-}
+    void MonolithicDeploymentDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
+    // MonolithicDeploymentDescription
+    // 
+    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+    begin_source ()
+    {
+      return source_.begin ();
+    }
 
-// CCMComponentPortKind
-//
+    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+    end_source ()
+    {
+      return source_.end ();
+    }
 
-CCMComponentPortKind::Value CCMComponentPortKind::
-integral () const
-{
-return v_;
-}
+    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+    begin_source () const
+    {
+      return source_.begin ();
+    }
 
-bool
-operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-{
-return a.v_ == b.v_;
-}
+    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+    end_source () const
+    {
+      return source_.end ();
+    }
 
-bool
-operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-{
-return a.v_ != b.v_;
-}
+    void MonolithicDeploymentDescription::
+    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      source_.push_back (e);
+    }
 
-CCMComponentPortKind::
-CCMComponentPortKind (CCMComponentPortKind::Value v)
-: v_ (v)
-{
-}
+    size_t MonolithicDeploymentDescription::
+    count_source(void) const
+    {
+      return source_.size ();
+    }
 
-// ComponentPortDescription
-//
-
-ComponentPortDescription::
-ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::boolean const& provider__,
-::XMLSchema::boolean const& exclusiveProvider__,
-::XMLSchema::boolean const& exclusiveUser__,
-::XMLSchema::boolean const& optional__,
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-provider_ (new ::XMLSchema::boolean (provider__)),
-exclusiveProvider_ (new ::XMLSchema::boolean (exclusiveProvider__)),
-exclusiveUser_ (new ::XMLSchema::boolean (exclusiveUser__)),
-optional_ (new ::XMLSchema::boolean (optional__)),
-kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-regulator__ ()
-{
-name_->container (this);
-provider_->container (this);
-exclusiveProvider_->container (this);
-exclusiveUser_->container (this);
-optional_->container (this);
-kind_->container (this);
-}
+    // MonolithicDeploymentDescription
+    // 
+    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+    begin_artifact ()
+    {
+      return artifact_.begin ();
+    }
 
-ComponentPortDescription::
-ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
-provider_ (new ::XMLSchema::boolean (*s.provider_)),
-exclusiveProvider_ (new ::XMLSchema::boolean (*s.exclusiveProvider_)),
-exclusiveUser_ (new ::XMLSchema::boolean (*s.exclusiveUser_)),
-optional_ (new ::XMLSchema::boolean (*s.optional_)),
-kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-regulator__ ()
-{
-name_->container (this);
-if (specificType_.get ()) specificType_->container (this);
-{
-for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
-}
+    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+    end_artifact ()
+    {
+      return artifact_.end ();
+    }
 
-provider_->container (this);
-exclusiveProvider_->container (this);
-exclusiveUser_->container (this);
-optional_->container (this);
-kind_->container (this);
-}
+    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+    begin_artifact () const
+    {
+      return artifact_.begin ();
+    }
 
-::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
-operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-{
-name (s.name ());
+    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+    end_artifact () const
+    {
+      return artifact_.end ();
+    }
 
-if (s.specificType_.get ()) specificType (*(s.specificType_));
-else specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    void MonolithicDeploymentDescription::
+    add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      artifact_.push_back (e);
+    }
 
-supportedType_.clear ();
-{
-for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
-}
+    size_t MonolithicDeploymentDescription::
+    count_artifact(void) const
+    {
+      return artifact_.size ();
+    }
 
-provider (s.provider ());
+    // MonolithicDeploymentDescription
+    // 
+    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+    begin_execParameter ()
+    {
+      return execParameter_.begin ();
+    }
 
-exclusiveProvider (s.exclusiveProvider ());
+    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+    end_execParameter ()
+    {
+      return execParameter_.end ();
+    }
 
-exclusiveUser (s.exclusiveUser ());
+    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+    begin_execParameter () const
+    {
+      return execParameter_.begin ();
+    }
 
-optional (s.optional ());
+    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+    end_execParameter () const
+    {
+      return execParameter_.end ();
+    }
 
-kind (s.kind ());
+    void MonolithicDeploymentDescription::
+    add_execParameter (::CIAO::Config_Handlers::Property const& e)
+    {
+      execParameter_.push_back (e);
+    }
 
-return *this;
-}
+    size_t MonolithicDeploymentDescription::
+    count_execParameter(void) const
+    {
+      return execParameter_.size ();
+    }
 
+    // MonolithicDeploymentDescription
+    // 
+    MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
 
-// ComponentPortDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-name () const
-{
-return *name_;
-}
+    MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
 
-void ComponentPortDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
 
-// ComponentPortDescription
-//
-bool ComponentPortDescription::
-specificType_p () const
-{
-return specificType_.get () != 0;
-}
+    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-specificType () const
-{
-return *specificType_;
-}
+    void MonolithicDeploymentDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
 
-void ComponentPortDescription::
-specificType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (specificType_.get ())
-{
-*specificType_ = e;
-}
+    size_t MonolithicDeploymentDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
 
-else
-{
-specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-specificType_->container (this);
-}
-}
+    // MonolithicDeploymentDescription
+    // 
+    bool MonolithicDeploymentDescription::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
-// ComponentPortDescription
-//
-ComponentPortDescription::supportedType_iterator ComponentPortDescription::
-begin_supportedType ()
-{
-return supportedType_.begin ();
-}
+    ::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
+    id () const
+    {
+      return *id_;
+    }
 
-ComponentPortDescription::supportedType_iterator ComponentPortDescription::
-end_supportedType ()
-{
-return supportedType_.end ();
-}
+    ::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
+    id ()
+    {
+      return *id_;
+    }
 
-ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
-begin_supportedType () const
-{
-return supportedType_.begin ();
-}
+    void MonolithicDeploymentDescription::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
+      {
+        *id_ = e;
+      }
 
-ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
-end_supportedType () const
-{
-return supportedType_.end ();
-}
+      else
+      {
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
+      }
+    }
 
-void ComponentPortDescription::
-add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-supportedType_.push_back (e);
-}
 
-size_t ComponentPortDescription::
-count_supportedType(void) const
-{
-return supportedType_.size ();
-}
+    // ResourceUsageKind
+    // 
 
-// ComponentPortDescription
-//
-::XMLSchema::boolean const& ComponentPortDescription::
-provider () const
-{
-return *provider_;
-}
+    ResourceUsageKind::Value ResourceUsageKind::
+    integral () const
+    {
+      return v_;
+    }
 
-void ComponentPortDescription::
-provider (::XMLSchema::boolean const& e)
-{
-*provider_ = e;
-}
+    bool
+    operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+    {
+      return a.v_ == b.v_;
+    }
 
-// ComponentPortDescription
-//
-::XMLSchema::boolean const& ComponentPortDescription::
-exclusiveProvider () const
-{
-return *exclusiveProvider_;
-}
+    bool
+    operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+    {
+      return a.v_ != b.v_;
+    }
 
-void ComponentPortDescription::
-exclusiveProvider (::XMLSchema::boolean const& e)
-{
-*exclusiveProvider_ = e;
-}
+    ResourceUsageKind::
+    ResourceUsageKind (ResourceUsageKind::Value v)
+    : v_ (v)
+    {
+    }
 
-// ComponentPortDescription
-//
-::XMLSchema::boolean const& ComponentPortDescription::
-exclusiveUser () const
-{
-return *exclusiveUser_;
-}
+    // InstanceResourceDeploymentDescription
+    // 
+
+    InstanceResourceDeploymentDescription::
+    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
+                                           ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                           ::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+    : 
+    ::XSCRT::Type (), 
+    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+    regulator__ ()
+    {
+      resourceUsage_->container (this);
+      requirementName_->container (this);
+      resourceName_->container (this);
+    }
 
-void ComponentPortDescription::
-exclusiveUser (::XMLSchema::boolean const& e)
-{
-*exclusiveUser_ = e;
-}
+    InstanceResourceDeploymentDescription::
+    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+    regulator__ ()
+    {
+      resourceUsage_->container (this);
+      requirementName_->container (this);
+      resourceName_->container (this);
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-// ComponentPortDescription
-//
-::XMLSchema::boolean const& ComponentPortDescription::
-optional () const
-{
-return *optional_;
-}
+    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
+    {
+      resourceUsage (s.resourceUsage ());
 
-void ComponentPortDescription::
-optional (::XMLSchema::boolean const& e)
-{
-*optional_ = e;
-}
+      requirementName (s.requirementName ());
 
-// ComponentPortDescription
-//
-::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
-kind () const
-{
-return *kind_;
-}
+      resourceName (s.resourceName ());
 
-void ComponentPortDescription::
-kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-{
-*kind_ = e;
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
+      return *this;
+    }
 
-// ComponentPropertyDescription
-//
 
-ComponentPropertyDescription::
-ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::DataType const& type__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-type_ (new ::CIAO::Config_Handlers::DataType (type__)),
-regulator__ ()
-{
-name_->container (this);
-type_->container (this);
-}
+    // InstanceResourceDeploymentDescription
+    // 
+    ::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
+    resourceUsage () const
+    {
+      return *resourceUsage_;
+    }
 
-ComponentPropertyDescription::
-ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-regulator__ ()
-{
-name_->container (this);
-type_->container (this);
-}
+    void InstanceResourceDeploymentDescription::
+    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+    {
+      *resourceUsage_ = e;
+    }
 
-::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
-operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-{
-name (s.name ());
+    // InstanceResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+    requirementName () const
+    {
+      return *requirementName_;
+    }
 
-type (s.type ());
+    void InstanceResourceDeploymentDescription::
+    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *requirementName_ = e;
+    }
 
-return *this;
-}
+    // InstanceResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+    resourceName () const
+    {
+      return *resourceName_;
+    }
 
+    void InstanceResourceDeploymentDescription::
+    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceName_ = e;
+    }
 
-// ComponentPropertyDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
-name () const
-{
-return *name_;
-}
+    // InstanceResourceDeploymentDescription
+    // 
+    InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-void ComponentPropertyDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
-// ComponentPropertyDescription
-//
-::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
-type () const
-{
-return *type_;
-}
+    InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-void ComponentPropertyDescription::
-type (::CIAO::Config_Handlers::DataType const& e)
-{
-*type_ = e;
-}
+    InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
+    void InstanceResourceDeploymentDescription::
+    add_property (::CIAO::Config_Handlers::Property const& e)
+    {
+      property_.push_back (e);
+    }
 
-// ComponentExternalPortEndpoint
-//
+    size_t InstanceResourceDeploymentDescription::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
-ComponentExternalPortEndpoint::
-ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-regulator__ ()
-{
-portName_->container (this);
-}
 
-ComponentExternalPortEndpoint::
-ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-regulator__ ()
-{
-portName_->container (this);
-}
+    // InstanceDeploymentDescription
+    // 
+
+    InstanceDeploymentDescription::
+    InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                   ::XMLSchema::string< ACE_TCHAR > const& node__,
+                                   ::XMLSchema::string< ACE_TCHAR > const& source__,
+                                   ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
+    source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
+    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (implementation__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      node_->container (this);
+      source_->container (this);
+      implementation_->container (this);
+    }
 
-::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
-operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-{
-portName (s.portName ());
+    InstanceDeploymentDescription::
+    InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
+    source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
+    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
+    deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      node_->container (this);
+      source_->container (this);
+      implementation_->container (this);
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
-return *this;
-}
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
+      if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
+      if (id_.get ()) id_->container (this);
+    }
 
-// ComponentExternalPortEndpoint
-//
-::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
-portName () const
-{
-return *portName_;
-}
+    ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
+    {
+      name (s.name ());
 
-void ComponentExternalPortEndpoint::
-portName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*portName_ = e;
-}
+      node (s.node ());
 
+      source (s.source ());
 
-// PlanSubcomponentPortEndpoint
-//
+      implementation (s.implementation ());
 
-PlanSubcomponentPortEndpoint::
-PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
-regulator__ ()
-{
-portName_->container (this);
-kind_->container (this);
-instance_->container (this);
-}
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
-PlanSubcomponentPortEndpoint::
-PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-provider_ (s.provider_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.provider_) : 0),
-kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
-regulator__ ()
-{
-portName_->container (this);
-if (provider_.get ()) provider_->container (this);
-kind_->container (this);
-instance_->container (this);
-}
+      deployedResource_.clear ();
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
-::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
-operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-{
-portName (s.portName ());
+      if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
+      else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-if (s.provider_.get ()) provider (*(s.provider_));
-else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.id_.get ()) id (*(s.id_));
+      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-kind (s.kind ());
+      return *this;
+    }
 
-instance (s.instance ());
 
-return *this;
-}
+    // InstanceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+    name () const
+    {
+      return *name_;
+    }
 
+    void InstanceDeploymentDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// PlanSubcomponentPortEndpoint
-//
-::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-portName () const
-{
-return *portName_;
-}
+    // InstanceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+    node () const
+    {
+      return *node_;
+    }
 
-void PlanSubcomponentPortEndpoint::
-portName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*portName_ = e;
-}
+    void InstanceDeploymentDescription::
+    node (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *node_ = e;
+    }
 
-// PlanSubcomponentPortEndpoint
-//
-bool PlanSubcomponentPortEndpoint::
-provider_p () const
-{
-return provider_.get () != 0;
-}
+    // InstanceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+    source () const
+    {
+      return *source_;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-provider () const
-{
-return *provider_;
-}
+    void InstanceDeploymentDescription::
+    source (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *source_ = e;
+    }
 
-void PlanSubcomponentPortEndpoint::
-provider (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (provider_.get ())
-{
-*provider_ = e;
-}
+    // InstanceDeploymentDescription
+    // 
+    ::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
+    implementation () const
+    {
+      return *implementation_;
+    }
 
-else
-{
-provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-provider_->container (this);
-}
-}
+    void InstanceDeploymentDescription::
+    implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      *implementation_ = e;
+    }
 
-// PlanSubcomponentPortEndpoint
-//
-::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
-kind () const
-{
-return *kind_;
-}
+    // InstanceDeploymentDescription
+    // 
+    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
 
-void PlanSubcomponentPortEndpoint::
-kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-{
-*kind_ = e;
-}
+    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
 
-// PlanSubcomponentPortEndpoint
-//
-::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-instance () const
-{
-return *instance_;
-}
+    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
 
-void PlanSubcomponentPortEndpoint::
-instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-{
-*instance_ = e;
-}
+    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
 
+    void InstanceDeploymentDescription::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
 
-// ExternalReferenceEndpoint
-//
+    size_t InstanceDeploymentDescription::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
 
-ExternalReferenceEndpoint::
-ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
-:
-::XSCRT::Type (),
-location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
-regulator__ ()
-{
-location_->container (this);
-}
+    // InstanceDeploymentDescription
+    // 
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
+    begin_deployedResource ()
+    {
+      return deployedResource_.begin ();
+    }
 
-ExternalReferenceEndpoint::
-ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-:
-::XSCRT::Type (),
-location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
-regulator__ ()
-{
-location_->container (this);
-}
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
+    end_deployedResource ()
+    {
+      return deployedResource_.end ();
+    }
 
-::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
-operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-{
-location (s.location ());
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
+    begin_deployedResource () const
+    {
+      return deployedResource_.begin ();
+    }
 
-return *this;
-}
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
+    end_deployedResource () const
+    {
+      return deployedResource_.end ();
+    }
 
+    void InstanceDeploymentDescription::
+    add_deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+    {
+      deployedResource_.push_back (e);
+    }
 
-// ExternalReferenceEndpoint
-//
-::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
-location () const
-{
-return *location_;
-}
+    size_t InstanceDeploymentDescription::
+    count_deployedResource(void) const
+    {
+      return deployedResource_.size ();
+    }
 
-void ExternalReferenceEndpoint::
-location (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*location_ = e;
-}
+    // InstanceDeploymentDescription
+    // 
+    bool InstanceDeploymentDescription::
+    deployedSharedResource_p () const
+    {
+      return deployedSharedResource_.get () != 0;
+    }
 
+    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
+    deployedSharedResource () const
+    {
+      return *deployedSharedResource_;
+    }
 
-// ConnectionResourceDeploymentDescription
-//
+    void InstanceDeploymentDescription::
+    deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+    {
+      if (deployedSharedResource_.get ())
+      {
+        *deployedSharedResource_ = e;
+      }
 
-ConnectionResourceDeploymentDescription::
-ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__)
-:
-::XSCRT::Type (),
-targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-regulator__ ()
-{
-targetName_->container (this);
-requirementName_->container (this);
-resourceName_->container (this);
-}
+      else
+      {
+        deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
+        deployedSharedResource_->container (this);
+      }
+    }
 
-ConnectionResourceDeploymentDescription::
-ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-:
-::XSCRT::Type (),
-targetName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.targetName_)),
-requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-regulator__ ()
-{
-targetName_->container (this);
-requirementName_->container (this);
-resourceName_->container (this);
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    // InstanceDeploymentDescription
+    // 
+    bool InstanceDeploymentDescription::
+    id_p () const
+    {
+      return id_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
-operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-{
-targetName (s.targetName ());
+    ::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
+    id () const
+    {
+      return *id_;
+    }
 
-requirementName (s.requirementName ());
+    ::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
+    id ()
+    {
+      return *id_;
+    }
 
-resourceName (s.resourceName ());
+    void InstanceDeploymentDescription::
+    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    {
+      if (id_.get ())
+      {
+        *id_ = e;
+      }
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+      else
+      {
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
+      }
+    }
 
-return *this;
-}
 
+    // CCMComponentPortKind
+    // 
 
-// ConnectionResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-targetName () const
-{
-return *targetName_;
-}
+    CCMComponentPortKind::Value CCMComponentPortKind::
+    integral () const
+    {
+      return v_;
+    }
 
-void ConnectionResourceDeploymentDescription::
-targetName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*targetName_ = e;
-}
+    bool
+    operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+    {
+      return a.v_ == b.v_;
+    }
 
-// ConnectionResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-requirementName () const
-{
-return *requirementName_;
-}
+    bool
+    operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+    {
+      return a.v_ != b.v_;
+    }
 
-void ConnectionResourceDeploymentDescription::
-requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*requirementName_ = e;
-}
+    CCMComponentPortKind::
+    CCMComponentPortKind (CCMComponentPortKind::Value v)
+    : v_ (v)
+    {
+    }
 
-// ConnectionResourceDeploymentDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-resourceName () const
-{
-return *resourceName_;
-}
+    // ComponentPortDescription
+    // 
+
+    ComponentPortDescription::
+    ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                              ::XMLSchema::boolean const& provider__,
+                              ::XMLSchema::boolean const& exclusiveProvider__,
+                              ::XMLSchema::boolean const& exclusiveUser__,
+                              ::XMLSchema::boolean const& optional__,
+                              ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    provider_ (new ::XMLSchema::boolean (provider__)),
+    exclusiveProvider_ (new ::XMLSchema::boolean (exclusiveProvider__)),
+    exclusiveUser_ (new ::XMLSchema::boolean (exclusiveUser__)),
+    optional_ (new ::XMLSchema::boolean (optional__)),
+    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      provider_->container (this);
+      exclusiveProvider_->container (this);
+      exclusiveUser_->container (this);
+      optional_->container (this);
+      kind_->container (this);
+    }
 
-void ConnectionResourceDeploymentDescription::
-resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceName_ = e;
-}
+    ComponentPortDescription::
+    ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
+    provider_ (new ::XMLSchema::boolean (*s.provider_)),
+    exclusiveProvider_ (new ::XMLSchema::boolean (*s.exclusiveProvider_)),
+    exclusiveUser_ (new ::XMLSchema::boolean (*s.exclusiveUser_)),
+    optional_ (new ::XMLSchema::boolean (*s.optional_)),
+    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (specificType_.get ()) specificType_->container (this);
+      {
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+      }
 
-// ConnectionResourceDeploymentDescription
-//
-ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
-begin_property ()
-{
-return property_.begin ();
-}
+      provider_->container (this);
+      exclusiveProvider_->container (this);
+      exclusiveUser_->container (this);
+      optional_->container (this);
+      kind_->container (this);
+    }
 
-ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
-end_property ()
-{
-return property_.end ();
-}
+    ::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
+    operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
+    {
+      name (s.name ());
 
-ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
-begin_property () const
-{
-return property_.begin ();
-}
+      if (s.specificType_.get ()) specificType (*(s.specificType_));
+      else specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
-end_property () const
-{
-return property_.end ();
-}
+      supportedType_.clear ();
+      {
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+      }
 
-void ConnectionResourceDeploymentDescription::
-add_property (::CIAO::Config_Handlers::Property const& e)
-{
-property_.push_back (e);
-}
+      provider (s.provider ());
 
-size_t ConnectionResourceDeploymentDescription::
-count_property(void) const
-{
-return property_.size ();
-}
+      exclusiveProvider (s.exclusiveProvider ());
 
+      exclusiveUser (s.exclusiveUser ());
 
-// PlanConnectionDescription
-//
+      optional (s.optional ());
 
-PlanConnectionDescription::
-PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+      kind (s.kind ());
 
-PlanConnectionDescription::
-PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-source_ (s.source_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.source_) : 0),
-regulator__ ()
-{
-name_->container (this);
-if (source_.get ()) source_->container (this);
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      return *this;
+    }
 
-{
-for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-}
 
-{
-for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-}
+    // ComponentPortDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-{
-for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-}
+    void ComponentPortDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-{
-for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-}
-}
+    // ComponentPortDescription
+    // 
+    bool ComponentPortDescription::
+    specificType_p () const
+    {
+      return specificType_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
-operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-{
-name (s.name ());
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+    specificType () const
+    {
+      return *specificType_;
+    }
 
-if (s.source_.get ()) source (*(s.source_));
-else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    void ComponentPortDescription::
+    specificType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (specificType_.get ())
+      {
+        *specificType_ = e;
+      }
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      else
+      {
+        specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        specificType_->container (this);
+      }
+    }
 
-externalEndpoint_.clear ();
-{
-for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-}
+    // ComponentPortDescription
+    // 
+    ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+    begin_supportedType ()
+    {
+      return supportedType_.begin ();
+    }
 
-internalEndpoint_.clear ();
-{
-for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-}
+    ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+    end_supportedType ()
+    {
+      return supportedType_.end ();
+    }
 
-externalReference_.clear ();
-{
-for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-}
+    ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+    begin_supportedType () const
+    {
+      return supportedType_.begin ();
+    }
 
-deployedResource_.clear ();
-{
-for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-}
+    ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+    end_supportedType () const
+    {
+      return supportedType_.end ();
+    }
 
-return *this;
-}
+    void ComponentPortDescription::
+    add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      supportedType_.push_back (e);
+    }
 
+    size_t ComponentPortDescription::
+    count_supportedType(void) const
+    {
+      return supportedType_.size ();
+    }
 
-// PlanConnectionDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-name () const
-{
-return *name_;
-}
+    // ComponentPortDescription
+    // 
+    ::XMLSchema::boolean const& ComponentPortDescription::
+    provider () const
+    {
+      return *provider_;
+    }
 
-void PlanConnectionDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void ComponentPortDescription::
+    provider (::XMLSchema::boolean const& e)
+    {
+      *provider_ = e;
+    }
 
-// PlanConnectionDescription
-//
-bool PlanConnectionDescription::
-source_p () const
-{
-return source_.get () != 0;
-}
+    // ComponentPortDescription
+    // 
+    ::XMLSchema::boolean const& ComponentPortDescription::
+    exclusiveProvider () const
+    {
+      return *exclusiveProvider_;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-source () const
-{
-return *source_;
-}
+    void ComponentPortDescription::
+    exclusiveProvider (::XMLSchema::boolean const& e)
+    {
+      *exclusiveProvider_ = e;
+    }
 
-void PlanConnectionDescription::
-source (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (source_.get ())
-{
-*source_ = e;
-}
+    // ComponentPortDescription
+    // 
+    ::XMLSchema::boolean const& ComponentPortDescription::
+    exclusiveUser () const
+    {
+      return *exclusiveUser_;
+    }
 
-else
-{
-source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-source_->container (this);
-}
-}
+    void ComponentPortDescription::
+    exclusiveUser (::XMLSchema::boolean const& e)
+    {
+      *exclusiveUser_ = e;
+    }
 
-// PlanConnectionDescription
-//
-PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+    // ComponentPortDescription
+    // 
+    ::XMLSchema::boolean const& ComponentPortDescription::
+    optional () const
+    {
+      return *optional_;
+    }
 
-PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+    void ComponentPortDescription::
+    optional (::XMLSchema::boolean const& e)
+    {
+      *optional_ = e;
+    }
 
-PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
+    // ComponentPortDescription
+    // 
+    ::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
+    kind () const
+    {
+      return *kind_;
+    }
 
-PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    void ComponentPortDescription::
+    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+    {
+      *kind_ = e;
+    }
 
-void PlanConnectionDescription::
-add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-{
-deployRequirement_.push_back (e);
-}
 
-size_t PlanConnectionDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    // ComponentPropertyDescription
+    // 
 
-// PlanConnectionDescription
-//
-PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-begin_externalEndpoint ()
-{
-return externalEndpoint_.begin ();
-}
+    ComponentPropertyDescription::
+    ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                  ::CIAO::Config_Handlers::DataType const& type__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
+    }
 
-PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-end_externalEndpoint ()
-{
-return externalEndpoint_.end ();
-}
+    ComponentPropertyDescription::
+    ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      type_->container (this);
+    }
 
-PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-begin_externalEndpoint () const
-{
-return externalEndpoint_.begin ();
-}
+    ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
+    operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
+    {
+      name (s.name ());
 
-PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-end_externalEndpoint () const
-{
-return externalEndpoint_.end ();
-}
+      type (s.type ());
 
-void PlanConnectionDescription::
-add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-{
-externalEndpoint_.push_back (e);
-}
+      return *this;
+    }
 
-size_t PlanConnectionDescription::
-count_externalEndpoint(void) const
-{
-return externalEndpoint_.size ();
-}
 
-// PlanConnectionDescription
-//
-PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-begin_internalEndpoint ()
-{
-return internalEndpoint_.begin ();
-}
+    // ComponentPropertyDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-end_internalEndpoint ()
-{
-return internalEndpoint_.end ();
-}
+    void ComponentPropertyDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-begin_internalEndpoint () const
-{
-return internalEndpoint_.begin ();
-}
+    // ComponentPropertyDescription
+    // 
+    ::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
+    type () const
+    {
+      return *type_;
+    }
 
-PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-end_internalEndpoint () const
-{
-return internalEndpoint_.end ();
-}
+    void ComponentPropertyDescription::
+    type (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *type_ = e;
+    }
 
-void PlanConnectionDescription::
-add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
-{
-internalEndpoint_.push_back (e);
-}
 
-size_t PlanConnectionDescription::
-count_internalEndpoint(void) const
-{
-return internalEndpoint_.size ();
-}
+    // ComponentExternalPortEndpoint
+    // 
 
-// PlanConnectionDescription
-//
-PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-begin_externalReference ()
-{
-return externalReference_.begin ();
-}
+    ComponentExternalPortEndpoint::
+    ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
+    : 
+    ::XSCRT::Type (), 
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+    regulator__ ()
+    {
+      portName_->container (this);
+    }
 
-PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-end_externalReference ()
-{
-return externalReference_.end ();
-}
+    ComponentExternalPortEndpoint::
+    ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+    :
+    ::XSCRT::Type (),
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+    regulator__ ()
+    {
+      portName_->container (this);
+    }
 
-PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-begin_externalReference () const
-{
-return externalReference_.begin ();
-}
+    ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
+    operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+    {
+      portName (s.portName ());
 
-PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-end_externalReference () const
-{
-return externalReference_.end ();
-}
+      return *this;
+    }
 
-void PlanConnectionDescription::
-add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-{
-externalReference_.push_back (e);
-}
 
-size_t PlanConnectionDescription::
-count_externalReference(void) const
-{
-return externalReference_.size ();
-}
+    // ComponentExternalPortEndpoint
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
+    portName () const
+    {
+      return *portName_;
+    }
 
-// PlanConnectionDescription
-//
-PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-begin_deployedResource ()
-{
-return deployedResource_.begin ();
-}
+    void ComponentExternalPortEndpoint::
+    portName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *portName_ = e;
+    }
 
-PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-end_deployedResource ()
-{
-return deployedResource_.end ();
-}
 
-PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-begin_deployedResource () const
-{
-return deployedResource_.begin ();
-}
+    // PlanSubcomponentPortEndpoint
+    // 
 
-PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-end_deployedResource () const
-{
-return deployedResource_.end ();
-}
+    PlanSubcomponentPortEndpoint::
+    PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+                                  ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+                                  ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+    : 
+    ::XSCRT::Type (), 
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    regulator__ ()
+    {
+      portName_->container (this);
+      kind_->container (this);
+      instance_->container (this);
+    }
 
-void PlanConnectionDescription::
-add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
-{
-deployedResource_.push_back (e);
-}
+    PlanSubcomponentPortEndpoint::
+    PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
+    :
+    ::XSCRT::Type (),
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+    provider_ (s.provider_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.provider_) : 0),
+    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    regulator__ ()
+    {
+      portName_->container (this);
+      if (provider_.get ()) provider_->container (this);
+      kind_->container (this);
+      instance_->container (this);
+    }
 
-size_t PlanConnectionDescription::
-count_deployedResource(void) const
-{
-return deployedResource_.size ();
-}
+    ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
+    operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
+    {
+      portName (s.portName ());
 
+      if (s.provider_.get ()) provider (*(s.provider_));
+      else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-// ImplementationDependency
-//
+      kind (s.kind ());
 
-ImplementationDependency::
-ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-:
-::XSCRT::Type (),
-requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-regulator__ ()
-{
-requiredType_->container (this);
-}
+      instance (s.instance ());
 
-ImplementationDependency::
-ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
-:
-::XSCRT::Type (),
-requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-regulator__ ()
-{
-requiredType_->container (this);
-}
+      return *this;
+    }
 
-::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
-operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
-{
-requiredType (s.requiredType ());
 
-return *this;
-}
+    // PlanSubcomponentPortEndpoint
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+    portName () const
+    {
+      return *portName_;
+    }
 
+    void PlanSubcomponentPortEndpoint::
+    portName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *portName_ = e;
+    }
 
-// ImplementationDependency
-//
-::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
-requiredType () const
-{
-return *requiredType_;
-}
+    // PlanSubcomponentPortEndpoint
+    // 
+    bool PlanSubcomponentPortEndpoint::
+    provider_p () const
+    {
+      return provider_.get () != 0;
+    }
 
-void ImplementationDependency::
-requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*requiredType_ = e;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+    provider () const
+    {
+      return *provider_;
+    }
 
+    void PlanSubcomponentPortEndpoint::
+    provider (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (provider_.get ())
+      {
+        *provider_ = e;
+      }
 
-// Capability
-//
+      else
+      {
+        provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        provider_->container (this);
+      }
+    }
 
-Capability::
-Capability (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    // PlanSubcomponentPortEndpoint
+    // 
+    ::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
+    kind () const
+    {
+      return *kind_;
+    }
 
-Capability::
-Capability (::CIAO::Config_Handlers::Capability const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-regulator__ ()
-{
-name_->container (this);
-{
-for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-}
+    void PlanSubcomponentPortEndpoint::
+    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+    {
+      *kind_ = e;
+    }
 
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    // PlanSubcomponentPortEndpoint
+    // 
+    ::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+    instance () const
+    {
+      return *instance_;
+    }
 
-::CIAO::Config_Handlers::Capability& Capability::
-operator= (::CIAO::Config_Handlers::Capability const& s)
-{
-name (s.name ());
+    void PlanSubcomponentPortEndpoint::
+    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      *instance_ = e;
+    }
 
-resourceType_.clear ();
-{
-for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-}
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+    // ExternalReferenceEndpoint
+    // 
 
-return *this;
-}
+    ExternalReferenceEndpoint::
+    ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
+    : 
+    ::XSCRT::Type (), 
+    location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
+    regulator__ ()
+    {
+      location_->container (this);
+    }
 
+    ExternalReferenceEndpoint::
+    ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+    :
+    ::XSCRT::Type (),
+    location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
+    regulator__ ()
+    {
+      location_->container (this);
+    }
 
-// Capability
-//
-::XMLSchema::string< ACE_TCHAR > const& Capability::
-name () const
-{
-return *name_;
-}
+    ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
+    operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+    {
+      location (s.location ());
 
-void Capability::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+      return *this;
+    }
 
-// Capability
-//
-Capability::resourceType_iterator Capability::
-begin_resourceType ()
-{
-return resourceType_.begin ();
-}
 
-Capability::resourceType_iterator Capability::
-end_resourceType ()
-{
-return resourceType_.end ();
-}
+    // ExternalReferenceEndpoint
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
+    location () const
+    {
+      return *location_;
+    }
 
-Capability::resourceType_const_iterator Capability::
-begin_resourceType () const
-{
-return resourceType_.begin ();
-}
+    void ExternalReferenceEndpoint::
+    location (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *location_ = e;
+    }
 
-Capability::resourceType_const_iterator Capability::
-end_resourceType () const
-{
-return resourceType_.end ();
-}
 
-void Capability::
-add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-resourceType_.push_back (e);
-}
+    // ConnectionResourceDeploymentDescription
+    // 
 
-size_t Capability::
-count_resourceType(void) const
-{
-return resourceType_.size ();
-}
+    ConnectionResourceDeploymentDescription::
+    ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
+                                             ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                             ::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+    : 
+    ::XSCRT::Type (), 
+    targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)),
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+    regulator__ ()
+    {
+      targetName_->container (this);
+      requirementName_->container (this);
+      resourceName_->container (this);
+    }
 
-// Capability
-//
-Capability::property_iterator Capability::
-begin_property ()
-{
-return property_.begin ();
-}
+    ConnectionResourceDeploymentDescription::
+    ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
+    :
+    ::XSCRT::Type (),
+    targetName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.targetName_)),
+    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+    regulator__ ()
+    {
+      targetName_->container (this);
+      requirementName_->container (this);
+      resourceName_->container (this);
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-Capability::property_iterator Capability::
-end_property ()
-{
-return property_.end ();
-}
+    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
+    operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
+    {
+      targetName (s.targetName ());
 
-Capability::property_const_iterator Capability::
-begin_property () const
-{
-return property_.begin ();
-}
+      requirementName (s.requirementName ());
 
-Capability::property_const_iterator Capability::
-end_property () const
-{
-return property_.end ();
-}
+      resourceName (s.resourceName ());
 
-void Capability::
-add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-{
-property_.push_back (e);
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
-size_t Capability::
-count_property(void) const
-{
-return property_.size ();
-}
+      return *this;
+    }
 
 
-// ImplementationRequirement
-//
+    // ConnectionResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+    targetName () const
+    {
+      return *targetName_;
+    }
 
-ImplementationRequirement::
-ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-resourceType_->container (this);
-name_->container (this);
-}
+    void ConnectionResourceDeploymentDescription::
+    targetName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *targetName_ = e;
+    }
 
-ImplementationRequirement::
-ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-:
-::XSCRT::Type (),
-resourceUsage_ (s.resourceUsage_.get () ? new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_) : 0),
-resourcePort_ (s.resourcePort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.resourcePort_) : 0),
-componentPort_ (s.componentPort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_) : 0),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-regulator__ ()
-{
-if (resourceUsage_.get ()) resourceUsage_->container (this);
-if (resourcePort_.get ()) resourcePort_->container (this);
-if (componentPort_.get ()) componentPort_->container (this);
-resourceType_->container (this);
-name_->container (this);
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
-}
+    // ConnectionResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+    requirementName () const
+    {
+      return *requirementName_;
+    }
 
-::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
-operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-{
-if (s.resourceUsage_.get ()) resourceUsage (*(s.resourceUsage_));
-else resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (0);
+    void ConnectionResourceDeploymentDescription::
+    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *requirementName_ = e;
+    }
 
-if (s.resourcePort_.get ()) resourcePort (*(s.resourcePort_));
-else resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    // ConnectionResourceDeploymentDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+    resourceName () const
+    {
+      return *resourceName_;
+    }
 
-if (s.componentPort_.get ()) componentPort (*(s.componentPort_));
-else componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    void ConnectionResourceDeploymentDescription::
+    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceName_ = e;
+    }
 
-resourceType (s.resourceType ());
+    // ConnectionResourceDeploymentDescription
+    // 
+    ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-name (s.name ());
+    ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
-property_.clear ();
-{
-for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-}
+    ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-return *this;
-}
+    ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
+    void ConnectionResourceDeploymentDescription::
+    add_property (::CIAO::Config_Handlers::Property const& e)
+    {
+      property_.push_back (e);
+    }
 
-// ImplementationRequirement
-//
-bool ImplementationRequirement::
-resourceUsage_p () const
-{
-return resourceUsage_.get () != 0;
-}
+    size_t ConnectionResourceDeploymentDescription::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
-::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
-resourceUsage () const
-{
-return *resourceUsage_;
-}
 
-void ImplementationRequirement::
-resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-{
-if (resourceUsage_.get ())
-{
-*resourceUsage_ = e;
-}
+    // PlanConnectionDescription
+    // 
 
-else
-{
-resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
-resourceUsage_->container (this);
-}
-}
+    PlanConnectionDescription::
+    PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-// ImplementationRequirement
-//
-bool ImplementationRequirement::
-resourcePort_p () const
-{
-return resourcePort_.get () != 0;
-}
+    PlanConnectionDescription::
+    PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    source_ (s.source_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.source_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (source_.get ()) source_->container (this);
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-resourcePort () const
-{
-return *resourcePort_;
-}
+      {
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+      }
 
-void ImplementationRequirement::
-resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (resourcePort_.get ())
-{
-*resourcePort_ = e;
-}
+      {
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+      }
 
-else
-{
-resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourcePort_->container (this);
-}
-}
+      {
+        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+      }
 
-// ImplementationRequirement
-//
-bool ImplementationRequirement::
-componentPort_p () const
-{
-return componentPort_.get () != 0;
-}
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-componentPort () const
-{
-return *componentPort_;
-}
+    ::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
+    operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
+    {
+      name (s.name ());
 
-void ImplementationRequirement::
-componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (componentPort_.get ())
-{
-*componentPort_ = e;
-}
+      if (s.source_.get ()) source (*(s.source_));
+      else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-else
-{
-componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-componentPort_->container (this);
-}
-}
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-// ImplementationRequirement
-//
-::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-resourceType () const
-{
-return *resourceType_;
-}
+      externalEndpoint_.clear ();
+      {
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+      }
 
-void ImplementationRequirement::
-resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceType_ = e;
-}
+      internalEndpoint_.clear ();
+      {
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+      }
 
-// ImplementationRequirement
-//
-::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-name () const
-{
-return *name_;
-}
+      externalReference_.clear ();
+      {
+        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+      }
 
-void ImplementationRequirement::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+      deployedResource_.clear ();
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
-// ImplementationRequirement
-//
-ImplementationRequirement::property_iterator ImplementationRequirement::
-begin_property ()
-{
-return property_.begin ();
-}
+      return *this;
+    }
 
-ImplementationRequirement::property_iterator ImplementationRequirement::
-end_property ()
-{
-return property_.end ();
-}
 
-ImplementationRequirement::property_const_iterator ImplementationRequirement::
-begin_property () const
-{
-return property_.begin ();
-}
+    // PlanConnectionDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+    name () const
+    {
+      return *name_;
+    }
 
-ImplementationRequirement::property_const_iterator ImplementationRequirement::
-end_property () const
-{
-return property_.end ();
-}
+    void PlanConnectionDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-void ImplementationRequirement::
-add_property (::CIAO::Config_Handlers::Property const& e)
-{
-property_.push_back (e);
-}
+    // PlanConnectionDescription
+    // 
+    bool PlanConnectionDescription::
+    source_p () const
+    {
+      return source_.get () != 0;
+    }
 
-size_t ImplementationRequirement::
-count_property(void) const
-{
-return property_.size ();
-}
+    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+    source () const
+    {
+      return *source_;
+    }
+
+    void PlanConnectionDescription::
+    source (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (source_.get ())
+      {
+        *source_ = e;
+      }
 
+      else
+      {
+        source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        source_->container (this);
+      }
+    }
 
-// ComponentPackageReference
-//
+    // PlanConnectionDescription
+    // 
+    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
 
-ComponentPackageReference::
-ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-:
-::XSCRT::Type (),
-requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-regulator__ ()
-{
-requiredType_->container (this);
-}
+    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
 
-ComponentPackageReference::
-ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-:
-::XSCRT::Type (),
-requiredUUID_ (s.requiredUUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_) : 0),
-requiredName_ (s.requiredName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_) : 0),
-requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-regulator__ ()
-{
-if (requiredUUID_.get ()) requiredUUID_->container (this);
-if (requiredName_.get ()) requiredName_->container (this);
-requiredType_->container (this);
-}
+    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
 
-::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
-operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-{
-if (s.requiredUUID_.get ()) requiredUUID (*(s.requiredUUID_));
-else requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
 
-if (s.requiredName_.get ()) requiredName (*(s.requiredName_));
-else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    void PlanConnectionDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
 
-requiredType (s.requiredType ());
+    size_t PlanConnectionDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
 
-return *this;
-}
+    // PlanConnectionDescription
+    // 
+    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+    begin_externalEndpoint ()
+    {
+      return externalEndpoint_.begin ();
+    }
 
+    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+    end_externalEndpoint ()
+    {
+      return externalEndpoint_.end ();
+    }
 
-// ComponentPackageReference
-//
-bool ComponentPackageReference::
-requiredUUID_p () const
-{
-return requiredUUID_.get () != 0;
-}
+    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+    begin_externalEndpoint () const
+    {
+      return externalEndpoint_.begin ();
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-requiredUUID () const
-{
-return *requiredUUID_;
-}
+    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+    end_externalEndpoint () const
+    {
+      return externalEndpoint_.end ();
+    }
 
-void ComponentPackageReference::
-requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (requiredUUID_.get ())
-{
-*requiredUUID_ = e;
-}
+    void PlanConnectionDescription::
+    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+    {
+      externalEndpoint_.push_back (e);
+    }
 
-else
-{
-requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requiredUUID_->container (this);
-}
-}
+    size_t PlanConnectionDescription::
+    count_externalEndpoint(void) const
+    {
+      return externalEndpoint_.size ();
+    }
 
-// ComponentPackageReference
-//
-bool ComponentPackageReference::
-requiredName_p () const
-{
-return requiredName_.get () != 0;
-}
+    // PlanConnectionDescription
+    // 
+    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+    begin_internalEndpoint ()
+    {
+      return internalEndpoint_.begin ();
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-requiredName () const
-{
-return *requiredName_;
-}
+    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+    end_internalEndpoint ()
+    {
+      return internalEndpoint_.end ();
+    }
 
-void ComponentPackageReference::
-requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (requiredName_.get ())
-{
-*requiredName_ = e;
-}
+    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+    begin_internalEndpoint () const
+    {
+      return internalEndpoint_.begin ();
+    }
 
-else
-{
-requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requiredName_->container (this);
-}
-}
+    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+    end_internalEndpoint () const
+    {
+      return internalEndpoint_.end ();
+    }
 
-// ComponentPackageReference
-//
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-requiredType () const
-{
-return *requiredType_;
-}
+    void PlanConnectionDescription::
+    add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
+    {
+      internalEndpoint_.push_back (e);
+    }
 
-void ComponentPackageReference::
-requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*requiredType_ = e;
-}
+    size_t PlanConnectionDescription::
+    count_internalEndpoint(void) const
+    {
+      return internalEndpoint_.size ();
+    }
 
+    // PlanConnectionDescription
+    // 
+    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+    begin_externalReference ()
+    {
+      return externalReference_.begin ();
+    }
 
-// SubcomponentPortEndpoint
-//
+    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+    end_externalReference ()
+    {
+      return externalReference_.end ();
+    }
 
-SubcomponentPortEndpoint::
-SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
-regulator__ ()
-{
-portName_->container (this);
-instance_->container (this);
-}
+    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+    begin_externalReference () const
+    {
+      return externalReference_.begin ();
+    }
 
-SubcomponentPortEndpoint::
-SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-:
-::XSCRT::Type (),
-portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
-regulator__ ()
-{
-portName_->container (this);
-instance_->container (this);
-}
+    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+    end_externalReference () const
+    {
+      return externalReference_.end ();
+    }
 
-::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
-operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-{
-portName (s.portName ());
+    void PlanConnectionDescription::
+    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+    {
+      externalReference_.push_back (e);
+    }
 
-instance (s.instance ());
+    size_t PlanConnectionDescription::
+    count_externalReference(void) const
+    {
+      return externalReference_.size ();
+    }
 
-return *this;
-}
+    // PlanConnectionDescription
+    // 
+    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+    begin_deployedResource ()
+    {
+      return deployedResource_.begin ();
+    }
 
+    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+    end_deployedResource ()
+    {
+      return deployedResource_.end ();
+    }
 
-// SubcomponentPortEndpoint
-//
-::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
-portName () const
-{
-return *portName_;
-}
+    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+    begin_deployedResource () const
+    {
+      return deployedResource_.begin ();
+    }
 
-void SubcomponentPortEndpoint::
-portName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*portName_ = e;
-}
+    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+    end_deployedResource () const
+    {
+      return deployedResource_.end ();
+    }
 
-// SubcomponentPortEndpoint
-//
-::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
-instance () const
-{
-return *instance_;
-}
+    void PlanConnectionDescription::
+    add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
+    {
+      deployedResource_.push_back (e);
+    }
 
-void SubcomponentPortEndpoint::
-instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-{
-*instance_ = e;
-}
+    size_t PlanConnectionDescription::
+    count_deployedResource(void) const
+    {
+      return deployedResource_.size ();
+    }
 
 
-// AssemblyConnectionDescription
-//
+    // ImplementationDependency
+    // 
 
-AssemblyConnectionDescription::
-AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    ImplementationDependency::
+    ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+    : 
+    ::XSCRT::Type (), 
+    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+    regulator__ ()
+    {
+      requiredType_->container (this);
+    }
 
-AssemblyConnectionDescription::
-AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-regulator__ ()
-{
-name_->container (this);
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+    ImplementationDependency::
+    ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
+    :
+    ::XSCRT::Type (),
+    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
+    regulator__ ()
+    {
+      requiredType_->container (this);
+    }
 
-{
-for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-}
+    ::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
+    operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
+    {
+      requiredType (s.requiredType ());
 
-{
-for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-}
+      return *this;
+    }
 
-{
-for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-}
-}
 
-::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
-operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-{
-name (s.name ());
+    // ImplementationDependency
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
+    requiredType () const
+    {
+      return *requiredType_;
+    }
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+    void ImplementationDependency::
+    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *requiredType_ = e;
+    }
 
-internalEndpoint_.clear ();
-{
-for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-}
 
-externalEndpoint_.clear ();
-{
-for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-}
+    // Capability
+    // 
 
-externalReference_.clear ();
-{
-for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-}
+    Capability::
+    Capability (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-return *this;
-}
+    Capability::
+    Capability (::CIAO::Config_Handlers::Capability const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      {
+        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+      }
 
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-// AssemblyConnectionDescription
-//
-::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
-name () const
-{
-return *name_;
-}
+    ::CIAO::Config_Handlers::Capability& Capability::
+    operator= (::CIAO::Config_Handlers::Capability const& s)
+    {
+      name (s.name ());
 
-void AssemblyConnectionDescription::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+      resourceType_.clear ();
+      {
+        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+      }
 
-// AssemblyConnectionDescription
-//
-AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
 
-AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+      return *this;
+    }
 
-AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
 
-AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    // Capability
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Capability::
+    name () const
+    {
+      return *name_;
+    }
 
-void AssemblyConnectionDescription::
-add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-{
-deployRequirement_.push_back (e);
-}
+    void Capability::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-size_t AssemblyConnectionDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    // Capability
+    // 
+    Capability::resourceType_iterator Capability::
+    begin_resourceType ()
+    {
+      return resourceType_.begin ();
+    }
 
-// AssemblyConnectionDescription
-//
-AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-begin_internalEndpoint ()
-{
-return internalEndpoint_.begin ();
-}
+    Capability::resourceType_iterator Capability::
+    end_resourceType ()
+    {
+      return resourceType_.end ();
+    }
 
-AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-end_internalEndpoint ()
-{
-return internalEndpoint_.end ();
-}
+    Capability::resourceType_const_iterator Capability::
+    begin_resourceType () const
+    {
+      return resourceType_.begin ();
+    }
 
-AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-begin_internalEndpoint () const
-{
-return internalEndpoint_.begin ();
-}
+    Capability::resourceType_const_iterator Capability::
+    end_resourceType () const
+    {
+      return resourceType_.end ();
+    }
 
-AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-end_internalEndpoint () const
-{
-return internalEndpoint_.end ();
-}
+    void Capability::
+    add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      resourceType_.push_back (e);
+    }
 
-void AssemblyConnectionDescription::
-add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
-{
-internalEndpoint_.push_back (e);
-}
+    size_t Capability::
+    count_resourceType(void) const
+    {
+      return resourceType_.size ();
+    }
 
-size_t AssemblyConnectionDescription::
-count_internalEndpoint(void) const
-{
-return internalEndpoint_.size ();
-}
+    // Capability
+    // 
+    Capability::property_iterator Capability::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
 
-// AssemblyConnectionDescription
-//
-AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-begin_externalEndpoint ()
-{
-return externalEndpoint_.begin ();
-}
+    Capability::property_iterator Capability::
+    end_property ()
+    {
+      return property_.end ();
+    }
 
-AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-end_externalEndpoint ()
-{
-return externalEndpoint_.end ();
-}
+    Capability::property_const_iterator Capability::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
 
-AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-begin_externalEndpoint () const
-{
-return externalEndpoint_.begin ();
-}
+    Capability::property_const_iterator Capability::
+    end_property () const
+    {
+      return property_.end ();
+    }
 
-AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-end_externalEndpoint () const
-{
-return externalEndpoint_.end ();
-}
+    void Capability::
+    add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+    {
+      property_.push_back (e);
+    }
 
-void AssemblyConnectionDescription::
-add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-{
-externalEndpoint_.push_back (e);
-}
+    size_t Capability::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
 
-size_t AssemblyConnectionDescription::
-count_externalEndpoint(void) const
-{
-return externalEndpoint_.size ();
-}
 
-// AssemblyConnectionDescription
-//
-AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-begin_externalReference ()
-{
-return externalReference_.begin ();
-}
+    // ImplementationRequirement
+    // 
 
-AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-end_externalReference ()
-{
-return externalReference_.end ();
-}
+    ImplementationRequirement::
+    ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                               ::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      resourceType_->container (this);
+      name_->container (this);
+    }
 
-AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-begin_externalReference () const
-{
-return externalReference_.begin ();
-}
+    ImplementationRequirement::
+    ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
+    :
+    ::XSCRT::Type (),
+    resourceUsage_ (s.resourceUsage_.get () ? new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_) : 0),
+    resourcePort_ (s.resourcePort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.resourcePort_) : 0),
+    componentPort_ (s.componentPort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_) : 0),
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    regulator__ ()
+    {
+      if (resourceUsage_.get ()) resourceUsage_->container (this);
+      if (resourcePort_.get ()) resourcePort_->container (this);
+      if (componentPort_.get ()) componentPort_->container (this);
+      resourceType_->container (this);
+      name_->container (this);
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+    }
 
-AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-end_externalReference () const
-{
-return externalReference_.end ();
-}
+    ::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
+    operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
+    {
+      if (s.resourceUsage_.get ()) resourceUsage (*(s.resourceUsage_));
+      else resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (0);
 
-void AssemblyConnectionDescription::
-add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-{
-externalReference_.push_back (e);
-}
+      if (s.resourcePort_.get ()) resourcePort (*(s.resourcePort_));
+      else resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-size_t AssemblyConnectionDescription::
-count_externalReference(void) const
-{
-return externalReference_.size ();
-}
-}
+      if (s.componentPort_.get ()) componentPort (*(s.componentPort_));
+      else componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      resourceType (s.resourceType ());
+
+      name (s.name ());
+
+      property_.clear ();
+      {
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+      }
+
+      return *this;
+    }
+
+
+    // ImplementationRequirement
+    // 
+    bool ImplementationRequirement::
+    resourceUsage_p () const
+    {
+      return resourceUsage_.get () != 0;
+    }
+
+    ::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
+    resourceUsage () const
+    {
+      return *resourceUsage_;
+    }
+
+    void ImplementationRequirement::
+    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+    {
+      if (resourceUsage_.get ())
+      {
+        *resourceUsage_ = e;
+      }
+
+      else
+      {
+        resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+        resourceUsage_->container (this);
+      }
+    }
+
+    // ImplementationRequirement
+    // 
+    bool ImplementationRequirement::
+    resourcePort_p () const
+    {
+      return resourcePort_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+    resourcePort () const
+    {
+      return *resourcePort_;
+    }
+
+    void ImplementationRequirement::
+    resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (resourcePort_.get ())
+      {
+        *resourcePort_ = e;
+      }
+
+      else
+      {
+        resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        resourcePort_->container (this);
+      }
+    }
+
+    // ImplementationRequirement
+    // 
+    bool ImplementationRequirement::
+    componentPort_p () const
+    {
+      return componentPort_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+    componentPort () const
+    {
+      return *componentPort_;
+    }
+
+    void ImplementationRequirement::
+    componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (componentPort_.get ())
+      {
+        *componentPort_ = e;
+      }
+
+      else
+      {
+        componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        componentPort_->container (this);
+      }
+    }
+
+    // ImplementationRequirement
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+    resourceType () const
+    {
+      return *resourceType_;
+    }
+
+    void ImplementationRequirement::
+    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceType_ = e;
+    }
+
+    // ImplementationRequirement
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+    name () const
+    {
+      return *name_;
+    }
+
+    void ImplementationRequirement::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
+
+    // ImplementationRequirement
+    // 
+    ImplementationRequirement::property_iterator ImplementationRequirement::
+    begin_property ()
+    {
+      return property_.begin ();
+    }
+
+    ImplementationRequirement::property_iterator ImplementationRequirement::
+    end_property ()
+    {
+      return property_.end ();
+    }
+
+    ImplementationRequirement::property_const_iterator ImplementationRequirement::
+    begin_property () const
+    {
+      return property_.begin ();
+    }
+
+    ImplementationRequirement::property_const_iterator ImplementationRequirement::
+    end_property () const
+    {
+      return property_.end ();
+    }
+
+    void ImplementationRequirement::
+    add_property (::CIAO::Config_Handlers::Property const& e)
+    {
+      property_.push_back (e);
+    }
+
+    size_t ImplementationRequirement::
+    count_property(void) const
+    {
+      return property_.size ();
+    }
+
+
+    // ComponentPackageReference
+    // 
+
+    ComponentPackageReference::
+    ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+    : 
+    ::XSCRT::Type (), 
+    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+    regulator__ ()
+    {
+      requiredType_->container (this);
+    }
+
+    ComponentPackageReference::
+    ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+    :
+    ::XSCRT::Type (),
+    requiredUUID_ (s.requiredUUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_) : 0),
+    requiredName_ (s.requiredName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_) : 0),
+    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
+    regulator__ ()
+    {
+      if (requiredUUID_.get ()) requiredUUID_->container (this);
+      if (requiredName_.get ()) requiredName_->container (this);
+      requiredType_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
+    operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+    {
+      if (s.requiredUUID_.get ()) requiredUUID (*(s.requiredUUID_));
+      else requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      if (s.requiredName_.get ()) requiredName (*(s.requiredName_));
+      else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      requiredType (s.requiredType ());
+
+      return *this;
+    }
+
+
+    // ComponentPackageReference
+    // 
+    bool ComponentPackageReference::
+    requiredUUID_p () const
+    {
+      return requiredUUID_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+    requiredUUID () const
+    {
+      return *requiredUUID_;
+    }
+
+    void ComponentPackageReference::
+    requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (requiredUUID_.get ())
+      {
+        *requiredUUID_ = e;
+      }
+
+      else
+      {
+        requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        requiredUUID_->container (this);
+      }
+    }
+
+    // ComponentPackageReference
+    // 
+    bool ComponentPackageReference::
+    requiredName_p () const
+    {
+      return requiredName_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+    requiredName () const
+    {
+      return *requiredName_;
+    }
+
+    void ComponentPackageReference::
+    requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (requiredName_.get ())
+      {
+        *requiredName_ = e;
+      }
+
+      else
+      {
+        requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        requiredName_->container (this);
+      }
+    }
+
+    // ComponentPackageReference
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+    requiredType () const
+    {
+      return *requiredType_;
+    }
+
+    void ComponentPackageReference::
+    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *requiredType_ = e;
+    }
+
+
+    // SubcomponentPortEndpoint
+    // 
+
+    SubcomponentPortEndpoint::
+    SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+                              ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+    : 
+    ::XSCRT::Type (), 
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    regulator__ ()
+    {
+      portName_->container (this);
+      instance_->container (this);
+    }
+
+    SubcomponentPortEndpoint::
+    SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
+    :
+    ::XSCRT::Type (),
+    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    regulator__ ()
+    {
+      portName_->container (this);
+      instance_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
+    operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
+    {
+      portName (s.portName ());
+
+      instance (s.instance ());
+
+      return *this;
+    }
+
+
+    // SubcomponentPortEndpoint
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
+    portName () const
+    {
+      return *portName_;
+    }
+
+    void SubcomponentPortEndpoint::
+    portName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *portName_ = e;
+    }
+
+    // SubcomponentPortEndpoint
+    // 
+    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
+    instance () const
+    {
+      return *instance_;
+    }
+
+    void SubcomponentPortEndpoint::
+    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      *instance_ = e;
+    }
+
+
+    // AssemblyConnectionDescription
+    // 
+
+    AssemblyConnectionDescription::
+    AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
+
+    AssemblyConnectionDescription::
+    AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
+
+      {
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+      }
+
+      {
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+      }
+
+      {
+        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+      }
+    }
+
+    ::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
+    operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
+    {
+      name (s.name ());
+
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
+
+      internalEndpoint_.clear ();
+      {
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+      }
+
+      externalEndpoint_.clear ();
+      {
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+      }
+
+      externalReference_.clear ();
+      {
+        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+      }
+
+      return *this;
+    }
+
+
+    // AssemblyConnectionDescription
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
+    name () const
+    {
+      return *name_;
+    }
+
+    void AssemblyConnectionDescription::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
+
+    // AssemblyConnectionDescription
+    // 
+    AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
+
+    AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
+
+    AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
+
+    AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
+
+    void AssemblyConnectionDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
+
+    size_t AssemblyConnectionDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
+
+    // AssemblyConnectionDescription
+    // 
+    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+    begin_internalEndpoint ()
+    {
+      return internalEndpoint_.begin ();
+    }
+
+    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+    end_internalEndpoint ()
+    {
+      return internalEndpoint_.end ();
+    }
+
+    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+    begin_internalEndpoint () const
+    {
+      return internalEndpoint_.begin ();
+    }
+
+    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+    end_internalEndpoint () const
+    {
+      return internalEndpoint_.end ();
+    }
+
+    void AssemblyConnectionDescription::
+    add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
+    {
+      internalEndpoint_.push_back (e);
+    }
+
+    size_t AssemblyConnectionDescription::
+    count_internalEndpoint(void) const
+    {
+      return internalEndpoint_.size ();
+    }
+
+    // AssemblyConnectionDescription
+    // 
+    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+    begin_externalEndpoint ()
+    {
+      return externalEndpoint_.begin ();
+    }
+
+    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+    end_externalEndpoint ()
+    {
+      return externalEndpoint_.end ();
+    }
+
+    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+    begin_externalEndpoint () const
+    {
+      return externalEndpoint_.begin ();
+    }
+
+    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+    end_externalEndpoint () const
+    {
+      return externalEndpoint_.end ();
+    }
+
+    void AssemblyConnectionDescription::
+    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+    {
+      externalEndpoint_.push_back (e);
+    }
+
+    size_t AssemblyConnectionDescription::
+    count_externalEndpoint(void) const
+    {
+      return externalEndpoint_.size ();
+    }
+
+    // AssemblyConnectionDescription
+    // 
+    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+    begin_externalReference ()
+    {
+      return externalReference_.begin ();
+    }
+
+    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+    end_externalReference ()
+    {
+      return externalReference_.end ();
+    }
+
+    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+    begin_externalReference () const
+    {
+      return externalReference_.begin ();
+    }
+
+    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+    end_externalReference () const
+    {
+      return externalReference_.end ();
+    }
+
+    void AssemblyConnectionDescription::
+    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+    {
+      externalReference_.push_back (e);
+    }
+
+    size_t AssemblyConnectionDescription::
+    count_externalReference(void) const
+    {
+      return externalReference_.size ();
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-// TCKind
-//
+  namespace Config_Handlers
+  {
+    // TCKind
+    //
 
-TCKind::
-TCKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-: ::XSCRT::Type (e)
-{
-::std::basic_string< ACE_TCHAR > v (e.value ());
-
-if (v == "tk_null") v_ = tk_null_l;
-else if (v == "tk_void") v_ = tk_void_l;
-else if (v == "tk_short") v_ = tk_short_l;
-else if (v == "tk_long") v_ = tk_long_l;
-else if (v == "tk_ushort") v_ = tk_ushort_l;
-else if (v == "tk_ulong") v_ = tk_ulong_l;
-else if (v == "tk_float") v_ = tk_float_l;
-else if (v == "tk_double") v_ = tk_double_l;
-else if (v == "tk_boolean") v_ = tk_boolean_l;
-else if (v == "tk_char") v_ = tk_char_l;
-else if (v == "tk_octet") v_ = tk_octet_l;
-else if (v == "tk_any") v_ = tk_any_l;
-else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
-else if (v == "tk_Principal") v_ = tk_Principal_l;
-else if (v == "tk_objref") v_ = tk_objref_l;
-else if (v == "tk_struct") v_ = tk_struct_l;
-else if (v == "tk_union") v_ = tk_union_l;
-else if (v == "tk_enum") v_ = tk_enum_l;
-else if (v == "tk_string") v_ = tk_string_l;
-else if (v == "tk_sequence") v_ = tk_sequence_l;
-else if (v == "tk_array") v_ = tk_array_l;
-else if (v == "tk_alias") v_ = tk_alias_l;
-else if (v == "tk_except") v_ = tk_except_l;
-else if (v == "tk_longlong") v_ = tk_longlong_l;
-else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
-else if (v == "tk_longdouble") v_ = tk_longdouble_l;
-else if (v == "tk_wchar") v_ = tk_wchar_l;
-else if (v == "tk_wstring") v_ = tk_wstring_l;
-else if (v == "tk_wfixed") v_ = tk_wfixed_l;
-else if (v == "tk_value") v_ = tk_value_l;
-else if (v == "tk_value_box") v_ = tk_value_box_l;
-else if (v == "tk_native") v_ = tk_native_l;
-else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
-else if (v == "tk_local_interface") v_ = tk_local_interface_l;
-else if (v == "tk_component") v_ = tk_component_l;
-else if (v == "tk_home") v_ = tk_home_l;
-else if (v == "tk_event") v_ = tk_event_l;
-else
-{
-}
-}
+    TCKind::
+    TCKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "tk_null") v_ = tk_null_l;
+      else if (v == "tk_void") v_ = tk_void_l;
+      else if (v == "tk_short") v_ = tk_short_l;
+      else if (v == "tk_long") v_ = tk_long_l;
+      else if (v == "tk_ushort") v_ = tk_ushort_l;
+      else if (v == "tk_ulong") v_ = tk_ulong_l;
+      else if (v == "tk_float") v_ = tk_float_l;
+      else if (v == "tk_double") v_ = tk_double_l;
+      else if (v == "tk_boolean") v_ = tk_boolean_l;
+      else if (v == "tk_char") v_ = tk_char_l;
+      else if (v == "tk_octet") v_ = tk_octet_l;
+      else if (v == "tk_any") v_ = tk_any_l;
+      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+      else if (v == "tk_Principal") v_ = tk_Principal_l;
+      else if (v == "tk_objref") v_ = tk_objref_l;
+      else if (v == "tk_struct") v_ = tk_struct_l;
+      else if (v == "tk_union") v_ = tk_union_l;
+      else if (v == "tk_enum") v_ = tk_enum_l;
+      else if (v == "tk_string") v_ = tk_string_l;
+      else if (v == "tk_sequence") v_ = tk_sequence_l;
+      else if (v == "tk_array") v_ = tk_array_l;
+      else if (v == "tk_alias") v_ = tk_alias_l;
+      else if (v == "tk_except") v_ = tk_except_l;
+      else if (v == "tk_longlong") v_ = tk_longlong_l;
+      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+      else if (v == "tk_wchar") v_ = tk_wchar_l;
+      else if (v == "tk_wstring") v_ = tk_wstring_l;
+      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+      else if (v == "tk_value") v_ = tk_value_l;
+      else if (v == "tk_value_box") v_ = tk_value_box_l;
+      else if (v == "tk_native") v_ = tk_native_l;
+      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+      else if (v == "tk_component") v_ = tk_component_l;
+      else if (v == "tk_home") v_ = tk_home_l;
+      else if (v == "tk_event") v_ = tk_event_l;
+      else 
+      {
+      }
+    }
 
-TCKind::
-TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-: ::XSCRT::Type (a)
-{
-::std::basic_string< ACE_TCHAR > v (a.value ());
-
-if (v == "tk_null") v_ = tk_null_l;
-else if (v == "tk_void") v_ = tk_void_l;
-else if (v == "tk_short") v_ = tk_short_l;
-else if (v == "tk_long") v_ = tk_long_l;
-else if (v == "tk_ushort") v_ = tk_ushort_l;
-else if (v == "tk_ulong") v_ = tk_ulong_l;
-else if (v == "tk_float") v_ = tk_float_l;
-else if (v == "tk_double") v_ = tk_double_l;
-else if (v == "tk_boolean") v_ = tk_boolean_l;
-else if (v == "tk_char") v_ = tk_char_l;
-else if (v == "tk_octet") v_ = tk_octet_l;
-else if (v == "tk_any") v_ = tk_any_l;
-else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
-else if (v == "tk_Principal") v_ = tk_Principal_l;
-else if (v == "tk_objref") v_ = tk_objref_l;
-else if (v == "tk_struct") v_ = tk_struct_l;
-else if (v == "tk_union") v_ = tk_union_l;
-else if (v == "tk_enum") v_ = tk_enum_l;
-else if (v == "tk_string") v_ = tk_string_l;
-else if (v == "tk_sequence") v_ = tk_sequence_l;
-else if (v == "tk_array") v_ = tk_array_l;
-else if (v == "tk_alias") v_ = tk_alias_l;
-else if (v == "tk_except") v_ = tk_except_l;
-else if (v == "tk_longlong") v_ = tk_longlong_l;
-else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
-else if (v == "tk_longdouble") v_ = tk_longdouble_l;
-else if (v == "tk_wchar") v_ = tk_wchar_l;
-else if (v == "tk_wstring") v_ = tk_wstring_l;
-else if (v == "tk_wfixed") v_ = tk_wfixed_l;
-else if (v == "tk_value") v_ = tk_value_l;
-else if (v == "tk_value_box") v_ = tk_value_box_l;
-else if (v == "tk_native") v_ = tk_native_l;
-else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
-else if (v == "tk_local_interface") v_ = tk_local_interface_l;
-else if (v == "tk_component") v_ = tk_component_l;
-else if (v == "tk_home") v_ = tk_home_l;
-else if (v == "tk_event") v_ = tk_event_l;
-else
-{
-}
-}
+    TCKind::
+    TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "tk_null") v_ = tk_null_l;
+      else if (v == "tk_void") v_ = tk_void_l;
+      else if (v == "tk_short") v_ = tk_short_l;
+      else if (v == "tk_long") v_ = tk_long_l;
+      else if (v == "tk_ushort") v_ = tk_ushort_l;
+      else if (v == "tk_ulong") v_ = tk_ulong_l;
+      else if (v == "tk_float") v_ = tk_float_l;
+      else if (v == "tk_double") v_ = tk_double_l;
+      else if (v == "tk_boolean") v_ = tk_boolean_l;
+      else if (v == "tk_char") v_ = tk_char_l;
+      else if (v == "tk_octet") v_ = tk_octet_l;
+      else if (v == "tk_any") v_ = tk_any_l;
+      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+      else if (v == "tk_Principal") v_ = tk_Principal_l;
+      else if (v == "tk_objref") v_ = tk_objref_l;
+      else if (v == "tk_struct") v_ = tk_struct_l;
+      else if (v == "tk_union") v_ = tk_union_l;
+      else if (v == "tk_enum") v_ = tk_enum_l;
+      else if (v == "tk_string") v_ = tk_string_l;
+      else if (v == "tk_sequence") v_ = tk_sequence_l;
+      else if (v == "tk_array") v_ = tk_array_l;
+      else if (v == "tk_alias") v_ = tk_alias_l;
+      else if (v == "tk_except") v_ = tk_except_l;
+      else if (v == "tk_longlong") v_ = tk_longlong_l;
+      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+      else if (v == "tk_wchar") v_ = tk_wchar_l;
+      else if (v == "tk_wstring") v_ = tk_wstring_l;
+      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+      else if (v == "tk_value") v_ = tk_value_l;
+      else if (v == "tk_value_box") v_ = tk_value_box_l;
+      else if (v == "tk_native") v_ = tk_native_l;
+      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+      else if (v == "tk_component") v_ = tk_component_l;
+      else if (v == "tk_home") v_ = tk_home_l;
+      else if (v == "tk_event") v_ = tk_event_l;
+      else 
+      {
+      }
+    }
 
-TCKind const TCKind::tk_null (TCKind::tk_null_l);
-TCKind const TCKind::tk_void (TCKind::tk_void_l);
-TCKind const TCKind::tk_short (TCKind::tk_short_l);
-TCKind const TCKind::tk_long (TCKind::tk_long_l);
-TCKind const TCKind::tk_ushort (TCKind::tk_ushort_l);
-TCKind const TCKind::tk_ulong (TCKind::tk_ulong_l);
-TCKind const TCKind::tk_float (TCKind::tk_float_l);
-TCKind const TCKind::tk_double (TCKind::tk_double_l);
-TCKind const TCKind::tk_boolean (TCKind::tk_boolean_l);
-TCKind const TCKind::tk_char (TCKind::tk_char_l);
-TCKind const TCKind::tk_octet (TCKind::tk_octet_l);
-TCKind const TCKind::tk_any (TCKind::tk_any_l);
-TCKind const TCKind::tk_TypeCode (TCKind::tk_TypeCode_l);
-TCKind const TCKind::tk_Principal (TCKind::tk_Principal_l);
-TCKind const TCKind::tk_objref (TCKind::tk_objref_l);
-TCKind const TCKind::tk_struct (TCKind::tk_struct_l);
-TCKind const TCKind::tk_union (TCKind::tk_union_l);
-TCKind const TCKind::tk_enum (TCKind::tk_enum_l);
-TCKind const TCKind::tk_string (TCKind::tk_string_l);
-TCKind const TCKind::tk_sequence (TCKind::tk_sequence_l);
-TCKind const TCKind::tk_array (TCKind::tk_array_l);
-TCKind const TCKind::tk_alias (TCKind::tk_alias_l);
-TCKind const TCKind::tk_except (TCKind::tk_except_l);
-TCKind const TCKind::tk_longlong (TCKind::tk_longlong_l);
-TCKind const TCKind::tk_ulonglong (TCKind::tk_ulonglong_l);
-TCKind const TCKind::tk_longdouble (TCKind::tk_longdouble_l);
-TCKind const TCKind::tk_wchar (TCKind::tk_wchar_l);
-TCKind const TCKind::tk_wstring (TCKind::tk_wstring_l);
-TCKind const TCKind::tk_wfixed (TCKind::tk_wfixed_l);
-TCKind const TCKind::tk_value (TCKind::tk_value_l);
-TCKind const TCKind::tk_value_box (TCKind::tk_value_box_l);
-TCKind const TCKind::tk_native (TCKind::tk_native_l);
-TCKind const TCKind::tk_abstract_interface (TCKind::tk_abstract_interface_l);
-TCKind const TCKind::tk_local_interface (TCKind::tk_local_interface_l);
-TCKind const TCKind::tk_component (TCKind::tk_component_l);
-TCKind const TCKind::tk_home (TCKind::tk_home_l);
-TCKind const TCKind::tk_event (TCKind::tk_event_l);
-
-// DataType
-//
-
-DataType::
-DataType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    TCKind const TCKind::tk_null (TCKind::tk_null_l);
+    TCKind const TCKind::tk_void (TCKind::tk_void_l);
+    TCKind const TCKind::tk_short (TCKind::tk_short_l);
+    TCKind const TCKind::tk_long (TCKind::tk_long_l);
+    TCKind const TCKind::tk_ushort (TCKind::tk_ushort_l);
+    TCKind const TCKind::tk_ulong (TCKind::tk_ulong_l);
+    TCKind const TCKind::tk_float (TCKind::tk_float_l);
+    TCKind const TCKind::tk_double (TCKind::tk_double_l);
+    TCKind const TCKind::tk_boolean (TCKind::tk_boolean_l);
+    TCKind const TCKind::tk_char (TCKind::tk_char_l);
+    TCKind const TCKind::tk_octet (TCKind::tk_octet_l);
+    TCKind const TCKind::tk_any (TCKind::tk_any_l);
+    TCKind const TCKind::tk_TypeCode (TCKind::tk_TypeCode_l);
+    TCKind const TCKind::tk_Principal (TCKind::tk_Principal_l);
+    TCKind const TCKind::tk_objref (TCKind::tk_objref_l);
+    TCKind const TCKind::tk_struct (TCKind::tk_struct_l);
+    TCKind const TCKind::tk_union (TCKind::tk_union_l);
+    TCKind const TCKind::tk_enum (TCKind::tk_enum_l);
+    TCKind const TCKind::tk_string (TCKind::tk_string_l);
+    TCKind const TCKind::tk_sequence (TCKind::tk_sequence_l);
+    TCKind const TCKind::tk_array (TCKind::tk_array_l);
+    TCKind const TCKind::tk_alias (TCKind::tk_alias_l);
+    TCKind const TCKind::tk_except (TCKind::tk_except_l);
+    TCKind const TCKind::tk_longlong (TCKind::tk_longlong_l);
+    TCKind const TCKind::tk_ulonglong (TCKind::tk_ulonglong_l);
+    TCKind const TCKind::tk_longdouble (TCKind::tk_longdouble_l);
+    TCKind const TCKind::tk_wchar (TCKind::tk_wchar_l);
+    TCKind const TCKind::tk_wstring (TCKind::tk_wstring_l);
+    TCKind const TCKind::tk_wfixed (TCKind::tk_wfixed_l);
+    TCKind const TCKind::tk_value (TCKind::tk_value_l);
+    TCKind const TCKind::tk_value_box (TCKind::tk_value_box_l);
+    TCKind const TCKind::tk_native (TCKind::tk_native_l);
+    TCKind const TCKind::tk_abstract_interface (TCKind::tk_abstract_interface_l);
+    TCKind const TCKind::tk_local_interface (TCKind::tk_local_interface_l);
+    TCKind const TCKind::tk_component (TCKind::tk_component_l);
+    TCKind const TCKind::tk_home (TCKind::tk_home_l);
+    TCKind const TCKind::tk_event (TCKind::tk_event_l);
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    // DataType
+    //
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    DataType::
+    DataType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-if (n == "kind")
-{
-kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
-kind_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "enum")
-{
-::CIAO::Config_Handlers::EnumType t (e);
-enum_ (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else
-{
-}
-}
-}
+        if (n == "kind")
+        {
+          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
+          kind_->container (this);
+        }
 
-// DataValue
-//
+        else if (n == "enum")
+        {
+          ::CIAO::Config_Handlers::EnumType t (e);
+          enum_ (t);
+        }
 
-DataValue::
-DataValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "struct")
+        {
+          ::CIAO::Config_Handlers::StructType t (e);
+          struct_ (t);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "value")
+        {
+          ::CIAO::Config_Handlers::ValueType t (e);
+          value (t);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "sequence")
+        {
+          ::CIAO::Config_Handlers::SequenceType t (e);
+          sequence (t);
+        }
 
-if (n == "short")
-{
-::XMLSchema::short_ t (e);
-add_short (t);
-}
+        else 
+        {
+        }
+      }
 
-else if (n == "long")
-{
-::XMLSchema::int_ t (e);
-add_long (t);
-}
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
+        {
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
+        }
 
-else if (n == "ushort")
-{
-::XMLSchema::unsignedShort t (e);
-add_ushort (t);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "ulong")
-{
-::XMLSchema::unsignedInt t (e);
-add_ulong (t);
-}
+    // DataValue
+    //
 
-else if (n == "float")
-{
-::XMLSchema::float_ t (e);
-add_float (t);
-}
+    DataValue::
+    DataValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "double")
-{
-::XMLSchema::double_ t (e);
-add_double (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "boolean")
-{
-::XMLSchema::boolean t (e);
-add_boolean (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "octet")
-{
-::XMLSchema::unsignedByte t (e);
-add_octet (t);
-}
+        if (n == "short")
+        {
+          ::XMLSchema::short_ t (e);
+          add_short (t);
+        }
 
-else if (n == "enum")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_enum (t);
-}
+        else if (n == "long")
+        {
+          ::XMLSchema::int_ t (e);
+          add_long (t);
+        }
 
-else if (n == "string")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_string (t);
-}
+        else if (n == "ushort")
+        {
+          ::XMLSchema::unsignedShort t (e);
+          add_ushort (t);
+        }
 
-else if (n == "longlong")
-{
-::XMLSchema::long_ t (e);
-add_longlong (t);
-}
+        else if (n == "ulong")
+        {
+          ::XMLSchema::unsignedInt t (e);
+          add_ulong (t);
+        }
 
-else if (n == "ulonglong")
-{
-::XMLSchema::unsignedLong t (e);
-add_ulonglong (t);
-}
+        else if (n == "float")
+        {
+          ::XMLSchema::float_ t (e);
+          add_float (t);
+        }
 
-else if (n == "longdouble")
-{
-::XMLSchema::double_ t (e);
-add_longdouble (t);
-}
+        else if (n == "double")
+        {
+          ::XMLSchema::double_ t (e);
+          add_double (t);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "boolean")
+        {
+          ::XMLSchema::boolean t (e);
+          add_boolean (t);
+        }
 
-// EnumType
-//
+        else if (n == "octet")
+        {
+          ::XMLSchema::unsignedByte t (e);
+          add_octet (t);
+        }
 
-EnumType::
-EnumType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "enum")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_enum (t);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "string")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_string (t);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "longlong")
+        {
+          ::XMLSchema::long_ t (e);
+          add_longlong (t);
+        }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else if (n == "ulonglong")
+        {
+          ::XMLSchema::unsignedLong t (e);
+          add_ulonglong (t);
+        }
 
-else if (n == "typeId")
-{
-typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-typeId_->container (this);
-}
+        else if (n == "longdouble")
+        {
+          ::XMLSchema::double_ t (e);
+          add_longdouble (t);
+        }
 
-else if (n == "member")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_member (t);
-}
+        else if (n == "member")
+        {
+          ::CIAO::Config_Handlers::NamedValue t (e);
+          add_member (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// Any
-//
+    // EnumType
+    //
 
-Any::
-Any (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    EnumType::
+    EnumType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "type")
-{
-type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-type_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "value")
-{
-value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
-value_->container (this);
-}
+        else if (n == "typeId")
+        {
+          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          typeId_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "member")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_member (t);
+        }
 
-// Property
-//
+        else 
+        {
+        }
+      }
+    }
 
-Property::
-Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    // StructType
+    //
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    StructType::
+    StructType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "value")
-{
-value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-value_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "typeId")
+        {
+          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          typeId_->container (this);
+        }
 
-// SatisfierPropertyKind
-//
+        else if (n == "member")
+        {
+          ::CIAO::Config_Handlers::StructMemberType t (e);
+          add_member (t);
+        }
 
-SatisfierPropertyKind::
-SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-: ::XSCRT::Type (e)
-{
-::std::basic_string< ACE_TCHAR > v (e.value ());
-
-if (v == "Quantity") v_ = Quantity_l;
-else if (v == "Capacity") v_ = Capacity_l;
-else if (v == "Minimum") v_ = Minimum_l;
-else if (v == "Maximum") v_ = Maximum_l;
-else if (v == "Attribute") v_ = Attribute_l;
-else if (v == "Selection") v_ = Selection_l;
-else
-{
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-SatisfierPropertyKind::
-SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-: ::XSCRT::Type (a)
-{
-::std::basic_string< ACE_TCHAR > v (a.value ());
-
-if (v == "Quantity") v_ = Quantity_l;
-else if (v == "Capacity") v_ = Capacity_l;
-else if (v == "Minimum") v_ = Minimum_l;
-else if (v == "Maximum") v_ = Maximum_l;
-else if (v == "Attribute") v_ = Attribute_l;
-else if (v == "Selection") v_ = Selection_l;
-else
-{
-}
-}
+    // StructMemberType
+    //
 
-SatisfierPropertyKind const SatisfierPropertyKind::Quantity (SatisfierPropertyKind::Quantity_l);
-SatisfierPropertyKind const SatisfierPropertyKind::Capacity (SatisfierPropertyKind::Capacity_l);
-SatisfierPropertyKind const SatisfierPropertyKind::Minimum (SatisfierPropertyKind::Minimum_l);
-SatisfierPropertyKind const SatisfierPropertyKind::Maximum (SatisfierPropertyKind::Maximum_l);
-SatisfierPropertyKind const SatisfierPropertyKind::Attribute (SatisfierPropertyKind::Attribute_l);
-SatisfierPropertyKind const SatisfierPropertyKind::Selection (SatisfierPropertyKind::Selection_l);
+    StructMemberType::
+    StructMemberType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-// SatisfierProperty
-//
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-SatisfierProperty::
-SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "type")
+        {
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          type_->container (this);
+        }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "kind")
-{
-kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
-kind_->container (this);
-}
+    // ValueType
+    //
 
-else if (n == "dynamic")
-{
-dynamic_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-dynamic_->container (this);
-}
+    ValueType::
+    ValueType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "value")
-{
-value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-value_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else
-{
-}
-}
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-// Resource
-//
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-Resource::
-Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "typeId")
+        {
+          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          typeId_->container (this);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "modifier")
+        {
+          modifier_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          modifier_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "baseType")
+        {
+          baseType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          baseType_->container (this);
+        }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else if (n == "member")
+        {
+          ::CIAO::Config_Handlers::ValueMemberType t (e);
+          add_member (t);
+        }
 
-else if (n == "resourceType")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_resourceType (t);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::SatisfierProperty t (e);
-add_property (t);
-}
+    // ValueMemberType
+    //
 
-else
-{
-}
-}
-}
+    ValueMemberType::
+    ValueMemberType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-// Requirement
-//
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-Requirement::
-Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "visibility")
+        {
+          visibility_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          visibility_->container (this);
+        }
 
-if (n == "resourceType")
-{
-resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceType_->container (this);
-}
+        else if (n == "type")
+        {
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          type_->container (this);
+        }
 
-else if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_property (t);
-}
+    // NamedValue
+    //
 
-else
-{
-}
-}
-}
+    NamedValue::
+    NamedValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-// ResourceDeploymentDescription
-//
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-ResourceDeploymentDescription::
-ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "value")
+        {
+          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
+          value_->container (this);
+        }
 
-if (n == "requirementName")
-{
-requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requirementName_->container (this);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "resourceName")
-{
-resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceName_->container (this);
-}
+    // SequenceType
+    //
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_property (t);
-}
+    SequenceType::
+    SequenceType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else
-{
-}
-}
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-// ArtifactDeploymentDescription
-//
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-ArtifactDeploymentDescription::
-ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        if (n == "bound")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          bound (t);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "elementType")
+        {
+          elementType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          elementType_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else 
+        {
+        }
+      }
+    }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+    // Any
+    //
 
-else if (n == "source")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_source (t);
-}
+    Any::
+    Any (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "node")
-{
-node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-node_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "location")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_location (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "execParameter")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_execParameter (t);
-}
+        if (n == "type")
+        {
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          type_->container (this);
+        }
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_deployRequirement (t);
-}
+        else if (n == "value")
+        {
+          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
+          value_->container (this);
+        }
 
-else if (n == "deployedResource")
-{
-::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
-add_deployedResource (t);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else
-{
-}
-}
+    // Property
+    //
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "id")
-{
-::XMLSchema::ID< ACE_TCHAR > t (a);
-id (t);
-}
+    Property::
+    Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else
-{
-}
-}
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-// MonolithicDeploymentDescription
-//
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-MonolithicDeploymentDescription::
-MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "value")
+        {
+          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+          value_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else 
+        {
+        }
+      }
+    }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+    // SatisfierPropertyKind
+    //
 
-else if (n == "source")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_source (t);
-}
+    SatisfierPropertyKind::
+    SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "Quantity") v_ = Quantity_l;
+      else if (v == "Capacity") v_ = Capacity_l;
+      else if (v == "Minimum") v_ = Minimum_l;
+      else if (v == "Maximum") v_ = Maximum_l;
+      else if (v == "Attribute") v_ = Attribute_l;
+      else if (v == "Selection") v_ = Selection_l;
+      else 
+      {
+      }
+    }
 
-else if (n == "artifact")
-{
-::XMLSchema::IDREF< ACE_TCHAR > t (e);
-add_artifact (t);
-}
+    SatisfierPropertyKind::
+    SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "Quantity") v_ = Quantity_l;
+      else if (v == "Capacity") v_ = Capacity_l;
+      else if (v == "Minimum") v_ = Minimum_l;
+      else if (v == "Maximum") v_ = Maximum_l;
+      else if (v == "Attribute") v_ = Attribute_l;
+      else if (v == "Selection") v_ = Selection_l;
+      else 
+      {
+      }
+    }
 
-else if (n == "execParameter")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_execParameter (t);
-}
+    SatisfierPropertyKind const SatisfierPropertyKind::Quantity (SatisfierPropertyKind::Quantity_l);
+    SatisfierPropertyKind const SatisfierPropertyKind::Capacity (SatisfierPropertyKind::Capacity_l);
+    SatisfierPropertyKind const SatisfierPropertyKind::Minimum (SatisfierPropertyKind::Minimum_l);
+    SatisfierPropertyKind const SatisfierPropertyKind::Maximum (SatisfierPropertyKind::Maximum_l);
+    SatisfierPropertyKind const SatisfierPropertyKind::Attribute (SatisfierPropertyKind::Attribute_l);
+    SatisfierPropertyKind const SatisfierPropertyKind::Selection (SatisfierPropertyKind::Selection_l);
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_deployRequirement (t);
-}
+    // SatisfierProperty
+    //
 
-else
-{
-}
-}
+    SatisfierProperty::
+    SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "id")
-{
-::XMLSchema::ID< ACE_TCHAR > t (a);
-id (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else
-{
-}
-}
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-// ResourceUsageKind
-//
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-ResourceUsageKind::
-ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-: ::XSCRT::Type (e)
-{
-::std::basic_string< ACE_TCHAR > v (e.value ());
-
-if (v == "None") v_ = None_l;
-else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
-else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
-else if (v == "PortUsesResource") v_ = PortUsesResource_l;
-else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
-else
-{
-}
-}
+        else if (n == "kind")
+        {
+          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
+          kind_->container (this);
+        }
 
-ResourceUsageKind::
-ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-: ::XSCRT::Type (a)
-{
-::std::basic_string< ACE_TCHAR > v (a.value ());
-
-if (v == "None") v_ = None_l;
-else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
-else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
-else if (v == "PortUsesResource") v_ = PortUsesResource_l;
-else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
-else
-{
-}
-}
+        else if (n == "dynamic")
+        {
+          dynamic_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          dynamic_->container (this);
+        }
 
-ResourceUsageKind const ResourceUsageKind::None (ResourceUsageKind::None_l);
-ResourceUsageKind const ResourceUsageKind::InstanceUsesResource (ResourceUsageKind::InstanceUsesResource_l);
-ResourceUsageKind const ResourceUsageKind::ResourceUsesInstance (ResourceUsageKind::ResourceUsesInstance_l);
-ResourceUsageKind const ResourceUsageKind::PortUsesResource (ResourceUsageKind::PortUsesResource_l);
-ResourceUsageKind const ResourceUsageKind::ResourceUsesPort (ResourceUsageKind::ResourceUsesPort_l);
+        else if (n == "value")
+        {
+          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+          value_->container (this);
+        }
 
-// InstanceResourceDeploymentDescription
-//
+        else 
+        {
+        }
+      }
+    }
 
-InstanceResourceDeploymentDescription::
-InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    // Resource
+    //
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    Resource::
+    Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-if (n == "resourceUsage")
-{
-resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
-resourceUsage_->container (this);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "requirementName")
-{
-requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requirementName_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "resourceName")
-{
-resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceName_->container (this);
-}
+        else if (n == "resourceType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_resourceType (t);
+        }
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_property (t);
-}
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::SatisfierProperty t (e);
+          add_property (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// InstanceDeploymentDescription
-//
+    // Requirement
+    //
 
-InstanceDeploymentDescription::
-InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    Requirement::
+    Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "resourceType")
+        {
+          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceType_->container (this);
+        }
 
-else if (n == "node")
-{
-node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-node_->container (this);
-}
+        else if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "source")
-{
-source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-source_->container (this);
-}
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_property (t);
+        }
 
-else if (n == "implementation")
-{
-implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-implementation_->container (this);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "configProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_configProperty (t);
-}
+    // ResourceDeploymentDescription
+    //
 
-else if (n == "deployedResource")
-{
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-deployedResource (t);
-}
+    ResourceDeploymentDescription::
+    ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "deployedSharedResource")
-{
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-deployedSharedResource (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else
-{
-}
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "id")
-{
-::XMLSchema::ID< ACE_TCHAR > t (a);
-id (t);
-}
+        if (n == "requirementName")
+        {
+          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          requirementName_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "resourceName")
+        {
+          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceName_->container (this);
+        }
 
-// CCMComponentPortKind
-//
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_property (t);
+        }
 
-CCMComponentPortKind::
-CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-: ::XSCRT::Type (e)
-{
-::std::basic_string< ACE_TCHAR > v (e.value ());
-
-if (v == "Facet") v_ = Facet_l;
-else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
-else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
-else if (v == "EventEmitter") v_ = EventEmitter_l;
-else if (v == "EventPublisher") v_ = EventPublisher_l;
-else if (v == "EventConsumer") v_ = EventConsumer_l;
-else
-{
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-CCMComponentPortKind::
-CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-: ::XSCRT::Type (a)
-{
-::std::basic_string< ACE_TCHAR > v (a.value ());
-
-if (v == "Facet") v_ = Facet_l;
-else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
-else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
-else if (v == "EventEmitter") v_ = EventEmitter_l;
-else if (v == "EventPublisher") v_ = EventPublisher_l;
-else if (v == "EventConsumer") v_ = EventConsumer_l;
-else
-{
-}
-}
+    // ArtifactDeploymentDescription
+    //
 
-CCMComponentPortKind const CCMComponentPortKind::Facet (CCMComponentPortKind::Facet_l);
-CCMComponentPortKind const CCMComponentPortKind::SimplexReceptacle (CCMComponentPortKind::SimplexReceptacle_l);
-CCMComponentPortKind const CCMComponentPortKind::MultiplexReceptacle (CCMComponentPortKind::MultiplexReceptacle_l);
-CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
-CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
-CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
+    ArtifactDeploymentDescription::
+    ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-// ComponentPortDescription
-//
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-ComponentPortDescription::
-ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "source")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_source (t);
+        }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else if (n == "node")
+        {
+          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          node_->container (this);
+        }
 
-else if (n == "specificType")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-specificType (t);
-}
+        else if (n == "location")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_location (t);
+        }
 
-else if (n == "supportedType")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_supportedType (t);
-}
+        else if (n == "execParameter")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_execParameter (t);
+        }
 
-else if (n == "provider")
-{
-provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-provider_->container (this);
-}
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_deployRequirement (t);
+        }
 
-else if (n == "exclusiveProvider")
-{
-exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-exclusiveProvider_->container (this);
-}
+        else if (n == "deployedResource")
+        {
+          ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
+          add_deployedResource (t);
+        }
 
-else if (n == "exclusiveUser")
-{
-exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-exclusiveUser_->container (this);
-}
+        else 
+        {
+        }
+      }
 
-else if (n == "optional")
-{
-optional_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-optional_->container (this);
-}
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
+        {
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
+        }
 
-else if (n == "kind")
-{
-kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
-kind_->container (this);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else
-{
-}
-}
-}
+    // MonolithicDeploymentDescription
+    //
 
-// ComponentPropertyDescription
-//
+    MonolithicDeploymentDescription::
+    MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-ComponentPropertyDescription::
-ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        else if (n == "source")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_source (t);
+        }
 
-else if (n == "type")
-{
-type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-type_->container (this);
-}
+        else if (n == "artifact")
+        {
+          ::XMLSchema::IDREF< ACE_TCHAR > t (e);
+          add_artifact (t);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "execParameter")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_execParameter (t);
+        }
 
-// ComponentExternalPortEndpoint
-//
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_deployRequirement (t);
+        }
 
-ComponentExternalPortEndpoint::
-ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else 
+        {
+        }
+      }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
+        {
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else 
+        {
+        }
+      }
+    }
 
-if (n == "portName")
-{
-portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-portName_->container (this);
-}
+    // ResourceUsageKind
+    //
 
-else
-{
-}
-}
-}
+    ResourceUsageKind::
+    ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "None") v_ = None_l;
+      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
+      else 
+      {
+      }
+    }
 
-// PlanSubcomponentPortEndpoint
-//
+    ResourceUsageKind::
+    ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "None") v_ = None_l;
+      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
+      else 
+      {
+      }
+    }
 
-PlanSubcomponentPortEndpoint::
-PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    ResourceUsageKind const ResourceUsageKind::None (ResourceUsageKind::None_l);
+    ResourceUsageKind const ResourceUsageKind::InstanceUsesResource (ResourceUsageKind::InstanceUsesResource_l);
+    ResourceUsageKind const ResourceUsageKind::ResourceUsesInstance (ResourceUsageKind::ResourceUsesInstance_l);
+    ResourceUsageKind const ResourceUsageKind::PortUsesResource (ResourceUsageKind::PortUsesResource_l);
+    ResourceUsageKind const ResourceUsageKind::ResourceUsesPort (ResourceUsageKind::ResourceUsesPort_l);
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    // InstanceResourceDeploymentDescription
+    //
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    InstanceResourceDeploymentDescription::
+    InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-if (n == "portName")
-{
-portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-portName_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "provider")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-provider (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "kind")
-{
-kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
-kind_->container (this);
-}
+        if (n == "resourceUsage")
+        {
+          resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+          resourceUsage_->container (this);
+        }
 
-else if (n == "instance")
-{
-instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-instance_->container (this);
-}
+        else if (n == "requirementName")
+        {
+          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          requirementName_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "resourceName")
+        {
+          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceName_->container (this);
+        }
 
-// ExternalReferenceEndpoint
-//
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_property (t);
+        }
 
-ExternalReferenceEndpoint::
-ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else 
+        {
+        }
+      }
+    }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    // InstanceDeploymentDescription
+    //
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    InstanceDeploymentDescription::
+    InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-if (n == "location")
-{
-location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-location_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else
-{
-}
-}
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-// ConnectionResourceDeploymentDescription
-//
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-ConnectionResourceDeploymentDescription::
-ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "node")
+        {
+          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          node_->container (this);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "source")
+        {
+          source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          source_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "implementation")
+        {
+          implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          implementation_->container (this);
+        }
 
-if (n == "targetName")
-{
-targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-targetName_->container (this);
-}
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
 
-else if (n == "requirementName")
-{
-requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requirementName_->container (this);
-}
+        else if (n == "deployedResource")
+        {
+          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+          add_deployedResource (t);
+        }
 
-else if (n == "resourceName")
-{
-resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceName_->container (this);
-}
+        else if (n == "deployedSharedResource")
+        {
+          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+          deployedSharedResource (t);
+        }
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_property (t);
-}
+        else 
+        {
+        }
+      }
 
-else
-{
-}
-}
-}
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
+        {
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
+        }
 
-// PlanConnectionDescription
-//
+        else 
+        {
+        }
+      }
+    }
 
-PlanConnectionDescription::
-PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    // CCMComponentPortKind
+    //
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    CCMComponentPortKind::
+    CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "Facet") v_ = Facet_l;
+      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+      else if (v == "EventEmitter") v_ = EventEmitter_l;
+      else if (v == "EventPublisher") v_ = EventPublisher_l;
+      else if (v == "EventConsumer") v_ = EventConsumer_l;
+      else 
+      {
+      }
+    }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    CCMComponentPortKind::
+    CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "Facet") v_ = Facet_l;
+      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+      else if (v == "EventEmitter") v_ = EventEmitter_l;
+      else if (v == "EventPublisher") v_ = EventPublisher_l;
+      else if (v == "EventConsumer") v_ = EventConsumer_l;
+      else 
+      {
+      }
+    }
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+    CCMComponentPortKind const CCMComponentPortKind::Facet (CCMComponentPortKind::Facet_l);
+    CCMComponentPortKind const CCMComponentPortKind::SimplexReceptacle (CCMComponentPortKind::SimplexReceptacle_l);
+    CCMComponentPortKind const CCMComponentPortKind::MultiplexReceptacle (CCMComponentPortKind::MultiplexReceptacle_l);
+    CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
+    CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
+    CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
 
-else if (n == "source")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-source (t);
-}
+    // ComponentPortDescription
+    //
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_deployRequirement (t);
-}
+    ComponentPortDescription::
+    ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "externalEndpoint")
-{
-::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-add_externalEndpoint (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "internalEndpoint")
-{
-::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
-add_internalEndpoint (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "externalReference")
-{
-::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-add_externalReference (t);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "deployedResource")
-{
-::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
-add_deployedResource (t);
-}
+        else if (n == "specificType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          specificType (t);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "supportedType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_supportedType (t);
+        }
 
-// ImplementationDependency
-//
+        else if (n == "provider")
+        {
+          provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          provider_->container (this);
+        }
 
-ImplementationDependency::
-ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "exclusiveProvider")
+        {
+          exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          exclusiveProvider_->container (this);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else if (n == "exclusiveUser")
+        {
+          exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          exclusiveUser_->container (this);
+        }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        else if (n == "optional")
+        {
+          optional_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          optional_->container (this);
+        }
 
-if (n == "requiredType")
-{
-requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requiredType_->container (this);
-}
+        else if (n == "kind")
+        {
+          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
+          kind_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// Capability
-//
+    // ComponentPropertyDescription
+    //
 
-Capability::
-Capability (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    ComponentPropertyDescription::
+    ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "resourceType")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_resourceType (t);
-}
+        else if (n == "type")
+        {
+          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          type_->container (this);
+        }
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::SatisfierProperty t (e);
-add_property (t);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else
-{
-}
-}
-}
+    // ComponentExternalPortEndpoint
+    //
 
-// ImplementationRequirement
-//
+    ComponentExternalPortEndpoint::
+    ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-ImplementationRequirement::
-ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+        if (n == "portName")
+        {
+          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          portName_->container (this);
+        }
 
-if (n == "resourceUsage")
-{
-::CIAO::Config_Handlers::ResourceUsageKind t (e);
-resourceUsage (t);
-}
+        else 
+        {
+        }
+      }
+    }
 
-else if (n == "resourcePort")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-resourcePort (t);
-}
+    // PlanSubcomponentPortEndpoint
+    //
 
-else if (n == "componentPort")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-componentPort (t);
-}
+    PlanSubcomponentPortEndpoint::
+    PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "resourceType")
-{
-resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceType_->container (this);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "property")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_property (t);
-}
+        if (n == "portName")
+        {
+          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          portName_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "provider")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          provider (t);
+        }
 
-// ComponentPackageReference
-//
+        else if (n == "kind")
+        {
+          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
+          kind_->container (this);
+        }
 
-ComponentPackageReference::
-ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "instance")
+        {
+          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          instance_->container (this);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else 
+        {
+        }
+      }
+    }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    // ExternalReferenceEndpoint
+    //
 
-if (n == "requiredUUID")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-requiredUUID (t);
-}
+    ExternalReferenceEndpoint::
+    ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "requiredName")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-requiredName (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "requiredType")
-{
-requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-requiredType_->container (this);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else
-{
-}
-}
-}
+        if (n == "location")
+        {
+          location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          location_->container (this);
+        }
 
-// SubcomponentPortEndpoint
-//
+        else 
+        {
+        }
+      }
+    }
 
-SubcomponentPortEndpoint::
-SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    // ConnectionResourceDeploymentDescription
+    //
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+    ConnectionResourceDeploymentDescription::
+    ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-if (n == "portName")
-{
-portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-portName_->container (this);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "instance")
-{
-instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-instance_->container (this);
-}
+        if (n == "targetName")
+        {
+          targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          targetName_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else if (n == "requirementName")
+        {
+          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          requirementName_->container (this);
+        }
 
-// AssemblyConnectionDescription
-//
+        else if (n == "resourceName")
+        {
+          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceName_->container (this);
+        }
 
-AssemblyConnectionDescription::
-AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_property (t);
+        }
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+        else 
+        {
+        }
+      }
+    }
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+    // PlanConnectionDescription
+    //
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+    PlanConnectionDescription::
+    PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_deployRequirement (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-else if (n == "internalEndpoint")
-{
-::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
-add_internalEndpoint (t);
-}
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-else if (n == "externalEndpoint")
-{
-::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-add_externalEndpoint (t);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "externalReference")
-{
-::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-add_externalReference (t);
-}
+        else if (n == "source")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          source (t);
+        }
 
-else
-{
-}
-}
-}
-}
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_deployRequirement (t);
+        }
+
+        else if (n == "externalEndpoint")
+        {
+          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
+          add_externalEndpoint (t);
+        }
+
+        else if (n == "internalEndpoint")
+        {
+          ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
+          add_internalEndpoint (t);
+        }
+
+        else if (n == "externalReference")
+        {
+          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
+          add_externalReference (t);
+        }
+
+        else if (n == "deployedResource")
+        {
+          ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
+          add_deployedResource (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // ImplementationDependency
+    //
+
+    ImplementationDependency::
+    ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "requiredType")
+        {
+          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          requiredType_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // Capability
+    //
+
+    Capability::
+    Capability (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "resourceType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_resourceType (t);
+        }
+
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::SatisfierProperty t (e);
+          add_property (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // ImplementationRequirement
+    //
+
+    ImplementationRequirement::
+    ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "resourceUsage")
+        {
+          ::CIAO::Config_Handlers::ResourceUsageKind t (e);
+          resourceUsage (t);
+        }
+
+        else if (n == "resourcePort")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          resourcePort (t);
+        }
+
+        else if (n == "componentPort")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          componentPort (t);
+        }
+
+        else if (n == "resourceType")
+        {
+          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceType_->container (this);
+        }
+
+        else if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_property (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // ComponentPackageReference
+    //
+
+    ComponentPackageReference::
+    ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "requiredUUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          requiredUUID (t);
+        }
+
+        else if (n == "requiredName")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          requiredName (t);
+        }
+
+        else if (n == "requiredType")
+        {
+          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          requiredType_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // SubcomponentPortEndpoint
+    //
+
+    SubcomponentPortEndpoint::
+    SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "portName")
+        {
+          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          portName_->container (this);
+        }
+
+        else if (n == "instance")
+        {
+          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          instance_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // AssemblyConnectionDescription
+    //
+
+    AssemblyConnectionDescription::
+    AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_deployRequirement (t);
+        }
+
+        else if (n == "internalEndpoint")
+        {
+          ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
+          add_internalEndpoint (t);
+        }
+
+        else if (n == "externalEndpoint")
+        {
+          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
+          add_externalEndpoint (t);
+        }
+
+        else if (n == "externalReference")
+        {
+          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
+          add_externalReference (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace
-{
-::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-struct TCKindTypeInfoInitializer
-{
-TCKindTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (TCKind));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct TCKindTypeInfoInitializer
+      {
+        TCKindTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (TCKind));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-TCKindTypeInfoInitializer TCKindTypeInfoInitializer_;
+      TCKindTypeInfoInitializer TCKindTypeInfoInitializer_;
 
-struct DataTypeTypeInfoInitializer
-{
-DataTypeTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (DataType));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct DataTypeTypeInfoInitializer
+      {
+        DataTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (DataType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-DataTypeTypeInfoInitializer DataTypeTypeInfoInitializer_;
+      DataTypeTypeInfoInitializer DataTypeTypeInfoInitializer_;
 
-struct DataValueTypeInfoInitializer
-{
-DataValueTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (DataValue));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct DataValueTypeInfoInitializer
+      {
+        DataValueTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (DataValue));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
+      DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
 
-struct EnumTypeTypeInfoInitializer
-{
-EnumTypeTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (EnumType));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct EnumTypeTypeInfoInitializer
+      {
+        EnumTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (EnumType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-EnumTypeTypeInfoInitializer EnumTypeTypeInfoInitializer_;
+      EnumTypeTypeInfoInitializer EnumTypeTypeInfoInitializer_;
 
-struct AnyTypeInfoInitializer
-{
-AnyTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Any));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct StructTypeTypeInfoInitializer
+      {
+        StructTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (StructType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-AnyTypeInfoInitializer AnyTypeInfoInitializer_;
+      StructTypeTypeInfoInitializer StructTypeTypeInfoInitializer_;
 
-struct PropertyTypeInfoInitializer
-{
-PropertyTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Property));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct StructMemberTypeTypeInfoInitializer
+      {
+        StructMemberTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (StructMemberType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
+      StructMemberTypeTypeInfoInitializer StructMemberTypeTypeInfoInitializer_;
 
-struct SatisfierPropertyKindTypeInfoInitializer
-{
-SatisfierPropertyKindTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ValueTypeTypeInfoInitializer
+      {
+        ValueTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ValueType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      ValueTypeTypeInfoInitializer ValueTypeTypeInfoInitializer_;
 
-SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
+      struct ValueMemberTypeTypeInfoInitializer
+      {
+        ValueMemberTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ValueMemberType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct SatisfierPropertyTypeInfoInitializer
-{
-SatisfierPropertyTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SatisfierProperty));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      ValueMemberTypeTypeInfoInitializer ValueMemberTypeTypeInfoInitializer_;
 
-SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
+      struct NamedValueTypeInfoInitializer
+      {
+        NamedValueTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (NamedValue));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct ResourceTypeInfoInitializer
-{
-ResourceTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Resource));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      NamedValueTypeInfoInitializer NamedValueTypeInfoInitializer_;
 
-ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
+      struct SequenceTypeTypeInfoInitializer
+      {
+        SequenceTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SequenceType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct RequirementTypeInfoInitializer
-{
-RequirementTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Requirement));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      SequenceTypeTypeInfoInitializer SequenceTypeTypeInfoInitializer_;
 
-RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
+      struct AnyTypeInfoInitializer
+      {
+        AnyTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Any));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct ResourceDeploymentDescriptionTypeInfoInitializer
-{
-ResourceDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      AnyTypeInfoInitializer AnyTypeInfoInitializer_;
 
-ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
+      struct PropertyTypeInfoInitializer
+      {
+        PropertyTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Property));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct ArtifactDeploymentDescriptionTypeInfoInitializer
-{
-ArtifactDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
 
-ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
+      struct SatisfierPropertyKindTypeInfoInitializer
+      {
+        SatisfierPropertyKindTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct MonolithicDeploymentDescriptionTypeInfoInitializer
-{
-MonolithicDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
+      SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
 
-struct ResourceUsageKindTypeInfoInitializer
-{
-ResourceUsageKindTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ResourceUsageKind));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct SatisfierPropertyTypeInfoInitializer
+      {
+        SatisfierPropertyTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SatisfierProperty));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
 
-ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
+      struct ResourceTypeInfoInitializer
+      {
+        ResourceTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Resource));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
-{
-InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
 
-InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
+      struct RequirementTypeInfoInitializer
+      {
+        RequirementTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Requirement));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct InstanceDeploymentDescriptionTypeInfoInitializer
-{
-InstanceDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
 
-InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
+      struct ResourceDeploymentDescriptionTypeInfoInitializer
+      {
+        ResourceDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct CCMComponentPortKindTypeInfoInitializer
-{
-CCMComponentPortKindTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (CCMComponentPortKind));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+      ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
 
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      struct ArtifactDeploymentDescriptionTypeInfoInitializer
+      {
+        ArtifactDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-struct ComponentPortDescriptionTypeInfoInitializer
-{
-ComponentPortDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentPortDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      struct MonolithicDeploymentDescriptionTypeInfoInitializer
+      {
+        MonolithicDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-struct ComponentPropertyDescriptionTypeInfoInitializer
-{
-ComponentPropertyDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      struct ResourceUsageKindTypeInfoInitializer
+      {
+        ResourceUsageKindTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ResourceUsageKind));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-struct ComponentExternalPortEndpointTypeInfoInitializer
-{
-ComponentExternalPortEndpointTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
-::XSCRT::ExtendedTypeInfo nf (id);
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
 
-ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
+      struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
+      {
+        InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct PlanSubcomponentPortEndpointTypeInfoInitializer
-{
-PlanSubcomponentPortEndpointTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
 
-PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
+      struct InstanceDeploymentDescriptionTypeInfoInitializer
+      {
+        InstanceDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct ExternalReferenceEndpointTypeInfoInitializer
-{
-ExternalReferenceEndpointTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+      InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
 
-ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
+      struct CCMComponentPortKindTypeInfoInitializer
+      {
+        CCMComponentPortKindTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (CCMComponentPortKind));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
-{
-ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
+      CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
 
-struct PlanConnectionDescriptionTypeInfoInitializer
-{
-PlanConnectionDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (PlanConnectionDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ComponentPortDescriptionTypeInfoInitializer
+      {
+        ComponentPortDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPortDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
+      ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
 
-struct ImplementationDependencyTypeInfoInitializer
-{
-ImplementationDependencyTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ImplementationDependency));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ComponentPropertyDescriptionTypeInfoInitializer
+      {
+        ComponentPropertyDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
+      ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
 
-struct CapabilityTypeInfoInitializer
-{
-CapabilityTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Capability));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ComponentExternalPortEndpointTypeInfoInitializer
+      {
+        ComponentExternalPortEndpointTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
+      ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
 
-struct ImplementationRequirementTypeInfoInitializer
-{
-ImplementationRequirementTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ImplementationRequirement));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct PlanSubcomponentPortEndpointTypeInfoInitializer
+      {
+        PlanSubcomponentPortEndpointTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
+      PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
 
-struct ComponentPackageReferenceTypeInfoInitializer
-{
-ComponentPackageReferenceTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentPackageReference));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ExternalReferenceEndpointTypeInfoInitializer
+      {
+        ExternalReferenceEndpointTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+      ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
 
-struct SubcomponentPortEndpointTypeInfoInitializer
-{
-SubcomponentPortEndpointTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
+      {
+        ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
+      ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
 
-struct AssemblyConnectionDescriptionTypeInfoInitializer
-{
-AssemblyConnectionDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct PlanConnectionDescriptionTypeInfoInitializer
+      {
+        PlanConnectionDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (PlanConnectionDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
-}
-}
+      PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
+
+      struct ImplementationDependencyTypeInfoInitializer
+      {
+        ImplementationDependencyTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ImplementationDependency));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
+
+      struct CapabilityTypeInfoInitializer
+      {
+        CapabilityTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Capability));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
+
+      struct ImplementationRequirementTypeInfoInitializer
+      {
+        ImplementationRequirementTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ImplementationRequirement));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
+
+      struct ComponentPackageReferenceTypeInfoInitializer
+      {
+        ComponentPackageReferenceTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPackageReference));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+
+      struct SubcomponentPortEndpointTypeInfoInitializer
+      {
+        SubcomponentPortEndpointTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
+
+      struct AssemblyConnectionDescriptionTypeInfoInitializer
+      {
+        AssemblyConnectionDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-// DataType
-//
-//
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // DataType
+      //
+      //
 
-void DataType::
-traverse (Type& o)
-{
-pre (o);
-kind (o);
-if (o.enum_p ()) enum_ (o);
-else enum_none (o);
-post (o);
-}
+      void DataType::
+      traverse (Type& o)
+      {
+        pre (o);
+        kind (o);
+        if (o.enum_p ()) enum_ (o);
+        else enum_none (o);
+        if (o.struct_p ()) struct_ (o);
+        else struct_none (o);
+        if (o.value_p ()) value (o);
+        else value_none (o);
+        if (o.sequence_p ()) sequence (o);
+        else sequence_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void DataType::
-traverse (Type const& o)
-{
-pre (o);
-kind (o);
-if (o.enum_p ()) enum_ (o);
-else enum_none (o);
-post (o);
-}
+      void DataType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        kind (o);
+        if (o.enum_p ()) enum_ (o);
+        else enum_none (o);
+        if (o.struct_p ()) struct_ (o);
+        else struct_none (o);
+        if (o.value_p ()) value (o);
+        else value_none (o);
+        if (o.sequence_p ()) sequence (o);
+        else sequence_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void DataType::
-pre (Type&)
-{
-}
+      void DataType::
+      pre (Type&)
+      {
+      }
 
-void DataType::
-pre (Type const&)
-{
-}
+      void DataType::
+      pre (Type const&)
+      {
+      }
 
-void DataType::
-kind (Type& o)
-{
-dispatch (o.kind ());
-}
+      void DataType::
+      kind (Type& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void DataType::
-kind (Type const& o)
-{
-dispatch (o.kind ());
-}
+      void DataType::
+      kind (Type const& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void DataType::
-enum_ (Type& o)
-{
-dispatch (o.enum_ ());
-}
+      void DataType::
+      enum_ (Type& o)
+      {
+        dispatch (o.enum_ ());
+      }
 
-void DataType::
-enum_ (Type const& o)
-{
-dispatch (o.enum_ ());
-}
+      void DataType::
+      enum_ (Type const& o)
+      {
+        dispatch (o.enum_ ());
+      }
 
-void DataType::
-enum_none (Type&)
-{
-}
+      void DataType::
+      enum_none (Type&)
+      {
+      }
 
-void DataType::
-enum_none (Type const&)
-{
-}
+      void DataType::
+      enum_none (Type const&)
+      {
+      }
 
-void DataType::
-post (Type&)
-{
-}
+      void DataType::
+      struct_ (Type& o)
+      {
+        dispatch (o.struct_ ());
+      }
 
-void DataType::
-post (Type const&)
-{
-}
+      void DataType::
+      struct_ (Type const& o)
+      {
+        dispatch (o.struct_ ());
+      }
 
-// DataValue
-//
-//
+      void DataType::
+      struct_none (Type&)
+      {
+      }
 
-void DataValue::
-traverse (Type& o)
-{
-pre (o);
-short_ (o);
-long_ (o);
-ushort (o);
-ulong (o);
-float_ (o);
-double_ (o);
-boolean (o);
-octet (o);
-enum_ (o);
-string (o);
-longlong (o);
-ulonglong (o);
-longdouble (o);
-post (o);
-}
+      void DataType::
+      struct_none (Type const&)
+      {
+      }
 
-void DataValue::
-traverse (Type const& o)
-{
-pre (o);
-short_ (o);
-long_ (o);
-ushort (o);
-ulong (o);
-float_ (o);
-double_ (o);
-boolean (o);
-octet (o);
-enum_ (o);
-string (o);
-longlong (o);
-ulonglong (o);
-longdouble (o);
-post (o);
-}
+      void DataType::
+      value (Type& o)
+      {
+        dispatch (o.value ());
+      }
 
-void DataValue::
-pre (Type&)
-{
-}
+      void DataType::
+      value (Type const& o)
+      {
+        dispatch (o.value ());
+      }
 
-void DataValue::
-pre (Type const&)
-{
-}
+      void DataType::
+      value_none (Type&)
+      {
+      }
 
-void DataValue::
-short_ (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
+      void DataType::
+      value_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-short_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) short_next (o);
-}
+      void DataType::
+      sequence (Type& o)
+      {
+        dispatch (o.sequence ());
+      }
 
-short_post (o);
-}
+      void DataType::
+      sequence (Type const& o)
+      {
+        dispatch (o.sequence ());
+      }
 
-else short_none (o);
-}
+      void DataType::
+      sequence_none (Type&)
+      {
+      }
 
-void DataValue::
-short_ (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
+      void DataType::
+      sequence_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-short_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) short_next (o);
-}
+      void DataType::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
 
-short_post (o);
-}
+      void DataType::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
 
-else short_none (o);
-}
+      void DataType::
+      id_none (Type&)
+      {
+      }
 
-void DataValue::
-short_pre (Type&)
-{
-}
+      void DataType::
+      id_none (Type const&)
+      {
+      }
 
-void DataValue::
-short_pre (Type const&)
-{
-}
+      void DataType::
+      post (Type&)
+      {
+      }
 
-void DataValue::
-short_next (Type&)
-{
-}
+      void DataType::
+      post (Type const&)
+      {
+      }
 
-void DataValue::
-short_next (Type const&)
-{
-}
+      // DataValue
+      //
+      //
 
-void DataValue::
-short_post (Type&)
-{
-}
+      void DataValue::
+      traverse (Type& o)
+      {
+        pre (o);
+        short_ (o);
+        long_ (o);
+        ushort (o);
+        ulong (o);
+        float_ (o);
+        double_ (o);
+        boolean (o);
+        octet (o);
+        enum_ (o);
+        string (o);
+        longlong (o);
+        ulonglong (o);
+        longdouble (o);
+        member (o);
+        post (o);
+      }
 
-void DataValue::
-short_post (Type const&)
-{
-}
+      void DataValue::
+      traverse (Type const& o)
+      {
+        pre (o);
+        short_ (o);
+        long_ (o);
+        ushort (o);
+        ulong (o);
+        float_ (o);
+        double_ (o);
+        boolean (o);
+        octet (o);
+        enum_ (o);
+        string (o);
+        longlong (o);
+        ulonglong (o);
+        longdouble (o);
+        member (o);
+        post (o);
+      }
 
-void DataValue::
-short_none (Type&)
-{
-}
+      void DataValue::
+      pre (Type&)
+      {
+      }
 
-void DataValue::
-short_none (Type const&)
-{
-}
+      void DataValue::
+      pre (Type const&)
+      {
+      }
 
-void DataValue::
-long_ (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long());
+      void DataValue::
+      short_ (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
 
-if (b != e)
-{
-long_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) long_next (o);
-}
+        if (b != e)
+        {
+          short_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) short_next (o);
+          }
+
+          short_post (o);
+        }
 
-long_post (o);
-}
+        else short_none (o);
+      }
 
-else long_none (o);
-}
+      void DataValue::
+      short_ (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
 
-void DataValue::
-long_ (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long());
+        if (b != e)
+        {
+          short_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) short_next (o);
+          }
+
+          short_post (o);
+        }
 
-if (b != e)
-{
-long_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) long_next (o);
-}
+        else short_none (o);
+      }
 
-long_post (o);
-}
+      void DataValue::
+      short_pre (Type&)
+      {
+      }
 
-else long_none (o);
-}
+      void DataValue::
+      short_pre (Type const&)
+      {
+      }
 
-void DataValue::
-long_pre (Type&)
-{
-}
+      void DataValue::
+      short_next (Type&)
+      {
+      }
 
-void DataValue::
-long_pre (Type const&)
-{
-}
+      void DataValue::
+      short_next (Type const&)
+      {
+      }
 
-void DataValue::
-long_next (Type&)
-{
-}
+      void DataValue::
+      short_post (Type&)
+      {
+      }
 
-void DataValue::
-long_next (Type const&)
-{
-}
+      void DataValue::
+      short_post (Type const&)
+      {
+      }
 
-void DataValue::
-long_post (Type&)
-{
-}
+      void DataValue::
+      short_none (Type&)
+      {
+      }
 
-void DataValue::
-long_post (Type const&)
-{
-}
+      void DataValue::
+      short_none (Type const&)
+      {
+      }
 
-void DataValue::
-long_none (Type&)
-{
-}
+      void DataValue::
+      long_ (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long());
 
-void DataValue::
-long_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          long_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) long_next (o);
+          }
+
+          long_post (o);
+        }
 
-void DataValue::
-ushort (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
+        else long_none (o);
+      }
 
-if (b != e)
-{
-ushort_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ushort_next (o);
-}
+      void DataValue::
+      long_ (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long());
 
-ushort_post (o);
-}
+        if (b != e)
+        {
+          long_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) long_next (o);
+          }
+
+          long_post (o);
+        }
 
-else ushort_none (o);
-}
+        else long_none (o);
+      }
 
-void DataValue::
-ushort (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort());
+      void DataValue::
+      long_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-ushort_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ushort_next (o);
-}
+      void DataValue::
+      long_pre (Type const&)
+      {
+      }
 
-ushort_post (o);
-}
+      void DataValue::
+      long_next (Type&)
+      {
+      }
 
-else ushort_none (o);
-}
+      void DataValue::
+      long_next (Type const&)
+      {
+      }
 
-void DataValue::
-ushort_pre (Type&)
-{
-}
+      void DataValue::
+      long_post (Type&)
+      {
+      }
 
-void DataValue::
-ushort_pre (Type const&)
-{
-}
+      void DataValue::
+      long_post (Type const&)
+      {
+      }
 
-void DataValue::
-ushort_next (Type&)
-{
-}
+      void DataValue::
+      long_none (Type&)
+      {
+      }
 
-void DataValue::
-ushort_next (Type const&)
-{
-}
+      void DataValue::
+      long_none (Type const&)
+      {
+      }
 
-void DataValue::
-ushort_post (Type&)
-{
-}
+      void DataValue::
+      ushort (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
 
-void DataValue::
-ushort_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          ushort_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ushort_next (o);
+          }
+
+          ushort_post (o);
+        }
 
-void DataValue::
-ushort_none (Type&)
-{
-}
+        else ushort_none (o);
+      }
 
-void DataValue::
-ushort_none (Type const&)
-{
-}
+      void DataValue::
+      ushort (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort());
 
-void DataValue::
-ulong (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ulong_iterator b (o.begin_ulong()), e (o.end_ulong());
+        if (b != e)
+        {
+          ushort_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ushort_next (o);
+          }
+
+          ushort_post (o);
+        }
 
-if (b != e)
-{
-ulong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ulong_next (o);
-}
+        else ushort_none (o);
+      }
 
-ulong_post (o);
-}
+      void DataValue::
+      ushort_pre (Type&)
+      {
+      }
 
-else ulong_none (o);
-}
+      void DataValue::
+      ushort_pre (Type const&)
+      {
+      }
 
-void DataValue::
-ulong (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong());
+      void DataValue::
+      ushort_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-ulong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ulong_next (o);
-}
+      void DataValue::
+      ushort_next (Type const&)
+      {
+      }
 
-ulong_post (o);
-}
+      void DataValue::
+      ushort_post (Type&)
+      {
+      }
 
-else ulong_none (o);
-}
+      void DataValue::
+      ushort_post (Type const&)
+      {
+      }
 
-void DataValue::
-ulong_pre (Type&)
-{
-}
+      void DataValue::
+      ushort_none (Type&)
+      {
+      }
 
-void DataValue::
-ulong_pre (Type const&)
-{
-}
+      void DataValue::
+      ushort_none (Type const&)
+      {
+      }
 
-void DataValue::
-ulong_next (Type&)
-{
-}
+      void DataValue::
+      ulong (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ulong_iterator b (o.begin_ulong()), e (o.end_ulong());
 
-void DataValue::
-ulong_next (Type const&)
-{
-}
+        if (b != e)
+        {
+          ulong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ulong_next (o);
+          }
+
+          ulong_post (o);
+        }
 
-void DataValue::
-ulong_post (Type&)
-{
-}
+        else ulong_none (o);
+      }
 
-void DataValue::
-ulong_post (Type const&)
-{
-}
+      void DataValue::
+      ulong (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong());
 
-void DataValue::
-ulong_none (Type&)
-{
-}
+        if (b != e)
+        {
+          ulong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ulong_next (o);
+          }
+
+          ulong_post (o);
+        }
 
-void DataValue::
-ulong_none (Type const&)
-{
-}
+        else ulong_none (o);
+      }
 
-void DataValue::
-float_ (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::float_iterator b (o.begin_float()), e (o.end_float());
+      void DataValue::
+      ulong_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-float_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) float_next (o);
-}
+      void DataValue::
+      ulong_pre (Type const&)
+      {
+      }
 
-float_post (o);
-}
+      void DataValue::
+      ulong_next (Type&)
+      {
+      }
 
-else float_none (o);
-}
+      void DataValue::
+      ulong_next (Type const&)
+      {
+      }
 
-void DataValue::
-float_ (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::float_const_iterator b (o.begin_float()), e (o.end_float());
+      void DataValue::
+      ulong_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-float_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) float_next (o);
-}
+      void DataValue::
+      ulong_post (Type const&)
+      {
+      }
 
-float_post (o);
-}
+      void DataValue::
+      ulong_none (Type&)
+      {
+      }
 
-else float_none (o);
-}
+      void DataValue::
+      ulong_none (Type const&)
+      {
+      }
 
-void DataValue::
-float_pre (Type&)
-{
-}
+      void DataValue::
+      float_ (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::float_iterator b (o.begin_float()), e (o.end_float());
 
-void DataValue::
-float_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          float_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) float_next (o);
+          }
+
+          float_post (o);
+        }
 
-void DataValue::
-float_next (Type&)
-{
-}
+        else float_none (o);
+      }
 
-void DataValue::
-float_next (Type const&)
-{
-}
+      void DataValue::
+      float_ (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::float_const_iterator b (o.begin_float()), e (o.end_float());
 
-void DataValue::
-float_post (Type&)
-{
-}
+        if (b != e)
+        {
+          float_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) float_next (o);
+          }
+
+          float_post (o);
+        }
 
-void DataValue::
-float_post (Type const&)
-{
-}
+        else float_none (o);
+      }
 
-void DataValue::
-float_none (Type&)
-{
-}
+      void DataValue::
+      float_pre (Type&)
+      {
+      }
 
-void DataValue::
-float_none (Type const&)
-{
-}
+      void DataValue::
+      float_pre (Type const&)
+      {
+      }
 
-void DataValue::
-double_ (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
+      void DataValue::
+      float_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-double_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) double_next (o);
-}
+      void DataValue::
+      float_next (Type const&)
+      {
+      }
 
-double_post (o);
-}
+      void DataValue::
+      float_post (Type&)
+      {
+      }
 
-else double_none (o);
-}
+      void DataValue::
+      float_post (Type const&)
+      {
+      }
 
-void DataValue::
-double_ (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double());
+      void DataValue::
+      float_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-double_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) double_next (o);
-}
+      void DataValue::
+      float_none (Type const&)
+      {
+      }
 
-double_post (o);
-}
+      void DataValue::
+      double_ (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
 
-else double_none (o);
-}
+        if (b != e)
+        {
+          double_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) double_next (o);
+          }
+
+          double_post (o);
+        }
 
-void DataValue::
-double_pre (Type&)
-{
-}
+        else double_none (o);
+      }
 
-void DataValue::
-double_pre (Type const&)
-{
-}
+      void DataValue::
+      double_ (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double());
 
-void DataValue::
-double_next (Type&)
-{
-}
+        if (b != e)
+        {
+          double_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) double_next (o);
+          }
+
+          double_post (o);
+        }
 
-void DataValue::
-double_next (Type const&)
-{
-}
+        else double_none (o);
+      }
 
-void DataValue::
-double_post (Type&)
-{
-}
+      void DataValue::
+      double_pre (Type&)
+      {
+      }
 
-void DataValue::
-double_post (Type const&)
-{
-}
+      void DataValue::
+      double_pre (Type const&)
+      {
+      }
 
-void DataValue::
-double_none (Type&)
-{
-}
+      void DataValue::
+      double_next (Type&)
+      {
+      }
 
-void DataValue::
-double_none (Type const&)
-{
-}
+      void DataValue::
+      double_next (Type const&)
+      {
+      }
 
-void DataValue::
-boolean (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
+      void DataValue::
+      double_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-boolean_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) boolean_next (o);
-}
+      void DataValue::
+      double_post (Type const&)
+      {
+      }
 
-boolean_post (o);
-}
+      void DataValue::
+      double_none (Type&)
+      {
+      }
 
-else boolean_none (o);
-}
+      void DataValue::
+      double_none (Type const&)
+      {
+      }
 
-void DataValue::
-boolean (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean());
+      void DataValue::
+      boolean (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
 
-if (b != e)
-{
-boolean_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) boolean_next (o);
-}
+        if (b != e)
+        {
+          boolean_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) boolean_next (o);
+          }
+
+          boolean_post (o);
+        }
 
-boolean_post (o);
-}
+        else boolean_none (o);
+      }
 
-else boolean_none (o);
-}
+      void DataValue::
+      boolean (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean());
 
-void DataValue::
-boolean_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          boolean_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) boolean_next (o);
+          }
+
+          boolean_post (o);
+        }
 
-void DataValue::
-boolean_pre (Type const&)
-{
-}
+        else boolean_none (o);
+      }
 
-void DataValue::
-boolean_next (Type&)
-{
-}
+      void DataValue::
+      boolean_pre (Type&)
+      {
+      }
 
-void DataValue::
-boolean_next (Type const&)
-{
-}
+      void DataValue::
+      boolean_pre (Type const&)
+      {
+      }
 
-void DataValue::
-boolean_post (Type&)
-{
-}
+      void DataValue::
+      boolean_next (Type&)
+      {
+      }
 
-void DataValue::
-boolean_post (Type const&)
-{
-}
+      void DataValue::
+      boolean_next (Type const&)
+      {
+      }
 
-void DataValue::
-boolean_none (Type&)
-{
-}
+      void DataValue::
+      boolean_post (Type&)
+      {
+      }
 
-void DataValue::
-boolean_none (Type const&)
-{
-}
+      void DataValue::
+      boolean_post (Type const&)
+      {
+      }
 
-void DataValue::
-octet (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
+      void DataValue::
+      boolean_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-octet_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) octet_next (o);
-}
+      void DataValue::
+      boolean_none (Type const&)
+      {
+      }
 
-octet_post (o);
-}
+      void DataValue::
+      octet (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
 
-else octet_none (o);
-}
+        if (b != e)
+        {
+          octet_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) octet_next (o);
+          }
+
+          octet_post (o);
+        }
 
-void DataValue::
-octet (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet());
+        else octet_none (o);
+      }
 
-if (b != e)
-{
-octet_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) octet_next (o);
-}
+      void DataValue::
+      octet (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet());
 
-octet_post (o);
-}
+        if (b != e)
+        {
+          octet_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) octet_next (o);
+          }
+
+          octet_post (o);
+        }
 
-else octet_none (o);
-}
+        else octet_none (o);
+      }
 
-void DataValue::
-octet_pre (Type&)
-{
-}
+      void DataValue::
+      octet_pre (Type&)
+      {
+      }
 
-void DataValue::
-octet_pre (Type const&)
-{
-}
+      void DataValue::
+      octet_pre (Type const&)
+      {
+      }
 
-void DataValue::
-octet_next (Type&)
-{
-}
+      void DataValue::
+      octet_next (Type&)
+      {
+      }
 
-void DataValue::
-octet_next (Type const&)
-{
-}
+      void DataValue::
+      octet_next (Type const&)
+      {
+      }
 
-void DataValue::
-octet_post (Type&)
-{
-}
+      void DataValue::
+      octet_post (Type&)
+      {
+      }
 
-void DataValue::
-octet_post (Type const&)
-{
-}
+      void DataValue::
+      octet_post (Type const&)
+      {
+      }
 
-void DataValue::
-octet_none (Type&)
-{
-}
+      void DataValue::
+      octet_none (Type&)
+      {
+      }
 
-void DataValue::
-octet_none (Type const&)
-{
-}
+      void DataValue::
+      octet_none (Type const&)
+      {
+      }
 
-void DataValue::
-enum_ (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum());
+      void DataValue::
+      enum_ (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum());
 
-if (b != e)
-{
-enum_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) enum_next (o);
-}
+        if (b != e)
+        {
+          enum_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) enum_next (o);
+          }
+
+          enum_post (o);
+        }
 
-enum_post (o);
-}
+        else enum_none (o);
+      }
 
-else enum_none (o);
-}
+      void DataValue::
+      enum_ (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum());
 
-void DataValue::
-enum_ (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum());
+        if (b != e)
+        {
+          enum_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) enum_next (o);
+          }
+
+          enum_post (o);
+        }
 
-if (b != e)
-{
-enum_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) enum_next (o);
-}
+        else enum_none (o);
+      }
 
-enum_post (o);
-}
+      void DataValue::
+      enum_pre (Type&)
+      {
+      }
 
-else enum_none (o);
-}
+      void DataValue::
+      enum_pre (Type const&)
+      {
+      }
 
-void DataValue::
-enum_pre (Type&)
-{
-}
+      void DataValue::
+      enum_next (Type&)
+      {
+      }
 
-void DataValue::
-enum_pre (Type const&)
-{
-}
+      void DataValue::
+      enum_next (Type const&)
+      {
+      }
 
-void DataValue::
-enum_next (Type&)
-{
-}
+      void DataValue::
+      enum_post (Type&)
+      {
+      }
 
-void DataValue::
-enum_next (Type const&)
-{
-}
+      void DataValue::
+      enum_post (Type const&)
+      {
+      }
 
-void DataValue::
-enum_post (Type&)
-{
-}
+      void DataValue::
+      enum_none (Type&)
+      {
+      }
 
-void DataValue::
-enum_post (Type const&)
-{
-}
+      void DataValue::
+      enum_none (Type const&)
+      {
+      }
 
-void DataValue::
-enum_none (Type&)
-{
-}
+      void DataValue::
+      string (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
 
-void DataValue::
-enum_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          string_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) string_next (o);
+          }
+
+          string_post (o);
+        }
 
-void DataValue::
-string (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
+        else string_none (o);
+      }
 
-if (b != e)
-{
-string_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) string_next (o);
-}
+      void DataValue::
+      string (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string());
 
-string_post (o);
-}
+        if (b != e)
+        {
+          string_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) string_next (o);
+          }
+
+          string_post (o);
+        }
 
-else string_none (o);
-}
+        else string_none (o);
+      }
 
-void DataValue::
-string (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string());
+      void DataValue::
+      string_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-string_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) string_next (o);
-}
+      void DataValue::
+      string_pre (Type const&)
+      {
+      }
 
-string_post (o);
-}
+      void DataValue::
+      string_next (Type&)
+      {
+      }
 
-else string_none (o);
-}
+      void DataValue::
+      string_next (Type const&)
+      {
+      }
 
-void DataValue::
-string_pre (Type&)
-{
-}
+      void DataValue::
+      string_post (Type&)
+      {
+      }
 
-void DataValue::
-string_pre (Type const&)
-{
-}
+      void DataValue::
+      string_post (Type const&)
+      {
+      }
 
-void DataValue::
-string_next (Type&)
-{
-}
+      void DataValue::
+      string_none (Type&)
+      {
+      }
 
-void DataValue::
-string_next (Type const&)
-{
-}
+      void DataValue::
+      string_none (Type const&)
+      {
+      }
 
-void DataValue::
-string_post (Type&)
-{
-}
+      void DataValue::
+      longlong (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
 
-void DataValue::
-string_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          longlong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) longlong_next (o);
+          }
+
+          longlong_post (o);
+        }
 
-void DataValue::
-string_none (Type&)
-{
-}
+        else longlong_none (o);
+      }
 
-void DataValue::
-string_none (Type const&)
-{
-}
+      void DataValue::
+      longlong (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong());
 
-void DataValue::
-longlong (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
+        if (b != e)
+        {
+          longlong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) longlong_next (o);
+          }
+
+          longlong_post (o);
+        }
 
-if (b != e)
-{
-longlong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) longlong_next (o);
-}
+        else longlong_none (o);
+      }
 
-longlong_post (o);
-}
+      void DataValue::
+      longlong_pre (Type&)
+      {
+      }
 
-else longlong_none (o);
-}
+      void DataValue::
+      longlong_pre (Type const&)
+      {
+      }
 
-void DataValue::
-longlong (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong());
+      void DataValue::
+      longlong_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-longlong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) longlong_next (o);
-}
+      void DataValue::
+      longlong_next (Type const&)
+      {
+      }
 
-longlong_post (o);
-}
+      void DataValue::
+      longlong_post (Type&)
+      {
+      }
 
-else longlong_none (o);
-}
+      void DataValue::
+      longlong_post (Type const&)
+      {
+      }
 
-void DataValue::
-longlong_pre (Type&)
-{
-}
+      void DataValue::
+      longlong_none (Type&)
+      {
+      }
 
-void DataValue::
-longlong_pre (Type const&)
-{
-}
+      void DataValue::
+      longlong_none (Type const&)
+      {
+      }
 
-void DataValue::
-longlong_next (Type&)
-{
-}
+      void DataValue::
+      ulonglong (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
 
-void DataValue::
-longlong_next (Type const&)
-{
-}
+        if (b != e)
+        {
+          ulonglong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ulonglong_next (o);
+          }
+
+          ulonglong_post (o);
+        }
 
-void DataValue::
-longlong_post (Type&)
-{
-}
+        else ulonglong_none (o);
+      }
 
-void DataValue::
-longlong_post (Type const&)
-{
-}
+      void DataValue::
+      ulonglong (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
 
-void DataValue::
-longlong_none (Type&)
-{
-}
+        if (b != e)
+        {
+          ulonglong_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) ulonglong_next (o);
+          }
+
+          ulonglong_post (o);
+        }
 
-void DataValue::
-longlong_none (Type const&)
-{
-}
+        else ulonglong_none (o);
+      }
 
-void DataValue::
-ulonglong (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
+      void DataValue::
+      ulonglong_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-ulonglong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ulonglong_next (o);
-}
+      void DataValue::
+      ulonglong_pre (Type const&)
+      {
+      }
 
-ulonglong_post (o);
-}
+      void DataValue::
+      ulonglong_next (Type&)
+      {
+      }
 
-else ulonglong_none (o);
-}
+      void DataValue::
+      ulonglong_next (Type const&)
+      {
+      }
 
-void DataValue::
-ulonglong (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
+      void DataValue::
+      ulonglong_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-ulonglong_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) ulonglong_next (o);
-}
+      void DataValue::
+      ulonglong_post (Type const&)
+      {
+      }
 
-ulonglong_post (o);
-}
+      void DataValue::
+      ulonglong_none (Type&)
+      {
+      }
 
-else ulonglong_none (o);
-}
+      void DataValue::
+      ulonglong_none (Type const&)
+      {
+      }
 
-void DataValue::
-ulonglong_pre (Type&)
-{
-}
+      void DataValue::
+      longdouble (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-void DataValue::
-ulonglong_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          longdouble_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) longdouble_next (o);
+          }
+
+          longdouble_post (o);
+        }
 
-void DataValue::
-ulonglong_next (Type&)
-{
-}
+        else longdouble_none (o);
+      }
 
-void DataValue::
-ulonglong_next (Type const&)
-{
-}
+      void DataValue::
+      longdouble (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-void DataValue::
-ulonglong_post (Type&)
-{
-}
+        if (b != e)
+        {
+          longdouble_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) longdouble_next (o);
+          }
+
+          longdouble_post (o);
+        }
 
-void DataValue::
-ulonglong_post (Type const&)
-{
-}
+        else longdouble_none (o);
+      }
 
-void DataValue::
-ulonglong_none (Type&)
-{
-}
+      void DataValue::
+      longdouble_pre (Type&)
+      {
+      }
 
-void DataValue::
-ulonglong_none (Type const&)
-{
-}
+      void DataValue::
+      longdouble_pre (Type const&)
+      {
+      }
 
-void DataValue::
-longdouble (Type& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
+      void DataValue::
+      longdouble_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-longdouble_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) longdouble_next (o);
-}
+      void DataValue::
+      longdouble_next (Type const&)
+      {
+      }
 
-longdouble_post (o);
-}
+      void DataValue::
+      longdouble_post (Type&)
+      {
+      }
 
-else longdouble_none (o);
-}
+      void DataValue::
+      longdouble_post (Type const&)
+      {
+      }
 
-void DataValue::
-longdouble (Type const& o)
-{
-// VC6 anathema strikes again
-//
-DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble());
+      void DataValue::
+      longdouble_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-longdouble_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) longdouble_next (o);
-}
+      void DataValue::
+      longdouble_none (Type const&)
+      {
+      }
 
-longdouble_post (o);
-}
+      void DataValue::
+      member (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-else longdouble_none (o);
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void DataValue::
-longdouble_pre (Type&)
-{
-}
+        else member_none (o);
+      }
 
-void DataValue::
-longdouble_pre (Type const&)
-{
-}
+      void DataValue::
+      member (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-void DataValue::
-longdouble_next (Type&)
-{
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void DataValue::
-longdouble_next (Type const&)
-{
-}
+        else member_none (o);
+      }
 
-void DataValue::
-longdouble_post (Type&)
-{
-}
+      void DataValue::
+      member_pre (Type&)
+      {
+      }
 
-void DataValue::
-longdouble_post (Type const&)
-{
-}
+      void DataValue::
+      member_pre (Type const&)
+      {
+      }
 
-void DataValue::
-longdouble_none (Type&)
-{
-}
+      void DataValue::
+      member_next (Type&)
+      {
+      }
 
-void DataValue::
-longdouble_none (Type const&)
-{
-}
+      void DataValue::
+      member_next (Type const&)
+      {
+      }
 
-void DataValue::
-post (Type&)
-{
-}
+      void DataValue::
+      member_post (Type&)
+      {
+      }
 
-void DataValue::
-post (Type const&)
-{
-}
+      void DataValue::
+      member_post (Type const&)
+      {
+      }
 
-// EnumType
-//
-//
+      void DataValue::
+      member_none (Type&)
+      {
+      }
 
-void EnumType::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-typeId (o);
-member (o);
-post (o);
-}
+      void DataValue::
+      member_none (Type const&)
+      {
+      }
 
-void EnumType::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-typeId (o);
-member (o);
-post (o);
-}
+      void DataValue::
+      post (Type&)
+      {
+      }
 
-void EnumType::
-pre (Type&)
-{
-}
+      void DataValue::
+      post (Type const&)
+      {
+      }
 
-void EnumType::
-pre (Type const&)
-{
-}
+      // EnumType
+      //
+      //
 
-void EnumType::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void EnumType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        member (o);
+        post (o);
+      }
 
-void EnumType::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void EnumType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        member (o);
+        post (o);
+      }
 
-void EnumType::
-typeId (Type& o)
-{
-dispatch (o.typeId ());
-}
+      void EnumType::
+      pre (Type&)
+      {
+      }
 
-void EnumType::
-typeId (Type const& o)
-{
-dispatch (o.typeId ());
-}
+      void EnumType::
+      pre (Type const&)
+      {
+      }
 
-void EnumType::
-member (Type& o)
-{
-// VC6 anathema strikes again
-//
-EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
+      void EnumType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-if (b != e)
-{
-member_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) member_next (o);
-}
+      void EnumType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-member_post (o);
-}
-}
+      void EnumType::
+      typeId (Type& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-void EnumType::
-member (Type const& o)
-{
-// VC6 anathema strikes again
-//
-EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
+      void EnumType::
+      typeId (Type const& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-if (b != e)
-{
-member_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) member_next (o);
-}
+      void EnumType::
+      member (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-member_post (o);
-}
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
+      }
 
-void EnumType::
-member_pre (Type&)
-{
-}
+      void EnumType::
+      member (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-void EnumType::
-member_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
+      }
 
-void EnumType::
-member_next (Type&)
-{
-}
+      void EnumType::
+      member_pre (Type&)
+      {
+      }
 
-void EnumType::
-member_next (Type const&)
-{
-}
+      void EnumType::
+      member_pre (Type const&)
+      {
+      }
 
-void EnumType::
-member_post (Type&)
-{
-}
+      void EnumType::
+      member_next (Type&)
+      {
+      }
 
-void EnumType::
-member_post (Type const&)
-{
-}
+      void EnumType::
+      member_next (Type const&)
+      {
+      }
 
-void EnumType::
-post (Type&)
-{
-}
+      void EnumType::
+      member_post (Type&)
+      {
+      }
 
-void EnumType::
-post (Type const&)
-{
-}
+      void EnumType::
+      member_post (Type const&)
+      {
+      }
 
-// Any
-//
-//
+      void EnumType::
+      post (Type&)
+      {
+      }
 
-void Any::
-traverse (Type& o)
-{
-pre (o);
-type (o);
-value (o);
-post (o);
-}
+      void EnumType::
+      post (Type const&)
+      {
+      }
 
-void Any::
-traverse (Type const& o)
-{
-pre (o);
-type (o);
-value (o);
-post (o);
-}
+      // StructType
+      //
+      //
 
-void Any::
-pre (Type&)
-{
-}
+      void StructType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        member (o);
+        post (o);
+      }
 
-void Any::
-pre (Type const&)
-{
-}
+      void StructType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        member (o);
+        post (o);
+      }
 
-void Any::
-type (Type& o)
-{
-dispatch (o.type ());
-}
+      void StructType::
+      pre (Type&)
+      {
+      }
 
-void Any::
-type (Type const& o)
-{
-dispatch (o.type ());
-}
+      void StructType::
+      pre (Type const&)
+      {
+      }
 
-void Any::
-value (Type& o)
-{
-dispatch (o.value ());
-}
+      void StructType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Any::
-value (Type const& o)
-{
-dispatch (o.value ());
-}
+      void StructType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Any::
-post (Type&)
-{
-}
+      void StructType::
+      typeId (Type& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-void Any::
-post (Type const&)
-{
-}
+      void StructType::
+      typeId (Type const& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-// Property
-//
-//
+      void StructType::
+      member (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        StructType::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-void Property::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-value (o);
-post (o);
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void Property::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-value (o);
-post (o);
-}
+        else member_none (o);
+      }
 
-void Property::
-pre (Type&)
-{
-}
+      void StructType::
+      member (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        StructType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-void Property::
-pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void Property::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+        else member_none (o);
+      }
 
-void Property::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void StructType::
+      member_pre (Type&)
+      {
+      }
 
-void Property::
-value (Type& o)
-{
-dispatch (o.value ());
-}
+      void StructType::
+      member_pre (Type const&)
+      {
+      }
 
-void Property::
-value (Type const& o)
-{
-dispatch (o.value ());
-}
+      void StructType::
+      member_next (Type&)
+      {
+      }
 
-void Property::
-post (Type&)
-{
-}
+      void StructType::
+      member_next (Type const&)
+      {
+      }
 
-void Property::
-post (Type const&)
-{
-}
+      void StructType::
+      member_post (Type&)
+      {
+      }
 
-// SatisfierProperty
-//
-//
+      void StructType::
+      member_post (Type const&)
+      {
+      }
 
-void SatisfierProperty::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-kind (o);
-dynamic (o);
-value (o);
-post (o);
-}
+      void StructType::
+      member_none (Type&)
+      {
+      }
 
-void SatisfierProperty::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-kind (o);
-dynamic (o);
-value (o);
-post (o);
-}
+      void StructType::
+      member_none (Type const&)
+      {
+      }
 
-void SatisfierProperty::
-pre (Type&)
-{
-}
+      void StructType::
+      post (Type&)
+      {
+      }
 
-void SatisfierProperty::
-pre (Type const&)
-{
-}
+      void StructType::
+      post (Type const&)
+      {
+      }
 
-void SatisfierProperty::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      // StructMemberType
+      //
+      //
 
-void SatisfierProperty::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void StructMemberType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        post (o);
+      }
 
-void SatisfierProperty::
-kind (Type& o)
-{
-dispatch (o.kind ());
-}
+      void StructMemberType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        post (o);
+      }
 
-void SatisfierProperty::
-kind (Type const& o)
-{
-dispatch (o.kind ());
-}
+      void StructMemberType::
+      pre (Type&)
+      {
+      }
 
-void SatisfierProperty::
-dynamic (Type& o)
-{
-dispatch (o.dynamic ());
-}
+      void StructMemberType::
+      pre (Type const&)
+      {
+      }
 
-void SatisfierProperty::
-dynamic (Type const& o)
-{
-dispatch (o.dynamic ());
-}
+      void StructMemberType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void SatisfierProperty::
-value (Type& o)
-{
-dispatch (o.value ());
-}
+      void StructMemberType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void SatisfierProperty::
-value (Type const& o)
-{
-dispatch (o.value ());
-}
+      void StructMemberType::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
 
-void SatisfierProperty::
-post (Type&)
-{
-}
+      void StructMemberType::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
 
-void SatisfierProperty::
-post (Type const&)
-{
-}
+      void StructMemberType::
+      post (Type&)
+      {
+      }
 
-// Resource
-//
-//
+      void StructMemberType::
+      post (Type const&)
+      {
+      }
 
-void Resource::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-property (o);
-post (o);
-}
+      // ValueType
+      //
+      //
 
-void Resource::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-property (o);
-post (o);
-}
+      void ValueType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        modifier (o);
+        baseType (o);
+        member (o);
+        post (o);
+      }
 
-void Resource::
-pre (Type&)
-{
-}
+      void ValueType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        modifier (o);
+        baseType (o);
+        member (o);
+        post (o);
+      }
 
-void Resource::
-pre (Type const&)
-{
-}
+      void ValueType::
+      pre (Type&)
+      {
+      }
 
-void Resource::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void ValueType::
+      pre (Type const&)
+      {
+      }
 
-void Resource::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void ValueType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Resource::
-resourceType (Type& o)
-{
-// VC6 anathema strikes again
-//
-Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+      void ValueType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-if (b != e)
-{
-resourceType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resourceType_next (o);
-}
+      void ValueType::
+      typeId (Type& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-resourceType_post (o);
-}
-}
+      void ValueType::
+      typeId (Type const& o)
+      {
+        dispatch (o.typeId ());
+      }
 
-void Resource::
-resourceType (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+      void ValueType::
+      modifier (Type& o)
+      {
+        dispatch (o.modifier ());
+      }
 
-if (b != e)
-{
-resourceType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resourceType_next (o);
-}
+      void ValueType::
+      modifier (Type const& o)
+      {
+        dispatch (o.modifier ());
+      }
 
-resourceType_post (o);
-}
-}
+      void ValueType::
+      baseType (Type& o)
+      {
+        dispatch (o.baseType ());
+      }
 
-void Resource::
-resourceType_pre (Type&)
-{
-}
+      void ValueType::
+      baseType (Type const& o)
+      {
+        dispatch (o.baseType ());
+      }
 
-void Resource::
-resourceType_pre (Type const&)
-{
-}
+      void ValueType::
+      member (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ValueType::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-void Resource::
-resourceType_next (Type&)
-{
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void Resource::
-resourceType_next (Type const&)
-{
-}
+        else member_none (o);
+      }
 
-void Resource::
-resourceType_post (Type&)
-{
-}
+      void ValueType::
+      member (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ValueType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-void Resource::
-resourceType_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          member_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) member_next (o);
+          }
+
+          member_post (o);
+        }
 
-void Resource::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-Resource::Type::property_iterator b (o.begin_property()), e (o.end_property());
+        else member_none (o);
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ValueType::
+      member_pre (Type&)
+      {
+      }
 
-property_post (o);
-}
+      void ValueType::
+      member_pre (Type const&)
+      {
+      }
 
-else property_none (o);
-}
+      void ValueType::
+      member_next (Type&)
+      {
+      }
 
-void Resource::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void ValueType::
+      member_next (Type const&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ValueType::
+      member_post (Type&)
+      {
+      }
 
-property_post (o);
-}
+      void ValueType::
+      member_post (Type const&)
+      {
+      }
 
-else property_none (o);
-}
+      void ValueType::
+      member_none (Type&)
+      {
+      }
 
-void Resource::
-property_pre (Type&)
-{
-}
+      void ValueType::
+      member_none (Type const&)
+      {
+      }
 
-void Resource::
-property_pre (Type const&)
-{
-}
+      void ValueType::
+      post (Type&)
+      {
+      }
 
-void Resource::
-property_next (Type&)
-{
-}
+      void ValueType::
+      post (Type const&)
+      {
+      }
 
-void Resource::
-property_next (Type const&)
-{
-}
+      // ValueMemberType
+      //
+      //
 
-void Resource::
-property_post (Type&)
-{
-}
+      void ValueMemberType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        visibility (o);
+        type (o);
+        post (o);
+      }
 
-void Resource::
-property_post (Type const&)
-{
-}
+      void ValueMemberType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        visibility (o);
+        type (o);
+        post (o);
+      }
 
-void Resource::
-property_none (Type&)
-{
-}
+      void ValueMemberType::
+      pre (Type&)
+      {
+      }
 
-void Resource::
-property_none (Type const&)
-{
-}
+      void ValueMemberType::
+      pre (Type const&)
+      {
+      }
 
-void Resource::
-post (Type&)
-{
-}
+      void ValueMemberType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Resource::
-post (Type const&)
-{
-}
+      void ValueMemberType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-// Requirement
-//
-//
+      void ValueMemberType::
+      visibility (Type& o)
+      {
+        dispatch (o.visibility ());
+      }
 
-void Requirement::
-traverse (Type& o)
-{
-pre (o);
-resourceType (o);
-name (o);
-property (o);
-post (o);
-}
+      void ValueMemberType::
+      visibility (Type const& o)
+      {
+        dispatch (o.visibility ());
+      }
 
-void Requirement::
-traverse (Type const& o)
-{
-pre (o);
-resourceType (o);
-name (o);
-property (o);
-post (o);
-}
+      void ValueMemberType::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
 
-void Requirement::
-pre (Type&)
-{
-}
+      void ValueMemberType::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
 
-void Requirement::
-pre (Type const&)
-{
-}
+      void ValueMemberType::
+      post (Type&)
+      {
+      }
 
-void Requirement::
-resourceType (Type& o)
-{
-dispatch (o.resourceType ());
-}
+      void ValueMemberType::
+      post (Type const&)
+      {
+      }
 
-void Requirement::
-resourceType (Type const& o)
-{
-dispatch (o.resourceType ());
-}
+      // NamedValue
+      //
+      //
 
-void Requirement::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void NamedValue::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        value (o);
+        post (o);
+      }
 
-void Requirement::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void NamedValue::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        value (o);
+        post (o);
+      }
 
-void Requirement::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-Requirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
+      void NamedValue::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void NamedValue::
+      pre (Type const&)
+      {
+      }
 
-property_post (o);
-}
+      void NamedValue::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-else property_none (o);
-}
+      void NamedValue::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Requirement::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Requirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void NamedValue::
+      value (Type& o)
+      {
+        dispatch (o.value ());
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void NamedValue::
+      value (Type const& o)
+      {
+        dispatch (o.value ());
+      }
 
-property_post (o);
-}
+      void NamedValue::
+      post (Type&)
+      {
+      }
 
-else property_none (o);
-}
+      void NamedValue::
+      post (Type const&)
+      {
+      }
 
-void Requirement::
-property_pre (Type&)
-{
-}
+      // SequenceType
+      //
+      //
 
-void Requirement::
-property_pre (Type const&)
-{
-}
+      void SequenceType::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.bound_p ()) bound (o);
+        else bound_none (o);
+        elementType (o);
+        post (o);
+      }
 
-void Requirement::
-property_next (Type&)
-{
-}
+      void SequenceType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.bound_p ()) bound (o);
+        else bound_none (o);
+        elementType (o);
+        post (o);
+      }
 
-void Requirement::
-property_next (Type const&)
-{
-}
+      void SequenceType::
+      pre (Type&)
+      {
+      }
 
-void Requirement::
-property_post (Type&)
-{
-}
+      void SequenceType::
+      pre (Type const&)
+      {
+      }
 
-void Requirement::
-property_post (Type const&)
-{
-}
+      void SequenceType::
+      bound (Type& o)
+      {
+        dispatch (o.bound ());
+      }
 
-void Requirement::
-property_none (Type&)
-{
-}
+      void SequenceType::
+      bound (Type const& o)
+      {
+        dispatch (o.bound ());
+      }
 
-void Requirement::
-property_none (Type const&)
-{
-}
+      void SequenceType::
+      bound_none (Type&)
+      {
+      }
 
-void Requirement::
-post (Type&)
-{
-}
+      void SequenceType::
+      bound_none (Type const&)
+      {
+      }
 
-void Requirement::
-post (Type const&)
-{
-}
+      void SequenceType::
+      elementType (Type& o)
+      {
+        dispatch (o.elementType ());
+      }
 
-// ResourceDeploymentDescription
-//
-//
+      void SequenceType::
+      elementType (Type const& o)
+      {
+        dispatch (o.elementType ());
+      }
 
-void ResourceDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+      void SequenceType::
+      post (Type&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+      void SequenceType::
+      post (Type const&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-pre (Type&)
-{
-}
+      // Any
+      //
+      //
 
-void ResourceDeploymentDescription::
-pre (Type const&)
-{
-}
+      void Any::
+      traverse (Type& o)
+      {
+        pre (o);
+        type (o);
+        value (o);
+        post (o);
+      }
 
-void ResourceDeploymentDescription::
-requirementName (Type& o)
-{
-dispatch (o.requirementName ());
-}
+      void Any::
+      traverse (Type const& o)
+      {
+        pre (o);
+        type (o);
+        value (o);
+        post (o);
+      }
 
-void ResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-dispatch (o.requirementName ());
-}
+      void Any::
+      pre (Type&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-resourceName (Type& o)
-{
-dispatch (o.resourceName ());
-}
+      void Any::
+      pre (Type const&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-dispatch (o.resourceName ());
-}
+      void Any::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
 
-void ResourceDeploymentDescription::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-ResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
+      void Any::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void Any::
+      value (Type& o)
+      {
+        dispatch (o.value ());
+      }
 
-property_post (o);
-}
+      void Any::
+      value (Type const& o)
+      {
+        dispatch (o.value ());
+      }
 
-else property_none (o);
-}
+      void Any::
+      post (Type&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void Any::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      // Property
+      //
+      //
 
-property_post (o);
-}
+      void Property::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        value (o);
+        post (o);
+      }
 
-else property_none (o);
-}
+      void Property::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        value (o);
+        post (o);
+      }
 
-void ResourceDeploymentDescription::
-property_pre (Type&)
-{
-}
+      void Property::
+      pre (Type&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-property_pre (Type const&)
-{
-}
+      void Property::
+      pre (Type const&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-property_next (Type&)
-{
-}
+      void Property::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ResourceDeploymentDescription::
-property_next (Type const&)
-{
-}
+      void Property::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ResourceDeploymentDescription::
-property_post (Type&)
-{
-}
+      void Property::
+      value (Type& o)
+      {
+        dispatch (o.value ());
+      }
 
-void ResourceDeploymentDescription::
-property_post (Type const&)
-{
-}
+      void Property::
+      value (Type const& o)
+      {
+        dispatch (o.value ());
+      }
 
-void ResourceDeploymentDescription::
-property_none (Type&)
-{
-}
+      void Property::
+      post (Type&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-property_none (Type const&)
-{
-}
+      void Property::
+      post (Type const&)
+      {
+      }
 
-void ResourceDeploymentDescription::
-post (Type&)
-{
-}
+      // SatisfierProperty
+      //
+      //
 
-void ResourceDeploymentDescription::
-post (Type const&)
-{
-}
+      void SatisfierProperty::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        kind (o);
+        dynamic (o);
+        value (o);
+        post (o);
+      }
 
-// ArtifactDeploymentDescription
-//
-//
+      void SatisfierProperty::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        kind (o);
+        dynamic (o);
+        value (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-source (o);
-node (o);
-location (o);
-execParameter (o);
-deployRequirement (o);
-deployedResource (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void SatisfierProperty::
+      pre (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-source (o);
-node (o);
-location (o);
-execParameter (o);
-deployRequirement (o);
-deployedResource (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void SatisfierProperty::
+      pre (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-pre (Type&)
-{
-}
+      void SatisfierProperty::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ArtifactDeploymentDescription::
-pre (Type const&)
-{
-}
+      void SatisfierProperty::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ArtifactDeploymentDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void SatisfierProperty::
+      kind (Type& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void ArtifactDeploymentDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void SatisfierProperty::
+      kind (Type const& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void ArtifactDeploymentDescription::
-source (Type& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
+      void SatisfierProperty::
+      dynamic (Type& o)
+      {
+        dispatch (o.dynamic ());
+      }
 
-if (b != e)
-{
-source_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) source_next (o);
-}
+      void SatisfierProperty::
+      dynamic (Type const& o)
+      {
+        dispatch (o.dynamic ());
+      }
 
-source_post (o);
-}
-}
+      void SatisfierProperty::
+      value (Type& o)
+      {
+        dispatch (o.value ());
+      }
 
-void ArtifactDeploymentDescription::
-source (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
+      void SatisfierProperty::
+      value (Type const& o)
+      {
+        dispatch (o.value ());
+      }
 
-if (b != e)
-{
-source_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) source_next (o);
-}
+      void SatisfierProperty::
+      post (Type&)
+      {
+      }
 
-source_post (o);
-}
-}
+      void SatisfierProperty::
+      post (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-source_pre (Type&)
-{
-}
+      // Resource
+      //
+      //
 
-void ArtifactDeploymentDescription::
-source_pre (Type const&)
-{
-}
+      void Resource::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-source_next (Type&)
-{
-}
+      void Resource::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-source_next (Type const&)
-{
-}
+      void Resource::
+      pre (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-source_post (Type&)
-{
-}
+      void Resource::
+      pre (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-source_post (Type const&)
-{
-}
+      void Resource::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ArtifactDeploymentDescription::
-node (Type& o)
-{
-dispatch (o.node ());
-}
+      void Resource::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ArtifactDeploymentDescription::
-node (Type const& o)
-{
-dispatch (o.node ());
-}
+      void Resource::
+      resourceType (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-void ArtifactDeploymentDescription::
-location (Type& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
+        if (b != e)
+        {
+          resourceType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resourceType_next (o);
+          }
+
+          resourceType_post (o);
+        }
+      }
 
-if (b != e)
-{
-location_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) location_next (o);
-}
+      void Resource::
+      resourceType (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-location_post (o);
-}
-}
+        if (b != e)
+        {
+          resourceType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resourceType_next (o);
+          }
+
+          resourceType_post (o);
+        }
+      }
 
-void ArtifactDeploymentDescription::
-location (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
+      void Resource::
+      resourceType_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-location_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) location_next (o);
-}
+      void Resource::
+      resourceType_pre (Type const&)
+      {
+      }
 
-location_post (o);
-}
-}
+      void Resource::
+      resourceType_next (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-location_pre (Type&)
-{
-}
+      void Resource::
+      resourceType_next (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-location_pre (Type const&)
-{
-}
+      void Resource::
+      resourceType_post (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-location_next (Type&)
-{
-}
+      void Resource::
+      resourceType_post (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-location_next (Type const&)
-{
-}
+      void Resource::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Resource::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-void ArtifactDeploymentDescription::
-location_post (Type&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ArtifactDeploymentDescription::
-location_post (Type const&)
-{
-}
+        else property_none (o);
+      }
 
-void ArtifactDeploymentDescription::
-execParameter (Type& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+      void Resource::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-execParameter_post (o);
-}
+        else property_none (o);
+      }
 
-else execParameter_none (o);
-}
+      void Resource::
+      property_pre (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+      void Resource::
+      property_pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
+      void Resource::
+      property_next (Type&)
+      {
+      }
 
-execParameter_post (o);
-}
+      void Resource::
+      property_next (Type const&)
+      {
+      }
 
-else execParameter_none (o);
-}
+      void Resource::
+      property_post (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_pre (Type&)
-{
-}
+      void Resource::
+      property_post (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_pre (Type const&)
-{
-}
+      void Resource::
+      property_none (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_next (Type&)
-{
-}
+      void Resource::
+      property_none (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_next (Type const&)
-{
-}
+      void Resource::
+      post (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_post (Type&)
-{
-}
+      void Resource::
+      post (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_post (Type const&)
-{
-}
+      // Requirement
+      //
+      //
 
-void ArtifactDeploymentDescription::
-execParameter_none (Type&)
-{
-}
+      void Requirement::
+      traverse (Type& o)
+      {
+        pre (o);
+        resourceType (o);
+        name (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_none (Type const&)
-{
-}
+      void Requirement::
+      traverse (Type const& o)
+      {
+        pre (o);
+        resourceType (o);
+        name (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void Requirement::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void Requirement::
+      pre (Type const&)
+      {
+      }
 
-deployRequirement_post (o);
-}
+      void Requirement::
+      resourceType (Type& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-else deployRequirement_none (o);
-}
+      void Requirement::
+      resourceType (Type const& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void Requirement::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void Requirement::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-deployRequirement_post (o);
-}
+      void Requirement::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Requirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-else deployRequirement_none (o);
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ArtifactDeploymentDescription::
-deployRequirement_pre (Type&)
-{
-}
+        else property_none (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_pre (Type const&)
-{
-}
+      void Requirement::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Requirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-void ArtifactDeploymentDescription::
-deployRequirement_next (Type&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ArtifactDeploymentDescription::
-deployRequirement_next (Type const&)
-{
-}
+        else property_none (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_post (Type&)
-{
-}
+      void Requirement::
+      property_pre (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_post (Type const&)
-{
-}
+      void Requirement::
+      property_pre (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_none (Type&)
-{
-}
+      void Requirement::
+      property_next (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_none (Type const&)
-{
-}
+      void Requirement::
+      property_next (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource (Type& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+      void Requirement::
+      property_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-deployedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployedResource_next (o);
-}
+      void Requirement::
+      property_post (Type const&)
+      {
+      }
 
-deployedResource_post (o);
-}
+      void Requirement::
+      property_none (Type&)
+      {
+      }
 
-else deployedResource_none (o);
-}
+      void Requirement::
+      property_none (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+      void Requirement::
+      post (Type&)
+      {
+      }
 
-if (b != e)
-{
-deployedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployedResource_next (o);
-}
+      void Requirement::
+      post (Type const&)
+      {
+      }
 
-deployedResource_post (o);
-}
+      // ResourceDeploymentDescription
+      //
+      //
 
-else deployedResource_none (o);
-}
+      void ResourceDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_pre (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_pre (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_next (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_next (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      requirementName (Type& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_post (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_post (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      resourceName (Type& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_none (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_none (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-void ArtifactDeploymentDescription::
-id (Type& o)
-{
-dispatch (o.id ());
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ArtifactDeploymentDescription::
-id (Type const& o)
-{
-dispatch (o.id ());
-}
+        else property_none (o);
+      }
 
-void ArtifactDeploymentDescription::
-id_none (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-void ArtifactDeploymentDescription::
-id_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ArtifactDeploymentDescription::
-post (Type&)
-{
-}
+        else property_none (o);
+      }
 
-void ArtifactDeploymentDescription::
-post (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      property_pre (Type&)
+      {
+      }
 
-// MonolithicDeploymentDescription
-//
-//
+      void ResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-source (o);
-artifact (o);
-execParameter (o);
-deployRequirement (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void ResourceDeploymentDescription::
+      property_next (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-source (o);
-artifact (o);
-execParameter (o);
-deployRequirement (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void ResourceDeploymentDescription::
+      property_next (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-pre (Type&)
-{
-}
+      void ResourceDeploymentDescription::
+      property_post (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-pre (Type const&)
-{
-}
+      void ResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void ResourceDeploymentDescription::
+      property_none (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void ResourceDeploymentDescription::
+      property_none (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-source (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
+      void ResourceDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-if (b != e)
-{
-source_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) source_next (o);
-}
+      void ResourceDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-source_post (o);
-}
-}
+      // ArtifactDeploymentDescription
+      //
+      //
 
-void MonolithicDeploymentDescription::
-source (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
+      void ArtifactDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        source (o);
+        node (o);
+        location (o);
+        execParameter (o);
+        deployRequirement (o);
+        deployedResource (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-if (b != e)
-{
-source_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) source_next (o);
-}
+      void ArtifactDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        source (o);
+        node (o);
+        location (o);
+        execParameter (o);
+        deployRequirement (o);
+        deployedResource (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-source_post (o);
-}
-}
+      void ArtifactDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-source_pre (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-source_pre (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void MonolithicDeploymentDescription::
-source_next (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void MonolithicDeploymentDescription::
-source_next (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      source (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-void MonolithicDeploymentDescription::
-source_post (Type&)
-{
-}
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
 
-void MonolithicDeploymentDescription::
-source_post (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      source (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
 
-void MonolithicDeploymentDescription::
-artifact (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
 
-if (b != e)
-{
-artifact_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) artifact_next (o);
-}
+      void ArtifactDeploymentDescription::
+      source_pre (Type&)
+      {
+      }
 
-artifact_post (o);
-}
-}
+      void ArtifactDeploymentDescription::
+      source_pre (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-artifact (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
+      void ArtifactDeploymentDescription::
+      source_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-artifact_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) artifact_next (o);
-}
+      void ArtifactDeploymentDescription::
+      source_next (Type const&)
+      {
+      }
 
-artifact_post (o);
-}
-}
+      void ArtifactDeploymentDescription::
+      source_post (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-artifact_pre (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      source_post (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-artifact_pre (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      node (Type& o)
+      {
+        dispatch (o.node ());
+      }
 
-void MonolithicDeploymentDescription::
-artifact_next (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      node (Type const& o)
+      {
+        dispatch (o.node ());
+      }
 
-void MonolithicDeploymentDescription::
-artifact_next (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      location (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
 
-void MonolithicDeploymentDescription::
-artifact_post (Type&)
-{
-}
+        if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) location_next (o);
+          }
+
+          location_post (o);
+        }
+      }
 
-void MonolithicDeploymentDescription::
-artifact_post (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      location (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
 
-void MonolithicDeploymentDescription::
-execParameter (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+        if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) location_next (o);
+          }
+
+          location_post (o);
+        }
+      }
 
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
+      void ArtifactDeploymentDescription::
+      location_pre (Type&)
+      {
+      }
 
-execParameter_post (o);
-}
+      void ArtifactDeploymentDescription::
+      location_pre (Type const&)
+      {
+      }
 
-else execParameter_none (o);
-}
+      void ArtifactDeploymentDescription::
+      location_next (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-execParameter (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+      void ArtifactDeploymentDescription::
+      location_next (Type const&)
+      {
+      }
 
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
+      void ArtifactDeploymentDescription::
+      location_post (Type&)
+      {
+      }
 
-execParameter_post (o);
-}
+      void ArtifactDeploymentDescription::
+      location_post (Type const&)
+      {
+      }
 
-else execParameter_none (o);
-}
+      void ArtifactDeploymentDescription::
+      execParameter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-void MonolithicDeploymentDescription::
-execParameter_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
 
-void MonolithicDeploymentDescription::
-execParameter_pre (Type const&)
-{
-}
+        else execParameter_none (o);
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_next (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      execParameter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-void MonolithicDeploymentDescription::
-execParameter_next (Type const&)
-{
-}
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
 
-void MonolithicDeploymentDescription::
-execParameter_post (Type&)
-{
-}
+        else execParameter_none (o);
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_post (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      execParameter_pre (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_none (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      execParameter_pre (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_none (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      execParameter_next (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ArtifactDeploymentDescription::
+      execParameter_next (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ArtifactDeploymentDescription::
+      execParameter_post (Type&)
+      {
+      }
 
-deployRequirement_post (o);
-}
+      void ArtifactDeploymentDescription::
+      execParameter_post (Type const&)
+      {
+      }
 
-else deployRequirement_none (o);
-}
+      void ArtifactDeploymentDescription::
+      execParameter_none (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ArtifactDeploymentDescription::
+      execParameter_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-deployRequirement_post (o);
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-else deployRequirement_none (o);
-}
+        else deployRequirement_none (o);
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_pre (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void MonolithicDeploymentDescription::
-deployRequirement_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-void MonolithicDeploymentDescription::
-deployRequirement_next (Type&)
-{
-}
+        else deployRequirement_none (o);
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_next (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_post (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_post (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_next (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_none (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_none (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_post (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-id (Type& o)
-{
-dispatch (o.id ());
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-id (Type const& o)
-{
-dispatch (o.id ());
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_none (Type&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-id_none (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-id_none (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployedResource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void MonolithicDeploymentDescription::
-post (Type&)
-{
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void MonolithicDeploymentDescription::
-post (Type const&)
-{
-}
+        else deployedResource_none (o);
+      }
 
-// InstanceResourceDeploymentDescription
-//
-//
+      void ArtifactDeploymentDescription::
+      deployedResource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void InstanceResourceDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-resourceUsage (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void InstanceResourceDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-resourceUsage (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+        else deployedResource_none (o);
+      }
 
-void InstanceResourceDeploymentDescription::
-pre (Type&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_pre (Type&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-pre (Type const&)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_pre (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceUsage (Type& o)
-{
-dispatch (o.resourceUsage ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_next (Type&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceUsage (Type const& o)
-{
-dispatch (o.resourceUsage ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_next (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-requirementName (Type& o)
-{
-dispatch (o.requirementName ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_post (Type&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-dispatch (o.requirementName ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceName (Type& o)
-{
-dispatch (o.resourceName ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_none (Type&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-dispatch (o.resourceName ());
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_none (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-InstanceResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
+      void ArtifactDeploymentDescription::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ArtifactDeploymentDescription::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
 
-property_post (o);
-}
+      void ArtifactDeploymentDescription::
+      id_none (Type&)
+      {
+      }
 
-else property_none (o);
-}
+      void ArtifactDeploymentDescription::
+      id_none (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-InstanceResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void ArtifactDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ArtifactDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-property_post (o);
-}
+      // MonolithicDeploymentDescription
+      //
+      //
 
-else property_none (o);
-}
+      void MonolithicDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        source (o);
+        artifact (o);
+        execParameter (o);
+        deployRequirement (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void InstanceResourceDeploymentDescription::
-property_pre (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        source (o);
+        artifact (o);
+        execParameter (o);
+        deployRequirement (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void InstanceResourceDeploymentDescription::
-property_pre (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property_next (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property_next (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void InstanceResourceDeploymentDescription::
-property_post (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void InstanceResourceDeploymentDescription::
-property_post (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      source (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-void InstanceResourceDeploymentDescription::
-property_none (Type&)
-{
-}
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
 
-void InstanceResourceDeploymentDescription::
-property_none (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      source (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
 
-void InstanceResourceDeploymentDescription::
-post (Type&)
-{
-}
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
 
-void InstanceResourceDeploymentDescription::
-post (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      source_pre (Type&)
+      {
+      }
 
-// InstanceDeploymentDescription
-//
-//
+      void MonolithicDeploymentDescription::
+      source_pre (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-node (o);
-source (o);
-implementation (o);
-configProperty (o);
-if (o.deployedResource_p ()) deployedResource (o);
-else deployedResource_none (o);
-if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-else deployedSharedResource_none (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void MonolithicDeploymentDescription::
+      source_next (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-node (o);
-source (o);
-implementation (o);
-configProperty (o);
-if (o.deployedResource_p ()) deployedResource (o);
-else deployedResource_none (o);
-if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-else deployedSharedResource_none (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
+      void MonolithicDeploymentDescription::
+      source_next (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-pre (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      source_post (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-pre (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      source_post (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void MonolithicDeploymentDescription::
+      artifact (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
-void InstanceDeploymentDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+        if (b != e)
+        {
+          artifact_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) artifact_next (o);
+          }
+
+          artifact_post (o);
+        }
+      }
 
-void InstanceDeploymentDescription::
-node (Type& o)
-{
-dispatch (o.node ());
-}
+      void MonolithicDeploymentDescription::
+      artifact (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
 
-void InstanceDeploymentDescription::
-node (Type const& o)
-{
-dispatch (o.node ());
-}
+        if (b != e)
+        {
+          artifact_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) artifact_next (o);
+          }
+
+          artifact_post (o);
+        }
+      }
 
-void InstanceDeploymentDescription::
-source (Type& o)
-{
-dispatch (o.source ());
-}
+      void MonolithicDeploymentDescription::
+      artifact_pre (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-source (Type const& o)
-{
-dispatch (o.source ());
-}
+      void MonolithicDeploymentDescription::
+      artifact_pre (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-implementation (Type& o)
-{
-dispatch (o.implementation ());
-}
+      void MonolithicDeploymentDescription::
+      artifact_next (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-implementation (Type const& o)
-{
-dispatch (o.implementation ());
-}
+      void MonolithicDeploymentDescription::
+      artifact_next (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+      void MonolithicDeploymentDescription::
+      artifact_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void MonolithicDeploymentDescription::
+      artifact_post (Type const&)
+      {
+      }
 
-configProperty_post (o);
-}
+      void MonolithicDeploymentDescription::
+      execParameter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-else configProperty_none (o);
-}
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
 
-void InstanceDeploymentDescription::
-configProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+        else execParameter_none (o);
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void MonolithicDeploymentDescription::
+      execParameter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-configProperty_post (o);
-}
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
 
-else configProperty_none (o);
-}
+        else execParameter_none (o);
+      }
 
-void InstanceDeploymentDescription::
-configProperty_pre (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_pre (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_pre (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_pre (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_next (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_next (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_next (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_next (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_post (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_post (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_post (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_post (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_none (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_none (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-configProperty_none (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      execParameter_none (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-deployedResource (Type& o)
-{
-dispatch (o.deployedResource ());
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void InstanceDeploymentDescription::
-deployedResource (Type const& o)
-{
-dispatch (o.deployedResource ());
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-void InstanceDeploymentDescription::
-deployedResource_none (Type&)
-{
-}
+        else deployRequirement_none (o);
+      }
 
-void InstanceDeploymentDescription::
-deployedResource_none (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void InstanceDeploymentDescription::
-deployedSharedResource (Type& o)
-{
-dispatch (o.deployedSharedResource ());
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-void InstanceDeploymentDescription::
-deployedSharedResource (Type const& o)
-{
-dispatch (o.deployedSharedResource ());
-}
+        else deployRequirement_none (o);
+      }
 
-void InstanceDeploymentDescription::
-deployedSharedResource_none (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-deployedSharedResource_none (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-id (Type& o)
-{
-dispatch (o.id ());
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_next (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-id (Type const& o)
-{
-dispatch (o.id ());
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-id_none (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_post (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-id_none (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-post (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_none (Type&)
+      {
+      }
 
-void InstanceDeploymentDescription::
-post (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
 
-// ComponentPortDescription
-//
-//
+      void MonolithicDeploymentDescription::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
 
-void ComponentPortDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.specificType_p ()) specificType (o);
-else specificType_none (o);
-supportedType (o);
-provider (o);
-exclusiveProvider (o);
-exclusiveUser (o);
-optional (o);
-kind (o);
-post (o);
-}
+      void MonolithicDeploymentDescription::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
 
-void ComponentPortDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.specificType_p ()) specificType (o);
-else specificType_none (o);
-supportedType (o);
-provider (o);
-exclusiveProvider (o);
-exclusiveUser (o);
-optional (o);
-kind (o);
-post (o);
-}
+      void MonolithicDeploymentDescription::
+      id_none (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-pre (Type&)
-{
-}
+      void MonolithicDeploymentDescription::
+      id_none (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-pre (Type const&)
-{
-}
+      void MonolithicDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void MonolithicDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      // InstanceResourceDeploymentDescription
+      //
+      //
 
-void ComponentPortDescription::
-specificType (Type& o)
-{
-dispatch (o.specificType ());
-}
+      void InstanceResourceDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        resourceUsage (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void ComponentPortDescription::
-specificType (Type const& o)
-{
-dispatch (o.specificType ());
-}
+      void InstanceResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        resourceUsage (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void ComponentPortDescription::
-specificType_none (Type&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-specificType_none (Type const&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-supportedType (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPortDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
+      void InstanceResourceDeploymentDescription::
+      resourceUsage (Type& o)
+      {
+        dispatch (o.resourceUsage ());
+      }
 
-if (b != e)
-{
-supportedType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) supportedType_next (o);
-}
+      void InstanceResourceDeploymentDescription::
+      resourceUsage (Type const& o)
+      {
+        dispatch (o.resourceUsage ());
+      }
 
-supportedType_post (o);
-}
+      void InstanceResourceDeploymentDescription::
+      requirementName (Type& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-else supportedType_none (o);
-}
+      void InstanceResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-void ComponentPortDescription::
-supportedType (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPortDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
+      void InstanceResourceDeploymentDescription::
+      resourceName (Type& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-if (b != e)
-{
-supportedType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) supportedType_next (o);
-}
+      void InstanceResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-supportedType_post (o);
-}
+      void InstanceResourceDeploymentDescription::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-else supportedType_none (o);
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ComponentPortDescription::
-supportedType_pre (Type&)
-{
-}
+        else property_none (o);
+      }
 
-void ComponentPortDescription::
-supportedType_pre (Type const&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-void ComponentPortDescription::
-supportedType_next (Type&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ComponentPortDescription::
-supportedType_next (Type const&)
-{
-}
+        else property_none (o);
+      }
 
-void ComponentPortDescription::
-supportedType_post (Type&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      property_pre (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-supportedType_post (Type const&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-supportedType_none (Type&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      property_next (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-supportedType_none (Type const&)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      property_next (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-provider (Type& o)
-{
-dispatch (o.provider ());
-}
+      void InstanceResourceDeploymentDescription::
+      property_post (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-provider (Type const& o)
-{
-dispatch (o.provider ());
-}
+      void InstanceResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-exclusiveProvider (Type& o)
-{
-dispatch (o.exclusiveProvider ());
-}
+      void InstanceResourceDeploymentDescription::
+      property_none (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-exclusiveProvider (Type const& o)
-{
-dispatch (o.exclusiveProvider ());
-}
+      void InstanceResourceDeploymentDescription::
+      property_none (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-exclusiveUser (Type& o)
-{
-dispatch (o.exclusiveUser ());
-}
+      void InstanceResourceDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-exclusiveUser (Type const& o)
-{
-dispatch (o.exclusiveUser ());
-}
+      void InstanceResourceDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-optional (Type& o)
-{
-dispatch (o.optional ());
-}
+      // InstanceDeploymentDescription
+      //
+      //
 
-void ComponentPortDescription::
-optional (Type const& o)
-{
-dispatch (o.optional ());
-}
+      void InstanceDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        node (o);
+        source (o);
+        implementation (o);
+        configProperty (o);
+        deployedResource (o);
+        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
+        else deployedSharedResource_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void ComponentPortDescription::
-kind (Type& o)
-{
-dispatch (o.kind ());
-}
+      void InstanceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        node (o);
+        source (o);
+        implementation (o);
+        configProperty (o);
+        deployedResource (o);
+        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
+        else deployedSharedResource_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void ComponentPortDescription::
-kind (Type const& o)
-{
-dispatch (o.kind ());
-}
+      void InstanceDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void ComponentPortDescription::
-post (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void ComponentPortDescription::
-post (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-// ComponentPropertyDescription
-//
-//
+      void InstanceDeploymentDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ComponentPropertyDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-type (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      node (Type& o)
+      {
+        dispatch (o.node ());
+      }
 
-void ComponentPropertyDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-type (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      node (Type const& o)
+      {
+        dispatch (o.node ());
+      }
 
-void ComponentPropertyDescription::
-pre (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      source (Type& o)
+      {
+        dispatch (o.source ());
+      }
 
-void ComponentPropertyDescription::
-pre (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      source (Type const& o)
+      {
+        dispatch (o.source ());
+      }
 
-void ComponentPropertyDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void InstanceDeploymentDescription::
+      implementation (Type& o)
+      {
+        dispatch (o.implementation ());
+      }
 
-void ComponentPropertyDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void InstanceDeploymentDescription::
+      implementation (Type const& o)
+      {
+        dispatch (o.implementation ());
+      }
 
-void ComponentPropertyDescription::
-type (Type& o)
-{
-dispatch (o.type ());
-}
+      void InstanceDeploymentDescription::
+      configProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-void ComponentPropertyDescription::
-type (Type const& o)
-{
-dispatch (o.type ());
-}
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void ComponentPropertyDescription::
-post (Type&)
-{
-}
+        else configProperty_none (o);
+      }
 
-void ComponentPropertyDescription::
-post (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-// ComponentExternalPortEndpoint
-//
-//
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void ComponentExternalPortEndpoint::
-traverse (Type& o)
-{
-pre (o);
-portName (o);
-post (o);
-}
+        else configProperty_none (o);
+      }
 
-void ComponentExternalPortEndpoint::
-traverse (Type const& o)
-{
-pre (o);
-portName (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      configProperty_pre (Type&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-pre (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty_pre (Type const&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-pre (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty_next (Type&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-portName (Type& o)
-{
-dispatch (o.portName ());
-}
+      void InstanceDeploymentDescription::
+      configProperty_next (Type const&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-portName (Type const& o)
-{
-dispatch (o.portName ());
-}
+      void InstanceDeploymentDescription::
+      configProperty_post (Type&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-post (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty_post (Type const&)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-post (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty_none (Type&)
+      {
+      }
 
-// PlanSubcomponentPortEndpoint
-//
-//
+      void InstanceDeploymentDescription::
+      configProperty_none (Type const&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-traverse (Type& o)
-{
-pre (o);
-portName (o);
-if (o.provider_p ()) provider (o);
-else provider_none (o);
-kind (o);
-instance (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      deployedResource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void PlanSubcomponentPortEndpoint::
-traverse (Type const& o)
-{
-pre (o);
-portName (o);
-if (o.provider_p ()) provider (o);
-else provider_none (o);
-kind (o);
-instance (o);
-post (o);
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void PlanSubcomponentPortEndpoint::
-pre (Type&)
-{
-}
+        else deployedResource_none (o);
+      }
 
-void PlanSubcomponentPortEndpoint::
-pre (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      deployedResource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void PlanSubcomponentPortEndpoint::
-portName (Type& o)
-{
-dispatch (o.portName ());
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void PlanSubcomponentPortEndpoint::
-portName (Type const& o)
-{
-dispatch (o.portName ());
-}
+        else deployedResource_none (o);
+      }
 
-void PlanSubcomponentPortEndpoint::
-provider (Type& o)
-{
-dispatch (o.provider ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_pre (Type&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-provider (Type const& o)
-{
-dispatch (o.provider ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_pre (Type const&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-provider_none (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-provider_none (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type const&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-kind (Type& o)
-{
-dispatch (o.kind ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-kind (Type const& o)
-{
-dispatch (o.kind ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-instance (Type& o)
-{
-dispatch (o.instance ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_none (Type&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-instance (Type const& o)
-{
-dispatch (o.instance ());
-}
+      void InstanceDeploymentDescription::
+      deployedResource_none (Type const&)
+      {
+      }
 
-void PlanSubcomponentPortEndpoint::
-post (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      deployedSharedResource (Type& o)
+      {
+        dispatch (o.deployedSharedResource ());
+      }
 
-void PlanSubcomponentPortEndpoint::
-post (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      deployedSharedResource (Type const& o)
+      {
+        dispatch (o.deployedSharedResource ());
+      }
 
-// ExternalReferenceEndpoint
-//
-//
+      void InstanceDeploymentDescription::
+      deployedSharedResource_none (Type&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-traverse (Type& o)
-{
-pre (o);
-location (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      deployedSharedResource_none (Type const&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-traverse (Type const& o)
-{
-pre (o);
-location (o);
-post (o);
-}
+      void InstanceDeploymentDescription::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
 
-void ExternalReferenceEndpoint::
-pre (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
 
-void ExternalReferenceEndpoint::
-pre (Type const&)
-{
-}
+      void InstanceDeploymentDescription::
+      id_none (Type&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-location (Type& o)
-{
-dispatch (o.location ());
-}
+      void InstanceDeploymentDescription::
+      id_none (Type const&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-location (Type const& o)
-{
-dispatch (o.location ());
-}
+      void InstanceDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-post (Type&)
-{
-}
+      void InstanceDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-void ExternalReferenceEndpoint::
-post (Type const&)
-{
-}
+      // ComponentPortDescription
+      //
+      //
 
-// ConnectionResourceDeploymentDescription
-//
-//
+      void ComponentPortDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.specificType_p ()) specificType (o);
+        else specificType_none (o);
+        supportedType (o);
+        provider (o);
+        exclusiveProvider (o);
+        exclusiveUser (o);
+        optional (o);
+        kind (o);
+        post (o);
+      }
 
-void ConnectionResourceDeploymentDescription::
-traverse (Type& o)
-{
-pre (o);
-targetName (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+      void ComponentPortDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.specificType_p ()) specificType (o);
+        else specificType_none (o);
+        supportedType (o);
+        provider (o);
+        exclusiveProvider (o);
+        exclusiveUser (o);
+        optional (o);
+        kind (o);
+        post (o);
+      }
 
-void ConnectionResourceDeploymentDescription::
-traverse (Type const& o)
-{
-pre (o);
-targetName (o);
-requirementName (o);
-resourceName (o);
-property (o);
-post (o);
-}
+      void ComponentPortDescription::
+      pre (Type&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-pre (Type&)
-{
-}
+      void ComponentPortDescription::
+      pre (Type const&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-pre (Type const&)
-{
-}
+      void ComponentPortDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-targetName (Type& o)
-{
-dispatch (o.targetName ());
-}
+      void ComponentPortDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-targetName (Type const& o)
-{
-dispatch (o.targetName ());
-}
+      void ComponentPortDescription::
+      specificType (Type& o)
+      {
+        dispatch (o.specificType ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-requirementName (Type& o)
-{
-dispatch (o.requirementName ());
-}
+      void ComponentPortDescription::
+      specificType (Type const& o)
+      {
+        dispatch (o.specificType ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-dispatch (o.requirementName ());
-}
+      void ComponentPortDescription::
+      specificType_none (Type&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-resourceName (Type& o)
-{
-dispatch (o.resourceName ());
-}
+      void ComponentPortDescription::
+      specificType_none (Type const&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-dispatch (o.resourceName ());
-}
+      void ComponentPortDescription::
+      supportedType (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPortDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-void ConnectionResourceDeploymentDescription::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-ConnectionResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
+        if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
+          }
+
+          supportedType_post (o);
+        }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+        else supportedType_none (o);
+      }
 
-property_post (o);
-}
+      void ComponentPortDescription::
+      supportedType (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPortDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-else property_none (o);
-}
+        if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
+          }
+
+          supportedType_post (o);
+        }
 
-void ConnectionResourceDeploymentDescription::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ConnectionResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+        else supportedType_none (o);
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ComponentPortDescription::
+      supportedType_pre (Type&)
+      {
+      }
 
-property_post (o);
-}
+      void ComponentPortDescription::
+      supportedType_pre (Type const&)
+      {
+      }
 
-else property_none (o);
-}
+      void ComponentPortDescription::
+      supportedType_next (Type&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_pre (Type&)
-{
-}
+      void ComponentPortDescription::
+      supportedType_next (Type const&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_pre (Type const&)
-{
-}
+      void ComponentPortDescription::
+      supportedType_post (Type&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_next (Type&)
-{
-}
+      void ComponentPortDescription::
+      supportedType_post (Type const&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_next (Type const&)
-{
-}
+      void ComponentPortDescription::
+      supportedType_none (Type&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_post (Type&)
-{
-}
+      void ComponentPortDescription::
+      supportedType_none (Type const&)
+      {
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_post (Type const&)
-{
-}
+      void ComponentPortDescription::
+      provider (Type& o)
+      {
+        dispatch (o.provider ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_none (Type&)
-{
-}
+      void ComponentPortDescription::
+      provider (Type const& o)
+      {
+        dispatch (o.provider ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_none (Type const&)
-{
-}
+      void ComponentPortDescription::
+      exclusiveProvider (Type& o)
+      {
+        dispatch (o.exclusiveProvider ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-post (Type&)
-{
-}
+      void ComponentPortDescription::
+      exclusiveProvider (Type const& o)
+      {
+        dispatch (o.exclusiveProvider ());
+      }
 
-void ConnectionResourceDeploymentDescription::
-post (Type const&)
-{
-}
+      void ComponentPortDescription::
+      exclusiveUser (Type& o)
+      {
+        dispatch (o.exclusiveUser ());
+      }
 
-// PlanConnectionDescription
-//
-//
+      void ComponentPortDescription::
+      exclusiveUser (Type const& o)
+      {
+        dispatch (o.exclusiveUser ());
+      }
 
-void PlanConnectionDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.source_p ()) source (o);
-else source_none (o);
-deployRequirement (o);
-externalEndpoint (o);
-internalEndpoint (o);
-externalReference (o);
-deployedResource (o);
-post (o);
-}
+      void ComponentPortDescription::
+      optional (Type& o)
+      {
+        dispatch (o.optional ());
+      }
 
-void PlanConnectionDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.source_p ()) source (o);
-else source_none (o);
-deployRequirement (o);
-externalEndpoint (o);
-internalEndpoint (o);
-externalReference (o);
-deployedResource (o);
-post (o);
-}
+      void ComponentPortDescription::
+      optional (Type const& o)
+      {
+        dispatch (o.optional ());
+      }
 
-void PlanConnectionDescription::
-pre (Type&)
-{
-}
+      void ComponentPortDescription::
+      kind (Type& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void PlanConnectionDescription::
-pre (Type const&)
-{
-}
+      void ComponentPortDescription::
+      kind (Type const& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void PlanConnectionDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void ComponentPortDescription::
+      post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void ComponentPortDescription::
+      post (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-source (Type& o)
-{
-dispatch (o.source ());
-}
+      // ComponentPropertyDescription
+      //
+      //
 
-void PlanConnectionDescription::
-source (Type const& o)
-{
-dispatch (o.source ());
-}
+      void ComponentPropertyDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-source_none (Type&)
-{
-}
+      void ComponentPropertyDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-source_none (Type const&)
-{
-}
+      void ComponentPropertyDescription::
+      pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ComponentPropertyDescription::
+      pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ComponentPropertyDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-deployRequirement_post (o);
-}
+      void ComponentPropertyDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-else deployRequirement_none (o);
-}
+      void ComponentPropertyDescription::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
 
-void PlanConnectionDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ComponentPropertyDescription::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ComponentPropertyDescription::
+      post (Type&)
+      {
+      }
 
-deployRequirement_post (o);
-}
+      void ComponentPropertyDescription::
+      post (Type const&)
+      {
+      }
 
-else deployRequirement_none (o);
-}
+      // ComponentExternalPortEndpoint
+      //
+      //
 
-void PlanConnectionDescription::
-deployRequirement_pre (Type&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      traverse (Type& o)
+      {
+        pre (o);
+        portName (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-deployRequirement_pre (Type const&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      traverse (Type const& o)
+      {
+        pre (o);
+        portName (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-deployRequirement_next (Type&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployRequirement_next (Type const&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      pre (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployRequirement_post (Type&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      portName (Type& o)
+      {
+        dispatch (o.portName ());
+      }
 
-void PlanConnectionDescription::
-deployRequirement_post (Type const&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      portName (Type const& o)
+      {
+        dispatch (o.portName ());
+      }
 
-void PlanConnectionDescription::
-deployRequirement_none (Type&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployRequirement_none (Type const&)
-{
-}
+      void ComponentExternalPortEndpoint::
+      post (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalEndpoint (Type& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+      // PlanSubcomponentPortEndpoint
+      //
+      //
 
-if (b != e)
-{
-externalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalEndpoint_next (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      traverse (Type& o)
+      {
+        pre (o);
+        portName (o);
+        if (o.provider_p ()) provider (o);
+        else provider_none (o);
+        kind (o);
+        instance (o);
+        post (o);
+      }
 
-externalEndpoint_post (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      traverse (Type const& o)
+      {
+        pre (o);
+        portName (o);
+        if (o.provider_p ()) provider (o);
+        else provider_none (o);
+        kind (o);
+        instance (o);
+        post (o);
+      }
 
-else externalEndpoint_none (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalEndpoint (Type const& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+      void PlanSubcomponentPortEndpoint::
+      pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-externalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalEndpoint_next (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      portName (Type& o)
+      {
+        dispatch (o.portName ());
+      }
 
-externalEndpoint_post (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      portName (Type const& o)
+      {
+        dispatch (o.portName ());
+      }
 
-else externalEndpoint_none (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      provider (Type& o)
+      {
+        dispatch (o.provider ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_pre (Type&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      provider (Type const& o)
+      {
+        dispatch (o.provider ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_pre (Type const&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      provider_none (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_next (Type&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      provider_none (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_next (Type const&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      kind (Type& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_post (Type&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      kind (Type const& o)
+      {
+        dispatch (o.kind ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_post (Type const&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      instance (Type& o)
+      {
+        dispatch (o.instance ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_none (Type&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      instance (Type const& o)
+      {
+        dispatch (o.instance ());
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_none (Type const&)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-internalEndpoint (Type& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+      void PlanSubcomponentPortEndpoint::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-internalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) internalEndpoint_next (o);
-}
+      // ExternalReferenceEndpoint
+      //
+      //
 
-internalEndpoint_post (o);
-}
+      void ExternalReferenceEndpoint::
+      traverse (Type& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
 
-else internalEndpoint_none (o);
-}
+      void ExternalReferenceEndpoint::
+      traverse (Type const& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-internalEndpoint (Type const& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+      void ExternalReferenceEndpoint::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-internalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) internalEndpoint_next (o);
-}
+      void ExternalReferenceEndpoint::
+      pre (Type const&)
+      {
+      }
 
-internalEndpoint_post (o);
-}
+      void ExternalReferenceEndpoint::
+      location (Type& o)
+      {
+        dispatch (o.location ());
+      }
 
-else internalEndpoint_none (o);
-}
+      void ExternalReferenceEndpoint::
+      location (Type const& o)
+      {
+        dispatch (o.location ());
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_pre (Type&)
-{
-}
+      void ExternalReferenceEndpoint::
+      post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_pre (Type const&)
-{
-}
+      void ExternalReferenceEndpoint::
+      post (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_next (Type&)
-{
-}
+      // ConnectionResourceDeploymentDescription
+      //
+      //
 
-void PlanConnectionDescription::
-internalEndpoint_next (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        targetName (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_post (Type&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        targetName (o);
+        requirementName (o);
+        resourceName (o);
+        property (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_post (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_none (Type&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      pre (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_none (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      targetName (Type& o)
+      {
+        dispatch (o.targetName ());
+      }
 
-void PlanConnectionDescription::
-externalReference (Type& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+      void ConnectionResourceDeploymentDescription::
+      targetName (Type const& o)
+      {
+        dispatch (o.targetName ());
+      }
 
-if (b != e)
-{
-externalReference_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalReference_next (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      requirementName (Type& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-externalReference_post (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        dispatch (o.requirementName ());
+      }
 
-else externalReference_none (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      resourceName (Type& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-void PlanConnectionDescription::
-externalReference (Type const& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+      void ConnectionResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        dispatch (o.resourceName ());
+      }
 
-if (b != e)
-{
-externalReference_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalReference_next (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ConnectionResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-externalReference_post (o);
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-else externalReference_none (o);
-}
+        else property_none (o);
+      }
 
-void PlanConnectionDescription::
-externalReference_pre (Type&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ConnectionResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-void PlanConnectionDescription::
-externalReference_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void PlanConnectionDescription::
-externalReference_next (Type&)
-{
-}
+        else property_none (o);
+      }
 
-void PlanConnectionDescription::
-externalReference_next (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalReference_post (Type&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalReference_post (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_next (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalReference_none (Type&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_next (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-externalReference_none (Type const&)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployedResource (Type& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+      void ConnectionResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployedResource_next (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      property_none (Type&)
+      {
+      }
 
-deployedResource_post (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      property_none (Type const&)
+      {
+      }
 
-else deployedResource_none (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      post (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployedResource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+      void ConnectionResourceDeploymentDescription::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployedResource_next (o);
-}
+      // PlanConnectionDescription
+      //
+      //
 
-deployedResource_post (o);
-}
+      void PlanConnectionDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.source_p ()) source (o);
+        else source_none (o);
+        deployRequirement (o);
+        externalEndpoint (o);
+        internalEndpoint (o);
+        externalReference (o);
+        deployedResource (o);
+        post (o);
+      }
 
-else deployedResource_none (o);
-}
+      void PlanConnectionDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.source_p ()) source (o);
+        else source_none (o);
+        deployRequirement (o);
+        externalEndpoint (o);
+        internalEndpoint (o);
+        externalReference (o);
+        deployedResource (o);
+        post (o);
+      }
 
-void PlanConnectionDescription::
-deployedResource_pre (Type&)
-{
-}
+      void PlanConnectionDescription::
+      pre (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployedResource_pre (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      pre (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployedResource_next (Type&)
-{
-}
+      void PlanConnectionDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void PlanConnectionDescription::
-deployedResource_next (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void PlanConnectionDescription::
-deployedResource_post (Type&)
-{
-}
+      void PlanConnectionDescription::
+      source (Type& o)
+      {
+        dispatch (o.source ());
+      }
 
-void PlanConnectionDescription::
-deployedResource_post (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      source (Type const& o)
+      {
+        dispatch (o.source ());
+      }
 
-void PlanConnectionDescription::
-deployedResource_none (Type&)
-{
-}
+      void PlanConnectionDescription::
+      source_none (Type&)
+      {
+      }
 
-void PlanConnectionDescription::
-deployedResource_none (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      source_none (Type const&)
+      {
+      }
 
-void PlanConnectionDescription::
-post (Type&)
-{
-}
+      void PlanConnectionDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void PlanConnectionDescription::
-post (Type const&)
-{
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-// ImplementationDependency
-//
-//
+        else deployRequirement_none (o);
+      }
 
-void ImplementationDependency::
-traverse (Type& o)
-{
-pre (o);
-requiredType (o);
-post (o);
-}
+      void PlanConnectionDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void ImplementationDependency::
-traverse (Type const& o)
-{
-pre (o);
-requiredType (o);
-post (o);
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-void ImplementationDependency::
-pre (Type&)
-{
-}
+        else deployRequirement_none (o);
+      }
 
-void ImplementationDependency::
-pre (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
 
-void ImplementationDependency::
-requiredType (Type& o)
-{
-dispatch (o.requiredType ());
-}
+      void PlanConnectionDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
 
-void ImplementationDependency::
-requiredType (Type const& o)
-{
-dispatch (o.requiredType ());
-}
+      void PlanConnectionDescription::
+      deployRequirement_next (Type&)
+      {
+      }
 
-void ImplementationDependency::
-post (Type&)
-{
-}
+      void PlanConnectionDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
 
-void ImplementationDependency::
-post (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      deployRequirement_post (Type&)
+      {
+      }
 
-// Capability
-//
-//
+      void PlanConnectionDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
 
-void Capability::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-property (o);
-post (o);
-}
+      void PlanConnectionDescription::
+      deployRequirement_none (Type&)
+      {
+      }
 
-void Capability::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-property (o);
-post (o);
-}
+      void PlanConnectionDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
 
-void Capability::
-pre (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-void Capability::
-pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          externalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalEndpoint_next (o);
+          }
+
+          externalEndpoint_post (o);
+        }
 
-void Capability::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+        else externalEndpoint_none (o);
+      }
 
-void Capability::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void PlanConnectionDescription::
+      externalEndpoint (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-void Capability::
-resourceType (Type& o)
-{
-// VC6 anathema strikes again
-//
-Capability::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+        if (b != e)
+        {
+          externalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalEndpoint_next (o);
+          }
+
+          externalEndpoint_post (o);
+        }
 
-if (b != e)
-{
-resourceType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resourceType_next (o);
-}
+        else externalEndpoint_none (o);
+      }
 
-resourceType_post (o);
-}
-}
+      void PlanConnectionDescription::
+      externalEndpoint_pre (Type&)
+      {
+      }
 
-void Capability::
-resourceType (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Capability::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+      void PlanConnectionDescription::
+      externalEndpoint_pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-resourceType_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resourceType_next (o);
-}
+      void PlanConnectionDescription::
+      externalEndpoint_next (Type&)
+      {
+      }
 
-resourceType_post (o);
-}
-}
+      void PlanConnectionDescription::
+      externalEndpoint_next (Type const&)
+      {
+      }
 
-void Capability::
-resourceType_pre (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_post (Type&)
+      {
+      }
 
-void Capability::
-resourceType_pre (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_post (Type const&)
+      {
+      }
 
-void Capability::
-resourceType_next (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_none (Type&)
+      {
+      }
 
-void Capability::
-resourceType_next (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_none (Type const&)
+      {
+      }
 
-void Capability::
-resourceType_post (Type&)
-{
-}
+      void PlanConnectionDescription::
+      internalEndpoint (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
 
-void Capability::
-resourceType_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          internalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) internalEndpoint_next (o);
+          }
+
+          internalEndpoint_post (o);
+        }
 
-void Capability::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-Capability::Type::property_iterator b (o.begin_property()), e (o.end_property());
+        else internalEndpoint_none (o);
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void PlanConnectionDescription::
+      internalEndpoint (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
 
-property_post (o);
-}
+        if (b != e)
+        {
+          internalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) internalEndpoint_next (o);
+          }
+
+          internalEndpoint_post (o);
+        }
 
-else property_none (o);
-}
+        else internalEndpoint_none (o);
+      }
 
-void Capability::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Capability::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void PlanConnectionDescription::
+      internalEndpoint_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void PlanConnectionDescription::
+      internalEndpoint_pre (Type const&)
+      {
+      }
 
-property_post (o);
-}
+      void PlanConnectionDescription::
+      internalEndpoint_next (Type&)
+      {
+      }
 
-else property_none (o);
-}
+      void PlanConnectionDescription::
+      internalEndpoint_next (Type const&)
+      {
+      }
 
-void Capability::
-property_pre (Type&)
-{
-}
+      void PlanConnectionDescription::
+      internalEndpoint_post (Type&)
+      {
+      }
 
-void Capability::
-property_pre (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      internalEndpoint_post (Type const&)
+      {
+      }
 
-void Capability::
-property_next (Type&)
-{
-}
+      void PlanConnectionDescription::
+      internalEndpoint_none (Type&)
+      {
+      }
 
-void Capability::
-property_next (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      internalEndpoint_none (Type const&)
+      {
+      }
 
-void Capability::
-property_post (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalReference (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
 
-void Capability::
-property_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          externalReference_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalReference_next (o);
+          }
+
+          externalReference_post (o);
+        }
 
-void Capability::
-property_none (Type&)
-{
-}
+        else externalReference_none (o);
+      }
 
-void Capability::
-property_none (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      externalReference (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
 
-void Capability::
-post (Type&)
-{
-}
+        if (b != e)
+        {
+          externalReference_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalReference_next (o);
+          }
+
+          externalReference_post (o);
+        }
 
-void Capability::
-post (Type const&)
-{
-}
+        else externalReference_none (o);
+      }
 
-// ImplementationRequirement
-//
-//
+      void PlanConnectionDescription::
+      externalReference_pre (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-traverse (Type& o)
-{
-pre (o);
-if (o.resourceUsage_p ()) resourceUsage (o);
-else resourceUsage_none (o);
-if (o.resourcePort_p ()) resourcePort (o);
-else resourcePort_none (o);
-if (o.componentPort_p ()) componentPort (o);
-else componentPort_none (o);
-resourceType (o);
-name (o);
-property (o);
-post (o);
-}
+      void PlanConnectionDescription::
+      externalReference_pre (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-traverse (Type const& o)
-{
-pre (o);
-if (o.resourceUsage_p ()) resourceUsage (o);
-else resourceUsage_none (o);
-if (o.resourcePort_p ()) resourcePort (o);
-else resourcePort_none (o);
-if (o.componentPort_p ()) componentPort (o);
-else componentPort_none (o);
-resourceType (o);
-name (o);
-property (o);
-post (o);
-}
+      void PlanConnectionDescription::
+      externalReference_next (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-pre (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalReference_next (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-pre (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      externalReference_post (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceUsage (Type& o)
-{
-dispatch (o.resourceUsage ());
-}
+      void PlanConnectionDescription::
+      externalReference_post (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceUsage (Type const& o)
-{
-dispatch (o.resourceUsage ());
-}
+      void PlanConnectionDescription::
+      externalReference_none (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceUsage_none (Type&)
-{
-}
+      void PlanConnectionDescription::
+      externalReference_none (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceUsage_none (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      deployedResource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void ImplementationRequirement::
-resourcePort (Type& o)
-{
-dispatch (o.resourcePort ());
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void ImplementationRequirement::
-resourcePort (Type const& o)
-{
-dispatch (o.resourcePort ());
-}
+        else deployedResource_none (o);
+      }
 
-void ImplementationRequirement::
-resourcePort_none (Type&)
-{
-}
+      void PlanConnectionDescription::
+      deployedResource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-void ImplementationRequirement::
-resourcePort_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
 
-void ImplementationRequirement::
-componentPort (Type& o)
-{
-dispatch (o.componentPort ());
-}
+        else deployedResource_none (o);
+      }
 
-void ImplementationRequirement::
-componentPort (Type const& o)
-{
-dispatch (o.componentPort ());
-}
+      void PlanConnectionDescription::
+      deployedResource_pre (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-componentPort_none (Type&)
-{
-}
+      void PlanConnectionDescription::
+      deployedResource_pre (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-componentPort_none (Type const&)
-{
-}
+      void PlanConnectionDescription::
+      deployedResource_next (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceType (Type& o)
-{
-dispatch (o.resourceType ());
-}
+      void PlanConnectionDescription::
+      deployedResource_next (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-resourceType (Type const& o)
-{
-dispatch (o.resourceType ());
-}
+      void PlanConnectionDescription::
+      deployedResource_post (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void PlanConnectionDescription::
+      deployedResource_post (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void PlanConnectionDescription::
+      deployedResource_none (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-property (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationRequirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
+      void PlanConnectionDescription::
+      deployedResource_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void PlanConnectionDescription::
+      post (Type&)
+      {
+      }
 
-property_post (o);
-}
+      void PlanConnectionDescription::
+      post (Type const&)
+      {
+      }
 
-else property_none (o);
-}
+      // ImplementationDependency
+      //
+      //
 
-void ImplementationRequirement::
-property (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationRequirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+      void ImplementationDependency::
+      traverse (Type& o)
+      {
+        pre (o);
+        requiredType (o);
+        post (o);
+      }
 
-if (b != e)
-{
-property_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) property_next (o);
-}
+      void ImplementationDependency::
+      traverse (Type const& o)
+      {
+        pre (o);
+        requiredType (o);
+        post (o);
+      }
 
-property_post (o);
-}
+      void ImplementationDependency::
+      pre (Type&)
+      {
+      }
 
-else property_none (o);
-}
+      void ImplementationDependency::
+      pre (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-property_pre (Type&)
-{
-}
+      void ImplementationDependency::
+      requiredType (Type& o)
+      {
+        dispatch (o.requiredType ());
+      }
 
-void ImplementationRequirement::
-property_pre (Type const&)
-{
-}
+      void ImplementationDependency::
+      requiredType (Type const& o)
+      {
+        dispatch (o.requiredType ());
+      }
 
-void ImplementationRequirement::
-property_next (Type&)
-{
-}
+      void ImplementationDependency::
+      post (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-property_next (Type const&)
-{
-}
+      void ImplementationDependency::
+      post (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-property_post (Type&)
-{
-}
+      // Capability
+      //
+      //
 
-void ImplementationRequirement::
-property_post (Type const&)
-{
-}
+      void Capability::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        property (o);
+        post (o);
+      }
 
-void ImplementationRequirement::
-property_none (Type&)
-{
-}
+      void Capability::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        property (o);
+        post (o);
+      }
 
-void ImplementationRequirement::
-property_none (Type const&)
-{
-}
+      void Capability::
+      pre (Type&)
+      {
+      }
 
-void ImplementationRequirement::
-post (Type&)
-{
-}
+      void Capability::
+      pre (Type const&)
+      {
+      }
 
-void ImplementationRequirement::
-post (Type const&)
-{
-}
+      void Capability::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-// ComponentPackageReference
-//
-//
+      void Capability::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ComponentPackageReference::
-traverse (Type& o)
-{
-pre (o);
-if (o.requiredUUID_p ()) requiredUUID (o);
-else requiredUUID_none (o);
-if (o.requiredName_p ()) requiredName (o);
-else requiredName_none (o);
-requiredType (o);
-post (o);
-}
+      void Capability::
+      resourceType (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Capability::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-void ComponentPackageReference::
-traverse (Type const& o)
-{
-pre (o);
-if (o.requiredUUID_p ()) requiredUUID (o);
-else requiredUUID_none (o);
-if (o.requiredName_p ()) requiredName (o);
-else requiredName_none (o);
-requiredType (o);
-post (o);
-}
+        if (b != e)
+        {
+          resourceType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resourceType_next (o);
+          }
+
+          resourceType_post (o);
+        }
+      }
 
-void ComponentPackageReference::
-pre (Type&)
-{
-}
+      void Capability::
+      resourceType (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Capability::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-void ComponentPackageReference::
-pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          resourceType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resourceType_next (o);
+          }
+
+          resourceType_post (o);
+        }
+      }
 
-void ComponentPackageReference::
-requiredUUID (Type& o)
-{
-dispatch (o.requiredUUID ());
-}
+      void Capability::
+      resourceType_pre (Type&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredUUID (Type const& o)
-{
-dispatch (o.requiredUUID ());
-}
+      void Capability::
+      resourceType_pre (Type const&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredUUID_none (Type&)
-{
-}
+      void Capability::
+      resourceType_next (Type&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredUUID_none (Type const&)
-{
-}
+      void Capability::
+      resourceType_next (Type const&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredName (Type& o)
-{
-dispatch (o.requiredName ());
-}
+      void Capability::
+      resourceType_post (Type&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredName (Type const& o)
-{
-dispatch (o.requiredName ());
-}
+      void Capability::
+      resourceType_post (Type const&)
+      {
+      }
 
-void ComponentPackageReference::
-requiredName_none (Type&)
-{
-}
+      void Capability::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Capability::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-void ComponentPackageReference::
-requiredName_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ComponentPackageReference::
-requiredType (Type& o)
-{
-dispatch (o.requiredType ());
-}
+        else property_none (o);
+      }
 
-void ComponentPackageReference::
-requiredType (Type const& o)
-{
-dispatch (o.requiredType ());
-}
+      void Capability::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Capability::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-void ComponentPackageReference::
-post (Type&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void ComponentPackageReference::
-post (Type const&)
-{
-}
+        else property_none (o);
+      }
 
-// SubcomponentPortEndpoint
-//
-//
+      void Capability::
+      property_pre (Type&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-traverse (Type& o)
-{
-pre (o);
-portName (o);
-instance (o);
-post (o);
-}
+      void Capability::
+      property_pre (Type const&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-traverse (Type const& o)
-{
-pre (o);
-portName (o);
-instance (o);
-post (o);
-}
+      void Capability::
+      property_next (Type&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-pre (Type&)
-{
-}
+      void Capability::
+      property_next (Type const&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-pre (Type const&)
-{
-}
+      void Capability::
+      property_post (Type&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-portName (Type& o)
-{
-dispatch (o.portName ());
-}
+      void Capability::
+      property_post (Type const&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-portName (Type const& o)
-{
-dispatch (o.portName ());
-}
+      void Capability::
+      property_none (Type&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-instance (Type& o)
-{
-dispatch (o.instance ());
-}
+      void Capability::
+      property_none (Type const&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-instance (Type const& o)
-{
-dispatch (o.instance ());
-}
+      void Capability::
+      post (Type&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-post (Type&)
-{
-}
+      void Capability::
+      post (Type const&)
+      {
+      }
 
-void SubcomponentPortEndpoint::
-post (Type const&)
-{
-}
+      // ImplementationRequirement
+      //
+      //
 
-// AssemblyConnectionDescription
-//
-//
+      void ImplementationRequirement::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.resourceUsage_p ()) resourceUsage (o);
+        else resourceUsage_none (o);
+        if (o.resourcePort_p ()) resourcePort (o);
+        else resourcePort_none (o);
+        if (o.componentPort_p ()) componentPort (o);
+        else componentPort_none (o);
+        resourceType (o);
+        name (o);
+        property (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-deployRequirement (o);
-internalEndpoint (o);
-externalEndpoint (o);
-externalReference (o);
-post (o);
-}
+      void ImplementationRequirement::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.resourceUsage_p ()) resourceUsage (o);
+        else resourceUsage_none (o);
+        if (o.resourcePort_p ()) resourcePort (o);
+        else resourcePort_none (o);
+        if (o.componentPort_p ()) componentPort (o);
+        else componentPort_none (o);
+        resourceType (o);
+        name (o);
+        property (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-deployRequirement (o);
-internalEndpoint (o);
-externalEndpoint (o);
-externalReference (o);
-post (o);
-}
+      void ImplementationRequirement::
+      pre (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-pre (Type&)
-{
-}
+      void ImplementationRequirement::
+      pre (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-pre (Type const&)
-{
-}
+      void ImplementationRequirement::
+      resourceUsage (Type& o)
+      {
+        dispatch (o.resourceUsage ());
+      }
 
-void AssemblyConnectionDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void ImplementationRequirement::
+      resourceUsage (Type const& o)
+      {
+        dispatch (o.resourceUsage ());
+      }
 
-void AssemblyConnectionDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void ImplementationRequirement::
+      resourceUsage_none (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ImplementationRequirement::
+      resourceUsage_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ImplementationRequirement::
+      resourcePort (Type& o)
+      {
+        dispatch (o.resourcePort ());
+      }
 
-deployRequirement_post (o);
-}
+      void ImplementationRequirement::
+      resourcePort (Type const& o)
+      {
+        dispatch (o.resourcePort ());
+      }
 
-else deployRequirement_none (o);
-}
+      void ImplementationRequirement::
+      resourcePort_none (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void ImplementationRequirement::
+      resourcePort_none (Type const&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void ImplementationRequirement::
+      componentPort (Type& o)
+      {
+        dispatch (o.componentPort ());
+      }
 
-deployRequirement_post (o);
-}
+      void ImplementationRequirement::
+      componentPort (Type const& o)
+      {
+        dispatch (o.componentPort ());
+      }
 
-else deployRequirement_none (o);
-}
+      void ImplementationRequirement::
+      componentPort_none (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_pre (Type&)
-{
-}
+      void ImplementationRequirement::
+      componentPort_none (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_pre (Type const&)
-{
-}
+      void ImplementationRequirement::
+      resourceType (Type& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_next (Type&)
-{
-}
+      void ImplementationRequirement::
+      resourceType (Type const& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_next (Type const&)
-{
-}
+      void ImplementationRequirement::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_post (Type&)
-{
-}
+      void ImplementationRequirement::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_post (Type const&)
-{
-}
+      void ImplementationRequirement::
+      property (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationRequirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-void AssemblyConnectionDescription::
-deployRequirement_none (Type&)
-{
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-void AssemblyConnectionDescription::
-deployRequirement_none (Type const&)
-{
-}
+        else property_none (o);
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint (Type& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+      void ImplementationRequirement::
+      property (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationRequirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-if (b != e)
-{
-internalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) internalEndpoint_next (o);
-}
+        if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) property_next (o);
+          }
+
+          property_post (o);
+        }
 
-internalEndpoint_post (o);
-}
+        else property_none (o);
+      }
 
-else internalEndpoint_none (o);
-}
+      void ImplementationRequirement::
+      property_pre (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint (Type const& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+      void ImplementationRequirement::
+      property_pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-internalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) internalEndpoint_next (o);
-}
+      void ImplementationRequirement::
+      property_next (Type&)
+      {
+      }
 
-internalEndpoint_post (o);
-}
+      void ImplementationRequirement::
+      property_next (Type const&)
+      {
+      }
 
-else internalEndpoint_none (o);
-}
+      void ImplementationRequirement::
+      property_post (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_pre (Type&)
-{
-}
+      void ImplementationRequirement::
+      property_post (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_pre (Type const&)
-{
-}
+      void ImplementationRequirement::
+      property_none (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_next (Type&)
-{
-}
+      void ImplementationRequirement::
+      property_none (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_next (Type const&)
-{
-}
+      void ImplementationRequirement::
+      post (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_post (Type&)
-{
-}
+      void ImplementationRequirement::
+      post (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_post (Type const&)
-{
-}
+      // ComponentPackageReference
+      //
+      //
 
-void AssemblyConnectionDescription::
-internalEndpoint_none (Type&)
-{
-}
+      void ComponentPackageReference::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.requiredUUID_p ()) requiredUUID (o);
+        else requiredUUID_none (o);
+        if (o.requiredName_p ()) requiredName (o);
+        else requiredName_none (o);
+        requiredType (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_none (Type const&)
-{
-}
+      void ComponentPackageReference::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.requiredUUID_p ()) requiredUUID (o);
+        else requiredUUID_none (o);
+        if (o.requiredName_p ()) requiredName (o);
+        else requiredName_none (o);
+        requiredType (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint (Type& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+      void ComponentPackageReference::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-externalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalEndpoint_next (o);
-}
+      void ComponentPackageReference::
+      pre (Type const&)
+      {
+      }
 
-externalEndpoint_post (o);
-}
+      void ComponentPackageReference::
+      requiredUUID (Type& o)
+      {
+        dispatch (o.requiredUUID ());
+      }
 
-else externalEndpoint_none (o);
-}
+      void ComponentPackageReference::
+      requiredUUID (Type const& o)
+      {
+        dispatch (o.requiredUUID ());
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint (Type const& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+      void ComponentPackageReference::
+      requiredUUID_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-externalEndpoint_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalEndpoint_next (o);
-}
+      void ComponentPackageReference::
+      requiredUUID_none (Type const&)
+      {
+      }
 
-externalEndpoint_post (o);
-}
+      void ComponentPackageReference::
+      requiredName (Type& o)
+      {
+        dispatch (o.requiredName ());
+      }
 
-else externalEndpoint_none (o);
-}
+      void ComponentPackageReference::
+      requiredName (Type const& o)
+      {
+        dispatch (o.requiredName ());
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_pre (Type&)
-{
-}
+      void ComponentPackageReference::
+      requiredName_none (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_pre (Type const&)
-{
-}
+      void ComponentPackageReference::
+      requiredName_none (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_next (Type&)
-{
-}
+      void ComponentPackageReference::
+      requiredType (Type& o)
+      {
+        dispatch (o.requiredType ());
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_next (Type const&)
-{
-}
+      void ComponentPackageReference::
+      requiredType (Type const& o)
+      {
+        dispatch (o.requiredType ());
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_post (Type&)
-{
-}
+      void ComponentPackageReference::
+      post (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_post (Type const&)
-{
-}
+      void ComponentPackageReference::
+      post (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_none (Type&)
-{
-}
+      // SubcomponentPortEndpoint
+      //
+      //
 
-void AssemblyConnectionDescription::
-externalEndpoint_none (Type const&)
-{
-}
+      void SubcomponentPortEndpoint::
+      traverse (Type& o)
+      {
+        pre (o);
+        portName (o);
+        instance (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-externalReference (Type& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+      void SubcomponentPortEndpoint::
+      traverse (Type const& o)
+      {
+        pre (o);
+        portName (o);
+        instance (o);
+        post (o);
+      }
 
-if (b != e)
-{
-externalReference_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalReference_next (o);
-}
+      void SubcomponentPortEndpoint::
+      pre (Type&)
+      {
+      }
 
-externalReference_post (o);
-}
+      void SubcomponentPortEndpoint::
+      pre (Type const&)
+      {
+      }
 
-else externalReference_none (o);
-}
+      void SubcomponentPortEndpoint::
+      portName (Type& o)
+      {
+        dispatch (o.portName ());
+      }
 
-void AssemblyConnectionDescription::
-externalReference (Type const& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+      void SubcomponentPortEndpoint::
+      portName (Type const& o)
+      {
+        dispatch (o.portName ());
+      }
 
-if (b != e)
-{
-externalReference_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalReference_next (o);
-}
+      void SubcomponentPortEndpoint::
+      instance (Type& o)
+      {
+        dispatch (o.instance ());
+      }
 
-externalReference_post (o);
-}
+      void SubcomponentPortEndpoint::
+      instance (Type const& o)
+      {
+        dispatch (o.instance ());
+      }
 
-else externalReference_none (o);
-}
+      void SubcomponentPortEndpoint::
+      post (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_pre (Type&)
-{
-}
+      void SubcomponentPortEndpoint::
+      post (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_pre (Type const&)
-{
-}
+      // AssemblyConnectionDescription
+      //
+      //
 
-void AssemblyConnectionDescription::
-externalReference_next (Type&)
-{
-}
+      void AssemblyConnectionDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        deployRequirement (o);
+        internalEndpoint (o);
+        externalEndpoint (o);
+        externalReference (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-externalReference_next (Type const&)
-{
-}
+      void AssemblyConnectionDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        deployRequirement (o);
+        internalEndpoint (o);
+        externalEndpoint (o);
+        externalReference (o);
+        post (o);
+      }
 
-void AssemblyConnectionDescription::
-externalReference_post (Type&)
-{
-}
+      void AssemblyConnectionDescription::
+      pre (Type&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_post (Type const&)
-{
-}
+      void AssemblyConnectionDescription::
+      pre (Type const&)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_none (Type&)
-{
-}
+      void AssemblyConnectionDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void AssemblyConnectionDescription::
-externalReference_none (Type const&)
-{
-}
+      void AssemblyConnectionDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void AssemblyConnectionDescription::
-post (Type&)
-{
-}
+      void AssemblyConnectionDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void AssemblyConnectionDescription::
-post (Type const&)
-{
-}
-}
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
+
+        else deployRequirement_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
+
+        else deployRequirement_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_next (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_post (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_none (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+
+        if (b != e)
+        {
+          internalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) internalEndpoint_next (o);
+          }
+
+          internalEndpoint_post (o);
+        }
+
+        else internalEndpoint_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+
+        if (b != e)
+        {
+          internalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) internalEndpoint_next (o);
+          }
+
+          internalEndpoint_post (o);
+        }
+
+        else internalEndpoint_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_pre (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_pre (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_next (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_next (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_post (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_post (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_none (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_none (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+
+        if (b != e)
+        {
+          externalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalEndpoint_next (o);
+          }
+
+          externalEndpoint_post (o);
+        }
+
+        else externalEndpoint_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+
+        if (b != e)
+        {
+          externalEndpoint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalEndpoint_next (o);
+          }
+
+          externalEndpoint_post (o);
+        }
+
+        else externalEndpoint_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_pre (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_pre (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_next (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_next (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_post (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_post (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_none (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_none (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+
+        if (b != e)
+        {
+          externalReference_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalReference_next (o);
+          }
+
+          externalReference_post (o);
+        }
+
+        else externalReference_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+
+        if (b != e)
+        {
+          externalReference_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalReference_next (o);
+          }
+
+          externalReference_post (o);
+        }
+
+        else externalReference_none (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_pre (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_pre (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_next (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_next (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_post (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_post (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_none (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_none (Type const&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      post (Type&)
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      post (Type const&)
+      {
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-// TCKind
-//
-//
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // TCKind
+      //
+      //
 
-TCKind::
-TCKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      TCKind::
+      TCKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-TCKind::
-TCKind ()
-{
-}
+      TCKind::
+      TCKind ()
+      {
+      }
 
-void TCKind::
-traverse (Type const& o)
-{
-::std::basic_string< ACE_TCHAR > s;
-
-if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = "tk_null";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = "tk_void";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = "tk_short";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = "tk_long";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = "tk_ushort";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = "tk_ulong";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = "tk_float";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = "tk_double";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = "tk_boolean";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = "tk_char";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = "tk_octet";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = "tk_any";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = "tk_TypeCode";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = "tk_Principal";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = "tk_objref";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = "tk_struct";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = "tk_union";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = "tk_enum";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = "tk_string";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = "tk_sequence";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = "tk_array";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = "tk_alias";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = "tk_except";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = "tk_longlong";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = "tk_ulonglong";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = "tk_longdouble";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = "tk_wchar";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = "tk_wstring";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = "tk_wfixed";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = "tk_value";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = "tk_value_box";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = "tk_native";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = "tk_abstract_interface";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = "tk_local_interface";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = "tk_component";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = "tk_home";
-else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = "tk_event";
-else
-{
-}
+      void TCKind::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = "tk_null";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = "tk_void";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = "tk_short";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = "tk_long";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = "tk_ushort";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = "tk_ulong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = "tk_float";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = "tk_double";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = "tk_boolean";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = "tk_char";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = "tk_octet";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = "tk_any";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = "tk_TypeCode";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = "tk_Principal";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = "tk_objref";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = "tk_struct";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = "tk_union";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = "tk_enum";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = "tk_string";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = "tk_sequence";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = "tk_array";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = "tk_alias";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = "tk_except";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = "tk_longlong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = "tk_ulonglong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = "tk_longdouble";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = "tk_wchar";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = "tk_wstring";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = "tk_wfixed";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = "tk_value";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = "tk_value_box";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = "tk_native";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = "tk_abstract_interface";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = "tk_local_interface";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = "tk_component";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = "tk_home";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = "tk_event";
+        else 
+        {
+        }
 
-if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-{
-a->value (s);
-}
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
 
-else
-{
-top_().value (s);
-}
-}
+        else
+        {
+          top_().value (s);
+        }
+      }
 
-// DataType
-//
-//
+      // DataType
+      //
+      //
 
-DataType::
-DataType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      DataType::
+      DataType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-DataType::
-DataType ()
-{
-}
+      DataType::
+      DataType ()
+      {
+      }
 
-void DataType::
-traverse (Type const& o)
-{
-Traversal::DataType::traverse (o);
-}
+      void DataType::
+      traverse (Type const& o)
+      {
+        Traversal::DataType::traverse (o);
+      }
 
-void DataType::
-kind (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-Traversal::DataType::kind (o);
-pop_ ();
-}
+      void DataType::
+      kind (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+        Traversal::DataType::kind (o);
+        pop_ ();
+      }
 
-void DataType::
-enum_ (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
-Traversal::DataType::enum_ (o);
-pop_ ();
-}
+      void DataType::
+      enum_ (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
+        Traversal::DataType::enum_ (o);
+        pop_ ();
+      }
 
-// DataValue
-//
-//
+      void DataType::
+      struct_ (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("struct", top_ ()));
+        Traversal::DataType::struct_ (o);
+        pop_ ();
+      }
 
-DataValue::
-DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void DataType::
+      value (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+        Traversal::DataType::value (o);
+        pop_ ();
+      }
 
-DataValue::
-DataValue ()
-{
-}
+      void DataType::
+      sequence (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sequence", top_ ()));
+        Traversal::DataType::sequence (o);
+        pop_ ();
+      }
 
-void DataValue::
-traverse (Type const& o)
-{
-Traversal::DataValue::traverse (o);
-}
+      void DataType::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::DataType::id (o);
+        attr_ (0);
+      }
 
-void DataValue::
-short_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
-}
+      // DataValue
+      //
+      //
 
-void DataValue::
-short_next (Type const& o)
-{
-short_post (o);
-short_pre (o);
-}
+      DataValue::
+      DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void DataValue::
-short_post (Type const&)
-{
-pop_ ();
-}
+      DataValue::
+      DataValue ()
+      {
+      }
 
-void DataValue::
-long_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
-}
+      void DataValue::
+      traverse (Type const& o)
+      {
+        Traversal::DataValue::traverse (o);
+      }
 
-void DataValue::
-long_next (Type const& o)
-{
-long_post (o);
-long_pre (o);
-}
+      void DataValue::
+      short_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
+      }
 
-void DataValue::
-long_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      short_next (Type const& o)
+      {
+        short_post (o);
+        short_pre (o);
+      }
 
-void DataValue::
-ushort_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
-}
+      void DataValue::
+      short_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-ushort_next (Type const& o)
-{
-ushort_post (o);
-ushort_pre (o);
-}
+      void DataValue::
+      long_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
+      }
 
-void DataValue::
-ushort_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      long_next (Type const& o)
+      {
+        long_post (o);
+        long_pre (o);
+      }
 
-void DataValue::
-ulong_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
-}
+      void DataValue::
+      long_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-ulong_next (Type const& o)
-{
-ulong_post (o);
-ulong_pre (o);
-}
+      void DataValue::
+      ushort_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
+      }
 
-void DataValue::
-ulong_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      ushort_next (Type const& o)
+      {
+        ushort_post (o);
+        ushort_pre (o);
+      }
 
-void DataValue::
-float_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
-}
+      void DataValue::
+      ushort_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-float_next (Type const& o)
-{
-float_post (o);
-float_pre (o);
-}
+      void DataValue::
+      ulong_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
+      }
 
-void DataValue::
-float_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      ulong_next (Type const& o)
+      {
+        ulong_post (o);
+        ulong_pre (o);
+      }
 
-void DataValue::
-double_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
-}
+      void DataValue::
+      ulong_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-double_next (Type const& o)
-{
-double_post (o);
-double_pre (o);
-}
+      void DataValue::
+      float_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
+      }
 
-void DataValue::
-double_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      float_next (Type const& o)
+      {
+        float_post (o);
+        float_pre (o);
+      }
 
-void DataValue::
-boolean_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
-}
+      void DataValue::
+      float_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-boolean_next (Type const& o)
-{
-boolean_post (o);
-boolean_pre (o);
-}
+      void DataValue::
+      double_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
+      }
 
-void DataValue::
-boolean_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      double_next (Type const& o)
+      {
+        double_post (o);
+        double_pre (o);
+      }
 
-void DataValue::
-octet_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
-}
+      void DataValue::
+      double_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-octet_next (Type const& o)
-{
-octet_post (o);
-octet_pre (o);
-}
+      void DataValue::
+      boolean_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
+      }
 
-void DataValue::
-octet_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      boolean_next (Type const& o)
+      {
+        boolean_post (o);
+        boolean_pre (o);
+      }
 
-void DataValue::
-enum_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
-}
+      void DataValue::
+      boolean_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-enum_next (Type const& o)
-{
-enum_post (o);
-enum_pre (o);
-}
+      void DataValue::
+      octet_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
+      }
 
-void DataValue::
-enum_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      octet_next (Type const& o)
+      {
+        octet_post (o);
+        octet_pre (o);
+      }
 
-void DataValue::
-string_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
-}
+      void DataValue::
+      octet_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-string_next (Type const& o)
-{
-string_post (o);
-string_pre (o);
-}
+      void DataValue::
+      enum_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
+      }
 
-void DataValue::
-string_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      enum_next (Type const& o)
+      {
+        enum_post (o);
+        enum_pre (o);
+      }
 
-void DataValue::
-longlong_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
-}
+      void DataValue::
+      enum_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-longlong_next (Type const& o)
-{
-longlong_post (o);
-longlong_pre (o);
-}
+      void DataValue::
+      string_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
+      }
 
-void DataValue::
-longlong_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      string_next (Type const& o)
+      {
+        string_post (o);
+        string_pre (o);
+      }
 
-void DataValue::
-ulonglong_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
-}
+      void DataValue::
+      string_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-ulonglong_next (Type const& o)
-{
-ulonglong_post (o);
-ulonglong_pre (o);
-}
+      void DataValue::
+      longlong_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
+      }
 
-void DataValue::
-ulonglong_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      longlong_next (Type const& o)
+      {
+        longlong_post (o);
+        longlong_pre (o);
+      }
 
-void DataValue::
-longdouble_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
-}
+      void DataValue::
+      longlong_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void DataValue::
-longdouble_next (Type const& o)
-{
-longdouble_post (o);
-longdouble_pre (o);
-}
+      void DataValue::
+      ulonglong_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
+      }
 
-void DataValue::
-longdouble_post (Type const&)
-{
-pop_ ();
-}
+      void DataValue::
+      ulonglong_next (Type const& o)
+      {
+        ulonglong_post (o);
+        ulonglong_pre (o);
+      }
 
-// EnumType
-//
-//
+      void DataValue::
+      ulonglong_post (Type const&)
+      {
+        pop_ ();
+      }
 
-EnumType::
-EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void DataValue::
+      longdouble_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
+      }
 
-EnumType::
-EnumType ()
-{
-}
+      void DataValue::
+      longdouble_next (Type const& o)
+      {
+        longdouble_post (o);
+        longdouble_pre (o);
+      }
 
-void EnumType::
-traverse (Type const& o)
-{
-Traversal::EnumType::traverse (o);
-}
+      void DataValue::
+      longdouble_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void EnumType::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::EnumType::name (o);
-pop_ ();
-}
+      void DataValue::
+      member_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+      }
 
-void EnumType::
-typeId (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
-Traversal::EnumType::typeId (o);
-pop_ ();
-}
+      void DataValue::
+      member_next (Type const& o)
+      {
+        member_post (o);
+        member_pre (o);
+      }
 
-void EnumType::
-member_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
-}
+      void DataValue::
+      member_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void EnumType::
-member_next (Type const& o)
-{
-member_post (o);
-member_pre (o);
-}
+      // EnumType
+      //
+      //
 
-void EnumType::
-member_post (Type const&)
-{
-pop_ ();
-}
+      EnumType::
+      EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-// Any
-//
-//
+      EnumType::
+      EnumType ()
+      {
+      }
 
-Any::
-Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void EnumType::
+      traverse (Type const& o)
+      {
+        Traversal::EnumType::traverse (o);
+      }
 
-Any::
-Any ()
-{
-}
+      void EnumType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::EnumType::name (o);
+        pop_ ();
+      }
 
-void Any::
-traverse (Type const& o)
-{
-Traversal::Any::traverse (o);
-}
+      void EnumType::
+      typeId (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+        Traversal::EnumType::typeId (o);
+        pop_ ();
+      }
 
-void Any::
-type (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-Traversal::Any::type (o);
-pop_ ();
-}
+      void EnumType::
+      member_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+      }
 
-void Any::
-value (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-Traversal::Any::value (o);
-pop_ ();
-}
+      void EnumType::
+      member_next (Type const& o)
+      {
+        member_post (o);
+        member_pre (o);
+      }
 
-// Property
-//
-//
+      void EnumType::
+      member_post (Type const&)
+      {
+        pop_ ();
+      }
 
-Property::
-Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      // StructType
+      //
+      //
 
-Property::
-Property ()
-{
-}
+      StructType::
+      StructType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void Property::
-traverse (Type const& o)
-{
-Traversal::Property::traverse (o);
-}
+      StructType::
+      StructType ()
+      {
+      }
 
-void Property::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Property::name (o);
-pop_ ();
-}
+      void StructType::
+      traverse (Type const& o)
+      {
+        Traversal::StructType::traverse (o);
+      }
 
-void Property::
-value (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-Traversal::Property::value (o);
-pop_ ();
-}
+      void StructType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::StructType::name (o);
+        pop_ ();
+      }
 
-// SatisfierPropertyKind
-//
-//
+      void StructType::
+      typeId (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+        Traversal::StructType::typeId (o);
+        pop_ ();
+      }
 
-SatisfierPropertyKind::
-SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void StructType::
+      member_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+      }
 
-SatisfierPropertyKind::
-SatisfierPropertyKind ()
-{
-}
+      void StructType::
+      member_next (Type const& o)
+      {
+        member_post (o);
+        member_pre (o);
+      }
 
-void SatisfierPropertyKind::
-traverse (Type const& o)
-{
-::std::basic_string< ACE_TCHAR > s;
-
-if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = "Quantity";
-else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = "Capacity";
-else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = "Minimum";
-else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = "Maximum";
-else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = "Attribute";
-else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = "Selection";
-else
-{
-}
+      void StructType::
+      member_post (Type const&)
+      {
+        pop_ ();
+      }
 
-if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-{
-a->value (s);
-}
+      // StructMemberType
+      //
+      //
 
-else
-{
-top_().value (s);
-}
-}
+      StructMemberType::
+      StructMemberType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-// SatisfierProperty
-//
-//
+      StructMemberType::
+      StructMemberType ()
+      {
+      }
 
-SatisfierProperty::
-SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void StructMemberType::
+      traverse (Type const& o)
+      {
+        Traversal::StructMemberType::traverse (o);
+      }
 
-SatisfierProperty::
-SatisfierProperty ()
-{
-}
+      void StructMemberType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::StructMemberType::name (o);
+        pop_ ();
+      }
 
-void SatisfierProperty::
-traverse (Type const& o)
-{
-Traversal::SatisfierProperty::traverse (o);
-}
+      void StructMemberType::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::StructMemberType::type (o);
+        pop_ ();
+      }
 
-void SatisfierProperty::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::SatisfierProperty::name (o);
-pop_ ();
-}
+      // ValueType
+      //
+      //
 
-void SatisfierProperty::
-kind (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-Traversal::SatisfierProperty::kind (o);
-pop_ ();
-}
+      ValueType::
+      ValueType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void SatisfierProperty::
-dynamic (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic", top_ ()));
-Traversal::SatisfierProperty::dynamic (o);
-pop_ ();
-}
+      ValueType::
+      ValueType ()
+      {
+      }
 
-void SatisfierProperty::
-value (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-Traversal::SatisfierProperty::value (o);
-pop_ ();
-}
+      void ValueType::
+      traverse (Type const& o)
+      {
+        Traversal::ValueType::traverse (o);
+      }
 
-// Resource
-//
-//
+      void ValueType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ValueType::name (o);
+        pop_ ();
+      }
 
-Resource::
-Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ValueType::
+      typeId (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+        Traversal::ValueType::typeId (o);
+        pop_ ();
+      }
 
-Resource::
-Resource ()
-{
-}
+      void ValueType::
+      modifier (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("modifier", top_ ()));
+        Traversal::ValueType::modifier (o);
+        pop_ ();
+      }
 
-void Resource::
-traverse (Type const& o)
-{
-Traversal::Resource::traverse (o);
-}
+      void ValueType::
+      baseType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("baseType", top_ ()));
+        Traversal::ValueType::baseType (o);
+        pop_ ();
+      }
 
-void Resource::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Resource::name (o);
-pop_ ();
-}
+      void ValueType::
+      member_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+      }
 
-void Resource::
-resourceType_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-}
+      void ValueType::
+      member_next (Type const& o)
+      {
+        member_post (o);
+        member_pre (o);
+      }
 
-void Resource::
-resourceType_next (Type const& o)
-{
-resourceType_post (o);
-resourceType_pre (o);
-}
+      void ValueType::
+      member_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Resource::
-resourceType_post (Type const&)
-{
-pop_ ();
-}
+      // ValueMemberType
+      //
+      //
 
-void Resource::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      ValueMemberType::
+      ValueMemberType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void Resource::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      ValueMemberType::
+      ValueMemberType ()
+      {
+      }
 
-void Resource::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void ValueMemberType::
+      traverse (Type const& o)
+      {
+        Traversal::ValueMemberType::traverse (o);
+      }
 
-// Requirement
-//
-//
+      void ValueMemberType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ValueMemberType::name (o);
+        pop_ ();
+      }
 
-Requirement::
-Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ValueMemberType::
+      visibility (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("visibility", top_ ()));
+        Traversal::ValueMemberType::visibility (o);
+        pop_ ();
+      }
 
-Requirement::
-Requirement ()
-{
-}
+      void ValueMemberType::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::ValueMemberType::type (o);
+        pop_ ();
+      }
 
-void Requirement::
-traverse (Type const& o)
-{
-Traversal::Requirement::traverse (o);
-}
+      // NamedValue
+      //
+      //
 
-void Requirement::
-resourceType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-Traversal::Requirement::resourceType (o);
-pop_ ();
-}
+      NamedValue::
+      NamedValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void Requirement::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Requirement::name (o);
-pop_ ();
-}
+      NamedValue::
+      NamedValue ()
+      {
+      }
 
-void Requirement::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      void NamedValue::
+      traverse (Type const& o)
+      {
+        Traversal::NamedValue::traverse (o);
+      }
 
-void Requirement::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      void NamedValue::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::NamedValue::name (o);
+        pop_ ();
+      }
 
-void Requirement::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void NamedValue::
+      value (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+        Traversal::NamedValue::value (o);
+        pop_ ();
+      }
 
-// ResourceDeploymentDescription
-//
-//
+      // SequenceType
+      //
+      //
 
-ResourceDeploymentDescription::
-ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      SequenceType::
+      SequenceType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-ResourceDeploymentDescription::
-ResourceDeploymentDescription ()
-{
-}
+      SequenceType::
+      SequenceType ()
+      {
+      }
 
-void ResourceDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::ResourceDeploymentDescription::traverse (o);
-}
+      void SequenceType::
+      traverse (Type const& o)
+      {
+        Traversal::SequenceType::traverse (o);
+      }
 
-void ResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-Traversal::ResourceDeploymentDescription::requirementName (o);
-pop_ ();
-}
+      void SequenceType::
+      bound (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bound", top_ ()));
+        Traversal::SequenceType::bound (o);
+        pop_ ();
+      }
 
-void ResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-Traversal::ResourceDeploymentDescription::resourceName (o);
-pop_ ();
-}
+      void SequenceType::
+      elementType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("elementType", top_ ()));
+        Traversal::SequenceType::elementType (o);
+        pop_ ();
+      }
 
-void ResourceDeploymentDescription::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      // Any
+      //
+      //
 
-void ResourceDeploymentDescription::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      Any::
+      Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ResourceDeploymentDescription::
-property_post (Type const&)
-{
-pop_ ();
-}
+      Any::
+      Any ()
+      {
+      }
 
-// ArtifactDeploymentDescription
-//
-//
+      void Any::
+      traverse (Type const& o)
+      {
+        Traversal::Any::traverse (o);
+      }
 
-ArtifactDeploymentDescription::
-ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void Any::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::Any::type (o);
+        pop_ ();
+      }
 
-ArtifactDeploymentDescription::
-ArtifactDeploymentDescription ()
-{
-}
+      void Any::
+      value (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+        Traversal::Any::value (o);
+        pop_ ();
+      }
 
-void ArtifactDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::ArtifactDeploymentDescription::traverse (o);
-}
+      // Property
+      //
+      //
 
-void ArtifactDeploymentDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::ArtifactDeploymentDescription::name (o);
-pop_ ();
-}
+      Property::
+      Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-source_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-}
+      Property::
+      Property ()
+      {
+      }
 
-void ArtifactDeploymentDescription::
-source_next (Type const& o)
-{
-source_post (o);
-source_pre (o);
-}
+      void Property::
+      traverse (Type const& o)
+      {
+        Traversal::Property::traverse (o);
+      }
 
-void ArtifactDeploymentDescription::
-source_post (Type const&)
-{
-pop_ ();
-}
+      void Property::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Property::name (o);
+        pop_ ();
+      }
 
-void ArtifactDeploymentDescription::
-node (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-Traversal::ArtifactDeploymentDescription::node (o);
-pop_ ();
-}
+      void Property::
+      value (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+        Traversal::Property::value (o);
+        pop_ ();
+      }
 
-void ArtifactDeploymentDescription::
-location_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-}
+      // SatisfierPropertyKind
+      //
+      //
 
-void ArtifactDeploymentDescription::
-location_next (Type const& o)
-{
-location_post (o);
-location_pre (o);
-}
+      SatisfierPropertyKind::
+      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-location_post (Type const&)
-{
-pop_ ();
-}
+      SatisfierPropertyKind::
+      SatisfierPropertyKind ()
+      {
+      }
 
-void ArtifactDeploymentDescription::
-execParameter_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-}
+      void SatisfierPropertyKind::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = "Quantity";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = "Capacity";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = "Minimum";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = "Maximum";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = "Attribute";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = "Selection";
+        else 
+        {
+        }
 
-void ArtifactDeploymentDescription::
-execParameter_next (Type const& o)
-{
-execParameter_post (o);
-execParameter_pre (o);
-}
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
 
-void ArtifactDeploymentDescription::
-execParameter_post (Type const&)
-{
-pop_ ();
-}
+        else
+        {
+          top_().value (s);
+        }
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
+      // SatisfierProperty
+      //
+      //
 
-void ArtifactDeploymentDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
+      SatisfierProperty::
+      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
+      SatisfierProperty::
+      SatisfierProperty ()
+      {
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-}
+      void SatisfierProperty::
+      traverse (Type const& o)
+      {
+        Traversal::SatisfierProperty::traverse (o);
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_next (Type const& o)
-{
-deployedResource_post (o);
-deployedResource_pre (o);
-}
+      void SatisfierProperty::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::SatisfierProperty::name (o);
+        pop_ ();
+      }
 
-void ArtifactDeploymentDescription::
-deployedResource_post (Type const&)
-{
-pop_ ();
-}
+      void SatisfierProperty::
+      kind (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+        Traversal::SatisfierProperty::kind (o);
+        pop_ ();
+      }
 
-void ArtifactDeploymentDescription::
-id (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-attr_ (&a);
-Traversal::ArtifactDeploymentDescription::id (o);
-attr_ (0);
-}
+      void SatisfierProperty::
+      dynamic (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic", top_ ()));
+        Traversal::SatisfierProperty::dynamic (o);
+        pop_ ();
+      }
 
-// MonolithicDeploymentDescription
-//
-//
+      void SatisfierProperty::
+      value (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+        Traversal::SatisfierProperty::value (o);
+        pop_ ();
+      }
 
-MonolithicDeploymentDescription::
-MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      // Resource
+      //
+      //
 
-MonolithicDeploymentDescription::
-MonolithicDeploymentDescription ()
-{
-}
+      Resource::
+      Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::MonolithicDeploymentDescription::traverse (o);
-}
+      Resource::
+      Resource ()
+      {
+      }
 
-void MonolithicDeploymentDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::MonolithicDeploymentDescription::name (o);
-pop_ ();
-}
+      void Resource::
+      traverse (Type const& o)
+      {
+        Traversal::Resource::traverse (o);
+      }
 
-void MonolithicDeploymentDescription::
-source_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-}
+      void Resource::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Resource::name (o);
+        pop_ ();
+      }
 
-void MonolithicDeploymentDescription::
-source_next (Type const& o)
-{
-source_post (o);
-source_pre (o);
-}
+      void Resource::
+      resourceType_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+      }
 
-void MonolithicDeploymentDescription::
-source_post (Type const&)
-{
-pop_ ();
-}
+      void Resource::
+      resourceType_next (Type const& o)
+      {
+        resourceType_post (o);
+        resourceType_pre (o);
+      }
 
-void MonolithicDeploymentDescription::
-artifact_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
-}
+      void Resource::
+      resourceType_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void MonolithicDeploymentDescription::
-artifact_next (Type const& o)
-{
-artifact_post (o);
-artifact_pre (o);
-}
+      void Resource::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
 
-void MonolithicDeploymentDescription::
-artifact_post (Type const&)
-{
-pop_ ();
-}
+      void Resource::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-}
+      void Resource::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void MonolithicDeploymentDescription::
-execParameter_next (Type const& o)
-{
-execParameter_post (o);
-execParameter_pre (o);
-}
+      // Requirement
+      //
+      //
 
-void MonolithicDeploymentDescription::
-execParameter_post (Type const&)
-{
-pop_ ();
-}
+      Requirement::
+      Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
+      Requirement::
+      Requirement ()
+      {
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
+      void Requirement::
+      traverse (Type const& o)
+      {
+        Traversal::Requirement::traverse (o);
+      }
 
-void MonolithicDeploymentDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
+      void Requirement::
+      resourceType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+        Traversal::Requirement::resourceType (o);
+        pop_ ();
+      }
 
-void MonolithicDeploymentDescription::
-id (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-attr_ (&a);
-Traversal::MonolithicDeploymentDescription::id (o);
-attr_ (0);
-}
+      void Requirement::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Requirement::name (o);
+        pop_ ();
+      }
 
-// ResourceUsageKind
-//
-//
+      void Requirement::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
 
-ResourceUsageKind::
-ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void Requirement::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
 
-ResourceUsageKind::
-ResourceUsageKind ()
-{
-}
+      void Requirement::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ResourceUsageKind::
-traverse (Type const& o)
-{
-::std::basic_string< ACE_TCHAR > s;
-
-if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = "None";
-else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = "InstanceUsesResource";
-else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = "ResourceUsesInstance";
-else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = "PortUsesResource";
-else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = "ResourceUsesPort";
-else
-{
-}
+      // ResourceDeploymentDescription
+      //
+      //
 
-if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-{
-a->value (s);
-}
+      ResourceDeploymentDescription::
+      ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-else
-{
-top_().value (s);
-}
-}
+      ResourceDeploymentDescription::
+      ResourceDeploymentDescription ()
+      {
+      }
 
-// InstanceResourceDeploymentDescription
-//
-//
+      void ResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ResourceDeploymentDescription::traverse (o);
+      }
 
-InstanceResourceDeploymentDescription::
-InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+        Traversal::ResourceDeploymentDescription::requirementName (o);
+        pop_ ();
+      }
 
-InstanceResourceDeploymentDescription::
-InstanceResourceDeploymentDescription ()
-{
-}
+      void ResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+        Traversal::ResourceDeploymentDescription::resourceName (o);
+        pop_ ();
+      }
 
-void InstanceResourceDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::InstanceResourceDeploymentDescription::traverse (o);
-}
+      void ResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceUsage (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
-pop_ ();
-}
+      void ResourceDeploymentDescription::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
 
-void InstanceResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-Traversal::InstanceResourceDeploymentDescription::requirementName (o);
-pop_ ();
-}
+      void ResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void InstanceResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-Traversal::InstanceResourceDeploymentDescription::resourceName (o);
-pop_ ();
-}
+      // ArtifactDeploymentDescription
+      //
+      //
 
-void InstanceResourceDeploymentDescription::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      ArtifactDeploymentDescription::
+      ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      ArtifactDeploymentDescription::
+      ArtifactDeploymentDescription ()
+      {
+      }
 
-void InstanceResourceDeploymentDescription::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ArtifactDeploymentDescription::traverse (o);
+      }
 
-// InstanceDeploymentDescription
-//
-//
+      void ArtifactDeploymentDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ArtifactDeploymentDescription::name (o);
+        pop_ ();
+      }
 
-InstanceDeploymentDescription::
-InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ArtifactDeploymentDescription::
+      source_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+      }
 
-InstanceDeploymentDescription::
-InstanceDeploymentDescription ()
-{
-}
+      void ArtifactDeploymentDescription::
+      source_next (Type const& o)
+      {
+        source_post (o);
+        source_pre (o);
+      }
 
-void InstanceDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::InstanceDeploymentDescription::traverse (o);
-}
+      void ArtifactDeploymentDescription::
+      source_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void InstanceDeploymentDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::InstanceDeploymentDescription::name (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      node (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+        Traversal::ArtifactDeploymentDescription::node (o);
+        pop_ ();
+      }
 
-void InstanceDeploymentDescription::
-node (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-Traversal::InstanceDeploymentDescription::node (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      location_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+      }
 
-void InstanceDeploymentDescription::
-source (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-Traversal::InstanceDeploymentDescription::source (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      location_next (Type const& o)
+      {
+        location_post (o);
+        location_pre (o);
+      }
 
-void InstanceDeploymentDescription::
-implementation (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-Traversal::InstanceDeploymentDescription::implementation (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      location_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void InstanceDeploymentDescription::
-configProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-}
+      void ArtifactDeploymentDescription::
+      execParameter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+      }
 
-void InstanceDeploymentDescription::
-configProperty_next (Type const& o)
-{
-configProperty_post (o);
-configProperty_pre (o);
-}
+      void ArtifactDeploymentDescription::
+      execParameter_next (Type const& o)
+      {
+        execParameter_post (o);
+        execParameter_pre (o);
+      }
 
-void InstanceDeploymentDescription::
-configProperty_post (Type const&)
-{
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      execParameter_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void InstanceDeploymentDescription::
-deployedResource (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-Traversal::InstanceDeploymentDescription::deployedResource (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
 
-void InstanceDeploymentDescription::
-deployedSharedResource (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
-Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
-pop_ ();
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
 
-void InstanceDeploymentDescription::
-id (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-attr_ (&a);
-Traversal::InstanceDeploymentDescription::id (o);
-attr_ (0);
-}
+      void ArtifactDeploymentDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// CCMComponentPortKind
-//
-//
+      void ArtifactDeploymentDescription::
+      deployedResource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+      }
 
-CCMComponentPortKind::
-CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_next (Type const& o)
+      {
+        deployedResource_post (o);
+        deployedResource_pre (o);
+      }
 
-CCMComponentPortKind::
-CCMComponentPortKind ()
-{
-}
+      void ArtifactDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void CCMComponentPortKind::
-traverse (Type const& o)
-{
-::std::basic_string< ACE_TCHAR > s;
-
-if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = "Facet";
-else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = "SimplexReceptacle";
-else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = "MultiplexReceptacle";
-else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
-else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
-else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
-else
-{
-}
+      void ArtifactDeploymentDescription::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::ArtifactDeploymentDescription::id (o);
+        attr_ (0);
+      }
 
-if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-{
-a->value (s);
-}
+      // MonolithicDeploymentDescription
+      //
+      //
 
-else
-{
-top_().value (s);
-}
-}
+      MonolithicDeploymentDescription::
+      MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-// ComponentPortDescription
-//
-//
+      MonolithicDeploymentDescription::
+      MonolithicDeploymentDescription ()
+      {
+      }
 
-ComponentPortDescription::
-ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void MonolithicDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::MonolithicDeploymentDescription::traverse (o);
+      }
 
-ComponentPortDescription::
-ComponentPortDescription ()
-{
-}
+      void MonolithicDeploymentDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::MonolithicDeploymentDescription::name (o);
+        pop_ ();
+      }
 
-void ComponentPortDescription::
-traverse (Type const& o)
-{
-Traversal::ComponentPortDescription::traverse (o);
-}
+      void MonolithicDeploymentDescription::
+      source_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+      }
 
-void ComponentPortDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::ComponentPortDescription::name (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      source_next (Type const& o)
+      {
+        source_post (o);
+        source_pre (o);
+      }
 
-void ComponentPortDescription::
-specificType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
-Traversal::ComponentPortDescription::specificType (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      source_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentPortDescription::
-supportedType_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
-}
+      void MonolithicDeploymentDescription::
+      artifact_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
+      }
 
-void ComponentPortDescription::
-supportedType_next (Type const& o)
-{
-supportedType_post (o);
-supportedType_pre (o);
-}
+      void MonolithicDeploymentDescription::
+      artifact_next (Type const& o)
+      {
+        artifact_post (o);
+        artifact_pre (o);
+      }
 
-void ComponentPortDescription::
-supportedType_post (Type const&)
-{
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      artifact_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentPortDescription::
-provider (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-Traversal::ComponentPortDescription::provider (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      execParameter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+      }
 
-void ComponentPortDescription::
-exclusiveProvider (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
-Traversal::ComponentPortDescription::exclusiveProvider (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      execParameter_next (Type const& o)
+      {
+        execParameter_post (o);
+        execParameter_pre (o);
+      }
 
-void ComponentPortDescription::
-exclusiveUser (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
-Traversal::ComponentPortDescription::exclusiveUser (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      execParameter_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentPortDescription::
-optional (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
-Traversal::ComponentPortDescription::optional (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
 
-void ComponentPortDescription::
-kind (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-Traversal::ComponentPortDescription::kind (o);
-pop_ ();
-}
+      void MonolithicDeploymentDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
 
-// ComponentPropertyDescription
-//
-//
+      void MonolithicDeploymentDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
 
-ComponentPropertyDescription::
-ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void MonolithicDeploymentDescription::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::MonolithicDeploymentDescription::id (o);
+        attr_ (0);
+      }
 
-ComponentPropertyDescription::
-ComponentPropertyDescription ()
-{
-}
+      // ResourceUsageKind
+      //
+      //
 
-void ComponentPropertyDescription::
-traverse (Type const& o)
-{
-Traversal::ComponentPropertyDescription::traverse (o);
-}
+      ResourceUsageKind::
+      ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ComponentPropertyDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::ComponentPropertyDescription::name (o);
-pop_ ();
-}
+      ResourceUsageKind::
+      ResourceUsageKind ()
+      {
+      }
 
-void ComponentPropertyDescription::
-type (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-Traversal::ComponentPropertyDescription::type (o);
-pop_ ();
-}
+      void ResourceUsageKind::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = "None";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = "InstanceUsesResource";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = "ResourceUsesInstance";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = "PortUsesResource";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = "ResourceUsesPort";
+        else 
+        {
+        }
 
-// ComponentExternalPortEndpoint
-//
-//
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
 
-ComponentExternalPortEndpoint::
-ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+        else
+        {
+          top_().value (s);
+        }
+      }
 
-ComponentExternalPortEndpoint::
-ComponentExternalPortEndpoint ()
-{
-}
+      // InstanceResourceDeploymentDescription
+      //
+      //
 
-void ComponentExternalPortEndpoint::
-traverse (Type const& o)
-{
-Traversal::ComponentExternalPortEndpoint::traverse (o);
-}
+      InstanceResourceDeploymentDescription::
+      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ComponentExternalPortEndpoint::
-portName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-Traversal::ComponentExternalPortEndpoint::portName (o);
-pop_ ();
-}
+      InstanceResourceDeploymentDescription::
+      InstanceResourceDeploymentDescription ()
+      {
+      }
 
-// PlanSubcomponentPortEndpoint
-//
-//
+      void InstanceResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::InstanceResourceDeploymentDescription::traverse (o);
+      }
 
-PlanSubcomponentPortEndpoint::
-PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void InstanceResourceDeploymentDescription::
+      resourceUsage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+        Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
+        pop_ ();
+      }
 
-PlanSubcomponentPortEndpoint::
-PlanSubcomponentPortEndpoint ()
-{
-}
+      void InstanceResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+        Traversal::InstanceResourceDeploymentDescription::requirementName (o);
+        pop_ ();
+      }
 
-void PlanSubcomponentPortEndpoint::
-traverse (Type const& o)
-{
-Traversal::PlanSubcomponentPortEndpoint::traverse (o);
-}
+      void InstanceResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+        Traversal::InstanceResourceDeploymentDescription::resourceName (o);
+        pop_ ();
+      }
 
-void PlanSubcomponentPortEndpoint::
-portName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-Traversal::PlanSubcomponentPortEndpoint::portName (o);
-pop_ ();
-}
+      void InstanceResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
 
-void PlanSubcomponentPortEndpoint::
-provider (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-Traversal::PlanSubcomponentPortEndpoint::provider (o);
-pop_ ();
-}
+      void InstanceResourceDeploymentDescription::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
 
-void PlanSubcomponentPortEndpoint::
-kind (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-Traversal::PlanSubcomponentPortEndpoint::kind (o);
-pop_ ();
-}
+      void InstanceResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void PlanSubcomponentPortEndpoint::
-instance (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-Traversal::PlanSubcomponentPortEndpoint::instance (o);
-pop_ ();
-}
+      // InstanceDeploymentDescription
+      //
+      //
 
-// ExternalReferenceEndpoint
-//
-//
+      InstanceDeploymentDescription::
+      InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-ExternalReferenceEndpoint::
-ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      InstanceDeploymentDescription::
+      InstanceDeploymentDescription ()
+      {
+      }
 
-ExternalReferenceEndpoint::
-ExternalReferenceEndpoint ()
-{
-}
+      void InstanceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::InstanceDeploymentDescription::traverse (o);
+      }
 
-void ExternalReferenceEndpoint::
-traverse (Type const& o)
-{
-Traversal::ExternalReferenceEndpoint::traverse (o);
-}
+      void InstanceDeploymentDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::InstanceDeploymentDescription::name (o);
+        pop_ ();
+      }
 
-void ExternalReferenceEndpoint::
-location (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-Traversal::ExternalReferenceEndpoint::location (o);
-pop_ ();
-}
+      void InstanceDeploymentDescription::
+      node (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+        Traversal::InstanceDeploymentDescription::node (o);
+        pop_ ();
+      }
 
-// ConnectionResourceDeploymentDescription
-//
-//
+      void InstanceDeploymentDescription::
+      source (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+        Traversal::InstanceDeploymentDescription::source (o);
+        pop_ ();
+      }
 
-ConnectionResourceDeploymentDescription::
-ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void InstanceDeploymentDescription::
+      implementation (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
+        Traversal::InstanceDeploymentDescription::implementation (o);
+        pop_ ();
+      }
 
-ConnectionResourceDeploymentDescription::
-ConnectionResourceDeploymentDescription ()
-{
-}
+      void InstanceDeploymentDescription::
+      configProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+      }
 
-void ConnectionResourceDeploymentDescription::
-traverse (Type const& o)
-{
-Traversal::ConnectionResourceDeploymentDescription::traverse (o);
-}
+      void InstanceDeploymentDescription::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
 
-void ConnectionResourceDeploymentDescription::
-targetName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
-Traversal::ConnectionResourceDeploymentDescription::targetName (o);
-pop_ ();
-}
+      void InstanceDeploymentDescription::
+      configProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ConnectionResourceDeploymentDescription::
-requirementName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
-pop_ ();
-}
+      void InstanceDeploymentDescription::
+      deployedResource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+      }
 
-void ConnectionResourceDeploymentDescription::
-resourceName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
-pop_ ();
-}
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type const& o)
+      {
+        deployedResource_post (o);
+        deployedResource_pre (o);
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      void InstanceDeploymentDescription::
+      deployedSharedResource (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
+        Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
+        pop_ ();
+      }
 
-void ConnectionResourceDeploymentDescription::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void InstanceDeploymentDescription::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::InstanceDeploymentDescription::id (o);
+        attr_ (0);
+      }
 
-// PlanConnectionDescription
-//
-//
+      // CCMComponentPortKind
+      //
+      //
 
-PlanConnectionDescription::
-PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      CCMComponentPortKind::
+      CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-PlanConnectionDescription::
-PlanConnectionDescription ()
-{
-}
+      CCMComponentPortKind::
+      CCMComponentPortKind ()
+      {
+      }
 
-void PlanConnectionDescription::
-traverse (Type const& o)
-{
-Traversal::PlanConnectionDescription::traverse (o);
-}
+      void CCMComponentPortKind::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = "Facet";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = "SimplexReceptacle";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = "MultiplexReceptacle";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
+        else 
+        {
+        }
 
-void PlanConnectionDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::PlanConnectionDescription::name (o);
-pop_ ();
-}
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
 
-void PlanConnectionDescription::
-source (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-Traversal::PlanConnectionDescription::source (o);
-pop_ ();
-}
+        else
+        {
+          top_().value (s);
+        }
+      }
 
-void PlanConnectionDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
+      // ComponentPortDescription
+      //
+      //
 
-void PlanConnectionDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
+      ComponentPortDescription::
+      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void PlanConnectionDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
+      ComponentPortDescription::
+      ComponentPortDescription ()
+      {
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-}
+      void ComponentPortDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPortDescription::traverse (o);
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_next (Type const& o)
-{
-externalEndpoint_post (o);
-externalEndpoint_pre (o);
-}
+      void ComponentPortDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ComponentPortDescription::name (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-externalEndpoint_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentPortDescription::
+      specificType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
+        Traversal::ComponentPortDescription::specificType (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-}
+      void ComponentPortDescription::
+      supportedType_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_next (Type const& o)
-{
-internalEndpoint_post (o);
-internalEndpoint_pre (o);
-}
+      void ComponentPortDescription::
+      supportedType_next (Type const& o)
+      {
+        supportedType_post (o);
+        supportedType_pre (o);
+      }
 
-void PlanConnectionDescription::
-internalEndpoint_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentPortDescription::
+      supportedType_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-externalReference_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-}
+      void ComponentPortDescription::
+      provider (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+        Traversal::ComponentPortDescription::provider (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-externalReference_next (Type const& o)
-{
-externalReference_post (o);
-externalReference_pre (o);
-}
+      void ComponentPortDescription::
+      exclusiveProvider (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
+        Traversal::ComponentPortDescription::exclusiveProvider (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-externalReference_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentPortDescription::
+      exclusiveUser (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
+        Traversal::ComponentPortDescription::exclusiveUser (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-deployedResource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-}
+      void ComponentPortDescription::
+      optional (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
+        Traversal::ComponentPortDescription::optional (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-deployedResource_next (Type const& o)
-{
-deployedResource_post (o);
-deployedResource_pre (o);
-}
+      void ComponentPortDescription::
+      kind (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+        Traversal::ComponentPortDescription::kind (o);
+        pop_ ();
+      }
 
-void PlanConnectionDescription::
-deployedResource_post (Type const&)
-{
-pop_ ();
-}
+      // ComponentPropertyDescription
+      //
+      //
 
-// ImplementationDependency
-//
-//
+      ComponentPropertyDescription::
+      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-ImplementationDependency::
-ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      ComponentPropertyDescription::
+      ComponentPropertyDescription ()
+      {
+      }
 
-ImplementationDependency::
-ImplementationDependency ()
-{
-}
+      void ComponentPropertyDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPropertyDescription::traverse (o);
+      }
 
-void ImplementationDependency::
-traverse (Type const& o)
-{
-Traversal::ImplementationDependency::traverse (o);
-}
+      void ComponentPropertyDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ComponentPropertyDescription::name (o);
+        pop_ ();
+      }
 
-void ImplementationDependency::
-requiredType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-Traversal::ImplementationDependency::requiredType (o);
-pop_ ();
-}
+      void ComponentPropertyDescription::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::ComponentPropertyDescription::type (o);
+        pop_ ();
+      }
 
-// Capability
-//
-//
+      // ComponentExternalPortEndpoint
+      //
+      //
 
-Capability::
-Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      ComponentExternalPortEndpoint::
+      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-Capability::
-Capability ()
-{
-}
+      ComponentExternalPortEndpoint::
+      ComponentExternalPortEndpoint ()
+      {
+      }
 
-void Capability::
-traverse (Type const& o)
-{
-Traversal::Capability::traverse (o);
-}
+      void ComponentExternalPortEndpoint::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentExternalPortEndpoint::traverse (o);
+      }
 
-void Capability::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Capability::name (o);
-pop_ ();
-}
+      void ComponentExternalPortEndpoint::
+      portName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+        Traversal::ComponentExternalPortEndpoint::portName (o);
+        pop_ ();
+      }
 
-void Capability::
-resourceType_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-}
+      // PlanSubcomponentPortEndpoint
+      //
+      //
 
-void Capability::
-resourceType_next (Type const& o)
-{
-resourceType_post (o);
-resourceType_pre (o);
-}
+      PlanSubcomponentPortEndpoint::
+      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void Capability::
-resourceType_post (Type const&)
-{
-pop_ ();
-}
+      PlanSubcomponentPortEndpoint::
+      PlanSubcomponentPortEndpoint ()
+      {
+      }
 
-void Capability::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      void PlanSubcomponentPortEndpoint::
+      traverse (Type const& o)
+      {
+        Traversal::PlanSubcomponentPortEndpoint::traverse (o);
+      }
 
-void Capability::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      void PlanSubcomponentPortEndpoint::
+      portName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+        Traversal::PlanSubcomponentPortEndpoint::portName (o);
+        pop_ ();
+      }
 
-void Capability::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void PlanSubcomponentPortEndpoint::
+      provider (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+        Traversal::PlanSubcomponentPortEndpoint::provider (o);
+        pop_ ();
+      }
 
-// ImplementationRequirement
-//
-//
+      void PlanSubcomponentPortEndpoint::
+      kind (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+        Traversal::PlanSubcomponentPortEndpoint::kind (o);
+        pop_ ();
+      }
 
-ImplementationRequirement::
-ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void PlanSubcomponentPortEndpoint::
+      instance (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+        Traversal::PlanSubcomponentPortEndpoint::instance (o);
+        pop_ ();
+      }
 
-ImplementationRequirement::
-ImplementationRequirement ()
-{
-}
+      // ExternalReferenceEndpoint
+      //
+      //
 
-void ImplementationRequirement::
-traverse (Type const& o)
-{
-Traversal::ImplementationRequirement::traverse (o);
-}
+      ExternalReferenceEndpoint::
+      ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ImplementationRequirement::
-resourceUsage (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-Traversal::ImplementationRequirement::resourceUsage (o);
-pop_ ();
-}
+      ExternalReferenceEndpoint::
+      ExternalReferenceEndpoint ()
+      {
+      }
 
-void ImplementationRequirement::
-resourcePort (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
-Traversal::ImplementationRequirement::resourcePort (o);
-pop_ ();
-}
+      void ExternalReferenceEndpoint::
+      traverse (Type const& o)
+      {
+        Traversal::ExternalReferenceEndpoint::traverse (o);
+      }
 
-void ImplementationRequirement::
-componentPort (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
-Traversal::ImplementationRequirement::componentPort (o);
-pop_ ();
-}
+      void ExternalReferenceEndpoint::
+      location (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+        Traversal::ExternalReferenceEndpoint::location (o);
+        pop_ ();
+      }
 
-void ImplementationRequirement::
-resourceType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-Traversal::ImplementationRequirement::resourceType (o);
-pop_ ();
-}
+      // ConnectionResourceDeploymentDescription
+      //
+      //
 
-void ImplementationRequirement::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::ImplementationRequirement::name (o);
-pop_ ();
-}
+      ConnectionResourceDeploymentDescription::
+      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void ImplementationRequirement::
-property_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-}
+      ConnectionResourceDeploymentDescription::
+      ConnectionResourceDeploymentDescription ()
+      {
+      }
 
-void ImplementationRequirement::
-property_next (Type const& o)
-{
-property_post (o);
-property_pre (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ConnectionResourceDeploymentDescription::traverse (o);
+      }
 
-void ImplementationRequirement::
-property_post (Type const&)
-{
-pop_ ();
-}
+      void ConnectionResourceDeploymentDescription::
+      targetName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
+        Traversal::ConnectionResourceDeploymentDescription::targetName (o);
+        pop_ ();
+      }
 
-// ComponentPackageReference
-//
-//
+      void ConnectionResourceDeploymentDescription::
+      requirementName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+        Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
+        pop_ ();
+      }
 
-ComponentPackageReference::
-ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      resourceName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+        Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
+        pop_ ();
+      }
 
-ComponentPackageReference::
-ComponentPackageReference ()
-{
-}
+      void ConnectionResourceDeploymentDescription::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
 
-void ComponentPackageReference::
-traverse (Type const& o)
-{
-Traversal::ComponentPackageReference::traverse (o);
-}
+      void ConnectionResourceDeploymentDescription::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
 
-void ComponentPackageReference::
-requiredUUID (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
-Traversal::ComponentPackageReference::requiredUUID (o);
-pop_ ();
-}
+      void ConnectionResourceDeploymentDescription::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentPackageReference::
-requiredName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
-Traversal::ComponentPackageReference::requiredName (o);
-pop_ ();
-}
+      // PlanConnectionDescription
+      //
+      //
 
-void ComponentPackageReference::
-requiredType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-Traversal::ComponentPackageReference::requiredType (o);
-pop_ ();
-}
+      PlanConnectionDescription::
+      PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-// SubcomponentPortEndpoint
-//
-//
+      PlanConnectionDescription::
+      PlanConnectionDescription ()
+      {
+      }
 
-SubcomponentPortEndpoint::
-SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void PlanConnectionDescription::
+      traverse (Type const& o)
+      {
+        Traversal::PlanConnectionDescription::traverse (o);
+      }
 
-SubcomponentPortEndpoint::
-SubcomponentPortEndpoint ()
-{
-}
+      void PlanConnectionDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::PlanConnectionDescription::name (o);
+        pop_ ();
+      }
 
-void SubcomponentPortEndpoint::
-traverse (Type const& o)
-{
-Traversal::SubcomponentPortEndpoint::traverse (o);
-}
+      void PlanConnectionDescription::
+      source (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+        Traversal::PlanConnectionDescription::source (o);
+        pop_ ();
+      }
 
-void SubcomponentPortEndpoint::
-portName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-Traversal::SubcomponentPortEndpoint::portName (o);
-pop_ ();
-}
+      void PlanConnectionDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
 
-void SubcomponentPortEndpoint::
-instance (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-Traversal::SubcomponentPortEndpoint::instance (o);
-pop_ ();
-}
+      void PlanConnectionDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
 
-// AssemblyConnectionDescription
-//
-//
+      void PlanConnectionDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
 
-AssemblyConnectionDescription::
-AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
+      }
 
-AssemblyConnectionDescription::
-AssemblyConnectionDescription ()
-{
-}
+      void PlanConnectionDescription::
+      externalEndpoint_next (Type const& o)
+      {
+        externalEndpoint_post (o);
+        externalEndpoint_pre (o);
+      }
 
-void AssemblyConnectionDescription::
-traverse (Type const& o)
-{
-Traversal::AssemblyConnectionDescription::traverse (o);
-}
+      void PlanConnectionDescription::
+      externalEndpoint_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void AssemblyConnectionDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::AssemblyConnectionDescription::name (o);
-pop_ ();
-}
+      void PlanConnectionDescription::
+      internalEndpoint_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
+      void PlanConnectionDescription::
+      internalEndpoint_next (Type const& o)
+      {
+        internalEndpoint_post (o);
+        internalEndpoint_pre (o);
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
+      void PlanConnectionDescription::
+      internalEndpoint_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void AssemblyConnectionDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
+      void PlanConnectionDescription::
+      externalReference_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-}
+      void PlanConnectionDescription::
+      externalReference_next (Type const& o)
+      {
+        externalReference_post (o);
+        externalReference_pre (o);
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_next (Type const& o)
-{
-internalEndpoint_post (o);
-internalEndpoint_pre (o);
-}
+      void PlanConnectionDescription::
+      externalReference_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void AssemblyConnectionDescription::
-internalEndpoint_post (Type const&)
-{
-pop_ ();
-}
+      void PlanConnectionDescription::
+      deployedResource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-}
+      void PlanConnectionDescription::
+      deployedResource_next (Type const& o)
+      {
+        deployedResource_post (o);
+        deployedResource_pre (o);
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_next (Type const& o)
-{
-externalEndpoint_post (o);
-externalEndpoint_pre (o);
-}
+      void PlanConnectionDescription::
+      deployedResource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void AssemblyConnectionDescription::
-externalEndpoint_post (Type const&)
-{
-pop_ ();
-}
+      // ImplementationDependency
+      //
+      //
 
-void AssemblyConnectionDescription::
-externalReference_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-}
+      ImplementationDependency::
+      ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_next (Type const& o)
-{
-externalReference_post (o);
-externalReference_pre (o);
-}
+      ImplementationDependency::
+      ImplementationDependency ()
+      {
+      }
 
-void AssemblyConnectionDescription::
-externalReference_post (Type const&)
-{
-pop_ ();
-}
-}
-}
+      void ImplementationDependency::
+      traverse (Type const& o)
+      {
+        Traversal::ImplementationDependency::traverse (o);
+      }
+
+      void ImplementationDependency::
+      requiredType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+        Traversal::ImplementationDependency::requiredType (o);
+        pop_ ();
+      }
+
+      // Capability
+      //
+      //
+
+      Capability::
+      Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      Capability::
+      Capability ()
+      {
+      }
+
+      void Capability::
+      traverse (Type const& o)
+      {
+        Traversal::Capability::traverse (o);
+      }
+
+      void Capability::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Capability::name (o);
+        pop_ ();
+      }
+
+      void Capability::
+      resourceType_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+      }
+
+      void Capability::
+      resourceType_next (Type const& o)
+      {
+        resourceType_post (o);
+        resourceType_pre (o);
+      }
+
+      void Capability::
+      resourceType_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void Capability::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
+
+      void Capability::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
+
+      void Capability::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      // ImplementationRequirement
+      //
+      //
+
+      ImplementationRequirement::
+      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ImplementationRequirement::
+      ImplementationRequirement ()
+      {
+      }
+
+      void ImplementationRequirement::
+      traverse (Type const& o)
+      {
+        Traversal::ImplementationRequirement::traverse (o);
+      }
+
+      void ImplementationRequirement::
+      resourceUsage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+        Traversal::ImplementationRequirement::resourceUsage (o);
+        pop_ ();
+      }
+
+      void ImplementationRequirement::
+      resourcePort (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
+        Traversal::ImplementationRequirement::resourcePort (o);
+        pop_ ();
+      }
+
+      void ImplementationRequirement::
+      componentPort (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
+        Traversal::ImplementationRequirement::componentPort (o);
+        pop_ ();
+      }
+
+      void ImplementationRequirement::
+      resourceType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+        Traversal::ImplementationRequirement::resourceType (o);
+        pop_ ();
+      }
+
+      void ImplementationRequirement::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::ImplementationRequirement::name (o);
+        pop_ ();
+      }
+
+      void ImplementationRequirement::
+      property_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+      }
+
+      void ImplementationRequirement::
+      property_next (Type const& o)
+      {
+        property_post (o);
+        property_pre (o);
+      }
+
+      void ImplementationRequirement::
+      property_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      // ComponentPackageReference
+      //
+      //
+
+      ComponentPackageReference::
+      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ComponentPackageReference::
+      ComponentPackageReference ()
+      {
+      }
+
+      void ComponentPackageReference::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPackageReference::traverse (o);
+      }
+
+      void ComponentPackageReference::
+      requiredUUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
+        Traversal::ComponentPackageReference::requiredUUID (o);
+        pop_ ();
+      }
+
+      void ComponentPackageReference::
+      requiredName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
+        Traversal::ComponentPackageReference::requiredName (o);
+        pop_ ();
+      }
+
+      void ComponentPackageReference::
+      requiredType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+        Traversal::ComponentPackageReference::requiredType (o);
+        pop_ ();
+      }
+
+      // SubcomponentPortEndpoint
+      //
+      //
+
+      SubcomponentPortEndpoint::
+      SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      SubcomponentPortEndpoint::
+      SubcomponentPortEndpoint ()
+      {
+      }
+
+      void SubcomponentPortEndpoint::
+      traverse (Type const& o)
+      {
+        Traversal::SubcomponentPortEndpoint::traverse (o);
+      }
+
+      void SubcomponentPortEndpoint::
+      portName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+        Traversal::SubcomponentPortEndpoint::portName (o);
+        pop_ ();
+      }
+
+      void SubcomponentPortEndpoint::
+      instance (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+        Traversal::SubcomponentPortEndpoint::instance (o);
+        pop_ ();
+      }
+
+      // AssemblyConnectionDescription
+      //
+      //
+
+      AssemblyConnectionDescription::
+      AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      AssemblyConnectionDescription::
+      AssemblyConnectionDescription ()
+      {
+      }
+
+      void AssemblyConnectionDescription::
+      traverse (Type const& o)
+      {
+        Traversal::AssemblyConnectionDescription::traverse (o);
+      }
+
+      void AssemblyConnectionDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::AssemblyConnectionDescription::name (o);
+        pop_ ();
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
+
+      void AssemblyConnectionDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_next (Type const& o)
+      {
+        internalEndpoint_post (o);
+        internalEndpoint_pre (o);
+      }
+
+      void AssemblyConnectionDescription::
+      internalEndpoint_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_next (Type const& o)
+      {
+        externalEndpoint_post (o);
+        externalEndpoint_pre (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalEndpoint_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_next (Type const& o)
+      {
+        externalReference_post (o);
+        externalReference_pre (o);
+      }
+
+      void AssemblyConnectionDescription::
+      externalReference_post (Type const&)
+      {
+        pop_ ();
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index 3b3f395a0bb..f67d45baeaa 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,47 +15,53 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef BASIC_DEPLOYMENT_DATA_HPP
 #define BASIC_DEPLOYMENT_DATA_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class TCKind;
-class DataType;
-class DataValue;
-class EnumType;
-class Any;
-class Property;
-class SatisfierPropertyKind;
-class SatisfierProperty;
-class Resource;
-class Requirement;
-class ResourceDeploymentDescription;
-class ArtifactDeploymentDescription;
-class MonolithicDeploymentDescription;
-class ResourceUsageKind;
-class InstanceResourceDeploymentDescription;
-class InstanceDeploymentDescription;
-class CCMComponentPortKind;
-class ComponentPortDescription;
-class ComponentPropertyDescription;
-class ComponentExternalPortEndpoint;
-class PlanSubcomponentPortEndpoint;
-class ExternalReferenceEndpoint;
-class ConnectionResourceDeploymentDescription;
-class PlanConnectionDescription;
-class ImplementationDependency;
-class Capability;
-class ImplementationRequirement;
-class ComponentPackageReference;
-class SubcomponentPortEndpoint;
-class AssemblyConnectionDescription;
-}
+  namespace Config_Handlers
+  {
+    class TCKind;
+    class DataType;
+    class DataValue;
+    class EnumType;
+    class StructType;
+    class StructMemberType;
+    class ValueType;
+    class ValueMemberType;
+    class NamedValue;
+    class SequenceType;
+    class Any;
+    class Property;
+    class SatisfierPropertyKind;
+    class SatisfierProperty;
+    class Resource;
+    class Requirement;
+    class ResourceDeploymentDescription;
+    class ArtifactDeploymentDescription;
+    class MonolithicDeploymentDescription;
+    class ResourceUsageKind;
+    class InstanceResourceDeploymentDescription;
+    class InstanceDeploymentDescription;
+    class CCMComponentPortKind;
+    class ComponentPortDescription;
+    class ComponentPropertyDescription;
+    class ComponentExternalPortEndpoint;
+    class PlanSubcomponentPortEndpoint;
+    class ExternalReferenceEndpoint;
+    class ConnectionResourceDeploymentDescription;
+    class PlanConnectionDescription;
+    class ImplementationDependency;
+    class Capability;
+    class ImplementationRequirement;
+    class ComponentPackageReference;
+    class SubcomponentPortEndpoint;
+    class AssemblyConnectionDescription;
+  }
 }
 
 #include <memory>
@@ -65,7032 +70,8183 @@ class AssemblyConnectionDescription;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
-{
-public:
-TCKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-static TCKind const tk_null;
-static TCKind const tk_void;
-static TCKind const tk_short;
-static TCKind const tk_long;
-static TCKind const tk_ushort;
-static TCKind const tk_ulong;
-static TCKind const tk_float;
-static TCKind const tk_double;
-static TCKind const tk_boolean;
-static TCKind const tk_char;
-static TCKind const tk_octet;
-static TCKind const tk_any;
-static TCKind const tk_TypeCode;
-static TCKind const tk_Principal;
-static TCKind const tk_objref;
-static TCKind const tk_struct;
-static TCKind const tk_union;
-static TCKind const tk_enum;
-static TCKind const tk_string;
-static TCKind const tk_sequence;
-static TCKind const tk_array;
-static TCKind const tk_alias;
-static TCKind const tk_except;
-static TCKind const tk_longlong;
-static TCKind const tk_ulonglong;
-static TCKind const tk_longdouble;
-static TCKind const tk_wchar;
-static TCKind const tk_wstring;
-static TCKind const tk_wfixed;
-static TCKind const tk_value;
-static TCKind const tk_value_box;
-static TCKind const tk_native;
-static TCKind const tk_abstract_interface;
-static TCKind const tk_local_interface;
-static TCKind const tk_component;
-static TCKind const tk_home;
-static TCKind const tk_event;
-
-enum Value
-{
-tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l
-};
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
+    {
+      public:
+      TCKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static TCKind const tk_null;
+      static TCKind const tk_void;
+      static TCKind const tk_short;
+      static TCKind const tk_long;
+      static TCKind const tk_ushort;
+      static TCKind const tk_ulong;
+      static TCKind const tk_float;
+      static TCKind const tk_double;
+      static TCKind const tk_boolean;
+      static TCKind const tk_char;
+      static TCKind const tk_octet;
+      static TCKind const tk_any;
+      static TCKind const tk_TypeCode;
+      static TCKind const tk_Principal;
+      static TCKind const tk_objref;
+      static TCKind const tk_struct;
+      static TCKind const tk_union;
+      static TCKind const tk_enum;
+      static TCKind const tk_string;
+      static TCKind const tk_sequence;
+      static TCKind const tk_array;
+      static TCKind const tk_alias;
+      static TCKind const tk_except;
+      static TCKind const tk_longlong;
+      static TCKind const tk_ulonglong;
+      static TCKind const tk_longdouble;
+      static TCKind const tk_wchar;
+      static TCKind const tk_wstring;
+      static TCKind const tk_wfixed;
+      static TCKind const tk_value;
+      static TCKind const tk_value_box;
+      static TCKind const tk_native;
+      static TCKind const tk_abstract_interface;
+      static TCKind const tk_local_interface;
+      static TCKind const tk_component;
+      static TCKind const tk_home;
+      static TCKind const tk_event;
+
+      enum Value
+      {
+        tk_null_l, tk_void_l, tk_short_l, tk_long_l, tk_ushort_l, tk_ulong_l, tk_float_l, tk_double_l, tk_boolean_l, tk_char_l, tk_octet_l, tk_any_l, tk_TypeCode_l, tk_Principal_l, tk_objref_l, tk_struct_l, tk_union_l, tk_enum_l, tk_string_l, tk_sequence_l, tk_array_l, tk_alias_l, tk_except_l, tk_longlong_l, tk_ulonglong_l, tk_longdouble_l, tk_wchar_l, tk_wstring_l, tk_wfixed_l, tk_value_l, tk_value_box_l, tk_native_l, tk_abstract_interface_l, tk_local_interface_l, tk_component_l, tk_home_l, tk_event_l
+      };
+
+
+      Value
+      integral () const;
+
+      friend bool XSC_XML_Handlers_Export 
+      operator== (TCKind const& a, TCKind const& b);
+
+      friend bool XSC_XML_Handlers_Export 
+      operator!= (TCKind const& a, TCKind const& b);
+
+      private:
+      TCKind (Value v);
+
+      Value v_;
+    };
+
+    bool XSC_XML_Handlers_Export operator== (TCKind const &a, TCKind const &b);
+
+    bool XSC_XML_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
+
+
+    class XSC_XML_Handlers_Export DataType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // kind
+      // 
+      public:
+      ::CIAO::Config_Handlers::TCKind const& kind () const;
+      void kind (::CIAO::Config_Handlers::TCKind const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
+
+      // enum
+      // 
+      public:
+      bool enum_p () const;
+      ::CIAO::Config_Handlers::EnumType const& enum_ () const;
+      void enum_ (::CIAO::Config_Handlers::EnumType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > enum__;
+
+      // struct
+      // 
+      public:
+      bool struct_p () const;
+      ::CIAO::Config_Handlers::StructType const& struct_ () const;
+      void struct_ (::CIAO::Config_Handlers::StructType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::StructType > struct__;
+
+      // value
+      // 
+      public:
+      bool value_p () const;
+      ::CIAO::Config_Handlers::ValueType const& value () const;
+      void value (::CIAO::Config_Handlers::ValueType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ValueType > value_;
+
+      // sequence
+      // 
+      public:
+      bool sequence_p () const;
+      ::CIAO::Config_Handlers::SequenceType const& sequence () const;
+      void sequence (::CIAO::Config_Handlers::SequenceType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > sequence_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      DataType (::CIAO::Config_Handlers::TCKind const& kind__);
+
+      DataType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      DataType (DataType const& s);
+
+      DataType&
+      operator= (DataType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export DataValue : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // short
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator;
+      typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator;
+      short_iterator begin_short ();
+      short_iterator end_short ();
+      short_const_iterator begin_short () const;
+      short_const_iterator end_short () const;
+      void add_short (::XMLSchema::short_ const& );
+      size_t count_short (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::short_ > short_;
+
+      // long
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::int_ >::iterator long_iterator;
+      typedef ::std::list< ::XMLSchema::int_ >::const_iterator long_const_iterator;
+      long_iterator begin_long ();
+      long_iterator end_long ();
+      long_const_iterator begin_long () const;
+      long_const_iterator end_long () const;
+      void add_long (::XMLSchema::int_ const& );
+      size_t count_long (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::int_ > long_;
+
+      // ushort
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::unsignedShort >::iterator ushort_iterator;
+      typedef ::std::list< ::XMLSchema::unsignedShort >::const_iterator ushort_const_iterator;
+      ushort_iterator begin_ushort ();
+      ushort_iterator end_ushort ();
+      ushort_const_iterator begin_ushort () const;
+      ushort_const_iterator end_ushort () const;
+      void add_ushort (::XMLSchema::unsignedShort const& );
+      size_t count_ushort (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::unsignedShort > ushort_;
+
+      // ulong
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::unsignedInt >::iterator ulong_iterator;
+      typedef ::std::list< ::XMLSchema::unsignedInt >::const_iterator ulong_const_iterator;
+      ulong_iterator begin_ulong ();
+      ulong_iterator end_ulong ();
+      ulong_const_iterator begin_ulong () const;
+      ulong_const_iterator end_ulong () const;
+      void add_ulong (::XMLSchema::unsignedInt const& );
+      size_t count_ulong (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::unsignedInt > ulong_;
+
+      // float
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::float_ >::iterator float_iterator;
+      typedef ::std::list< ::XMLSchema::float_ >::const_iterator float_const_iterator;
+      float_iterator begin_float ();
+      float_iterator end_float ();
+      float_const_iterator begin_float () const;
+      float_const_iterator end_float () const;
+      void add_float (::XMLSchema::float_ const& );
+      size_t count_float (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::float_ > float_;
+
+      // double
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::double_ >::iterator double_iterator;
+      typedef ::std::list< ::XMLSchema::double_ >::const_iterator double_const_iterator;
+      double_iterator begin_double ();
+      double_iterator end_double ();
+      double_const_iterator begin_double () const;
+      double_const_iterator end_double () const;
+      void add_double (::XMLSchema::double_ const& );
+      size_t count_double (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::double_ > double_;
+
+      // boolean
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::boolean >::iterator boolean_iterator;
+      typedef ::std::list< ::XMLSchema::boolean >::const_iterator boolean_const_iterator;
+      boolean_iterator begin_boolean ();
+      boolean_iterator end_boolean ();
+      boolean_const_iterator begin_boolean () const;
+      boolean_const_iterator end_boolean () const;
+      void add_boolean (::XMLSchema::boolean const& );
+      size_t count_boolean (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::boolean > boolean_;
+
+      // octet
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::unsignedByte >::iterator octet_iterator;
+      typedef ::std::list< ::XMLSchema::unsignedByte >::const_iterator octet_const_iterator;
+      octet_iterator begin_octet ();
+      octet_iterator end_octet ();
+      octet_const_iterator begin_octet () const;
+      octet_const_iterator end_octet () const;
+      void add_octet (::XMLSchema::unsignedByte const& );
+      size_t count_octet (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::unsignedByte > octet_;
+
+      // enum
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator enum_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator enum_const_iterator;
+      enum_iterator begin_enum ();
+      enum_iterator end_enum ();
+      enum_const_iterator begin_enum () const;
+      enum_const_iterator end_enum () const;
+      void add_enum (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_enum (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > enum_;
+
+      // string
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator string_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator string_const_iterator;
+      string_iterator begin_string ();
+      string_iterator end_string ();
+      string_const_iterator begin_string () const;
+      string_const_iterator end_string () const;
+      void add_string (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_string (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > string_;
+
+      // longlong
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::long_ >::iterator longlong_iterator;
+      typedef ::std::list< ::XMLSchema::long_ >::const_iterator longlong_const_iterator;
+      longlong_iterator begin_longlong ();
+      longlong_iterator end_longlong ();
+      longlong_const_iterator begin_longlong () const;
+      longlong_const_iterator end_longlong () const;
+      void add_longlong (::XMLSchema::long_ const& );
+      size_t count_longlong (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::long_ > longlong_;
+
+      // ulonglong
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::unsignedLong >::iterator ulonglong_iterator;
+      typedef ::std::list< ::XMLSchema::unsignedLong >::const_iterator ulonglong_const_iterator;
+      ulonglong_iterator begin_ulonglong ();
+      ulonglong_iterator end_ulonglong ();
+      ulonglong_const_iterator begin_ulonglong () const;
+      ulonglong_const_iterator end_ulonglong () const;
+      void add_ulonglong (::XMLSchema::unsignedLong const& );
+      size_t count_ulonglong (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::unsignedLong > ulonglong_;
+
+      // longdouble
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::double_ >::iterator longdouble_iterator;
+      typedef ::std::list< ::XMLSchema::double_ >::const_iterator longdouble_const_iterator;
+      longdouble_iterator begin_longdouble ();
+      longdouble_iterator end_longdouble ();
+      longdouble_const_iterator begin_longdouble () const;
+      longdouble_const_iterator end_longdouble () const;
+      void add_longdouble (::XMLSchema::double_ const& );
+      size_t count_longdouble (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::double_ > longdouble_;
+
+      // member
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedValue >::iterator member_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedValue >::const_iterator member_const_iterator;
+      member_iterator begin_member ();
+      member_iterator end_member ();
+      member_const_iterator begin_member () const;
+      member_const_iterator end_member () const;
+      void add_member (::CIAO::Config_Handlers::NamedValue const& );
+      size_t count_member (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::NamedValue > member_;
+
+      public:
+      DataValue ();
+
+      DataValue (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      DataValue (DataValue const& s);
+
+      DataValue&
+      operator= (DataValue const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // typeId
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
+      void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+
+      // member
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator member_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator member_const_iterator;
+      member_iterator begin_member ();
+      member_iterator end_member ();
+      member_const_iterator begin_member () const;
+      member_const_iterator end_member () const;
+      void add_member (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_member (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > member_;
+
+      public:
+      EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                ::XMLSchema::string< ACE_TCHAR > const& typeId__);
+
+      EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      EnumType (EnumType const& s);
+
+      EnumType&
+      operator= (EnumType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export StructType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // typeId
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
+      void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+
+      // member
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::StructMemberType >::iterator member_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::StructMemberType >::const_iterator member_const_iterator;
+      member_iterator begin_member ();
+      member_iterator end_member ();
+      member_const_iterator begin_member () const;
+      member_const_iterator end_member () const;
+      void add_member (::CIAO::Config_Handlers::StructMemberType const& );
+      size_t count_member (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::StructMemberType > member_;
+
+      public:
+      StructType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                  ::XMLSchema::string< ACE_TCHAR > const& typeId__);
+
+      StructType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      StructType (StructType const& s);
+
+      StructType&
+      operator= (StructType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export StructMemberType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& type () const;
+      void type (::CIAO::Config_Handlers::DataType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+
+      public:
+      StructMemberType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                        ::CIAO::Config_Handlers::DataType const& type__);
+
+      StructMemberType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      StructMemberType (StructMemberType const& s);
+
+      StructMemberType&
+      operator= (StructMemberType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ValueType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // typeId
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
+      void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+
+      // modifier
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& modifier () const;
+      void modifier (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > modifier_;
+
+      // baseType
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& baseType () const;
+      void baseType (::CIAO::Config_Handlers::DataType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > baseType_;
+
+      // member
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ValueMemberType >::iterator member_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ValueMemberType >::const_iterator member_const_iterator;
+      member_iterator begin_member ();
+      member_iterator end_member ();
+      member_const_iterator begin_member () const;
+      member_const_iterator end_member () const;
+      void add_member (::CIAO::Config_Handlers::ValueMemberType const& );
+      size_t count_member (void) const;
 
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ValueMemberType > member_;
 
-Value
-integral () const;
+      public:
+      ValueType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                 ::XMLSchema::string< ACE_TCHAR > const& typeId__,
+                 ::XMLSchema::string< ACE_TCHAR > const& modifier__,
+                 ::CIAO::Config_Handlers::DataType const& baseType__);
 
-friend bool XSC_XML_Handlers_Export
-operator== (TCKind const& a, TCKind const& b);
+      ValueType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ValueType (ValueType const& s);
+
+      ValueType&
+      operator= (ValueType const& s);
 
-friend bool XSC_XML_Handlers_Export
-operator!= (TCKind const& a, TCKind const& b);
+      private:
+      char regulator__;
+    };
 
-private:
-TCKind (Value v);
 
-Value v_;
-};
+    class XSC_XML_Handlers_Export ValueMemberType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-bool XSC_XML_Handlers_Export operator== (TCKind const &a, TCKind const &b);
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-bool XSC_XML_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
+      // visibility
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& visibility () const;
+      void visibility (::XMLSchema::string< ACE_TCHAR > const& );
 
-class XSC_XML_Handlers_Export DataType : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > visibility_;
 
-// kind
-//
-public:
-::CIAO::Config_Handlers::TCKind const& kind () const;
-void kind (::CIAO::Config_Handlers::TCKind const& );
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& type () const;
+      void type (::CIAO::Config_Handlers::DataType const& );
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
-// enum
-//
-public:
-bool enum_p () const;
-::CIAO::Config_Handlers::EnumType const& enum_ () const;
-void enum_ (::CIAO::Config_Handlers::EnumType const& );
+      public:
+      ValueMemberType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                       ::XMLSchema::string< ACE_TCHAR > const& visibility__,
+                       ::CIAO::Config_Handlers::DataType const& type__);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > enum__;
+      ValueMemberType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ValueMemberType (ValueMemberType const& s);
+
+      ValueMemberType&
+      operator= (ValueMemberType const& s);
+
+      private:
+      char regulator__;
+    };
 
-public:
-DataType (::CIAO::Config_Handlers::TCKind const& kind__);
 
-DataType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-DataType (DataType const& s);
+    class XSC_XML_Handlers_Export NamedValue : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-DataType&
-operator= (DataType const& s);
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-private:
-char regulator__;
-};
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
+      // value
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataValue const& value () const;
+      void value (::CIAO::Config_Handlers::DataValue const& );
 
-class XSC_XML_Handlers_Export DataValue : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
 
-// short
-//
-public:
-typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator;
-typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator;
-short_iterator begin_short ();
-short_iterator end_short ();
-short_const_iterator begin_short () const;
-short_const_iterator end_short () const;
-void add_short (::XMLSchema::short_ const& );
-size_t count_short (void) const;
-
-protected:
-::std::list< ::XMLSchema::short_ > short_;
-
-// long
-//
-public:
-typedef ::std::list< ::XMLSchema::int_ >::iterator long_iterator;
-typedef ::std::list< ::XMLSchema::int_ >::const_iterator long_const_iterator;
-long_iterator begin_long ();
-long_iterator end_long ();
-long_const_iterator begin_long () const;
-long_const_iterator end_long () const;
-void add_long (::XMLSchema::int_ const& );
-size_t count_long (void) const;
-
-protected:
-::std::list< ::XMLSchema::int_ > long_;
-
-// ushort
-//
-public:
-typedef ::std::list< ::XMLSchema::unsignedShort >::iterator ushort_iterator;
-typedef ::std::list< ::XMLSchema::unsignedShort >::const_iterator ushort_const_iterator;
-ushort_iterator begin_ushort ();
-ushort_iterator end_ushort ();
-ushort_const_iterator begin_ushort () const;
-ushort_const_iterator end_ushort () const;
-void add_ushort (::XMLSchema::unsignedShort const& );
-size_t count_ushort (void) const;
-
-protected:
-::std::list< ::XMLSchema::unsignedShort > ushort_;
-
-// ulong
-//
-public:
-typedef ::std::list< ::XMLSchema::unsignedInt >::iterator ulong_iterator;
-typedef ::std::list< ::XMLSchema::unsignedInt >::const_iterator ulong_const_iterator;
-ulong_iterator begin_ulong ();
-ulong_iterator end_ulong ();
-ulong_const_iterator begin_ulong () const;
-ulong_const_iterator end_ulong () const;
-void add_ulong (::XMLSchema::unsignedInt const& );
-size_t count_ulong (void) const;
-
-protected:
-::std::list< ::XMLSchema::unsignedInt > ulong_;
-
-// float
-//
-public:
-typedef ::std::list< ::XMLSchema::float_ >::iterator float_iterator;
-typedef ::std::list< ::XMLSchema::float_ >::const_iterator float_const_iterator;
-float_iterator begin_float ();
-float_iterator end_float ();
-float_const_iterator begin_float () const;
-float_const_iterator end_float () const;
-void add_float (::XMLSchema::float_ const& );
-size_t count_float (void) const;
-
-protected:
-::std::list< ::XMLSchema::float_ > float_;
-
-// double
-//
-public:
-typedef ::std::list< ::XMLSchema::double_ >::iterator double_iterator;
-typedef ::std::list< ::XMLSchema::double_ >::const_iterator double_const_iterator;
-double_iterator begin_double ();
-double_iterator end_double ();
-double_const_iterator begin_double () const;
-double_const_iterator end_double () const;
-void add_double (::XMLSchema::double_ const& );
-size_t count_double (void) const;
-
-protected:
-::std::list< ::XMLSchema::double_ > double_;
-
-// boolean
-//
-public:
-typedef ::std::list< ::XMLSchema::boolean >::iterator boolean_iterator;
-typedef ::std::list< ::XMLSchema::boolean >::const_iterator boolean_const_iterator;
-boolean_iterator begin_boolean ();
-boolean_iterator end_boolean ();
-boolean_const_iterator begin_boolean () const;
-boolean_const_iterator end_boolean () const;
-void add_boolean (::XMLSchema::boolean const& );
-size_t count_boolean (void) const;
-
-protected:
-::std::list< ::XMLSchema::boolean > boolean_;
-
-// octet
-//
-public:
-typedef ::std::list< ::XMLSchema::unsignedByte >::iterator octet_iterator;
-typedef ::std::list< ::XMLSchema::unsignedByte >::const_iterator octet_const_iterator;
-octet_iterator begin_octet ();
-octet_iterator end_octet ();
-octet_const_iterator begin_octet () const;
-octet_const_iterator end_octet () const;
-void add_octet (::XMLSchema::unsignedByte const& );
-size_t count_octet (void) const;
-
-protected:
-::std::list< ::XMLSchema::unsignedByte > octet_;
-
-// enum
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator enum_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator enum_const_iterator;
-enum_iterator begin_enum ();
-enum_iterator end_enum ();
-enum_const_iterator begin_enum () const;
-enum_const_iterator end_enum () const;
-void add_enum (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_enum (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > enum_;
-
-// string
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator string_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator string_const_iterator;
-string_iterator begin_string ();
-string_iterator end_string ();
-string_const_iterator begin_string () const;
-string_const_iterator end_string () const;
-void add_string (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_string (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > string_;
-
-// longlong
-//
-public:
-typedef ::std::list< ::XMLSchema::long_ >::iterator longlong_iterator;
-typedef ::std::list< ::XMLSchema::long_ >::const_iterator longlong_const_iterator;
-longlong_iterator begin_longlong ();
-longlong_iterator end_longlong ();
-longlong_const_iterator begin_longlong () const;
-longlong_const_iterator end_longlong () const;
-void add_longlong (::XMLSchema::long_ const& );
-size_t count_longlong (void) const;
-
-protected:
-::std::list< ::XMLSchema::long_ > longlong_;
-
-// ulonglong
-//
-public:
-typedef ::std::list< ::XMLSchema::unsignedLong >::iterator ulonglong_iterator;
-typedef ::std::list< ::XMLSchema::unsignedLong >::const_iterator ulonglong_const_iterator;
-ulonglong_iterator begin_ulonglong ();
-ulonglong_iterator end_ulonglong ();
-ulonglong_const_iterator begin_ulonglong () const;
-ulonglong_const_iterator end_ulonglong () const;
-void add_ulonglong (::XMLSchema::unsignedLong const& );
-size_t count_ulonglong (void) const;
-
-protected:
-::std::list< ::XMLSchema::unsignedLong > ulonglong_;
-
-// longdouble
-//
-public:
-typedef ::std::list< ::XMLSchema::double_ >::iterator longdouble_iterator;
-typedef ::std::list< ::XMLSchema::double_ >::const_iterator longdouble_const_iterator;
-longdouble_iterator begin_longdouble ();
-longdouble_iterator end_longdouble ();
-longdouble_const_iterator begin_longdouble () const;
-longdouble_const_iterator end_longdouble () const;
-void add_longdouble (::XMLSchema::double_ const& );
-size_t count_longdouble (void) const;
+      public:
+      NamedValue (::XMLSchema::string< ACE_TCHAR > const& name__,
+                  ::CIAO::Config_Handlers::DataValue const& value__);
 
-protected:
-::std::list< ::XMLSchema::double_ > longdouble_;
+      NamedValue (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      NamedValue (NamedValue const& s);
 
-public:
-DataValue ();
+      NamedValue&
+      operator= (NamedValue const& s);
 
-DataValue (::XSCRT::XML::Element< ACE_TCHAR > const&);
-DataValue (DataValue const& s);
+      private:
+      char regulator__;
+    };
 
-DataValue&
-operator= (DataValue const& s);
 
-private:
-char regulator__;
-};
+    class XSC_XML_Handlers_Export SequenceType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
+      // bound
+      // 
+      public:
+      bool bound_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& bound () const;
+      void bound (::XMLSchema::string< ACE_TCHAR > const& );
 
-class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > bound_;
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+      // elementType
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& elementType () const;
+      void elementType (::CIAO::Config_Handlers::DataType const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > elementType_;
 
-// typeId
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& typeId () const;
-void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+      public:
+      SequenceType (::CIAO::Config_Handlers::DataType const& elementType__);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+      SequenceType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SequenceType (SequenceType const& s);
 
-// member
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator member_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator member_const_iterator;
-member_iterator begin_member ();
-member_iterator end_member ();
-member_const_iterator begin_member () const;
-member_const_iterator end_member () const;
-void add_member (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_member (void) const;
+      SequenceType&
+      operator= (SequenceType const& s);
 
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > member_;
+      private:
+      char regulator__;
+    };
 
-public:
-EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& typeId__);
 
-EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-EnumType (EnumType const& s);
+    class XSC_XML_Handlers_Export Any : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-EnumType&
-operator= (EnumType const& s);
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& type () const;
+      void type (::CIAO::Config_Handlers::DataType const& );
 
-private:
-char regulator__;
-};
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
+      // value
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataValue const& value () const;
+      void value (::CIAO::Config_Handlers::DataValue const& );
 
-class XSC_XML_Handlers_Export Any : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
 
-// type
-//
-public:
-::CIAO::Config_Handlers::DataType const& type () const;
-void type (::CIAO::Config_Handlers::DataType const& );
+      public:
+      Any (::CIAO::Config_Handlers::DataType const& type__,
+           ::CIAO::Config_Handlers::DataValue const& value__);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+      Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Any (Any const& s);
 
-// value
-//
-public:
-::CIAO::Config_Handlers::DataValue const& value () const;
-void value (::CIAO::Config_Handlers::DataValue const& );
+      Any&
+      operator= (Any const& s);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
+      private:
+      char regulator__;
+    };
 
-public:
-Any (::CIAO::Config_Handlers::DataType const& type__,
-::CIAO::Config_Handlers::DataValue const& value__);
 
-Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Any (Any const& s);
+    class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-Any&
-operator= (Any const& s);
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-private:
-char regulator__;
-};
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
+      // value
+      // 
+      public:
+      ::CIAO::Config_Handlers::Any const& value () const;
+      void value (::CIAO::Config_Handlers::Any const& );
 
-class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+      public:
+      Property (::XMLSchema::string< ACE_TCHAR > const& name__,
+                ::CIAO::Config_Handlers::Any const& value__);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+      Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Property (Property const& s);
 
-// value
-//
-public:
-::CIAO::Config_Handlers::Any const& value () const;
-void value (::CIAO::Config_Handlers::Any const& );
+      Property&
+      operator= (Property const& s);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+      private:
+      char regulator__;
+    };
 
-public:
-Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::Any const& value__);
 
-Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Property (Property const& s);
+    class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
+    {
+      public:
+      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
 
-Property&
-operator= (Property const& s);
+      static SatisfierPropertyKind const Quantity;
+      static SatisfierPropertyKind const Capacity;
+      static SatisfierPropertyKind const Minimum;
+      static SatisfierPropertyKind const Maximum;
+      static SatisfierPropertyKind const Attribute;
+      static SatisfierPropertyKind const Selection;
 
-private:
-char regulator__;
-};
+      enum Value
+      {
+        Quantity_l, Capacity_l, Minimum_l, Maximum_l, Attribute_l, Selection_l
+      };
 
 
-class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
-{
-public:
-SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-static SatisfierPropertyKind const Quantity;
-static SatisfierPropertyKind const Capacity;
-static SatisfierPropertyKind const Minimum;
-static SatisfierPropertyKind const Maximum;
-static SatisfierPropertyKind const Attribute;
-static SatisfierPropertyKind const Selection;
-
-enum Value
-{
-Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l
-};
+      Value
+      integral () const;
 
+      friend bool XSC_XML_Handlers_Export 
+      operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-Value
-integral () const;
+      friend bool XSC_XML_Handlers_Export 
+      operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-friend bool XSC_XML_Handlers_Export
-operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+      private:
+      SatisfierPropertyKind (Value v);
 
-friend bool XSC_XML_Handlers_Export
-operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+      Value v_;
+    };
 
-private:
-SatisfierPropertyKind (Value v);
+    bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-Value v_;
-};
+    bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+    class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+      // kind
+      // 
+      public:
+      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
+      void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
 
-// kind
-//
-public:
-::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
-void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
+      // dynamic
+      // 
+      public:
+      ::XMLSchema::boolean const& dynamic () const;
+      void dynamic (::XMLSchema::boolean const& );
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > dynamic_;
 
-// dynamic
-//
-public:
-::XMLSchema::boolean const& dynamic () const;
-void dynamic (::XMLSchema::boolean const& );
+      // value
+      // 
+      public:
+      ::CIAO::Config_Handlers::Any const& value () const;
+      void value (::CIAO::Config_Handlers::Any const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::boolean > dynamic_;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
 
-// value
-//
-public:
-::CIAO::Config_Handlers::Any const& value () const;
-void value (::CIAO::Config_Handlers::Any const& );
+      public:
+      SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
+                         ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+                         ::XMLSchema::boolean const& dynamic__,
+                         ::CIAO::Config_Handlers::Any const& value__);
+
+      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SatisfierProperty (SatisfierProperty const& s);
+
+      SatisfierProperty&
+      operator= (SatisfierProperty const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-public:
-SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-::XMLSchema::boolean const& dynamic__,
-::CIAO::Config_Handlers::Any const& value__);
+      // resourceType
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
+      resourceType_iterator begin_resourceType ();
+      resourceType_iterator end_resourceType ();
+      resourceType_const_iterator begin_resourceType () const;
+      resourceType_const_iterator end_resourceType () const;
+      void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_resourceType (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+
+      public:
+      Resource (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Resource (Resource const& s);
+
+      Resource&
+      operator= (Resource const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // resourceType
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::Property const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+      public:
+      Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                   ::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Requirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Requirement (Requirement const& s);
+
+      Requirement&
+      operator= (Requirement const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // requirementName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+
+      // resourceName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::Property const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+      public:
+      ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                     ::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+
+      ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
+
+      ResourceDeploymentDescription&
+      operator= (ResourceDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // source
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
+      source_iterator begin_source ();
+      source_iterator end_source ();
+      source_const_iterator begin_source () const;
+      source_const_iterator end_source () const;
+      void add_source (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_source (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+      // node
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& node () const;
+      void node (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+
+      // location
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+      location_iterator begin_location ();
+      location_iterator end_location ();
+      location_const_iterator begin_location () const;
+      location_const_iterator end_location () const;
+      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_location (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+      // execParameter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+      execParameter_iterator begin_execParameter ();
+      execParameter_iterator end_execParameter ();
+      execParameter_const_iterator begin_execParameter () const;
+      execParameter_const_iterator end_execParameter () const;
+      void add_execParameter (::CIAO::Config_Handlers::Property const& );
+      size_t count_execParameter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+      // deployedResource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::iterator deployedResource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
+      deployedResource_iterator begin_deployedResource ();
+      deployedResource_iterator end_deployedResource ();
+      deployedResource_const_iterator begin_deployedResource () const;
+      deployedResource_const_iterator end_deployedResource () const;
+      void add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& );
+      size_t count_deployedResource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                     ::XMLSchema::string< ACE_TCHAR > const& node__);
+
+      ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
+
+      ArtifactDeploymentDescription&
+      operator= (ArtifactDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // source
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
+      source_iterator begin_source ();
+      source_iterator end_source ();
+      source_const_iterator begin_source () const;
+      source_const_iterator end_source () const;
+      void add_source (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_source (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+      // artifact
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator artifact_iterator;
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator artifact_const_iterator;
+      artifact_iterator begin_artifact ();
+      artifact_iterator end_artifact ();
+      artifact_const_iterator begin_artifact () const;
+      artifact_const_iterator end_artifact () const;
+      void add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      size_t count_artifact (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > artifact_;
+
+      // execParameter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+      execParameter_iterator begin_execParameter ();
+      execParameter_iterator end_execParameter ();
+      execParameter_const_iterator begin_execParameter () const;
+      execParameter_const_iterator end_execParameter () const;
+      void add_execParameter (::CIAO::Config_Handlers::Property const& );
+      size_t count_execParameter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s);
+
+      MonolithicDeploymentDescription&
+      operator= (MonolithicDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
+    {
+      public:
+      ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static ResourceUsageKind const None;
+      static ResourceUsageKind const InstanceUsesResource;
+      static ResourceUsageKind const ResourceUsesInstance;
+      static ResourceUsageKind const PortUsesResource;
+      static ResourceUsageKind const ResourceUsesPort;
+
+      enum Value
+      {
+        None_l, InstanceUsesResource_l, ResourceUsesInstance_l, PortUsesResource_l, ResourceUsesPort_l
+      };
+
+
+      Value
+      integral () const;
+
+      friend bool XSC_XML_Handlers_Export 
+      operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
+
+      friend bool XSC_XML_Handlers_Export 
+      operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
+
+      private:
+      ResourceUsageKind (Value v);
+
+      Value v_;
+    };
+
+    bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
+
+    bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
+
+
+    class XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // resourceUsage
+      // 
+      public:
+      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
+      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+
+      // requirementName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+
+      // resourceName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::Property const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+      public:
+      InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
+                                             ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                             ::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+
+      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s);
+
+      InstanceResourceDeploymentDescription&
+      operator= (InstanceResourceDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // node
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& node () const;
+      void node (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+
+      // source
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& source () const;
+      void source (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+      // implementation
+      // 
+      public:
+      ::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
+      void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // deployedResource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >::iterator deployedResource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
+      deployedResource_iterator begin_deployedResource ();
+      deployedResource_iterator end_deployedResource ();
+      deployedResource_const_iterator begin_deployedResource () const;
+      deployedResource_const_iterator end_deployedResource () const;
+      void add_deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+      size_t count_deployedResource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
+
+      // deployedSharedResource
+      // 
+      public:
+      bool deployedSharedResource_p () const;
+      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
+      void deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                     ::XMLSchema::string< ACE_TCHAR > const& node__,
+                                     ::XMLSchema::string< ACE_TCHAR > const& source__,
+                                     ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__);
+
+      InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
+
+      InstanceDeploymentDescription&
+      operator= (InstanceDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
+    {
+      public:
+      CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static CCMComponentPortKind const Facet;
+      static CCMComponentPortKind const SimplexReceptacle;
+      static CCMComponentPortKind const MultiplexReceptacle;
+      static CCMComponentPortKind const EventEmitter;
+      static CCMComponentPortKind const EventPublisher;
+      static CCMComponentPortKind const EventConsumer;
+
+      enum Value
+      {
+        Facet_l, SimplexReceptacle_l, MultiplexReceptacle_l, EventEmitter_l, EventPublisher_l, EventConsumer_l
+      };
+
+
+      Value
+      integral () const;
+
+      friend bool XSC_XML_Handlers_Export 
+      operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+
+      friend bool XSC_XML_Handlers_Export 
+      operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+
+      private:
+      CCMComponentPortKind (Value v);
+
+      Value v_;
+    };
+
+    bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+
+    bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+
+
+    class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // specificType
+      // 
+      public:
+      bool specificType_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& specificType () const;
+      void specificType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
+
+      // supportedType
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
+      supportedType_iterator begin_supportedType ();
+      supportedType_iterator end_supportedType ();
+      supportedType_const_iterator begin_supportedType () const;
+      supportedType_const_iterator end_supportedType () const;
+      void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_supportedType (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
 
-SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SatisfierProperty (SatisfierProperty const& s);
+      // provider
+      // 
+      public:
+      ::XMLSchema::boolean const& provider () const;
+      void provider (::XMLSchema::boolean const& );
 
-SatisfierProperty&
-operator= (SatisfierProperty const& s);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > provider_;
 
-private:
-char regulator__;
-};
+      // exclusiveProvider
+      // 
+      public:
+      ::XMLSchema::boolean const& exclusiveProvider () const;
+      void exclusiveProvider (::XMLSchema::boolean const& );
 
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > exclusiveProvider_;
 
-class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      // exclusiveUser
+      // 
+      public:
+      ::XMLSchema::boolean const& exclusiveUser () const;
+      void exclusiveUser (::XMLSchema::boolean const& );
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > exclusiveUser_;
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+      // optional
+      // 
+      public:
+      ::XMLSchema::boolean const& optional () const;
+      void optional (::XMLSchema::boolean const& );
 
-// resourceType
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
-resourceType_iterator begin_resourceType ();
-resourceType_iterator end_resourceType ();
-resourceType_const_iterator begin_resourceType () const;
-resourceType_const_iterator end_resourceType () const;
-void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_resourceType (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
-size_t count_property (void) const;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > optional_;
 
-protected:
-::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+      // kind
+      // 
+      public:
+      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
 
-public:
-Resource (::XMLSchema::string< ACE_TCHAR > const& name__);
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Resource (Resource const& s);
+      public:
+      ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                ::XMLSchema::boolean const& provider__,
+                                ::XMLSchema::boolean const& exclusiveProvider__,
+                                ::XMLSchema::boolean const& exclusiveUser__,
+                                ::XMLSchema::boolean const& optional__,
+                                ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__);
 
-Resource&
-operator= (Resource const& s);
+      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPortDescription (ComponentPortDescription const& s);
+
+      ComponentPortDescription&
+      operator= (ComponentPortDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // type
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& type () const;
+      void type (::CIAO::Config_Handlers::DataType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+
+      public:
+      ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                    ::CIAO::Config_Handlers::DataType const& type__);
 
-private:
-char regulator__;
-};
+      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPropertyDescription (ComponentPropertyDescription const& s);
 
+      ComponentPropertyDescription&
+      operator= (ComponentPropertyDescription const& s);
 
-class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      private:
+      char regulator__;
+    };
 
-// resourceType
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+    class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+      // portName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
+      void portName (::XMLSchema::string< ACE_TCHAR > const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::Property const& );
-size_t count_property (void) const;
+      public:
+      ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > property_;
+      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
 
-public:
-Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::XMLSchema::string< ACE_TCHAR > const& name__);
+      ComponentExternalPortEndpoint&
+      operator= (ComponentExternalPortEndpoint const& s);
 
-Requirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Requirement (Requirement const& s);
+      private:
+      char regulator__;
+    };
 
-Requirement&
-operator= (Requirement const& s);
 
-private:
-char regulator__;
-};
+    class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
+      // portName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
+      void portName (::XMLSchema::string< ACE_TCHAR > const& );
 
-class XSC_XML_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
-// requirementName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+      // provider
+      // 
+      public:
+      bool provider_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& provider () const;
+      void provider (::XMLSchema::string< ACE_TCHAR > const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
 
-// resourceName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+      // kind
+      // 
+      public:
+      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::Property const& );
-size_t count_property (void) const;
+      // instance
+      // 
+      public:
+      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+      public:
+      PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+                                    ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+                                    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
+
+      PlanSubcomponentPortEndpoint&
+      operator= (PlanSubcomponentPortEndpoint const& s);
+
+      private:
+      char regulator__;
+    };
 
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > property_;
 
-public:
-ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+    class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
 
-ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
+      // location
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& location () const;
+      void location (::XMLSchema::string< ACE_TCHAR > const& );
 
-ResourceDeploymentDescription&
-operator= (ResourceDeploymentDescription const& s);
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
 
-private:
-char regulator__;
-};
+      public:
+      ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
 
+      ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
+
+      ExternalReferenceEndpoint&
+      operator= (ExternalReferenceEndpoint const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // targetName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& targetName () const;
+      void targetName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
+
+      // requirementName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+
+      // resourceName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::Property const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+      public:
+      ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
+                                               ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+                                               ::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+
+      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
+
+      ConnectionResourceDeploymentDescription&
+      operator= (ConnectionResourceDeploymentDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // source
+      // 
+      public:
+      bool source_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& source () const;
+      void source (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+      // externalEndpoint
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
+      externalEndpoint_iterator begin_externalEndpoint ();
+      externalEndpoint_iterator end_externalEndpoint ();
+      externalEndpoint_const_iterator begin_externalEndpoint () const;
+      externalEndpoint_const_iterator end_externalEndpoint () const;
+      void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
+      size_t count_externalEndpoint (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
+
+      // internalEndpoint
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
+      internalEndpoint_iterator begin_internalEndpoint ();
+      internalEndpoint_iterator end_internalEndpoint ();
+      internalEndpoint_const_iterator begin_internalEndpoint () const;
+      internalEndpoint_const_iterator end_internalEndpoint () const;
+      void add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& );
+      size_t count_internalEndpoint (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
+
+      // externalReference
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
+      externalReference_iterator begin_externalReference ();
+      externalReference_iterator end_externalReference ();
+      externalReference_const_iterator begin_externalReference () const;
+      externalReference_const_iterator end_externalReference () const;
+      void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
+      size_t count_externalReference (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
+
+      // deployedResource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::iterator deployedResource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
+      deployedResource_iterator begin_deployedResource ();
+      deployedResource_iterator end_deployedResource ();
+      deployedResource_const_iterator begin_deployedResource () const;
+      deployedResource_const_iterator end_deployedResource () const;
+      void add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& );
+      size_t count_deployedResource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_;
+
+      public:
+      PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PlanConnectionDescription (PlanConnectionDescription const& s);
+
+      PlanConnectionDescription&
+      operator= (PlanConnectionDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ImplementationDependency : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // requiredType
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
+      void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+
+      public:
+      ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+
+      ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ImplementationDependency (ImplementationDependency const& s);
+
+      ImplementationDependency&
+      operator= (ImplementationDependency const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Capability : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // resourceType
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
+      resourceType_iterator begin_resourceType ();
+      resourceType_iterator end_resourceType ();
+      resourceType_const_iterator begin_resourceType () const;
+      resourceType_const_iterator end_resourceType () const;
+      void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_resourceType (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+
+      public:
+      Capability (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Capability (Capability const& s);
+
+      Capability&
+      operator= (Capability const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // resourceUsage
+      // 
+      public:
+      bool resourceUsage_p () const;
+      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
+      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+
+      // resourcePort
+      // 
+      public:
+      bool resourcePort_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& resourcePort () const;
+      void resourcePort (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_;
+
+      // componentPort
+      // 
+      public:
+      bool componentPort_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& componentPort () const;
+      void componentPort (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_;
+
+      // resourceType
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::Property const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+      public:
+      ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                                 ::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ImplementationRequirement (ImplementationRequirement const& s);
+
+      ImplementationRequirement&
+      operator= (ImplementationRequirement const& s);
+
+      private:
+      char regulator__;
+    };
 
-class XSC_XML_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
+
+    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // requiredUUID
+      // 
+      public:
+      bool requiredUUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
+      void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
+
+      // requiredName
+      // 
+      public:
+      bool requiredName_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
+      void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
+
+      // requiredType
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
+      void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+
+      public:
+      ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+
+      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPackageReference (ComponentPackageReference const& s);
+
+      ComponentPackageReference&
+      operator= (ComponentPackageReference const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // portName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
+      void portName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+
+      // instance
+      // 
+      public:
+      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+      public:
+      SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+                                ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+      SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
+
+      SubcomponentPortEndpoint&
+      operator= (SubcomponentPortEndpoint const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+      // internalEndpoint
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
+      internalEndpoint_iterator begin_internalEndpoint ();
+      internalEndpoint_iterator end_internalEndpoint ();
+      internalEndpoint_const_iterator begin_internalEndpoint () const;
+      internalEndpoint_const_iterator end_internalEndpoint () const;
+      void add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& );
+      size_t count_internalEndpoint (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
+
+      // externalEndpoint
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
+      externalEndpoint_iterator begin_externalEndpoint ();
+      externalEndpoint_iterator end_externalEndpoint ();
+      externalEndpoint_const_iterator begin_externalEndpoint () const;
+      externalEndpoint_const_iterator end_externalEndpoint () const;
+      void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
+      size_t count_externalEndpoint (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
+
+      // externalReference
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
+      externalReference_iterator begin_externalReference ();
+      externalReference_iterator end_externalReference ();
+      externalReference_const_iterator begin_externalReference () const;
+      externalReference_const_iterator end_externalReference () const;
+      void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
+      size_t count_externalReference (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
+
+      public:
+      AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      AssemblyConnectionDescription (AssemblyConnectionDescription const& s);
+
+      AssemblyConnectionDescription&
+      operator= (AssemblyConnectionDescription const& s);
+
+      private:
+      char regulator__;
+    };
+  }
+}
+
+namespace CIAO
 {
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+  namespace Config_Handlers
+  {
+  }
+}
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+#include "XMLSchema/Traversal.hpp"
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
+      TCKind;
 
-// source
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
-source_iterator begin_source ();
-source_iterator end_source ();
-source_const_iterator begin_source () const;
-source_const_iterator end_source () const;
-void add_source (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_source (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-// node
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& node () const;
-void node (::XMLSchema::string< ACE_TCHAR > const& );
+      struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
+      {
+        virtual void
+        traverse (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+        virtual void
+        traverse (Type const&);
 
-// location
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-location_iterator begin_location ();
-location_iterator end_location ();
-location_const_iterator begin_location () const;
-location_const_iterator end_location () const;
-void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_location (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-// execParameter
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
-execParameter_iterator begin_execParameter ();
-execParameter_iterator end_execParameter ();
-execParameter_const_iterator begin_execParameter () const;
-execParameter_const_iterator end_execParameter () const;
-void add_execParameter (::CIAO::Config_Handlers::Property const& );
-size_t count_execParameter (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
-
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-// deployedResource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::iterator deployedResource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
-deployedResource_iterator begin_deployedResource ();
-deployedResource_iterator end_deployedResource ();
-deployedResource_const_iterator begin_deployedResource () const;
-deployedResource_const_iterator end_deployedResource () const;
-void add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& );
-size_t count_deployedResource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
-
-// id
-//
-public:
-bool id_p () const;
-::XMLSchema::ID< ACE_TCHAR > const& id () const;
-::XMLSchema::ID< ACE_TCHAR >& id ();
-void id (::XMLSchema::ID< ACE_TCHAR > const& );
+        virtual void
+        pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+        virtual void
+        pre (Type const&);
 
-public:
-ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& node__);
+        virtual void
+        kind (Type&);
 
-ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
+        virtual void
+        kind (Type const&);
 
-ArtifactDeploymentDescription&
-operator= (ArtifactDeploymentDescription const& s);
+        virtual void
+        enum_ (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        enum_ (Type const&);
 
+        virtual void
+        enum_none (Type&);
 
-class XSC_XML_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        enum_none (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        struct_ (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        struct_ (Type const&);
 
-// source
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
-source_iterator begin_source ();
-source_iterator end_source ();
-source_const_iterator begin_source () const;
-source_const_iterator end_source () const;
-void add_source (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_source (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-// artifact
-//
-public:
-typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator artifact_iterator;
-typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator artifact_const_iterator;
-artifact_iterator begin_artifact ();
-artifact_iterator end_artifact ();
-artifact_const_iterator begin_artifact () const;
-artifact_const_iterator end_artifact () const;
-void add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& );
-size_t count_artifact (void) const;
-
-protected:
-::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > artifact_;
-
-// execParameter
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
-execParameter_iterator begin_execParameter ();
-execParameter_iterator end_execParameter ();
-execParameter_const_iterator begin_execParameter () const;
-execParameter_const_iterator end_execParameter () const;
-void add_execParameter (::CIAO::Config_Handlers::Property const& );
-size_t count_execParameter (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
-
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-// id
-//
-public:
-bool id_p () const;
-::XMLSchema::ID< ACE_TCHAR > const& id () const;
-::XMLSchema::ID< ACE_TCHAR >& id ();
-void id (::XMLSchema::ID< ACE_TCHAR > const& );
+        virtual void
+        struct_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+        virtual void
+        struct_none (Type const&);
 
-public:
-MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+        virtual void
+        value (Type&);
 
-MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s);
+        virtual void
+        value (Type const&);
 
-MonolithicDeploymentDescription&
-operator= (MonolithicDeploymentDescription const& s);
+        virtual void
+        value_none (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        value_none (Type const&);
 
+        virtual void
+        sequence (Type&);
 
-class XSC_XML_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
-{
-public:
-ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+        virtual void
+        sequence (Type const&);
 
-static ResourceUsageKind const None;
-static ResourceUsageKind const InstanceUsesResource;
-static ResourceUsageKind const ResourceUsesInstance;
-static ResourceUsageKind const PortUsesResource;
-static ResourceUsageKind const ResourceUsesPort;
+        virtual void
+        sequence_none (Type&);
 
-enum Value
-{
-None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l
-};
+        virtual void
+        sequence_none (Type const&);
 
+        virtual void
+        id (Type&);
 
-Value
-integral () const;
+        virtual void
+        id (Type const&);
 
-friend bool XSC_XML_Handlers_Export
-operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
+        virtual void
+        id_none (Type&);
 
-friend bool XSC_XML_Handlers_Export
-operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
+        virtual void
+        id_none (Type const&);
 
-private:
-ResourceUsageKind (Value v);
+        virtual void
+        post (Type&);
 
-Value v_;
-};
+        virtual void
+        post (Type const&);
+      };
 
-bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
+      struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
+      {
+        virtual void
+        traverse (Type&);
 
-bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
+        virtual void
+        traverse (Type const&);
 
+        virtual void
+        pre (Type&);
 
-class XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        pre (Type const&);
 
-// resourceUsage
-//
-public:
-::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+        virtual void
+        short_ (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+        virtual void
+        short_ (Type const&);
 
-// requirementName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        short_pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+        virtual void
+        short_pre (Type const&);
 
-// resourceName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        short_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+        virtual void
+        short_next (Type const&);
 
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::Property const& );
-size_t count_property (void) const;
+        virtual void
+        short_post (Type&);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > property_;
+        virtual void
+        short_post (Type const&);
 
-public:
-InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+        virtual void
+        short_none (Type&);
 
-InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s);
+        virtual void
+        short_none (Type const&);
 
-InstanceResourceDeploymentDescription&
-operator= (InstanceResourceDeploymentDescription const& s);
+        virtual void
+        long_ (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        long_ (Type const&);
 
+        virtual void
+        long_pre (Type&);
 
-class XSC_XML_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        long_pre (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        long_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        long_next (Type const&);
 
-// node
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& node () const;
-void node (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        long_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+        virtual void
+        long_post (Type const&);
 
-// source
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& source () const;
-void source (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        long_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+        virtual void
+        long_none (Type const&);
 
-// implementation
-//
-public:
-::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
-void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
+        virtual void
+        ushort (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
+        virtual void
+        ushort (Type const&);
 
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// deployedResource
-//
-public:
-bool deployedResource_p () const;
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
-void deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+        virtual void
+        ushort_pre (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
+        virtual void
+        ushort_pre (Type const&);
 
-// deployedSharedResource
-//
-public:
-bool deployedSharedResource_p () const;
-::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
-void deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+        virtual void
+        ushort_next (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
+        virtual void
+        ushort_next (Type const&);
 
-// id
-//
-public:
-bool id_p () const;
-::XMLSchema::ID< ACE_TCHAR > const& id () const;
-::XMLSchema::ID< ACE_TCHAR >& id ();
-void id (::XMLSchema::ID< ACE_TCHAR > const& );
+        virtual void
+        ushort_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+        virtual void
+        ushort_post (Type const&);
 
-public:
-InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& node__,
-::XMLSchema::string< ACE_TCHAR > const& source__,
-::XMLSchema::IDREF< ACE_TCHAR > const& implementation__);
+        virtual void
+        ushort_none (Type&);
 
-InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
+        virtual void
+        ushort_none (Type const&);
 
-InstanceDeploymentDescription&
-operator= (InstanceDeploymentDescription const& s);
+        virtual void
+        ulong (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        ulong (Type const&);
 
+        virtual void
+        ulong_pre (Type&);
 
-class XSC_XML_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
-{
-public:
-CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-static CCMComponentPortKind const Facet;
-static CCMComponentPortKind const SimplexReceptacle;
-static CCMComponentPortKind const MultiplexReceptacle;
-static CCMComponentPortKind const EventEmitter;
-static CCMComponentPortKind const EventPublisher;
-static CCMComponentPortKind const EventConsumer;
-
-enum Value
-{
-Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l
-};
+        virtual void
+        ulong_pre (Type const&);
 
+        virtual void
+        ulong_next (Type&);
 
-Value
-integral () const;
+        virtual void
+        ulong_next (Type const&);
 
-friend bool XSC_XML_Handlers_Export
-operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+        virtual void
+        ulong_post (Type&);
 
-friend bool XSC_XML_Handlers_Export
-operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+        virtual void
+        ulong_post (Type const&);
 
-private:
-CCMComponentPortKind (Value v);
+        virtual void
+        ulong_none (Type&);
 
-Value v_;
-};
+        virtual void
+        ulong_none (Type const&);
 
-bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+        virtual void
+        float_ (Type&);
 
-bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+        virtual void
+        float_ (Type const&);
 
+        virtual void
+        float_pre (Type&);
 
-class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        float_pre (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        float_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        float_next (Type const&);
 
-// specificType
-//
-public:
-bool specificType_p () const;
-::XMLSchema::string< ACE_TCHAR > const& specificType () const;
-void specificType (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        float_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
+        virtual void
+        float_post (Type const&);
 
-// supportedType
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
-supportedType_iterator begin_supportedType ();
-supportedType_iterator end_supportedType ();
-supportedType_const_iterator begin_supportedType () const;
-supportedType_const_iterator end_supportedType () const;
-void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_supportedType (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
-
-// provider
-//
-public:
-::XMLSchema::boolean const& provider () const;
-void provider (::XMLSchema::boolean const& );
+        virtual void
+        float_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::boolean > provider_;
+        virtual void
+        float_none (Type const&);
 
-// exclusiveProvider
-//
-public:
-::XMLSchema::boolean const& exclusiveProvider () const;
-void exclusiveProvider (::XMLSchema::boolean const& );
+        virtual void
+        double_ (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::boolean > exclusiveProvider_;
+        virtual void
+        double_ (Type const&);
 
-// exclusiveUser
-//
-public:
-::XMLSchema::boolean const& exclusiveUser () const;
-void exclusiveUser (::XMLSchema::boolean const& );
+        virtual void
+        double_pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::boolean > exclusiveUser_;
+        virtual void
+        double_pre (Type const&);
 
-// optional
-//
-public:
-::XMLSchema::boolean const& optional () const;
-void optional (::XMLSchema::boolean const& );
+        virtual void
+        double_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::boolean > optional_;
+        virtual void
+        double_next (Type const&);
 
-// kind
-//
-public:
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+        virtual void
+        double_post (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+        virtual void
+        double_post (Type const&);
 
-public:
-ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::boolean const& provider__,
-::XMLSchema::boolean const& exclusiveProvider__,
-::XMLSchema::boolean const& exclusiveUser__,
-::XMLSchema::boolean const& optional__,
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind__);
+        virtual void
+        double_none (Type&);
 
-ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentPortDescription (ComponentPortDescription const& s);
+        virtual void
+        double_none (Type const&);
 
-ComponentPortDescription&
-operator= (ComponentPortDescription const& s);
+        virtual void
+        boolean (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        boolean (Type const&);
 
+        virtual void
+        boolean_pre (Type&);
 
-class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        boolean_pre (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        boolean_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        boolean_next (Type const&);
 
-// type
-//
-public:
-::CIAO::Config_Handlers::DataType const& type () const;
-void type (::CIAO::Config_Handlers::DataType const& );
+        virtual void
+        boolean_post (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+        virtual void
+        boolean_post (Type const&);
 
-public:
-ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::DataType const& type__);
+        virtual void
+        boolean_none (Type&);
 
-ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentPropertyDescription (ComponentPropertyDescription const& s);
+        virtual void
+        boolean_none (Type const&);
 
-ComponentPropertyDescription&
-operator= (ComponentPropertyDescription const& s);
+        virtual void
+        octet (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        octet (Type const&);
 
+        virtual void
+        octet_pre (Type&);
 
-class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        octet_pre (Type const&);
 
-// portName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& portName () const;
-void portName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        octet_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+        virtual void
+        octet_next (Type const&);
 
-public:
-ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
+        virtual void
+        octet_post (Type&);
 
-ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
+        virtual void
+        octet_post (Type const&);
 
-ComponentExternalPortEndpoint&
-operator= (ComponentExternalPortEndpoint const& s);
+        virtual void
+        octet_none (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        octet_none (Type const&);
 
+        virtual void
+        enum_ (Type&);
 
-class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        enum_ (Type const&);
 
-// portName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& portName () const;
-void portName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        enum_pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+        virtual void
+        enum_pre (Type const&);
 
-// provider
-//
-public:
-bool provider_p () const;
-::XMLSchema::string< ACE_TCHAR > const& provider () const;
-void provider (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        enum_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+        virtual void
+        enum_next (Type const&);
 
-// kind
-//
-public:
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+        virtual void
+        enum_post (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+        virtual void
+        enum_post (Type const&);
 
-// instance
-//
-public:
-::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+        virtual void
+        enum_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+        virtual void
+        enum_none (Type const&);
 
-public:
-PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+        virtual void
+        string (Type&);
 
-PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
+        virtual void
+        string (Type const&);
 
-PlanSubcomponentPortEndpoint&
-operator= (PlanSubcomponentPortEndpoint const& s);
+        virtual void
+        string_pre (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        string_pre (Type const&);
 
+        virtual void
+        string_next (Type&);
 
-class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        string_next (Type const&);
 
-// location
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& location () const;
-void location (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        string_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
+        virtual void
+        string_post (Type const&);
 
-public:
-ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
+        virtual void
+        string_none (Type&);
 
-ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
+        virtual void
+        string_none (Type const&);
 
-ExternalReferenceEndpoint&
-operator= (ExternalReferenceEndpoint const& s);
+        virtual void
+        longlong (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        longlong (Type const&);
 
+        virtual void
+        longlong_pre (Type&);
 
-class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        longlong_pre (Type const&);
 
-// targetName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& targetName () const;
-void targetName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        longlong_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
+        virtual void
+        longlong_next (Type const&);
 
-// requirementName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        longlong_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+        virtual void
+        longlong_post (Type const&);
 
-// resourceName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        longlong_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+        virtual void
+        longlong_none (Type const&);
 
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::Property const& );
-size_t count_property (void) const;
+        virtual void
+        ulonglong (Type&);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > property_;
+        virtual void
+        ulonglong (Type const&);
 
-public:
-ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+        virtual void
+        ulonglong_pre (Type&);
 
-ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
+        virtual void
+        ulonglong_pre (Type const&);
 
-ConnectionResourceDeploymentDescription&
-operator= (ConnectionResourceDeploymentDescription const& s);
+        virtual void
+        ulonglong_next (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        ulonglong_next (Type const&);
 
+        virtual void
+        ulonglong_post (Type&);
 
-class XSC_XML_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        ulonglong_post (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        ulonglong_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        ulonglong_none (Type const&);
 
-// source
-//
-public:
-bool source_p () const;
-::XMLSchema::string< ACE_TCHAR > const& source () const;
-void source (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        longdouble (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+        virtual void
+        longdouble (Type const&);
 
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-// externalEndpoint
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
-externalEndpoint_iterator begin_externalEndpoint ();
-externalEndpoint_iterator end_externalEndpoint ();
-externalEndpoint_const_iterator begin_externalEndpoint () const;
-externalEndpoint_const_iterator end_externalEndpoint () const;
-void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
-size_t count_externalEndpoint (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-// internalEndpoint
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
-internalEndpoint_iterator begin_internalEndpoint ();
-internalEndpoint_iterator end_internalEndpoint ();
-internalEndpoint_const_iterator begin_internalEndpoint () const;
-internalEndpoint_const_iterator end_internalEndpoint () const;
-void add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& );
-size_t count_internalEndpoint (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
-
-// externalReference
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
-externalReference_iterator begin_externalReference ();
-externalReference_iterator end_externalReference ();
-externalReference_const_iterator begin_externalReference () const;
-externalReference_const_iterator end_externalReference () const;
-void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
-size_t count_externalReference (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-// deployedResource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::iterator deployedResource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
-deployedResource_iterator begin_deployedResource ();
-deployedResource_iterator end_deployedResource ();
-deployedResource_const_iterator begin_deployedResource () const;
-deployedResource_const_iterator end_deployedResource () const;
-void add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& );
-size_t count_deployedResource (void) const;
+        virtual void
+        longdouble_pre (Type&);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_;
+        virtual void
+        longdouble_pre (Type const&);
 
-public:
-PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+        virtual void
+        longdouble_next (Type&);
 
-PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-PlanConnectionDescription (PlanConnectionDescription const& s);
+        virtual void
+        longdouble_next (Type const&);
 
-PlanConnectionDescription&
-operator= (PlanConnectionDescription const& s);
+        virtual void
+        longdouble_post (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        longdouble_post (Type const&);
 
+        virtual void
+        longdouble_none (Type&);
 
-class XSC_XML_Handlers_Export ImplementationDependency : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        longdouble_none (Type const&);
 
-// requiredType
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
-void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+        virtual void
+        member (Type const&);
 
-public:
-ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+        virtual void
+        member_pre (Type&);
 
-ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ImplementationDependency (ImplementationDependency const& s);
+        virtual void
+        member_pre (Type const&);
 
-ImplementationDependency&
-operator= (ImplementationDependency const& s);
+        virtual void
+        member_next (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        member_next (Type const&);
 
+        virtual void
+        member_post (Type&);
 
-class XSC_XML_Handlers_Export Capability : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        member_post (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member_none (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        member_none (Type const&);
 
-// resourceType
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
-resourceType_iterator begin_resourceType ();
-resourceType_iterator end_resourceType ();
-resourceType_const_iterator begin_resourceType () const;
-resourceType_const_iterator end_resourceType () const;
-void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_resourceType (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
-size_t count_property (void) const;
+        virtual void
+        post (Type&);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+        virtual void
+        post (Type const&);
+      };
 
-public:
-Capability (::XMLSchema::string< ACE_TCHAR > const& name__);
+      struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
+      {
+        virtual void
+        traverse (Type&);
 
-Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Capability (Capability const& s);
+        virtual void
+        traverse (Type const&);
 
-Capability&
-operator= (Capability const& s);
+        virtual void
+        pre (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        pre (Type const&);
 
+        virtual void
+        name (Type&);
 
-class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        name (Type const&);
 
-// resourceUsage
-//
-public:
-bool resourceUsage_p () const;
-::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+        virtual void
+        typeId (Type&);
 
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+        virtual void
+        typeId (Type const&);
 
-// resourcePort
-//
-public:
-bool resourcePort_p () const;
-::XMLSchema::string< ACE_TCHAR > const& resourcePort () const;
-void resourcePort (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_;
+        virtual void
+        member (Type const&);
 
-// componentPort
-//
-public:
-bool componentPort_p () const;
-::XMLSchema::string< ACE_TCHAR > const& componentPort () const;
-void componentPort (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member_pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_;
+        virtual void
+        member_pre (Type const&);
 
-// resourceType
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member_next (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+        virtual void
+        member_next (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member_post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        member_post (Type const&);
 
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::Property const& );
-size_t count_property (void) const;
+        virtual void
+        post (Type&);
 
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > property_;
+        virtual void
+        post (Type const&);
+      };
 
-public:
-ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::XMLSchema::string< ACE_TCHAR > const& name__);
+      struct XSC_XML_Handlers_Export StructType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::StructType >
+      {
+        virtual void
+        traverse (Type&);
 
-ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ImplementationRequirement (ImplementationRequirement const& s);
+        virtual void
+        traverse (Type const&);
 
-ImplementationRequirement&
-operator= (ImplementationRequirement const& s);
+        virtual void
+        pre (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        pre (Type const&);
 
+        virtual void
+        name (Type&);
 
-class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        name (Type const&);
 
-// requiredUUID
-//
-public:
-bool requiredUUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
-void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        typeId (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
+        virtual void
+        typeId (Type const&);
 
-// requiredName
-//
-public:
-bool requiredName_p () const;
-::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
-void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
+        virtual void
+        member (Type const&);
 
-// requiredType
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
-void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        member_pre (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+        virtual void
+        member_pre (Type const&);
 
-public:
-ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+        virtual void
+        member_next (Type&);
 
-ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentPackageReference (ComponentPackageReference const& s);
+        virtual void
+        member_next (Type const&);
 
-ComponentPackageReference&
-operator= (ComponentPackageReference const& s);
+        virtual void
+        member_post (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        member_post (Type const&);
 
+        virtual void
+        member_none (Type&);
 
-class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        member_none (Type const&);
 
-// portName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& portName () const;
-void portName (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+        virtual void
+        post (Type const&);
+      };
 
-// instance
-//
-public:
-::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      struct XSC_XML_Handlers_Export StructMemberType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::StructMemberType >
+      {
+        virtual void
+        traverse (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+        virtual void
+        traverse (Type const&);
 
-public:
-SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+        virtual void
+        pre (Type&);
 
-SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
+        virtual void
+        pre (Type const&);
 
-SubcomponentPortEndpoint&
-operator= (SubcomponentPortEndpoint const& s);
+        virtual void
+        name (Type&);
 
-private:
-char regulator__;
-};
+        virtual void
+        name (Type const&);
 
+        virtual void
+        type (Type&);
 
-class XSC_XML_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
+        virtual void
+        type (Type const&);
 
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
+        virtual void
+        post (Type&);
 
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+        virtual void
+        post (Type const&);
+      };
 
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-// internalEndpoint
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
-internalEndpoint_iterator begin_internalEndpoint ();
-internalEndpoint_iterator end_internalEndpoint ();
-internalEndpoint_const_iterator begin_internalEndpoint () const;
-internalEndpoint_const_iterator end_internalEndpoint () const;
-void add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& );
-size_t count_internalEndpoint (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
-
-// externalEndpoint
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
-externalEndpoint_iterator begin_externalEndpoint ();
-externalEndpoint_iterator end_externalEndpoint ();
-externalEndpoint_const_iterator begin_externalEndpoint () const;
-externalEndpoint_const_iterator end_externalEndpoint () const;
-void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
-size_t count_externalEndpoint (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-// externalReference
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
-externalReference_iterator begin_externalReference ();
-externalReference_iterator end_externalReference ();
-externalReference_const_iterator begin_externalReference () const;
-externalReference_const_iterator end_externalReference () const;
-void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
-size_t count_externalReference (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-public:
-AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-AssemblyConnectionDescription (AssemblyConnectionDescription const& s);
-
-AssemblyConnectionDescription&
-operator= (AssemblyConnectionDescription const& s);
-
-private:
-char regulator__;
-};
-}
-}
+      struct XSC_XML_Handlers_Export ValueType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ValueType >
+      {
+        virtual void
+        traverse (Type&);
 
-namespace CIAO
-{
-namespace Config_Handlers
-{
-}
-}
+        virtual void
+        traverse (Type const&);
 
-#include "XMLSchema/Traversal.hpp"
+        virtual void
+        pre (Type&);
 
-namespace CIAO
-{
-namespace Config_Handlers
-{
-namespace Traversal
-{
-typedef
-::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
-TCKind;
+        virtual void
+        pre (Type const&);
 
-struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        typeId (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        typeId (Type const&);
 
-virtual void
-kind (Type&);
+        virtual void
+        modifier (Type&);
 
-virtual void
-kind (Type const&);
+        virtual void
+        modifier (Type const&);
 
-virtual void
-enum_ (Type&);
+        virtual void
+        baseType (Type&);
 
-virtual void
-enum_ (Type const&);
+        virtual void
+        baseType (Type const&);
 
-virtual void
-enum_none (Type&);
+        virtual void
+        member (Type&);
 
-virtual void
-enum_none (Type const&);
+        virtual void
+        member (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        member_pre (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        member_pre (Type const&);
 
-struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        member_next (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        member_next (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        member_post (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        member_post (Type const&);
 
-virtual void
-short_ (Type&);
+        virtual void
+        member_none (Type&);
 
-virtual void
-short_ (Type const&);
+        virtual void
+        member_none (Type const&);
 
-virtual void
-short_pre (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-short_pre (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-short_next (Type&);
+      struct XSC_XML_Handlers_Export ValueMemberType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ValueMemberType >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-short_next (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-short_post (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-short_post (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-short_none (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-short_none (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-long_ (Type&);
+        virtual void
+        visibility (Type&);
 
-virtual void
-long_ (Type const&);
+        virtual void
+        visibility (Type const&);
 
-virtual void
-long_pre (Type&);
+        virtual void
+        type (Type&);
 
-virtual void
-long_pre (Type const&);
+        virtual void
+        type (Type const&);
 
-virtual void
-long_next (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-long_next (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-long_post (Type&);
+      struct XSC_XML_Handlers_Export NamedValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedValue >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-long_post (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-long_none (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-long_none (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-ushort (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-ushort (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-ushort_pre (Type&);
+        virtual void
+        value (Type&);
 
-virtual void
-ushort_pre (Type const&);
+        virtual void
+        value (Type const&);
 
-virtual void
-ushort_next (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-ushort_next (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-ushort_post (Type&);
+      struct XSC_XML_Handlers_Export SequenceType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SequenceType >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-ushort_post (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-ushort_none (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-ushort_none (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-ulong (Type&);
+        virtual void
+        bound (Type&);
 
-virtual void
-ulong (Type const&);
+        virtual void
+        bound (Type const&);
 
-virtual void
-ulong_pre (Type&);
+        virtual void
+        bound_none (Type&);
 
-virtual void
-ulong_pre (Type const&);
+        virtual void
+        bound_none (Type const&);
 
-virtual void
-ulong_next (Type&);
+        virtual void
+        elementType (Type&);
 
-virtual void
-ulong_next (Type const&);
+        virtual void
+        elementType (Type const&);
 
-virtual void
-ulong_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-ulong_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-ulong_none (Type&);
+      struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-ulong_none (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-float_ (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-float_ (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-float_pre (Type&);
+        virtual void
+        type (Type&);
 
-virtual void
-float_pre (Type const&);
+        virtual void
+        type (Type const&);
 
-virtual void
-float_next (Type&);
+        virtual void
+        value (Type&);
 
-virtual void
-float_next (Type const&);
+        virtual void
+        value (Type const&);
 
-virtual void
-float_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-float_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-float_none (Type&);
+      struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-float_none (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-double_ (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-double_ (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-double_pre (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-double_pre (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-double_next (Type&);
+        virtual void
+        value (Type&);
 
-virtual void
-double_next (Type const&);
+        virtual void
+        value (Type const&);
 
-virtual void
-double_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-double_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-double_none (Type&);
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
+      SatisfierPropertyKind;
 
-virtual void
-double_none (Type const&);
+      struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-boolean (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-boolean (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-boolean_pre (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-boolean_pre (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-boolean_next (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-boolean_next (Type const&);
+        virtual void
+        kind (Type&);
 
-virtual void
-boolean_post (Type&);
+        virtual void
+        kind (Type const&);
 
-virtual void
-boolean_post (Type const&);
+        virtual void
+        dynamic (Type&);
 
-virtual void
-boolean_none (Type&);
+        virtual void
+        dynamic (Type const&);
 
-virtual void
-boolean_none (Type const&);
+        virtual void
+        value (Type&);
 
-virtual void
-octet (Type&);
+        virtual void
+        value (Type const&);
 
-virtual void
-octet (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-octet_pre (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-octet_pre (Type const&);
+      struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-octet_next (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-octet_next (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-octet_post (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-octet_post (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-octet_none (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-octet_none (Type const&);
+        virtual void
+        resourceType (Type&);
 
-virtual void
-enum_ (Type&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-enum_ (Type const&);
+        virtual void
+        resourceType_pre (Type&);
 
-virtual void
-enum_pre (Type&);
+        virtual void
+        resourceType_pre (Type const&);
 
-virtual void
-enum_pre (Type const&);
+        virtual void
+        resourceType_next (Type&);
 
-virtual void
-enum_next (Type&);
+        virtual void
+        resourceType_next (Type const&);
 
-virtual void
-enum_next (Type const&);
+        virtual void
+        resourceType_post (Type&);
 
-virtual void
-enum_post (Type&);
+        virtual void
+        resourceType_post (Type const&);
 
-virtual void
-enum_post (Type const&);
+        virtual void
+        property (Type&);
 
-virtual void
-enum_none (Type&);
+        virtual void
+        property (Type const&);
 
-virtual void
-enum_none (Type const&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-string (Type&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-string (Type const&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-string_pre (Type&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-string_pre (Type const&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-string_next (Type&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-string_next (Type const&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-string_post (Type&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-string_post (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-string_none (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-string_none (Type const&);
+      struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-longlong (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-longlong (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-longlong_pre (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-longlong_pre (Type const&);
+        virtual void
+        resourceType (Type&);
 
-virtual void
-longlong_next (Type&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-longlong_next (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-longlong_post (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-longlong_post (Type const&);
+        virtual void
+        property (Type&);
 
-virtual void
-longlong_none (Type&);
+        virtual void
+        property (Type const&);
 
-virtual void
-longlong_none (Type const&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-ulonglong (Type&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-ulonglong (Type const&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-ulonglong_pre (Type&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-ulonglong_pre (Type const&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-ulonglong_next (Type&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-ulonglong_next (Type const&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-ulonglong_post (Type&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-ulonglong_post (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-ulonglong_none (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-ulonglong_none (Type const&);
+      struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-longdouble (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-longdouble (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-longdouble_pre (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-longdouble_pre (Type const&);
+        virtual void
+        requirementName (Type&);
 
-virtual void
-longdouble_next (Type&);
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-longdouble_next (Type const&);
+        virtual void
+        resourceName (Type&);
 
-virtual void
-longdouble_post (Type&);
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-longdouble_post (Type const&);
+        virtual void
+        property (Type&);
 
-virtual void
-longdouble_none (Type&);
+        virtual void
+        property (Type const&);
 
-virtual void
-longdouble_none (Type const&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        property_next (Type&);
 
-struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-name (Type&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-typeId (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-typeId (Type const&);
+      struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-member (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-member (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-member_pre (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-member_pre (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-member_next (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-member_next (Type const&);
+        virtual void
+        source (Type&);
 
-virtual void
-member_post (Type&);
+        virtual void
+        source (Type const&);
 
-virtual void
-member_post (Type const&);
+        virtual void
+        source_pre (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        source_pre (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        source_next (Type&);
 
-struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        source_next (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        source_post (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        source_post (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        node (Type&);
 
-virtual void
-type (Type&);
+        virtual void
+        node (Type const&);
 
-virtual void
-type (Type const&);
+        virtual void
+        location (Type&);
 
-virtual void
-value (Type&);
+        virtual void
+        location (Type const&);
 
-virtual void
-value (Type const&);
+        virtual void
+        location_pre (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        location_pre (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        location_next (Type&);
 
-struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        location_next (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        location_post (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        location_post (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        execParameter (Type&);
 
-virtual void
-name (Type&);
+        virtual void
+        execParameter (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void
+        execParameter_pre (Type&);
 
-virtual void
-value (Type&);
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-value (Type const&);
+        virtual void
+        execParameter_next (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        execParameter_post (Type&);
 
-typedef
-::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
-SatisfierPropertyKind;
+        virtual void
+        execParameter_post (Type const&);
 
-struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        execParameter_none (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        execParameter_none (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-kind (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-kind (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-dynamic (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-dynamic (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-value (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-value (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        deployedResource (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        deployedResource (Type const&);
 
-struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        deployedResource_pre (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        deployedResource_pre (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        deployedResource_next (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        deployedResource_next (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        deployedResource_post (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-resourceType (Type&);
+        virtual void
+        deployedResource_none (Type&);
 
-virtual void
-resourceType (Type const&);
+        virtual void
+        deployedResource_none (Type const&);
 
-virtual void
-resourceType_pre (Type&);
+        virtual void
+        id (Type&);
 
-virtual void
-resourceType_pre (Type const&);
+        virtual void
+        id (Type const&);
 
-virtual void
-resourceType_next (Type&);
+        virtual void
+        id_none (Type&);
 
-virtual void
-resourceType_next (Type const&);
+        virtual void
+        id_none (Type const&);
 
-virtual void
-resourceType_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-resourceType_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-property (Type&);
+      struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        source (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        source (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        source_pre (Type&);
 
-virtual void
-property_none (Type const&);
+        virtual void
+        source_pre (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        source_next (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        source_next (Type const&);
 
-struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        source_post (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        source_post (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        artifact (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        artifact (Type const&);
 
-virtual void
-resourceType (Type&);
+        virtual void
+        artifact_pre (Type&);
 
-virtual void
-resourceType (Type const&);
+        virtual void
+        artifact_pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        artifact_next (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        artifact_next (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        artifact_post (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        artifact_post (Type const&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        execParameter (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        execParameter (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        execParameter_pre (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        execParameter_next (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        execParameter_post (Type&);
 
-virtual void
-property_none (Type const&);
+        virtual void
+        execParameter_post (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        execParameter_none (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        execParameter_none (Type const&);
 
-struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-requirementName (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-requirementName (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-resourceName (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-resourceName (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        id (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        id (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        id_none (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        id_none (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-property_none (Type&);
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
+      ResourceUsageKind;
 
-virtual void
-property_none (Type const&);
+      struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        pre (Type&);
 
-struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        resourceUsage (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        resourceUsage (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        requirementName (Type&);
 
-virtual void
-name (Type&);
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void
+        resourceName (Type&);
 
-virtual void
-source (Type&);
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-source (Type const&);
+        virtual void
+        property (Type&);
 
-virtual void
-source_pre (Type&);
+        virtual void
+        property (Type const&);
 
-virtual void
-source_pre (Type const&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-source_next (Type&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-source_next (Type const&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-source_post (Type&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-source_post (Type const&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-node (Type&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-node (Type const&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-location (Type&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-location (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-location_pre (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-location_pre (Type const&);
+      struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-location_next (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-location_next (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-location_post (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-location_post (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-execParameter (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-execParameter (Type const&);
+        virtual void
+        node (Type&);
 
-virtual void
-execParameter_pre (Type&);
+        virtual void
+        node (Type const&);
 
-virtual void
-execParameter_pre (Type const&);
+        virtual void
+        source (Type&);
 
-virtual void
-execParameter_next (Type&);
+        virtual void
+        source (Type const&);
 
-virtual void
-execParameter_next (Type const&);
+        virtual void
+        implementation (Type&);
 
-virtual void
-execParameter_post (Type&);
+        virtual void
+        implementation (Type const&);
 
-virtual void
-execParameter_post (Type const&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-execParameter_none (Type&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-execParameter_none (Type const&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-deployRequirement (Type&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-deployRequirement (Type const&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-deployRequirement_pre (Type&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-deployRequirement_next (Type&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        deployedResource (Type&);
 
-virtual void
-deployRequirement_none (Type&);
+        virtual void
+        deployedResource (Type const&);
 
-virtual void
-deployRequirement_none (Type const&);
+        virtual void
+        deployedResource_pre (Type&);
 
-virtual void
-deployedResource (Type&);
+        virtual void
+        deployedResource_pre (Type const&);
 
-virtual void
-deployedResource (Type const&);
+        virtual void
+        deployedResource_next (Type&);
 
-virtual void
-deployedResource_pre (Type&);
+        virtual void
+        deployedResource_next (Type const&);
 
-virtual void
-deployedResource_pre (Type const&);
+        virtual void
+        deployedResource_post (Type&);
 
-virtual void
-deployedResource_next (Type&);
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-deployedResource_next (Type const&);
+        virtual void
+        deployedResource_none (Type&);
 
-virtual void
-deployedResource_post (Type&);
+        virtual void
+        deployedResource_none (Type const&);
 
-virtual void
-deployedResource_post (Type const&);
+        virtual void
+        deployedSharedResource (Type&);
 
-virtual void
-deployedResource_none (Type&);
+        virtual void
+        deployedSharedResource (Type const&);
 
-virtual void
-deployedResource_none (Type const&);
+        virtual void
+        deployedSharedResource_none (Type&);
 
-virtual void
-id (Type&);
+        virtual void
+        deployedSharedResource_none (Type const&);
 
-virtual void
-id (Type const&);
+        virtual void
+        id (Type&);
 
-virtual void
-id_none (Type&);
+        virtual void
+        id (Type const&);
 
-virtual void
-id_none (Type const&);
+        virtual void
+        id_none (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        id_none (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type&);
 
-struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-traverse (Type const&);
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
+      CCMComponentPortKind;
 
-virtual void
-pre (Type&);
+      struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-source (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-source (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-source_pre (Type&);
+        virtual void
+        specificType (Type&);
 
-virtual void
-source_pre (Type const&);
+        virtual void
+        specificType (Type const&);
 
-virtual void
-source_next (Type&);
+        virtual void
+        specificType_none (Type&);
 
-virtual void
-source_next (Type const&);
+        virtual void
+        specificType_none (Type const&);
 
-virtual void
-source_post (Type&);
+        virtual void
+        supportedType (Type&);
 
-virtual void
-source_post (Type const&);
+        virtual void
+        supportedType (Type const&);
 
-virtual void
-artifact (Type&);
+        virtual void
+        supportedType_pre (Type&);
 
-virtual void
-artifact (Type const&);
+        virtual void
+        supportedType_pre (Type const&);
 
-virtual void
-artifact_pre (Type&);
+        virtual void
+        supportedType_next (Type&);
 
-virtual void
-artifact_pre (Type const&);
+        virtual void
+        supportedType_next (Type const&);
 
-virtual void
-artifact_next (Type&);
+        virtual void
+        supportedType_post (Type&);
 
-virtual void
-artifact_next (Type const&);
+        virtual void
+        supportedType_post (Type const&);
 
-virtual void
-artifact_post (Type&);
+        virtual void
+        supportedType_none (Type&);
 
-virtual void
-artifact_post (Type const&);
+        virtual void
+        supportedType_none (Type const&);
 
-virtual void
-execParameter (Type&);
+        virtual void
+        provider (Type&);
 
-virtual void
-execParameter (Type const&);
+        virtual void
+        provider (Type const&);
 
-virtual void
-execParameter_pre (Type&);
+        virtual void
+        exclusiveProvider (Type&);
 
-virtual void
-execParameter_pre (Type const&);
+        virtual void
+        exclusiveProvider (Type const&);
 
-virtual void
-execParameter_next (Type&);
+        virtual void
+        exclusiveUser (Type&);
 
-virtual void
-execParameter_next (Type const&);
+        virtual void
+        exclusiveUser (Type const&);
 
-virtual void
-execParameter_post (Type&);
+        virtual void
+        optional (Type&);
 
-virtual void
-execParameter_post (Type const&);
+        virtual void
+        optional (Type const&);
 
-virtual void
-execParameter_none (Type&);
+        virtual void
+        kind (Type&);
 
-virtual void
-execParameter_none (Type const&);
+        virtual void
+        kind (Type const&);
 
-virtual void
-deployRequirement (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-deployRequirement (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-deployRequirement_pre (Type&);
+      struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-deployRequirement_next (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-deployRequirement_none (Type&);
+        virtual void
+        type (Type&);
 
-virtual void
-deployRequirement_none (Type const&);
+        virtual void
+        type (Type const&);
 
-virtual void
-id (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-id (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-id_none (Type&);
+      struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-id_none (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        pre (Type const&);
 
-typedef
-::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
-ResourceUsageKind;
+        virtual void
+        portName (Type&);
 
-struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        portName (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-pre (Type const&);
+      struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-resourceUsage (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-resourceUsage (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-requirementName (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-requirementName (Type const&);
+        virtual void
+        portName (Type&);
 
-virtual void
-resourceName (Type&);
+        virtual void
+        portName (Type const&);
 
-virtual void
-resourceName (Type const&);
+        virtual void
+        provider (Type&);
 
-virtual void
-property (Type&);
+        virtual void
+        provider (Type const&);
 
-virtual void
-property (Type const&);
+        virtual void
+        provider_none (Type&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        provider_none (Type const&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        kind (Type&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        kind (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        instance (Type&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        instance (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-property_none (Type const&);
+      struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        pre (Type&);
 
-struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        location (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        location (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-name (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-name (Type const&);
+      struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-node (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-node (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-source (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-source (Type const&);
+        virtual void
+        targetName (Type&);
 
-virtual void
-implementation (Type&);
+        virtual void
+        targetName (Type const&);
 
-virtual void
-implementation (Type const&);
+        virtual void
+        requirementName (Type&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        resourceName (Type&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        property (Type&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        property (Type const&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-deployedResource (Type&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-deployedResource (Type const&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-deployedResource_none (Type&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-deployedResource_none (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-deployedSharedResource (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-deployedSharedResource (Type const&);
+      struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-deployedSharedResource_none (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-deployedSharedResource_none (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-id (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-id (Type const&);
+        virtual void
+        name (Type&);
 
-virtual void
-id_none (Type&);
+        virtual void
+        name (Type const&);
 
-virtual void
-id_none (Type const&);
+        virtual void
+        source (Type&);
 
-virtual void
-post (Type&);
+        virtual void
+        source (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        source_none (Type&);
 
-typedef
-::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
-CCMComponentPortKind;
+        virtual void
+        source_none (Type const&);
 
-struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-specificType (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-specificType (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-specificType_none (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-specificType_none (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-supportedType (Type&);
+        virtual void
+        externalEndpoint (Type&);
 
-virtual void
-supportedType (Type const&);
+        virtual void
+        externalEndpoint (Type const&);
 
-virtual void
-supportedType_pre (Type&);
+        virtual void
+        externalEndpoint_pre (Type&);
 
-virtual void
-supportedType_pre (Type const&);
+        virtual void
+        externalEndpoint_pre (Type const&);
 
-virtual void
-supportedType_next (Type&);
+        virtual void
+        externalEndpoint_next (Type&);
 
-virtual void
-supportedType_next (Type const&);
+        virtual void
+        externalEndpoint_next (Type const&);
 
-virtual void
-supportedType_post (Type&);
+        virtual void
+        externalEndpoint_post (Type&);
 
-virtual void
-supportedType_post (Type const&);
+        virtual void
+        externalEndpoint_post (Type const&);
 
-virtual void
-supportedType_none (Type&);
+        virtual void
+        externalEndpoint_none (Type&);
 
-virtual void
-supportedType_none (Type const&);
+        virtual void
+        externalEndpoint_none (Type const&);
 
-virtual void
-provider (Type&);
+        virtual void
+        internalEndpoint (Type&);
 
-virtual void
-provider (Type const&);
+        virtual void
+        internalEndpoint (Type const&);
 
-virtual void
-exclusiveProvider (Type&);
+        virtual void
+        internalEndpoint_pre (Type&);
 
-virtual void
-exclusiveProvider (Type const&);
+        virtual void
+        internalEndpoint_pre (Type const&);
 
-virtual void
-exclusiveUser (Type&);
+        virtual void
+        internalEndpoint_next (Type&);
 
-virtual void
-exclusiveUser (Type const&);
+        virtual void
+        internalEndpoint_next (Type const&);
 
-virtual void
-optional (Type&);
+        virtual void
+        internalEndpoint_post (Type&);
 
-virtual void
-optional (Type const&);
+        virtual void
+        internalEndpoint_post (Type const&);
 
-virtual void
-kind (Type&);
+        virtual void
+        internalEndpoint_none (Type&);
 
-virtual void
-kind (Type const&);
+        virtual void
+        internalEndpoint_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        externalReference (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        externalReference (Type const&);
 
-struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        externalReference_pre (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        externalReference_pre (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        externalReference_next (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        externalReference_next (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        externalReference_post (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        externalReference_post (Type const&);
 
-virtual void
-type (Type&);
+        virtual void
+        externalReference_none (Type&);
 
-virtual void
-type (Type const&);
+        virtual void
+        externalReference_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        deployedResource (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        deployedResource (Type const&);
 
-struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        deployedResource_pre (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        deployedResource_pre (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        deployedResource_next (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        deployedResource_next (Type const&);
 
-virtual void
-portName (Type&);
+        virtual void
+        deployedResource_post (Type&);
 
-virtual void
-portName (Type const&);
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        deployedResource_none (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        deployedResource_none (Type const&);
 
-struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-pre (Type&);
+      struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-portName (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-portName (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-provider (Type&);
+        virtual void
+        requiredType (Type&);
 
-virtual void
-provider (Type const&);
+        virtual void
+        requiredType (Type const&);
 
-virtual void
-provider_none (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-provider_none (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-kind (Type&);
+      struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-kind (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-instance (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-instance (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        name (Type const&);
 
-struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        resourceType (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        resourceType_pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        resourceType_pre (Type const&);
 
-virtual void
-location (Type&);
+        virtual void
+        resourceType_next (Type&);
 
-virtual void
-location (Type const&);
+        virtual void
+        resourceType_next (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        resourceType_post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        resourceType_post (Type const&);
 
-struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        property (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        property (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-targetName (Type&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-targetName (Type const&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-requirementName (Type&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-requirementName (Type const&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-resourceName (Type&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-resourceName (Type const&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-property_pre (Type&);
+      struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        resourceUsage (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        resourceUsage (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        resourceUsage_none (Type&);
 
-virtual void
-property_none (Type const&);
+        virtual void
+        resourceUsage_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        resourcePort (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        resourcePort (Type const&);
 
-struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        resourcePort_none (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        resourcePort_none (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        componentPort (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        componentPort (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        componentPort_none (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        componentPort_none (Type const&);
 
-virtual void
-source (Type&);
+        virtual void
+        resourceType (Type&);
 
-virtual void
-source (Type const&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-source_none (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-source_none (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-deployRequirement (Type&);
+        virtual void
+        property (Type&);
 
-virtual void
-deployRequirement (Type const&);
+        virtual void
+        property (Type const&);
 
-virtual void
-deployRequirement_pre (Type&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-deployRequirement_none (Type&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-deployRequirement_none (Type const&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-externalEndpoint (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-externalEndpoint (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-externalEndpoint_pre (Type&);
+      struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-externalEndpoint_pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-externalEndpoint_next (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-externalEndpoint_next (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-externalEndpoint_post (Type&);
+        virtual void
+        requiredUUID (Type&);
 
-virtual void
-externalEndpoint_post (Type const&);
+        virtual void
+        requiredUUID (Type const&);
 
-virtual void
-externalEndpoint_none (Type&);
+        virtual void
+        requiredUUID_none (Type&);
 
-virtual void
-externalEndpoint_none (Type const&);
+        virtual void
+        requiredUUID_none (Type const&);
 
-virtual void
-internalEndpoint (Type&);
+        virtual void
+        requiredName (Type&);
 
-virtual void
-internalEndpoint (Type const&);
+        virtual void
+        requiredName (Type const&);
 
-virtual void
-internalEndpoint_pre (Type&);
+        virtual void
+        requiredName_none (Type&);
 
-virtual void
-internalEndpoint_pre (Type const&);
+        virtual void
+        requiredName_none (Type const&);
 
-virtual void
-internalEndpoint_next (Type&);
+        virtual void
+        requiredType (Type&);
 
-virtual void
-internalEndpoint_next (Type const&);
+        virtual void
+        requiredType (Type const&);
 
-virtual void
-internalEndpoint_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-internalEndpoint_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-internalEndpoint_none (Type&);
+      struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-internalEndpoint_none (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-externalReference (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-externalReference (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-externalReference_pre (Type&);
+        virtual void
+        portName (Type&);
 
-virtual void
-externalReference_pre (Type const&);
+        virtual void
+        portName (Type const&);
 
-virtual void
-externalReference_next (Type&);
+        virtual void
+        instance (Type&);
 
-virtual void
-externalReference_next (Type const&);
+        virtual void
+        instance (Type const&);
 
-virtual void
-externalReference_post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-externalReference_post (Type const&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-externalReference_none (Type&);
+      struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-externalReference_none (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-deployedResource (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-deployedResource (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-deployedResource_pre (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-deployedResource_pre (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-deployedResource_next (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-deployedResource_next (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-deployedResource_post (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-deployedResource_post (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-deployedResource_none (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-deployedResource_none (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        deployRequirement_post (Type const&);
 
-struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        internalEndpoint (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        internalEndpoint (Type const&);
 
-virtual void
-requiredType (Type&);
+        virtual void
+        internalEndpoint_pre (Type&);
 
-virtual void
-requiredType (Type const&);
+        virtual void
+        internalEndpoint_pre (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        internalEndpoint_next (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        internalEndpoint_next (Type const&);
 
-struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        internalEndpoint_post (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        internalEndpoint_post (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        internalEndpoint_none (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        internalEndpoint_none (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        externalEndpoint (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        externalEndpoint (Type const&);
 
-virtual void
-resourceType (Type&);
+        virtual void
+        externalEndpoint_pre (Type&);
 
-virtual void
-resourceType (Type const&);
+        virtual void
+        externalEndpoint_pre (Type const&);
 
-virtual void
-resourceType_pre (Type&);
+        virtual void
+        externalEndpoint_next (Type&);
 
-virtual void
-resourceType_pre (Type const&);
+        virtual void
+        externalEndpoint_next (Type const&);
 
-virtual void
-resourceType_next (Type&);
+        virtual void
+        externalEndpoint_post (Type&);
 
-virtual void
-resourceType_next (Type const&);
+        virtual void
+        externalEndpoint_post (Type const&);
 
-virtual void
-resourceType_post (Type&);
+        virtual void
+        externalEndpoint_none (Type&);
 
-virtual void
-resourceType_post (Type const&);
+        virtual void
+        externalEndpoint_none (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        externalReference (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        externalReference (Type const&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        externalReference_pre (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        externalReference_pre (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        externalReference_next (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        externalReference_next (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        externalReference_post (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        externalReference_post (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        externalReference_none (Type&);
 
-virtual void
-property_none (Type const&);
+        virtual void
+        externalReference_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
+}
+
+#include "XMLSchema/Writer.hpp"
 
-struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
+namespace CIAO
 {
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct TCKind : Traversal::TCKind, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-pre (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type const&);
+        protected:
+        TCKind ();
+      };
 
-virtual void
-resourceUsage (Type&);
+      struct DataType : Traversal::DataType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::DataType Type;
+        DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-resourceUsage (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-resourceUsage_none (Type&);
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceUsage_none (Type const&);
 
-virtual void
-resourcePort (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-resourcePort (Type const&);
+        virtual void 
+        kind (Type &o)
+        {
 
-virtual void
-resourcePort_none (Type&);
+          this->kind (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourcePort_none (Type const&);
 
-virtual void
-componentPort (Type&);
+        virtual void
+        kind (Type const&);
 
-virtual void
-componentPort (Type const&);
+        virtual void 
+        enum_ (Type &o)
+        {
 
-virtual void
-componentPort_none (Type&);
+          this->enum_ (const_cast <Type const &> (o));
+        }
 
-virtual void
-componentPort_none (Type const&);
 
-virtual void
-resourceType (Type&);
+        virtual void
+        enum_ (Type const&);
 
-virtual void
-resourceType (Type const&);
+        virtual void 
+        struct_ (Type &o)
+        {
 
-virtual void
-name (Type&);
+          this->struct_ (const_cast <Type const &> (o));
+        }
 
-virtual void
-name (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        struct_ (Type const&);
 
-virtual void
-property (Type const&);
+        virtual void 
+        value (Type &o)
+        {
 
-virtual void
-property_pre (Type&);
+          this->value (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_pre (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        value (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        sequence (Type &o)
+        {
 
-virtual void
-property_post (Type&);
+          this->sequence (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_post (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        sequence (Type const&);
 
-virtual void
-property_none (Type const&);
+        virtual void 
+        id (Type &o)
+        {
 
-virtual void
-post (Type&);
+          this->id (const_cast <Type const &> (o));
+        }
 
-virtual void
-post (Type const&);
-};
 
-struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        id (Type const&);
 
-virtual void
-traverse (Type const&);
+        protected:
+        DataType ();
+      };
 
-virtual void
-pre (Type&);
+      struct DataValue : Traversal::DataValue, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::DataValue Type;
+        DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-pre (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-requiredUUID (Type&);
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-requiredUUID (Type const&);
 
-virtual void
-requiredUUID_none (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-requiredUUID_none (Type const&);
+        virtual void 
+        short_pre (Type &o)
+        {
 
-virtual void
-requiredName (Type&);
+          this->short_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-requiredName (Type const&);
 
-virtual void
-requiredName_none (Type&);
+        virtual void
+        short_pre (Type const&);
 
-virtual void
-requiredName_none (Type const&);
+        virtual void 
+        short_next (Type &o)
+        {
 
-virtual void
-requiredType (Type&);
+          this->short_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-requiredType (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        short_next (Type const&);
 
-virtual void
-post (Type const&);
-};
+        virtual void 
+        short_post (Type &o)
+        {
 
-struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
-{
-virtual void
-traverse (Type&);
+          this->short_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        short_post (Type const&);
 
-virtual void
-pre (Type const&);
+        virtual void 
+        long_pre (Type &o)
+        {
 
-virtual void
-portName (Type&);
+          this->long_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-portName (Type const&);
 
-virtual void
-instance (Type&);
+        virtual void
+        long_pre (Type const&);
 
-virtual void
-instance (Type const&);
+        virtual void 
+        long_next (Type &o)
+        {
 
-virtual void
-post (Type&);
+          this->long_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-post (Type const&);
-};
 
-struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
-{
-virtual void
-traverse (Type&);
+        virtual void
+        long_next (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        long_post (Type &o)
+        {
 
-virtual void
-pre (Type&);
+          this->long_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        long_post (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        ushort_pre (Type &o)
+        {
 
-virtual void
-deployRequirement (Type&);
+          this->ushort_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement (Type const&);
 
-virtual void
-deployRequirement_pre (Type&);
+        virtual void
+        ushort_pre (Type const&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void 
+        ushort_next (Type &o)
+        {
 
-virtual void
-deployRequirement_next (Type&);
+          this->ushort_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        ushort_next (Type const&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void 
+        ushort_post (Type &o)
+        {
 
-virtual void
-deployRequirement_none (Type&);
+          this->ushort_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_none (Type const&);
 
-virtual void
-internalEndpoint (Type&);
+        virtual void
+        ushort_post (Type const&);
 
-virtual void
-internalEndpoint (Type const&);
+        virtual void 
+        ulong_pre (Type &o)
+        {
 
-virtual void
-internalEndpoint_pre (Type&);
+          this->ulong_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-internalEndpoint_pre (Type const&);
 
-virtual void
-internalEndpoint_next (Type&);
+        virtual void
+        ulong_pre (Type const&);
 
-virtual void
-internalEndpoint_next (Type const&);
+        virtual void 
+        ulong_next (Type &o)
+        {
 
-virtual void
-internalEndpoint_post (Type&);
+          this->ulong_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-internalEndpoint_post (Type const&);
 
-virtual void
-internalEndpoint_none (Type&);
+        virtual void
+        ulong_next (Type const&);
 
-virtual void
-internalEndpoint_none (Type const&);
+        virtual void 
+        ulong_post (Type &o)
+        {
 
-virtual void
-externalEndpoint (Type&);
+          this->ulong_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalEndpoint (Type const&);
 
-virtual void
-externalEndpoint_pre (Type&);
+        virtual void
+        ulong_post (Type const&);
 
-virtual void
-externalEndpoint_pre (Type const&);
+        virtual void 
+        float_pre (Type &o)
+        {
 
-virtual void
-externalEndpoint_next (Type&);
+          this->float_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalEndpoint_next (Type const&);
 
-virtual void
-externalEndpoint_post (Type&);
+        virtual void
+        float_pre (Type const&);
 
-virtual void
-externalEndpoint_post (Type const&);
+        virtual void 
+        float_next (Type &o)
+        {
 
-virtual void
-externalEndpoint_none (Type&);
+          this->float_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalEndpoint_none (Type const&);
 
-virtual void
-externalReference (Type&);
+        virtual void
+        float_next (Type const&);
 
-virtual void
-externalReference (Type const&);
+        virtual void 
+        float_post (Type &o)
+        {
 
-virtual void
-externalReference_pre (Type&);
+          this->float_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_pre (Type const&);
 
-virtual void
-externalReference_next (Type&);
+        virtual void
+        float_post (Type const&);
 
-virtual void
-externalReference_next (Type const&);
+        virtual void 
+        double_pre (Type &o)
+        {
 
-virtual void
-externalReference_post (Type&);
+          this->double_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_post (Type const&);
 
-virtual void
-externalReference_none (Type&);
+        virtual void
+        double_pre (Type const&);
 
-virtual void
-externalReference_none (Type const&);
+        virtual void 
+        double_next (Type &o)
+        {
 
-virtual void
-post (Type&);
+          this->double_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-post (Type const&);
-};
-}
-}
-}
 
-#include "XMLSchema/Writer.hpp"
+        virtual void
+        double_next (Type const&);
 
-namespace CIAO
-{
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct TCKind : Traversal::TCKind,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        double_post (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
-this->traverse (const_cast <Type const &> (o));
-}
+          this->double_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-protected:
-TCKind ();
-};
+        virtual void
+        double_post (Type const&);
 
-struct DataType : Traversal::DataType,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::DataType Type;
-DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        boolean_pre (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->boolean_pre (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        boolean_pre (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        boolean_next (Type &o)
+        {
 
-virtual void
-kind (Type &o)
-{
+          this->boolean_next (const_cast <Type const &> (o));
+        }
 
-this->kind (const_cast <Type const &> (o));
-}
 
+        virtual void
+        boolean_next (Type const&);
 
-virtual void
-kind (Type const&);
+        virtual void 
+        boolean_post (Type &o)
+        {
 
-virtual void
-enum_ (Type &o)
-{
+          this->boolean_post (const_cast <Type const &> (o));
+        }
 
-this->enum_ (const_cast <Type const &> (o));
-}
 
+        virtual void
+        boolean_post (Type const&);
 
-virtual void
-enum_ (Type const&);
+        virtual void 
+        octet_pre (Type &o)
+        {
 
-protected:
-DataType ();
-};
+          this->octet_pre (const_cast <Type const &> (o));
+        }
 
-struct DataValue : Traversal::DataValue,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::DataValue Type;
-DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        octet_pre (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        octet_next (Type &o)
+        {
 
+          this->octet_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-short_pre (Type &o)
-{
+        virtual void
+        octet_next (Type const&);
 
-this->short_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        octet_post (Type &o)
+        {
 
+          this->octet_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-short_pre (Type const&);
 
-virtual void
-short_next (Type &o)
-{
+        virtual void
+        octet_post (Type const&);
 
-this->short_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        enum_pre (Type &o)
+        {
 
+          this->enum_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-short_next (Type const&);
 
-virtual void
-short_post (Type &o)
-{
+        virtual void
+        enum_pre (Type const&);
 
-this->short_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        enum_next (Type &o)
+        {
 
+          this->enum_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-short_post (Type const&);
 
-virtual void
-long_pre (Type &o)
-{
+        virtual void
+        enum_next (Type const&);
 
-this->long_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        enum_post (Type &o)
+        {
 
+          this->enum_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-long_pre (Type const&);
 
-virtual void
-long_next (Type &o)
-{
+        virtual void
+        enum_post (Type const&);
 
-this->long_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        string_pre (Type &o)
+        {
 
+          this->string_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-long_next (Type const&);
 
-virtual void
-long_post (Type &o)
-{
+        virtual void
+        string_pre (Type const&);
 
-this->long_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        string_next (Type &o)
+        {
 
+          this->string_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-long_post (Type const&);
 
-virtual void
-ushort_pre (Type &o)
-{
+        virtual void
+        string_next (Type const&);
 
-this->ushort_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        string_post (Type &o)
+        {
 
+          this->string_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-ushort_pre (Type const&);
 
-virtual void
-ushort_next (Type &o)
-{
+        virtual void
+        string_post (Type const&);
 
-this->ushort_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        longlong_pre (Type &o)
+        {
 
+          this->longlong_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-ushort_next (Type const&);
 
-virtual void
-ushort_post (Type &o)
-{
+        virtual void
+        longlong_pre (Type const&);
 
-this->ushort_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        longlong_next (Type &o)
+        {
 
+          this->longlong_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-ushort_post (Type const&);
 
-virtual void
-ulong_pre (Type &o)
-{
+        virtual void
+        longlong_next (Type const&);
 
-this->ulong_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        longlong_post (Type &o)
+        {
 
+          this->longlong_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-ulong_pre (Type const&);
 
-virtual void
-ulong_next (Type &o)
-{
+        virtual void
+        longlong_post (Type const&);
 
-this->ulong_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        ulonglong_pre (Type &o)
+        {
 
+          this->ulonglong_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-ulong_next (Type const&);
 
-virtual void
-ulong_post (Type &o)
-{
+        virtual void
+        ulonglong_pre (Type const&);
 
-this->ulong_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        ulonglong_next (Type &o)
+        {
 
+          this->ulonglong_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-ulong_post (Type const&);
 
-virtual void
-float_pre (Type &o)
-{
+        virtual void
+        ulonglong_next (Type const&);
 
-this->float_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        ulonglong_post (Type &o)
+        {
 
+          this->ulonglong_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-float_pre (Type const&);
 
-virtual void
-float_next (Type &o)
-{
+        virtual void
+        ulonglong_post (Type const&);
 
-this->float_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        longdouble_pre (Type &o)
+        {
 
+          this->longdouble_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-float_next (Type const&);
 
-virtual void
-float_post (Type &o)
-{
+        virtual void
+        longdouble_pre (Type const&);
 
-this->float_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        longdouble_next (Type &o)
+        {
 
+          this->longdouble_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-float_post (Type const&);
 
-virtual void
-double_pre (Type &o)
-{
+        virtual void
+        longdouble_next (Type const&);
 
-this->double_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        longdouble_post (Type &o)
+        {
 
+          this->longdouble_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-double_pre (Type const&);
 
-virtual void
-double_next (Type &o)
-{
+        virtual void
+        longdouble_post (Type const&);
 
-this->double_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_pre (Type &o)
+        {
 
+          this->member_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-double_next (Type const&);
 
-virtual void
-double_post (Type &o)
-{
+        virtual void
+        member_pre (Type const&);
 
-this->double_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_next (Type &o)
+        {
 
+          this->member_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-double_post (Type const&);
 
-virtual void
-boolean_pre (Type &o)
-{
+        virtual void
+        member_next (Type const&);
 
-this->boolean_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_post (Type &o)
+        {
 
+          this->member_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-boolean_pre (Type const&);
 
-virtual void
-boolean_next (Type &o)
-{
+        virtual void
+        member_post (Type const&);
 
-this->boolean_next (const_cast <Type const &> (o));
-}
+        protected:
+        DataValue ();
+      };
 
+      struct EnumType : Traversal::EnumType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::EnumType Type;
+        EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-boolean_next (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-boolean_post (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->boolean_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-boolean_post (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-octet_pre (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->octet_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-octet_pre (Type const&);
+        virtual void 
+        typeId (Type &o)
+        {
 
-virtual void
-octet_next (Type &o)
-{
+          this->typeId (const_cast <Type const &> (o));
+        }
 
-this->octet_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        typeId (Type const&);
 
-virtual void
-octet_next (Type const&);
+        virtual void 
+        member_pre (Type &o)
+        {
 
-virtual void
-octet_post (Type &o)
-{
+          this->member_pre (const_cast <Type const &> (o));
+        }
 
-this->octet_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_pre (Type const&);
 
-virtual void
-octet_post (Type const&);
+        virtual void 
+        member_next (Type &o)
+        {
 
-virtual void
-enum_pre (Type &o)
-{
+          this->member_next (const_cast <Type const &> (o));
+        }
 
-this->enum_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_next (Type const&);
 
-virtual void
-enum_pre (Type const&);
+        virtual void 
+        member_post (Type &o)
+        {
 
-virtual void
-enum_next (Type &o)
-{
+          this->member_post (const_cast <Type const &> (o));
+        }
 
-this->enum_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_post (Type const&);
 
-virtual void
-enum_next (Type const&);
+        protected:
+        EnumType ();
+      };
 
-virtual void
-enum_post (Type &o)
-{
+      struct StructType : Traversal::StructType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::StructType Type;
+        StructType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->enum_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-enum_post (Type const&);
 
-virtual void
-string_pre (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->string_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-string_pre (Type const&);
 
-virtual void
-string_next (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->string_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        typeId (Type &o)
+        {
 
+          this->typeId (const_cast <Type const &> (o));
+        }
 
-virtual void
-string_next (Type const&);
 
-virtual void
-string_post (Type &o)
-{
+        virtual void
+        typeId (Type const&);
 
-this->string_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_pre (Type &o)
+        {
 
+          this->member_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-string_post (Type const&);
 
-virtual void
-longlong_pre (Type &o)
-{
+        virtual void
+        member_pre (Type const&);
 
-this->longlong_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_next (Type &o)
+        {
 
+          this->member_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-longlong_pre (Type const&);
 
-virtual void
-longlong_next (Type &o)
-{
+        virtual void
+        member_next (Type const&);
 
-this->longlong_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        member_post (Type &o)
+        {
 
+          this->member_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-longlong_next (Type const&);
 
-virtual void
-longlong_post (Type &o)
-{
+        virtual void
+        member_post (Type const&);
 
-this->longlong_post (const_cast <Type const &> (o));
-}
+        protected:
+        StructType ();
+      };
 
+      struct StructMemberType : Traversal::StructMemberType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::StructMemberType Type;
+        StructMemberType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-longlong_post (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-ulonglong_pre (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->ulonglong_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-ulonglong_pre (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-ulonglong_next (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->ulonglong_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-ulonglong_next (Type const&);
+        virtual void 
+        type (Type &o)
+        {
 
-virtual void
-ulonglong_post (Type &o)
-{
+          this->type (const_cast <Type const &> (o));
+        }
 
-this->ulonglong_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        type (Type const&);
 
-virtual void
-ulonglong_post (Type const&);
+        protected:
+        StructMemberType ();
+      };
 
-virtual void
-longdouble_pre (Type &o)
-{
+      struct ValueType : Traversal::ValueType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ValueType Type;
+        ValueType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->longdouble_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-longdouble_pre (Type const&);
 
-virtual void
-longdouble_next (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->longdouble_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-longdouble_next (Type const&);
 
-virtual void
-longdouble_post (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->longdouble_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        typeId (Type &o)
+        {
 
+          this->typeId (const_cast <Type const &> (o));
+        }
 
-virtual void
-longdouble_post (Type const&);
 
-protected:
-DataValue ();
-};
+        virtual void
+        typeId (Type const&);
 
-struct EnumType : Traversal::EnumType,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::EnumType Type;
-EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        modifier (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->modifier (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        modifier (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        baseType (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->baseType (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        baseType (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        member_pre (Type &o)
+        {
 
-virtual void
-typeId (Type &o)
-{
+          this->member_pre (const_cast <Type const &> (o));
+        }
 
-this->typeId (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_pre (Type const&);
 
-virtual void
-typeId (Type const&);
+        virtual void 
+        member_next (Type &o)
+        {
 
-virtual void
-member_pre (Type &o)
-{
+          this->member_next (const_cast <Type const &> (o));
+        }
 
-this->member_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_next (Type const&);
 
-virtual void
-member_pre (Type const&);
+        virtual void 
+        member_post (Type &o)
+        {
 
-virtual void
-member_next (Type &o)
-{
+          this->member_post (const_cast <Type const &> (o));
+        }
 
-this->member_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        member_post (Type const&);
 
-virtual void
-member_next (Type const&);
+        protected:
+        ValueType ();
+      };
 
-virtual void
-member_post (Type &o)
-{
+      struct ValueMemberType : Traversal::ValueMemberType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ValueMemberType Type;
+        ValueMemberType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->member_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-member_post (Type const&);
 
-protected:
-EnumType ();
-};
+        virtual void
+        traverse (Type const&);
 
-struct Any : Traversal::Any,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Any Type;
-Any (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        visibility (Type &o)
+        {
 
-virtual void
-type (Type &o)
-{
+          this->visibility (const_cast <Type const &> (o));
+        }
 
-this->type (const_cast <Type const &> (o));
-}
 
+        virtual void
+        visibility (Type const&);
 
-virtual void
-type (Type const&);
+        virtual void 
+        type (Type &o)
+        {
 
-virtual void
-value (Type &o)
-{
+          this->type (const_cast <Type const &> (o));
+        }
 
-this->value (const_cast <Type const &> (o));
-}
 
+        virtual void
+        type (Type const&);
 
-virtual void
-value (Type const&);
+        protected:
+        ValueMemberType ();
+      };
 
-protected:
-Any ();
-};
+      struct NamedValue : Traversal::NamedValue, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::NamedValue Type;
+        NamedValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-struct Property : Traversal::Property,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Property Type;
-Property (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        value (Type &o)
+        {
 
-virtual void
-value (Type &o)
-{
+          this->value (const_cast <Type const &> (o));
+        }
 
-this->value (const_cast <Type const &> (o));
-}
 
+        virtual void
+        value (Type const&);
 
-virtual void
-value (Type const&);
+        protected:
+        NamedValue ();
+      };
 
-protected:
-Property ();
-};
+      struct SequenceType : Traversal::SequenceType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SequenceType Type;
+        SequenceType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-protected:
-SatisfierPropertyKind ();
-};
+        virtual void
+        traverse (Type const&);
 
-struct SatisfierProperty : Traversal::SatisfierProperty,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
-SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        bound (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->bound (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        bound (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        elementType (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->elementType (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        elementType (Type const&);
 
-virtual void
-name (Type const&);
+        protected:
+        SequenceType ();
+      };
 
-virtual void
-kind (Type &o)
-{
+      struct Any : Traversal::Any, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Any Type;
+        Any (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->kind (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-kind (Type const&);
 
-virtual void
-dynamic (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->dynamic (const_cast <Type const &> (o));
-}
+        virtual void 
+        type (Type &o)
+        {
 
+          this->type (const_cast <Type const &> (o));
+        }
 
-virtual void
-dynamic (Type const&);
 
-virtual void
-value (Type &o)
-{
+        virtual void
+        type (Type const&);
 
-this->value (const_cast <Type const &> (o));
-}
+        virtual void 
+        value (Type &o)
+        {
 
+          this->value (const_cast <Type const &> (o));
+        }
 
-virtual void
-value (Type const&);
 
-protected:
-SatisfierProperty ();
-};
+        virtual void
+        value (Type const&);
 
-struct Resource : Traversal::Resource,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Resource Type;
-Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
+        protected:
+        Any ();
+      };
 
-virtual void
-traverse (Type &o)
-{
+      struct Property : Traversal::Property, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Property Type;
+        Property (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->name (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-name (Type const&);
 
-virtual void
-resourceType_pre (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->resourceType_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        value (Type &o)
+        {
 
+          this->value (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceType_pre (Type const&);
 
-virtual void
-resourceType_next (Type &o)
-{
+        virtual void
+        value (Type const&);
 
-this->resourceType_next (const_cast <Type const &> (o));
-}
+        protected:
+        Property ();
+      };
 
+      struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-resourceType_next (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceType_post (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->resourceType_post (const_cast <Type const &> (o));
-}
+        protected:
+        SatisfierPropertyKind ();
+      };
 
+      struct SatisfierProperty : Traversal::SatisfierProperty, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
+        SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-resourceType_post (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-property_pre (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->property_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-property_pre (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-property_next (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->property_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        kind (Type &o)
+        {
 
-virtual void
-property_post (Type &o)
-{
+          this->kind (const_cast <Type const &> (o));
+        }
 
-this->property_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        kind (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void 
+        dynamic (Type &o)
+        {
 
-protected:
-Resource ();
-};
+          this->dynamic (const_cast <Type const &> (o));
+        }
 
-struct Requirement : Traversal::Requirement,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Requirement Type;
-Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        dynamic (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        value (Type &o)
+        {
 
+          this->value (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-resourceType (Type &o)
-{
+        virtual void
+        value (Type const&);
 
-this->resourceType (const_cast <Type const &> (o));
-}
+        protected:
+        SatisfierProperty ();
+      };
 
+      struct Resource : Traversal::Resource, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Resource Type;
+        Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-resourceType (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-property_pre (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->property_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-property_pre (Type const&);
+        virtual void 
+        resourceType_pre (Type &o)
+        {
 
-virtual void
-property_next (Type &o)
-{
+          this->resourceType_pre (const_cast <Type const &> (o));
+        }
 
-this->property_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType_pre (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        resourceType_next (Type &o)
+        {
 
-virtual void
-property_post (Type &o)
-{
+          this->resourceType_next (const_cast <Type const &> (o));
+        }
 
-this->property_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType_next (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void 
+        resourceType_post (Type &o)
+        {
 
-protected:
-Requirement ();
-};
+          this->resourceType_post (const_cast <Type const &> (o));
+        }
 
-struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
-ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        resourceType_post (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_pre (Type &o)
+        {
 
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-requirementName (Type &o)
-{
+        virtual void
+        property_pre (Type const&);
 
-this->requirementName (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_next (Type &o)
+        {
 
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-requirementName (Type const&);
 
-virtual void
-resourceName (Type &o)
-{
+        virtual void
+        property_next (Type const&);
 
-this->resourceName (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_post (Type &o)
+        {
 
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceName (Type const&);
 
-virtual void
-property_pre (Type &o)
-{
+        virtual void
+        property_post (Type const&);
 
-this->property_pre (const_cast <Type const &> (o));
-}
+        protected:
+        Resource ();
+      };
 
+      struct Requirement : Traversal::Requirement, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Requirement Type;
+        Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-property_pre (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-property_next (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->property_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        resourceType (Type &o)
+        {
 
-virtual void
-property_post (Type &o)
-{
+          this->resourceType (const_cast <Type const &> (o));
+        }
 
-this->property_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-protected:
-ResourceDeploymentDescription ();
-};
+          this->name (const_cast <Type const &> (o));
+        }
 
-struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
-ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_pre (Type &o)
+        {
 
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void
+        property_pre (Type const&);
 
-this->name (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_next (Type &o)
+        {
 
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-name (Type const&);
 
-virtual void
-source_pre (Type &o)
-{
+        virtual void
+        property_next (Type const&);
 
-this->source_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_post (Type &o)
+        {
 
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-source_pre (Type const&);
 
-virtual void
-source_next (Type &o)
-{
+        virtual void
+        property_post (Type const&);
 
-this->source_next (const_cast <Type const &> (o));
-}
+        protected:
+        Requirement ();
+      };
 
+      struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
+        ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-source_next (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-source_post (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->source_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-source_post (Type const&);
+        virtual void 
+        requirementName (Type &o)
+        {
 
-virtual void
-node (Type &o)
-{
+          this->requirementName (const_cast <Type const &> (o));
+        }
 
-this->node (const_cast <Type const &> (o));
-}
 
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-node (Type const&);
+        virtual void 
+        resourceName (Type &o)
+        {
 
-virtual void
-location_pre (Type &o)
-{
+          this->resourceName (const_cast <Type const &> (o));
+        }
 
-this->location_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-location_pre (Type const&);
+        virtual void 
+        property_pre (Type &o)
+        {
 
-virtual void
-location_next (Type &o)
-{
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-this->location_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-location_next (Type const&);
+        virtual void 
+        property_next (Type &o)
+        {
 
-virtual void
-location_post (Type &o)
-{
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-this->location_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_next (Type const&);
 
-virtual void
-location_post (Type const&);
+        virtual void 
+        property_post (Type &o)
+        {
 
-virtual void
-execParameter_pre (Type &o)
-{
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-this->execParameter_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_post (Type const&);
 
-virtual void
-execParameter_pre (Type const&);
+        protected:
+        ResourceDeploymentDescription ();
+      };
 
-virtual void
-execParameter_next (Type &o)
-{
+      struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
+        ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->execParameter_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-execParameter_next (Type const&);
 
-virtual void
-execParameter_post (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->execParameter_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-execParameter_post (Type const&);
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_pre (Type &o)
+        {
 
+          this->source_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type &o)
-{
+        virtual void
+        source_pre (Type const&);
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_next (Type &o)
+        {
 
+          this->source_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type &o)
-{
+        virtual void
+        source_next (Type const&);
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_post (Type &o)
+        {
 
+          this->source_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_post (Type const&);
 
-virtual void
-deployedResource_pre (Type &o)
-{
+        virtual void
+        source_post (Type const&);
 
-this->deployedResource_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        node (Type &o)
+        {
 
+          this->node (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_pre (Type const&);
 
-virtual void
-deployedResource_next (Type &o)
-{
+        virtual void
+        node (Type const&);
 
-this->deployedResource_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        location_pre (Type &o)
+        {
 
+          this->location_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_next (Type const&);
 
-virtual void
-deployedResource_post (Type &o)
-{
+        virtual void
+        location_pre (Type const&);
 
-this->deployedResource_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        location_next (Type &o)
+        {
 
+          this->location_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_post (Type const&);
 
-virtual void
-id (Type &o)
-{
+        virtual void
+        location_next (Type const&);
 
-this->id (const_cast <Type const &> (o));
-}
+        virtual void 
+        location_post (Type &o)
+        {
 
+          this->location_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-id (Type const&);
 
-protected:
-ArtifactDeploymentDescription ();
-};
+        virtual void
+        location_post (Type const&);
 
-struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
-MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        execParameter_pre (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->execParameter_pre (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        execParameter_next (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->execParameter_next (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        execParameter_post (Type &o)
+        {
 
-virtual void
-source_pre (Type &o)
-{
+          this->execParameter_post (const_cast <Type const &> (o));
+        }
 
-this->source_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_post (Type const&);
 
-virtual void
-source_pre (Type const&);
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
 
-virtual void
-source_next (Type &o)
-{
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
 
-this->source_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-source_next (Type const&);
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
 
-virtual void
-source_post (Type &o)
-{
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
 
-this->source_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-source_post (Type const&);
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
 
-virtual void
-artifact_pre (Type &o)
-{
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
 
-this->artifact_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-artifact_pre (Type const&);
+        virtual void 
+        deployedResource_pre (Type &o)
+        {
 
-virtual void
-artifact_next (Type &o)
-{
+          this->deployedResource_pre (const_cast <Type const &> (o));
+        }
 
-this->artifact_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_pre (Type const&);
 
-virtual void
-artifact_next (Type const&);
+        virtual void 
+        deployedResource_next (Type &o)
+        {
 
-virtual void
-artifact_post (Type &o)
-{
+          this->deployedResource_next (const_cast <Type const &> (o));
+        }
 
-this->artifact_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_next (Type const&);
 
-virtual void
-artifact_post (Type const&);
+        virtual void 
+        deployedResource_post (Type &o)
+        {
 
-virtual void
-execParameter_pre (Type &o)
-{
+          this->deployedResource_post (const_cast <Type const &> (o));
+        }
 
-this->execParameter_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-execParameter_pre (Type const&);
+        virtual void 
+        id (Type &o)
+        {
 
-virtual void
-execParameter_next (Type &o)
-{
+          this->id (const_cast <Type const &> (o));
+        }
 
-this->execParameter_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        id (Type const&);
 
-virtual void
-execParameter_next (Type const&);
+        protected:
+        ArtifactDeploymentDescription ();
+      };
 
-virtual void
-execParameter_post (Type &o)
-{
+      struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
+        MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->execParameter_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-execParameter_post (Type const&);
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_pre (Type &o)
+        {
 
+          this->source_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type &o)
-{
+        virtual void
+        source_pre (Type const&);
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_next (Type &o)
+        {
 
+          this->source_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_post (Type const&);
 
-virtual void
-id (Type &o)
-{
+        virtual void
+        source_next (Type const&);
 
-this->id (const_cast <Type const &> (o));
-}
+        virtual void 
+        source_post (Type &o)
+        {
 
+          this->source_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-id (Type const&);
 
-protected:
-MonolithicDeploymentDescription ();
-};
+        virtual void
+        source_post (Type const&);
 
-struct ResourceUsageKind : Traversal::ResourceUsageKind,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        artifact_pre (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
-this->traverse (const_cast <Type const &> (o));
-}
+          this->artifact_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-protected:
-ResourceUsageKind ();
-};
+        virtual void
+        artifact_pre (Type const&);
 
-struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
-InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        artifact_next (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->artifact_next (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        artifact_next (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        artifact_post (Type &o)
+        {
 
-virtual void
-resourceUsage (Type &o)
-{
+          this->artifact_post (const_cast <Type const &> (o));
+        }
 
-this->resourceUsage (const_cast <Type const &> (o));
-}
 
+        virtual void
+        artifact_post (Type const&);
 
-virtual void
-resourceUsage (Type const&);
+        virtual void 
+        execParameter_pre (Type &o)
+        {
 
-virtual void
-requirementName (Type &o)
-{
+          this->execParameter_pre (const_cast <Type const &> (o));
+        }
 
-this->requirementName (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-requirementName (Type const&);
+        virtual void 
+        execParameter_next (Type &o)
+        {
 
-virtual void
-resourceName (Type &o)
-{
+          this->execParameter_next (const_cast <Type const &> (o));
+        }
 
-this->resourceName (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-resourceName (Type const&);
+        virtual void 
+        execParameter_post (Type &o)
+        {
 
-virtual void
-property_pre (Type &o)
-{
+          this->execParameter_post (const_cast <Type const &> (o));
+        }
 
-this->property_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        execParameter_post (Type const&);
 
-virtual void
-property_pre (Type const&);
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
 
-virtual void
-property_next (Type &o)
-{
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
 
-this->property_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
 
-virtual void
-property_post (Type &o)
-{
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
 
-this->property_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
 
-protected:
-InstanceResourceDeploymentDescription ();
-};
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
 
-struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
-InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        deployRequirement_post (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        id (Type &o)
+        {
 
+          this->id (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void
+        id (Type const&);
 
-this->name (const_cast <Type const &> (o));
-}
+        protected:
+        MonolithicDeploymentDescription ();
+      };
 
+      struct ResourceUsageKind : Traversal::ResourceUsageKind, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-node (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->node (const_cast <Type const &> (o));
-}
+        protected:
+        ResourceUsageKind ();
+      };
 
+      struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
+        InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-node (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-source (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->source (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-source (Type const&);
+        virtual void 
+        resourceUsage (Type &o)
+        {
 
-virtual void
-implementation (Type &o)
-{
+          this->resourceUsage (const_cast <Type const &> (o));
+        }
 
-this->implementation (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceUsage (Type const&);
 
-virtual void
-implementation (Type const&);
+        virtual void 
+        requirementName (Type &o)
+        {
 
-virtual void
-configProperty_pre (Type &o)
-{
+          this->requirementName (const_cast <Type const &> (o));
+        }
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void 
+        resourceName (Type &o)
+        {
 
-virtual void
-configProperty_next (Type &o)
-{
+          this->resourceName (const_cast <Type const &> (o));
+        }
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void 
+        property_pre (Type &o)
+        {
 
-virtual void
-configProperty_post (Type &o)
-{
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void 
+        property_next (Type &o)
+        {
 
-virtual void
-deployedResource (Type &o)
-{
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-this->deployedResource (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_next (Type const&);
 
-virtual void
-deployedResource (Type const&);
+        virtual void 
+        property_post (Type &o)
+        {
 
-virtual void
-deployedSharedResource (Type &o)
-{
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-this->deployedSharedResource (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_post (Type const&);
 
-virtual void
-deployedSharedResource (Type const&);
+        protected:
+        InstanceResourceDeploymentDescription ();
+      };
 
-virtual void
-id (Type &o)
-{
+      struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
+        InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->id (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-id (Type const&);
 
-protected:
-InstanceDeploymentDescription ();
-};
+        virtual void
+        traverse (Type const&);
 
-struct CCMComponentPortKind : Traversal::CCMComponentPortKind,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
-this->traverse (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-protected:
-CCMComponentPortKind ();
-};
+        virtual void
+        name (Type const&);
 
-struct ComponentPortDescription : Traversal::ComponentPortDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
-ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        node (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->node (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        node (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        source (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->source (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        source (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        implementation (Type &o)
+        {
 
-virtual void
-specificType (Type &o)
-{
+          this->implementation (const_cast <Type const &> (o));
+        }
 
-this->specificType (const_cast <Type const &> (o));
-}
 
+        virtual void
+        implementation (Type const&);
 
-virtual void
-specificType (Type const&);
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-virtual void
-supportedType_pre (Type &o)
-{
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
-this->supportedType_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-supportedType_pre (Type const&);
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-virtual void
-supportedType_next (Type &o)
-{
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
-this->supportedType_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-supportedType_next (Type const&);
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-virtual void
-supportedType_post (Type &o)
-{
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
-this->supportedType_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-supportedType_post (Type const&);
+        virtual void 
+        deployedResource_pre (Type &o)
+        {
 
-virtual void
-provider (Type &o)
-{
+          this->deployedResource_pre (const_cast <Type const &> (o));
+        }
 
-this->provider (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_pre (Type const&);
 
-virtual void
-provider (Type const&);
+        virtual void 
+        deployedResource_next (Type &o)
+        {
 
-virtual void
-exclusiveProvider (Type &o)
-{
+          this->deployedResource_next (const_cast <Type const &> (o));
+        }
 
-this->exclusiveProvider (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_next (Type const&);
 
-virtual void
-exclusiveProvider (Type const&);
+        virtual void 
+        deployedResource_post (Type &o)
+        {
 
-virtual void
-exclusiveUser (Type &o)
-{
+          this->deployedResource_post (const_cast <Type const &> (o));
+        }
 
-this->exclusiveUser (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-exclusiveUser (Type const&);
+        virtual void 
+        deployedSharedResource (Type &o)
+        {
 
-virtual void
-optional (Type &o)
-{
+          this->deployedSharedResource (const_cast <Type const &> (o));
+        }
 
-this->optional (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedSharedResource (Type const&);
 
-virtual void
-optional (Type const&);
+        virtual void 
+        id (Type &o)
+        {
 
-virtual void
-kind (Type &o)
-{
+          this->id (const_cast <Type const &> (o));
+        }
 
-this->kind (const_cast <Type const &> (o));
-}
 
+        virtual void
+        id (Type const&);
 
-virtual void
-kind (Type const&);
+        protected:
+        InstanceDeploymentDescription ();
+      };
 
-protected:
-ComponentPortDescription ();
-};
+      struct CCMComponentPortKind : Traversal::CCMComponentPortKind, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
-ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        protected:
+        CCMComponentPortKind ();
+      };
 
+      struct ComponentPortDescription : Traversal::ComponentPortDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
+        ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-type (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->type (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-type (Type const&);
+        virtual void 
+        specificType (Type &o)
+        {
 
-protected:
-ComponentPropertyDescription ();
-};
+          this->specificType (const_cast <Type const &> (o));
+        }
 
-struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
-ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        specificType (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        supportedType_pre (Type &o)
+        {
 
+          this->supportedType_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-portName (Type &o)
-{
+        virtual void
+        supportedType_pre (Type const&);
 
-this->portName (const_cast <Type const &> (o));
-}
+        virtual void 
+        supportedType_next (Type &o)
+        {
 
+          this->supportedType_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-portName (Type const&);
 
-protected:
-ComponentExternalPortEndpoint ();
-};
+        virtual void
+        supportedType_next (Type const&);
 
-struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
-PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        supportedType_post (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->supportedType_post (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        supportedType_post (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        provider (Type &o)
+        {
 
-virtual void
-portName (Type &o)
-{
+          this->provider (const_cast <Type const &> (o));
+        }
 
-this->portName (const_cast <Type const &> (o));
-}
 
+        virtual void
+        provider (Type const&);
 
-virtual void
-portName (Type const&);
+        virtual void 
+        exclusiveProvider (Type &o)
+        {
 
-virtual void
-provider (Type &o)
-{
+          this->exclusiveProvider (const_cast <Type const &> (o));
+        }
 
-this->provider (const_cast <Type const &> (o));
-}
 
+        virtual void
+        exclusiveProvider (Type const&);
 
-virtual void
-provider (Type const&);
+        virtual void 
+        exclusiveUser (Type &o)
+        {
 
-virtual void
-kind (Type &o)
-{
+          this->exclusiveUser (const_cast <Type const &> (o));
+        }
 
-this->kind (const_cast <Type const &> (o));
-}
 
+        virtual void
+        exclusiveUser (Type const&);
 
-virtual void
-kind (Type const&);
+        virtual void 
+        optional (Type &o)
+        {
 
-virtual void
-instance (Type &o)
-{
+          this->optional (const_cast <Type const &> (o));
+        }
 
-this->instance (const_cast <Type const &> (o));
-}
 
+        virtual void
+        optional (Type const&);
 
-virtual void
-instance (Type const&);
+        virtual void 
+        kind (Type &o)
+        {
 
-protected:
-PlanSubcomponentPortEndpoint ();
-};
+          this->kind (const_cast <Type const &> (o));
+        }
 
-struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
-ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        kind (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        protected:
+        ComponentPortDescription ();
+      };
 
+      struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
+        ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-location (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->location (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-location (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-protected:
-ExternalReferenceEndpoint ();
-};
+          this->name (const_cast <Type const &> (o));
+        }
 
-struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
-ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        type (Type &o)
+        {
 
+          this->type (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-targetName (Type &o)
-{
+        virtual void
+        type (Type const&);
 
-this->targetName (const_cast <Type const &> (o));
-}
+        protected:
+        ComponentPropertyDescription ();
+      };
 
+      struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
+        ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-targetName (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-requirementName (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->requirementName (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-requirementName (Type const&);
+        virtual void 
+        portName (Type &o)
+        {
 
-virtual void
-resourceName (Type &o)
-{
+          this->portName (const_cast <Type const &> (o));
+        }
 
-this->resourceName (const_cast <Type const &> (o));
-}
 
+        virtual void
+        portName (Type const&);
 
-virtual void
-resourceName (Type const&);
+        protected:
+        ComponentExternalPortEndpoint ();
+      };
 
-virtual void
-property_pre (Type &o)
-{
+      struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
+        PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->property_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_pre (Type const&);
 
-virtual void
-property_next (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->property_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        portName (Type &o)
+        {
 
+          this->portName (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_next (Type const&);
 
-virtual void
-property_post (Type &o)
-{
+        virtual void
+        portName (Type const&);
 
-this->property_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        provider (Type &o)
+        {
 
+          this->provider (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_post (Type const&);
 
-protected:
-ConnectionResourceDeploymentDescription ();
-};
+        virtual void
+        provider (Type const&);
 
-struct PlanConnectionDescription : Traversal::PlanConnectionDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
-PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        kind (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->kind (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        kind (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        instance (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->instance (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        instance (Type const&);
 
-virtual void
-name (Type const&);
+        protected:
+        PlanSubcomponentPortEndpoint ();
+      };
 
-virtual void
-source (Type &o)
-{
+      struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
+        ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->source (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-source (Type const&);
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        location (Type &o)
+        {
 
+          this->location (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type &o)
-{
+        virtual void
+        location (Type const&);
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
+        protected:
+        ExternalReferenceEndpoint ();
+      };
 
+      struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
+        ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-deployRequirement_post (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void 
+        targetName (Type &o)
+        {
 
-virtual void
-externalEndpoint_pre (Type &o)
-{
+          this->targetName (const_cast <Type const &> (o));
+        }
 
-this->externalEndpoint_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        targetName (Type const&);
 
-virtual void
-externalEndpoint_pre (Type const&);
+        virtual void 
+        requirementName (Type &o)
+        {
 
-virtual void
-externalEndpoint_next (Type &o)
-{
+          this->requirementName (const_cast <Type const &> (o));
+        }
 
-this->externalEndpoint_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        requirementName (Type const&);
 
-virtual void
-externalEndpoint_next (Type const&);
+        virtual void 
+        resourceName (Type &o)
+        {
 
-virtual void
-externalEndpoint_post (Type &o)
-{
+          this->resourceName (const_cast <Type const &> (o));
+        }
 
-this->externalEndpoint_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceName (Type const&);
 
-virtual void
-externalEndpoint_post (Type const&);
+        virtual void 
+        property_pre (Type &o)
+        {
 
-virtual void
-internalEndpoint_pre (Type &o)
-{
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-this->internalEndpoint_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-internalEndpoint_pre (Type const&);
+        virtual void 
+        property_next (Type &o)
+        {
 
-virtual void
-internalEndpoint_next (Type &o)
-{
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-this->internalEndpoint_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_next (Type const&);
 
-virtual void
-internalEndpoint_next (Type const&);
+        virtual void 
+        property_post (Type &o)
+        {
 
-virtual void
-internalEndpoint_post (Type &o)
-{
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-this->internalEndpoint_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_post (Type const&);
 
-virtual void
-internalEndpoint_post (Type const&);
+        protected:
+        ConnectionResourceDeploymentDescription ();
+      };
 
-virtual void
-externalReference_pre (Type &o)
-{
+      struct PlanConnectionDescription : Traversal::PlanConnectionDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
+        PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->externalReference_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_pre (Type const&);
 
-virtual void
-externalReference_next (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->externalReference_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_next (Type const&);
 
-virtual void
-externalReference_post (Type &o)
-{
+        virtual void
+        name (Type const&);
 
-this->externalReference_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        source (Type &o)
+        {
 
+          this->source (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_post (Type const&);
 
-virtual void
-deployedResource_pre (Type &o)
-{
+        virtual void
+        source (Type const&);
 
-this->deployedResource_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
 
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_pre (Type const&);
 
-virtual void
-deployedResource_next (Type &o)
-{
+        virtual void
+        deployRequirement_pre (Type const&);
 
-this->deployedResource_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
 
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_next (Type const&);
 
-virtual void
-deployedResource_post (Type &o)
-{
+        virtual void
+        deployRequirement_next (Type const&);
 
-this->deployedResource_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
 
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployedResource_post (Type const&);
 
-protected:
-PlanConnectionDescription ();
-};
+        virtual void
+        deployRequirement_post (Type const&);
 
-struct ImplementationDependency : Traversal::ImplementationDependency,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
-ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        externalEndpoint_pre (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->externalEndpoint_pre (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        externalEndpoint_pre (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        externalEndpoint_next (Type &o)
+        {
 
-virtual void
-requiredType (Type &o)
-{
+          this->externalEndpoint_next (const_cast <Type const &> (o));
+        }
 
-this->requiredType (const_cast <Type const &> (o));
-}
 
+        virtual void
+        externalEndpoint_next (Type const&);
 
-virtual void
-requiredType (Type const&);
+        virtual void 
+        externalEndpoint_post (Type &o)
+        {
 
-protected:
-ImplementationDependency ();
-};
+          this->externalEndpoint_post (const_cast <Type const &> (o));
+        }
 
-struct Capability : Traversal::Capability,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Capability Type;
-Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        externalEndpoint_post (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        internalEndpoint_pre (Type &o)
+        {
 
+          this->internalEndpoint_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void
+        internalEndpoint_pre (Type const&);
 
-this->name (const_cast <Type const &> (o));
-}
+        virtual void 
+        internalEndpoint_next (Type &o)
+        {
 
+          this->internalEndpoint_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-name (Type const&);
 
-virtual void
-resourceType_pre (Type &o)
-{
+        virtual void
+        internalEndpoint_next (Type const&);
 
-this->resourceType_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        internalEndpoint_post (Type &o)
+        {
 
+          this->internalEndpoint_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceType_pre (Type const&);
 
-virtual void
-resourceType_next (Type &o)
-{
+        virtual void
+        internalEndpoint_post (Type const&);
 
-this->resourceType_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        externalReference_pre (Type &o)
+        {
 
+          this->externalReference_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceType_next (Type const&);
 
-virtual void
-resourceType_post (Type &o)
-{
+        virtual void
+        externalReference_pre (Type const&);
 
-this->resourceType_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        externalReference_next (Type &o)
+        {
 
+          this->externalReference_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceType_post (Type const&);
 
-virtual void
-property_pre (Type &o)
-{
+        virtual void
+        externalReference_next (Type const&);
 
-this->property_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        externalReference_post (Type &o)
+        {
 
+          this->externalReference_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_pre (Type const&);
 
-virtual void
-property_next (Type &o)
-{
+        virtual void
+        externalReference_post (Type const&);
 
-this->property_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        deployedResource_pre (Type &o)
+        {
 
+          this->deployedResource_pre (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_next (Type const&);
 
-virtual void
-property_post (Type &o)
-{
+        virtual void
+        deployedResource_pre (Type const&);
 
-this->property_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        deployedResource_next (Type &o)
+        {
 
+          this->deployedResource_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-property_post (Type const&);
 
-protected:
-Capability ();
-};
+        virtual void
+        deployedResource_next (Type const&);
 
-struct ImplementationRequirement : Traversal::ImplementationRequirement,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
-ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        deployedResource_post (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->deployedResource_post (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        deployedResource_post (Type const&);
 
-virtual void
-traverse (Type const&);
+        protected:
+        PlanConnectionDescription ();
+      };
 
-virtual void
-resourceUsage (Type &o)
-{
+      struct ImplementationDependency : Traversal::ImplementationDependency, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
+        ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->resourceUsage (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourceUsage (Type const&);
 
-virtual void
-resourcePort (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->resourcePort (const_cast <Type const &> (o));
-}
+        virtual void 
+        requiredType (Type &o)
+        {
 
+          this->requiredType (const_cast <Type const &> (o));
+        }
 
-virtual void
-resourcePort (Type const&);
 
-virtual void
-componentPort (Type &o)
-{
+        virtual void
+        requiredType (Type const&);
 
-this->componentPort (const_cast <Type const &> (o));
-}
+        protected:
+        ImplementationDependency ();
+      };
 
+      struct Capability : Traversal::Capability, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Capability Type;
+        Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-componentPort (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-resourceType (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->resourceType (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-resourceType (Type const&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        resourceType_pre (Type &o)
+        {
 
-virtual void
-property_pre (Type &o)
-{
+          this->resourceType_pre (const_cast <Type const &> (o));
+        }
 
-this->property_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType_pre (Type const&);
 
-virtual void
-property_pre (Type const&);
+        virtual void 
+        resourceType_next (Type &o)
+        {
 
-virtual void
-property_next (Type &o)
-{
+          this->resourceType_next (const_cast <Type const &> (o));
+        }
 
-this->property_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType_next (Type const&);
 
-virtual void
-property_next (Type const&);
+        virtual void 
+        resourceType_post (Type &o)
+        {
 
-virtual void
-property_post (Type &o)
-{
+          this->resourceType_post (const_cast <Type const &> (o));
+        }
 
-this->property_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        resourceType_post (Type const&);
 
-virtual void
-property_post (Type const&);
+        virtual void 
+        property_pre (Type &o)
+        {
 
-protected:
-ImplementationRequirement ();
-};
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-struct ComponentPackageReference : Traversal::ComponentPackageReference,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
-ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        property_pre (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_next (Type &o)
+        {
 
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-requiredUUID (Type &o)
-{
+        virtual void
+        property_next (Type const&);
 
-this->requiredUUID (const_cast <Type const &> (o));
-}
+        virtual void 
+        property_post (Type &o)
+        {
 
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-virtual void
-requiredUUID (Type const&);
 
-virtual void
-requiredName (Type &o)
-{
+        virtual void
+        property_post (Type const&);
 
-this->requiredName (const_cast <Type const &> (o));
-}
+        protected:
+        Capability ();
+      };
 
+      struct ImplementationRequirement : Traversal::ImplementationRequirement, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
+        ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-requiredName (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-requiredType (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->requiredType (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-requiredType (Type const&);
+        virtual void 
+        resourceUsage (Type &o)
+        {
 
-protected:
-ComponentPackageReference ();
-};
+          this->resourceUsage (const_cast <Type const &> (o));
+        }
 
-struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
-SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void
+        resourceUsage (Type const&);
 
-this->traverse (const_cast <Type const &> (o));
-}
+        virtual void 
+        resourcePort (Type &o)
+        {
 
+          this->resourcePort (const_cast <Type const &> (o));
+        }
 
-virtual void
-traverse (Type const&);
 
-virtual void
-portName (Type &o)
-{
+        virtual void
+        resourcePort (Type const&);
 
-this->portName (const_cast <Type const &> (o));
-}
+        virtual void 
+        componentPort (Type &o)
+        {
 
+          this->componentPort (const_cast <Type const &> (o));
+        }
 
-virtual void
-portName (Type const&);
 
-virtual void
-instance (Type &o)
-{
+        virtual void
+        componentPort (Type const&);
 
-this->instance (const_cast <Type const &> (o));
-}
+        virtual void 
+        resourceType (Type &o)
+        {
 
+          this->resourceType (const_cast <Type const &> (o));
+        }
 
-virtual void
-instance (Type const&);
 
-protected:
-SubcomponentPortEndpoint ();
-};
+        virtual void
+        resourceType (Type const&);
 
-struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
-AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        virtual void 
+        name (Type &o)
+        {
 
-virtual void
-traverse (Type &o)
-{
+          this->name (const_cast <Type const &> (o));
+        }
 
-this->traverse (const_cast <Type const &> (o));
-}
 
+        virtual void
+        name (Type const&);
 
-virtual void
-traverse (Type const&);
+        virtual void 
+        property_pre (Type &o)
+        {
 
-virtual void
-name (Type &o)
-{
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
-this->name (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-name (Type const&);
+        virtual void 
+        property_next (Type &o)
+        {
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+          this->property_next (const_cast <Type const &> (o));
+        }
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_next (Type const&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void 
+        property_post (Type &o)
+        {
 
-virtual void
-deployRequirement_next (Type &o)
-{
+          this->property_post (const_cast <Type const &> (o));
+        }
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        property_post (Type const&);
 
-virtual void
-deployRequirement_next (Type const&);
+        protected:
+        ImplementationRequirement ();
+      };
 
-virtual void
-deployRequirement_post (Type &o)
-{
+      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
+        ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-deployRequirement_post (Type const&);
 
-virtual void
-internalEndpoint_pre (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->internalEndpoint_pre (const_cast <Type const &> (o));
-}
+        virtual void 
+        requiredUUID (Type &o)
+        {
 
+          this->requiredUUID (const_cast <Type const &> (o));
+        }
 
-virtual void
-internalEndpoint_pre (Type const&);
 
-virtual void
-internalEndpoint_next (Type &o)
-{
+        virtual void
+        requiredUUID (Type const&);
 
-this->internalEndpoint_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        requiredName (Type &o)
+        {
 
+          this->requiredName (const_cast <Type const &> (o));
+        }
 
-virtual void
-internalEndpoint_next (Type const&);
 
-virtual void
-internalEndpoint_post (Type &o)
-{
+        virtual void
+        requiredName (Type const&);
 
-this->internalEndpoint_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        requiredType (Type &o)
+        {
 
+          this->requiredType (const_cast <Type const &> (o));
+        }
 
-virtual void
-internalEndpoint_post (Type const&);
 
-virtual void
-externalEndpoint_pre (Type &o)
-{
+        virtual void
+        requiredType (Type const&);
 
-this->externalEndpoint_pre (const_cast <Type const &> (o));
-}
+        protected:
+        ComponentPackageReference ();
+      };
 
+      struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
+        SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-externalEndpoint_pre (Type const&);
+        virtual void 
+        traverse (Type &o)
+        {
 
-virtual void
-externalEndpoint_next (Type &o)
-{
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-this->externalEndpoint_next (const_cast <Type const &> (o));
-}
 
+        virtual void
+        traverse (Type const&);
 
-virtual void
-externalEndpoint_next (Type const&);
+        virtual void 
+        portName (Type &o)
+        {
 
-virtual void
-externalEndpoint_post (Type &o)
-{
+          this->portName (const_cast <Type const &> (o));
+        }
 
-this->externalEndpoint_post (const_cast <Type const &> (o));
-}
 
+        virtual void
+        portName (Type const&);
 
-virtual void
-externalEndpoint_post (Type const&);
+        virtual void 
+        instance (Type &o)
+        {
 
-virtual void
-externalReference_pre (Type &o)
-{
+          this->instance (const_cast <Type const &> (o));
+        }
 
-this->externalReference_pre (const_cast <Type const &> (o));
-}
 
+        virtual void
+        instance (Type const&);
 
-virtual void
-externalReference_pre (Type const&);
+        protected:
+        SubcomponentPortEndpoint ();
+      };
 
-virtual void
-externalReference_next (Type &o)
-{
+      struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
+        AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-this->externalReference_next (const_cast <Type const &> (o));
-}
+        virtual void 
+        traverse (Type &o)
+        {
 
+          this->traverse (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_next (Type const&);
 
-virtual void
-externalReference_post (Type &o)
-{
+        virtual void
+        traverse (Type const&);
 
-this->externalReference_post (const_cast <Type const &> (o));
-}
+        virtual void 
+        name (Type &o)
+        {
 
+          this->name (const_cast <Type const &> (o));
+        }
 
-virtual void
-externalReference_post (Type const&);
 
-protected:
-AssemblyConnectionDescription ();
-};
-}
-}
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
+
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        deployRequirement_pre (Type const&);
+
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
+
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        deployRequirement_next (Type const&);
+
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
+
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        deployRequirement_post (Type const&);
+
+        virtual void 
+        internalEndpoint_pre (Type &o)
+        {
+
+          this->internalEndpoint_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        internalEndpoint_pre (Type const&);
+
+        virtual void 
+        internalEndpoint_next (Type &o)
+        {
+
+          this->internalEndpoint_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        internalEndpoint_next (Type const&);
+
+        virtual void 
+        internalEndpoint_post (Type &o)
+        {
+
+          this->internalEndpoint_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        internalEndpoint_post (Type const&);
+
+        virtual void 
+        externalEndpoint_pre (Type &o)
+        {
+
+          this->externalEndpoint_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalEndpoint_pre (Type const&);
+
+        virtual void 
+        externalEndpoint_next (Type &o)
+        {
+
+          this->externalEndpoint_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalEndpoint_next (Type const&);
+
+        virtual void 
+        externalEndpoint_post (Type &o)
+        {
+
+          this->externalEndpoint_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalEndpoint_post (Type const&);
+
+        virtual void 
+        externalReference_pre (Type &o)
+        {
+
+          this->externalReference_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalReference_pre (Type const&);
+
+        virtual void 
+        externalReference_next (Type &o)
+        {
+
+          this->externalReference_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalReference_next (Type const&);
+
+        virtual void 
+        externalReference_post (Type &o)
+        {
+
+          this->externalReference_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        externalReference_post (Type const&);
+
+        protected:
+        AssemblyConnectionDescription ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // BASIC_DEPLOYMENT_DATA_HPP
diff --git a/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index f7e4a7e82d3..8256f089f68 100644
--- a/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -8,7 +8,7 @@
 #include "Property_Handler.h"
 #include "CPD_Handler.h"
 #include "ComponentPropertyDescription_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 3131ce5735b..4c93545f2c6 100644
--- a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
index 2f2db561642..a31c183415d 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
@@ -3,12 +3,18 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
- 
+
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "CIAOEvents.hpp"
 
 namespace CIAO
@@ -1004,7 +1010,7 @@ namespace CIAO
 
     CIAOEventsDef::
     CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1046,7 +1052,7 @@ namespace CIAO
 
     EventServiceDescription::
     EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1168,7 +1174,7 @@ namespace CIAO
 
     Filter::
     Filter (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1222,7 +1228,7 @@ namespace CIAO
 
     AddressServerDescription::
     AddressServerDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1261,7 +1267,7 @@ namespace CIAO
 
     UDPSenderDescription::
     UDPSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1294,7 +1300,7 @@ namespace CIAO
 
     UDPReceiverDescription::
     UDPReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1358,3 +1364,1668 @@ namespace CIAO
   }
 }
 
+#include "XMLSchema/TypeInfo.hpp"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+      struct EventServiceTypeTypeInfoInitializer
+      {
+        EventServiceTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (EventServiceType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      EventServiceTypeTypeInfoInitializer EventServiceTypeTypeInfoInitializer_;
+
+      struct CIAOEventsDefTypeInfoInitializer
+      {
+        CIAOEventsDefTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (CIAOEventsDef));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      CIAOEventsDefTypeInfoInitializer CIAOEventsDefTypeInfoInitializer_;
+
+      struct EventServiceDescriptionTypeInfoInitializer
+      {
+        EventServiceDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (EventServiceDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      EventServiceDescriptionTypeInfoInitializer EventServiceDescriptionTypeInfoInitializer_;
+
+      struct FilterTypeTypeInfoInitializer
+      {
+        FilterTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (FilterType));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      FilterTypeTypeInfoInitializer FilterTypeTypeInfoInitializer_;
+
+      struct FilterTypeInfoInitializer
+      {
+        FilterTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Filter));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      FilterTypeInfoInitializer FilterTypeInfoInitializer_;
+
+      struct AddressServerDescriptionTypeInfoInitializer
+      {
+        AddressServerDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (AddressServerDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      AddressServerDescriptionTypeInfoInitializer AddressServerDescriptionTypeInfoInitializer_;
+
+      struct UDPSenderDescriptionTypeInfoInitializer
+      {
+        UDPSenderDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (UDPSenderDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      UDPSenderDescriptionTypeInfoInitializer UDPSenderDescriptionTypeInfoInitializer_;
+
+      struct UDPReceiverDescriptionTypeInfoInitializer
+      {
+        UDPReceiverDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (UDPReceiverDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      UDPReceiverDescriptionTypeInfoInitializer UDPReceiverDescriptionTypeInfoInitializer_;
+    }
+  }
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // CIAOEventsDef
+      //
+      //
+
+      void CIAOEventsDef::
+      traverse (Type& o)
+      {
+        pre (o);
+        eventServiceConfiguration (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void CIAOEventsDef::
+      traverse (Type const& o)
+      {
+        pre (o);
+        eventServiceConfiguration (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void CIAOEventsDef::
+      pre (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      pre (Type const&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        CIAOEventsDef::Type::eventServiceConfiguration_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
+
+        if (b != e)
+        {
+          eventServiceConfiguration_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) eventServiceConfiguration_next (o);
+          }
+
+          eventServiceConfiguration_post (o);
+        }
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        CIAOEventsDef::Type::eventServiceConfiguration_const_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
+
+        if (b != e)
+        {
+          eventServiceConfiguration_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) eventServiceConfiguration_next (o);
+          }
+
+          eventServiceConfiguration_post (o);
+        }
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_pre (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_pre (Type const&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_next (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_next (Type const&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_post (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_post (Type const&)
+      {
+      }
+
+      void CIAOEventsDef::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void CIAOEventsDef::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void CIAOEventsDef::
+      id_none (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      id_none (Type const&)
+      {
+      }
+
+      void CIAOEventsDef::
+      post (Type&)
+      {
+      }
+
+      void CIAOEventsDef::
+      post (Type const&)
+      {
+      }
+
+      // EventServiceDescription
+      //
+      //
+
+      void EventServiceDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        node (o);
+        type (o);
+        svc_cfg_file (o);
+        filter (o);
+        addr_serv (o);
+        udp_sender (o);
+        udp_receiver (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void EventServiceDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        node (o);
+        type (o);
+        svc_cfg_file (o);
+        filter (o);
+        addr_serv (o);
+        udp_sender (o);
+        udp_receiver (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void EventServiceDescription::
+      pre (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      pre (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void EventServiceDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void EventServiceDescription::
+      node (Type& o)
+      {
+        dispatch (o.node ());
+      }
+
+      void EventServiceDescription::
+      node (Type const& o)
+      {
+        dispatch (o.node ());
+      }
+
+      void EventServiceDescription::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
+
+      void EventServiceDescription::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
+
+      void EventServiceDescription::
+      svc_cfg_file (Type& o)
+      {
+        dispatch (o.svc_cfg_file ());
+      }
+
+      void EventServiceDescription::
+      svc_cfg_file (Type const& o)
+      {
+        dispatch (o.svc_cfg_file ());
+      }
+
+      void EventServiceDescription::
+      filter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::filter_iterator b (o.begin_filter()), e (o.end_filter());
+
+        if (b != e)
+        {
+          filter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) filter_next (o);
+          }
+
+          filter_post (o);
+        }
+
+        else filter_none (o);
+      }
+
+      void EventServiceDescription::
+      filter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::filter_const_iterator b (o.begin_filter()), e (o.end_filter());
+
+        if (b != e)
+        {
+          filter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) filter_next (o);
+          }
+
+          filter_post (o);
+        }
+
+        else filter_none (o);
+      }
+
+      void EventServiceDescription::
+      filter_pre (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_pre (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_next (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_next (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_post (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_post (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_none (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      filter_none (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::addr_serv_iterator b (o.begin_addr_serv()), e (o.end_addr_serv());
+
+        if (b != e)
+        {
+          addr_serv_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) addr_serv_next (o);
+          }
+
+          addr_serv_post (o);
+        }
+
+        else addr_serv_none (o);
+      }
+
+      void EventServiceDescription::
+      addr_serv (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::addr_serv_const_iterator b (o.begin_addr_serv()), e (o.end_addr_serv());
+
+        if (b != e)
+        {
+          addr_serv_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) addr_serv_next (o);
+          }
+
+          addr_serv_post (o);
+        }
+
+        else addr_serv_none (o);
+      }
+
+      void EventServiceDescription::
+      addr_serv_pre (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_pre (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_next (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_next (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_post (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_post (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_none (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      addr_serv_none (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::udp_sender_iterator b (o.begin_udp_sender()), e (o.end_udp_sender());
+
+        if (b != e)
+        {
+          udp_sender_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) udp_sender_next (o);
+          }
+
+          udp_sender_post (o);
+        }
+
+        else udp_sender_none (o);
+      }
+
+      void EventServiceDescription::
+      udp_sender (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::udp_sender_const_iterator b (o.begin_udp_sender()), e (o.end_udp_sender());
+
+        if (b != e)
+        {
+          udp_sender_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) udp_sender_next (o);
+          }
+
+          udp_sender_post (o);
+        }
+
+        else udp_sender_none (o);
+      }
+
+      void EventServiceDescription::
+      udp_sender_pre (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_pre (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_next (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_next (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_post (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_post (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_none (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_sender_none (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::udp_receiver_iterator b (o.begin_udp_receiver()), e (o.end_udp_receiver());
+
+        if (b != e)
+        {
+          udp_receiver_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) udp_receiver_next (o);
+          }
+
+          udp_receiver_post (o);
+        }
+
+        else udp_receiver_none (o);
+      }
+
+      void EventServiceDescription::
+      udp_receiver (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        EventServiceDescription::Type::udp_receiver_const_iterator b (o.begin_udp_receiver()), e (o.end_udp_receiver());
+
+        if (b != e)
+        {
+          udp_receiver_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) udp_receiver_next (o);
+          }
+
+          udp_receiver_post (o);
+        }
+
+        else udp_receiver_none (o);
+      }
+
+      void EventServiceDescription::
+      udp_receiver_pre (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_pre (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_next (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_next (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_post (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_post (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_none (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      udp_receiver_none (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void EventServiceDescription::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void EventServiceDescription::
+      id_none (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      id_none (Type const&)
+      {
+      }
+
+      void EventServiceDescription::
+      post (Type&)
+      {
+      }
+
+      void EventServiceDescription::
+      post (Type const&)
+      {
+      }
+
+      // Filter
+      //
+      //
+
+      void Filter::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        source (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void Filter::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        type (o);
+        source (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
+
+      void Filter::
+      pre (Type&)
+      {
+      }
+
+      void Filter::
+      pre (Type const&)
+      {
+      }
+
+      void Filter::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void Filter::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void Filter::
+      type (Type& o)
+      {
+        dispatch (o.type ());
+      }
+
+      void Filter::
+      type (Type const& o)
+      {
+        dispatch (o.type ());
+      }
+
+      void Filter::
+      source (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Filter::Type::source_iterator b (o.begin_source()), e (o.end_source());
+
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
+
+      void Filter::
+      source (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Filter::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
+
+        if (b != e)
+        {
+          source_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) source_next (o);
+          }
+
+          source_post (o);
+        }
+      }
+
+      void Filter::
+      source_pre (Type&)
+      {
+      }
+
+      void Filter::
+      source_pre (Type const&)
+      {
+      }
+
+      void Filter::
+      source_next (Type&)
+      {
+      }
+
+      void Filter::
+      source_next (Type const&)
+      {
+      }
+
+      void Filter::
+      source_post (Type&)
+      {
+      }
+
+      void Filter::
+      source_post (Type const&)
+      {
+      }
+
+      void Filter::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void Filter::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
+
+      void Filter::
+      id_none (Type&)
+      {
+      }
+
+      void Filter::
+      id_none (Type const&)
+      {
+      }
+
+      void Filter::
+      post (Type&)
+      {
+      }
+
+      void Filter::
+      post (Type const&)
+      {
+      }
+
+      // AddressServerDescription
+      //
+      //
+
+      void AddressServerDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        port (o);
+        address (o);
+        post (o);
+      }
+
+      void AddressServerDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        port (o);
+        address (o);
+        post (o);
+      }
+
+      void AddressServerDescription::
+      pre (Type&)
+      {
+      }
+
+      void AddressServerDescription::
+      pre (Type const&)
+      {
+      }
+
+      void AddressServerDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void AddressServerDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void AddressServerDescription::
+      port (Type& o)
+      {
+        dispatch (o.port ());
+      }
+
+      void AddressServerDescription::
+      port (Type const& o)
+      {
+        dispatch (o.port ());
+      }
+
+      void AddressServerDescription::
+      address (Type& o)
+      {
+        dispatch (o.address ());
+      }
+
+      void AddressServerDescription::
+      address (Type const& o)
+      {
+        dispatch (o.address ());
+      }
+
+      void AddressServerDescription::
+      post (Type&)
+      {
+      }
+
+      void AddressServerDescription::
+      post (Type const&)
+      {
+      }
+
+      // UDPSenderDescription
+      //
+      //
+
+      void UDPSenderDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        addr_serv_id (o);
+        post (o);
+      }
+
+      void UDPSenderDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        addr_serv_id (o);
+        post (o);
+      }
+
+      void UDPSenderDescription::
+      pre (Type&)
+      {
+      }
+
+      void UDPSenderDescription::
+      pre (Type const&)
+      {
+      }
+
+      void UDPSenderDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void UDPSenderDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void UDPSenderDescription::
+      addr_serv_id (Type& o)
+      {
+        dispatch (o.addr_serv_id ());
+      }
+
+      void UDPSenderDescription::
+      addr_serv_id (Type const& o)
+      {
+        dispatch (o.addr_serv_id ());
+      }
+
+      void UDPSenderDescription::
+      post (Type&)
+      {
+      }
+
+      void UDPSenderDescription::
+      post (Type const&)
+      {
+      }
+
+      // UDPReceiverDescription
+      //
+      //
+
+      void UDPReceiverDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.addr_serv_id_p ()) addr_serv_id (o);
+        else addr_serv_id_none (o);
+        is_multicast (o);
+        listen_port (o);
+        post (o);
+      }
+
+      void UDPReceiverDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.addr_serv_id_p ()) addr_serv_id (o);
+        else addr_serv_id_none (o);
+        is_multicast (o);
+        listen_port (o);
+        post (o);
+      }
+
+      void UDPReceiverDescription::
+      pre (Type&)
+      {
+      }
+
+      void UDPReceiverDescription::
+      pre (Type const&)
+      {
+      }
+
+      void UDPReceiverDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void UDPReceiverDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void UDPReceiverDescription::
+      addr_serv_id (Type& o)
+      {
+        dispatch (o.addr_serv_id ());
+      }
+
+      void UDPReceiverDescription::
+      addr_serv_id (Type const& o)
+      {
+        dispatch (o.addr_serv_id ());
+      }
+
+      void UDPReceiverDescription::
+      addr_serv_id_none (Type&)
+      {
+      }
+
+      void UDPReceiverDescription::
+      addr_serv_id_none (Type const&)
+      {
+      }
+
+      void UDPReceiverDescription::
+      is_multicast (Type& o)
+      {
+        dispatch (o.is_multicast ());
+      }
+
+      void UDPReceiverDescription::
+      is_multicast (Type const& o)
+      {
+        dispatch (o.is_multicast ());
+      }
+
+      void UDPReceiverDescription::
+      listen_port (Type& o)
+      {
+        dispatch (o.listen_port ());
+      }
+
+      void UDPReceiverDescription::
+      listen_port (Type const& o)
+      {
+        dispatch (o.listen_port ());
+      }
+
+      void UDPReceiverDescription::
+      post (Type&)
+      {
+      }
+
+      void UDPReceiverDescription::
+      post (Type const&)
+      {
+      }
+    }
+  }
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // EventServiceType
+      //
+      //
+
+      EventServiceType::
+      EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      EventServiceType::
+      EventServiceType ()
+      {
+      }
+
+      void EventServiceType::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::EventServiceType::EC) s = "EC";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTEC) s = "RTEC";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::NOTIFY) s = "NOTIFY";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY) s = "RTNOTIFY";
+        else 
+        {
+        }
+
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
+
+        else
+        {
+          top_().value (s);
+        }
+      }
+
+      // CIAOEventsDef
+      //
+      //
+
+      CIAOEventsDef::
+      CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      CIAOEventsDef::
+      CIAOEventsDef ()
+      {
+      }
+
+      void CIAOEventsDef::
+      traverse (Type const& o)
+      {
+        Traversal::CIAOEventsDef::traverse (o);
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("eventServiceConfiguration", top_ ()));
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_next (Type const& o)
+      {
+        eventServiceConfiguration_post (o);
+        eventServiceConfiguration_pre (o);
+      }
+
+      void CIAOEventsDef::
+      eventServiceConfiguration_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void CIAOEventsDef::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::CIAOEventsDef::id (o);
+        attr_ (0);
+      }
+
+      // EventServiceDescription
+      //
+      //
+
+      EventServiceDescription::
+      EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      EventServiceDescription::
+      EventServiceDescription ()
+      {
+      }
+
+      void EventServiceDescription::
+      traverse (Type const& o)
+      {
+        Traversal::EventServiceDescription::traverse (o);
+      }
+
+      void EventServiceDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::EventServiceDescription::name (o);
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      node (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+        Traversal::EventServiceDescription::node (o);
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::EventServiceDescription::type (o);
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      svc_cfg_file (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
+        Traversal::EventServiceDescription::svc_cfg_file (o);
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      filter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("filter", top_ ()));
+      }
+
+      void EventServiceDescription::
+      filter_next (Type const& o)
+      {
+        filter_post (o);
+        filter_pre (o);
+      }
+
+      void EventServiceDescription::
+      filter_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      addr_serv_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv", top_ ()));
+      }
+
+      void EventServiceDescription::
+      addr_serv_next (Type const& o)
+      {
+        addr_serv_post (o);
+        addr_serv_pre (o);
+      }
+
+      void EventServiceDescription::
+      addr_serv_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      udp_sender_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("udp_sender", top_ ()));
+      }
+
+      void EventServiceDescription::
+      udp_sender_next (Type const& o)
+      {
+        udp_sender_post (o);
+        udp_sender_pre (o);
+      }
+
+      void EventServiceDescription::
+      udp_sender_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      udp_receiver_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("udp_receiver", top_ ()));
+      }
+
+      void EventServiceDescription::
+      udp_receiver_next (Type const& o)
+      {
+        udp_receiver_post (o);
+        udp_receiver_pre (o);
+      }
+
+      void EventServiceDescription::
+      udp_receiver_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void EventServiceDescription::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::EventServiceDescription::id (o);
+        attr_ (0);
+      }
+
+      // FilterType
+      //
+      //
+
+      FilterType::
+      FilterType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      FilterType::
+      FilterType ()
+      {
+      }
+
+      void FilterType::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::FilterType::CONJUNCTION) s = "CONJUNCTION";
+        else if (o == ::CIAO::Config_Handlers::FilterType::DISJUNCTION) s = "DISJUNCTION";
+        else if (o == ::CIAO::Config_Handlers::FilterType::LOGICAL_AND) s = "LOGICAL_AND";
+        else if (o == ::CIAO::Config_Handlers::FilterType::NEGATE) s = "NEGATE";
+        else 
+        {
+        }
+
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
+
+        else
+        {
+          top_().value (s);
+        }
+      }
+
+      // Filter
+      //
+      //
+
+      Filter::
+      Filter (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      Filter::
+      Filter ()
+      {
+      }
+
+      void Filter::
+      traverse (Type const& o)
+      {
+        Traversal::Filter::traverse (o);
+      }
+
+      void Filter::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Filter::name (o);
+        pop_ ();
+      }
+
+      void Filter::
+      type (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+        Traversal::Filter::type (o);
+        pop_ ();
+      }
+
+      void Filter::
+      source_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+      }
+
+      void Filter::
+      source_next (Type const& o)
+      {
+        source_post (o);
+        source_pre (o);
+      }
+
+      void Filter::
+      source_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void Filter::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::Filter::id (o);
+        attr_ (0);
+      }
+
+      // AddressServerDescription
+      //
+      //
+
+      AddressServerDescription::
+      AddressServerDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      AddressServerDescription::
+      AddressServerDescription ()
+      {
+      }
+
+      void AddressServerDescription::
+      traverse (Type const& o)
+      {
+        Traversal::AddressServerDescription::traverse (o);
+      }
+
+      void AddressServerDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::AddressServerDescription::name (o);
+        pop_ ();
+      }
+
+      void AddressServerDescription::
+      port (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("port", top_ ()));
+        Traversal::AddressServerDescription::port (o);
+        pop_ ();
+      }
+
+      void AddressServerDescription::
+      address (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("address", top_ ()));
+        Traversal::AddressServerDescription::address (o);
+        pop_ ();
+      }
+
+      // UDPSenderDescription
+      //
+      //
+
+      UDPSenderDescription::
+      UDPSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      UDPSenderDescription::
+      UDPSenderDescription ()
+      {
+      }
+
+      void UDPSenderDescription::
+      traverse (Type const& o)
+      {
+        Traversal::UDPSenderDescription::traverse (o);
+      }
+
+      void UDPSenderDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::UDPSenderDescription::name (o);
+        pop_ ();
+      }
+
+      void UDPSenderDescription::
+      addr_serv_id (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv_id", top_ ()));
+        Traversal::UDPSenderDescription::addr_serv_id (o);
+        pop_ ();
+      }
+
+      // UDPReceiverDescription
+      //
+      //
+
+      UDPReceiverDescription::
+      UDPReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      UDPReceiverDescription::
+      UDPReceiverDescription ()
+      {
+      }
+
+      void UDPReceiverDescription::
+      traverse (Type const& o)
+      {
+        Traversal::UDPReceiverDescription::traverse (o);
+      }
+
+      void UDPReceiverDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::UDPReceiverDescription::name (o);
+        pop_ ();
+      }
+
+      void UDPReceiverDescription::
+      addr_serv_id (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv_id", top_ ()));
+        Traversal::UDPReceiverDescription::addr_serv_id (o);
+        pop_ ();
+      }
+
+      void UDPReceiverDescription::
+      is_multicast (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("is_multicast", top_ ()));
+        Traversal::UDPReceiverDescription::is_multicast (o);
+        pop_ ();
+      }
+
+      void UDPReceiverDescription::
+      listen_port (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("listen_port", top_ ()));
+        Traversal::UDPReceiverDescription::listen_port (o);
+        pop_ ();
+      }
+    }
+  }
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    void
+    CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const& s, xercesc::DOMDocument* d)
+    {
+      ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
+      if (e.name () != "CIAOEvents")
+      {
+        throw 1;
+      }
+
+      struct W : virtual ::CIAO::Config_Handlers::Writer::CIAOEventsDef,
+      virtual ::CIAO::Config_Handlers::Writer::EventServiceDescription,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::EventServiceType,
+      virtual ::CIAO::Config_Handlers::Writer::Filter,
+      virtual ::CIAO::Config_Handlers::Writer::FilterType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AddressServerDescription,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::UDPSenderDescription,
+      virtual ::CIAO::Config_Handlers::Writer::UDPReceiverDescription,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        W (::XSCRT::XML::Element< ACE_TCHAR >& e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
+        {
+        }
+      };
+
+      W w (e);
+      w.dispatch (s);
+    }
+  }
+}
+
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
index 692b6b940d0..96eb968efca 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
@@ -15,10 +15,10 @@
 # include <string.h>
 #endif
 
-#include "CIAO_Events_Handlers_Export.h"
 #ifndef CIAOEVENTS_HPP
 #define CIAOEVENTS_HPP
 
+#include "CIAO_Events_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
@@ -57,7 +57,7 @@ namespace CIAO
 
       enum Value
       {
-        EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l
+        EC_l, RTEC_l, NOTIFY_l, RTNOTIFY_l
       };
 
 
@@ -83,8 +83,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export CIAOEventsDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // eventServiceConfiguration
       // 
@@ -128,8 +127,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export EventServiceDescription : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // name
       // 
@@ -268,7 +266,7 @@ namespace CIAO
 
       enum Value
       {
-        CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l
+        CONJUNCTION_l, DISJUNCTION_l, LOGICAL_AND_l, NEGATE_l
       };
 
 
@@ -294,8 +292,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export Filter : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // name
       // 
@@ -358,8 +355,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export AddressServerDescription : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // name
       // 
@@ -406,8 +402,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export UDPSenderDescription : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // name
       // 
@@ -444,8 +439,7 @@ namespace CIAO
 
     class CIAO_Events_Handlers_Export UDPReceiverDescription : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // name
       // 
@@ -511,4 +505,1028 @@ namespace CIAO
   }
 }
 
+#include "XMLSchema/Traversal.hpp"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceType >
+      EventServiceType;
+
+      struct CIAO_Events_Handlers_Export CIAOEventsDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CIAOEventsDef >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        eventServiceConfiguration (Type&);
+
+        virtual void
+        eventServiceConfiguration (Type const&);
+
+        virtual void
+        eventServiceConfiguration_pre (Type&);
+
+        virtual void
+        eventServiceConfiguration_pre (Type const&);
+
+        virtual void
+        eventServiceConfiguration_next (Type&);
+
+        virtual void
+        eventServiceConfiguration_next (Type const&);
+
+        virtual void
+        eventServiceConfiguration_post (Type&);
+
+        virtual void
+        eventServiceConfiguration_post (Type const&);
+
+        virtual void
+        id (Type&);
+
+        virtual void
+        id (Type const&);
+
+        virtual void
+        id_none (Type&);
+
+        virtual void
+        id_none (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      struct CIAO_Events_Handlers_Export EventServiceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceDescription >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        node (Type&);
+
+        virtual void
+        node (Type const&);
+
+        virtual void
+        type (Type&);
+
+        virtual void
+        type (Type const&);
+
+        virtual void
+        svc_cfg_file (Type&);
+
+        virtual void
+        svc_cfg_file (Type const&);
+
+        virtual void
+        filter (Type&);
+
+        virtual void
+        filter (Type const&);
+
+        virtual void
+        filter_pre (Type&);
+
+        virtual void
+        filter_pre (Type const&);
+
+        virtual void
+        filter_next (Type&);
+
+        virtual void
+        filter_next (Type const&);
+
+        virtual void
+        filter_post (Type&);
+
+        virtual void
+        filter_post (Type const&);
+
+        virtual void
+        filter_none (Type&);
+
+        virtual void
+        filter_none (Type const&);
+
+        virtual void
+        addr_serv (Type&);
+
+        virtual void
+        addr_serv (Type const&);
+
+        virtual void
+        addr_serv_pre (Type&);
+
+        virtual void
+        addr_serv_pre (Type const&);
+
+        virtual void
+        addr_serv_next (Type&);
+
+        virtual void
+        addr_serv_next (Type const&);
+
+        virtual void
+        addr_serv_post (Type&);
+
+        virtual void
+        addr_serv_post (Type const&);
+
+        virtual void
+        addr_serv_none (Type&);
+
+        virtual void
+        addr_serv_none (Type const&);
+
+        virtual void
+        udp_sender (Type&);
+
+        virtual void
+        udp_sender (Type const&);
+
+        virtual void
+        udp_sender_pre (Type&);
+
+        virtual void
+        udp_sender_pre (Type const&);
+
+        virtual void
+        udp_sender_next (Type&);
+
+        virtual void
+        udp_sender_next (Type const&);
+
+        virtual void
+        udp_sender_post (Type&);
+
+        virtual void
+        udp_sender_post (Type const&);
+
+        virtual void
+        udp_sender_none (Type&);
+
+        virtual void
+        udp_sender_none (Type const&);
+
+        virtual void
+        udp_receiver (Type&);
+
+        virtual void
+        udp_receiver (Type const&);
+
+        virtual void
+        udp_receiver_pre (Type&);
+
+        virtual void
+        udp_receiver_pre (Type const&);
+
+        virtual void
+        udp_receiver_next (Type&);
+
+        virtual void
+        udp_receiver_next (Type const&);
+
+        virtual void
+        udp_receiver_post (Type&);
+
+        virtual void
+        udp_receiver_post (Type const&);
+
+        virtual void
+        udp_receiver_none (Type&);
+
+        virtual void
+        udp_receiver_none (Type const&);
+
+        virtual void
+        id (Type&);
+
+        virtual void
+        id (Type const&);
+
+        virtual void
+        id_none (Type&);
+
+        virtual void
+        id_none (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::FilterType >
+      FilterType;
+
+      struct CIAO_Events_Handlers_Export Filter : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Filter >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        type (Type&);
+
+        virtual void
+        type (Type const&);
+
+        virtual void
+        source (Type&);
+
+        virtual void
+        source (Type const&);
+
+        virtual void
+        source_pre (Type&);
+
+        virtual void
+        source_pre (Type const&);
+
+        virtual void
+        source_next (Type&);
+
+        virtual void
+        source_next (Type const&);
+
+        virtual void
+        source_post (Type&);
+
+        virtual void
+        source_post (Type const&);
+
+        virtual void
+        id (Type&);
+
+        virtual void
+        id (Type const&);
+
+        virtual void
+        id_none (Type&);
+
+        virtual void
+        id_none (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      struct CIAO_Events_Handlers_Export AddressServerDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AddressServerDescription >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        port (Type&);
+
+        virtual void
+        port (Type const&);
+
+        virtual void
+        address (Type&);
+
+        virtual void
+        address (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      struct CIAO_Events_Handlers_Export UDPSenderDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::UDPSenderDescription >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        addr_serv_id (Type&);
+
+        virtual void
+        addr_serv_id (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      struct CIAO_Events_Handlers_Export UDPReceiverDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::UDPReceiverDescription >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        addr_serv_id (Type&);
+
+        virtual void
+        addr_serv_id (Type const&);
+
+        virtual void
+        addr_serv_id_none (Type&);
+
+        virtual void
+        addr_serv_id_none (Type const&);
+
+        virtual void
+        is_multicast (Type&);
+
+        virtual void
+        is_multicast (Type const&);
+
+        virtual void
+        listen_port (Type&);
+
+        virtual void
+        listen_port (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
+}
+
+#include "XMLSchema/Writer.hpp"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct EventServiceType : Traversal::EventServiceType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        traverse (Type const&);
+
+        protected:
+        EventServiceType ();
+      };
+
+      struct CIAOEventsDef : Traversal::CIAOEventsDef, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::CIAOEventsDef Type;
+        CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        eventServiceConfiguration_pre (Type &o)
+        {
+
+          this->eventServiceConfiguration_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        eventServiceConfiguration_pre (Type const&);
+
+        virtual void 
+        eventServiceConfiguration_next (Type &o)
+        {
+
+          this->eventServiceConfiguration_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        eventServiceConfiguration_next (Type const&);
+
+        virtual void 
+        eventServiceConfiguration_post (Type &o)
+        {
+
+          this->eventServiceConfiguration_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        eventServiceConfiguration_post (Type const&);
+
+        virtual void 
+        id (Type &o)
+        {
+
+          this->id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        id (Type const&);
+
+        protected:
+        CIAOEventsDef ();
+      };
+
+      struct EventServiceDescription : Traversal::EventServiceDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::EventServiceDescription Type;
+        EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        node (Type &o)
+        {
+
+          this->node (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        node (Type const&);
+
+        virtual void 
+        type (Type &o)
+        {
+
+          this->type (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        type (Type const&);
+
+        virtual void 
+        svc_cfg_file (Type &o)
+        {
+
+          this->svc_cfg_file (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        svc_cfg_file (Type const&);
+
+        virtual void 
+        filter_pre (Type &o)
+        {
+
+          this->filter_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        filter_pre (Type const&);
+
+        virtual void 
+        filter_next (Type &o)
+        {
+
+          this->filter_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        filter_next (Type const&);
+
+        virtual void 
+        filter_post (Type &o)
+        {
+
+          this->filter_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        filter_post (Type const&);
+
+        virtual void 
+        addr_serv_pre (Type &o)
+        {
+
+          this->addr_serv_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        addr_serv_pre (Type const&);
+
+        virtual void 
+        addr_serv_next (Type &o)
+        {
+
+          this->addr_serv_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        addr_serv_next (Type const&);
+
+        virtual void 
+        addr_serv_post (Type &o)
+        {
+
+          this->addr_serv_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        addr_serv_post (Type const&);
+
+        virtual void 
+        udp_sender_pre (Type &o)
+        {
+
+          this->udp_sender_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_sender_pre (Type const&);
+
+        virtual void 
+        udp_sender_next (Type &o)
+        {
+
+          this->udp_sender_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_sender_next (Type const&);
+
+        virtual void 
+        udp_sender_post (Type &o)
+        {
+
+          this->udp_sender_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_sender_post (Type const&);
+
+        virtual void 
+        udp_receiver_pre (Type &o)
+        {
+
+          this->udp_receiver_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_receiver_pre (Type const&);
+
+        virtual void 
+        udp_receiver_next (Type &o)
+        {
+
+          this->udp_receiver_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_receiver_next (Type const&);
+
+        virtual void 
+        udp_receiver_post (Type &o)
+        {
+
+          this->udp_receiver_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        udp_receiver_post (Type const&);
+
+        virtual void 
+        id (Type &o)
+        {
+
+          this->id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        id (Type const&);
+
+        protected:
+        EventServiceDescription ();
+      };
+
+      struct FilterType : Traversal::FilterType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        FilterType (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        traverse (Type const&);
+
+        protected:
+        FilterType ();
+      };
+
+      struct Filter : Traversal::Filter, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Filter Type;
+        Filter (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        type (Type &o)
+        {
+
+          this->type (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        type (Type const&);
+
+        virtual void 
+        source_pre (Type &o)
+        {
+
+          this->source_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        source_pre (Type const&);
+
+        virtual void 
+        source_next (Type &o)
+        {
+
+          this->source_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        source_next (Type const&);
+
+        virtual void 
+        source_post (Type &o)
+        {
+
+          this->source_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        source_post (Type const&);
+
+        virtual void 
+        id (Type &o)
+        {
+
+          this->id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        id (Type const&);
+
+        protected:
+        Filter ();
+      };
+
+      struct AddressServerDescription : Traversal::AddressServerDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::AddressServerDescription Type;
+        AddressServerDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        port (Type &o)
+        {
+
+          this->port (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        port (Type const&);
+
+        virtual void 
+        address (Type &o)
+        {
+
+          this->address (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        address (Type const&);
+
+        protected:
+        AddressServerDescription ();
+      };
+
+      struct UDPSenderDescription : Traversal::UDPSenderDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::UDPSenderDescription Type;
+        UDPSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        addr_serv_id (Type &o)
+        {
+
+          this->addr_serv_id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        addr_serv_id (Type const&);
+
+        protected:
+        UDPSenderDescription ();
+      };
+
+      struct UDPReceiverDescription : Traversal::UDPReceiverDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::UDPReceiverDescription Type;
+        UDPReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        addr_serv_id (Type &o)
+        {
+
+          this->addr_serv_id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        addr_serv_id (Type const&);
+
+        virtual void 
+        is_multicast (Type &o)
+        {
+
+          this->is_multicast (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        is_multicast (Type const&);
+
+        virtual void 
+        listen_port (Type &o)
+        {
+
+          this->listen_port (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        listen_port (Type const&);
+
+        protected:
+        UDPReceiverDescription ();
+      };
+    }
+  }
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    CIAO_Events_Handlers_Export
+    void
+    CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const&, xercesc::DOMDocument*);
+  }
+}
+
 #endif // CIAOEVENTS_HPP
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
index fd7cb12a464..e95c0656506 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
@@ -2,7 +2,7 @@
 #include "Utils/XML_Helper.h"
 #include "CIAOEvents_Handler.h"
 #include "CIAOEvents.hpp"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
index 7a27aa76a64..f45ff89afb4 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
@@ -14,9 +14,9 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 #include "CIAO_Events_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
index 395b76fd09e..b25f0cb1d97 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
@@ -1,11 +1,30 @@
 //$Id$
 
-project (CIAO_Events_Handlers) : acelib, ciao_xml_utils, ciao_events_dnc, ciao_deployment_stub {
+project (CIAO_Events_XML_Generation) : xscdefaults {
+   requires += xsc
+
+   xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
+   xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
+   xscflags += --cxx-export-symbol CIAO_Events_Handlers_Export
+   xscflags += --cxx-namespace-regex  <%quote%>%.*vanderbilt.*%CIAO/Config_Handlers%<%quote%>
+   xscflags += --cxx-export-header CIAO_Events_Handlers_Export.h
+   xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
+   
+   custom_only = 1
+
+   XSC_Files {
+        gendir = .
+        $(CIAO_ROOT)/docs/schema/CIAOEvents.xsd
+   }
+}
+
+project (CIAO_Events_Handlers) : acelib, ciao_config_handlers_base, ciao_events_dnc, ciao_deployment_stub {
   sharedname = CIAO_Events_Handlers
   dynamicflags   = CIAO_EVENTS_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
   includes += $(CIAO_ROOT)/tools/Config_Handlers
 
+  after += CIAO_Events_XML_Generation 
   Source_Files {
     CIAOEvents.cpp
     CIAOEvents_Handler.cpp
@@ -15,7 +34,7 @@ project (CIAO_Events_Handlers) : acelib, ciao_xml_utils, ciao_events_dnc, ciao_d
   }
 }
 
-project (CIAO_Events_Handlers_Tests) : ciao_xml_utils, ciao_server_dnc {
+project (CIAO_Events_Handlers_Tests) : ciao_config_handlers_base, ciao_server_dnc {
   exename = test
   after    += CIAO_Events_Handlers
   macros   += XML_USE_PTHREADS
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
index 63c024a0a89..d4f92a9a990 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
@@ -4,7 +4,7 @@
 
 #include "CIAOEvents.hpp"
 #include "CIAOEvents_Handler.h"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 
 #include "ace/Get_Opt.h"
 #include "tao/ORB.h"
diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index 0b7b54d1adf..97a9e50ae23 100644
--- a/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index 03da34467eb..87d1b6511e5 100644
--- a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "CRDD_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 
 #include "ciao/CIAO_common.h"
diff --git a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index e7f9fa0266d..d916bf8076f 100644
--- a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index be3a4f289aa..0363001958f 100644
--- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,18 +1,49 @@
 //$Id$
 
+project (XSC_XML_Generation) : xscdefaults {
+   requires += xsc
+
+   xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
+   xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
+   xscflags += --cxx-export-symbol XSC_XML_Handlers_Export
+   xscflags += --cxx-namespace-regex  <%quote%>%.*Deployment.*%CIAO/Config_Handlers%<%quote%>
+   xscflags += --cxx-export-header XSC_XML_Handlers_Export.h
+   xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
+   
+   custom_only = 1
+
+   XSC_Files {
+        gendir = .
+        $(CIAO_ROOT)/docs/schema/Basic_Deployment_Data.xsd
+        $(CIAO_ROOT)/docs/schema/Deployment.xsd
+        $(CIAO_ROOT)/docs/schema/ccd.xsd
+        $(CIAO_ROOT)/docs/schema/cdd.xsd
+        $(CIAO_ROOT)/docs/schema/cdp.xsd
+        $(CIAO_ROOT)/docs/schema/cid.xsd
+        $(CIAO_ROOT)/docs/schema/cpd.xsd
+        $(CIAO_ROOT)/docs/schema/iad.xsd
+        $(CIAO_ROOT)/docs/schema/pcd.xsd
+        $(CIAO_ROOT)/docs/schema/toplevel.xsd
+   }
+
+   Source_Files {
+   }
+}
+
 project (XSC_XML_Handlers) : acelib, xerces {
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
   includes += $(CIAO_ROOT)/tools/Config_Handlers
+  after += XSC_XML_Generation
 
   Source_Files {
+    Deployment.cpp
     ccd.cpp
     cdd.cpp
     cdp.cpp
     cid.cpp
     cpd.cpp
-    Deployment.cpp
     iad.cpp
     pcd.cpp
     toplevel.cpp
diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/tools/Config_Handlers/DD_Handler.cpp
index d6de22ee29e..18ed4013c8c 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 "DAnCE/Deployment/Deployment_TargetDataC.h"
 #include "CIAO_common.h"
 
 using namespace std;
diff --git a/CIAO/tools/Config_Handlers/DP_Handler.cpp b/CIAO/tools/Config_Handlers/DP_Handler.cpp
index ff26719d544..c5ff32d9c35 100644
--- a/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
 #include "ADD_Handler.h"
@@ -266,7 +266,7 @@ ACE_RCSID (Config_Handlers,
 
         // We are assuming there is a realizes for the moment
         // @@ We may want to change this at a later date by creating a sequence of
-        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../ciao/Deployment_Data.idl
+        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../DAnCE/Deployment/Deployment_Data.idl
         // @@ so we can check for length
         this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
         if (!this->xsc_dp_->realizes_p())
diff --git a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index 22512ec15a5..2be43fb3b5b 100644
--- a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -8,7 +8,7 @@
 #include "PCD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/DataType_Handler.h b/CIAO/tools/Config_Handlers/DataType_Handler.h
index 5991c949f3a..b2a3240fbec 100644
--- a/CIAO/tools/Config_Handlers/DataType_Handler.h
+++ b/CIAO/tools/Config_Handlers/DataType_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
 
 #include "Config_Handlers_Common_Export.h"
diff --git a/CIAO/tools/Config_Handlers/Deployment.cpp b/CIAO/tools/Config_Handlers/Deployment.cpp
index 3d4ddb419c0..20003d72205 100644
--- a/CIAO/tools/Config_Handlers/Deployment.cpp
+++ b/CIAO/tools/Config_Handlers/Deployment.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "Deployment.hpp"
 
 namespace CIAO
@@ -34,15 +40,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "domain")
-        {
-          ::CIAO::Config_Handlers::Domain r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::Domain r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::DeploymentPlan
@@ -50,15 +56,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "deploymentPlan")
-        {
-          ::CIAO::Config_Handlers::DeploymentPlan r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::DeploymentPlan r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::ImplementationArtifactDescription
@@ -66,15 +72,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "implementationArtifactDescription")
-        {
-          ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::ComponentInterfaceDescription
@@ -82,15 +88,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentInterfaceDescription")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::ComponentImplementationDescription
@@ -98,15 +104,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentImplementationDescription")
-        {
-          ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::ComponentPackageDescription
@@ -114,15 +120,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentPackageDescription")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::PackageConfiguration
@@ -130,15 +136,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "packageConfiguration")
-        {
-          ::CIAO::Config_Handlers::PackageConfiguration r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::PackageConfiguration r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
 
     ::CIAO::Config_Handlers::TopLevelPackageDescription
@@ -146,15 +152,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "topLevelPackageDescription")
-        {
-          ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
-          return r;
-        }
+      {
+        ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
+        return r;
+      }
 
       else
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
     }
   }
 }
@@ -201,39 +207,46 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "domain")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::Domain,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::Node,
-        virtual ::CIAO::Config_Handlers::Writer::Interconnect,
-        virtual ::CIAO::Config_Handlers::Writer::Bridge,
-        virtual ::CIAO::Config_Handlers::Writer::Resource,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::SharedResource,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::Node,
+      virtual ::CIAO::Config_Handlers::Writer::Interconnect,
+      virtual ::CIAO::Config_Handlers::Writer::Bridge,
+      virtual ::CIAO::Config_Handlers::Writer::Resource,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::SharedResource,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -247,51 +260,57 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "deploymentPlan")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::DeploymentPlan,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
-        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
-        virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-        virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-        virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+      virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+      virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -305,34 +324,41 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "implementationArtifactDescription")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -346,35 +372,42 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentInterfaceDescription")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -388,61 +421,67 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentImplementationDescription")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Capability,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+      virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Capability,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -456,61 +495,67 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentPackageDescription")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Capability,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Capability,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -524,61 +569,67 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "packageConfiguration")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Capability,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Capability,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -592,62 +643,68 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "topLevelPackageDescription")
-        {
-          throw 1;
-        }
+      {
+        throw 1;
+      }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::TopLevelPackageDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Property,
-        virtual ::CIAO::Config_Handlers::Writer::Any,
-        virtual ::CIAO::Config_Handlers::Writer::DataType,
-        virtual ::CIAO::Config_Handlers::Writer::TCKind,
-        virtual ::CIAO::Config_Handlers::Writer::EnumType,
-        virtual ::CIAO::Config_Handlers::Writer::DataValue,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Requirement,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-        virtual ::CIAO::Config_Handlers::Writer::Capability,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
+      virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Property,
+      virtual ::CIAO::Config_Handlers::Writer::Any,
+      virtual ::CIAO::Config_Handlers::Writer::DataType,
+      virtual ::CIAO::Config_Handlers::Writer::TCKind,
+      virtual ::CIAO::Config_Handlers::Writer::EnumType,
+      virtual ::CIAO::Config_Handlers::Writer::StructType,
+      virtual ::CIAO::Config_Handlers::Writer::StructMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueType,
+      virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
+      virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::DataValue,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NamedValue,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Requirement,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+      virtual ::CIAO::Config_Handlers::Writer::Capability,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
diff --git a/CIAO/tools/Config_Handlers/Deployment.hpp b/CIAO/tools/Config_Handlers/Deployment.hpp
index ca6cf839a75..d0477b78113 100644
--- a/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -9,17 +9,16 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
-
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef DEPLOYMENT_HPP
 #define DEPLOYMENT_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index be434b370a6..475b8894dab 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -1,7 +1,8 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
+#include "tao/SystemException.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include <iostream>
@@ -23,7 +24,7 @@ namespace Deployment
             ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n",
                         Dump_Obj::indent(), caption, i));
             ACE_DEBUG ((LM_DEBUG, "%s  %s: \n",
-                        Dump_Obj::indent(), str_seq[i]));
+                        Dump_Obj::indent(), str_seq[i].in ()));
           }
       }
   }
@@ -99,18 +100,22 @@ namespace Deployment
     dump ("name", node.name);
     dump ("label", node.label);
 
-#if (_MSC_VER > 1200)
+#if (_MSC_VER)
     dump_ref_seq<Deployment::Domain> (
                                       "sharedResourceRef",
-                                      node.sharedResourceRef, "Domain",
+                                      node.sharedResourceRef,
+                                      "Domain",
                                       &Domain::sharedResource);
+#endif
 
+#if (_MSC_VER)
     dump_ref_seq<Deployment::Domain> (
                                       "connectionRef",
                                       node.connectionRef,
                                       "Domain",
                                       &Domain::interconnect);
-#endif /* _MSC_VER */
+#endif
+
     dump_sequence ("resource",
                    node.resource);
 
@@ -123,20 +128,20 @@ namespace Deployment
     dump ("name", conn.name);
     dump ("label", conn.label);
 
-#if (_MSC_VER > 1200)
+#if (_MSC_VER)
     dump_ref_seq<Deployment::Domain> (
                                       "connectionRef",
                                       conn.connectionRef,
                                       "Domain",
                                       &Domain::bridge);
-
+#endif
+#if (_MSC_VER)
     dump_ref_seq<Deployment::Domain> (
                                       "connectRef",
                                       conn.connectRef,
                                       "Domain",
                                       &Domain::node);
-#endif /*_MSC_VER*/
-
+#endif
     dump_sequence ("resource",
                    conn.resource);
   }
@@ -148,14 +153,14 @@ namespace Deployment
     Dump_Obj dump_obj("Bridge");
     dump ("name", bridge.name);
     dump ("label", bridge.label);
-#if (_MSC_VER > 1200)
 
+#if (_MSC_VER)
     dump_ref_seq<Deployment::Domain> (
                                       "connectRef",
                                       bridge.connectRef,
                                       "Domain",
                                       &Domain::interconnect);
-#endif /*_MSC_VER*/
+#endif
 
     dump_sequence ("resource", bridge.resource);
   }
@@ -300,12 +305,12 @@ namespace Deployment
 
     dump ("name", mdd.name);
     dump ("source", mdd.source);
-#if (_MSC_VER > 1200)
 
+#if (_MSC_VER)
     dump_ref_seq<Deployment::DeploymentPlan> ("artifactRef", mdd.artifactRef,
                                               "DeploymentPlan",
                                               &DeploymentPlan::artifact);
-#endif /*_MSC_VER*/
+#endif
     dump_sequence ("execParameter", mdd.execParameter);
     dump_sequence ("deployRequirement", mdd.deployRequirement);
   }
@@ -347,12 +352,12 @@ namespace Deployment
     dump ("node", idd.node);
     dump ("source", idd.source);
 
-#if (_MSC_VER > 1200)
+#if (_MSC_VER)
     dump_ref<Deployment::DeploymentPlan> ("implementationRef",
                                           idd.implementationRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::implementation);
-#endif /*_MSC_VER*/
+#endif
     dump_sequence ("configProperty", idd.configProperty);
     dump_sequence ("deployedResource", idd.deployedResource);
     dump_sequence ("deployedSharedResource", idd.deployedSharedResource);
@@ -385,11 +390,11 @@ namespace Deployment
     case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
     default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind\n")); break;
     }
-#if (_MSC_VER > 1200)
+#if (_MSC_VER)
     dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::instance);
-#endif /*_MSC_VER*/
+#endif
   }
 
   // ExternalReferenceEndpoint
@@ -437,11 +442,11 @@ namespace Deployment
 
     dump ("propertyName", pspr.propertyName);
 
-#if (_MSC_VER > 1200)
+#if (_MSC_VER)
     dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspr.instanceRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::instance);
-#endif /*_MSC_VER*/
+#endif
   }
 
   // PlanPropertyMapping
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/tools/Config_Handlers/DnC_Dump.h
index ae8b587ff62..17fb49377de 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -12,8 +12,8 @@
 #define DNC_DUMP_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_TargetDataC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
+#include "DAnCE/Deployment/Deployment_TargetDataC.h"
 #include "Config_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/Dump_Obj.h b/CIAO/tools/Config_Handlers/Dump_Obj.h
index d8e90351ad1..bb5d0139ce8 100644
--- a/CIAO/tools/Config_Handlers/Dump_Obj.h
+++ b/CIAO/tools/Config_Handlers/Dump_Obj.h
@@ -12,7 +12,7 @@
 #define CIAO_DUMP_OBJ_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 7cc9a0de2b5..170d67aa9ad 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_dnc {
+project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_dnc, ciao_config_handlers_base {
   after += XSC_XML_Handlers
   libs += XSC_XML_Handlers
   dynamicflags += DYNANY_HANDLER_BUILD_DLL
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index 8773f7b9014..66eee609aad 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -33,7 +33,7 @@ namespace CIAO
            i != type.enum_ ().end_member ();
            ++i)
         {
-          members[index++] = i->c_str ();
+          members[index++] = CORBA::string_dup (i->c_str ());
         }
 
       // Grab pointer to the DynAny_Handler to use the orb and any factory.
diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index d64528cfdeb..17c9bd2b34e 100644
--- a/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/ESD_Handler.cpp b/CIAO/tools/Config_Handlers/ESD_Handler.cpp
index 1ae8a526842..4bb1134ae44 100644
--- a/CIAO/tools/Config_Handlers/ESD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ESD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ESD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 7c7c315f324..bb137ff7920 100644
--- a/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace CIAO
@@ -80,18 +80,16 @@ namespace CIAO
                          src.end_configProperty (),
                          Property_Functor (dest.configProperty));
 
-          if (src.deployedResource_p ())
-            {
-              dest.deployedResource.length (1);
-              IRDD_Handler::instance_resource_deployment_descr (src.deployedResource (),
-                                                                dest.deployedResource[0]);
-            }
+          dest.deployedResource.length (src.count_deployedResource ());
+          std::for_each (src.begin_deployedResource (),
+                         src.end_deployedResource (),
+                         IRDD_Functor (dest.deployedResource));
 
           if (src.deployedSharedResource_p ())
             {
               dest.deployedSharedResource.length (1);
-              IRDD_Handler::instance_resource_deployment_descr (src.deployedSharedResource (),
-                                                                dest.deployedSharedResource[0]);
+              IRDD_Handler::handle_irdd (src.deployedSharedResource (),
+					 dest.deployedSharedResource[0]);
             }
 
         }
@@ -134,9 +132,12 @@ namespace CIAO
                                                                  src.configProperty[j]));
         }
 
-      //Check if there is a deployedResource, if so store
-      if(src.deployedResource.length() != 0)
-        idd.deployedResource(IRDD_Handler::instance_resource_deployment_descr(src.deployedResource[0]));
+      // Get and store the deployedResource(s)
+      size_t dp_total = src.deployedResource.length ();
+      for (size_t k = 0; k < dp_total; k++)
+        {
+          idd.add_deployedResource (IRDD_Handler::instance_resource_deployment_descr (src.deployedResource[k]));
+        }
 
       //Check if there is a deployedSharedResource, if so store it
       if(src.deployedSharedResource.length() != 0)
diff --git a/CIAO/tools/Config_Handlers/ID_Handler.cpp b/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 5d3cad169a6..b2e888338e0 100644
--- a/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 34318ee8d4c..97443a495ba 100644
--- a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ciao/CIAO_common.h"
 
@@ -22,9 +22,8 @@ namespace CIAO
 
 
     void
-    IRDD_Handler::instance_resource_deployment_descr (
-                                                      const InstanceResourceDeploymentDescription& desc,
-                                                      Deployment::InstanceResourceDeploymentDescription& toconfig)
+    IRDD_Handler::handle_irdd (const InstanceResourceDeploymentDescription& desc,
+			       Deployment::InstanceResourceDeploymentDescription& toconfig)
       throw (Config_Error)
     {
       CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr");
diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.h b/CIAO/tools/Config_Handlers/IRDD_Handler.h
index df30ed2e87f..0b85306d2ce 100644
--- a/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -15,6 +15,7 @@
 #include "Common.h"
 #include "Config_Handlers_Export.h"
 #include "ace/config-lite.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,46 +25,48 @@
 
 namespace Deployment
 {
-struct InstanceResourceDeploymentDescription;
+  struct InstanceResourceDeploymentDescription;
+  class InstanceResourceDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-
-class InstanceResourceDeploymentDescription;
-
-
-/*
-* @class IRDD_Handler
-*
-* @brief Handler class for <InstanceResourceDeploymentDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC InstanceResourceDeploymentDescription objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL Any type.
-*
-*/
-class Config_Handlers_Export IRDD_Handler {
-public:
-IRDD_Handler (void);
-virtual ~IRDD_Handler (void);
-
-static void instance_resource_deployment_descr (
-const InstanceResourceDeploymentDescription& desc,
-Deployment::InstanceResourceDeploymentDescription& toconfig)
-throw (Config_Error);
-
-static InstanceResourceDeploymentDescription
-instance_resource_deployment_descr (
-const Deployment::InstanceResourceDeploymentDescription& src)
-throw (Config_Error);
-
-
-};
-}
+  namespace Config_Handlers
+    {
+
+      class InstanceResourceDeploymentDescription;
+
+
+      /*
+       * @class IRDD_Handler
+       *
+       * @brief Handler class for <InstanceResourceDeploymentDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC InstanceResourceDeploymentDescription objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL Any type.
+       *
+       */
+      class Config_Handlers_Export IRDD_Handler {
+      public:
+	IRDD_Handler (void);
+	virtual ~IRDD_Handler (void);
+
+	static void handle_irdd (const InstanceResourceDeploymentDescription& desc,
+							Deployment::InstanceResourceDeploymentDescription& toconfig)
+	  throw (Config_Error);
+
+	static InstanceResourceDeploymentDescription
+	  instance_resource_deployment_descr (const Deployment::InstanceResourceDeploymentDescription& src)
+	  throw (Config_Error);
+      };
+
+      typedef Sequence_Handler < InstanceResourceDeploymentDescription,
+				 ::Deployment::InstanceResourceDeploymentDescriptions,
+				 ::Deployment::InstanceResourceDeploymentDescription,
+				 IRDD_Handler::handle_irdd > IRDD_Functor;
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index c86d6dc1da1..b0c5f7cfe94 100644
--- a/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "MDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ADD_Handler.h"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
diff --git a/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 23b332d471e..071194d778a 100644
--- a/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "ERE_Handler.h"
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 24d55cecf36..0da66acefd4 100644
--- a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "PSPE_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index ec3bb20e539..8907ce0b0b1 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Package_Handlers/CAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cid.hpp"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Req_Handler.h"
 #include "CEPE_Handler.h"
 #include "ERE_Handler.h"
@@ -17,185 +17,180 @@ namespace CIAO
   {
     namespace Packaging
     {
-      namespace
+      struct Packaging_Handlers_Export SPE_Handler
       {
-        struct SPE_Handler
-        {
-          static void handle_spe (const SubcomponentPortEndpoint &desc,
-                               ::Deployment::SubcomponentPortEndpoint &toconfig)
-          {
-            CIAO_TRACE("SPE_Handler::get_spe");
-
-            toconfig.portName = desc.portName ().c_str ();
-
-            ACE_CString str (desc.instance ().id ().c_str ());
-            CORBA::ULong pos (0);
-
-            SID_Handler::IDREF.find_ref (str, pos);
-            toconfig.instanceRef = pos;
-          }
-
-          static SubcomponentPortEndpoint
-          get_spe (const ::Deployment::SubcomponentPortEndpoint &src)
-          {
-            CIAO_TRACE("SPE_Handler::get_spe - reverse");
-            ACE_CString str;
-            SID_Handler::IDREF.find_ref (src.instanceRef, str);
-
-            return SubcomponentPortEndpoint (src.portName.in (),
-                                             str.c_str ());
-          }
-        };
-
-        typedef Sequence_Handler < SubcomponentPortEndpoint,
-                                   ::Deployment::SubcomponentPortEndpoints,
-                                   ::Deployment::SubcomponentPortEndpoint,
-                                   SPE_Handler::handle_spe > SPE_Functor;
-
-        struct ACD_Handler
-        {
-          static void handle_acd (const AssemblyConnectionDescription &desc,
-                               ::Deployment::AssemblyConnectionDescription &toconfig)
-          {
-            CIAO_TRACE("ACD_Handler::get_acd");
-
-            toconfig.name = desc.name ().c_str ();
-
-            toconfig.deployRequirement.length (desc.count_deployRequirement ());
-            std::for_each (desc.begin_deployRequirement (),
-                           desc.end_deployRequirement (),
-                           Requirement_Functor (toconfig.deployRequirement));
-
-            toconfig.internalEndpoint.length (desc.count_internalEndpoint ());
-	    SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe,
-					 desc.begin_internalEndpoint (),
-					 toconfig.internalEndpoint);
-            std::for_each (desc.begin_internalEndpoint (),
-                           desc.end_internalEndpoint (),
-                           SPE_Functor (toconfig.internalEndpoint));
-
-            toconfig.externalEndpoint.length (desc.count_externalEndpoint ());
-            std::for_each (desc.begin_externalEndpoint (),
-                           desc.end_externalEndpoint (),
-                           CEPE_Functor (toconfig.externalEndpoint));
-
-            toconfig.externalReference.length (desc.count_externalReference ());
-            std::for_each (desc.begin_externalReference (),
-                           desc.end_externalReference (),
-                           ERE_Functor (toconfig.externalReference));
-
-          }
-
-          static AssemblyConnectionDescription
-          get_acd (const ::Deployment::AssemblyConnectionDescription &src)
-          {
-            CIAO_TRACE("ACD_Handler::get_acd - reverse");
-
-            AssemblyConnectionDescription retval (src.name.in ());
-
-            for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
-              retval.add_deployRequirement
-                (Req_Handler::get_requirement (src.deployRequirement[i]));
-
-            for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i)
-              retval.add_internalEndpoint
-                (SPE_Handler::get_spe (src.internalEndpoint[i]));
-
-            for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i)
-              retval.add_externalEndpoint
-                (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i]));
-
-            for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i)
-              retval.add_externalReference
-                (ERE_Handler::external_ref_endpoint (src.externalReference[i]));
-
-            return retval;
-          }
-        };
-
-        typedef Sequence_Handler < AssemblyConnectionDescription,
-                                   ::Deployment::AssemblyConnectionDescriptions,
-                                   ::Deployment::AssemblyConnectionDescription,
-                                   ACD_Handler::handle_acd > ACD_Functor;
-
-
-        struct SPR_Handler
-        {
-          static void handle_spr (const SubcomponentPropertyReference &desc,
-                               ::Deployment::SubcomponentPropertyReference &toconfig)
-          {
-            CIAO_TRACE("SPR_Handler::get_spr");
-
-            toconfig.propertyName = desc.propertyName ().c_str ();
-
-            ACE_CString str (desc.instance ().id ().c_str ());
-            CORBA::ULong pos (0);
-
-            SID_Handler::IDREF.find_ref (str, pos);
-            toconfig.instanceRef = pos;
-
-          }
-
-          static SubcomponentPropertyReference
-          get_spr (const ::Deployment::SubcomponentPropertyReference &src)
-          {
-            CIAO_TRACE("SPR_HAndler::get_spr - reverse");
-            ACE_CString str;
-            SID_Handler::IDREF.find_ref (src.instanceRef, str);
-
-            return SubcomponentPropertyReference (src.propertyName.in (),
-                                                  str.c_str ());
-          }
-
-        };
-
-        typedef Sequence_Handler < SubcomponentPropertyReference,
-                                   ::Deployment::SubcomponentPropertyReferences,
-                                   ::Deployment::SubcomponentPropertyReference,
-                                   SPR_Handler::handle_spr > SPR_Functor;
-
-        struct APM_Handler
-        {
-          static void handle_apm (const AssemblyPropertyMapping &desc,
-                               ::Deployment::AssemblyPropertyMapping &toconfig)
-          {
-            CIAO_TRACE("APM_Handler::get_apm");
-
-            toconfig.name = desc.name ().c_str ();
-            toconfig.externalName = desc.externalName ().c_str ();
-
-            toconfig.delegatesTo.length (desc.count_delegatesTo ());
-	    SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr,
-					 desc.begin_delegatesTo (),
-					 toconfig.delegatesTo);
-            std::for_each (desc.begin_delegatesTo (),
-                           desc.end_delegatesTo (),
-                           SPR_Functor (toconfig.delegatesTo));
-          }
-
-          static AssemblyPropertyMapping
-          get_apm (const ::Deployment::AssemblyPropertyMapping &src)
-          {
-            CIAO_TRACE("APM_Handler::get_apm - reverse");
+	static void handle_spe (const SubcomponentPortEndpoint &desc,
+				::Deployment::SubcomponentPortEndpoint &toconfig)
+	{
+	  CIAO_TRACE("SPE_Handler::get_spe");
+
+	  toconfig.portName = desc.portName ().c_str ();
+
+	  ACE_CString str (desc.instance ().id ().c_str ());
+	  CORBA::ULong pos (0);
+
+	  SID_Handler::IDREF.find_ref (str, pos);
+	  toconfig.instanceRef = pos;
+	}
+
+	static SubcomponentPortEndpoint
+	get_spe (const ::Deployment::SubcomponentPortEndpoint &src)
+	{
+	  CIAO_TRACE("SPE_Handler::get_spe - reverse");
+	  ACE_CString str;
+	  SID_Handler::IDREF.find_ref (src.instanceRef, str);
+
+	  return SubcomponentPortEndpoint (src.portName.in (),
+					   str.c_str ());
+	}
+      };
+
+      typedef Sequence_Handler < SubcomponentPortEndpoint,
+				 ::Deployment::SubcomponentPortEndpoints,
+				 ::Deployment::SubcomponentPortEndpoint,
+				 SPE_Handler::handle_spe > SPE_Functor;
+
+      struct Packaging_Handlers_Export ACD_Handler
+      {
+	static void handle_acd (const AssemblyConnectionDescription &desc,
+				::Deployment::AssemblyConnectionDescription &toconfig)
+	{
+	  CIAO_TRACE("ACD_Handler::get_acd");
 
-            AssemblyPropertyMapping retval (src.name.in (),
-                                            src.externalName.in ());
-
-            for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i)
-              retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i]));
+	  toconfig.name = desc.name ().c_str ();
 
-            return retval;
-          }
-        };
-
-        typedef Sequence_Handler < AssemblyPropertyMapping,
-                                   ::Deployment::AssemblyPropertyMappings,
-                                   ::Deployment::AssemblyPropertyMapping,
-                                   APM_Handler::handle_apm > APM_Functor;
-      }
+	  toconfig.deployRequirement.length (desc.count_deployRequirement ());
+	  std::for_each (desc.begin_deployRequirement (),
+			 desc.end_deployRequirement (),
+			 Requirement_Functor (toconfig.deployRequirement));
+
+	  toconfig.internalEndpoint.length (desc.count_internalEndpoint ());
+	  SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe,
+				       desc.begin_internalEndpoint (),
+				       toconfig.internalEndpoint);
+	  std::for_each (desc.begin_internalEndpoint (),
+			 desc.end_internalEndpoint (),
+			 SPE_Functor (toconfig.internalEndpoint));
+
+	  toconfig.externalEndpoint.length (desc.count_externalEndpoint ());
+	  std::for_each (desc.begin_externalEndpoint (),
+			 desc.end_externalEndpoint (),
+			 CEPE_Functor (toconfig.externalEndpoint));
+
+	  toconfig.externalReference.length (desc.count_externalReference ());
+	  std::for_each (desc.begin_externalReference (),
+			 desc.end_externalReference (),
+			 ERE_Functor (toconfig.externalReference));
+
+	}
+
+	static AssemblyConnectionDescription
+	get_acd (const ::Deployment::AssemblyConnectionDescription &src)
+	{
+	  CIAO_TRACE("ACD_Handler::get_acd - reverse");
+
+	  AssemblyConnectionDescription retval (src.name.in ());
+
+	  for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+	    retval.add_deployRequirement
+	      (Req_Handler::get_requirement (src.deployRequirement[i]));
+
+	  for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i)
+	    retval.add_internalEndpoint
+	      (SPE_Handler::get_spe (src.internalEndpoint[i]));
+
+	  for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i)
+	    retval.add_externalEndpoint
+	      (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i]));
+
+	  for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i)
+	    retval.add_externalReference
+	      (ERE_Handler::external_ref_endpoint (src.externalReference[i]));
+
+	  return retval;
+	}
+      };
 
+      typedef Sequence_Handler < AssemblyConnectionDescription,
+				 ::Deployment::AssemblyConnectionDescriptions,
+				 ::Deployment::AssemblyConnectionDescription,
+				 ACD_Handler::handle_acd > ACD_Functor;
 
 
+      struct Packaging_Handlers_Export SPR_Handler
+      {
+	static void handle_spr (const SubcomponentPropertyReference &desc,
+				::Deployment::SubcomponentPropertyReference &toconfig)
+	{
+	  CIAO_TRACE("SPR_Handler::get_spr");
+
+	  toconfig.propertyName = desc.propertyName ().c_str ();
+
+	  ACE_CString str (desc.instance ().id ().c_str ());
+	  CORBA::ULong pos (0);
+
+	  SID_Handler::IDREF.find_ref (str, pos);
+	  toconfig.instanceRef = pos;
+
+	}
+
+	static SubcomponentPropertyReference
+	get_spr (const ::Deployment::SubcomponentPropertyReference &src)
+	{
+	  CIAO_TRACE("SPR_HAndler::get_spr - reverse");
+	  ACE_CString str;
+	  SID_Handler::IDREF.find_ref (src.instanceRef, str);
+
+	  return SubcomponentPropertyReference (src.propertyName.in (),
+						str.c_str ());
+	}
+
+      };
+
+      typedef Sequence_Handler < SubcomponentPropertyReference,
+				 ::Deployment::SubcomponentPropertyReferences,
+				 ::Deployment::SubcomponentPropertyReference,
+				 SPR_Handler::handle_spr > SPR_Functor;
+
+      struct Packaging_Handlers_Export APM_Handler
+      {
+	static void handle_apm (const AssemblyPropertyMapping &desc,
+				::Deployment::AssemblyPropertyMapping &toconfig)
+	{
+	  CIAO_TRACE("APM_Handler::get_apm");
+
+	  toconfig.name = desc.name ().c_str ();
+	  toconfig.externalName = desc.externalName ().c_str ();
+
+	  toconfig.delegatesTo.length (desc.count_delegatesTo ());
+	  SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr,
+				       desc.begin_delegatesTo (),
+				       toconfig.delegatesTo);
+	  std::for_each (desc.begin_delegatesTo (),
+			 desc.end_delegatesTo (),
+			 SPR_Functor (toconfig.delegatesTo));
+	}
+
+	static AssemblyPropertyMapping
+	get_apm (const ::Deployment::AssemblyPropertyMapping &src)
+	{
+	  CIAO_TRACE("APM_Handler::get_apm - reverse");
+
+	  AssemblyPropertyMapping retval (src.name.in (),
+					  src.externalName.in ());
+
+	  for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i)
+	    retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i]));
+
+	  return retval;
+	}
+      };
+
+      typedef Sequence_Handler < AssemblyPropertyMapping,
+				 ::Deployment::AssemblyPropertyMappings,
+				 ::Deployment::AssemblyPropertyMapping,
+				 APM_Handler::handle_apm > APM_Functor;
+
       void
       CAD_Handler::component_assem_descr (const ComponentAssemblyDescription &desc,
                                           ::Deployment::ComponentAssemblyDescription &toconfig)
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
index b4c0b790fc0..139c24936ce 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index d5e39d485da..78d865eb366 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -10,7 +10,7 @@
 #include "Req_Handler.h"
 
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Utils/Exceptions.h"
 
@@ -54,7 +54,7 @@ namespace CIAO
 	  Capability retval (src.name.in ());
 
 	  for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i)
-	    retval.add_resourceType (src.resourceType[i]);
+      retval.add_resourceType (src.resourceType[i].in ());
 
 	  for (CORBA::ULong i = 0; i < src.property.length (); ++i)
 	    retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i]));
@@ -167,12 +167,12 @@ namespace CIAO
 	  return retval;
 	}
       };
-      
+
       typedef Sequence_Handler < ImplementationRequirement,
 				 ::Deployment::ImplementationRequirements,
 				 ::Deployment::ImplementationRequirement,
 				 IR_Handler::handle_ir > IR_Functor;
-      
+
       struct MID_Handler
       {
 	static void handle_mid (const MonolithicImplementationDescription &desc,
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index a45c92e8465..b857c893bf8 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 "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/Exceptions.h"
 #include "Property_Handler.h"
@@ -15,38 +15,36 @@ namespace CIAO
   {
     namespace Packaging
     {
-      namespace
+      struct Packaging_Handlers_Export PCI_Handler
       {
-        struct PCI_Handler
-        {
-          static void handle_pci (const PackagedComponentImplementation &desc,
-                               ::Deployment::PackagedComponentImplementation &toconfig)
-          {
-            CIAO_TRACE ("PCI_Handler::get_pci");
-            toconfig.name = desc.name ().c_str ();
-
-            CID_Handler::component_impl_descr (desc.referencedImplementation (),
-                                               toconfig.referencedImplementation);
-          }
-
-          static PackagedComponentImplementation
-          get_pci (const ::Deployment::PackagedComponentImplementation &src)
-          {
-            CIAO_TRACE ("PCI_Handler::get_pci - reverse");
-            return PackagedComponentImplementation (src.name.in (),
-               CID_Handler::component_impl_descr (src.referencedImplementation));
-          }
-        };
-
-        typedef Sequence_Handler < PackagedComponentImplementation,
-                                   ::Deployment::PackagedComponentImplementations,
-                                   ::Deployment::PackagedComponentImplementation,
-                                   PCI_Handler::handle_pci > PCI_Functor;
-      }
+	static void handle_pci (const PackagedComponentImplementation &desc,
+				::Deployment::PackagedComponentImplementation &toconfig)
+	{
+	  CIAO_TRACE ("PCI_Handler::get_pci");
+	  toconfig.name = desc.name ().c_str ();
+
+	  CID_Handler::component_impl_descr (desc.referencedImplementation (),
+					     toconfig.referencedImplementation);
+	}
+
+	static PackagedComponentImplementation
+	get_pci (const ::Deployment::PackagedComponentImplementation &src)
+	{
+	  CIAO_TRACE ("PCI_Handler::get_pci - reverse");
+	  return PackagedComponentImplementation (src.name.in (),
+						  CID_Handler::component_impl_descr (src.referencedImplementation));
+	}
+      };
+
+      typedef Sequence_Handler < PackagedComponentImplementation,
+				 ::Deployment::PackagedComponentImplementations,
+				 ::Deployment::PackagedComponentImplementation,
+				 PCI_Handler::handle_pci > PCI_Functor;
+     
 
       void
       CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc,
-                                            ::Deployment::ComponentPackageDescription &toconfig)
+						   ::Deployment::ComponentPackageDescription &toconfig)
       {
         CIAO_TRACE ("CPD_Handler::component_package_descr");
 
@@ -117,19 +115,19 @@ namespace CIAO
         for (size_t i = 0; i < src.configProperty.length (); ++i)
           {
             toconfig.add_configProperty (
-              Property_Handler::get_property (src.configProperty[i]));
+					 Property_Handler::get_property (src.configProperty[i]));
           }
 
         { // Packaged Component Implementations
           for (size_t i = 0; i < src.implementation.length (); ++i)
             toconfig.add_implementation (
-              PCI_Handler::get_pci (src.implementation[i]));
+					 PCI_Handler::get_pci (src.implementation[i]));
         }
 
         for (size_t i = 0; i < src.infoProperty.length (); ++i)
           {
             toconfig.add_infoProperty (
-              Property_Handler::get_property (src.infoProperty[i]));
+				       Property_Handler::get_property (src.infoProperty[i]));
           }
 
         return toconfig;
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index 801519dc987..f13260480ad 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -43,7 +43,7 @@ namespace CIAO
                                    ::Deployment::ComponentPropertyDescriptions,
                                    ::Deployment::ComponentPropertyDescription,
                                    Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor;
-     
+
 
       void
       Comp_Intf_Descr_Handler::comp_intf_descr (
@@ -120,10 +120,10 @@ namespace CIAO
         retval.specificType (src.specificType.in ());
 
         for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
-          retval.add_supportedType (src.supportedType[i]);
+          retval.add_supportedType (src.supportedType[i].in ());
 
         for (CORBA::ULong i = 0; i < src.idlFile.length (); ++i)
-          retval.add_idlFile (src.idlFile[i]);
+          retval.add_idlFile (src.idlFile[i].in ());
 
         for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
           retval.add_configProperty (
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
index e4eb2b0af58..02f07fbb438 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index 61c85827472..97aa436df82 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -81,7 +81,7 @@ namespace CIAO
         retval.UUID (src.UUID.in ());
 
         for (CORBA::ULong i = 0; i < src.location.length (); ++i)
-          retval.add_location (src.location[i]);
+          retval.add_location (src.location[i].in ());
 
         for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i)
           retval.add_dependsOn (NIA_Handler::get_nia (src.dependsOn[i]));
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index 2c4db4eddf2..2f3f2845343 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 "DAnCE/Deployment/Deployment_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..d596adc6108 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 "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Utils/XercesString.h"
 #include "Utils/Exceptions.h"
@@ -37,14 +37,12 @@ namespace CIAO
 
         if (root == XStr ("Deployment:topLevelPackageDescription"))
           {
-	    PackageConfiguration foo;
-	    TopLevelPackageDescription tpd (foo);
+            TopLevelPackageDescription tpd;
+	    
+	    tpd = topLevelPackageDescription (dom);
 
-            tpd = topLevelPackageDescription (dom);
-
-            PCD_Handler::package_config (tpd.package (),
+            PCD_Handler::package_config (*tpd.begin_basePackage (),
                                          toconfig);
-
           }
         else if (root == XStr ("Deployment:packageConfiguration"))
           {
@@ -75,10 +73,10 @@ namespace CIAO
 
         const PackageConfiguration *pcd;
 
-        if (desc.href_p ())
+        if (desc.contentLocation_p ())
           {
             // Take ownership of the resolved pcd
-            xsc_pcd.reset (PCD_Handler:: resolve_package_config (desc.href ().c_str ()));
+            xsc_pcd.reset (PCD_Handler:: resolve_package_config (desc.contentLocation ().c_str ()));
             pcd = xsc_pcd.get ();
           }
         else
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 34eadf9ea32..c89325ed467 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -2,7 +2,7 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "Package_Handlers/SID_Handler.h"
 #include "cid.hpp"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Req_Handler.h"
@@ -100,7 +100,7 @@ namespace CIAO
             ComponentPackageImport ci;
 
             for (CORBA::ULong i = 0; i < src.importedPackage[0].location.length (); ++i)
-              ci.add_location (src.importedPackage[0].location[i]);
+              ci.add_location (src.importedPackage[0].location[i].in ());
 
             retval.importedPackage (ci);
           }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
index 7ab76020dd9..6812dc20114 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 "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "SID_Handler.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
@@ -55,7 +55,7 @@ int main (int argc, char *argv[])
         return 1;
 
       // Initialize an ORB so Any will work
-      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
       ACE_UNUSED_ARG (orb);
 
 
diff --git a/CIAO/tools/Config_Handlers/Property_Handler.cpp b/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 41129007618..ef077426a16 100644
--- a/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/Property_Handler.h b/CIAO/tools/Config_Handlers/Property_Handler.h
index 1b0f2476bf8..6da0530f8a8 100644
--- a/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -53,9 +53,8 @@ namespace CIAO
 	  /// <CIAO::Config_Handlers::Property> to the CORBA IDL type
 	  /// <Deployment::Property>.
 	  static void handle_property (const Property& desc,
-				    ::Deployment::Property& toconfig);
-	  static Property get_property (
-					const ::Deployment::Property& src);
+				       ::Deployment::Property& toconfig);
+	  static Property get_property (const ::Deployment::Property& src);
 	};
 
 
diff --git a/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 374c0e4993f..28ddc5ec7cf 100644
--- a/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "RDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Any_Handler.h"
 #include "ciao/CIAO_common.h"
 #include "Property_Handler.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..9c1363ab420 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 "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "IDREF_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index af9d71cfbee..01f192d5201 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "CIAOServerResources.hpp"
 
 namespace CIAO
@@ -16,12 +22,12 @@ namespace CIAO
   namespace Config_Handlers
   {
     // ServerResourcesDef
-    //
+    // 
 
     ServerResourcesDef::
     ServerResourcesDef (::CIAO::Config_Handlers::ORBConfigs const& orbConfigs__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     orbConfigs_ (new ::CIAO::Config_Handlers::ORBConfigs (orbConfigs__)),
     regulator__ ()
     {
@@ -63,7 +69,7 @@ namespace CIAO
 
 
     // ServerResourcesDef
-    //
+    // 
     bool ServerResourcesDef::
     cmdline_p () const
     {
@@ -92,7 +98,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    //
+    // 
     bool ServerResourcesDef::
     svcconf_p () const
     {
@@ -121,7 +127,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    //
+    // 
     ::CIAO::Config_Handlers::ORBConfigs const& ServerResourcesDef::
     orbConfigs () const
     {
@@ -135,7 +141,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    //
+    // 
     bool ServerResourcesDef::
     id_p () const
     {
@@ -171,12 +177,12 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    //
+    // 
 
     ServerCmdlineOptions::
     ServerCmdlineOptions ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -205,7 +211,7 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    //
+    // 
     ServerCmdlineOptions::arg_iterator ServerCmdlineOptions::
     begin_arg ()
     {
@@ -244,12 +250,12 @@ namespace CIAO
 
 
     // ACESvcConf
-    //
+    // 
 
     ACESvcConf::
     ACESvcConf ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -275,7 +281,7 @@ namespace CIAO
 
 
     // ACESvcConf
-    //
+    // 
     bool ACESvcConf::
     uri_p () const
     {
@@ -305,12 +311,12 @@ namespace CIAO
 
 
     // ORBConfigs
-    //
+    // 
 
     ORBConfigs::
     ORBConfigs ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -344,7 +350,7 @@ namespace CIAO
 
 
     // ORBConfigs
-    //
+    // 
     bool ORBConfigs::
     resources_p () const
     {
@@ -373,7 +379,7 @@ namespace CIAO
     }
 
     // ORBConfigs
-    //
+    // 
     ORBConfigs::policySet_iterator ORBConfigs::
     begin_policySet ()
     {
@@ -412,12 +418,12 @@ namespace CIAO
 
 
     // ORBResources
-    //
+    // 
 
     ORBResources::
     ORBResources ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -464,7 +470,7 @@ namespace CIAO
 
 
     // ORBResources
-    //
+    // 
     ORBResources::threadpool_iterator ORBResources::
     begin_threadpool ()
     {
@@ -502,7 +508,7 @@ namespace CIAO
     }
 
     // ORBResources
-    //
+    // 
     ORBResources::threadpoolWithLanes_iterator ORBResources::
     begin_threadpoolWithLanes ()
     {
@@ -540,7 +546,7 @@ namespace CIAO
     }
 
     // ORBResources
-    //
+    // 
     ORBResources::connectionBands_iterator ORBResources::
     begin_connectionBands ()
     {
@@ -578,52 +584,23 @@ namespace CIAO
     }
 
 
-    // Priority
-    //
-
-    Priority::
-    Priority (::XMLSchema::int_ const& b__)
-    :
-    Base__ (b__),
-    regulator__ ()
-    {
-    }
-
-    Priority::
-    Priority (::CIAO::Config_Handlers::Priority const& s)
-    :
-    Base__ (s),
-    regulator__ ()
-    {
-    }
-
-    ::CIAO::Config_Handlers::Priority& Priority::
-    operator= (::CIAO::Config_Handlers::Priority const& s)
-    {
-      static_cast< Base__& > (*this) = static_cast< Base__ const& > (s);
-
-      return *this;
-    }
-
-
-
     // ThreadpoolDef
-    //
+    // 
 
     ThreadpoolDef::
     ThreadpoolDef (::XMLSchema::unsignedLong const& stacksize__,
                    ::XMLSchema::unsignedLong const& static_threads__,
                    ::XMLSchema::unsignedLong const& dynamic_threads__,
-                   ::CIAO::Config_Handlers::Priority const& default_priority__,
+                   ::XMLSchema::int_ const& default_priority__,
                    ::XMLSchema::boolean const& allow_request_buffering__,
                    ::XMLSchema::unsignedLong const& max_buffered_requests__,
                    ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (dynamic_threads__)),
-    default_priority_ (new ::CIAO::Config_Handlers::Priority (default_priority__)),
+    default_priority_ (new ::XMLSchema::int_ (default_priority__)),
     allow_request_buffering_ (new ::XMLSchema::boolean (allow_request_buffering__)),
     max_buffered_requests_ (new ::XMLSchema::unsignedLong (max_buffered_requests__)),
     max_request_buffered_size_ (new ::XMLSchema::unsignedLong (max_request_buffered_size__)),
@@ -645,7 +622,7 @@ namespace CIAO
     stacksize_ (new ::XMLSchema::unsignedLong (*s.stacksize_)),
     static_threads_ (new ::XMLSchema::unsignedLong (*s.static_threads_)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (*s.dynamic_threads_)),
-    default_priority_ (new ::CIAO::Config_Handlers::Priority (*s.default_priority_)),
+    default_priority_ (new ::XMLSchema::int_ (*s.default_priority_)),
     allow_request_buffering_ (new ::XMLSchema::boolean (*s.allow_request_buffering_)),
     max_buffered_requests_ (new ::XMLSchema::unsignedLong (*s.max_buffered_requests_)),
     max_request_buffered_size_ (new ::XMLSchema::unsignedLong (*s.max_request_buffered_size_)),
@@ -687,7 +664,7 @@ namespace CIAO
 
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     stacksize () const
     {
@@ -701,7 +678,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     static_threads () const
     {
@@ -715,7 +692,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     dynamic_threads () const
     {
@@ -729,21 +706,21 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
-    ::CIAO::Config_Handlers::Priority const& ThreadpoolDef::
+    // 
+    ::XMLSchema::int_ const& ThreadpoolDef::
     default_priority () const
     {
       return *default_priority_;
     }
 
     void ThreadpoolDef::
-    default_priority (::CIAO::Config_Handlers::Priority const& e)
+    default_priority (::XMLSchema::int_ const& e)
     {
       *default_priority_ = e;
     }
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::boolean const& ThreadpoolDef::
     allow_request_buffering () const
     {
@@ -757,7 +734,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_buffered_requests () const
     {
@@ -771,7 +748,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_request_buffered_size () const
     {
@@ -785,7 +762,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    //
+    // 
     bool ThreadpoolDef::
     id_p () const
     {
@@ -821,7 +798,7 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    //
+    // 
 
     ThreadpoolWithLanesDef::
     ThreadpoolWithLanesDef (::XMLSchema::unsignedLong const& stacksize__,
@@ -829,8 +806,8 @@ namespace CIAO
                             ::XMLSchema::boolean const& allow_request_buffering__,
                             ::XMLSchema::unsignedLong const& max_buffered_requests__,
                             ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     allow_borrowing_ (new ::XMLSchema::boolean (allow_borrowing__)),
     allow_request_buffering_ (new ::XMLSchema::boolean (allow_request_buffering__)),
@@ -895,7 +872,7 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ThreadpoolWithLanesDef::threadpoolLane_iterator ThreadpoolWithLanesDef::
     begin_threadpoolLane ()
     {
@@ -933,7 +910,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     stacksize () const
     {
@@ -947,7 +924,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_borrowing () const
     {
@@ -961,7 +938,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_request_buffering () const
     {
@@ -975,7 +952,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_buffered_requests () const
     {
@@ -989,7 +966,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_request_buffered_size () const
     {
@@ -1003,7 +980,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    //
+    // 
     bool ThreadpoolWithLanesDef::
     id_p () const
     {
@@ -1039,17 +1016,17 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    //
+    // 
 
     ThreadpoolLaneDef::
     ThreadpoolLaneDef (::XMLSchema::unsignedLong const& static_threads__,
                        ::XMLSchema::unsignedLong const& dynamic_threads__,
-                       ::CIAO::Config_Handlers::Priority const& priority__)
-    :
-    ::XSCRT::Type (),
+                       ::XMLSchema::int_ const& priority__)
+    : 
+    ::XSCRT::Type (), 
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (dynamic_threads__)),
-    priority_ (new ::CIAO::Config_Handlers::Priority (priority__)),
+    priority_ (new ::XMLSchema::int_ (priority__)),
     regulator__ ()
     {
       static_threads_->container (this);
@@ -1063,7 +1040,7 @@ namespace CIAO
     ::XSCRT::Type (),
     static_threads_ (new ::XMLSchema::unsignedLong (*s.static_threads_)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (*s.dynamic_threads_)),
-    priority_ (new ::CIAO::Config_Handlers::Priority (*s.priority_)),
+    priority_ (new ::XMLSchema::int_ (*s.priority_)),
     regulator__ ()
     {
       static_threads_->container (this);
@@ -1085,7 +1062,7 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     static_threads () const
     {
@@ -1099,7 +1076,7 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    //
+    // 
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     dynamic_threads () const
     {
@@ -1113,27 +1090,27 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    //
-    ::CIAO::Config_Handlers::Priority const& ThreadpoolLaneDef::
+    // 
+    ::XMLSchema::int_ const& ThreadpoolLaneDef::
     priority () const
     {
       return *priority_;
     }
 
     void ThreadpoolLaneDef::
-    priority (::CIAO::Config_Handlers::Priority const& e)
+    priority (::XMLSchema::int_ const& e)
     {
       *priority_ = e;
     }
 
 
     // ConnectionBandsDef
-    //
+    // 
 
     ConnectionBandsDef::
     ConnectionBandsDef ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -1168,7 +1145,7 @@ namespace CIAO
 
 
     // ConnectionBandsDef
-    //
+    // 
     ConnectionBandsDef::band_iterator ConnectionBandsDef::
     begin_band ()
     {
@@ -1206,7 +1183,7 @@ namespace CIAO
     }
 
     // ConnectionBandsDef
-    //
+    // 
     bool ConnectionBandsDef::
     id_p () const
     {
@@ -1242,13 +1219,13 @@ namespace CIAO
 
 
     // PriorityBandDef
-    //
+    // 
 
     PriorityBandDef::
     PriorityBandDef (::XMLSchema::int_ const& low__,
                      ::XMLSchema::int_ const& high__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     low_ (new ::XMLSchema::int_ (low__)),
     high_ (new ::XMLSchema::int_ (high__)),
     regulator__ ()
@@ -1281,7 +1258,7 @@ namespace CIAO
 
 
     // PriorityBandDef
-    //
+    // 
     ::XMLSchema::int_ const& PriorityBandDef::
     low () const
     {
@@ -1295,7 +1272,7 @@ namespace CIAO
     }
 
     // PriorityBandDef
-    //
+    // 
     ::XMLSchema::int_ const& PriorityBandDef::
     high () const
     {
@@ -1310,12 +1287,12 @@ namespace CIAO
 
 
     // PolicySet
-    //
+    // 
 
     PolicySet::
     PolicySet ()
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     regulator__ ()
     {
     }
@@ -1332,6 +1309,14 @@ namespace CIAO
       }
 
       {
+        for (nwpriorityModel_const_iterator i (s.nwpriorityModel_.begin ());i != s.nwpriorityModel_.end ();++i) add_nwpriorityModel (*i);
+      }
+
+      {
+        for (cnwpriorityModel_const_iterator i (s.cnwpriorityModel_.begin ());i != s.cnwpriorityModel_.end ();++i) add_cnwpriorityModel (*i);
+      }
+
+      {
         for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
       }
 
@@ -1350,6 +1335,16 @@ namespace CIAO
         for (priorityModel_const_iterator i (s.priorityModel_.begin ());i != s.priorityModel_.end ();++i) add_priorityModel (*i);
       }
 
+      nwpriorityModel_.clear ();
+      {
+        for (nwpriorityModel_const_iterator i (s.nwpriorityModel_.begin ());i != s.nwpriorityModel_.end ();++i) add_nwpriorityModel (*i);
+      }
+
+      cnwpriorityModel_.clear ();
+      {
+        for (cnwpriorityModel_const_iterator i (s.cnwpriorityModel_.begin ());i != s.cnwpriorityModel_.end ();++i) add_cnwpriorityModel (*i);
+      }
+
       threadpool_.clear ();
       {
         for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
@@ -1368,7 +1363,7 @@ namespace CIAO
 
 
     // PolicySet
-    //
+    // 
     PolicySet::priorityModel_iterator PolicySet::
     begin_priorityModel ()
     {
@@ -1406,7 +1401,83 @@ namespace CIAO
     }
 
     // PolicySet
-    //
+    // 
+    PolicySet::nwpriorityModel_iterator PolicySet::
+    begin_nwpriorityModel ()
+    {
+      return nwpriorityModel_.begin ();
+    }
+
+    PolicySet::nwpriorityModel_iterator PolicySet::
+    end_nwpriorityModel ()
+    {
+      return nwpriorityModel_.end ();
+    }
+
+    PolicySet::nwpriorityModel_const_iterator PolicySet::
+    begin_nwpriorityModel () const
+    {
+      return nwpriorityModel_.begin ();
+    }
+
+    PolicySet::nwpriorityModel_const_iterator PolicySet::
+    end_nwpriorityModel () const
+    {
+      return nwpriorityModel_.end ();
+    }
+
+    void PolicySet::
+    add_nwpriorityModel (::CIAO::Config_Handlers::NWPriorityModelPolicyDef const& e)
+    {
+      nwpriorityModel_.push_back (e);
+    }
+
+    size_t PolicySet::
+    count_nwpriorityModel(void) const
+    {
+      return nwpriorityModel_.size ();
+    }
+
+    // PolicySet
+    // 
+    PolicySet::cnwpriorityModel_iterator PolicySet::
+    begin_cnwpriorityModel ()
+    {
+      return cnwpriorityModel_.begin ();
+    }
+
+    PolicySet::cnwpriorityModel_iterator PolicySet::
+    end_cnwpriorityModel ()
+    {
+      return cnwpriorityModel_.end ();
+    }
+
+    PolicySet::cnwpriorityModel_const_iterator PolicySet::
+    begin_cnwpriorityModel () const
+    {
+      return cnwpriorityModel_.begin ();
+    }
+
+    PolicySet::cnwpriorityModel_const_iterator PolicySet::
+    end_cnwpriorityModel () const
+    {
+      return cnwpriorityModel_.end ();
+    }
+
+    void PolicySet::
+    add_cnwpriorityModel (::CIAO::Config_Handlers::CNWPriorityModelPolicyDef const& e)
+    {
+      cnwpriorityModel_.push_back (e);
+    }
+
+    size_t PolicySet::
+    count_cnwpriorityModel(void) const
+    {
+      return cnwpriorityModel_.size ();
+    }
+
+    // PolicySet
+    // 
     PolicySet::threadpool_iterator PolicySet::
     begin_threadpool ()
     {
@@ -1444,7 +1515,7 @@ namespace CIAO
     }
 
     // PolicySet
-    //
+    // 
     PolicySet::priorityBandedConnection_iterator PolicySet::
     begin_priorityBandedConnection ()
     {
@@ -1482,7 +1553,7 @@ namespace CIAO
     }
 
     // PolicySet
-    //
+    // 
     bool PolicySet::
     id_p () const
     {
@@ -1518,7 +1589,7 @@ namespace CIAO
 
 
     // PriorityModel
-    //
+    // 
 
     PriorityModel::Value PriorityModel::
     integral () const
@@ -1544,13 +1615,40 @@ namespace CIAO
     {
     }
 
+    // NWPriorityModel
+    // 
+
+    NWPriorityModel::Value NWPriorityModel::
+    integral () const
+    {
+      return v_;
+    }
+
+    bool
+    operator== (::CIAO::Config_Handlers::NWPriorityModel const& a, ::CIAO::Config_Handlers::NWPriorityModel const& b)
+    {
+      return a.v_ == b.v_;
+    }
+
+    bool
+    operator!= (::CIAO::Config_Handlers::NWPriorityModel const& a, ::CIAO::Config_Handlers::NWPriorityModel const& b)
+    {
+      return a.v_ != b.v_;
+    }
+
+    NWPriorityModel::
+    NWPriorityModel (NWPriorityModel::Value v)
+    : v_ (v)
+    {
+    }
+
     // PriorityModelPolicyDef
-    //
+    // 
 
     PriorityModelPolicyDef::
     PriorityModelPolicyDef (::CIAO::Config_Handlers::PriorityModel const& priority_model__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     priority_model_ (new ::CIAO::Config_Handlers::PriorityModel (priority_model__)),
     regulator__ ()
     {
@@ -1562,7 +1660,7 @@ namespace CIAO
     :
     ::XSCRT::Type (),
     priority_model_ (new ::CIAO::Config_Handlers::PriorityModel (*s.priority_model_)),
-    server_priority_ (s.server_priority_.get () ? new ::CIAO::Config_Handlers::Priority (*s.server_priority_) : 0),
+    server_priority_ (s.server_priority_.get () ? new ::XMLSchema::int_ (*s.server_priority_) : 0),
     regulator__ ()
     {
       priority_model_->container (this);
@@ -1575,14 +1673,14 @@ namespace CIAO
       priority_model (s.priority_model ());
 
       if (s.server_priority_.get ()) server_priority (*(s.server_priority_));
-      else server_priority_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > (0);
+      else server_priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (0);
 
       return *this;
     }
 
 
     // PriorityModelPolicyDef
-    //
+    // 
     ::CIAO::Config_Handlers::PriorityModel const& PriorityModelPolicyDef::
     priority_model () const
     {
@@ -1596,27 +1694,27 @@ namespace CIAO
     }
 
     // PriorityModelPolicyDef
-    //
+    // 
     bool PriorityModelPolicyDef::
     server_priority_p () const
     {
       return server_priority_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Priority const& PriorityModelPolicyDef::
+    ::XMLSchema::int_ const& PriorityModelPolicyDef::
     server_priority () const
     {
       return *server_priority_;
     }
 
-    ::CIAO::Config_Handlers::Priority& PriorityModelPolicyDef::
+    ::XMLSchema::int_& PriorityModelPolicyDef::
     server_priority ()
     {
       return *server_priority_;
     }
 
     void PriorityModelPolicyDef::
-    server_priority (::CIAO::Config_Handlers::Priority const& e)
+    server_priority (::XMLSchema::int_ const& e)
     {
       if (server_priority_.get ())
       {
@@ -1625,10 +1723,167 @@ namespace CIAO
 
       else
       {
-        server_priority_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > (new ::CIAO::Config_Handlers::Priority (e));
+        server_priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
         server_priority_->container (this);
       }
     }
+
+
+    // NWPriorityModelPolicyDef
+    // 
+
+    NWPriorityModelPolicyDef::
+    NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model__,
+                              ::XMLSchema::long_ const& request_dscp__,
+                              ::XMLSchema::long_ const& reply_dscp__)
+    : 
+    ::XSCRT::Type (), 
+    nw_priority_model_ (new ::CIAO::Config_Handlers::NWPriorityModel (nw_priority_model__)),
+    request_dscp_ (new ::XMLSchema::long_ (request_dscp__)),
+    reply_dscp_ (new ::XMLSchema::long_ (reply_dscp__)),
+    regulator__ ()
+    {
+      nw_priority_model_->container (this);
+      request_dscp_->container (this);
+      reply_dscp_->container (this);
+    }
+
+    NWPriorityModelPolicyDef::
+    NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModelPolicyDef const& s)
+    :
+    ::XSCRT::Type (),
+    nw_priority_model_ (new ::CIAO::Config_Handlers::NWPriorityModel (*s.nw_priority_model_)),
+    request_dscp_ (new ::XMLSchema::long_ (*s.request_dscp_)),
+    reply_dscp_ (new ::XMLSchema::long_ (*s.reply_dscp_)),
+    regulator__ ()
+    {
+      nw_priority_model_->container (this);
+      request_dscp_->container (this);
+      reply_dscp_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::NWPriorityModelPolicyDef& NWPriorityModelPolicyDef::
+    operator= (::CIAO::Config_Handlers::NWPriorityModelPolicyDef const& s)
+    {
+      nw_priority_model (s.nw_priority_model ());
+
+      request_dscp (s.request_dscp ());
+
+      reply_dscp (s.reply_dscp ());
+
+      return *this;
+    }
+
+
+    // NWPriorityModelPolicyDef
+    // 
+    ::CIAO::Config_Handlers::NWPriorityModel const& NWPriorityModelPolicyDef::
+    nw_priority_model () const
+    {
+      return *nw_priority_model_;
+    }
+
+    void NWPriorityModelPolicyDef::
+    nw_priority_model (::CIAO::Config_Handlers::NWPriorityModel const& e)
+    {
+      *nw_priority_model_ = e;
+    }
+
+    // NWPriorityModelPolicyDef
+    // 
+    ::XMLSchema::long_ const& NWPriorityModelPolicyDef::
+    request_dscp () const
+    {
+      return *request_dscp_;
+    }
+
+    void NWPriorityModelPolicyDef::
+    request_dscp (::XMLSchema::long_ const& e)
+    {
+      *request_dscp_ = e;
+    }
+
+    // NWPriorityModelPolicyDef
+    // 
+    ::XMLSchema::long_ const& NWPriorityModelPolicyDef::
+    reply_dscp () const
+    {
+      return *reply_dscp_;
+    }
+
+    void NWPriorityModelPolicyDef::
+    reply_dscp (::XMLSchema::long_ const& e)
+    {
+      *reply_dscp_ = e;
+    }
+
+
+    // CNWPriorityModelPolicyDef
+    // 
+
+    CNWPriorityModelPolicyDef::
+    CNWPriorityModelPolicyDef (::XMLSchema::long_ const& request_dscp__,
+                               ::XMLSchema::long_ const& reply_dscp__)
+    : 
+    ::XSCRT::Type (), 
+    request_dscp_ (new ::XMLSchema::long_ (request_dscp__)),
+    reply_dscp_ (new ::XMLSchema::long_ (reply_dscp__)),
+    regulator__ ()
+    {
+      request_dscp_->container (this);
+      reply_dscp_->container (this);
+    }
+
+    CNWPriorityModelPolicyDef::
+    CNWPriorityModelPolicyDef (::CIAO::Config_Handlers::CNWPriorityModelPolicyDef const& s)
+    :
+    ::XSCRT::Type (),
+    request_dscp_ (new ::XMLSchema::long_ (*s.request_dscp_)),
+    reply_dscp_ (new ::XMLSchema::long_ (*s.reply_dscp_)),
+    regulator__ ()
+    {
+      request_dscp_->container (this);
+      reply_dscp_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef& CNWPriorityModelPolicyDef::
+    operator= (::CIAO::Config_Handlers::CNWPriorityModelPolicyDef const& s)
+    {
+      request_dscp (s.request_dscp ());
+
+      reply_dscp (s.reply_dscp ());
+
+      return *this;
+    }
+
+
+    // CNWPriorityModelPolicyDef
+    // 
+    ::XMLSchema::long_ const& CNWPriorityModelPolicyDef::
+    request_dscp () const
+    {
+      return *request_dscp_;
+    }
+
+    void CNWPriorityModelPolicyDef::
+    request_dscp (::XMLSchema::long_ const& e)
+    {
+      *request_dscp_ = e;
+    }
+
+    // CNWPriorityModelPolicyDef
+    // 
+    ::XMLSchema::long_ const& CNWPriorityModelPolicyDef::
+    reply_dscp () const
+    {
+      return *reply_dscp_;
+    }
+
+    void CNWPriorityModelPolicyDef::
+    reply_dscp (::XMLSchema::long_ const& e)
+    {
+      *reply_dscp_ = e;
+    }
   }
 }
 
@@ -1641,7 +1896,7 @@ namespace CIAO
 
     ServerResourcesDef::
     ServerResourcesDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1669,7 +1924,7 @@ namespace CIAO
           orbConfigs_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1684,7 +1939,7 @@ namespace CIAO
           id (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1695,7 +1950,7 @@ namespace CIAO
 
     ServerCmdlineOptions::
     ServerCmdlineOptions (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1711,7 +1966,7 @@ namespace CIAO
           add_arg (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1722,7 +1977,7 @@ namespace CIAO
 
     ACESvcConf::
     ACESvcConf (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1738,7 +1993,7 @@ namespace CIAO
           uri (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1749,7 +2004,7 @@ namespace CIAO
 
     ORBConfigs::
     ORBConfigs (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1771,7 +2026,7 @@ namespace CIAO
           add_policySet (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1782,7 +2037,7 @@ namespace CIAO
 
     ORBResources::
     ORBResources (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1810,35 +2065,18 @@ namespace CIAO
           add_connectionBands (t);
         }
 
-        else
+        else 
         {
         }
       }
     }
 
-    // Priority
-    //
-
-    Priority::
-    Priority (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
-    }
-
-    Priority::
-    Priority (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-    :
-    Base__ (a),
-    regulator__ ()
-    {
-    }
-
     // ThreadpoolDef
     //
 
     ThreadpoolDef::
     ThreadpoolDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1868,7 +2106,7 @@ namespace CIAO
 
         else if (n == "default_priority")
         {
-          default_priority_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > (new ::CIAO::Config_Handlers::Priority (e));
+          default_priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           default_priority_->container (this);
         }
 
@@ -1890,7 +2128,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1905,7 +2143,7 @@ namespace CIAO
           id (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1916,7 +2154,7 @@ namespace CIAO
 
     ThreadpoolWithLanesDef::
     ThreadpoolWithLanesDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -1962,7 +2200,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1977,7 +2215,7 @@ namespace CIAO
           id (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -1988,7 +2226,7 @@ namespace CIAO
 
     ThreadpoolLaneDef::
     ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -2012,11 +2250,11 @@ namespace CIAO
 
         else if (n == "priority")
         {
-          priority_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > (new ::CIAO::Config_Handlers::Priority (e));
+          priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           priority_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2027,7 +2265,7 @@ namespace CIAO
 
     ConnectionBandsDef::
     ConnectionBandsDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -2043,7 +2281,7 @@ namespace CIAO
           add_band (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2058,7 +2296,7 @@ namespace CIAO
           id (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2069,7 +2307,7 @@ namespace CIAO
 
     PriorityBandDef::
     PriorityBandDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -2091,7 +2329,7 @@ namespace CIAO
           high_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2102,7 +2340,7 @@ namespace CIAO
 
     PolicySet::
     PolicySet (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -2118,6 +2356,18 @@ namespace CIAO
           add_priorityModel (t);
         }
 
+        else if (n == "nwpriorityModel")
+        {
+          ::CIAO::Config_Handlers::NWPriorityModelPolicyDef t (e);
+          add_nwpriorityModel (t);
+        }
+
+        else if (n == "cnwpriorityModel")
+        {
+          ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef t (e);
+          add_cnwpriorityModel (t);
+        }
+
         else if (n == "threadpool")
         {
           ::XMLSchema::IDREF< ACE_TCHAR > t (e);
@@ -2130,7 +2380,7 @@ namespace CIAO
           add_priorityBandedConnection (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2145,7 +2395,7 @@ namespace CIAO
           id (t);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2162,7 +2412,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else
+      else 
       {
       }
     }
@@ -2175,7 +2425,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else
+      else 
       {
       }
     }
@@ -2183,12 +2433,44 @@ namespace CIAO
     PriorityModel const PriorityModel::SERVER_DECLARED (PriorityModel::SERVER_DECLARED_l);
     PriorityModel const PriorityModel::CLIENT_PROPAGATED (PriorityModel::CLIENT_PROPAGATED_l);
 
+    // NWPriorityModel
+    //
+
+    NWPriorityModel::
+    NWPriorityModel (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+      else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+      else 
+      {
+      }
+    }
+
+    NWPriorityModel::
+    NWPriorityModel (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+      else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+      else 
+      {
+      }
+    }
+
+    NWPriorityModel const NWPriorityModel::SERVER_DECLARED_NWPRIORITY (NWPriorityModel::SERVER_DECLARED_NWPRIORITY_l);
+    NWPriorityModel const NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY (NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY_l);
+
     // PriorityModelPolicyDef
     //
 
     PriorityModelPolicyDef::
     PriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
@@ -2204,7 +2486,7 @@ namespace CIAO
           priority_model_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2215,11 +2497,83 @@ namespace CIAO
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
         if (n == "server_priority")
         {
-          ::CIAO::Config_Handlers::Priority t (a);
+          ::XMLSchema::int_ t (a);
           server_priority (t);
         }
 
-        else
+        else 
+        {
+        }
+      }
+    }
+
+    // NWPriorityModelPolicyDef
+    //
+
+    NWPriorityModelPolicyDef::
+    NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "nw_priority_model")
+        {
+          nw_priority_model_ = ::std::auto_ptr< ::CIAO::Config_Handlers::NWPriorityModel > (new ::CIAO::Config_Handlers::NWPriorityModel (e));
+          nw_priority_model_->container (this);
+        }
+
+        else if (n == "request_dscp")
+        {
+          request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
+          request_dscp_->container (this);
+        }
+
+        else if (n == "reply_dscp")
+        {
+          reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
+          reply_dscp_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
+    // CNWPriorityModelPolicyDef
+    //
+
+    CNWPriorityModelPolicyDef::
+    CNWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "request_dscp")
+        {
+          request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
+          request_dscp_->container (this);
+        }
+
+        else if (n == "reply_dscp")
+        {
+          reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
+          reply_dscp_->container (this);
+        }
+
+        else 
         {
         }
       }
@@ -2329,20 +2683,6 @@ namespace CIAO
 
       ORBResourcesTypeInfoInitializer ORBResourcesTypeInfoInitializer_;
 
-      struct PriorityTypeInfoInitializer
-      {
-        PriorityTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Priority));
-          ::XSCRT::ExtendedTypeInfo nf (id);
-
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XMLSchema::int_));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
-
-      PriorityTypeInfoInitializer PriorityTypeInfoInitializer_;
-
       struct ThreadpoolDefTypeInfoInitializer
       {
         ThreadpoolDefTypeInfoInitializer ()
@@ -2442,6 +2782,21 @@ namespace CIAO
 
       PriorityModelTypeInfoInitializer PriorityModelTypeInfoInitializer_;
 
+      struct NWPriorityModelTypeInfoInitializer
+      {
+        NWPriorityModelTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (NWPriorityModel));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      NWPriorityModelTypeInfoInitializer NWPriorityModelTypeInfoInitializer_;
+
       struct PriorityModelPolicyDefTypeInfoInitializer
       {
         PriorityModelPolicyDefTypeInfoInitializer ()
@@ -2455,6 +2810,34 @@ namespace CIAO
       };
 
       PriorityModelPolicyDefTypeInfoInitializer PriorityModelPolicyDefTypeInfoInitializer_;
+
+      struct NWPriorityModelPolicyDefTypeInfoInitializer
+      {
+        NWPriorityModelPolicyDefTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (NWPriorityModelPolicyDef));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      NWPriorityModelPolicyDefTypeInfoInitializer NWPriorityModelPolicyDefTypeInfoInitializer_;
+
+      struct CNWPriorityModelPolicyDefTypeInfoInitializer
+      {
+        CNWPriorityModelPolicyDefTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (CNWPriorityModelPolicyDef));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      CNWPriorityModelPolicyDefTypeInfoInitializer CNWPriorityModelPolicyDefTypeInfoInitializer_;
     }
   }
 }
@@ -3201,44 +3584,6 @@ namespace CIAO
       {
       }
 
-      // Priority
-      //
-      //
-
-      void Priority::
-      traverse (Type& o)
-      {
-        pre (o);
-        post (o);
-      }
-
-      void Priority::
-      traverse (Type const& o)
-      {
-        pre (o);
-        post (o);
-      }
-
-      void Priority::
-      pre (Type&)
-      {
-      }
-
-      void Priority::
-      pre (Type const&)
-      {
-      }
-
-      void Priority::
-      post (Type&)
-      {
-      }
-
-      void Priority::
-      post (Type const&)
-      {
-      }
-
       // ThreadpoolDef
       //
       //
@@ -3898,6 +4243,8 @@ namespace CIAO
       {
         pre (o);
         priorityModel (o);
+        nwpriorityModel (o);
+        cnwpriorityModel (o);
         threadpool (o);
         priorityBandedConnection (o);
         if (o.id_p ()) id (o);
@@ -3910,6 +4257,8 @@ namespace CIAO
       {
         pre (o);
         priorityModel (o);
+        nwpriorityModel (o);
+        cnwpriorityModel (o);
         threadpool (o);
         priorityBandedConnection (o);
         if (o.id_p ()) id (o);
@@ -4012,6 +4361,174 @@ namespace CIAO
       }
 
       void PolicySet::
+      nwpriorityModel (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PolicySet::Type::nwpriorityModel_iterator b (o.begin_nwpriorityModel()), e (o.end_nwpriorityModel());
+
+        if (b != e)
+        {
+          nwpriorityModel_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) nwpriorityModel_next (o);
+          }
+
+          nwpriorityModel_post (o);
+        }
+
+        else nwpriorityModel_none (o);
+      }
+
+      void PolicySet::
+      nwpriorityModel (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PolicySet::Type::nwpriorityModel_const_iterator b (o.begin_nwpriorityModel()), e (o.end_nwpriorityModel());
+
+        if (b != e)
+        {
+          nwpriorityModel_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) nwpriorityModel_next (o);
+          }
+
+          nwpriorityModel_post (o);
+        }
+
+        else nwpriorityModel_none (o);
+      }
+
+      void PolicySet::
+      nwpriorityModel_pre (Type&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_pre (Type const&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_next (Type&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_next (Type const&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_post (Type&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_post (Type const&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_none (Type&)
+      {
+      }
+
+      void PolicySet::
+      nwpriorityModel_none (Type const&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PolicySet::Type::cnwpriorityModel_iterator b (o.begin_cnwpriorityModel()), e (o.end_cnwpriorityModel());
+
+        if (b != e)
+        {
+          cnwpriorityModel_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) cnwpriorityModel_next (o);
+          }
+
+          cnwpriorityModel_post (o);
+        }
+
+        else cnwpriorityModel_none (o);
+      }
+
+      void PolicySet::
+      cnwpriorityModel (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        PolicySet::Type::cnwpriorityModel_const_iterator b (o.begin_cnwpriorityModel()), e (o.end_cnwpriorityModel());
+
+        if (b != e)
+        {
+          cnwpriorityModel_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) cnwpriorityModel_next (o);
+          }
+
+          cnwpriorityModel_post (o);
+        }
+
+        else cnwpriorityModel_none (o);
+      }
+
+      void PolicySet::
+      cnwpriorityModel_pre (Type&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_pre (Type const&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_next (Type&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_next (Type const&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_post (Type&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_post (Type const&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_none (Type&)
+      {
+      }
+
+      void PolicySet::
+      cnwpriorityModel_none (Type const&)
+      {
+      }
+
+      void PolicySet::
       threadpool (Type& o)
       {
         // VC6 anathema strikes again
@@ -4288,6 +4805,152 @@ namespace CIAO
       post (Type const&)
       {
       }
+
+      // NWPriorityModelPolicyDef
+      //
+      //
+
+      void NWPriorityModelPolicyDef::
+      traverse (Type& o)
+      {
+        pre (o);
+        nw_priority_model (o);
+        request_dscp (o);
+        reply_dscp (o);
+        post (o);
+      }
+
+      void NWPriorityModelPolicyDef::
+      traverse (Type const& o)
+      {
+        pre (o);
+        nw_priority_model (o);
+        request_dscp (o);
+        reply_dscp (o);
+        post (o);
+      }
+
+      void NWPriorityModelPolicyDef::
+      pre (Type&)
+      {
+      }
+
+      void NWPriorityModelPolicyDef::
+      pre (Type const&)
+      {
+      }
+
+      void NWPriorityModelPolicyDef::
+      nw_priority_model (Type& o)
+      {
+        dispatch (o.nw_priority_model ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      nw_priority_model (Type const& o)
+      {
+        dispatch (o.nw_priority_model ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      request_dscp (Type& o)
+      {
+        dispatch (o.request_dscp ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      request_dscp (Type const& o)
+      {
+        dispatch (o.request_dscp ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      reply_dscp (Type& o)
+      {
+        dispatch (o.reply_dscp ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      reply_dscp (Type const& o)
+      {
+        dispatch (o.reply_dscp ());
+      }
+
+      void NWPriorityModelPolicyDef::
+      post (Type&)
+      {
+      }
+
+      void NWPriorityModelPolicyDef::
+      post (Type const&)
+      {
+      }
+
+      // CNWPriorityModelPolicyDef
+      //
+      //
+
+      void CNWPriorityModelPolicyDef::
+      traverse (Type& o)
+      {
+        pre (o);
+        request_dscp (o);
+        reply_dscp (o);
+        post (o);
+      }
+
+      void CNWPriorityModelPolicyDef::
+      traverse (Type const& o)
+      {
+        pre (o);
+        request_dscp (o);
+        reply_dscp (o);
+        post (o);
+      }
+
+      void CNWPriorityModelPolicyDef::
+      pre (Type&)
+      {
+      }
+
+      void CNWPriorityModelPolicyDef::
+      pre (Type const&)
+      {
+      }
+
+      void CNWPriorityModelPolicyDef::
+      request_dscp (Type& o)
+      {
+        dispatch (o.request_dscp ());
+      }
+
+      void CNWPriorityModelPolicyDef::
+      request_dscp (Type const& o)
+      {
+        dispatch (o.request_dscp ());
+      }
+
+      void CNWPriorityModelPolicyDef::
+      reply_dscp (Type& o)
+      {
+        dispatch (o.reply_dscp ());
+      }
+
+      void CNWPriorityModelPolicyDef::
+      reply_dscp (Type const& o)
+      {
+        dispatch (o.reply_dscp ());
+      }
+
+      void CNWPriorityModelPolicyDef::
+      post (Type&)
+      {
+      }
+
+      void CNWPriorityModelPolicyDef::
+      post (Type const&)
+      {
+      }
     }
   }
 }
@@ -4547,27 +5210,6 @@ namespace CIAO
         pop_ ();
       }
 
-      // Priority
-      //
-      //
-
-      Priority::
-      Priority (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
-
-      Priority::
-      Priority ()
-      {
-      }
-
-      void Priority::
-      traverse (Type const& o)
-      {
-        Traversal::Priority::traverse (o);
-      }
-
       // ThreadpoolDef
       //
       //
@@ -4915,6 +5557,44 @@ namespace CIAO
       }
 
       void PolicySet::
+      nwpriorityModel_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nwpriorityModel", top_ ()));
+      }
+
+      void PolicySet::
+      nwpriorityModel_next (Type const& o)
+      {
+        nwpriorityModel_post (o);
+        nwpriorityModel_pre (o);
+      }
+
+      void PolicySet::
+      nwpriorityModel_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void PolicySet::
+      cnwpriorityModel_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("cnwpriorityModel", top_ ()));
+      }
+
+      void PolicySet::
+      cnwpriorityModel_next (Type const& o)
+      {
+        cnwpriorityModel_post (o);
+        cnwpriorityModel_pre (o);
+      }
+
+      void PolicySet::
+      cnwpriorityModel_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void PolicySet::
       threadpool_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpool", top_ ()));
@@ -4983,8 +5663,45 @@ namespace CIAO
 
         if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = "SERVER_DECLARED";
         else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = "CLIENT_PROPAGATED";
+        else 
+        {
+        }
+
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
+
         else
         {
+          top_().value (s);
+        }
+      }
+
+      // NWPriorityModel
+      //
+      //
+
+      NWPriorityModel::
+      NWPriorityModel (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      NWPriorityModel::
+      NWPriorityModel ()
+      {
+      }
+
+      void NWPriorityModel::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = "SERVER_DECLARED_NWPRIORITY";
+        else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = "CLIENT_PROPAGATED_NWPRIORITY";
+        else 
+        {
         }
 
         if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
@@ -5035,6 +5752,88 @@ namespace CIAO
         Traversal::PriorityModelPolicyDef::server_priority (o);
         attr_ (0);
       }
+
+      // NWPriorityModelPolicyDef
+      //
+      //
+
+      NWPriorityModelPolicyDef::
+      NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      NWPriorityModelPolicyDef::
+      NWPriorityModelPolicyDef ()
+      {
+      }
+
+      void NWPriorityModelPolicyDef::
+      traverse (Type const& o)
+      {
+        Traversal::NWPriorityModelPolicyDef::traverse (o);
+      }
+
+      void NWPriorityModelPolicyDef::
+      nw_priority_model (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nw_priority_model", top_ ()));
+        Traversal::NWPriorityModelPolicyDef::nw_priority_model (o);
+        pop_ ();
+      }
+
+      void NWPriorityModelPolicyDef::
+      request_dscp (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
+        Traversal::NWPriorityModelPolicyDef::request_dscp (o);
+        pop_ ();
+      }
+
+      void NWPriorityModelPolicyDef::
+      reply_dscp (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
+        Traversal::NWPriorityModelPolicyDef::reply_dscp (o);
+        pop_ ();
+      }
+
+      // CNWPriorityModelPolicyDef
+      //
+      //
+
+      CNWPriorityModelPolicyDef::
+      CNWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      CNWPriorityModelPolicyDef::
+      CNWPriorityModelPolicyDef ()
+      {
+      }
+
+      void CNWPriorityModelPolicyDef::
+      traverse (Type const& o)
+      {
+        Traversal::CNWPriorityModelPolicyDef::traverse (o);
+      }
+
+      void CNWPriorityModelPolicyDef::
+      request_dscp (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
+        Traversal::CNWPriorityModelPolicyDef::request_dscp (o);
+        pop_ ();
+      }
+
+      void CNWPriorityModelPolicyDef::
+      reply_dscp (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
+        Traversal::CNWPriorityModelPolicyDef::reply_dscp (o);
+        pop_ ();
+      }
     }
   }
 }
@@ -5060,18 +5859,21 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ORBResources,
       virtual ::CIAO::Config_Handlers::Writer::ThreadpoolDef,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::Priority,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::ThreadpoolWithLanesDef,
       virtual ::CIAO::Config_Handlers::Writer::ThreadpoolLaneDef,
       virtual ::CIAO::Config_Handlers::Writer::ConnectionBandsDef,
       virtual ::CIAO::Config_Handlers::Writer::PriorityBandDef,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::PolicySet,
       virtual ::CIAO::Config_Handlers::Writer::PriorityModelPolicyDef,
       virtual ::CIAO::Config_Handlers::Writer::PriorityModel,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::NWPriorityModelPolicyDef,
+      virtual ::CIAO::Config_Handlers::Writer::NWPriorityModel,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::CNWPriorityModelPolicyDef,
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index 7493f703fb9..a5a4cd9c951 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -9,17 +9,16 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
-
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
 # include <string.h>
 #endif
 
-#include "RT_CCM_Handlers_Export.h"
 #ifndef CIAOSERVER_RESOURCES_HPP
 #define CIAOSERVER_RESOURCES_HPP
 
+#include "RT_CCM_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
@@ -31,7 +30,6 @@ namespace CIAO
     class ACESvcConf;
     class ORBConfigs;
     class ORBResources;
-    class Priority;
     class ThreadpoolDef;
     class ThreadpoolWithLanesDef;
     class ThreadpoolLaneDef;
@@ -39,7 +37,10 @@ namespace CIAO
     class PriorityBandDef;
     class PolicySet;
     class PriorityModel;
+    class NWPriorityModel;
     class PriorityModelPolicyDef;
+    class NWPriorityModelPolicyDef;
+    class CNWPriorityModelPolicyDef;
   }
 }
 
@@ -53,11 +54,10 @@ namespace CIAO
   {
     class RT_CCM_Handlers_Export ServerResourcesDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // cmdline
-      //
+      // 
       public:
       bool cmdline_p () const;
       ::CIAO::Config_Handlers::ServerCmdlineOptions const& cmdline () const;
@@ -67,7 +67,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ServerCmdlineOptions > cmdline_;
 
       // svcconf
-      //
+      // 
       public:
       bool svcconf_p () const;
       ::CIAO::Config_Handlers::ACESvcConf const& svcconf () const;
@@ -77,7 +77,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ACESvcConf > svcconf_;
 
       // orbConfigs
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::ORBConfigs const& orbConfigs () const;
       void orbConfigs (::CIAO::Config_Handlers::ORBConfigs const& );
@@ -86,7 +86,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ORBConfigs > orbConfigs_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -112,11 +112,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ServerCmdlineOptions : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // arg
-      //
+      // 
       public:
       typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
       typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator arg_const_iterator;
@@ -146,11 +145,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ACESvcConf : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // uri
-      //
+      // 
       public:
       bool uri_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& uri () const;
@@ -175,11 +173,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ORBConfigs : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // resources
-      //
+      // 
       public:
       bool resources_p () const;
       ::CIAO::Config_Handlers::ORBResources const& resources () const;
@@ -189,7 +186,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ORBResources > resources_;
 
       // policySet
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::const_iterator policySet_const_iterator;
@@ -219,11 +216,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ORBResources : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // threadpool
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::const_iterator threadpool_const_iterator;
@@ -238,7 +234,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
 
       // threadpoolWithLanes
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::const_iterator threadpoolWithLanes_const_iterator;
@@ -253,7 +249,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
 
       // connectionBands
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::const_iterator connectionBands_const_iterator;
@@ -281,32 +277,12 @@ namespace CIAO
     };
 
 
-    class RT_CCM_Handlers_Export Priority : public ::XMLSchema::int_
-    {
-      //@@ VC6 anathema
-      typedef ::XMLSchema::int_ Base__;
-
-      public:
-      Priority (::XMLSchema::int_ const& b__);
-
-      Priority (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Priority (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-      Priority (Priority const& s);
-
-      Priority&
-      operator= (Priority const& s);
-
-      private:
-      char regulator__;
-    };
-
     class RT_CCM_Handlers_Export ThreadpoolDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // stacksize
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -315,7 +291,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // static_threads
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -324,7 +300,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > static_threads_;
 
       // dynamic_threads
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& dynamic_threads () const;
       void dynamic_threads (::XMLSchema::unsignedLong const& );
@@ -333,16 +309,16 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > dynamic_threads_;
 
       // default_priority
-      //
+      // 
       public:
-      ::CIAO::Config_Handlers::Priority const& default_priority () const;
-      void default_priority (::CIAO::Config_Handlers::Priority const& );
+      ::XMLSchema::int_ const& default_priority () const;
+      void default_priority (::XMLSchema::int_ const& );
 
       protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > default_priority_;
+      ::std::auto_ptr< ::XMLSchema::int_ > default_priority_;
 
       // allow_request_buffering
-      //
+      // 
       public:
       ::XMLSchema::boolean const& allow_request_buffering () const;
       void allow_request_buffering (::XMLSchema::boolean const& );
@@ -351,7 +327,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_request_buffering_;
 
       // max_buffered_requests
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& max_buffered_requests () const;
       void max_buffered_requests (::XMLSchema::unsignedLong const& );
@@ -360,7 +336,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_buffered_requests_;
 
       // max_request_buffered_size
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& max_request_buffered_size () const;
       void max_request_buffered_size (::XMLSchema::unsignedLong const& );
@@ -369,7 +345,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_request_buffered_size_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -383,7 +359,7 @@ namespace CIAO
       ThreadpoolDef (::XMLSchema::unsignedLong const& stacksize__,
                      ::XMLSchema::unsignedLong const& static_threads__,
                      ::XMLSchema::unsignedLong const& dynamic_threads__,
-                     ::CIAO::Config_Handlers::Priority const& default_priority__,
+                     ::XMLSchema::int_ const& default_priority__,
                      ::XMLSchema::boolean const& allow_request_buffering__,
                      ::XMLSchema::unsignedLong const& max_buffered_requests__,
                      ::XMLSchema::unsignedLong const& max_request_buffered_size__);
@@ -401,11 +377,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ThreadpoolWithLanesDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // threadpoolLane
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
@@ -420,7 +395,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
 
       // stacksize
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -429,7 +404,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // allow_borrowing
-      //
+      // 
       public:
       ::XMLSchema::boolean const& allow_borrowing () const;
       void allow_borrowing (::XMLSchema::boolean const& );
@@ -438,7 +413,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_borrowing_;
 
       // allow_request_buffering
-      //
+      // 
       public:
       ::XMLSchema::boolean const& allow_request_buffering () const;
       void allow_request_buffering (::XMLSchema::boolean const& );
@@ -447,7 +422,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_request_buffering_;
 
       // max_buffered_requests
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& max_buffered_requests () const;
       void max_buffered_requests (::XMLSchema::unsignedLong const& );
@@ -456,7 +431,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_buffered_requests_;
 
       // max_request_buffered_size
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& max_request_buffered_size () const;
       void max_request_buffered_size (::XMLSchema::unsignedLong const& );
@@ -465,7 +440,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_request_buffered_size_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -495,11 +470,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ThreadpoolLaneDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // static_threads
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -508,7 +482,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > static_threads_;
 
       // dynamic_threads
-      //
+      // 
       public:
       ::XMLSchema::unsignedLong const& dynamic_threads () const;
       void dynamic_threads (::XMLSchema::unsignedLong const& );
@@ -517,18 +491,18 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > dynamic_threads_;
 
       // priority
-      //
+      // 
       public:
-      ::CIAO::Config_Handlers::Priority const& priority () const;
-      void priority (::CIAO::Config_Handlers::Priority const& );
+      ::XMLSchema::int_ const& priority () const;
+      void priority (::XMLSchema::int_ const& );
 
       protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > priority_;
+      ::std::auto_ptr< ::XMLSchema::int_ > priority_;
 
       public:
       ThreadpoolLaneDef (::XMLSchema::unsignedLong const& static_threads__,
                          ::XMLSchema::unsignedLong const& dynamic_threads__,
-                         ::CIAO::Config_Handlers::Priority const& priority__);
+                         ::XMLSchema::int_ const& priority__);
 
       ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ThreadpoolLaneDef (ThreadpoolLaneDef const& s);
@@ -543,11 +517,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export ConnectionBandsDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // band
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
@@ -562,7 +535,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::PriorityBandDef > band_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -588,11 +561,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export PriorityBandDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // low
-      //
+      // 
       public:
       ::XMLSchema::int_ const& low () const;
       void low (::XMLSchema::int_ const& );
@@ -601,7 +573,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::int_ > low_;
 
       // high
-      //
+      // 
       public:
       ::XMLSchema::int_ const& high () const;
       void high (::XMLSchema::int_ const& );
@@ -626,11 +598,10 @@ namespace CIAO
 
     class RT_CCM_Handlers_Export PolicySet : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // priorityModel
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::const_iterator priorityModel_const_iterator;
@@ -644,8 +615,38 @@ namespace CIAO
       protected:
       ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
 
+      // nwpriorityModel
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef >::iterator nwpriorityModel_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef >::const_iterator nwpriorityModel_const_iterator;
+      nwpriorityModel_iterator begin_nwpriorityModel ();
+      nwpriorityModel_iterator end_nwpriorityModel ();
+      nwpriorityModel_const_iterator begin_nwpriorityModel () const;
+      nwpriorityModel_const_iterator end_nwpriorityModel () const;
+      void add_nwpriorityModel (::CIAO::Config_Handlers::NWPriorityModelPolicyDef const& );
+      size_t count_nwpriorityModel (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef > nwpriorityModel_;
+
+      // cnwpriorityModel
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef >::iterator cnwpriorityModel_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef >::const_iterator cnwpriorityModel_const_iterator;
+      cnwpriorityModel_iterator begin_cnwpriorityModel ();
+      cnwpriorityModel_iterator end_cnwpriorityModel ();
+      cnwpriorityModel_const_iterator begin_cnwpriorityModel () const;
+      cnwpriorityModel_const_iterator end_cnwpriorityModel () const;
+      void add_cnwpriorityModel (::CIAO::Config_Handlers::CNWPriorityModelPolicyDef const& );
+      size_t count_cnwpriorityModel (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef > cnwpriorityModel_;
+
       // threadpool
-      //
+      // 
       public:
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator threadpool_const_iterator;
@@ -660,7 +661,7 @@ namespace CIAO
       ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
 
       // priorityBandedConnection
-      //
+      // 
       public:
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
@@ -675,7 +676,7 @@ namespace CIAO
       ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -710,17 +711,17 @@ namespace CIAO
 
       enum Value
       {
-        SERVER_DECLARED_l,CLIENT_PROPAGATED_l
+        SERVER_DECLARED_l, CLIENT_PROPAGATED_l
       };
 
 
       Value
       integral () const;
 
-      friend bool RT_CCM_Handlers_Export
+      friend bool RT_CCM_Handlers_Export 
       operator== (PriorityModel const& a, PriorityModel const& b);
 
-      friend bool RT_CCM_Handlers_Export
+      friend bool RT_CCM_Handlers_Export 
       operator!= (PriorityModel const& a, PriorityModel const& b);
 
       private:
@@ -734,13 +735,47 @@ namespace CIAO
     bool RT_CCM_Handlers_Export operator!= (PriorityModel const &a, PriorityModel const &b);
 
 
+    class RT_CCM_Handlers_Export NWPriorityModel : public ::XSCRT::Type
+    {
+      public:
+      NWPriorityModel (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      NWPriorityModel (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static NWPriorityModel const SERVER_DECLARED_NWPRIORITY;
+      static NWPriorityModel const CLIENT_PROPAGATED_NWPRIORITY;
+
+      enum Value
+      {
+        SERVER_DECLARED_NWPRIORITY_l, CLIENT_PROPAGATED_NWPRIORITY_l
+      };
+
+
+      Value
+      integral () const;
+
+      friend bool RT_CCM_Handlers_Export 
+      operator== (NWPriorityModel const& a, NWPriorityModel const& b);
+
+      friend bool RT_CCM_Handlers_Export 
+      operator!= (NWPriorityModel const& a, NWPriorityModel const& b);
+
+      private:
+      NWPriorityModel (Value v);
+
+      Value v_;
+    };
+
+    bool RT_CCM_Handlers_Export operator== (NWPriorityModel const &a, NWPriorityModel const &b);
+
+    bool RT_CCM_Handlers_Export operator!= (NWPriorityModel const &a, NWPriorityModel const &b);
+
+
     class RT_CCM_Handlers_Export PriorityModelPolicyDef : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // priority_model
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::PriorityModel const& priority_model () const;
       void priority_model (::CIAO::Config_Handlers::PriorityModel const& );
@@ -749,15 +784,15 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::PriorityModel > priority_model_;
 
       // server_priority
-      //
+      // 
       public:
       bool server_priority_p () const;
-      ::CIAO::Config_Handlers::Priority const& server_priority () const;
-      ::CIAO::Config_Handlers::Priority& server_priority ();
-      void server_priority (::CIAO::Config_Handlers::Priority const& );
+      ::XMLSchema::int_ const& server_priority () const;
+      ::XMLSchema::int_& server_priority ();
+      void server_priority (::XMLSchema::int_ const& );
 
       protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > server_priority_;
+      ::std::auto_ptr< ::XMLSchema::int_ > server_priority_;
 
       public:
       PriorityModelPolicyDef (::CIAO::Config_Handlers::PriorityModel const& priority_model__);
@@ -771,6 +806,90 @@ namespace CIAO
       private:
       char regulator__;
     };
+
+
+    class RT_CCM_Handlers_Export NWPriorityModelPolicyDef : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // nw_priority_model
+      // 
+      public:
+      ::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model () const;
+      void nw_priority_model (::CIAO::Config_Handlers::NWPriorityModel const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::NWPriorityModel > nw_priority_model_;
+
+      // request_dscp
+      // 
+      public:
+      ::XMLSchema::long_ const& request_dscp () const;
+      void request_dscp (::XMLSchema::long_ const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::long_ > request_dscp_;
+
+      // reply_dscp
+      // 
+      public:
+      ::XMLSchema::long_ const& reply_dscp () const;
+      void reply_dscp (::XMLSchema::long_ const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::long_ > reply_dscp_;
+
+      public:
+      NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model__,
+                                ::XMLSchema::long_ const& request_dscp__,
+                                ::XMLSchema::long_ const& reply_dscp__);
+
+      NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      NWPriorityModelPolicyDef (NWPriorityModelPolicyDef const& s);
+
+      NWPriorityModelPolicyDef&
+      operator= (NWPriorityModelPolicyDef const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class RT_CCM_Handlers_Export CNWPriorityModelPolicyDef : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // request_dscp
+      // 
+      public:
+      ::XMLSchema::long_ const& request_dscp () const;
+      void request_dscp (::XMLSchema::long_ const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::long_ > request_dscp_;
+
+      // reply_dscp
+      // 
+      public:
+      ::XMLSchema::long_ const& reply_dscp () const;
+      void reply_dscp (::XMLSchema::long_ const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::long_ > reply_dscp_;
+
+      public:
+      CNWPriorityModelPolicyDef (::XMLSchema::long_ const& request_dscp__,
+                                 ::XMLSchema::long_ const& reply_dscp__);
+
+      CNWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      CNWPriorityModelPolicyDef (CNWPriorityModelPolicyDef const& s);
+
+      CNWPriorityModelPolicyDef&
+      operator= (CNWPriorityModelPolicyDef const& s);
+
+      private:
+      char regulator__;
+    };
   }
 }
 
@@ -1101,27 +1220,6 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct RT_CCM_Handlers_Export Priority : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Priority >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
       struct RT_CCM_Handlers_Export ThreadpoolDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolDef >
       {
         virtual void
@@ -1458,6 +1556,66 @@ namespace CIAO
         priorityModel_none (Type const&);
 
         virtual void
+        nwpriorityModel (Type&);
+
+        virtual void
+        nwpriorityModel (Type const&);
+
+        virtual void
+        nwpriorityModel_pre (Type&);
+
+        virtual void
+        nwpriorityModel_pre (Type const&);
+
+        virtual void
+        nwpriorityModel_next (Type&);
+
+        virtual void
+        nwpriorityModel_next (Type const&);
+
+        virtual void
+        nwpriorityModel_post (Type&);
+
+        virtual void
+        nwpriorityModel_post (Type const&);
+
+        virtual void
+        nwpriorityModel_none (Type&);
+
+        virtual void
+        nwpriorityModel_none (Type const&);
+
+        virtual void
+        cnwpriorityModel (Type&);
+
+        virtual void
+        cnwpriorityModel (Type const&);
+
+        virtual void
+        cnwpriorityModel_pre (Type&);
+
+        virtual void
+        cnwpriorityModel_pre (Type const&);
+
+        virtual void
+        cnwpriorityModel_next (Type&);
+
+        virtual void
+        cnwpriorityModel_next (Type const&);
+
+        virtual void
+        cnwpriorityModel_post (Type&);
+
+        virtual void
+        cnwpriorityModel_post (Type const&);
+
+        virtual void
+        cnwpriorityModel_none (Type&);
+
+        virtual void
+        cnwpriorityModel_none (Type const&);
+
+        virtual void
         threadpool (Type&);
 
         virtual void
@@ -1540,6 +1698,10 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityModel >
       PriorityModel;
 
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NWPriorityModel >
+      NWPriorityModel;
+
       struct RT_CCM_Handlers_Export PriorityModelPolicyDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityModelPolicyDef >
       {
         virtual void
@@ -1578,6 +1740,78 @@ namespace CIAO
         virtual void
         post (Type const&);
       };
+
+      struct RT_CCM_Handlers_Export NWPriorityModelPolicyDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        nw_priority_model (Type&);
+
+        virtual void
+        nw_priority_model (Type const&);
+
+        virtual void
+        request_dscp (Type&);
+
+        virtual void
+        request_dscp (Type const&);
+
+        virtual void
+        reply_dscp (Type&);
+
+        virtual void
+        reply_dscp (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
+      struct RT_CCM_Handlers_Export CNWPriorityModelPolicyDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        request_dscp (Type&);
+
+        virtual void
+        request_dscp (Type const&);
+
+        virtual void
+        reply_dscp (Type&);
+
+        virtual void
+        reply_dscp (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
     }
   }
 }
@@ -1590,13 +1824,13 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct ServerResourcesDef : Traversal::ServerResourcesDef,
+      struct ServerResourcesDef : Traversal::ServerResourcesDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ServerResourcesDef Type;
         ServerResourcesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1607,7 +1841,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         cmdline (Type &o)
         {
 
@@ -1618,7 +1852,7 @@ namespace CIAO
         virtual void
         cmdline (Type const&);
 
-        virtual void
+        virtual void 
         svcconf (Type &o)
         {
 
@@ -1629,7 +1863,7 @@ namespace CIAO
         virtual void
         svcconf (Type const&);
 
-        virtual void
+        virtual void 
         orbConfigs (Type &o)
         {
 
@@ -1640,7 +1874,7 @@ namespace CIAO
         virtual void
         orbConfigs (Type const&);
 
-        virtual void
+        virtual void 
         id (Type &o)
         {
 
@@ -1655,13 +1889,13 @@ namespace CIAO
         ServerResourcesDef ();
       };
 
-      struct ServerCmdlineOptions : Traversal::ServerCmdlineOptions,
+      struct ServerCmdlineOptions : Traversal::ServerCmdlineOptions, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ServerCmdlineOptions Type;
         ServerCmdlineOptions (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1672,7 +1906,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         arg_pre (Type &o)
         {
 
@@ -1683,7 +1917,7 @@ namespace CIAO
         virtual void
         arg_pre (Type const&);
 
-        virtual void
+        virtual void 
         arg_next (Type &o)
         {
 
@@ -1694,7 +1928,7 @@ namespace CIAO
         virtual void
         arg_next (Type const&);
 
-        virtual void
+        virtual void 
         arg_post (Type &o)
         {
 
@@ -1709,13 +1943,13 @@ namespace CIAO
         ServerCmdlineOptions ();
       };
 
-      struct ACESvcConf : Traversal::ACESvcConf,
+      struct ACESvcConf : Traversal::ACESvcConf, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ACESvcConf Type;
         ACESvcConf (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1726,7 +1960,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         uri (Type &o)
         {
 
@@ -1741,13 +1975,13 @@ namespace CIAO
         ACESvcConf ();
       };
 
-      struct ORBConfigs : Traversal::ORBConfigs,
+      struct ORBConfigs : Traversal::ORBConfigs, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ORBConfigs Type;
         ORBConfigs (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1758,7 +1992,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         resources (Type &o)
         {
 
@@ -1769,7 +2003,7 @@ namespace CIAO
         virtual void
         resources (Type const&);
 
-        virtual void
+        virtual void 
         policySet_pre (Type &o)
         {
 
@@ -1780,7 +2014,7 @@ namespace CIAO
         virtual void
         policySet_pre (Type const&);
 
-        virtual void
+        virtual void 
         policySet_next (Type &o)
         {
 
@@ -1791,7 +2025,7 @@ namespace CIAO
         virtual void
         policySet_next (Type const&);
 
-        virtual void
+        virtual void 
         policySet_post (Type &o)
         {
 
@@ -1806,13 +2040,13 @@ namespace CIAO
         ORBConfigs ();
       };
 
-      struct ORBResources : Traversal::ORBResources,
+      struct ORBResources : Traversal::ORBResources, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ORBResources Type;
         ORBResources (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1823,7 +2057,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         threadpool_pre (Type &o)
         {
 
@@ -1834,7 +2068,7 @@ namespace CIAO
         virtual void
         threadpool_pre (Type const&);
 
-        virtual void
+        virtual void 
         threadpool_next (Type &o)
         {
 
@@ -1845,7 +2079,7 @@ namespace CIAO
         virtual void
         threadpool_next (Type const&);
 
-        virtual void
+        virtual void 
         threadpool_post (Type &o)
         {
 
@@ -1856,7 +2090,7 @@ namespace CIAO
         virtual void
         threadpool_post (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolWithLanes_pre (Type &o)
         {
 
@@ -1867,7 +2101,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_pre (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolWithLanes_next (Type &o)
         {
 
@@ -1878,7 +2112,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_next (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolWithLanes_post (Type &o)
         {
 
@@ -1889,7 +2123,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_post (Type const&);
 
-        virtual void
+        virtual void 
         connectionBands_pre (Type &o)
         {
 
@@ -1900,7 +2134,7 @@ namespace CIAO
         virtual void
         connectionBands_pre (Type const&);
 
-        virtual void
+        virtual void 
         connectionBands_next (Type &o)
         {
 
@@ -1911,7 +2145,7 @@ namespace CIAO
         virtual void
         connectionBands_next (Type const&);
 
-        virtual void
+        virtual void 
         connectionBands_post (Type &o)
         {
 
@@ -1926,34 +2160,13 @@ namespace CIAO
         ORBResources ();
       };
 
-      struct Priority : Traversal::Priority,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Priority Type;
-        Priority (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-        virtual void
-        traverse (Type &o)
-        {
-
-          this->traverse (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        traverse (Type const&);
-
-        protected:
-        Priority ();
-      };
-
-      struct ThreadpoolDef : Traversal::ThreadpoolDef,
+      struct ThreadpoolDef : Traversal::ThreadpoolDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolDef Type;
         ThreadpoolDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -1964,7 +2177,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         stacksize (Type &o)
         {
 
@@ -1975,7 +2188,7 @@ namespace CIAO
         virtual void
         stacksize (Type const&);
 
-        virtual void
+        virtual void 
         static_threads (Type &o)
         {
 
@@ -1986,7 +2199,7 @@ namespace CIAO
         virtual void
         static_threads (Type const&);
 
-        virtual void
+        virtual void 
         dynamic_threads (Type &o)
         {
 
@@ -1997,7 +2210,7 @@ namespace CIAO
         virtual void
         dynamic_threads (Type const&);
 
-        virtual void
+        virtual void 
         default_priority (Type &o)
         {
 
@@ -2008,7 +2221,7 @@ namespace CIAO
         virtual void
         default_priority (Type const&);
 
-        virtual void
+        virtual void 
         allow_request_buffering (Type &o)
         {
 
@@ -2019,7 +2232,7 @@ namespace CIAO
         virtual void
         allow_request_buffering (Type const&);
 
-        virtual void
+        virtual void 
         max_buffered_requests (Type &o)
         {
 
@@ -2030,7 +2243,7 @@ namespace CIAO
         virtual void
         max_buffered_requests (Type const&);
 
-        virtual void
+        virtual void 
         max_request_buffered_size (Type &o)
         {
 
@@ -2041,7 +2254,7 @@ namespace CIAO
         virtual void
         max_request_buffered_size (Type const&);
 
-        virtual void
+        virtual void 
         id (Type &o)
         {
 
@@ -2056,13 +2269,13 @@ namespace CIAO
         ThreadpoolDef ();
       };
 
-      struct ThreadpoolWithLanesDef : Traversal::ThreadpoolWithLanesDef,
+      struct ThreadpoolWithLanesDef : Traversal::ThreadpoolWithLanesDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolWithLanesDef Type;
         ThreadpoolWithLanesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2073,7 +2286,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolLane_pre (Type &o)
         {
 
@@ -2084,7 +2297,7 @@ namespace CIAO
         virtual void
         threadpoolLane_pre (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolLane_next (Type &o)
         {
 
@@ -2095,7 +2308,7 @@ namespace CIAO
         virtual void
         threadpoolLane_next (Type const&);
 
-        virtual void
+        virtual void 
         threadpoolLane_post (Type &o)
         {
 
@@ -2106,7 +2319,7 @@ namespace CIAO
         virtual void
         threadpoolLane_post (Type const&);
 
-        virtual void
+        virtual void 
         stacksize (Type &o)
         {
 
@@ -2117,7 +2330,7 @@ namespace CIAO
         virtual void
         stacksize (Type const&);
 
-        virtual void
+        virtual void 
         allow_borrowing (Type &o)
         {
 
@@ -2128,7 +2341,7 @@ namespace CIAO
         virtual void
         allow_borrowing (Type const&);
 
-        virtual void
+        virtual void 
         allow_request_buffering (Type &o)
         {
 
@@ -2139,7 +2352,7 @@ namespace CIAO
         virtual void
         allow_request_buffering (Type const&);
 
-        virtual void
+        virtual void 
         max_buffered_requests (Type &o)
         {
 
@@ -2150,7 +2363,7 @@ namespace CIAO
         virtual void
         max_buffered_requests (Type const&);
 
-        virtual void
+        virtual void 
         max_request_buffered_size (Type &o)
         {
 
@@ -2161,7 +2374,7 @@ namespace CIAO
         virtual void
         max_request_buffered_size (Type const&);
 
-        virtual void
+        virtual void 
         id (Type &o)
         {
 
@@ -2176,13 +2389,13 @@ namespace CIAO
         ThreadpoolWithLanesDef ();
       };
 
-      struct ThreadpoolLaneDef : Traversal::ThreadpoolLaneDef,
+      struct ThreadpoolLaneDef : Traversal::ThreadpoolLaneDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolLaneDef Type;
         ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2193,7 +2406,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         static_threads (Type &o)
         {
 
@@ -2204,7 +2417,7 @@ namespace CIAO
         virtual void
         static_threads (Type const&);
 
-        virtual void
+        virtual void 
         dynamic_threads (Type &o)
         {
 
@@ -2215,7 +2428,7 @@ namespace CIAO
         virtual void
         dynamic_threads (Type const&);
 
-        virtual void
+        virtual void 
         priority (Type &o)
         {
 
@@ -2230,13 +2443,13 @@ namespace CIAO
         ThreadpoolLaneDef ();
       };
 
-      struct ConnectionBandsDef : Traversal::ConnectionBandsDef,
+      struct ConnectionBandsDef : Traversal::ConnectionBandsDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ConnectionBandsDef Type;
         ConnectionBandsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2247,7 +2460,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         band_pre (Type &o)
         {
 
@@ -2258,7 +2471,7 @@ namespace CIAO
         virtual void
         band_pre (Type const&);
 
-        virtual void
+        virtual void 
         band_next (Type &o)
         {
 
@@ -2269,7 +2482,7 @@ namespace CIAO
         virtual void
         band_next (Type const&);
 
-        virtual void
+        virtual void 
         band_post (Type &o)
         {
 
@@ -2280,7 +2493,7 @@ namespace CIAO
         virtual void
         band_post (Type const&);
 
-        virtual void
+        virtual void 
         id (Type &o)
         {
 
@@ -2295,13 +2508,13 @@ namespace CIAO
         ConnectionBandsDef ();
       };
 
-      struct PriorityBandDef : Traversal::PriorityBandDef,
+      struct PriorityBandDef : Traversal::PriorityBandDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PriorityBandDef Type;
         PriorityBandDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2312,7 +2525,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         low (Type &o)
         {
 
@@ -2323,7 +2536,7 @@ namespace CIAO
         virtual void
         low (Type const&);
 
-        virtual void
+        virtual void 
         high (Type &o)
         {
 
@@ -2338,13 +2551,13 @@ namespace CIAO
         PriorityBandDef ();
       };
 
-      struct PolicySet : Traversal::PolicySet,
+      struct PolicySet : Traversal::PolicySet, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PolicySet Type;
         PolicySet (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2355,7 +2568,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         priorityModel_pre (Type &o)
         {
 
@@ -2366,7 +2579,7 @@ namespace CIAO
         virtual void
         priorityModel_pre (Type const&);
 
-        virtual void
+        virtual void 
         priorityModel_next (Type &o)
         {
 
@@ -2377,7 +2590,7 @@ namespace CIAO
         virtual void
         priorityModel_next (Type const&);
 
-        virtual void
+        virtual void 
         priorityModel_post (Type &o)
         {
 
@@ -2388,7 +2601,73 @@ namespace CIAO
         virtual void
         priorityModel_post (Type const&);
 
+        virtual void 
+        nwpriorityModel_pre (Type &o)
+        {
+
+          this->nwpriorityModel_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        nwpriorityModel_pre (Type const&);
+
+        virtual void 
+        nwpriorityModel_next (Type &o)
+        {
+
+          this->nwpriorityModel_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        nwpriorityModel_next (Type const&);
+
+        virtual void 
+        nwpriorityModel_post (Type &o)
+        {
+
+          this->nwpriorityModel_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        nwpriorityModel_post (Type const&);
+
+        virtual void 
+        cnwpriorityModel_pre (Type &o)
+        {
+
+          this->cnwpriorityModel_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        cnwpriorityModel_pre (Type const&);
+
+        virtual void 
+        cnwpriorityModel_next (Type &o)
+        {
+
+          this->cnwpriorityModel_next (const_cast <Type const &> (o));
+        }
+
+
         virtual void
+        cnwpriorityModel_next (Type const&);
+
+        virtual void 
+        cnwpriorityModel_post (Type &o)
+        {
+
+          this->cnwpriorityModel_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        cnwpriorityModel_post (Type const&);
+
+        virtual void 
         threadpool_pre (Type &o)
         {
 
@@ -2399,7 +2678,7 @@ namespace CIAO
         virtual void
         threadpool_pre (Type const&);
 
-        virtual void
+        virtual void 
         threadpool_next (Type &o)
         {
 
@@ -2410,7 +2689,7 @@ namespace CIAO
         virtual void
         threadpool_next (Type const&);
 
-        virtual void
+        virtual void 
         threadpool_post (Type &o)
         {
 
@@ -2421,7 +2700,7 @@ namespace CIAO
         virtual void
         threadpool_post (Type const&);
 
-        virtual void
+        virtual void 
         priorityBandedConnection_pre (Type &o)
         {
 
@@ -2432,7 +2711,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_pre (Type const&);
 
-        virtual void
+        virtual void 
         priorityBandedConnection_next (Type &o)
         {
 
@@ -2443,7 +2722,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_next (Type const&);
 
-        virtual void
+        virtual void 
         priorityBandedConnection_post (Type &o)
         {
 
@@ -2454,7 +2733,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_post (Type const&);
 
-        virtual void
+        virtual void 
         id (Type &o)
         {
 
@@ -2469,12 +2748,12 @@ namespace CIAO
         PolicySet ();
       };
 
-      struct PriorityModel : Traversal::PriorityModel,
+      struct PriorityModel : Traversal::PriorityModel, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         PriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
@@ -2487,13 +2766,31 @@ namespace CIAO
         PriorityModel ();
       };
 
-      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef,
+      struct NWPriorityModel : Traversal::NWPriorityModel, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        NWPriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        traverse (Type const&);
+
+        protected:
+        NWPriorityModel ();
+      };
+
+      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PriorityModelPolicyDef Type;
         PriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2504,7 +2801,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         priority_model (Type &o)
         {
 
@@ -2515,7 +2812,7 @@ namespace CIAO
         virtual void
         priority_model (Type const&);
 
-        virtual void
+        virtual void 
         server_priority (Type &o)
         {
 
@@ -2529,6 +2826,103 @@ namespace CIAO
         protected:
         PriorityModelPolicyDef ();
       };
+
+      struct NWPriorityModelPolicyDef : Traversal::NWPriorityModelPolicyDef, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::NWPriorityModelPolicyDef Type;
+        NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        nw_priority_model (Type &o)
+        {
+
+          this->nw_priority_model (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        nw_priority_model (Type const&);
+
+        virtual void 
+        request_dscp (Type &o)
+        {
+
+          this->request_dscp (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        request_dscp (Type const&);
+
+        virtual void 
+        reply_dscp (Type &o)
+        {
+
+          this->reply_dscp (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        reply_dscp (Type const&);
+
+        protected:
+        NWPriorityModelPolicyDef ();
+      };
+
+      struct CNWPriorityModelPolicyDef : Traversal::CNWPriorityModelPolicyDef, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef Type;
+        CNWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        request_dscp (Type &o)
+        {
+
+          this->request_dscp (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        request_dscp (Type const&);
+
+        virtual void 
+        reply_dscp (Type &o)
+        {
+
+          this->reply_dscp (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        reply_dscp (Type const&);
+
+        protected:
+        CNWPriorityModelPolicyDef ();
+      };
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index d5053a6dea6..39e2d72bbbf 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -35,7 +35,7 @@ namespace CIAO
             i < src.length ();
             ++i)
         {
-          co.add_arg (src[i]);
+          co.add_arg (src[i].in ());
         }
 
       return co;
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 1c3469e617e..e8676b54772 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 "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp
new file mode 100755
index 00000000000..acc74ca8c99
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp
@@ -0,0 +1,93 @@
+// $Id$
+
+#include "CNPM_Handler.h"
+#include "CIAOServerResources.hpp"
+#include "ace/Auto_Ptr.h"
+
+#define IPDSFIELD_DSCP_DEFAULT  0x00
+#define IPDSFIELD_DSCP_CS1      0x08
+#define IPDSFIELD_DSCP_CS2      0x10
+#define IPDSFIELD_DSCP_CS3      0x18
+#define IPDSFIELD_DSCP_CS4      0x20
+#define IPDSFIELD_DSCP_CS5      0x28
+#define IPDSFIELD_DSCP_CS6      0x30
+#define IPDSFIELD_DSCP_CS7      0x38
+#define IPDSFIELD_DSCP_AF11     0x0A
+#define IPDSFIELD_DSCP_AF12     0x0C
+#define IPDSFIELD_DSCP_AF13     0x0E
+#define IPDSFIELD_DSCP_AF21     0x12
+#define IPDSFIELD_DSCP_AF22     0x14
+#define IPDSFIELD_DSCP_AF23     0x16
+#define IPDSFIELD_DSCP_AF31     0x1A
+#define IPDSFIELD_DSCP_AF32     0x1C
+#define IPDSFIELD_DSCP_AF33     0x1E
+#define IPDSFIELD_DSCP_AF41     0x22
+#define IPDSFIELD_DSCP_AF42     0x24
+#define IPDSFIELD_DSCP_AF43     0x26
+#define IPDSFIELD_ECT_MASK      0x02
+#define IPDSFIELD_CE_MASK       0x01
+#define IPDSFIELD_DSCP_EF       0x2E
+
+static int const dscp[] =
+{
+  IPDSFIELD_DSCP_DEFAULT ,
+  IPDSFIELD_DSCP_CS1     ,
+  IPDSFIELD_DSCP_CS2     ,
+  IPDSFIELD_DSCP_CS3     ,
+  IPDSFIELD_DSCP_CS4     ,
+  IPDSFIELD_DSCP_CS5     ,
+  IPDSFIELD_DSCP_CS6     ,
+  IPDSFIELD_DSCP_CS7     ,
+  IPDSFIELD_DSCP_AF11    ,
+  IPDSFIELD_DSCP_AF12    ,
+  IPDSFIELD_DSCP_AF13    ,
+  IPDSFIELD_DSCP_AF21    ,
+  IPDSFIELD_DSCP_AF22    ,
+  IPDSFIELD_DSCP_AF23    ,
+  IPDSFIELD_DSCP_AF31    ,
+  IPDSFIELD_DSCP_AF32    ,
+  IPDSFIELD_DSCP_AF33    ,
+  IPDSFIELD_DSCP_AF41    ,
+  IPDSFIELD_DSCP_AF42    ,
+  IPDSFIELD_DSCP_AF43    ,
+  IPDSFIELD_DSCP_EF
+};
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    bool
+    CNPM_Handler::cnw_priority_pd (const CNWPriorityModelPolicyDef &src,
+      ::CIAO::DAnCE::CNWPriorityModelPolicyDef &dest)
+    {
+      int request_array_slot = 7;
+      long d = dscp[request_array_slot];
+
+      int a = static_cast <ACE_INT16> (d);
+      long b = static_cast <ACE_INT32> (a);
+      long c = static_cast <ACE_INT32> (a);
+
+      ACE_DEBUG ((LM_DEBUG, "numbers are %d %X %X\n", a, b, c));
+
+      dest.request_dscp = 
+        static_cast <ACE_INT32> (src.request_dscp ());
+      dest.reply_dscp = 
+        static_cast <ACE_INT32> (src.reply_dscp ());
+
+      return true;
+    }
+
+    CNWPriorityModelPolicyDef
+    CNPM_Handler::cnw_priority_pd (
+      const ::CIAO::DAnCE::CNWPriorityModelPolicyDef&)
+    {
+      auto_ptr <CNWPriorityModelPolicyDef> pmd;
+      pmd.reset (new CNWPriorityModelPolicyDef (0, 0));
+      return *pmd;
+    }
+  }
+}
+
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.h
new file mode 100755
index 00000000000..39da8b2fae4
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CNPM_Handler.h
@@ -0,0 +1,45 @@
+/**
+ * @file CNPM_Handler.h
+ *
+ * $Id$
+ */
+
+
+#ifndef CIAO_CONFIG_HANDLERS_CNPM_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_CNPM_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "RT_CCM_Handlers_Export.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+    namespace Config_Handlers
+    {
+      class CNWPriorityModelPolicyDef;
+
+      /**
+       * @class CNPM_Handler
+       * @brief Handler class for client NetworkPriorityModelPolicyDefs
+       */
+
+      class RT_CCM_Handlers_Export CNPM_Handler
+      {
+      public:
+        static bool cnw_priority_pd (const CNWPriorityModelPolicyDef &src,
+          ::CIAO::DAnCE::CNWPriorityModelPolicyDef &dest);
+
+        static CNWPriorityModelPolicyDef cnw_priority_pd (
+          const ::CIAO::DAnCE::CNWPriorityModelPolicyDef &src);
+      };
+    }
+
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_CNPM_HANDLER_H */
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.cpp
new file mode 100755
index 00000000000..d530b2169e2
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.cpp
@@ -0,0 +1,131 @@
+// $Id$
+
+#include "NPM_Handler.h"
+#include "CIAOServerResources.hpp"
+#include "ace/Auto_Ptr.h"
+
+#define IPDSFIELD_DSCP_DEFAULT  0x00
+#define IPDSFIELD_DSCP_CS1      0x08
+#define IPDSFIELD_DSCP_CS2      0x10
+#define IPDSFIELD_DSCP_CS3      0x18
+#define IPDSFIELD_DSCP_CS4      0x20
+#define IPDSFIELD_DSCP_CS5      0x28
+#define IPDSFIELD_DSCP_CS6      0x30
+#define IPDSFIELD_DSCP_CS7      0x38
+#define IPDSFIELD_DSCP_AF11     0x0A
+#define IPDSFIELD_DSCP_AF12     0x0C
+#define IPDSFIELD_DSCP_AF13     0x0E
+#define IPDSFIELD_DSCP_AF21     0x12
+#define IPDSFIELD_DSCP_AF22     0x14
+#define IPDSFIELD_DSCP_AF23     0x16
+#define IPDSFIELD_DSCP_AF31     0x1A
+#define IPDSFIELD_DSCP_AF32     0x1C
+#define IPDSFIELD_DSCP_AF33     0x1E
+#define IPDSFIELD_DSCP_AF41     0x22
+#define IPDSFIELD_DSCP_AF42     0x24
+#define IPDSFIELD_DSCP_AF43     0x26
+#define IPDSFIELD_ECT_MASK      0x02
+#define IPDSFIELD_CE_MASK       0x01
+#define IPDSFIELD_DSCP_EF       0x2E
+
+static int const dscp[] =
+{
+  IPDSFIELD_DSCP_DEFAULT ,
+  IPDSFIELD_DSCP_CS1     ,
+  IPDSFIELD_DSCP_CS2     ,
+  IPDSFIELD_DSCP_CS3     ,
+  IPDSFIELD_DSCP_CS4     ,
+  IPDSFIELD_DSCP_CS5     ,
+  IPDSFIELD_DSCP_CS6     ,
+  IPDSFIELD_DSCP_CS7     ,
+  IPDSFIELD_DSCP_AF11    ,
+  IPDSFIELD_DSCP_AF12    ,
+  IPDSFIELD_DSCP_AF13    ,
+  IPDSFIELD_DSCP_AF21    ,
+  IPDSFIELD_DSCP_AF22    ,
+  IPDSFIELD_DSCP_AF23    ,
+  IPDSFIELD_DSCP_AF31    ,
+  IPDSFIELD_DSCP_AF32    ,
+  IPDSFIELD_DSCP_AF33    ,
+  IPDSFIELD_DSCP_AF41    ,
+  IPDSFIELD_DSCP_AF42    ,
+  IPDSFIELD_DSCP_AF43    ,
+  IPDSFIELD_DSCP_EF
+};
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    bool
+    NPM_Handler::nw_priority_model_pd (const NWPriorityModelPolicyDef &src,
+      ::CIAO::DAnCE::NWPriorityModelPolicyDef &dest)
+    {
+      switch (src.nw_priority_model ().integral ())
+        {
+        case NWPriorityModel::SERVER_DECLARED_NWPRIORITY_l:
+          dest.nw_priority_model = ::CIAO::DAnCE::SERVER_DECLARED_NWPRIORITY;
+          break;
+
+        case NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY_l:
+          dest.nw_priority_model = ::CIAO::DAnCE::CLIENT_PROPAGATED_NWPRIORITY;
+          break;
+
+        default:
+          ACE_ERROR ((LM_ERROR,
+                      "Unknown priority model passed to priority_model_pd\n"));
+          return false;
+        }
+
+      int request_array_slot = 7;
+      long d = dscp[request_array_slot];
+
+      int a = static_cast <ACE_INT16> (d);
+      long b = static_cast <ACE_INT32> (a);
+      long c = static_cast <ACE_INT32> (a);
+
+      ACE_DEBUG ((LM_DEBUG, "numbers are %d %X %X\n", a, b, c));
+
+      dest.request_dscp = 
+        static_cast <ACE_INT32> (src.request_dscp ());
+      dest.reply_dscp = 
+        static_cast <ACE_INT32> (src.reply_dscp ());
+
+      return true;
+    }
+
+
+    NWPriorityModelPolicyDef
+    NPM_Handler::nw_priority_model_pd (
+      const ::CIAO::DAnCE::NWPriorityModelPolicyDef &src)
+    {
+      auto_ptr <NWPriorityModelPolicyDef> pmd;
+
+      switch (src.nw_priority_model)
+        {
+        case ::CIAO::DAnCE::CLIENT_PROPAGATED_NWPRIORITY:
+          pmd.reset (new NWPriorityModelPolicyDef
+(NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY, 0, 0));
+          break;
+
+        case ::CIAO::DAnCE::SERVER_DECLARED_NWPRIORITY:
+          pmd.reset (new NWPriorityModelPolicyDef
+(NWPriorityModel::SERVER_DECLARED_NWPRIORITY, 0, 0));
+          break;
+
+        default:
+          ACE_ERROR ((LM_ERROR,
+                      "Invalid priority model given to nw_priority_model_pd\n"));
+          throw 1;
+        }
+
+      return *pmd;
+    }
+
+
+  }
+
+}
+
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.h
new file mode 100755
index 00000000000..bde507ba189
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/RT-CCM/NPM_Handler.h
@@ -0,0 +1,45 @@
+/**
+ * @file NPM_Handler.h
+ *
+ * $Id$
+ */
+
+
+#ifndef CIAO_CONFIG_HANDLERS_NPM_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_NPM_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "RT_CCM_Handlers_Export.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+    namespace Config_Handlers
+    {
+      class NWPriorityModelPolicyDef;
+
+      /**
+       * @class NPM_Handler
+       * @brief Handler class for NetworkPriorityModelPolicyDefs
+       */
+
+      class RT_CCM_Handlers_Export NPM_Handler
+      {
+      public:
+        static bool nw_priority_model_pd (const NWPriorityModelPolicyDef &src,
+          ::CIAO::DAnCE::NWPriorityModelPolicyDef &dest);
+
+        static NWPriorityModelPolicyDef nw_priority_model_pd (
+          const ::CIAO::DAnCE::NWPriorityModelPolicyDef &src);
+      };
+    }
+
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_NPM_HANDLER_H */
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index 8aa7db84e77..abcd2c0a3c5 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 "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index 2790e149320..5209aea7da4 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 "DAnCE/Deployment/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..2063eec449a 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 "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
index 95c5bb76d9d..16a2f71f40a 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -2,6 +2,8 @@
 
 #include "PS_Handler.h"
 #include "PM_Handler.h"
+#include "NPM_Handler.h"
+#include "CNPM_Handler.h"
 #include "CIAOServerResources.hpp"
 
 namespace CIAO
@@ -19,6 +21,8 @@ namespace CIAO
       CORBA::ULong len (dest.policies.length ());
       dest.policies.length (len +
                             src.count_priorityModel () +
+                            src.count_nwpriorityModel () +
+                            src.count_cnwpriorityModel () +
                             src.count_threadpool () +
                             src.count_priorityBandedConnection ());
 
@@ -33,6 +37,30 @@ namespace CIAO
           dest.policies[len++].PriorityModelDef (pmd);
         }
 
+      for (PolicySet::nwpriorityModel_const_iterator i = 
+           src.begin_nwpriorityModel ();
+           i != src.end_nwpriorityModel ();
+           ++i)
+        {
+          ::CIAO::DAnCE::NWPriorityModelPolicyDef npmd;
+
+          NPM_Handler::nw_priority_model_pd (*i, npmd);
+
+          dest.policies[len++].NWPriorityModelDef (npmd);
+        }
+
+      for (PolicySet::cnwpriorityModel_const_iterator i = 
+           src.begin_cnwpriorityModel ();
+           i != src.end_cnwpriorityModel ();
+           ++i)
+        {
+          ::CIAO::DAnCE::CNWPriorityModelPolicyDef cnpmd;
+
+          CNPM_Handler::cnw_priority_pd (*i, cnpmd);
+
+          dest.policies[len++].CNWPriorityModelDef (cnpmd);
+        }
+
       for (PolicySet::threadpool_const_iterator i = src.begin_threadpool ();
            i != src.end_threadpool ();
            ++i)
@@ -55,13 +83,9 @@ namespace CIAO
 
           dest.policies[len++].PriorityBandedConnectionDef (pbc);
         }
-
-
-
       return true;
     }
 
-
     PolicySet
     PS_Handler::policy_set (const ::CIAO::DAnCE::PolicySet &src)
     {
@@ -74,7 +98,7 @@ namespace CIAO
            i < src.policies.length ();
            ++i)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACE_DEBUG ((LM_ERROR,
                       "Attempting switch for i = %d\n",
                       i));
 
@@ -82,7 +106,20 @@ namespace CIAO
             {
             case ::CIAO::DAnCE::PRIORITY_MODEL_POLICY_TYPE:
               ps.add_priorityModel (
-                PM_Handler::priority_model_pd (src.policies[i].PriorityModelDef ()));
+                PM_Handler::priority_model_pd (
+                     src.policies[i].PriorityModelDef ()));
+              break;
+
+            case ::CIAO::DAnCE::NETWORK_PRIORITY_TYPE:
+              ps.add_nwpriorityModel (
+                NPM_Handler::nw_priority_model_pd (
+                   src.policies[i].NWPriorityModelDef ()));
+              break;
+
+            case ::CIAO::DAnCE::CLIENT_NETWORK_PRIORITY_TYPE:
+              ps.add_cnwpriorityModel (
+                CNPM_Handler::cnw_priority_pd (
+                   src.policies[i].CNWPriorityModelDef ()));
               break;
 
             case ::CIAO::DAnCE::THREADPOOL_POLICY_TYPE:
@@ -90,7 +127,8 @@ namespace CIAO
               break;
 
             case ::CIAO::DAnCE::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
-              ps.add_priorityBandedConnection (src.policies[i].PriorityBandedConnectionDef ().Id.in ());
+              ps.add_priorityBandedConnection (
+                src.policies[i].PriorityBandedConnectionDef ().Id.in ());
               break;
 
             case 0:
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 5bd9b9237c2..5c3cb4ae996 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 "DAnCE/Deployment/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..90e67000c6a 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
@@ -1,12 +1,32 @@
 //$Id$
 
-project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils {
+project (RT_CCM_XML_Generation) : xscdefaults {
+   requires += xsc
+
+   xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
+   xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
+   xscflags += --cxx-export-symbol RT_CCM_Handlers_Export
+   xscflags += --cxx-namespace-regex  <%quote%>%.*vanderbilt.*%CIAO/Config_Handlers%<%quote%>
+   xscflags += --cxx-export-header RT_CCM_Handlers_Export.h
+   xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
+   
+   custom_only = 1
+
+   XSC_Files {
+        gendir = .
+        $(CIAO_ROOT)/docs/schema/CIAOServerResources.xsd
+   }
+}
+
+project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_config_handlers_base {
   sharedname = RT_CCM_Config_Handlers
   dynamicflags   = RT_CCM_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
   includes += $(CIAO_ROOT)/tools/Config_Handlers
   includes += $(CIAO_ROOT)/ciao
 
+  after += RT_CCM_XML_Generation
+
   Source_Files {
         CIAOServerResources.cpp
         CLA_Handler.cpp
@@ -14,6 +34,8 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, ciao_xml_utils
         OR_Handler.cpp
         PM_Handler.cpp
         PS_Handler.cpp
+        CNPM_Handler.cpp
+        NPM_Handler.cpp
         SRD_Handler.cpp
         TP_Handler.cpp
         TPL_Handler.cpp
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index 3a5ad3128ed..e0347fcbb8a 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_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..dab5646e32b 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 "DAnCE/Deployment/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..3def524a0bb 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -7,10 +7,8 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    bool TP_Handler::thread_pool (
-                                  const ThreadpoolDef &src,
-                                  ::CIAO::DAnCE::ORS_Threadpool &dest
-                                  )
+    bool TP_Handler::thread_pool (const ThreadpoolDef &src,
+                                  ::CIAO::DAnCE::ORS_Threadpool &dest)
     {
       dest.Id = CORBA::String_var (src.id ().c_str ());
 
@@ -38,19 +36,15 @@ namespace CIAO
     }
 
     ThreadpoolDef
-    TP_Handler::thread_pool (
-                             const ::CIAO::DAnCE::ORS_Threadpool &src
-                             )
+    TP_Handler::thread_pool (const ::CIAO::DAnCE::ORS_Threadpool &src)
     {
-      ThreadpoolDef tp (
-                        XMLSchema::unsignedLong (src.stacksize),
+      ThreadpoolDef tp (XMLSchema::unsignedLong (src.stacksize),
                         XMLSchema::unsignedLong (src.static_threads),
                         XMLSchema::unsignedLong (src.dynamic_threads),
-                        Priority (src.default_priority),
+                        XMLSchema::int_ (src.default_priority),
                         XMLSchema::boolean (src.allow_request_buffering),
                         XMLSchema::unsignedLong (src.max_buffered_requests),
-                        XMLSchema::unsignedLong (src.max_request_buffer_size)
-                        );
+                        XMLSchema::unsignedLong (src.max_request_buffer_size));
 
       if (src.Id.in () == 0)
         {
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index f0e27e2cef5..34172995405 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 "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 15fabe1f34a..1a951c8983b 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
     return 1;
 
   // Initialize an ORB so Any will work
-  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
 
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
diff --git a/CIAO/tools/Config_Handlers/Req_Handler.cpp b/CIAO/tools/Config_Handlers/Req_Handler.cpp
index c20d5e428f2..76d0d5b7791 100644
--- a/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "Req_Handler.h"
 #include "Property_Handler.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
index 4eeb7377b29..607c964d700 100644
--- a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -3,7 +3,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_IAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/CIAO/tools/Config_Handlers/STD_CID_Handler.h
index c8fb2954a6f..475c1c1b471 100644
--- a/CIAO/tools/Config_Handlers/STD_CID_Handler.h
+++ b/CIAO/tools/Config_Handlers/STD_CID_Handler.h
@@ -16,7 +16,7 @@
 #include "Utils/XML_Helper.h"
 #include "IDREF_Base.h"
 #include "Config_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
index d79a4ea5d39..1ad0d109fa5 100644
--- a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -2,7 +2,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_CID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Deployment.hpp"
 
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 31f4d937a49..d01f0d7f6f4 100644
--- a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -3,7 +3,7 @@
 #include "SatisfierProperty_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 #include "Utils/Exceptions.h"
 namespace CIAO
diff --git a/CIAO/tools/Config_Handlers/Utils/XercesString.cpp b/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
index db3e704caa5..6f034163e4b 100644
--- a/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
+++ b/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include <ostream>
+#include <algorithm>
 
 #include "XercesString.h"
 using xercesc::XMLString;
@@ -39,7 +40,7 @@ namespace Config_Handlers
     if (&rhs == this)
       return *this;
     XStr temp (rhs);
-    ACE_Swap<XMLCh*>::swap (this->_wstr, temp._wstr);
+    std::swap (this->_wstr, temp._wstr);
     return *this;
   }
 
diff --git a/CIAO/tools/Config_Handlers/Utils/XercesString.h b/CIAO/tools/Config_Handlers/Utils/XercesString.h
index a6f1dabe1db..e7f0059086b 100644
--- a/CIAO/tools/Config_Handlers/Utils/XercesString.h
+++ b/CIAO/tools/Config_Handlers/Utils/XercesString.h
@@ -5,8 +5,6 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Swap.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index d7d55058b25..53e8ac1e801 100644
--- a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -4,7 +4,7 @@
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 
diff --git a/CIAO/tools/Config_Handlers/ccd.cpp b/CIAO/tools/Config_Handlers/ccd.cpp
index 66743f01e2e..64e40b82567 100644
--- a/CIAO/tools/Config_Handlers/ccd.cpp
+++ b/CIAO/tools/Config_Handlers/ccd.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "ccd.hpp"
 
 namespace CIAO
@@ -16,26 +22,26 @@ namespace CIAO
   namespace Config_Handlers
   {
     // ComponentInterfaceDescription
-    //
+    // 
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s)
-      :
-      ::XSCRT::Type (),
-      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-          specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
-            contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-              href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-                regulator__ ()
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
+    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+    regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
@@ -121,7 +127,7 @@ namespace CIAO
 
 
     // ComponentInterfaceDescription
-    //
+    // 
     bool ComponentInterfaceDescription::
     label_p () const
     {
@@ -138,19 +144,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-        {
-          *label_ = e;
-        }
+      {
+        *label_ = e;
+      }
 
       else
-        {
-          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          label_->container (this);
-        }
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     bool ComponentInterfaceDescription::
     UUID_p () const
     {
@@ -167,19 +173,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-        {
-          *UUID_ = e;
-        }
+      {
+        *UUID_ = e;
+      }
 
       else
-        {
-          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          UUID_->container (this);
-        }
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     bool ComponentInterfaceDescription::
     specificType_p () const
     {
@@ -196,19 +202,19 @@ namespace CIAO
     specificType (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (specificType_.get ())
-        {
-          *specificType_ = e;
-        }
+      {
+        *specificType_ = e;
+      }
 
       else
-        {
-          specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          specificType_->container (this);
-        }
+      {
+        specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        specificType_->container (this);
+      }
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::supportedType_iterator ComponentInterfaceDescription::
     begin_supportedType ()
     {
@@ -246,7 +252,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::idlFile_iterator ComponentInterfaceDescription::
     begin_idlFile ()
     {
@@ -284,7 +290,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::configProperty_iterator ComponentInterfaceDescription::
     begin_configProperty ()
     {
@@ -322,7 +328,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::port_iterator ComponentInterfaceDescription::
     begin_port ()
     {
@@ -360,7 +366,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::property_iterator ComponentInterfaceDescription::
     begin_property ()
     {
@@ -398,7 +404,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     ComponentInterfaceDescription::infoProperty_iterator ComponentInterfaceDescription::
     begin_infoProperty ()
     {
@@ -436,7 +442,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     bool ComponentInterfaceDescription::
     contentLocation_p () const
     {
@@ -453,19 +459,19 @@ namespace CIAO
     contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (contentLocation_.get ())
-        {
-          *contentLocation_ = e;
-        }
+      {
+        *contentLocation_ = e;
+      }
 
       else
-        {
-          contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          contentLocation_->container (this);
-        }
+      {
+        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        contentLocation_->container (this);
+      }
     }
 
     // ComponentInterfaceDescription
-    //
+    // 
     bool ComponentInterfaceDescription::
     href_p () const
     {
@@ -488,15 +494,15 @@ namespace CIAO
     href (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (href_.get ())
-        {
-          *href_ = e;
-        }
+      {
+        *href_ = e;
+      }
 
       else
-        {
-          href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          href_->container (this);
-        }
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
     }
   }
 }
@@ -510,95 +516,95 @@ namespace CIAO
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
+
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
+
+        else if (n == "specificType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          specificType (t);
+        }
+
+        else if (n == "supportedType")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "label")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              label (t);
-            }
-
-          else if (n == "UUID")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              UUID (t);
-            }
-
-          else if (n == "specificType")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              specificType (t);
-            }
-
-          else if (n == "supportedType")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              add_supportedType (t);
-            }
-
-          else if (n == "idlFile")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              add_idlFile (t);
-            }
-
-          else if (n == "configProperty")
-            {
-              ::CIAO::Config_Handlers::Property t (e);
-              add_configProperty (t);
-            }
-
-          else if (n == "port")
-            {
-              ::CIAO::Config_Handlers::ComponentPortDescription t (e);
-              add_port (t);
-            }
-
-          else if (n == "property")
-            {
-              ::CIAO::Config_Handlers::ComponentPropertyDescription t (e);
-              add_property (t);
-            }
-
-          else if (n == "infoProperty")
-            {
-              ::CIAO::Config_Handlers::Property t (e);
-              add_infoProperty (t);
-            }
-
-          else if (n == "contentLocation")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              contentLocation (t);
-            }
-
-          else
-            {
-            }
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_supportedType (t);
         }
 
+        else if (n == "idlFile")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_idlFile (t);
+        }
+
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
+
+        else if (n == "port")
+        {
+          ::CIAO::Config_Handlers::ComponentPortDescription t (e);
+          add_port (t);
+        }
+
+        else if (n == "property")
+        {
+          ::CIAO::Config_Handlers::ComponentPropertyDescription t (e);
+          add_property (t);
+        }
+
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
+
+        else if (n == "contentLocation")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          contentLocation (t);
+        }
+
+        else 
+        {
+        }
+      }
+
       while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
+
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "href")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (a);
-              href (t);
-            }
-
-          else
-            {
-            }
         }
+      }
     }
   }
 }
@@ -777,17 +783,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
         if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
           {
-            supportedType_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) supportedType_next (o);
-              }
-
-            supportedType_post (o);
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
           }
 
+          supportedType_post (o);
+        }
+
         else supportedType_none (o);
       }
 
@@ -799,17 +805,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
         if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
           {
-            supportedType_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) supportedType_next (o);
-              }
-
-            supportedType_post (o);
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
           }
 
+          supportedType_post (o);
+        }
+
         else supportedType_none (o);
       }
 
@@ -861,17 +867,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile());
 
         if (b != e)
+        {
+          idlFile_pre (o);
+          for (; b != e;)
           {
-            idlFile_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) idlFile_next (o);
-              }
-
-            idlFile_post (o);
+            dispatch (*b);
+            if (++b != e) idlFile_next (o);
           }
 
+          idlFile_post (o);
+        }
+
         else idlFile_none (o);
       }
 
@@ -883,17 +889,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::idlFile_const_iterator b (o.begin_idlFile()), e (o.end_idlFile());
 
         if (b != e)
+        {
+          idlFile_pre (o);
+          for (; b != e;)
           {
-            idlFile_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) idlFile_next (o);
-              }
-
-            idlFile_post (o);
+            dispatch (*b);
+            if (++b != e) idlFile_next (o);
           }
 
+          idlFile_post (o);
+        }
+
         else idlFile_none (o);
       }
 
@@ -945,17 +951,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
           {
-            configProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) configProperty_next (o);
-              }
-
-            configProperty_post (o);
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
           }
 
+          configProperty_post (o);
+        }
+
         else configProperty_none (o);
       }
 
@@ -967,17 +973,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
           {
-            configProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) configProperty_next (o);
-              }
-
-            configProperty_post (o);
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
           }
 
+          configProperty_post (o);
+        }
+
         else configProperty_none (o);
       }
 
@@ -1029,17 +1035,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::port_iterator b (o.begin_port()), e (o.end_port());
 
         if (b != e)
+        {
+          port_pre (o);
+          for (; b != e;)
           {
-            port_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) port_next (o);
-              }
-
-            port_post (o);
+            dispatch (*b);
+            if (++b != e) port_next (o);
           }
 
+          port_post (o);
+        }
+
         else port_none (o);
       }
 
@@ -1051,17 +1057,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::port_const_iterator b (o.begin_port()), e (o.end_port());
 
         if (b != e)
+        {
+          port_pre (o);
+          for (; b != e;)
           {
-            port_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) port_next (o);
-              }
-
-            port_post (o);
+            dispatch (*b);
+            if (++b != e) port_next (o);
           }
 
+          port_post (o);
+        }
+
         else port_none (o);
       }
 
@@ -1113,17 +1119,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
         if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
           {
-            property_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) property_next (o);
-              }
-
-            property_post (o);
+            dispatch (*b);
+            if (++b != e) property_next (o);
           }
 
+          property_post (o);
+        }
+
         else property_none (o);
       }
 
@@ -1135,17 +1141,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
         if (b != e)
+        {
+          property_pre (o);
+          for (; b != e;)
           {
-            property_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) property_next (o);
-              }
-
-            property_post (o);
+            dispatch (*b);
+            if (++b != e) property_next (o);
           }
 
+          property_post (o);
+        }
+
         else property_none (o);
       }
 
@@ -1197,17 +1203,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
           {
-            infoProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) infoProperty_next (o);
-              }
-
-            infoProperty_post (o);
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
           }
 
+          infoProperty_post (o);
+        }
+
         else infoProperty_none (o);
       }
 
@@ -1219,17 +1225,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
           {
-            infoProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) infoProperty_next (o);
-              }
-
-            infoProperty_post (o);
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
           }
 
+          infoProperty_post (o);
+        }
+
         else infoProperty_none (o);
       }
 
@@ -1342,7 +1348,7 @@ namespace CIAO
 
       ComponentInterfaceDescription::
       ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
diff --git a/CIAO/tools/Config_Handlers/ccd.hpp b/CIAO/tools/Config_Handlers/ccd.hpp
index 0a95203fecf..bb3832af5a6 100644
--- a/CIAO/tools/Config_Handlers/ccd.hpp
+++ b/CIAO/tools/Config_Handlers/ccd.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,18 +15,18 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef CCD_HPP
 #define CCD_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class ComponentInterfaceDescription;
-}
+  namespace Config_Handlers
+  {
+    class ComponentInterfaceDescription;
+  }
 }
 
 #include <memory>
@@ -38,738 +37,737 @@ class ComponentInterfaceDescription;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// specificType
-//
-public:
-bool specificType_p () const;
-::XMLSchema::string< ACE_TCHAR > const& specificType () const;
-void specificType (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
-
-// supportedType
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
-supportedType_iterator begin_supportedType ();
-supportedType_iterator end_supportedType ();
-supportedType_const_iterator begin_supportedType () const;
-supportedType_const_iterator end_supportedType () const;
-void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_supportedType (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
-
-// idlFile
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator idlFile_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator idlFile_const_iterator;
-idlFile_iterator begin_idlFile ();
-idlFile_iterator end_idlFile ();
-idlFile_const_iterator begin_idlFile () const;
-idlFile_const_iterator end_idlFile () const;
-void add_idlFile (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_idlFile (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > idlFile_;
-
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// port
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
-port_iterator begin_port ();
-port_iterator end_port ();
-port_const_iterator begin_port () const;
-port_const_iterator end_port () const;
-void add_port (::CIAO::Config_Handlers::ComponentPortDescription const& );
-size_t count_port (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
-
-// property
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::iterator property_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::const_iterator property_const_iterator;
-property_iterator begin_property ();
-property_iterator end_property ();
-property_const_iterator begin_property () const;
-property_const_iterator end_property () const;
-void add_property (::CIAO::Config_Handlers::ComponentPropertyDescription const& );
-size_t count_property (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
-
-// infoProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-infoProperty_iterator begin_infoProperty ();
-infoProperty_iterator end_infoProperty ();
-infoProperty_const_iterator begin_infoProperty () const;
-infoProperty_const_iterator end_infoProperty () const;
-void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_infoProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-// contentLocation
-//
-public:
-bool contentLocation_p () const;
-::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-// href
-//
-public:
-bool href_p () const;
-::XMLSchema::string< ACE_TCHAR > const& href () const;
-::XMLSchema::string< ACE_TCHAR >& href ();
-void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-public:
-ComponentInterfaceDescription ();
-
-ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentInterfaceDescription (ComponentInterfaceDescription const& s);
-
-ComponentInterfaceDescription&
-operator= (ComponentInterfaceDescription const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // specificType
+      // 
+      public:
+      bool specificType_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& specificType () const;
+      void specificType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
+
+      // supportedType
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
+      supportedType_iterator begin_supportedType ();
+      supportedType_iterator end_supportedType ();
+      supportedType_const_iterator begin_supportedType () const;
+      supportedType_const_iterator end_supportedType () const;
+      void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_supportedType (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+
+      // idlFile
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator idlFile_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator idlFile_const_iterator;
+      idlFile_iterator begin_idlFile ();
+      idlFile_iterator end_idlFile ();
+      idlFile_const_iterator begin_idlFile () const;
+      idlFile_const_iterator end_idlFile () const;
+      void add_idlFile (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_idlFile (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > idlFile_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // port
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
+      port_iterator begin_port ();
+      port_iterator end_port ();
+      port_const_iterator begin_port () const;
+      port_const_iterator end_port () const;
+      void add_port (::CIAO::Config_Handlers::ComponentPortDescription const& );
+      size_t count_port (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
+
+      // property
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::iterator property_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::const_iterator property_const_iterator;
+      property_iterator begin_property ();
+      property_iterator end_property ();
+      property_const_iterator begin_property () const;
+      property_const_iterator end_property () const;
+      void add_property (::CIAO::Config_Handlers::ComponentPropertyDescription const& );
+      size_t count_property (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
+
+      // infoProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+      infoProperty_iterator begin_infoProperty ();
+      infoProperty_iterator end_infoProperty ();
+      infoProperty_const_iterator begin_infoProperty () const;
+      infoProperty_const_iterator end_infoProperty () const;
+      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_infoProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+      // contentLocation
+      // 
+      public:
+      bool contentLocation_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+      // href
+      // 
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+      public:
+      ComponentInterfaceDescription ();
+
+      ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentInterfaceDescription (ComponentInterfaceDescription const& s);
+
+      ComponentInterfaceDescription&
+      operator= (ComponentInterfaceDescription const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
-{
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-specificType (Type&);
+        virtual void
+        specificType (Type&);
 
-virtual void
-specificType (Type const&);
+        virtual void
+        specificType (Type const&);
 
-virtual void
-specificType_none (Type&);
+        virtual void
+        specificType_none (Type&);
 
-virtual void
-specificType_none (Type const&);
+        virtual void
+        specificType_none (Type const&);
 
-virtual void
-supportedType (Type&);
+        virtual void
+        supportedType (Type&);
 
-virtual void
-supportedType (Type const&);
+        virtual void
+        supportedType (Type const&);
 
-virtual void
-supportedType_pre (Type&);
+        virtual void
+        supportedType_pre (Type&);
 
-virtual void
-supportedType_pre (Type const&);
+        virtual void
+        supportedType_pre (Type const&);
 
-virtual void
-supportedType_next (Type&);
+        virtual void
+        supportedType_next (Type&);
 
-virtual void
-supportedType_next (Type const&);
+        virtual void
+        supportedType_next (Type const&);
 
-virtual void
-supportedType_post (Type&);
+        virtual void
+        supportedType_post (Type&);
 
-virtual void
-supportedType_post (Type const&);
+        virtual void
+        supportedType_post (Type const&);
 
-virtual void
-supportedType_none (Type&);
+        virtual void
+        supportedType_none (Type&);
 
-virtual void
-supportedType_none (Type const&);
+        virtual void
+        supportedType_none (Type const&);
 
-virtual void
-idlFile (Type&);
+        virtual void
+        idlFile (Type&);
 
-virtual void
-idlFile (Type const&);
+        virtual void
+        idlFile (Type const&);
 
-virtual void
-idlFile_pre (Type&);
+        virtual void
+        idlFile_pre (Type&);
 
-virtual void
-idlFile_pre (Type const&);
+        virtual void
+        idlFile_pre (Type const&);
 
-virtual void
-idlFile_next (Type&);
+        virtual void
+        idlFile_next (Type&);
 
-virtual void
-idlFile_next (Type const&);
+        virtual void
+        idlFile_next (Type const&);
 
-virtual void
-idlFile_post (Type&);
+        virtual void
+        idlFile_post (Type&);
 
-virtual void
-idlFile_post (Type const&);
+        virtual void
+        idlFile_post (Type const&);
 
-virtual void
-idlFile_none (Type&);
+        virtual void
+        idlFile_none (Type&);
 
-virtual void
-idlFile_none (Type const&);
+        virtual void
+        idlFile_none (Type const&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-port (Type&);
+        virtual void
+        port (Type&);
 
-virtual void
-port (Type const&);
+        virtual void
+        port (Type const&);
 
-virtual void
-port_pre (Type&);
+        virtual void
+        port_pre (Type&);
 
-virtual void
-port_pre (Type const&);
+        virtual void
+        port_pre (Type const&);
 
-virtual void
-port_next (Type&);
+        virtual void
+        port_next (Type&);
 
-virtual void
-port_next (Type const&);
+        virtual void
+        port_next (Type const&);
 
-virtual void
-port_post (Type&);
+        virtual void
+        port_post (Type&);
 
-virtual void
-port_post (Type const&);
+        virtual void
+        port_post (Type const&);
 
-virtual void
-port_none (Type&);
+        virtual void
+        port_none (Type&);
 
-virtual void
-port_none (Type const&);
+        virtual void
+        port_none (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        property (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        property (Type const&);
 
-virtual void
-property_pre (Type&);
+        virtual void
+        property_pre (Type&);
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-property_next (Type&);
+        virtual void
+        property_next (Type&);
 
-virtual void
-property_next (Type const&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-property_post (Type&);
+        virtual void
+        property_post (Type&);
 
-virtual void
-property_post (Type const&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-property_none (Type&);
+        virtual void
+        property_none (Type&);
 
-virtual void
-property_none (Type const&);
+        virtual void
+        property_none (Type const&);
 
-virtual void
-infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-virtual void
-infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-virtual void
-infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-virtual void
-infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-virtual void
-contentLocation (Type&);
+        virtual void
+        contentLocation (Type&);
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-contentLocation_none (Type&);
+        virtual void
+        contentLocation_none (Type&);
 
-virtual void
-contentLocation_none (Type const&);
+        virtual void
+        contentLocation_none (Type const&);
 
-virtual void
-href (Type&);
+        virtual void
+        href (Type&);
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-virtual void
-href_none (Type&);
+        virtual void
+        href_none (Type&);
 
-virtual void
-href_none (Type const&);
+        virtual void
+        href_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
-ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
+        ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-specificType (Type &o)
-{
+        virtual void 
+        specificType (Type &o)
+        {
 
-this->specificType (const_cast <Type const &> (o));
-}
+          this->specificType (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-specificType (Type const&);
+        virtual void
+        specificType (Type const&);
 
-virtual void
-supportedType_pre (Type &o)
-{
+        virtual void 
+        supportedType_pre (Type &o)
+        {
 
-this->supportedType_pre (const_cast <Type const &> (o));
-}
+          this->supportedType_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-supportedType_pre (Type const&);
+        virtual void
+        supportedType_pre (Type const&);
 
-virtual void
-supportedType_next (Type &o)
-{
+        virtual void 
+        supportedType_next (Type &o)
+        {
 
-this->supportedType_next (const_cast <Type const &> (o));
-}
+          this->supportedType_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-supportedType_next (Type const&);
+        virtual void
+        supportedType_next (Type const&);
 
-virtual void
-supportedType_post (Type &o)
-{
+        virtual void 
+        supportedType_post (Type &o)
+        {
 
-this->supportedType_post (const_cast <Type const &> (o));
-}
+          this->supportedType_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-supportedType_post (Type const&);
+        virtual void
+        supportedType_post (Type const&);
 
-virtual void
-idlFile_pre (Type &o)
-{
+        virtual void 
+        idlFile_pre (Type &o)
+        {
 
-this->idlFile_pre (const_cast <Type const &> (o));
-}
+          this->idlFile_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-idlFile_pre (Type const&);
+        virtual void
+        idlFile_pre (Type const&);
 
-virtual void
-idlFile_next (Type &o)
-{
+        virtual void 
+        idlFile_next (Type &o)
+        {
 
-this->idlFile_next (const_cast <Type const &> (o));
-}
+          this->idlFile_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-idlFile_next (Type const&);
+        virtual void
+        idlFile_next (Type const&);
 
-virtual void
-idlFile_post (Type &o)
-{
+        virtual void 
+        idlFile_post (Type &o)
+        {
 
-this->idlFile_post (const_cast <Type const &> (o));
-}
+          this->idlFile_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-idlFile_post (Type const&);
+        virtual void
+        idlFile_post (Type const&);
 
-virtual void
-configProperty_pre (Type &o)
-{
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type &o)
-{
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type &o)
-{
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-port_pre (Type &o)
-{
+        virtual void 
+        port_pre (Type &o)
+        {
 
-this->port_pre (const_cast <Type const &> (o));
-}
+          this->port_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-port_pre (Type const&);
+        virtual void
+        port_pre (Type const&);
 
-virtual void
-port_next (Type &o)
-{
+        virtual void 
+        port_next (Type &o)
+        {
 
-this->port_next (const_cast <Type const &> (o));
-}
+          this->port_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-port_next (Type const&);
+        virtual void
+        port_next (Type const&);
 
-virtual void
-port_post (Type &o)
-{
+        virtual void 
+        port_post (Type &o)
+        {
 
-this->port_post (const_cast <Type const &> (o));
-}
+          this->port_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-port_post (Type const&);
+        virtual void
+        port_post (Type const&);
 
-virtual void
-property_pre (Type &o)
-{
+        virtual void 
+        property_pre (Type &o)
+        {
 
-this->property_pre (const_cast <Type const &> (o));
-}
+          this->property_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-property_pre (Type const&);
+        virtual void
+        property_pre (Type const&);
 
-virtual void
-property_next (Type &o)
-{
+        virtual void 
+        property_next (Type &o)
+        {
 
-this->property_next (const_cast <Type const &> (o));
-}
+          this->property_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-property_next (Type const&);
+        virtual void
+        property_next (Type const&);
 
-virtual void
-property_post (Type &o)
-{
+        virtual void 
+        property_post (Type &o)
+        {
 
-this->property_post (const_cast <Type const &> (o));
-}
+          this->property_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-property_post (Type const&);
+        virtual void
+        property_post (Type const&);
 
-virtual void
-infoProperty_pre (Type &o)
-{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-this->infoProperty_pre (const_cast <Type const &> (o));
-}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type &o)
-{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-this->infoProperty_next (const_cast <Type const &> (o));
-}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type &o)
-{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-this->infoProperty_post (const_cast <Type const &> (o));
-}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-contentLocation (Type &o)
-{
+        virtual void 
+        contentLocation (Type &o)
+        {
 
-this->contentLocation (const_cast <Type const &> (o));
-}
+          this->contentLocation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type &o)
-{
+        virtual void 
+        href (Type &o)
+        {
 
-this->href (const_cast <Type const &> (o));
-}
+          this->href (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-protected:
-ComponentInterfaceDescription ();
-};
-}
-}
+        protected:
+        ComponentInterfaceDescription ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // CCD_HPP
diff --git a/CIAO/tools/Config_Handlers/cdd.cpp b/CIAO/tools/Config_Handlers/cdd.cpp
index 081ff061ea8..799ad5ebec7 100644
--- a/CIAO/tools/Config_Handlers/cdd.cpp
+++ b/CIAO/tools/Config_Handlers/cdd.cpp
@@ -1,4 +1,3 @@
-
 /* $Id$
  * This code was generated by the XML Schema Compiler.
  *
@@ -10,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "cdd.hpp"
 
 namespace CIAO
@@ -17,23 +22,23 @@ namespace CIAO
   namespace Config_Handlers
   {
     // Domain
-    //
+    // 
 
     Domain::
     Domain ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     Domain::
     Domain (::CIAO::Config_Handlers::Domain const& s)
-      :
-      ::XSCRT::Type (),
-      UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-        label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-          regulator__ ()
+    :
+    ::XSCRT::Type (),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    regulator__ ()
     {
       if (UUID_.get ()) UUID_->container (this);
       if (label_.get ()) label_->container (this);
@@ -97,7 +102,7 @@ namespace CIAO
 
 
     // Domain
-    //
+    // 
     bool Domain::
     UUID_p () const
     {
@@ -114,19 +119,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-        {
-          *UUID_ = e;
-        }
+      {
+        *UUID_ = e;
+      }
 
       else
-        {
-          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          UUID_->container (this);
-        }
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
     }
 
     // Domain
-    //
+    // 
     bool Domain::
     label_p () const
     {
@@ -143,19 +148,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-        {
-          *label_ = e;
-        }
+      {
+        *label_ = e;
+      }
 
       else
-        {
-          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          label_->container (this);
-        }
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
     }
 
     // Domain
-    //
+    // 
     Domain::node_iterator Domain::
     begin_node ()
     {
@@ -193,7 +198,7 @@ namespace CIAO
     }
 
     // Domain
-    //
+    // 
     Domain::interconnect_iterator Domain::
     begin_interconnect ()
     {
@@ -231,7 +236,7 @@ namespace CIAO
     }
 
     // Domain
-    //
+    // 
     Domain::bridge_iterator Domain::
     begin_bridge ()
     {
@@ -269,7 +274,7 @@ namespace CIAO
     }
 
     // Domain
-    //
+    // 
     Domain::sharedResource_iterator Domain::
     begin_sharedResource ()
     {
@@ -307,7 +312,7 @@ namespace CIAO
     }
 
     // Domain
-    //
+    // 
     Domain::infoProperty_iterator Domain::
     begin_infoProperty ()
     {
@@ -346,3047 +351,3047 @@ namespace CIAO
 
 
     // Bridge
-    //
+    // 
 
     Bridge::
     Bridge (::XMLSchema::string< ACE_TCHAR > const& name__)
-      :
-      ::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-Bridge::
-Bridge (::CIAO::Config_Handlers::Bridge const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-regulator__ ()
-{
-name_->container (this);
-if (label_.get ()) label_->container (this);
-{
-for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-}
+    Bridge::
+    Bridge (::CIAO::Config_Handlers::Bridge const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (label_.get ()) label_->container (this);
+      {
+        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+      }
 
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
-}
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::Bridge& Bridge::
-operator= (::CIAO::Config_Handlers::Bridge const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::Bridge& Bridge::
+    operator= (::CIAO::Config_Handlers::Bridge const& s)
+    {
+      name (s.name ());
 
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-connect_.clear ();
-{
-for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-}
+      connect_.clear ();
+      {
+        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+      }
 
-resource_.clear ();
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
+      resource_.clear ();
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// Bridge
-//
-::XMLSchema::string< ACE_TCHAR > const& Bridge::
-name () const
-{
-return *name_;
-}
+    // Bridge
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
+    name () const
+    {
+      return *name_;
+    }
 
-void Bridge::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void Bridge::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// Bridge
-//
-bool Bridge::
-label_p () const
-{
-return label_.get () != 0;
-}
+    // Bridge
+    // 
+    bool Bridge::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& Bridge::
-label () const
-{
-return *label_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
+    label () const
+    {
+      return *label_;
+    }
 
-void Bridge::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+    void Bridge::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-// Bridge
-//
-Bridge::connect_iterator Bridge::
-begin_connect ()
-{
-return connect_.begin ();
-}
+    // Bridge
+    // 
+    Bridge::connect_iterator Bridge::
+    begin_connect ()
+    {
+      return connect_.begin ();
+    }
 
-Bridge::connect_iterator Bridge::
-end_connect ()
-{
-return connect_.end ();
-}
+    Bridge::connect_iterator Bridge::
+    end_connect ()
+    {
+      return connect_.end ();
+    }
 
-Bridge::connect_const_iterator Bridge::
-begin_connect () const
-{
-return connect_.begin ();
-}
+    Bridge::connect_const_iterator Bridge::
+    begin_connect () const
+    {
+      return connect_.begin ();
+    }
 
-Bridge::connect_const_iterator Bridge::
-end_connect () const
-{
-return connect_.end ();
-}
+    Bridge::connect_const_iterator Bridge::
+    end_connect () const
+    {
+      return connect_.end ();
+    }
 
-void Bridge::
-add_connect (::CIAO::Config_Handlers::Interconnect const& e)
-{
-connect_.push_back (e);
-}
+    void Bridge::
+    add_connect (::CIAO::Config_Handlers::Interconnect const& e)
+    {
+      connect_.push_back (e);
+    }
 
-size_t Bridge::
-count_connect(void) const
-{
-return connect_.size ();
-}
+    size_t Bridge::
+    count_connect(void) const
+    {
+      return connect_.size ();
+    }
 
-// Bridge
-//
-Bridge::resource_iterator Bridge::
-begin_resource ()
-{
-return resource_.begin ();
-}
+    // Bridge
+    // 
+    Bridge::resource_iterator Bridge::
+    begin_resource ()
+    {
+      return resource_.begin ();
+    }
 
-Bridge::resource_iterator Bridge::
-end_resource ()
-{
-return resource_.end ();
-}
+    Bridge::resource_iterator Bridge::
+    end_resource ()
+    {
+      return resource_.end ();
+    }
 
-Bridge::resource_const_iterator Bridge::
-begin_resource () const
-{
-return resource_.begin ();
-}
+    Bridge::resource_const_iterator Bridge::
+    begin_resource () const
+    {
+      return resource_.begin ();
+    }
 
-Bridge::resource_const_iterator Bridge::
-end_resource () const
-{
-return resource_.end ();
-}
+    Bridge::resource_const_iterator Bridge::
+    end_resource () const
+    {
+      return resource_.end ();
+    }
 
-void Bridge::
-add_resource (::CIAO::Config_Handlers::Resource const& e)
-{
-resource_.push_back (e);
-}
+    void Bridge::
+    add_resource (::CIAO::Config_Handlers::Resource const& e)
+    {
+      resource_.push_back (e);
+    }
 
-size_t Bridge::
-count_resource(void) const
-{
-return resource_.size ();
-}
+    size_t Bridge::
+    count_resource(void) const
+    {
+      return resource_.size ();
+    }
 
 
-// Interconnect
-//
+    // Interconnect
+    // 
 
-Interconnect::
-Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    Interconnect::
+    Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-Interconnect::
-Interconnect (::CIAO::Config_Handlers::Interconnect const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-regulator__ ()
-{
-name_->container (this);
-if (label_.get ()) label_->container (this);
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+    Interconnect::
+    Interconnect (::CIAO::Config_Handlers::Interconnect const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (label_.get ()) label_->container (this);
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-{
-for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-}
+      {
+        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+      }
 
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
-}
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::Interconnect& Interconnect::
-operator= (::CIAO::Config_Handlers::Interconnect const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::Interconnect& Interconnect::
+    operator= (::CIAO::Config_Handlers::Interconnect const& s)
+    {
+      name (s.name ());
 
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-connection_.clear ();
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+      connection_.clear ();
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-connect_.clear ();
-{
-for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-}
+      connect_.clear ();
+      {
+        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+      }
 
-resource_.clear ();
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
+      resource_.clear ();
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// Interconnect
-//
-::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-name () const
-{
-return *name_;
-}
+    // Interconnect
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+    name () const
+    {
+      return *name_;
+    }
 
-void Interconnect::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void Interconnect::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// Interconnect
-//
-bool Interconnect::
-label_p () const
-{
-return label_.get () != 0;
-}
+    // Interconnect
+    // 
+    bool Interconnect::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-label () const
-{
-return *label_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+    label () const
+    {
+      return *label_;
+    }
 
-void Interconnect::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+    void Interconnect::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-// Interconnect
-//
-Interconnect::connection_iterator Interconnect::
-begin_connection ()
-{
-return connection_.begin ();
-}
+    // Interconnect
+    // 
+    Interconnect::connection_iterator Interconnect::
+    begin_connection ()
+    {
+      return connection_.begin ();
+    }
 
-Interconnect::connection_iterator Interconnect::
-end_connection ()
-{
-return connection_.end ();
-}
+    Interconnect::connection_iterator Interconnect::
+    end_connection ()
+    {
+      return connection_.end ();
+    }
 
-Interconnect::connection_const_iterator Interconnect::
-begin_connection () const
-{
-return connection_.begin ();
-}
+    Interconnect::connection_const_iterator Interconnect::
+    begin_connection () const
+    {
+      return connection_.begin ();
+    }
 
-Interconnect::connection_const_iterator Interconnect::
-end_connection () const
-{
-return connection_.end ();
-}
+    Interconnect::connection_const_iterator Interconnect::
+    end_connection () const
+    {
+      return connection_.end ();
+    }
 
-void Interconnect::
-add_connection (::CIAO::Config_Handlers::Bridge const& e)
-{
-connection_.push_back (e);
-}
+    void Interconnect::
+    add_connection (::CIAO::Config_Handlers::Bridge const& e)
+    {
+      connection_.push_back (e);
+    }
 
-size_t Interconnect::
-count_connection(void) const
-{
-return connection_.size ();
-}
+    size_t Interconnect::
+    count_connection(void) const
+    {
+      return connection_.size ();
+    }
 
-// Interconnect
-//
-Interconnect::connect_iterator Interconnect::
-begin_connect ()
-{
-return connect_.begin ();
-}
+    // Interconnect
+    // 
+    Interconnect::connect_iterator Interconnect::
+    begin_connect ()
+    {
+      return connect_.begin ();
+    }
 
-Interconnect::connect_iterator Interconnect::
-end_connect ()
-{
-return connect_.end ();
-}
+    Interconnect::connect_iterator Interconnect::
+    end_connect ()
+    {
+      return connect_.end ();
+    }
 
-Interconnect::connect_const_iterator Interconnect::
-begin_connect () const
-{
-return connect_.begin ();
-}
+    Interconnect::connect_const_iterator Interconnect::
+    begin_connect () const
+    {
+      return connect_.begin ();
+    }
 
-Interconnect::connect_const_iterator Interconnect::
-end_connect () const
-{
-return connect_.end ();
-}
+    Interconnect::connect_const_iterator Interconnect::
+    end_connect () const
+    {
+      return connect_.end ();
+    }
 
-void Interconnect::
-add_connect (::CIAO::Config_Handlers::Node const& e)
-{
-connect_.push_back (e);
-}
+    void Interconnect::
+    add_connect (::CIAO::Config_Handlers::Node const& e)
+    {
+      connect_.push_back (e);
+    }
 
-size_t Interconnect::
-count_connect(void) const
-{
-return connect_.size ();
-}
+    size_t Interconnect::
+    count_connect(void) const
+    {
+      return connect_.size ();
+    }
 
-// Interconnect
-//
-Interconnect::resource_iterator Interconnect::
-begin_resource ()
-{
-return resource_.begin ();
-}
+    // Interconnect
+    // 
+    Interconnect::resource_iterator Interconnect::
+    begin_resource ()
+    {
+      return resource_.begin ();
+    }
 
-Interconnect::resource_iterator Interconnect::
-end_resource ()
-{
-return resource_.end ();
-}
+    Interconnect::resource_iterator Interconnect::
+    end_resource ()
+    {
+      return resource_.end ();
+    }
 
-Interconnect::resource_const_iterator Interconnect::
-begin_resource () const
-{
-return resource_.begin ();
-}
+    Interconnect::resource_const_iterator Interconnect::
+    begin_resource () const
+    {
+      return resource_.begin ();
+    }
 
-Interconnect::resource_const_iterator Interconnect::
-end_resource () const
-{
-return resource_.end ();
-}
+    Interconnect::resource_const_iterator Interconnect::
+    end_resource () const
+    {
+      return resource_.end ();
+    }
 
-void Interconnect::
-add_resource (::CIAO::Config_Handlers::Resource const& e)
-{
-resource_.push_back (e);
-}
+    void Interconnect::
+    add_resource (::CIAO::Config_Handlers::Resource const& e)
+    {
+      resource_.push_back (e);
+    }
 
-size_t Interconnect::
-count_resource(void) const
-{
-return resource_.size ();
-}
+    size_t Interconnect::
+    count_resource(void) const
+    {
+      return resource_.size ();
+    }
 
 
-// Node
-//
+    // Node
+    // 
 
-Node::
-Node (::XMLSchema::string< ACE_TCHAR > const& name__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-regulator__ ()
-{
-name_->container (this);
-}
+    Node::
+    Node (::XMLSchema::string< ACE_TCHAR > const& name__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
+    {
+      name_->container (this);
+    }
 
-Node::
-Node (::CIAO::Config_Handlers::Node const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-regulator__ ()
-{
-name_->container (this);
-if (label_.get ()) label_->container (this);
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+    Node::
+    Node (::CIAO::Config_Handlers::Node const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    regulator__ ()
+    {
+      name_->container (this);
+      if (label_.get ()) label_->container (this);
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-{
-for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
-}
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+      }
 
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
-}
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::Node& Node::
-operator= (::CIAO::Config_Handlers::Node const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::Node& Node::
+    operator= (::CIAO::Config_Handlers::Node const& s)
+    {
+      name (s.name ());
 
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-connection_.clear ();
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+      connection_.clear ();
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-sharedResource_.clear ();
-{
-for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
-}
+      sharedResource_.clear ();
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+      }
 
-resource_.clear ();
-{
-for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-}
+      resource_.clear ();
+      {
+        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// Node
-//
-::XMLSchema::string< ACE_TCHAR > const& Node::
-name () const
-{
-return *name_;
-}
+    // Node
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& Node::
+    name () const
+    {
+      return *name_;
+    }
 
-void Node::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void Node::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// Node
-//
-bool Node::
-label_p () const
-{
-return label_.get () != 0;
-}
+    // Node
+    // 
+    bool Node::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& Node::
-label () const
-{
-return *label_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& Node::
+    label () const
+    {
+      return *label_;
+    }
 
-void Node::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+    void Node::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-// Node
-//
-Node::connection_iterator Node::
-begin_connection ()
-{
-return connection_.begin ();
-}
+    // Node
+    // 
+    Node::connection_iterator Node::
+    begin_connection ()
+    {
+      return connection_.begin ();
+    }
 
-Node::connection_iterator Node::
-end_connection ()
-{
-return connection_.end ();
-}
+    Node::connection_iterator Node::
+    end_connection ()
+    {
+      return connection_.end ();
+    }
 
-Node::connection_const_iterator Node::
-begin_connection () const
-{
-return connection_.begin ();
-}
+    Node::connection_const_iterator Node::
+    begin_connection () const
+    {
+      return connection_.begin ();
+    }
 
-Node::connection_const_iterator Node::
-end_connection () const
-{
-return connection_.end ();
-}
+    Node::connection_const_iterator Node::
+    end_connection () const
+    {
+      return connection_.end ();
+    }
 
-void Node::
-add_connection (::CIAO::Config_Handlers::Interconnect const& e)
-{
-connection_.push_back (e);
-}
+    void Node::
+    add_connection (::CIAO::Config_Handlers::Interconnect const& e)
+    {
+      connection_.push_back (e);
+    }
 
-size_t Node::
-count_connection(void) const
-{
-return connection_.size ();
-}
+    size_t Node::
+    count_connection(void) const
+    {
+      return connection_.size ();
+    }
 
-// Node
-//
-Node::sharedResource_iterator Node::
-begin_sharedResource ()
-{
-return sharedResource_.begin ();
-}
+    // Node
+    // 
+    Node::sharedResource_iterator Node::
+    begin_sharedResource ()
+    {
+      return sharedResource_.begin ();
+    }
 
-Node::sharedResource_iterator Node::
-end_sharedResource ()
-{
-return sharedResource_.end ();
-}
+    Node::sharedResource_iterator Node::
+    end_sharedResource ()
+    {
+      return sharedResource_.end ();
+    }
 
-Node::sharedResource_const_iterator Node::
-begin_sharedResource () const
-{
-return sharedResource_.begin ();
-}
+    Node::sharedResource_const_iterator Node::
+    begin_sharedResource () const
+    {
+      return sharedResource_.begin ();
+    }
 
-Node::sharedResource_const_iterator Node::
-end_sharedResource () const
-{
-return sharedResource_.end ();
-}
+    Node::sharedResource_const_iterator Node::
+    end_sharedResource () const
+    {
+      return sharedResource_.end ();
+    }
 
-void Node::
-add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
-{
-sharedResource_.push_back (e);
-}
+    void Node::
+    add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
+    {
+      sharedResource_.push_back (e);
+    }
 
-size_t Node::
-count_sharedResource(void) const
-{
-return sharedResource_.size ();
-}
+    size_t Node::
+    count_sharedResource(void) const
+    {
+      return sharedResource_.size ();
+    }
 
-// Node
-//
-Node::resource_iterator Node::
-begin_resource ()
-{
-return resource_.begin ();
-}
+    // Node
+    // 
+    Node::resource_iterator Node::
+    begin_resource ()
+    {
+      return resource_.begin ();
+    }
 
-Node::resource_iterator Node::
-end_resource ()
-{
-return resource_.end ();
-}
+    Node::resource_iterator Node::
+    end_resource ()
+    {
+      return resource_.end ();
+    }
 
-Node::resource_const_iterator Node::
-begin_resource () const
-{
-return resource_.begin ();
-}
+    Node::resource_const_iterator Node::
+    begin_resource () const
+    {
+      return resource_.begin ();
+    }
 
-Node::resource_const_iterator Node::
-end_resource () const
-{
-return resource_.end ();
-}
+    Node::resource_const_iterator Node::
+    end_resource () const
+    {
+      return resource_.end ();
+    }
 
-void Node::
-add_resource (::CIAO::Config_Handlers::Resource const& e)
-{
-resource_.push_back (e);
-}
+    void Node::
+    add_resource (::CIAO::Config_Handlers::Resource const& e)
+    {
+      resource_.push_back (e);
+    }
 
-size_t Node::
-count_resource(void) const
-{
-return resource_.size ();
-}
+    size_t Node::
+    count_resource(void) const
+    {
+      return resource_.size ();
+    }
 
 
-// SharedResource
-//
-
-SharedResource::
-SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::CIAO::Config_Handlers::Node const& node__,
-::CIAO::Config_Handlers::SatisfierProperty const& property__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-node_ (new ::CIAO::Config_Handlers::Node (node__)),
-property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
-regulator__ ()
-{
-name_->container (this);
-resourceType_->container (this);
-node_->container (this);
-property_->container (this);
-}
+    // SharedResource
+    // 
+
+    SharedResource::
+    SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
+                    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                    ::CIAO::Config_Handlers::Node const& node__,
+                    ::CIAO::Config_Handlers::SatisfierProperty const& property__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+    node_ (new ::CIAO::Config_Handlers::Node (node__)),
+    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      resourceType_->container (this);
+      node_->container (this);
+      property_->container (this);
+    }
 
-SharedResource::
-SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-node_ (new ::CIAO::Config_Handlers::Node (*s.node_)),
-property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-regulator__ ()
-{
-name_->container (this);
-resourceType_->container (this);
-node_->container (this);
-property_->container (this);
-}
+    SharedResource::
+    SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+    node_ (new ::CIAO::Config_Handlers::Node (*s.node_)),
+    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      resourceType_->container (this);
+      node_->container (this);
+      property_->container (this);
+    }
 
-::CIAO::Config_Handlers::SharedResource& SharedResource::
-operator= (::CIAO::Config_Handlers::SharedResource const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::SharedResource& SharedResource::
+    operator= (::CIAO::Config_Handlers::SharedResource const& s)
+    {
+      name (s.name ());
 
-resourceType (s.resourceType ());
+      resourceType (s.resourceType ());
 
-node (s.node ());
+      node (s.node ());
 
-property (s.property ());
+      property (s.property ());
 
-return *this;
-}
+      return *this;
+    }
 
 
-// SharedResource
-//
-::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-name () const
-{
-return *name_;
-}
+    // SharedResource
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+    name () const
+    {
+      return *name_;
+    }
 
-void SharedResource::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void SharedResource::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// SharedResource
-//
-::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-resourceType () const
-{
-return *resourceType_;
-}
+    // SharedResource
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+    resourceType () const
+    {
+      return *resourceType_;
+    }
 
-void SharedResource::
-resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*resourceType_ = e;
-}
+    void SharedResource::
+    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *resourceType_ = e;
+    }
 
-// SharedResource
-//
-::CIAO::Config_Handlers::Node const& SharedResource::
-node () const
-{
-return *node_;
-}
+    // SharedResource
+    // 
+    ::CIAO::Config_Handlers::Node const& SharedResource::
+    node () const
+    {
+      return *node_;
+    }
 
-void SharedResource::
-node (::CIAO::Config_Handlers::Node const& e)
-{
-*node_ = e;
-}
+    void SharedResource::
+    node (::CIAO::Config_Handlers::Node const& e)
+    {
+      *node_ = e;
+    }
 
-// SharedResource
-//
-::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
-property () const
-{
-return *property_;
-}
+    // SharedResource
+    // 
+    ::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
+    property () const
+    {
+      return *property_;
+    }
 
-void SharedResource::
-property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-{
-*property_ = e;
-}
-}
+    void SharedResource::
+    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+    {
+      *property_ = e;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-// Domain
-//
+  namespace Config_Handlers
+  {
+    // Domain
+    //
 
-Domain::
-Domain (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    Domain::
+    Domain (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "UUID")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-UUID (t);
-}
+        if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
 
-else if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
+        else if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
 
-else if (n == "node")
-{
-::CIAO::Config_Handlers::Node t (e);
-add_node (t);
-}
+        else if (n == "node")
+        {
+          ::CIAO::Config_Handlers::Node t (e);
+          add_node (t);
+        }
 
-else if (n == "interconnect")
-{
-::CIAO::Config_Handlers::Interconnect t (e);
-add_interconnect (t);
-}
+        else if (n == "interconnect")
+        {
+          ::CIAO::Config_Handlers::Interconnect t (e);
+          add_interconnect (t);
+        }
 
-else if (n == "bridge")
-{
-::CIAO::Config_Handlers::Bridge t (e);
-add_bridge (t);
-}
+        else if (n == "bridge")
+        {
+          ::CIAO::Config_Handlers::Bridge t (e);
+          add_bridge (t);
+        }
 
-else if (n == "sharedResource")
-{
-::CIAO::Config_Handlers::SharedResource t (e);
-add_sharedResource (t);
-}
+        else if (n == "sharedResource")
+        {
+          ::CIAO::Config_Handlers::SharedResource t (e);
+          add_sharedResource (t);
+        }
 
-else if (n == "infoProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_infoProperty (t);
-}
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// Bridge
-//
+    // Bridge
+    //
 
-Bridge::
-Bridge (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    Bridge::
+    Bridge (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
+        else if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
 
-else if (n == "connect")
-{
-::CIAO::Config_Handlers::Interconnect t (e);
-add_connect (t);
-}
+        else if (n == "connect")
+        {
+          ::CIAO::Config_Handlers::Interconnect t (e);
+          add_connect (t);
+        }
 
-else if (n == "resource")
-{
-::CIAO::Config_Handlers::Resource t (e);
-add_resource (t);
-}
+        else if (n == "resource")
+        {
+          ::CIAO::Config_Handlers::Resource t (e);
+          add_resource (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// Interconnect
-//
+    // Interconnect
+    //
 
-Interconnect::
-Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    Interconnect::
+    Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
+        else if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
 
-else if (n == "connection")
-{
-::CIAO::Config_Handlers::Bridge t (e);
-add_connection (t);
-}
+        else if (n == "connection")
+        {
+          ::CIAO::Config_Handlers::Bridge t (e);
+          add_connection (t);
+        }
 
-else if (n == "connect")
-{
-::CIAO::Config_Handlers::Node t (e);
-add_connect (t);
-}
+        else if (n == "connect")
+        {
+          ::CIAO::Config_Handlers::Node t (e);
+          add_connect (t);
+        }
 
-else if (n == "resource")
-{
-::CIAO::Config_Handlers::Resource t (e);
-add_resource (t);
-}
+        else if (n == "resource")
+        {
+          ::CIAO::Config_Handlers::Resource t (e);
+          add_resource (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// Node
-//
+    // Node
+    //
 
-Node::
-Node (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    Node::
+    Node (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
+        else if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
 
-else if (n == "connection")
-{
-::CIAO::Config_Handlers::Interconnect t (e);
-add_connection (t);
-}
+        else if (n == "connection")
+        {
+          ::CIAO::Config_Handlers::Interconnect t (e);
+          add_connection (t);
+        }
 
-else if (n == "sharedResource")
-{
-::CIAO::Config_Handlers::SharedResource t (e);
-add_sharedResource (t);
-}
+        else if (n == "sharedResource")
+        {
+          ::CIAO::Config_Handlers::SharedResource t (e);
+          add_sharedResource (t);
+        }
 
-else if (n == "resource")
-{
-::CIAO::Config_Handlers::Resource t (e);
-add_resource (t);
-}
+        else if (n == "resource")
+        {
+          ::CIAO::Config_Handlers::Resource t (e);
+          add_resource (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// SharedResource
-//
+    // SharedResource
+    //
 
-SharedResource::
-SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    SharedResource::
+    SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "resourceType")
-{
-resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-resourceType_->container (this);
-}
+        else if (n == "resourceType")
+        {
+          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceType_->container (this);
+        }
 
-else if (n == "node")
-{
-node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e));
-node_->container (this);
-}
+        else if (n == "node")
+        {
+          node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e));
+          node_->container (this);
+        }
 
-else if (n == "property")
-{
-property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
-property_->container (this);
-}
+        else if (n == "property")
+        {
+          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
+          property_->container (this);
+        }
 
-else
-{
-}
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace
-{
-::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-struct DomainTypeInfoInitializer
-{
-DomainTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Domain));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct DomainTypeInfoInitializer
+      {
+        DomainTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Domain));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-DomainTypeInfoInitializer DomainTypeInfoInitializer_;
+      DomainTypeInfoInitializer DomainTypeInfoInitializer_;
 
-struct BridgeTypeInfoInitializer
-{
-BridgeTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Bridge));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct BridgeTypeInfoInitializer
+      {
+        BridgeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Bridge));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-BridgeTypeInfoInitializer BridgeTypeInfoInitializer_;
+      BridgeTypeInfoInitializer BridgeTypeInfoInitializer_;
 
-struct InterconnectTypeInfoInitializer
-{
-InterconnectTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Interconnect));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct InterconnectTypeInfoInitializer
+      {
+        InterconnectTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Interconnect));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-InterconnectTypeInfoInitializer InterconnectTypeInfoInitializer_;
+      InterconnectTypeInfoInitializer InterconnectTypeInfoInitializer_;
 
-struct NodeTypeInfoInitializer
-{
-NodeTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (Node));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct NodeTypeInfoInitializer
+      {
+        NodeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (Node));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-NodeTypeInfoInitializer NodeTypeInfoInitializer_;
+      NodeTypeInfoInitializer NodeTypeInfoInitializer_;
 
-struct SharedResourceTypeInfoInitializer
-{
-SharedResourceTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SharedResource));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct SharedResourceTypeInfoInitializer
+      {
+        SharedResourceTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SharedResource));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-SharedResourceTypeInfoInitializer SharedResourceTypeInfoInitializer_;
-}
-}
+      SharedResourceTypeInfoInitializer SharedResourceTypeInfoInitializer_;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-// Domain
-//
-//
-
-void Domain::
-traverse (Type& o)
-{
-pre (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-node (o);
-interconnect (o);
-bridge (o);
-sharedResource (o);
-infoProperty (o);
-post (o);
-}
-
-void Domain::
-traverse (Type const& o)
-{
-pre (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-node (o);
-interconnect (o);
-bridge (o);
-sharedResource (o);
-infoProperty (o);
-post (o);
-}
-
-void Domain::
-pre (Type&)
-{
-}
-
-void Domain::
-pre (Type const&)
-{
-}
-
-void Domain::
-UUID (Type& o)
-{
-dispatch (o.UUID ());
-}
-
-void Domain::
-UUID (Type const& o)
-{
-dispatch (o.UUID ());
-}
-
-void Domain::
-UUID_none (Type&)
-{
-}
-
-void Domain::
-UUID_none (Type const&)
-{
-}
-
-void Domain::
-label (Type& o)
-{
-dispatch (o.label ());
-}
-
-void Domain::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
-
-void Domain::
-label_none (Type&)
-{
-}
-
-void Domain::
-label_none (Type const&)
-{
-}
-
-void Domain::
-node (Type& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::node_iterator b (o.begin_node()), e (o.end_node());
-
-if (b != e)
-{
-node_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) node_next (o);
-}
-
-node_post (o);
-}
-}
-
-void Domain::
-node (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
-
-if (b != e)
-{
-node_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) node_next (o);
-}
-
-node_post (o);
-}
-}
-
-void Domain::
-node_pre (Type&)
-{
-}
-
-void Domain::
-node_pre (Type const&)
-{
-}
-
-void Domain::
-node_next (Type&)
-{
-}
-
-void Domain::
-node_next (Type const&)
-{
-}
-
-void Domain::
-node_post (Type&)
-{
-}
-
-void Domain::
-node_post (Type const&)
-{
-}
-
-void Domain::
-interconnect (Type& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect());
-
-if (b != e)
-{
-interconnect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) interconnect_next (o);
-}
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // Domain
+      //
+      //
 
-interconnect_post (o);
-}
+      void Domain::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        node (o);
+        interconnect (o);
+        bridge (o);
+        sharedResource (o);
+        infoProperty (o);
+        post (o);
+      }
 
-else interconnect_none (o);
-}
+      void Domain::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        node (o);
+        interconnect (o);
+        bridge (o);
+        sharedResource (o);
+        infoProperty (o);
+        post (o);
+      }
 
-void Domain::
-interconnect (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::interconnect_const_iterator b (o.begin_interconnect()), e (o.end_interconnect());
+      void Domain::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-interconnect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) interconnect_next (o);
-}
+      void Domain::
+      pre (Type const&)
+      {
+      }
 
-interconnect_post (o);
-}
+      void Domain::
+      UUID (Type& o)
+      {
+        dispatch (o.UUID ());
+      }
 
-else interconnect_none (o);
-}
+      void Domain::
+      UUID (Type const& o)
+      {
+        dispatch (o.UUID ());
+      }
 
-void Domain::
-interconnect_pre (Type&)
-{
-}
+      void Domain::
+      UUID_none (Type&)
+      {
+      }
 
-void Domain::
-interconnect_pre (Type const&)
-{
-}
+      void Domain::
+      UUID_none (Type const&)
+      {
+      }
 
-void Domain::
-interconnect_next (Type&)
-{
-}
+      void Domain::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
 
-void Domain::
-interconnect_next (Type const&)
-{
-}
+      void Domain::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
 
-void Domain::
-interconnect_post (Type&)
-{
-}
+      void Domain::
+      label_none (Type&)
+      {
+      }
 
-void Domain::
-interconnect_post (Type const&)
-{
-}
+      void Domain::
+      label_none (Type const&)
+      {
+      }
 
-void Domain::
-interconnect_none (Type&)
-{
-}
+      void Domain::
+      node (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::node_iterator b (o.begin_node()), e (o.end_node());
 
-void Domain::
-interconnect_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          node_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) node_next (o);
+          }
+
+          node_post (o);
+        }
+      }
 
-void Domain::
-bridge (Type& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::bridge_iterator b (o.begin_bridge()), e (o.end_bridge());
+      void Domain::
+      node (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
 
-if (b != e)
-{
-bridge_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) bridge_next (o);
-}
+        if (b != e)
+        {
+          node_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) node_next (o);
+          }
+
+          node_post (o);
+        }
+      }
 
-bridge_post (o);
-}
+      void Domain::
+      node_pre (Type&)
+      {
+      }
 
-else bridge_none (o);
-}
+      void Domain::
+      node_pre (Type const&)
+      {
+      }
 
-void Domain::
-bridge (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge());
+      void Domain::
+      node_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-bridge_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) bridge_next (o);
-}
+      void Domain::
+      node_next (Type const&)
+      {
+      }
 
-bridge_post (o);
-}
+      void Domain::
+      node_post (Type&)
+      {
+      }
 
-else bridge_none (o);
-}
+      void Domain::
+      node_post (Type const&)
+      {
+      }
 
-void Domain::
-bridge_pre (Type&)
-{
-}
+      void Domain::
+      interconnect (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect());
 
-void Domain::
-bridge_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          interconnect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) interconnect_next (o);
+          }
+
+          interconnect_post (o);
+        }
 
-void Domain::
-bridge_next (Type&)
-{
-}
+        else interconnect_none (o);
+      }
 
-void Domain::
-bridge_next (Type const&)
-{
-}
+      void Domain::
+      interconnect (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::interconnect_const_iterator b (o.begin_interconnect()), e (o.end_interconnect());
 
-void Domain::
-bridge_post (Type&)
-{
-}
+        if (b != e)
+        {
+          interconnect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) interconnect_next (o);
+          }
+
+          interconnect_post (o);
+        }
 
-void Domain::
-bridge_post (Type const&)
-{
-}
+        else interconnect_none (o);
+      }
 
-void Domain::
-bridge_none (Type&)
-{
-}
+      void Domain::
+      interconnect_pre (Type&)
+      {
+      }
 
-void Domain::
-bridge_none (Type const&)
-{
-}
+      void Domain::
+      interconnect_pre (Type const&)
+      {
+      }
 
-void Domain::
-sharedResource (Type& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+      void Domain::
+      interconnect_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-sharedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) sharedResource_next (o);
-}
+      void Domain::
+      interconnect_next (Type const&)
+      {
+      }
 
-sharedResource_post (o);
-}
+      void Domain::
+      interconnect_post (Type&)
+      {
+      }
 
-else sharedResource_none (o);
-}
+      void Domain::
+      interconnect_post (Type const&)
+      {
+      }
 
-void Domain::
-sharedResource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+      void Domain::
+      interconnect_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-sharedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) sharedResource_next (o);
-}
+      void Domain::
+      interconnect_none (Type const&)
+      {
+      }
 
-sharedResource_post (o);
-}
+      void Domain::
+      bridge (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::bridge_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-else sharedResource_none (o);
-}
+        if (b != e)
+        {
+          bridge_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) bridge_next (o);
+          }
+
+          bridge_post (o);
+        }
 
-void Domain::
-sharedResource_pre (Type&)
-{
-}
+        else bridge_none (o);
+      }
 
-void Domain::
-sharedResource_pre (Type const&)
-{
-}
+      void Domain::
+      bridge (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-void Domain::
-sharedResource_next (Type&)
-{
-}
+        if (b != e)
+        {
+          bridge_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) bridge_next (o);
+          }
+
+          bridge_post (o);
+        }
 
-void Domain::
-sharedResource_next (Type const&)
-{
-}
+        else bridge_none (o);
+      }
 
-void Domain::
-sharedResource_post (Type&)
-{
-}
+      void Domain::
+      bridge_pre (Type&)
+      {
+      }
 
-void Domain::
-sharedResource_post (Type const&)
-{
-}
+      void Domain::
+      bridge_pre (Type const&)
+      {
+      }
 
-void Domain::
-sharedResource_none (Type&)
-{
-}
+      void Domain::
+      bridge_next (Type&)
+      {
+      }
 
-void Domain::
-sharedResource_none (Type const&)
-{
-}
+      void Domain::
+      bridge_next (Type const&)
+      {
+      }
 
-void Domain::
-infoProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+      void Domain::
+      bridge_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
+      void Domain::
+      bridge_post (Type const&)
+      {
+      }
 
-infoProperty_post (o);
-}
+      void Domain::
+      bridge_none (Type&)
+      {
+      }
 
-else infoProperty_none (o);
-}
+      void Domain::
+      bridge_none (Type const&)
+      {
+      }
 
-void Domain::
-infoProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Domain::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+      void Domain::
+      sharedResource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
+        if (b != e)
+        {
+          sharedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) sharedResource_next (o);
+          }
+
+          sharedResource_post (o);
+        }
 
-infoProperty_post (o);
-}
+        else sharedResource_none (o);
+      }
 
-else infoProperty_none (o);
-}
+      void Domain::
+      sharedResource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-void Domain::
-infoProperty_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          sharedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) sharedResource_next (o);
+          }
+
+          sharedResource_post (o);
+        }
 
-void Domain::
-infoProperty_pre (Type const&)
-{
-}
+        else sharedResource_none (o);
+      }
 
-void Domain::
-infoProperty_next (Type&)
-{
-}
+      void Domain::
+      sharedResource_pre (Type&)
+      {
+      }
 
-void Domain::
-infoProperty_next (Type const&)
-{
-}
+      void Domain::
+      sharedResource_pre (Type const&)
+      {
+      }
 
-void Domain::
-infoProperty_post (Type&)
-{
-}
+      void Domain::
+      sharedResource_next (Type&)
+      {
+      }
 
-void Domain::
-infoProperty_post (Type const&)
-{
-}
+      void Domain::
+      sharedResource_next (Type const&)
+      {
+      }
 
-void Domain::
-infoProperty_none (Type&)
-{
-}
+      void Domain::
+      sharedResource_post (Type&)
+      {
+      }
 
-void Domain::
-infoProperty_none (Type const&)
-{
-}
+      void Domain::
+      sharedResource_post (Type const&)
+      {
+      }
 
-void Domain::
-post (Type&)
-{
-}
+      void Domain::
+      sharedResource_none (Type&)
+      {
+      }
 
-void Domain::
-post (Type const&)
-{
-}
+      void Domain::
+      sharedResource_none (Type const&)
+      {
+      }
 
-// Bridge
-//
-//
+      void Domain::
+      infoProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-void Bridge::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connect (o);
-resource (o);
-post (o);
-}
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
 
-void Bridge::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connect (o);
-resource (o);
-post (o);
-}
+        else infoProperty_none (o);
+      }
 
-void Bridge::
-pre (Type&)
-{
-}
+      void Domain::
+      infoProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Domain::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-void Bridge::
-pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
 
-void Bridge::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+        else infoProperty_none (o);
+      }
 
-void Bridge::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void Domain::
+      infoProperty_pre (Type&)
+      {
+      }
 
-void Bridge::
-label (Type& o)
-{
-dispatch (o.label ());
-}
+      void Domain::
+      infoProperty_pre (Type const&)
+      {
+      }
 
-void Bridge::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
+      void Domain::
+      infoProperty_next (Type&)
+      {
+      }
 
-void Bridge::
-label_none (Type&)
-{
-}
+      void Domain::
+      infoProperty_next (Type const&)
+      {
+      }
 
-void Bridge::
-label_none (Type const&)
-{
-}
+      void Domain::
+      infoProperty_post (Type&)
+      {
+      }
 
-void Bridge::
-connect (Type& o)
-{
-// VC6 anathema strikes again
-//
-Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+      void Domain::
+      infoProperty_post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-connect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connect_next (o);
-}
+      void Domain::
+      infoProperty_none (Type&)
+      {
+      }
 
-connect_post (o);
-}
-}
+      void Domain::
+      infoProperty_none (Type const&)
+      {
+      }
 
-void Bridge::
-connect (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
+      void Domain::
+      post (Type&)
+      {
+      }
 
-if (b != e)
-{
-connect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connect_next (o);
-}
+      void Domain::
+      post (Type const&)
+      {
+      }
 
-connect_post (o);
-}
-}
+      // Bridge
+      //
+      //
 
-void Bridge::
-connect_pre (Type&)
-{
-}
+      void Bridge::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connect (o);
+        resource (o);
+        post (o);
+      }
 
-void Bridge::
-connect_pre (Type const&)
-{
-}
+      void Bridge::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connect (o);
+        resource (o);
+        post (o);
+      }
 
-void Bridge::
-connect_next (Type&)
-{
-}
+      void Bridge::
+      pre (Type&)
+      {
+      }
 
-void Bridge::
-connect_next (Type const&)
-{
-}
+      void Bridge::
+      pre (Type const&)
+      {
+      }
 
-void Bridge::
-connect_post (Type&)
-{
-}
+      void Bridge::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Bridge::
-connect_post (Type const&)
-{
-}
+      void Bridge::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Bridge::
-resource (Type& o)
-{
-// VC6 anathema strikes again
-//
-Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+      void Bridge::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+      void Bridge::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
 
-resource_post (o);
-}
+      void Bridge::
+      label_none (Type&)
+      {
+      }
 
-else resource_none (o);
-}
+      void Bridge::
+      label_none (Type const&)
+      {
+      }
 
-void Bridge::
-resource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+      void Bridge::
+      connect (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+        if (b != e)
+        {
+          connect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connect_next (o);
+          }
+
+          connect_post (o);
+        }
+      }
 
-resource_post (o);
-}
+      void Bridge::
+      connect (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
 
-else resource_none (o);
-}
+        if (b != e)
+        {
+          connect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connect_next (o);
+          }
+
+          connect_post (o);
+        }
+      }
 
-void Bridge::
-resource_pre (Type&)
-{
-}
+      void Bridge::
+      connect_pre (Type&)
+      {
+      }
 
-void Bridge::
-resource_pre (Type const&)
-{
-}
+      void Bridge::
+      connect_pre (Type const&)
+      {
+      }
 
-void Bridge::
-resource_next (Type&)
-{
-}
+      void Bridge::
+      connect_next (Type&)
+      {
+      }
 
-void Bridge::
-resource_next (Type const&)
-{
-}
+      void Bridge::
+      connect_next (Type const&)
+      {
+      }
 
-void Bridge::
-resource_post (Type&)
-{
-}
+      void Bridge::
+      connect_post (Type&)
+      {
+      }
 
-void Bridge::
-resource_post (Type const&)
-{
-}
+      void Bridge::
+      connect_post (Type const&)
+      {
+      }
 
-void Bridge::
-resource_none (Type&)
-{
-}
+      void Bridge::
+      resource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-void Bridge::
-resource_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-void Bridge::
-post (Type&)
-{
-}
+        else resource_none (o);
+      }
 
-void Bridge::
-post (Type const&)
-{
-}
+      void Bridge::
+      resource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-// Interconnect
-//
-//
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-void Interconnect::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connection (o);
-connect (o);
-resource (o);
-post (o);
-}
+        else resource_none (o);
+      }
 
-void Interconnect::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connection (o);
-connect (o);
-resource (o);
-post (o);
-}
+      void Bridge::
+      resource_pre (Type&)
+      {
+      }
 
-void Interconnect::
-pre (Type&)
-{
-}
+      void Bridge::
+      resource_pre (Type const&)
+      {
+      }
 
-void Interconnect::
-pre (Type const&)
-{
-}
+      void Bridge::
+      resource_next (Type&)
+      {
+      }
 
-void Interconnect::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void Bridge::
+      resource_next (Type const&)
+      {
+      }
 
-void Interconnect::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void Bridge::
+      resource_post (Type&)
+      {
+      }
 
-void Interconnect::
-label (Type& o)
-{
-dispatch (o.label ());
-}
+      void Bridge::
+      resource_post (Type const&)
+      {
+      }
 
-void Interconnect::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
+      void Bridge::
+      resource_none (Type&)
+      {
+      }
 
-void Interconnect::
-label_none (Type&)
-{
-}
+      void Bridge::
+      resource_none (Type const&)
+      {
+      }
 
-void Interconnect::
-label_none (Type const&)
-{
-}
+      void Bridge::
+      post (Type&)
+      {
+      }
 
-void Interconnect::
-connection (Type& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+      void Bridge::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      // Interconnect
+      //
+      //
 
-connection_post (o);
-}
+      void Interconnect::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connection (o);
+        connect (o);
+        resource (o);
+        post (o);
+      }
 
-else connection_none (o);
-}
+      void Interconnect::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connection (o);
+        connect (o);
+        resource (o);
+        post (o);
+      }
 
-void Interconnect::
-connection (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+      void Interconnect::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      void Interconnect::
+      pre (Type const&)
+      {
+      }
 
-connection_post (o);
-}
+      void Interconnect::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-else connection_none (o);
-}
+      void Interconnect::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void Interconnect::
-connection_pre (Type&)
-{
-}
+      void Interconnect::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
 
-void Interconnect::
-connection_pre (Type const&)
-{
-}
+      void Interconnect::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
 
-void Interconnect::
-connection_next (Type&)
-{
-}
+      void Interconnect::
+      label_none (Type&)
+      {
+      }
 
-void Interconnect::
-connection_next (Type const&)
-{
-}
+      void Interconnect::
+      label_none (Type const&)
+      {
+      }
 
-void Interconnect::
-connection_post (Type&)
-{
-}
+      void Interconnect::
+      connection (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-void Interconnect::
-connection_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-void Interconnect::
-connection_none (Type&)
-{
-}
+        else connection_none (o);
+      }
 
-void Interconnect::
-connection_none (Type const&)
-{
-}
+      void Interconnect::
+      connection (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-void Interconnect::
-connect (Type& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-if (b != e)
-{
-connect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connect_next (o);
-}
+        else connection_none (o);
+      }
 
-connect_post (o);
-}
-}
+      void Interconnect::
+      connection_pre (Type&)
+      {
+      }
 
-void Interconnect::
-connect (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
+      void Interconnect::
+      connection_pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-connect_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connect_next (o);
-}
+      void Interconnect::
+      connection_next (Type&)
+      {
+      }
 
-connect_post (o);
-}
-}
+      void Interconnect::
+      connection_next (Type const&)
+      {
+      }
 
-void Interconnect::
-connect_pre (Type&)
-{
-}
+      void Interconnect::
+      connection_post (Type&)
+      {
+      }
 
-void Interconnect::
-connect_pre (Type const&)
-{
-}
+      void Interconnect::
+      connection_post (Type const&)
+      {
+      }
 
-void Interconnect::
-connect_next (Type&)
-{
-}
+      void Interconnect::
+      connection_none (Type&)
+      {
+      }
 
-void Interconnect::
-connect_next (Type const&)
-{
-}
+      void Interconnect::
+      connection_none (Type const&)
+      {
+      }
 
-void Interconnect::
-connect_post (Type&)
-{
-}
+      void Interconnect::
+      connect (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-void Interconnect::
-connect_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          connect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connect_next (o);
+          }
+
+          connect_post (o);
+        }
+      }
 
-void Interconnect::
-resource (Type& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+      void Interconnect::
+      connect (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+        if (b != e)
+        {
+          connect_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connect_next (o);
+          }
+
+          connect_post (o);
+        }
+      }
 
-resource_post (o);
-}
+      void Interconnect::
+      connect_pre (Type&)
+      {
+      }
 
-else resource_none (o);
-}
+      void Interconnect::
+      connect_pre (Type const&)
+      {
+      }
 
-void Interconnect::
-resource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+      void Interconnect::
+      connect_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+      void Interconnect::
+      connect_next (Type const&)
+      {
+      }
 
-resource_post (o);
-}
+      void Interconnect::
+      connect_post (Type&)
+      {
+      }
 
-else resource_none (o);
-}
+      void Interconnect::
+      connect_post (Type const&)
+      {
+      }
 
-void Interconnect::
-resource_pre (Type&)
-{
-}
+      void Interconnect::
+      resource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-void Interconnect::
-resource_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-void Interconnect::
-resource_next (Type&)
-{
-}
+        else resource_none (o);
+      }
 
-void Interconnect::
-resource_next (Type const&)
-{
-}
+      void Interconnect::
+      resource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-void Interconnect::
-resource_post (Type&)
-{
-}
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-void Interconnect::
-resource_post (Type const&)
-{
-}
+        else resource_none (o);
+      }
 
-void Interconnect::
-resource_none (Type&)
-{
-}
+      void Interconnect::
+      resource_pre (Type&)
+      {
+      }
 
-void Interconnect::
-resource_none (Type const&)
-{
-}
+      void Interconnect::
+      resource_pre (Type const&)
+      {
+      }
 
-void Interconnect::
-post (Type&)
-{
-}
+      void Interconnect::
+      resource_next (Type&)
+      {
+      }
 
-void Interconnect::
-post (Type const&)
-{
-}
+      void Interconnect::
+      resource_next (Type const&)
+      {
+      }
 
-// Node
-//
-//
+      void Interconnect::
+      resource_post (Type&)
+      {
+      }
 
-void Node::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connection (o);
-sharedResource (o);
-resource (o);
-post (o);
-}
+      void Interconnect::
+      resource_post (Type const&)
+      {
+      }
 
-void Node::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-connection (o);
-sharedResource (o);
-resource (o);
-post (o);
-}
+      void Interconnect::
+      resource_none (Type&)
+      {
+      }
 
-void Node::
-pre (Type&)
-{
-}
+      void Interconnect::
+      resource_none (Type const&)
+      {
+      }
 
-void Node::
-pre (Type const&)
-{
-}
+      void Interconnect::
+      post (Type&)
+      {
+      }
 
-void Node::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void Interconnect::
+      post (Type const&)
+      {
+      }
 
-void Node::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      // Node
+      //
+      //
 
-void Node::
-label (Type& o)
-{
-dispatch (o.label ());
-}
+      void Node::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connection (o);
+        sharedResource (o);
+        resource (o);
+        post (o);
+      }
 
-void Node::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
+      void Node::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        connection (o);
+        sharedResource (o);
+        resource (o);
+        post (o);
+      }
 
-void Node::
-label_none (Type&)
-{
-}
+      void Node::
+      pre (Type&)
+      {
+      }
 
-void Node::
-label_none (Type const&)
-{
-}
+      void Node::
+      pre (Type const&)
+      {
+      }
 
-void Node::
-connection (Type& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+      void Node::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      void Node::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-connection_post (o);
-}
+      void Node::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
 
-else connection_none (o);
-}
+      void Node::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
 
-void Node::
-connection (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+      void Node::
+      label_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      void Node::
+      label_none (Type const&)
+      {
+      }
 
-connection_post (o);
-}
+      void Node::
+      connection (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-else connection_none (o);
-}
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-void Node::
-connection_pre (Type&)
-{
-}
+        else connection_none (o);
+      }
 
-void Node::
-connection_pre (Type const&)
-{
-}
+      void Node::
+      connection (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-void Node::
-connection_next (Type&)
-{
-}
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-void Node::
-connection_next (Type const&)
-{
-}
+        else connection_none (o);
+      }
 
-void Node::
-connection_post (Type&)
-{
-}
+      void Node::
+      connection_pre (Type&)
+      {
+      }
 
-void Node::
-connection_post (Type const&)
-{
-}
+      void Node::
+      connection_pre (Type const&)
+      {
+      }
 
-void Node::
-connection_none (Type&)
-{
-}
+      void Node::
+      connection_next (Type&)
+      {
+      }
 
-void Node::
-connection_none (Type const&)
-{
-}
+      void Node::
+      connection_next (Type const&)
+      {
+      }
 
-void Node::
-sharedResource (Type& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+      void Node::
+      connection_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-sharedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) sharedResource_next (o);
-}
+      void Node::
+      connection_post (Type const&)
+      {
+      }
 
-sharedResource_post (o);
-}
+      void Node::
+      connection_none (Type&)
+      {
+      }
 
-else sharedResource_none (o);
-}
+      void Node::
+      connection_none (Type const&)
+      {
+      }
 
-void Node::
-sharedResource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+      void Node::
+      sharedResource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-if (b != e)
-{
-sharedResource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) sharedResource_next (o);
-}
+        if (b != e)
+        {
+          sharedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) sharedResource_next (o);
+          }
+
+          sharedResource_post (o);
+        }
 
-sharedResource_post (o);
-}
+        else sharedResource_none (o);
+      }
 
-else sharedResource_none (o);
-}
+      void Node::
+      sharedResource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-void Node::
-sharedResource_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          sharedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) sharedResource_next (o);
+          }
+
+          sharedResource_post (o);
+        }
 
-void Node::
-sharedResource_pre (Type const&)
-{
-}
+        else sharedResource_none (o);
+      }
 
-void Node::
-sharedResource_next (Type&)
-{
-}
+      void Node::
+      sharedResource_pre (Type&)
+      {
+      }
 
-void Node::
-sharedResource_next (Type const&)
-{
-}
+      void Node::
+      sharedResource_pre (Type const&)
+      {
+      }
 
-void Node::
-sharedResource_post (Type&)
-{
-}
+      void Node::
+      sharedResource_next (Type&)
+      {
+      }
 
-void Node::
-sharedResource_post (Type const&)
-{
-}
+      void Node::
+      sharedResource_next (Type const&)
+      {
+      }
 
-void Node::
-sharedResource_none (Type&)
-{
-}
+      void Node::
+      sharedResource_post (Type&)
+      {
+      }
 
-void Node::
-sharedResource_none (Type const&)
-{
-}
+      void Node::
+      sharedResource_post (Type const&)
+      {
+      }
 
-void Node::
-resource (Type& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+      void Node::
+      sharedResource_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+      void Node::
+      sharedResource_none (Type const&)
+      {
+      }
 
-resource_post (o);
-}
+      void Node::
+      resource (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-else resource_none (o);
-}
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-void Node::
-resource (Type const& o)
-{
-// VC6 anathema strikes again
-//
-Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+        else resource_none (o);
+      }
 
-if (b != e)
-{
-resource_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) resource_next (o);
-}
+      void Node::
+      resource (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-resource_post (o);
-}
+        if (b != e)
+        {
+          resource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) resource_next (o);
+          }
+
+          resource_post (o);
+        }
 
-else resource_none (o);
-}
+        else resource_none (o);
+      }
 
-void Node::
-resource_pre (Type&)
-{
-}
+      void Node::
+      resource_pre (Type&)
+      {
+      }
 
-void Node::
-resource_pre (Type const&)
-{
-}
+      void Node::
+      resource_pre (Type const&)
+      {
+      }
 
-void Node::
-resource_next (Type&)
-{
-}
+      void Node::
+      resource_next (Type&)
+      {
+      }
 
-void Node::
-resource_next (Type const&)
-{
-}
+      void Node::
+      resource_next (Type const&)
+      {
+      }
 
-void Node::
-resource_post (Type&)
-{
-}
+      void Node::
+      resource_post (Type&)
+      {
+      }
 
-void Node::
-resource_post (Type const&)
-{
-}
+      void Node::
+      resource_post (Type const&)
+      {
+      }
 
-void Node::
-resource_none (Type&)
-{
-}
+      void Node::
+      resource_none (Type&)
+      {
+      }
 
-void Node::
-resource_none (Type const&)
-{
-}
+      void Node::
+      resource_none (Type const&)
+      {
+      }
 
-void Node::
-post (Type&)
-{
-}
+      void Node::
+      post (Type&)
+      {
+      }
 
-void Node::
-post (Type const&)
-{
-}
+      void Node::
+      post (Type const&)
+      {
+      }
 
-// SharedResource
-//
-//
+      // SharedResource
+      //
+      //
 
-void SharedResource::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-node (o);
-property (o);
-post (o);
-}
+      void SharedResource::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        node (o);
+        property (o);
+        post (o);
+      }
 
-void SharedResource::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-resourceType (o);
-node (o);
-property (o);
-post (o);
-}
+      void SharedResource::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        resourceType (o);
+        node (o);
+        property (o);
+        post (o);
+      }
 
-void SharedResource::
-pre (Type&)
-{
-}
+      void SharedResource::
+      pre (Type&)
+      {
+      }
 
-void SharedResource::
-pre (Type const&)
-{
-}
+      void SharedResource::
+      pre (Type const&)
+      {
+      }
 
-void SharedResource::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void SharedResource::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-void SharedResource::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void SharedResource::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void SharedResource::
-resourceType (Type& o)
-{
-dispatch (o.resourceType ());
-}
+      void SharedResource::
+      resourceType (Type& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-void SharedResource::
-resourceType (Type const& o)
-{
-dispatch (o.resourceType ());
-}
+      void SharedResource::
+      resourceType (Type const& o)
+      {
+        dispatch (o.resourceType ());
+      }
 
-void SharedResource::
-node (Type& o)
-{
-dispatch (o.node ());
-}
+      void SharedResource::
+      node (Type& o)
+      {
+        dispatch (o.node ());
+      }
 
-void SharedResource::
-node (Type const& o)
-{
-dispatch (o.node ());
-}
+      void SharedResource::
+      node (Type const& o)
+      {
+        dispatch (o.node ());
+      }
 
-void SharedResource::
-property (Type& o)
-{
-dispatch (o.property ());
-}
+      void SharedResource::
+      property (Type& o)
+      {
+        dispatch (o.property ());
+      }
 
-void SharedResource::
-property (Type const& o)
-{
-dispatch (o.property ());
-}
+      void SharedResource::
+      property (Type const& o)
+      {
+        dispatch (o.property ());
+      }
 
-void SharedResource::
-post (Type&)
-{
-}
+      void SharedResource::
+      post (Type&)
+      {
+      }
 
-void SharedResource::
-post (Type const&)
-{
-}
-}
-}
+      void SharedResource::
+      post (Type const&)
+      {
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-// Domain
-//
-//
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // Domain
+      //
+      //
 
-Domain::
-Domain (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      Domain::
+      Domain (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-Domain::
-Domain ()
-{
-}
+      Domain::
+      Domain ()
+      {
+      }
 
-void Domain::
-traverse (Type const& o)
-{
-Traversal::Domain::traverse (o);
-}
+      void Domain::
+      traverse (Type const& o)
+      {
+        Traversal::Domain::traverse (o);
+      }
 
-void Domain::
-UUID (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-Traversal::Domain::UUID (o);
-pop_ ();
-}
+      void Domain::
+      UUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+        Traversal::Domain::UUID (o);
+        pop_ ();
+      }
 
-void Domain::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::Domain::label (o);
-pop_ ();
-}
+      void Domain::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::Domain::label (o);
+        pop_ ();
+      }
 
-void Domain::
-node_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-}
+      void Domain::
+      node_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+      }
 
-void Domain::
-node_next (Type const& o)
-{
-node_post (o);
-node_pre (o);
-}
+      void Domain::
+      node_next (Type const& o)
+      {
+        node_post (o);
+        node_pre (o);
+      }
 
-void Domain::
-node_post (Type const&)
-{
-pop_ ();
-}
+      void Domain::
+      node_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Domain::
-interconnect_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
-}
+      void Domain::
+      interconnect_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
+      }
 
-void Domain::
-interconnect_next (Type const& o)
-{
-interconnect_post (o);
-interconnect_pre (o);
-}
+      void Domain::
+      interconnect_next (Type const& o)
+      {
+        interconnect_post (o);
+        interconnect_pre (o);
+      }
 
-void Domain::
-interconnect_post (Type const&)
-{
-pop_ ();
-}
+      void Domain::
+      interconnect_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Domain::
-bridge_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
-}
+      void Domain::
+      bridge_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
+      }
 
-void Domain::
-bridge_next (Type const& o)
-{
-bridge_post (o);
-bridge_pre (o);
-}
+      void Domain::
+      bridge_next (Type const& o)
+      {
+        bridge_post (o);
+        bridge_pre (o);
+      }
 
-void Domain::
-bridge_post (Type const&)
-{
-pop_ ();
-}
+      void Domain::
+      bridge_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Domain::
-sharedResource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-}
+      void Domain::
+      sharedResource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+      }
 
-void Domain::
-sharedResource_next (Type const& o)
-{
-sharedResource_post (o);
-sharedResource_pre (o);
-}
+      void Domain::
+      sharedResource_next (Type const& o)
+      {
+        sharedResource_post (o);
+        sharedResource_pre (o);
+      }
 
-void Domain::
-sharedResource_post (Type const&)
-{
-pop_ ();
-}
+      void Domain::
+      sharedResource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Domain::
-infoProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-}
+      void Domain::
+      infoProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+      }
 
-void Domain::
-infoProperty_next (Type const& o)
-{
-infoProperty_post (o);
-infoProperty_pre (o);
-}
+      void Domain::
+      infoProperty_next (Type const& o)
+      {
+        infoProperty_post (o);
+        infoProperty_pre (o);
+      }
 
-void Domain::
-infoProperty_post (Type const&)
-{
-pop_ ();
-}
+      void Domain::
+      infoProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// Bridge
-//
-//
+      // Bridge
+      //
+      //
 
-Bridge::
-Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      Bridge::
+      Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-Bridge::
-Bridge ()
-{
-}
+      Bridge::
+      Bridge ()
+      {
+      }
 
-void Bridge::
-traverse (Type const& o)
-{
-Traversal::Bridge::traverse (o);
-}
+      void Bridge::
+      traverse (Type const& o)
+      {
+        Traversal::Bridge::traverse (o);
+      }
 
-void Bridge::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Bridge::name (o);
-pop_ ();
-}
+      void Bridge::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Bridge::name (o);
+        pop_ ();
+      }
 
-void Bridge::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::Bridge::label (o);
-pop_ ();
-}
+      void Bridge::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::Bridge::label (o);
+        pop_ ();
+      }
 
-void Bridge::
-connect_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-}
+      void Bridge::
+      connect_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+      }
 
-void Bridge::
-connect_next (Type const& o)
-{
-connect_post (o);
-connect_pre (o);
-}
+      void Bridge::
+      connect_next (Type const& o)
+      {
+        connect_post (o);
+        connect_pre (o);
+      }
 
-void Bridge::
-connect_post (Type const&)
-{
-pop_ ();
-}
+      void Bridge::
+      connect_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Bridge::
-resource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-}
+      void Bridge::
+      resource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+      }
 
-void Bridge::
-resource_next (Type const& o)
-{
-resource_post (o);
-resource_pre (o);
-}
+      void Bridge::
+      resource_next (Type const& o)
+      {
+        resource_post (o);
+        resource_pre (o);
+      }
 
-void Bridge::
-resource_post (Type const&)
-{
-pop_ ();
-}
+      void Bridge::
+      resource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// Interconnect
-//
-//
+      // Interconnect
+      //
+      //
 
-Interconnect::
-Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      Interconnect::
+      Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-Interconnect::
-Interconnect ()
-{
-}
+      Interconnect::
+      Interconnect ()
+      {
+      }
 
-void Interconnect::
-traverse (Type const& o)
-{
-Traversal::Interconnect::traverse (o);
-}
+      void Interconnect::
+      traverse (Type const& o)
+      {
+        Traversal::Interconnect::traverse (o);
+      }
 
-void Interconnect::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Interconnect::name (o);
-pop_ ();
-}
+      void Interconnect::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Interconnect::name (o);
+        pop_ ();
+      }
 
-void Interconnect::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::Interconnect::label (o);
-pop_ ();
-}
+      void Interconnect::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::Interconnect::label (o);
+        pop_ ();
+      }
 
-void Interconnect::
-connection_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-}
+      void Interconnect::
+      connection_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+      }
 
-void Interconnect::
-connection_next (Type const& o)
-{
-connection_post (o);
-connection_pre (o);
-}
+      void Interconnect::
+      connection_next (Type const& o)
+      {
+        connection_post (o);
+        connection_pre (o);
+      }
 
-void Interconnect::
-connection_post (Type const&)
-{
-pop_ ();
-}
+      void Interconnect::
+      connection_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Interconnect::
-connect_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-}
+      void Interconnect::
+      connect_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+      }
 
-void Interconnect::
-connect_next (Type const& o)
-{
-connect_post (o);
-connect_pre (o);
-}
+      void Interconnect::
+      connect_next (Type const& o)
+      {
+        connect_post (o);
+        connect_pre (o);
+      }
 
-void Interconnect::
-connect_post (Type const&)
-{
-pop_ ();
-}
+      void Interconnect::
+      connect_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Interconnect::
-resource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-}
+      void Interconnect::
+      resource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+      }
 
-void Interconnect::
-resource_next (Type const& o)
-{
-resource_post (o);
-resource_pre (o);
-}
+      void Interconnect::
+      resource_next (Type const& o)
+      {
+        resource_post (o);
+        resource_pre (o);
+      }
 
-void Interconnect::
-resource_post (Type const&)
-{
-pop_ ();
-}
+      void Interconnect::
+      resource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// Node
-//
-//
+      // Node
+      //
+      //
 
-Node::
-Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      Node::
+      Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-Node::
-Node ()
-{
-}
+      Node::
+      Node ()
+      {
+      }
 
-void Node::
-traverse (Type const& o)
-{
-Traversal::Node::traverse (o);
-}
+      void Node::
+      traverse (Type const& o)
+      {
+        Traversal::Node::traverse (o);
+      }
 
-void Node::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::Node::name (o);
-pop_ ();
-}
+      void Node::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::Node::name (o);
+        pop_ ();
+      }
 
-void Node::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::Node::label (o);
-pop_ ();
-}
+      void Node::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::Node::label (o);
+        pop_ ();
+      }
 
-void Node::
-connection_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-}
+      void Node::
+      connection_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+      }
 
-void Node::
-connection_next (Type const& o)
-{
-connection_post (o);
-connection_pre (o);
-}
+      void Node::
+      connection_next (Type const& o)
+      {
+        connection_post (o);
+        connection_pre (o);
+      }
 
-void Node::
-connection_post (Type const&)
-{
-pop_ ();
-}
+      void Node::
+      connection_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Node::
-sharedResource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-}
+      void Node::
+      sharedResource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+      }
 
-void Node::
-sharedResource_next (Type const& o)
-{
-sharedResource_post (o);
-sharedResource_pre (o);
-}
+      void Node::
+      sharedResource_next (Type const& o)
+      {
+        sharedResource_post (o);
+        sharedResource_pre (o);
+      }
 
-void Node::
-sharedResource_post (Type const&)
-{
-pop_ ();
-}
+      void Node::
+      sharedResource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void Node::
-resource_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-}
+      void Node::
+      resource_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+      }
 
-void Node::
-resource_next (Type const& o)
-{
-resource_post (o);
-resource_pre (o);
-}
+      void Node::
+      resource_next (Type const& o)
+      {
+        resource_post (o);
+        resource_pre (o);
+      }
 
-void Node::
-resource_post (Type const&)
-{
-pop_ ();
-}
+      void Node::
+      resource_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// SharedResource
-//
-//
+      // SharedResource
+      //
+      //
 
-SharedResource::
-SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      SharedResource::
+      SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-SharedResource::
-SharedResource ()
-{
-}
+      SharedResource::
+      SharedResource ()
+      {
+      }
 
-void SharedResource::
-traverse (Type const& o)
-{
-Traversal::SharedResource::traverse (o);
-}
+      void SharedResource::
+      traverse (Type const& o)
+      {
+        Traversal::SharedResource::traverse (o);
+      }
 
-void SharedResource::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::SharedResource::name (o);
-pop_ ();
-}
+      void SharedResource::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::SharedResource::name (o);
+        pop_ ();
+      }
 
-void SharedResource::
-resourceType (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-Traversal::SharedResource::resourceType (o);
-pop_ ();
-}
+      void SharedResource::
+      resourceType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+        Traversal::SharedResource::resourceType (o);
+        pop_ ();
+      }
 
-void SharedResource::
-node (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-Traversal::SharedResource::node (o);
-pop_ ();
-}
+      void SharedResource::
+      node (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+        Traversal::SharedResource::node (o);
+        pop_ ();
+      }
 
-void SharedResource::
-property (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-Traversal::SharedResource::property (o);
-pop_ ();
-}
-}
-}
+      void SharedResource::
+      property (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+        Traversal::SharedResource::property (o);
+        pop_ ();
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
diff --git a/CIAO/tools/Config_Handlers/cdd.hpp b/CIAO/tools/Config_Handlers/cdd.hpp
index f2e599d1b9d..65c90942c53 100644
--- a/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/CIAO/tools/Config_Handlers/cdd.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,22 +15,22 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef CDD_HPP
 #define CDD_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class Domain;
-class Bridge;
-class Interconnect;
-class Node;
-class SharedResource;
-}
+  namespace Config_Handlers
+  {
+    class Domain;
+    class Bridge;
+    class Interconnect;
+    class Node;
+    class SharedResource;
+  }
 }
 
 #include <memory>
@@ -42,1694 +41,1689 @@ class SharedResource;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export Domain : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// node
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
-node_iterator begin_node ();
-node_iterator end_node ();
-node_const_iterator begin_node () const;
-node_const_iterator end_node () const;
-void add_node (::CIAO::Config_Handlers::Node const& );
-size_t count_node (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Node > node_;
-
-// interconnect
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator interconnect_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator interconnect_const_iterator;
-interconnect_iterator begin_interconnect ();
-interconnect_iterator end_interconnect ();
-interconnect_const_iterator begin_interconnect () const;
-interconnect_const_iterator end_interconnect () const;
-void add_interconnect (::CIAO::Config_Handlers::Interconnect const& );
-size_t count_interconnect (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Interconnect > interconnect_;
-
-// bridge
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator bridge_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator bridge_const_iterator;
-bridge_iterator begin_bridge ();
-bridge_iterator end_bridge ();
-bridge_const_iterator begin_bridge () const;
-bridge_const_iterator end_bridge () const;
-void add_bridge (::CIAO::Config_Handlers::Bridge const& );
-size_t count_bridge (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Bridge > bridge_;
-
-// sharedResource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
-sharedResource_iterator begin_sharedResource ();
-sharedResource_iterator end_sharedResource ();
-sharedResource_const_iterator begin_sharedResource () const;
-sharedResource_const_iterator end_sharedResource () const;
-void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-size_t count_sharedResource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-// infoProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-infoProperty_iterator begin_infoProperty ();
-infoProperty_iterator end_infoProperty ();
-infoProperty_const_iterator begin_infoProperty () const;
-infoProperty_const_iterator end_infoProperty () const;
-void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_infoProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-public:
-Domain ();
-
-Domain (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Domain (Domain const& s);
-
-Domain&
-operator= (Domain const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export Bridge : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// connect
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connect_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connect_const_iterator;
-connect_iterator begin_connect ();
-connect_iterator end_connect ();
-connect_const_iterator begin_connect () const;
-connect_const_iterator end_connect () const;
-void add_connect (::CIAO::Config_Handlers::Interconnect const& );
-size_t count_connect (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Interconnect > connect_;
-
-// resource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-resource_iterator begin_resource ();
-resource_iterator end_resource ();
-resource_const_iterator begin_resource () const;
-resource_const_iterator end_resource () const;
-void add_resource (::CIAO::Config_Handlers::Resource const& );
-size_t count_resource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-public:
-Bridge (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-Bridge (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Bridge (Bridge const& s);
-
-Bridge&
-operator= (Bridge const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export Interconnect : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// connection
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator connection_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator connection_const_iterator;
-connection_iterator begin_connection ();
-connection_iterator end_connection ();
-connection_const_iterator begin_connection () const;
-connection_const_iterator end_connection () const;
-void add_connection (::CIAO::Config_Handlers::Bridge const& );
-size_t count_connection (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Bridge > connection_;
-
-// connect
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator connect_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator connect_const_iterator;
-connect_iterator begin_connect ();
-connect_iterator end_connect ();
-connect_const_iterator begin_connect () const;
-connect_const_iterator end_connect () const;
-void add_connect (::CIAO::Config_Handlers::Node const& );
-size_t count_connect (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Node > connect_;
-
-// resource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-resource_iterator begin_resource ();
-resource_iterator end_resource ();
-resource_const_iterator begin_resource () const;
-resource_const_iterator end_resource () const;
-void add_resource (::CIAO::Config_Handlers::Resource const& );
-size_t count_resource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-public:
-Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Interconnect (Interconnect const& s);
-
-Interconnect&
-operator= (Interconnect const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export Node : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// connection
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connection_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connection_const_iterator;
-connection_iterator begin_connection ();
-connection_iterator end_connection ();
-connection_const_iterator begin_connection () const;
-connection_const_iterator end_connection () const;
-void add_connection (::CIAO::Config_Handlers::Interconnect const& );
-size_t count_connection (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Interconnect > connection_;
-
-// sharedResource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
-sharedResource_iterator begin_sharedResource ();
-sharedResource_iterator end_sharedResource ();
-sharedResource_const_iterator begin_sharedResource () const;
-sharedResource_const_iterator end_sharedResource () const;
-void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-size_t count_sharedResource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-// resource
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-resource_iterator begin_resource ();
-resource_iterator end_resource ();
-resource_const_iterator begin_resource () const;
-resource_const_iterator end_resource () const;
-void add_resource (::CIAO::Config_Handlers::Resource const& );
-size_t count_resource (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-public:
-Node (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-Node (::XSCRT::XML::Element< ACE_TCHAR > const&);
-Node (Node const& s);
-
-Node&
-operator= (Node const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export SharedResource : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// resourceType
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-// node
-//
-public:
-::CIAO::Config_Handlers::Node const& node () const;
-void node (::CIAO::Config_Handlers::Node const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
-
-// property
-//
-public:
-::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-public:
-SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-::CIAO::Config_Handlers::Node const& node__,
-::CIAO::Config_Handlers::SatisfierProperty const& property__);
-
-SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SharedResource (SharedResource const& s);
-
-SharedResource&
-operator= (SharedResource const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export Domain : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // node
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
+      node_iterator begin_node ();
+      node_iterator end_node ();
+      node_const_iterator begin_node () const;
+      node_const_iterator end_node () const;
+      void add_node (::CIAO::Config_Handlers::Node const& );
+      size_t count_node (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Node > node_;
+
+      // interconnect
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator interconnect_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator interconnect_const_iterator;
+      interconnect_iterator begin_interconnect ();
+      interconnect_iterator end_interconnect ();
+      interconnect_const_iterator begin_interconnect () const;
+      interconnect_const_iterator end_interconnect () const;
+      void add_interconnect (::CIAO::Config_Handlers::Interconnect const& );
+      size_t count_interconnect (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Interconnect > interconnect_;
+
+      // bridge
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator bridge_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator bridge_const_iterator;
+      bridge_iterator begin_bridge ();
+      bridge_iterator end_bridge ();
+      bridge_const_iterator begin_bridge () const;
+      bridge_const_iterator end_bridge () const;
+      void add_bridge (::CIAO::Config_Handlers::Bridge const& );
+      size_t count_bridge (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Bridge > bridge_;
+
+      // sharedResource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
+      sharedResource_iterator begin_sharedResource ();
+      sharedResource_iterator end_sharedResource ();
+      sharedResource_const_iterator begin_sharedResource () const;
+      sharedResource_const_iterator end_sharedResource () const;
+      void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
+      size_t count_sharedResource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
+
+      // infoProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+      infoProperty_iterator begin_infoProperty ();
+      infoProperty_iterator end_infoProperty ();
+      infoProperty_const_iterator begin_infoProperty () const;
+      infoProperty_const_iterator end_infoProperty () const;
+      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_infoProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+      public:
+      Domain ();
+
+      Domain (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Domain (Domain const& s);
+
+      Domain&
+      operator= (Domain const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Bridge : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // connect
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connect_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connect_const_iterator;
+      connect_iterator begin_connect ();
+      connect_iterator end_connect ();
+      connect_const_iterator begin_connect () const;
+      connect_const_iterator end_connect () const;
+      void add_connect (::CIAO::Config_Handlers::Interconnect const& );
+      size_t count_connect (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Interconnect > connect_;
+
+      // resource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+      resource_iterator begin_resource ();
+      resource_iterator end_resource ();
+      resource_const_iterator begin_resource () const;
+      resource_const_iterator end_resource () const;
+      void add_resource (::CIAO::Config_Handlers::Resource const& );
+      size_t count_resource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+      public:
+      Bridge (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Bridge (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Bridge (Bridge const& s);
+
+      Bridge&
+      operator= (Bridge const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Interconnect : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // connection
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator connection_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator connection_const_iterator;
+      connection_iterator begin_connection ();
+      connection_iterator end_connection ();
+      connection_const_iterator begin_connection () const;
+      connection_const_iterator end_connection () const;
+      void add_connection (::CIAO::Config_Handlers::Bridge const& );
+      size_t count_connection (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Bridge > connection_;
+
+      // connect
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator connect_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator connect_const_iterator;
+      connect_iterator begin_connect ();
+      connect_iterator end_connect ();
+      connect_const_iterator begin_connect () const;
+      connect_const_iterator end_connect () const;
+      void add_connect (::CIAO::Config_Handlers::Node const& );
+      size_t count_connect (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Node > connect_;
+
+      // resource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+      resource_iterator begin_resource ();
+      resource_iterator end_resource ();
+      resource_const_iterator begin_resource () const;
+      resource_const_iterator end_resource () const;
+      void add_resource (::CIAO::Config_Handlers::Resource const& );
+      size_t count_resource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+      public:
+      Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Interconnect (Interconnect const& s);
+
+      Interconnect&
+      operator= (Interconnect const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export Node : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // connection
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connection_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connection_const_iterator;
+      connection_iterator begin_connection ();
+      connection_iterator end_connection ();
+      connection_const_iterator begin_connection () const;
+      connection_const_iterator end_connection () const;
+      void add_connection (::CIAO::Config_Handlers::Interconnect const& );
+      size_t count_connection (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Interconnect > connection_;
+
+      // sharedResource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
+      sharedResource_iterator begin_sharedResource ();
+      sharedResource_iterator end_sharedResource ();
+      sharedResource_const_iterator begin_sharedResource () const;
+      sharedResource_const_iterator end_sharedResource () const;
+      void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
+      size_t count_sharedResource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
+
+      // resource
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+      resource_iterator begin_resource ();
+      resource_iterator end_resource ();
+      resource_const_iterator begin_resource () const;
+      resource_const_iterator end_resource () const;
+      void add_resource (::CIAO::Config_Handlers::Resource const& );
+      size_t count_resource (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+      public:
+      Node (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      Node (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      Node (Node const& s);
+
+      Node&
+      operator= (Node const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export SharedResource : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // resourceType
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+      // node
+      // 
+      public:
+      ::CIAO::Config_Handlers::Node const& node () const;
+      void node (::CIAO::Config_Handlers::Node const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
+
+      // property
+      // 
+      public:
+      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
+      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+
+      public:
+      SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
+                      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+                      ::CIAO::Config_Handlers::Node const& node__,
+                      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
+
+      SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SharedResource (SharedResource const& s);
+
+      SharedResource&
+      operator= (SharedResource const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
-{
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-node (Type&);
+        virtual void
+        node (Type&);
 
-virtual void
-node (Type const&);
+        virtual void
+        node (Type const&);
 
-virtual void
-node_pre (Type&);
+        virtual void
+        node_pre (Type&);
 
-virtual void
-node_pre (Type const&);
+        virtual void
+        node_pre (Type const&);
 
-virtual void
-node_next (Type&);
+        virtual void
+        node_next (Type&);
 
-virtual void
-node_next (Type const&);
+        virtual void
+        node_next (Type const&);
 
-virtual void
-node_post (Type&);
+        virtual void
+        node_post (Type&);
 
-virtual void
-node_post (Type const&);
+        virtual void
+        node_post (Type const&);
 
-virtual void
-interconnect (Type&);
+        virtual void
+        interconnect (Type&);
 
-virtual void
-interconnect (Type const&);
+        virtual void
+        interconnect (Type const&);
 
-virtual void
-interconnect_pre (Type&);
+        virtual void
+        interconnect_pre (Type&);
 
-virtual void
-interconnect_pre (Type const&);
+        virtual void
+        interconnect_pre (Type const&);
 
-virtual void
-interconnect_next (Type&);
+        virtual void
+        interconnect_next (Type&);
 
-virtual void
-interconnect_next (Type const&);
+        virtual void
+        interconnect_next (Type const&);
 
-virtual void
-interconnect_post (Type&);
+        virtual void
+        interconnect_post (Type&);
 
-virtual void
-interconnect_post (Type const&);
+        virtual void
+        interconnect_post (Type const&);
 
-virtual void
-interconnect_none (Type&);
+        virtual void
+        interconnect_none (Type&);
 
-virtual void
-interconnect_none (Type const&);
+        virtual void
+        interconnect_none (Type const&);
 
-virtual void
-bridge (Type&);
+        virtual void
+        bridge (Type&);
 
-virtual void
-bridge (Type const&);
+        virtual void
+        bridge (Type const&);
 
-virtual void
-bridge_pre (Type&);
+        virtual void
+        bridge_pre (Type&);
 
-virtual void
-bridge_pre (Type const&);
+        virtual void
+        bridge_pre (Type const&);
 
-virtual void
-bridge_next (Type&);
+        virtual void
+        bridge_next (Type&);
 
-virtual void
-bridge_next (Type const&);
+        virtual void
+        bridge_next (Type const&);
 
-virtual void
-bridge_post (Type&);
+        virtual void
+        bridge_post (Type&);
 
-virtual void
-bridge_post (Type const&);
+        virtual void
+        bridge_post (Type const&);
 
-virtual void
-bridge_none (Type&);
+        virtual void
+        bridge_none (Type&);
 
-virtual void
-bridge_none (Type const&);
+        virtual void
+        bridge_none (Type const&);
 
-virtual void
-sharedResource (Type&);
+        virtual void
+        sharedResource (Type&);
 
-virtual void
-sharedResource (Type const&);
+        virtual void
+        sharedResource (Type const&);
 
-virtual void
-sharedResource_pre (Type&);
+        virtual void
+        sharedResource_pre (Type&);
 
-virtual void
-sharedResource_pre (Type const&);
+        virtual void
+        sharedResource_pre (Type const&);
 
-virtual void
-sharedResource_next (Type&);
+        virtual void
+        sharedResource_next (Type&);
 
-virtual void
-sharedResource_next (Type const&);
+        virtual void
+        sharedResource_next (Type const&);
 
-virtual void
-sharedResource_post (Type&);
+        virtual void
+        sharedResource_post (Type&);
 
-virtual void
-sharedResource_post (Type const&);
+        virtual void
+        sharedResource_post (Type const&);
 
-virtual void
-sharedResource_none (Type&);
+        virtual void
+        sharedResource_none (Type&);
 
-virtual void
-sharedResource_none (Type const&);
+        virtual void
+        sharedResource_none (Type const&);
 
-virtual void
-infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-virtual void
-infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-virtual void
-infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-virtual void
-infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-connect (Type&);
+        virtual void
+        connect (Type&);
 
-virtual void
-connect (Type const&);
+        virtual void
+        connect (Type const&);
 
-virtual void
-connect_pre (Type&);
+        virtual void
+        connect_pre (Type&);
 
-virtual void
-connect_pre (Type const&);
+        virtual void
+        connect_pre (Type const&);
 
-virtual void
-connect_next (Type&);
+        virtual void
+        connect_next (Type&);
 
-virtual void
-connect_next (Type const&);
+        virtual void
+        connect_next (Type const&);
 
-virtual void
-connect_post (Type&);
+        virtual void
+        connect_post (Type&);
 
-virtual void
-connect_post (Type const&);
+        virtual void
+        connect_post (Type const&);
 
-virtual void
-resource (Type&);
+        virtual void
+        resource (Type&);
 
-virtual void
-resource (Type const&);
+        virtual void
+        resource (Type const&);
 
-virtual void
-resource_pre (Type&);
+        virtual void
+        resource_pre (Type&);
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type&);
+        virtual void
+        resource_next (Type&);
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type&);
+        virtual void
+        resource_post (Type&);
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-virtual void
-resource_none (Type&);
+        virtual void
+        resource_none (Type&);
 
-virtual void
-resource_none (Type const&);
+        virtual void
+        resource_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-connection (Type&);
+        virtual void
+        connection (Type&);
 
-virtual void
-connection (Type const&);
+        virtual void
+        connection (Type const&);
 
-virtual void
-connection_pre (Type&);
+        virtual void
+        connection_pre (Type&);
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type&);
+        virtual void
+        connection_next (Type&);
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type&);
+        virtual void
+        connection_post (Type&);
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-connection_none (Type&);
+        virtual void
+        connection_none (Type&);
 
-virtual void
-connection_none (Type const&);
+        virtual void
+        connection_none (Type const&);
 
-virtual void
-connect (Type&);
+        virtual void
+        connect (Type&);
 
-virtual void
-connect (Type const&);
+        virtual void
+        connect (Type const&);
 
-virtual void
-connect_pre (Type&);
+        virtual void
+        connect_pre (Type&);
 
-virtual void
-connect_pre (Type const&);
+        virtual void
+        connect_pre (Type const&);
 
-virtual void
-connect_next (Type&);
+        virtual void
+        connect_next (Type&);
 
-virtual void
-connect_next (Type const&);
+        virtual void
+        connect_next (Type const&);
 
-virtual void
-connect_post (Type&);
+        virtual void
+        connect_post (Type&);
 
-virtual void
-connect_post (Type const&);
+        virtual void
+        connect_post (Type const&);
 
-virtual void
-resource (Type&);
+        virtual void
+        resource (Type&);
 
-virtual void
-resource (Type const&);
+        virtual void
+        resource (Type const&);
 
-virtual void
-resource_pre (Type&);
+        virtual void
+        resource_pre (Type&);
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type&);
+        virtual void
+        resource_next (Type&);
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type&);
+        virtual void
+        resource_post (Type&);
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-virtual void
-resource_none (Type&);
+        virtual void
+        resource_none (Type&);
 
-virtual void
-resource_none (Type const&);
+        virtual void
+        resource_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-connection (Type&);
+        virtual void
+        connection (Type&);
 
-virtual void
-connection (Type const&);
+        virtual void
+        connection (Type const&);
 
-virtual void
-connection_pre (Type&);
+        virtual void
+        connection_pre (Type&);
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type&);
+        virtual void
+        connection_next (Type&);
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type&);
+        virtual void
+        connection_post (Type&);
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-connection_none (Type&);
+        virtual void
+        connection_none (Type&);
 
-virtual void
-connection_none (Type const&);
+        virtual void
+        connection_none (Type const&);
 
-virtual void
-sharedResource (Type&);
+        virtual void
+        sharedResource (Type&);
 
-virtual void
-sharedResource (Type const&);
+        virtual void
+        sharedResource (Type const&);
 
-virtual void
-sharedResource_pre (Type&);
+        virtual void
+        sharedResource_pre (Type&);
 
-virtual void
-sharedResource_pre (Type const&);
+        virtual void
+        sharedResource_pre (Type const&);
 
-virtual void
-sharedResource_next (Type&);
+        virtual void
+        sharedResource_next (Type&);
 
-virtual void
-sharedResource_next (Type const&);
+        virtual void
+        sharedResource_next (Type const&);
 
-virtual void
-sharedResource_post (Type&);
+        virtual void
+        sharedResource_post (Type&);
 
-virtual void
-sharedResource_post (Type const&);
+        virtual void
+        sharedResource_post (Type const&);
 
-virtual void
-sharedResource_none (Type&);
+        virtual void
+        sharedResource_none (Type&);
 
-virtual void
-sharedResource_none (Type const&);
+        virtual void
+        sharedResource_none (Type const&);
 
-virtual void
-resource (Type&);
+        virtual void
+        resource (Type&);
 
-virtual void
-resource (Type const&);
+        virtual void
+        resource (Type const&);
 
-virtual void
-resource_pre (Type&);
+        virtual void
+        resource_pre (Type&);
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type&);
+        virtual void
+        resource_next (Type&);
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type&);
+        virtual void
+        resource_post (Type&);
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-virtual void
-resource_none (Type&);
+        virtual void
+        resource_none (Type&);
 
-virtual void
-resource_none (Type const&);
+        virtual void
+        resource_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-resourceType (Type&);
+        virtual void
+        resourceType (Type&);
 
-virtual void
-resourceType (Type const&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-node (Type&);
+        virtual void
+        node (Type&);
 
-virtual void
-node (Type const&);
+        virtual void
+        node (Type const&);
 
-virtual void
-property (Type&);
+        virtual void
+        property (Type&);
 
-virtual void
-property (Type const&);
+        virtual void
+        property (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct Domain : Traversal::Domain,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Domain Type;
-Domain (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct Domain : Traversal::Domain, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Domain Type;
+        Domain (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-node_pre (Type &o)
-{
+        virtual void 
+        node_pre (Type &o)
+        {
 
-this->node_pre (const_cast <Type const &> (o));
-}
+          this->node_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-node_pre (Type const&);
+        virtual void
+        node_pre (Type const&);
 
-virtual void
-node_next (Type &o)
-{
+        virtual void 
+        node_next (Type &o)
+        {
 
-this->node_next (const_cast <Type const &> (o));
-}
+          this->node_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-node_next (Type const&);
+        virtual void
+        node_next (Type const&);
 
-virtual void
-node_post (Type &o)
-{
+        virtual void 
+        node_post (Type &o)
+        {
 
-this->node_post (const_cast <Type const &> (o));
-}
+          this->node_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-node_post (Type const&);
+        virtual void
+        node_post (Type const&);
 
-virtual void
-interconnect_pre (Type &o)
-{
+        virtual void 
+        interconnect_pre (Type &o)
+        {
 
-this->interconnect_pre (const_cast <Type const &> (o));
-}
+          this->interconnect_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-interconnect_pre (Type const&);
+        virtual void
+        interconnect_pre (Type const&);
 
-virtual void
-interconnect_next (Type &o)
-{
+        virtual void 
+        interconnect_next (Type &o)
+        {
 
-this->interconnect_next (const_cast <Type const &> (o));
-}
+          this->interconnect_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-interconnect_next (Type const&);
+        virtual void
+        interconnect_next (Type const&);
 
-virtual void
-interconnect_post (Type &o)
-{
+        virtual void 
+        interconnect_post (Type &o)
+        {
 
-this->interconnect_post (const_cast <Type const &> (o));
-}
+          this->interconnect_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-interconnect_post (Type const&);
+        virtual void
+        interconnect_post (Type const&);
 
-virtual void
-bridge_pre (Type &o)
-{
+        virtual void 
+        bridge_pre (Type &o)
+        {
 
-this->bridge_pre (const_cast <Type const &> (o));
-}
+          this->bridge_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-bridge_pre (Type const&);
+        virtual void
+        bridge_pre (Type const&);
 
-virtual void
-bridge_next (Type &o)
-{
+        virtual void 
+        bridge_next (Type &o)
+        {
 
-this->bridge_next (const_cast <Type const &> (o));
-}
+          this->bridge_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-bridge_next (Type const&);
+        virtual void
+        bridge_next (Type const&);
 
-virtual void
-bridge_post (Type &o)
-{
+        virtual void 
+        bridge_post (Type &o)
+        {
 
-this->bridge_post (const_cast <Type const &> (o));
-}
+          this->bridge_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-bridge_post (Type const&);
+        virtual void
+        bridge_post (Type const&);
 
-virtual void
-sharedResource_pre (Type &o)
-{
+        virtual void 
+        sharedResource_pre (Type &o)
+        {
 
-this->sharedResource_pre (const_cast <Type const &> (o));
-}
+          this->sharedResource_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_pre (Type const&);
+        virtual void
+        sharedResource_pre (Type const&);
 
-virtual void
-sharedResource_next (Type &o)
-{
+        virtual void 
+        sharedResource_next (Type &o)
+        {
 
-this->sharedResource_next (const_cast <Type const &> (o));
-}
+          this->sharedResource_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_next (Type const&);
+        virtual void
+        sharedResource_next (Type const&);
 
-virtual void
-sharedResource_post (Type &o)
-{
+        virtual void 
+        sharedResource_post (Type &o)
+        {
 
-this->sharedResource_post (const_cast <Type const &> (o));
-}
+          this->sharedResource_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_post (Type const&);
+        virtual void
+        sharedResource_post (Type const&);
 
-virtual void
-infoProperty_pre (Type &o)
-{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-this->infoProperty_pre (const_cast <Type const &> (o));
-}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type &o)
-{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-this->infoProperty_next (const_cast <Type const &> (o));
-}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type &o)
-{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-this->infoProperty_post (const_cast <Type const &> (o));
-}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-protected:
-Domain ();
-};
+        protected:
+        Domain ();
+      };
 
-struct Bridge : Traversal::Bridge,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Bridge Type;
-Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct Bridge : Traversal::Bridge, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Bridge Type;
+        Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-connect_pre (Type &o)
-{
+        virtual void 
+        connect_pre (Type &o)
+        {
 
-this->connect_pre (const_cast <Type const &> (o));
-}
+          this->connect_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_pre (Type const&);
+        virtual void
+        connect_pre (Type const&);
 
-virtual void
-connect_next (Type &o)
-{
+        virtual void 
+        connect_next (Type &o)
+        {
 
-this->connect_next (const_cast <Type const &> (o));
-}
+          this->connect_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_next (Type const&);
+        virtual void
+        connect_next (Type const&);
 
-virtual void
-connect_post (Type &o)
-{
+        virtual void 
+        connect_post (Type &o)
+        {
 
-this->connect_post (const_cast <Type const &> (o));
-}
+          this->connect_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_post (Type const&);
+        virtual void
+        connect_post (Type const&);
 
-virtual void
-resource_pre (Type &o)
-{
+        virtual void 
+        resource_pre (Type &o)
+        {
 
-this->resource_pre (const_cast <Type const &> (o));
-}
+          this->resource_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type &o)
-{
+        virtual void 
+        resource_next (Type &o)
+        {
 
-this->resource_next (const_cast <Type const &> (o));
-}
+          this->resource_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type &o)
-{
+        virtual void 
+        resource_post (Type &o)
+        {
 
-this->resource_post (const_cast <Type const &> (o));
-}
+          this->resource_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-protected:
-Bridge ();
-};
+        protected:
+        Bridge ();
+      };
 
-struct Interconnect : Traversal::Interconnect,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Interconnect Type;
-Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct Interconnect : Traversal::Interconnect, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Interconnect Type;
+        Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-connection_pre (Type &o)
-{
+        virtual void 
+        connection_pre (Type &o)
+        {
 
-this->connection_pre (const_cast <Type const &> (o));
-}
+          this->connection_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type &o)
-{
+        virtual void 
+        connection_next (Type &o)
+        {
 
-this->connection_next (const_cast <Type const &> (o));
-}
+          this->connection_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type &o)
-{
+        virtual void 
+        connection_post (Type &o)
+        {
 
-this->connection_post (const_cast <Type const &> (o));
-}
+          this->connection_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-connect_pre (Type &o)
-{
+        virtual void 
+        connect_pre (Type &o)
+        {
 
-this->connect_pre (const_cast <Type const &> (o));
-}
+          this->connect_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_pre (Type const&);
+        virtual void
+        connect_pre (Type const&);
 
-virtual void
-connect_next (Type &o)
-{
+        virtual void 
+        connect_next (Type &o)
+        {
 
-this->connect_next (const_cast <Type const &> (o));
-}
+          this->connect_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_next (Type const&);
+        virtual void
+        connect_next (Type const&);
 
-virtual void
-connect_post (Type &o)
-{
+        virtual void 
+        connect_post (Type &o)
+        {
 
-this->connect_post (const_cast <Type const &> (o));
-}
+          this->connect_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connect_post (Type const&);
+        virtual void
+        connect_post (Type const&);
 
-virtual void
-resource_pre (Type &o)
-{
+        virtual void 
+        resource_pre (Type &o)
+        {
 
-this->resource_pre (const_cast <Type const &> (o));
-}
+          this->resource_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type &o)
-{
+        virtual void 
+        resource_next (Type &o)
+        {
 
-this->resource_next (const_cast <Type const &> (o));
-}
+          this->resource_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type &o)
-{
+        virtual void 
+        resource_post (Type &o)
+        {
 
-this->resource_post (const_cast <Type const &> (o));
-}
+          this->resource_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-protected:
-Interconnect ();
-};
+        protected:
+        Interconnect ();
+      };
 
-struct Node : Traversal::Node,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::Node Type;
-Node (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct Node : Traversal::Node, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::Node Type;
+        Node (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-connection_pre (Type &o)
-{
+        virtual void 
+        connection_pre (Type &o)
+        {
 
-this->connection_pre (const_cast <Type const &> (o));
-}
+          this->connection_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type &o)
-{
+        virtual void 
+        connection_next (Type &o)
+        {
 
-this->connection_next (const_cast <Type const &> (o));
-}
+          this->connection_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type &o)
-{
+        virtual void 
+        connection_post (Type &o)
+        {
 
-this->connection_post (const_cast <Type const &> (o));
-}
+          this->connection_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-sharedResource_pre (Type &o)
-{
+        virtual void 
+        sharedResource_pre (Type &o)
+        {
 
-this->sharedResource_pre (const_cast <Type const &> (o));
-}
+          this->sharedResource_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_pre (Type const&);
+        virtual void
+        sharedResource_pre (Type const&);
 
-virtual void
-sharedResource_next (Type &o)
-{
+        virtual void 
+        sharedResource_next (Type &o)
+        {
 
-this->sharedResource_next (const_cast <Type const &> (o));
-}
+          this->sharedResource_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_next (Type const&);
+        virtual void
+        sharedResource_next (Type const&);
 
-virtual void
-sharedResource_post (Type &o)
-{
+        virtual void 
+        sharedResource_post (Type &o)
+        {
 
-this->sharedResource_post (const_cast <Type const &> (o));
-}
+          this->sharedResource_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-sharedResource_post (Type const&);
+        virtual void
+        sharedResource_post (Type const&);
 
-virtual void
-resource_pre (Type &o)
-{
+        virtual void 
+        resource_pre (Type &o)
+        {
 
-this->resource_pre (const_cast <Type const &> (o));
-}
+          this->resource_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_pre (Type const&);
+        virtual void
+        resource_pre (Type const&);
 
-virtual void
-resource_next (Type &o)
-{
+        virtual void 
+        resource_next (Type &o)
+        {
 
-this->resource_next (const_cast <Type const &> (o));
-}
+          this->resource_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_next (Type const&);
+        virtual void
+        resource_next (Type const&);
 
-virtual void
-resource_post (Type &o)
-{
+        virtual void 
+        resource_post (Type &o)
+        {
 
-this->resource_post (const_cast <Type const &> (o));
-}
+          this->resource_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resource_post (Type const&);
+        virtual void
+        resource_post (Type const&);
 
-protected:
-Node ();
-};
+        protected:
+        Node ();
+      };
 
-struct SharedResource : Traversal::SharedResource,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::SharedResource Type;
-SharedResource (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct SharedResource : Traversal::SharedResource, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SharedResource Type;
+        SharedResource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-resourceType (Type &o)
-{
+        virtual void 
+        resourceType (Type &o)
+        {
 
-this->resourceType (const_cast <Type const &> (o));
-}
+          this->resourceType (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-resourceType (Type const&);
+        virtual void
+        resourceType (Type const&);
 
-virtual void
-node (Type &o)
-{
+        virtual void 
+        node (Type &o)
+        {
 
-this->node (const_cast <Type const &> (o));
-}
+          this->node (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-node (Type const&);
+        virtual void
+        node (Type const&);
 
-virtual void
-property (Type &o)
-{
+        virtual void 
+        property (Type &o)
+        {
 
-this->property (const_cast <Type const &> (o));
-}
+          this->property (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-property (Type const&);
+        virtual void
+        property (Type const&);
 
-protected:
-SharedResource ();
-};
-}
-}
+        protected:
+        SharedResource ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // CDD_HPP
diff --git a/CIAO/tools/Config_Handlers/cdp.cpp b/CIAO/tools/Config_Handlers/cdp.cpp
index 0ba7c13577d..642932e59e9 100644
--- a/CIAO/tools/Config_Handlers/cdp.cpp
+++ b/CIAO/tools/Config_Handlers/cdp.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "cdp.hpp"
 
 namespace CIAO
@@ -16,24 +22,24 @@ namespace CIAO
   namespace Config_Handlers
   {
     // DeploymentPlan
-    //
+    // 
 
     DeploymentPlan::
     DeploymentPlan ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     DeploymentPlan::
     DeploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s)
-      :
-      ::XSCRT::Type (),
-      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-          realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
-          regulator__ ()
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
+    regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
@@ -110,7 +116,7 @@ namespace CIAO
 
 
     // DeploymentPlan
-    //
+    // 
     bool DeploymentPlan::
     label_p () const
     {
@@ -127,19 +133,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-        {
-          *label_ = e;
-        }
+      {
+        *label_ = e;
+      }
 
       else
-        {
-          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          label_->container (this);
-        }
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
     }
 
     // DeploymentPlan
-    //
+    // 
     bool DeploymentPlan::
     UUID_p () const
     {
@@ -156,19 +162,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-        {
-          *UUID_ = e;
-        }
+      {
+        *UUID_ = e;
+      }
 
       else
-        {
-          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          UUID_->container (this);
-        }
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
     }
 
     // DeploymentPlan
-    //
+    // 
     bool DeploymentPlan::
     realizes_p () const
     {
@@ -185,19 +191,19 @@ namespace CIAO
     realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
     {
       if (realizes_.get ())
-        {
-          *realizes_ = e;
-        }
+      {
+        *realizes_ = e;
+      }
 
       else
-        {
-          realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-          realizes_->container (this);
-        }
+      {
+        realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+        realizes_->container (this);
+      }
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::implementation_iterator DeploymentPlan::
     begin_implementation ()
     {
@@ -235,7 +241,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::instance_iterator DeploymentPlan::
     begin_instance ()
     {
@@ -273,7 +279,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::connection_iterator DeploymentPlan::
     begin_connection ()
     {
@@ -311,7 +317,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::dependsOn_iterator DeploymentPlan::
     begin_dependsOn ()
     {
@@ -349,7 +355,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::artifact_iterator DeploymentPlan::
     begin_artifact ()
     {
@@ -387,7 +393,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    //
+    // 
     DeploymentPlan::infoProperty_iterator DeploymentPlan::
     begin_infoProperty ()
     {
@@ -435,74 +441,74 @@ namespace CIAO
 
     DeploymentPlan::
     DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "label")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "label")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              label (t);
-            }
-
-          else if (n == "UUID")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              UUID (t);
-            }
-
-          else if (n == "realizes")
-            {
-              ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-              realizes (t);
-            }
-
-          else if (n == "implementation")
-            {
-              ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e);
-              add_implementation (t);
-            }
-
-          else if (n == "instance")
-            {
-              ::CIAO::Config_Handlers::InstanceDeploymentDescription t (e);
-              add_instance (t);
-            }
-
-          else if (n == "connection")
-            {
-              ::CIAO::Config_Handlers::PlanConnectionDescription t (e);
-              add_connection (t);
-            }
-
-          else if (n == "dependsOn")
-            {
-              ::CIAO::Config_Handlers::ImplementationDependency t (e);
-              add_dependsOn (t);
-            }
-
-          else if (n == "artifact")
-            {
-              ::CIAO::Config_Handlers::ArtifactDeploymentDescription t (e);
-              add_artifact (t);
-            }
-
-          else if (n == "infoProperty")
-            {
-              ::CIAO::Config_Handlers::Property t (e);
-              add_infoProperty (t);
-            }
-
-          else
-            {
-            }
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
         }
+
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
+
+        else if (n == "realizes")
+        {
+          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+          realizes (t);
+        }
+
+        else if (n == "implementation")
+        {
+          ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e);
+          add_implementation (t);
+        }
+
+        else if (n == "instance")
+        {
+          ::CIAO::Config_Handlers::InstanceDeploymentDescription t (e);
+          add_instance (t);
+        }
+
+        else if (n == "connection")
+        {
+          ::CIAO::Config_Handlers::PlanConnectionDescription t (e);
+          add_connection (t);
+        }
+
+        else if (n == "dependsOn")
+        {
+          ::CIAO::Config_Handlers::ImplementationDependency t (e);
+          add_dependsOn (t);
+        }
+
+        else if (n == "artifact")
+        {
+          ::CIAO::Config_Handlers::ArtifactDeploymentDescription t (e);
+          add_artifact (t);
+        }
+
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
+
+        else 
+        {
+        }
+      }
     }
   }
 }
@@ -673,16 +679,16 @@ namespace CIAO
         DeploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
+        {
+          implementation_pre (o);
+          for (; b != e;)
           {
-            implementation_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) implementation_next (o);
-              }
-
-            implementation_post (o);
+            dispatch (*b);
+            if (++b != e) implementation_next (o);
           }
+
+          implementation_post (o);
+        }
       }
 
       void DeploymentPlan::
@@ -693,16 +699,16 @@ namespace CIAO
         DeploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
+        {
+          implementation_pre (o);
+          for (; b != e;)
           {
-            implementation_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) implementation_next (o);
-              }
-
-            implementation_post (o);
+            dispatch (*b);
+            if (++b != e) implementation_next (o);
           }
+
+          implementation_post (o);
+        }
       }
 
       void DeploymentPlan::
@@ -743,17 +749,17 @@ namespace CIAO
         DeploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
+        {
+          instance_pre (o);
+          for (; b != e;)
           {
-            instance_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) instance_next (o);
-              }
-
-            instance_post (o);
+            dispatch (*b);
+            if (++b != e) instance_next (o);
           }
 
+          instance_post (o);
+        }
+
         else instance_none (o);
       }
 
@@ -765,17 +771,17 @@ namespace CIAO
         DeploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
+        {
+          instance_pre (o);
+          for (; b != e;)
           {
-            instance_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) instance_next (o);
-              }
-
-            instance_post (o);
+            dispatch (*b);
+            if (++b != e) instance_next (o);
           }
 
+          instance_post (o);
+        }
+
         else instance_none (o);
       }
 
@@ -827,17 +833,17 @@ namespace CIAO
         DeploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
           {
-            connection_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) connection_next (o);
-              }
-
-            connection_post (o);
+            dispatch (*b);
+            if (++b != e) connection_next (o);
           }
 
+          connection_post (o);
+        }
+
         else connection_none (o);
       }
 
@@ -849,17 +855,17 @@ namespace CIAO
         DeploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
           {
-            connection_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) connection_next (o);
-              }
-
-            connection_post (o);
+            dispatch (*b);
+            if (++b != e) connection_next (o);
           }
 
+          connection_post (o);
+        }
+
         else connection_none (o);
       }
 
@@ -911,17 +917,17 @@ namespace CIAO
         DeploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
           {
-            dependsOn_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) dependsOn_next (o);
-              }
-
-            dependsOn_post (o);
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
           }
 
+          dependsOn_post (o);
+        }
+
         else dependsOn_none (o);
       }
 
@@ -933,17 +939,17 @@ namespace CIAO
         DeploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
           {
-            dependsOn_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) dependsOn_next (o);
-              }
-
-            dependsOn_post (o);
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
           }
 
+          dependsOn_post (o);
+        }
+
         else dependsOn_none (o);
       }
 
@@ -995,17 +1001,17 @@ namespace CIAO
         DeploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
+        {
+          artifact_pre (o);
+          for (; b != e;)
           {
-            artifact_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) artifact_next (o);
-              }
-
-            artifact_post (o);
+            dispatch (*b);
+            if (++b != e) artifact_next (o);
           }
 
+          artifact_post (o);
+        }
+
         else artifact_none (o);
       }
 
@@ -1017,17 +1023,17 @@ namespace CIAO
         DeploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
+        {
+          artifact_pre (o);
+          for (; b != e;)
           {
-            artifact_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) artifact_next (o);
-              }
-
-            artifact_post (o);
+            dispatch (*b);
+            if (++b != e) artifact_next (o);
           }
 
+          artifact_post (o);
+        }
+
         else artifact_none (o);
       }
 
@@ -1079,17 +1085,17 @@ namespace CIAO
         DeploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
           {
-            infoProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) infoProperty_next (o);
-              }
-
-            infoProperty_post (o);
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
           }
 
+          infoProperty_post (o);
+        }
+
         else infoProperty_none (o);
       }
 
@@ -1101,17 +1107,17 @@ namespace CIAO
         DeploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
           {
-            infoProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) infoProperty_next (o);
-              }
-
-            infoProperty_post (o);
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
           }
 
+          infoProperty_post (o);
+        }
+
         else infoProperty_none (o);
       }
 
@@ -1180,7 +1186,7 @@ namespace CIAO
 
       DeploymentPlan::
       DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
diff --git a/CIAO/tools/Config_Handlers/cdp.hpp b/CIAO/tools/Config_Handlers/cdp.hpp
index f6033db9fca..df7d0a36ad6 100644
--- a/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/CIAO/tools/Config_Handlers/cdp.hpp
@@ -9,18 +9,16 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
-
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
-
 #ifndef CDP_HPP
 #define CDP_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
@@ -43,42 +41,41 @@ namespace CIAO
   {
     class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
 
       // label
-      //
-    public:
+      // 
+      public:
       bool label_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& label () const;
       void label (::XMLSchema::string< ACE_TCHAR > const& );
 
-    protected:
+      protected:
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
 
       // UUID
-      //
-    public:
+      // 
+      public:
       bool UUID_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
       void UUID (::XMLSchema::string< ACE_TCHAR > const& );
 
-    protected:
+      protected:
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
 
       // realizes
-      //
-    public:
+      // 
+      public:
       bool realizes_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
       void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
 
-    protected:
+      protected:
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // implementation
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator;
       implementation_iterator begin_implementation ();
@@ -88,12 +85,12 @@ namespace CIAO
       void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
       size_t count_implementation (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
 
       // instance
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
       instance_iterator begin_instance ();
@@ -103,12 +100,12 @@ namespace CIAO
       void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
       size_t count_instance (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
 
       // connection
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
       connection_iterator begin_connection ();
@@ -118,12 +115,12 @@ namespace CIAO
       void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
       size_t count_connection (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
 
       // dependsOn
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
       dependsOn_iterator begin_dependsOn ();
@@ -133,12 +130,12 @@ namespace CIAO
       void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
       size_t count_dependsOn (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
 
       // artifact
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
       artifact_iterator begin_artifact ();
@@ -148,12 +145,12 @@ namespace CIAO
       void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
       size_t count_artifact (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
 
       // infoProperty
-      //
-    public:
+      // 
+      public:
       typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
       infoProperty_iterator begin_infoProperty ();
@@ -163,10 +160,10 @@ namespace CIAO
       void add_infoProperty (::CIAO::Config_Handlers::Property const& );
       size_t count_infoProperty (void) const;
 
-    protected:
+      protected:
       ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
 
-    public:
+      public:
       DeploymentPlan ();
 
       DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -175,7 +172,7 @@ namespace CIAO
       DeploymentPlan&
       operator= (DeploymentPlan const& s);
 
-    private:
+      private:
       char regulator__;
     };
   }
@@ -198,233 +195,233 @@ namespace CIAO
     {
       struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
       {
-	virtual void
-	traverse (Type&);
+        virtual void
+        traverse (Type&);
 
-	virtual void
-	traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-	virtual void
-	pre (Type&);
+        virtual void
+        pre (Type&);
 
-	virtual void
-	pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-	virtual void
-	label (Type&);
+        virtual void
+        label (Type&);
 
-	virtual void
-	label (Type const&);
+        virtual void
+        label (Type const&);
 
-	virtual void
-	label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-	virtual void
-	label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-	virtual void
-	UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-	virtual void
-	UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-	virtual void
-	UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-	virtual void
-	UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-	virtual void
-	realizes (Type&);
+        virtual void
+        realizes (Type&);
 
-	virtual void
-	realizes (Type const&);
+        virtual void
+        realizes (Type const&);
 
-	virtual void
-	realizes_none (Type&);
+        virtual void
+        realizes_none (Type&);
 
-	virtual void
-	realizes_none (Type const&);
+        virtual void
+        realizes_none (Type const&);
 
-	virtual void
-	implementation (Type&);
+        virtual void
+        implementation (Type&);
 
-	virtual void
-	implementation (Type const&);
+        virtual void
+        implementation (Type const&);
 
-	virtual void
-	implementation_pre (Type&);
+        virtual void
+        implementation_pre (Type&);
 
-	virtual void
-	implementation_pre (Type const&);
+        virtual void
+        implementation_pre (Type const&);
 
-	virtual void
-	implementation_next (Type&);
+        virtual void
+        implementation_next (Type&);
 
-	virtual void
-	implementation_next (Type const&);
+        virtual void
+        implementation_next (Type const&);
 
-	virtual void
-	implementation_post (Type&);
+        virtual void
+        implementation_post (Type&);
 
-	virtual void
-	implementation_post (Type const&);
+        virtual void
+        implementation_post (Type const&);
 
-	virtual void
-	instance (Type&);
+        virtual void
+        instance (Type&);
 
-	virtual void
-	instance (Type const&);
+        virtual void
+        instance (Type const&);
 
-	virtual void
-	instance_pre (Type&);
+        virtual void
+        instance_pre (Type&);
 
-	virtual void
-	instance_pre (Type const&);
+        virtual void
+        instance_pre (Type const&);
 
-	virtual void
-	instance_next (Type&);
+        virtual void
+        instance_next (Type&);
 
-	virtual void
-	instance_next (Type const&);
+        virtual void
+        instance_next (Type const&);
 
-	virtual void
-	instance_post (Type&);
+        virtual void
+        instance_post (Type&);
 
-	virtual void
-	instance_post (Type const&);
+        virtual void
+        instance_post (Type const&);
 
-	virtual void
-	instance_none (Type&);
+        virtual void
+        instance_none (Type&);
 
-	virtual void
-	instance_none (Type const&);
+        virtual void
+        instance_none (Type const&);
 
-	virtual void
-	connection (Type&);
+        virtual void
+        connection (Type&);
 
-	virtual void
-	connection (Type const&);
+        virtual void
+        connection (Type const&);
 
-	virtual void
-	connection_pre (Type&);
+        virtual void
+        connection_pre (Type&);
 
-	virtual void
-	connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-	virtual void
-	connection_next (Type&);
+        virtual void
+        connection_next (Type&);
 
-	virtual void
-	connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-	virtual void
-	connection_post (Type&);
+        virtual void
+        connection_post (Type&);
 
-	virtual void
-	connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-	virtual void
-	connection_none (Type&);
+        virtual void
+        connection_none (Type&);
 
-	virtual void
-	connection_none (Type const&);
+        virtual void
+        connection_none (Type const&);
 
-	virtual void
-	dependsOn (Type&);
+        virtual void
+        dependsOn (Type&);
 
-	virtual void
-	dependsOn (Type const&);
+        virtual void
+        dependsOn (Type const&);
 
-	virtual void
-	dependsOn_pre (Type&);
+        virtual void
+        dependsOn_pre (Type&);
 
-	virtual void
-	dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-	virtual void
-	dependsOn_next (Type&);
+        virtual void
+        dependsOn_next (Type&);
 
-	virtual void
-	dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-	virtual void
-	dependsOn_post (Type&);
+        virtual void
+        dependsOn_post (Type&);
 
-	virtual void
-	dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-	virtual void
-	dependsOn_none (Type&);
+        virtual void
+        dependsOn_none (Type&);
 
-	virtual void
-	dependsOn_none (Type const&);
+        virtual void
+        dependsOn_none (Type const&);
 
-	virtual void
-	artifact (Type&);
+        virtual void
+        artifact (Type&);
 
-	virtual void
-	artifact (Type const&);
+        virtual void
+        artifact (Type const&);
 
-	virtual void
-	artifact_pre (Type&);
+        virtual void
+        artifact_pre (Type&);
 
-	virtual void
-	artifact_pre (Type const&);
+        virtual void
+        artifact_pre (Type const&);
 
-	virtual void
-	artifact_next (Type&);
+        virtual void
+        artifact_next (Type&);
 
-	virtual void
-	artifact_next (Type const&);
+        virtual void
+        artifact_next (Type const&);
 
-	virtual void
-	artifact_post (Type&);
+        virtual void
+        artifact_post (Type&);
 
-	virtual void
-	artifact_post (Type const&);
+        virtual void
+        artifact_post (Type const&);
 
-	virtual void
-	artifact_none (Type&);
+        virtual void
+        artifact_none (Type&);
 
-	virtual void
-	artifact_none (Type const&);
+        virtual void
+        artifact_none (Type const&);
 
-	virtual void
-	infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-	virtual void
-	infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-	virtual void
-	infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-	virtual void
-	infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-	virtual void
-	infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-	virtual void
-	infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-	virtual void
-	infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-	virtual void
-	infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-	virtual void
-	infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-	virtual void
-	infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-	virtual void
-	post (Type&);
+        virtual void
+        post (Type&);
 
-	virtual void
-	post (Type const&);
+        virtual void
+        post (Type const&);
       };
     }
   }
@@ -438,256 +435,256 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct DeploymentPlan : Traversal::DeploymentPlan,
-			      virtual ::XSCRT::Writer< ACE_TCHAR >
+      struct DeploymentPlan : Traversal::DeploymentPlan, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
-	typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-	DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
+        typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
+        DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-	virtual void
-	traverse (Type &o)
-	{
+        virtual void 
+        traverse (Type &o)
+        {
 
-	  this->traverse (const_cast <Type const &> (o));
-	}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-	virtual void
-	label (Type &o)
-	{
+        virtual void 
+        label (Type &o)
+        {
 
-	  this->label (const_cast <Type const &> (o));
-	}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	label (Type const&);
+        virtual void
+        label (Type const&);
 
-	virtual void
-	UUID (Type &o)
-	{
+        virtual void 
+        UUID (Type &o)
+        {
 
-	  this->UUID (const_cast <Type const &> (o));
-	}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-	virtual void
-	realizes (Type &o)
-	{
+        virtual void 
+        realizes (Type &o)
+        {
 
-	  this->realizes (const_cast <Type const &> (o));
-	}
+          this->realizes (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	realizes (Type const&);
+        virtual void
+        realizes (Type const&);
 
-	virtual void
-	implementation_pre (Type &o)
-	{
+        virtual void 
+        implementation_pre (Type &o)
+        {
 
-	  this->implementation_pre (const_cast <Type const &> (o));
-	}
+          this->implementation_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	implementation_pre (Type const&);
+        virtual void
+        implementation_pre (Type const&);
 
-	virtual void
-	implementation_next (Type &o)
-	{
+        virtual void 
+        implementation_next (Type &o)
+        {
 
-	  this->implementation_next (const_cast <Type const &> (o));
-	}
+          this->implementation_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	implementation_next (Type const&);
+        virtual void
+        implementation_next (Type const&);
 
-	virtual void
-	implementation_post (Type &o)
-	{
+        virtual void 
+        implementation_post (Type &o)
+        {
 
-	  this->implementation_post (const_cast <Type const &> (o));
-	}
+          this->implementation_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	implementation_post (Type const&);
+        virtual void
+        implementation_post (Type const&);
 
-	virtual void
-	instance_pre (Type &o)
-	{
+        virtual void 
+        instance_pre (Type &o)
+        {
 
-	  this->instance_pre (const_cast <Type const &> (o));
-	}
+          this->instance_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	instance_pre (Type const&);
+        virtual void
+        instance_pre (Type const&);
 
-	virtual void
-	instance_next (Type &o)
-	{
+        virtual void 
+        instance_next (Type &o)
+        {
 
-	  this->instance_next (const_cast <Type const &> (o));
-	}
+          this->instance_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	instance_next (Type const&);
+        virtual void
+        instance_next (Type const&);
 
-	virtual void
-	instance_post (Type &o)
-	{
+        virtual void 
+        instance_post (Type &o)
+        {
 
-	  this->instance_post (const_cast <Type const &> (o));
-	}
+          this->instance_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	instance_post (Type const&);
+        virtual void
+        instance_post (Type const&);
 
-	virtual void
-	connection_pre (Type &o)
-	{
+        virtual void 
+        connection_pre (Type &o)
+        {
 
-	  this->connection_pre (const_cast <Type const &> (o));
-	}
+          this->connection_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-	virtual void
-	connection_next (Type &o)
-	{
+        virtual void 
+        connection_next (Type &o)
+        {
 
-	  this->connection_next (const_cast <Type const &> (o));
-	}
+          this->connection_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-	virtual void
-	connection_post (Type &o)
-	{
+        virtual void 
+        connection_post (Type &o)
+        {
 
-	  this->connection_post (const_cast <Type const &> (o));
-	}
+          this->connection_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-	virtual void
-	dependsOn_pre (Type &o)
-	{
+        virtual void 
+        dependsOn_pre (Type &o)
+        {
 
-	  this->dependsOn_pre (const_cast <Type const &> (o));
-	}
+          this->dependsOn_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-	virtual void
-	dependsOn_next (Type &o)
-	{
+        virtual void 
+        dependsOn_next (Type &o)
+        {
 
-	  this->dependsOn_next (const_cast <Type const &> (o));
-	}
+          this->dependsOn_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-	virtual void
-	dependsOn_post (Type &o)
-	{
+        virtual void 
+        dependsOn_post (Type &o)
+        {
 
-	  this->dependsOn_post (const_cast <Type const &> (o));
-	}
+          this->dependsOn_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-	virtual void
-	artifact_pre (Type &o)
-	{
+        virtual void 
+        artifact_pre (Type &o)
+        {
 
-	  this->artifact_pre (const_cast <Type const &> (o));
-	}
+          this->artifact_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	artifact_pre (Type const&);
+        virtual void
+        artifact_pre (Type const&);
 
-	virtual void
-	artifact_next (Type &o)
-	{
+        virtual void 
+        artifact_next (Type &o)
+        {
 
-	  this->artifact_next (const_cast <Type const &> (o));
-	}
+          this->artifact_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	artifact_next (Type const&);
+        virtual void
+        artifact_next (Type const&);
 
-	virtual void
-	artifact_post (Type &o)
-	{
+        virtual void 
+        artifact_post (Type &o)
+        {
 
-	  this->artifact_post (const_cast <Type const &> (o));
-	}
+          this->artifact_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	artifact_post (Type const&);
+        virtual void
+        artifact_post (Type const&);
 
-	virtual void
-	infoProperty_pre (Type &o)
-	{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-	  this->infoProperty_pre (const_cast <Type const &> (o));
-	}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-	virtual void
-	infoProperty_next (Type &o)
-	{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-	  this->infoProperty_next (const_cast <Type const &> (o));
-	}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-	virtual void
-	infoProperty_post (Type &o)
-	{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-	  this->infoProperty_post (const_cast <Type const &> (o));
-	}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-      protected:
-	DeploymentPlan ();
+        protected:
+        DeploymentPlan ();
       };
     }
   }
diff --git a/CIAO/tools/Config_Handlers/cid.cpp b/CIAO/tools/Config_Handlers/cid.cpp
index 5cfd51e40d5..be716f2b8dc 100644
--- a/CIAO/tools/Config_Handlers/cid.cpp
+++ b/CIAO/tools/Config_Handlers/cid.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "cid.hpp"
 
 namespace CIAO
@@ -16,29 +22,29 @@ namespace CIAO
   namespace Config_Handlers
   {
     // SubcomponentInstantiationDescription
-    //
+    // 
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-        regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    regulator__ ()
     {
       name_->container (this);
     }
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-        basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
-        specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
-        referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
-        importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
-        id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-          regulator__ ()
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
+    specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
+    referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
+    importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
+    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    regulator__ ()
     {
       name_->container (this);
       if (basePackage_.get ()) basePackage_->container (this);
@@ -91,7 +97,7 @@ namespace CIAO
 
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     ::XMLSchema::string< ACE_TCHAR > const& SubcomponentInstantiationDescription::
     name () const
     {
@@ -105,7 +111,7 @@ namespace CIAO
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     bool SubcomponentInstantiationDescription::
     basePackage_p () const
     {
@@ -122,19 +128,19 @@ namespace CIAO
     basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
     {
       if (basePackage_.get ())
-        {
-          *basePackage_ = e;
-        }
+      {
+        *basePackage_ = e;
+      }
 
       else
-        {
-          basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-          basePackage_->container (this);
-        }
+      {
+        basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+        basePackage_->container (this);
+      }
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     bool SubcomponentInstantiationDescription::
     specializedConfig_p () const
     {
@@ -151,19 +157,19 @@ namespace CIAO
     specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
       if (specializedConfig_.get ())
-        {
-          *specializedConfig_ = e;
-        }
+      {
+        *specializedConfig_ = e;
+      }
 
       else
-        {
-          specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
-          specializedConfig_->container (this);
-        }
+      {
+        specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+        specializedConfig_->container (this);
+      }
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     SubcomponentInstantiationDescription::selectRequirement_iterator SubcomponentInstantiationDescription::
     begin_selectRequirement ()
     {
@@ -201,7 +207,7 @@ namespace CIAO
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     SubcomponentInstantiationDescription::configProperty_iterator SubcomponentInstantiationDescription::
     begin_configProperty ()
     {
@@ -239,7 +245,7 @@ namespace CIAO
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     bool SubcomponentInstantiationDescription::
     referencedPackage_p () const
     {
@@ -256,19 +262,19 @@ namespace CIAO
     referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
       if (referencedPackage_.get ())
-        {
-          *referencedPackage_ = e;
-        }
+      {
+        *referencedPackage_ = e;
+      }
 
       else
-        {
-          referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-          referencedPackage_->container (this);
-        }
+      {
+        referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+        referencedPackage_->container (this);
+      }
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     bool SubcomponentInstantiationDescription::
     importedPackage_p () const
     {
@@ -285,19 +291,19 @@ namespace CIAO
     importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
       if (importedPackage_.get ())
-        {
-          *importedPackage_ = e;
-        }
+      {
+        *importedPackage_ = e;
+      }
 
       else
-        {
-          importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
-          importedPackage_->container (this);
-        }
+      {
+        importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
+        importedPackage_->container (this);
+      }
     }
 
     // SubcomponentInstantiationDescription
-    //
+    // 
     bool SubcomponentInstantiationDescription::
     id_p () const
     {
@@ -320,3805 +326,3805 @@ namespace CIAO
     id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
       if (id_.get ())
-        {
-          *id_ = e;
-        }
+      {
+        *id_ = e;
+      }
 
       else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
+      {
+        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        id_->container (this);
+      }
     }
 
 
     // SubcomponentPropertyReference
-    //
+    // 
 
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
                                    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
-      :
-      ::XSCRT::Type (),
-propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
-regulator__ ()
-{
-propertyName_->container (this);
-instance_->container (this);
-}
+    : 
+    ::XSCRT::Type (), 
+    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    regulator__ ()
+    {
+      propertyName_->container (this);
+      instance_->container (this);
+    }
 
-SubcomponentPropertyReference::
-SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-:
-::XSCRT::Type (),
-propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
-instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
-regulator__ ()
-{
-propertyName_->container (this);
-instance_->container (this);
-}
+    SubcomponentPropertyReference::
+    SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+    :
+    ::XSCRT::Type (),
+    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
+    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    regulator__ ()
+    {
+      propertyName_->container (this);
+      instance_->container (this);
+    }
 
-::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
-operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-{
-propertyName (s.propertyName ());
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
+    operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+    {
+      propertyName (s.propertyName ());
 
-instance (s.instance ());
+      instance (s.instance ());
 
-return *this;
-}
+      return *this;
+    }
 
 
-// SubcomponentPropertyReference
-//
-::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
-propertyName () const
-{
-return *propertyName_;
-}
+    // SubcomponentPropertyReference
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
+    propertyName () const
+    {
+      return *propertyName_;
+    }
 
-void SubcomponentPropertyReference::
-propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*propertyName_ = e;
-}
+    void SubcomponentPropertyReference::
+    propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *propertyName_ = e;
+    }
 
-// SubcomponentPropertyReference
-//
-::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPropertyReference::
-instance () const
-{
-return *instance_;
-}
+    // SubcomponentPropertyReference
+    // 
+    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPropertyReference::
+    instance () const
+    {
+      return *instance_;
+    }
 
-void SubcomponentPropertyReference::
-instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-{
-*instance_ = e;
-}
+    void SubcomponentPropertyReference::
+    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      *instance_ = e;
+    }
 
 
-// AssemblyPropertyMapping
-//
+    // AssemblyPropertyMapping
+    // 
 
-AssemblyPropertyMapping::
-AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& externalName__)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
-regulator__ ()
-{
-name_->container (this);
-externalName_->container (this);
-}
+    AssemblyPropertyMapping::
+    AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+                             ::XMLSchema::string< ACE_TCHAR > const& externalName__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      externalName_->container (this);
+    }
 
-AssemblyPropertyMapping::
-AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-:
-::XSCRT::Type (),
-name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
-regulator__ ()
-{
-name_->container (this);
-externalName_->container (this);
-{
-for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
-}
-}
+    AssemblyPropertyMapping::
+    AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      externalName_->container (this);
+      {
+        for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
-operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-{
-name (s.name ());
+    ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
+    operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+    {
+      name (s.name ());
 
-externalName (s.externalName ());
+      externalName (s.externalName ());
 
-delegatesTo_.clear ();
-{
-for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
-}
+      delegatesTo_.clear ();
+      {
+        for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// AssemblyPropertyMapping
-//
-::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-name () const
-{
-return *name_;
-}
+    // AssemblyPropertyMapping
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+    name () const
+    {
+      return *name_;
+    }
 
-void AssemblyPropertyMapping::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
+    void AssemblyPropertyMapping::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-// AssemblyPropertyMapping
-//
-::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-externalName () const
-{
-return *externalName_;
-}
+    // AssemblyPropertyMapping
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+    externalName () const
+    {
+      return *externalName_;
+    }
 
-void AssemblyPropertyMapping::
-externalName (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*externalName_ = e;
-}
+    void AssemblyPropertyMapping::
+    externalName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *externalName_ = e;
+    }
 
-// AssemblyPropertyMapping
-//
-AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
-begin_delegatesTo ()
-{
-return delegatesTo_.begin ();
-}
+    // AssemblyPropertyMapping
+    // 
+    AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+    begin_delegatesTo ()
+    {
+      return delegatesTo_.begin ();
+    }
 
-AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
-end_delegatesTo ()
-{
-return delegatesTo_.end ();
-}
+    AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+    end_delegatesTo ()
+    {
+      return delegatesTo_.end ();
+    }
 
-AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
-begin_delegatesTo () const
-{
-return delegatesTo_.begin ();
-}
+    AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+    begin_delegatesTo () const
+    {
+      return delegatesTo_.begin ();
+    }
 
-AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
-end_delegatesTo () const
-{
-return delegatesTo_.end ();
-}
+    AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+    end_delegatesTo () const
+    {
+      return delegatesTo_.end ();
+    }
 
-void AssemblyPropertyMapping::
-add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
-{
-delegatesTo_.push_back (e);
-}
+    void AssemblyPropertyMapping::
+    add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
+    {
+      delegatesTo_.push_back (e);
+    }
 
-size_t AssemblyPropertyMapping::
-count_delegatesTo(void) const
-{
-return delegatesTo_.size ();
-}
+    size_t AssemblyPropertyMapping::
+    count_delegatesTo(void) const
+    {
+      return delegatesTo_.size ();
+    }
 
 
-// ComponentAssemblyDescription
-//
+    // ComponentAssemblyDescription
+    // 
 
-ComponentAssemblyDescription::
-ComponentAssemblyDescription ()
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-}
+    ComponentAssemblyDescription::
+    ComponentAssemblyDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-ComponentAssemblyDescription::
-ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-{
-for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
-}
+    ComponentAssemblyDescription::
+    ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+    :
+    ::XSCRT::Type (),
+    regulator__ ()
+    {
+      {
+        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
+      }
 
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-{
-for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
-}
-}
+      {
+        for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
-operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-{
-instance_.clear ();
-{
-for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
-}
+    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
+    operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+    {
+      instance_.clear ();
+      {
+        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
+      }
 
-connection_.clear ();
-{
-for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-}
+      connection_.clear ();
+      {
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+      }
 
-externalProperty_.clear ();
-{
-for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
-}
+      externalProperty_.clear ();
+      {
+        for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// ComponentAssemblyDescription
-//
-ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-begin_instance ()
-{
-return instance_.begin ();
-}
+    // ComponentAssemblyDescription
+    // 
+    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+    begin_instance ()
+    {
+      return instance_.begin ();
+    }
 
-ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-end_instance ()
-{
-return instance_.end ();
-}
+    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+    end_instance ()
+    {
+      return instance_.end ();
+    }
 
-ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-begin_instance () const
-{
-return instance_.begin ();
-}
+    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+    begin_instance () const
+    {
+      return instance_.begin ();
+    }
 
-ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-end_instance () const
-{
-return instance_.end ();
-}
+    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+    end_instance () const
+    {
+      return instance_.end ();
+    }
 
-void ComponentAssemblyDescription::
-add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-{
-instance_.push_back (e);
-}
+    void ComponentAssemblyDescription::
+    add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
+    {
+      instance_.push_back (e);
+    }
 
-size_t ComponentAssemblyDescription::
-count_instance(void) const
-{
-return instance_.size ();
-}
+    size_t ComponentAssemblyDescription::
+    count_instance(void) const
+    {
+      return instance_.size ();
+    }
 
-// ComponentAssemblyDescription
-//
-ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-begin_connection ()
-{
-return connection_.begin ();
-}
+    // ComponentAssemblyDescription
+    // 
+    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+    begin_connection ()
+    {
+      return connection_.begin ();
+    }
 
-ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-end_connection ()
-{
-return connection_.end ();
-}
+    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+    end_connection ()
+    {
+      return connection_.end ();
+    }
 
-ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-begin_connection () const
-{
-return connection_.begin ();
-}
+    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+    begin_connection () const
+    {
+      return connection_.begin ();
+    }
 
-ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-end_connection () const
-{
-return connection_.end ();
-}
+    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+    end_connection () const
+    {
+      return connection_.end ();
+    }
 
-void ComponentAssemblyDescription::
-add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
-{
-connection_.push_back (e);
-}
+    void ComponentAssemblyDescription::
+    add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
+    {
+      connection_.push_back (e);
+    }
 
-size_t ComponentAssemblyDescription::
-count_connection(void) const
-{
-return connection_.size ();
-}
+    size_t ComponentAssemblyDescription::
+    count_connection(void) const
+    {
+      return connection_.size ();
+    }
 
-// ComponentAssemblyDescription
-//
-ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
-begin_externalProperty ()
-{
-return externalProperty_.begin ();
-}
+    // ComponentAssemblyDescription
+    // 
+    ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+    begin_externalProperty ()
+    {
+      return externalProperty_.begin ();
+    }
 
-ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
-end_externalProperty ()
-{
-return externalProperty_.end ();
-}
+    ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+    end_externalProperty ()
+    {
+      return externalProperty_.end ();
+    }
 
-ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
-begin_externalProperty () const
-{
-return externalProperty_.begin ();
-}
+    ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+    begin_externalProperty () const
+    {
+      return externalProperty_.begin ();
+    }
 
-ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
-end_externalProperty () const
-{
-return externalProperty_.end ();
-}
+    ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+    end_externalProperty () const
+    {
+      return externalProperty_.end ();
+    }
 
-void ComponentAssemblyDescription::
-add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
-{
-externalProperty_.push_back (e);
-}
+    void ComponentAssemblyDescription::
+    add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
+    {
+      externalProperty_.push_back (e);
+    }
 
-size_t ComponentAssemblyDescription::
-count_externalProperty(void) const
-{
-return externalProperty_.size ();
-}
+    size_t ComponentAssemblyDescription::
+    count_externalProperty(void) const
+    {
+      return externalProperty_.size ();
+    }
 
 
-// MonolithicImplementationDescription
-//
+    // MonolithicImplementationDescription
+    // 
 
-MonolithicImplementationDescription::
-MonolithicImplementationDescription ()
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-}
+    MonolithicImplementationDescription::
+    MonolithicImplementationDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-MonolithicImplementationDescription::
-MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-{
-for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
-}
+    MonolithicImplementationDescription::
+    MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+    :
+    ::XSCRT::Type (),
+    regulator__ ()
+    {
+      {
+        for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
+      }
 
-{
-for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
-}
+      {
+        for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+      }
 
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-{
-for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
-}
-}
+      {
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+      }
+    }
 
-::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
-operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-{
-nodeExecParameter_.clear ();
-{
-for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
-}
+    ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
+    operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+    {
+      nodeExecParameter_.clear ();
+      {
+        for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
+      }
 
-componentExecParameter_.clear ();
-{
-for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
-}
+      componentExecParameter_.clear ();
+      {
+        for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+      }
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-primaryArtifact_.clear ();
-{
-for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
-}
+      primaryArtifact_.clear ();
+      {
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+      }
 
-return *this;
-}
+      return *this;
+    }
 
 
-// MonolithicImplementationDescription
-//
-MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
-begin_nodeExecParameter ()
-{
-return nodeExecParameter_.begin ();
-}
+    // MonolithicImplementationDescription
+    // 
+    MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+    begin_nodeExecParameter ()
+    {
+      return nodeExecParameter_.begin ();
+    }
 
-MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
-end_nodeExecParameter ()
-{
-return nodeExecParameter_.end ();
-}
+    MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+    end_nodeExecParameter ()
+    {
+      return nodeExecParameter_.end ();
+    }
 
-MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
-begin_nodeExecParameter () const
-{
-return nodeExecParameter_.begin ();
-}
+    MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+    begin_nodeExecParameter () const
+    {
+      return nodeExecParameter_.begin ();
+    }
 
-MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
-end_nodeExecParameter () const
-{
-return nodeExecParameter_.end ();
-}
+    MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+    end_nodeExecParameter () const
+    {
+      return nodeExecParameter_.end ();
+    }
 
-void MonolithicImplementationDescription::
-add_nodeExecParameter (::CIAO::Config_Handlers::Property const& e)
-{
-nodeExecParameter_.push_back (e);
-}
+    void MonolithicImplementationDescription::
+    add_nodeExecParameter (::CIAO::Config_Handlers::Property const& e)
+    {
+      nodeExecParameter_.push_back (e);
+    }
 
-size_t MonolithicImplementationDescription::
-count_nodeExecParameter(void) const
-{
-return nodeExecParameter_.size ();
-}
+    size_t MonolithicImplementationDescription::
+    count_nodeExecParameter(void) const
+    {
+      return nodeExecParameter_.size ();
+    }
 
-// MonolithicImplementationDescription
-//
-MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
-begin_componentExecParameter ()
-{
-return componentExecParameter_.begin ();
-}
+    // MonolithicImplementationDescription
+    // 
+    MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+    begin_componentExecParameter ()
+    {
+      return componentExecParameter_.begin ();
+    }
 
-MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
-end_componentExecParameter ()
-{
-return componentExecParameter_.end ();
-}
+    MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+    end_componentExecParameter ()
+    {
+      return componentExecParameter_.end ();
+    }
 
-MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
-begin_componentExecParameter () const
-{
-return componentExecParameter_.begin ();
-}
+    MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+    begin_componentExecParameter () const
+    {
+      return componentExecParameter_.begin ();
+    }
 
-MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
-end_componentExecParameter () const
-{
-return componentExecParameter_.end ();
-}
+    MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+    end_componentExecParameter () const
+    {
+      return componentExecParameter_.end ();
+    }
 
-void MonolithicImplementationDescription::
-add_componentExecParameter (::CIAO::Config_Handlers::Property const& e)
-{
-componentExecParameter_.push_back (e);
-}
+    void MonolithicImplementationDescription::
+    add_componentExecParameter (::CIAO::Config_Handlers::Property const& e)
+    {
+      componentExecParameter_.push_back (e);
+    }
 
-size_t MonolithicImplementationDescription::
-count_componentExecParameter(void) const
-{
-return componentExecParameter_.size ();
-}
+    size_t MonolithicImplementationDescription::
+    count_componentExecParameter(void) const
+    {
+      return componentExecParameter_.size ();
+    }
 
-// MonolithicImplementationDescription
-//
-MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+    // MonolithicImplementationDescription
+    // 
+    MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
 
-MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+    MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
 
-MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
+    MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
 
-MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
 
-void MonolithicImplementationDescription::
-add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
-{
-deployRequirement_.push_back (e);
-}
+    void MonolithicImplementationDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
 
-size_t MonolithicImplementationDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    size_t MonolithicImplementationDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
 
-// MonolithicImplementationDescription
-//
-MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-begin_primaryArtifact ()
-{
-return primaryArtifact_.begin ();
-}
+    // MonolithicImplementationDescription
+    // 
+    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+    begin_primaryArtifact ()
+    {
+      return primaryArtifact_.begin ();
+    }
 
-MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-end_primaryArtifact ()
-{
-return primaryArtifact_.end ();
-}
+    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+    end_primaryArtifact ()
+    {
+      return primaryArtifact_.end ();
+    }
 
-MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-begin_primaryArtifact () const
-{
-return primaryArtifact_.begin ();
-}
+    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+    begin_primaryArtifact () const
+    {
+      return primaryArtifact_.begin ();
+    }
 
-MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-end_primaryArtifact () const
-{
-return primaryArtifact_.end ();
-}
+    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+    end_primaryArtifact () const
+    {
+      return primaryArtifact_.end ();
+    }
 
-void MonolithicImplementationDescription::
-add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-{
-primaryArtifact_.push_back (e);
-}
+    void MonolithicImplementationDescription::
+    add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+    {
+      primaryArtifact_.push_back (e);
+    }
 
-size_t MonolithicImplementationDescription::
-count_primaryArtifact(void) const
-{
-return primaryArtifact_.size ();
-}
+    size_t MonolithicImplementationDescription::
+    count_primaryArtifact(void) const
+    {
+      return primaryArtifact_.size ();
+    }
 
 
-// ComponentImplementationDescription
-//
+    // ComponentImplementationDescription
+    // 
 
-ComponentImplementationDescription::
-ComponentImplementationDescription ()
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-}
+    ComponentImplementationDescription::
+    ComponentImplementationDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-ComponentImplementationDescription::
-ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-:
-::XSCRT::Type (),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
-assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
-monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
-contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-regulator__ ()
-{
-if (label_.get ()) label_->container (this);
-if (UUID_.get ()) UUID_->container (this);
-if (implements_.get ()) implements_->container (this);
-if (assemblyImpl_.get ()) assemblyImpl_->container (this);
-if (monolithicImpl_.get ()) monolithicImpl_->container (this);
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
+    ComponentImplementationDescription::
+    ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
+    assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
+    monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
+    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+    regulator__ ()
+    {
+      if (label_.get ()) label_->container (this);
+      if (UUID_.get ()) UUID_->container (this);
+      if (implements_.get ()) implements_->container (this);
+      if (assemblyImpl_.get ()) assemblyImpl_->container (this);
+      if (monolithicImpl_.get ()) monolithicImpl_->container (this);
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
-{
-for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
-}
+      {
+        for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+      }
 
-{
-for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-}
+      {
+        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+      }
 
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
-if (contentLocation_.get ()) contentLocation_->container (this);
-if (href_.get ()) href_->container (this);
-}
+      if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
+    }
 
-::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
-operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-{
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    ::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
+    operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+    {
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.UUID_.get ()) UUID (*(s.UUID_));
-else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.UUID_.get ()) UUID (*(s.UUID_));
+      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.implements_.get ()) implements (*(s.implements_));
-else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+      if (s.implements_.get ()) implements (*(s.implements_));
+      else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
-else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
+      if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
+      else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
 
-if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
-else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
+      if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
+      else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
 
-configProperty_.clear ();
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
-capability_.clear ();
-{
-for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
-}
+      capability_.clear ();
+      {
+        for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+      }
 
-dependsOn_.clear ();
-{
-for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-}
+      dependsOn_.clear ();
+      {
+        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+      }
 
-infoProperty_.clear ();
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+      infoProperty_.clear ();
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
-if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.href_.get ()) href (*(s.href_));
-else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-return *this;
-}
+      return *this;
+    }
 
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-label_p () const
-{
-return label_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-label () const
-{
-return *label_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+    label () const
+    {
+      return *label_;
+    }
 
-void ComponentImplementationDescription::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+    void ComponentImplementationDescription::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-UUID_p () const
-{
-return UUID_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    UUID_p () const
+    {
+      return UUID_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-UUID () const
-{
-return *UUID_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+    UUID () const
+    {
+      return *UUID_;
+    }
 
-void ComponentImplementationDescription::
-UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (UUID_.get ())
-{
-*UUID_ = e;
-}
+    void ComponentImplementationDescription::
+    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (UUID_.get ())
+      {
+        *UUID_ = e;
+      }
 
-else
-{
-UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-UUID_->container (this);
-}
-}
+      else
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-implements_p () const
-{
-return implements_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    implements_p () const
+    {
+      return implements_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
-implements () const
-{
-return *implements_;
-}
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
+    implements () const
+    {
+      return *implements_;
+    }
 
-void ComponentImplementationDescription::
-implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-{
-if (implements_.get ())
-{
-*implements_ = e;
-}
+    void ComponentImplementationDescription::
+    implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+    {
+      if (implements_.get ())
+      {
+        *implements_ = e;
+      }
 
-else
-{
-implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-implements_->container (this);
-}
-}
+      else
+      {
+        implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+        implements_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-assemblyImpl_p () const
-{
-return assemblyImpl_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    assemblyImpl_p () const
+    {
+      return assemblyImpl_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
-assemblyImpl () const
-{
-return *assemblyImpl_;
-}
+    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
+    assemblyImpl () const
+    {
+      return *assemblyImpl_;
+    }
 
-void ComponentImplementationDescription::
-assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
-{
-if (assemblyImpl_.get ())
-{
-*assemblyImpl_ = e;
-}
+    void ComponentImplementationDescription::
+    assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
+    {
+      if (assemblyImpl_.get ())
+      {
+        *assemblyImpl_ = e;
+      }
 
-else
-{
-assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
-assemblyImpl_->container (this);
-}
-}
+      else
+      {
+        assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
+        assemblyImpl_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-monolithicImpl_p () const
-{
-return monolithicImpl_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    monolithicImpl_p () const
+    {
+      return monolithicImpl_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
-monolithicImpl () const
-{
-return *monolithicImpl_;
-}
+    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
+    monolithicImpl () const
+    {
+      return *monolithicImpl_;
+    }
 
-void ComponentImplementationDescription::
-monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
-{
-if (monolithicImpl_.get ())
-{
-*monolithicImpl_ = e;
-}
+    void ComponentImplementationDescription::
+    monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
+    {
+      if (monolithicImpl_.get ())
+      {
+        *monolithicImpl_ = e;
+      }
 
-else
-{
-monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
-monolithicImpl_->container (this);
-}
-}
+      else
+      {
+        monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
+        monolithicImpl_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
-begin_configProperty ()
-{
-return configProperty_.begin ();
-}
+    // ComponentImplementationDescription
+    // 
+    ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
 
-ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
-end_configProperty ()
-{
-return configProperty_.end ();
-}
+    ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
 
-ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
-begin_configProperty () const
-{
-return configProperty_.begin ();
-}
+    ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
 
-ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
-end_configProperty () const
-{
-return configProperty_.end ();
-}
+    ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
 
-void ComponentImplementationDescription::
-add_configProperty (::CIAO::Config_Handlers::Property const& e)
-{
-configProperty_.push_back (e);
-}
+    void ComponentImplementationDescription::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
 
-size_t ComponentImplementationDescription::
-count_configProperty(void) const
-{
-return configProperty_.size ();
-}
+    size_t ComponentImplementationDescription::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
 
-// ComponentImplementationDescription
-//
-ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
-begin_capability ()
-{
-return capability_.begin ();
-}
+    // ComponentImplementationDescription
+    // 
+    ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
+    begin_capability ()
+    {
+      return capability_.begin ();
+    }
 
-ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
-end_capability ()
-{
-return capability_.end ();
-}
+    ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
+    end_capability ()
+    {
+      return capability_.end ();
+    }
 
-ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
-begin_capability () const
-{
-return capability_.begin ();
-}
+    ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
+    begin_capability () const
+    {
+      return capability_.begin ();
+    }
 
-ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
-end_capability () const
-{
-return capability_.end ();
-}
+    ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
+    end_capability () const
+    {
+      return capability_.end ();
+    }
 
-void ComponentImplementationDescription::
-add_capability (::CIAO::Config_Handlers::Capability const& e)
-{
-capability_.push_back (e);
-}
+    void ComponentImplementationDescription::
+    add_capability (::CIAO::Config_Handlers::Capability const& e)
+    {
+      capability_.push_back (e);
+    }
 
-size_t ComponentImplementationDescription::
-count_capability(void) const
-{
-return capability_.size ();
-}
+    size_t ComponentImplementationDescription::
+    count_capability(void) const
+    {
+      return capability_.size ();
+    }
 
-// ComponentImplementationDescription
-//
-ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
-begin_dependsOn ()
-{
-return dependsOn_.begin ();
-}
+    // ComponentImplementationDescription
+    // 
+    ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
+    begin_dependsOn ()
+    {
+      return dependsOn_.begin ();
+    }
 
-ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
-end_dependsOn ()
-{
-return dependsOn_.end ();
-}
+    ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
+    end_dependsOn ()
+    {
+      return dependsOn_.end ();
+    }
 
-ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
-begin_dependsOn () const
-{
-return dependsOn_.begin ();
-}
+    ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
+    begin_dependsOn () const
+    {
+      return dependsOn_.begin ();
+    }
 
-ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
-end_dependsOn () const
-{
-return dependsOn_.end ();
-}
+    ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
+    end_dependsOn () const
+    {
+      return dependsOn_.end ();
+    }
 
-void ComponentImplementationDescription::
-add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-{
-dependsOn_.push_back (e);
-}
+    void ComponentImplementationDescription::
+    add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
+    {
+      dependsOn_.push_back (e);
+    }
 
-size_t ComponentImplementationDescription::
-count_dependsOn(void) const
-{
-return dependsOn_.size ();
-}
+    size_t ComponentImplementationDescription::
+    count_dependsOn(void) const
+    {
+      return dependsOn_.size ();
+    }
 
-// ComponentImplementationDescription
-//
-ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
-begin_infoProperty ()
-{
-return infoProperty_.begin ();
-}
+    // ComponentImplementationDescription
+    // 
+    ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
+    begin_infoProperty ()
+    {
+      return infoProperty_.begin ();
+    }
 
-ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
-end_infoProperty ()
-{
-return infoProperty_.end ();
-}
+    ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
+    end_infoProperty ()
+    {
+      return infoProperty_.end ();
+    }
 
-ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
-begin_infoProperty () const
-{
-return infoProperty_.begin ();
-}
+    ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
+    begin_infoProperty () const
+    {
+      return infoProperty_.begin ();
+    }
 
-ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
-end_infoProperty () const
-{
-return infoProperty_.end ();
-}
+    ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
+    end_infoProperty () const
+    {
+      return infoProperty_.end ();
+    }
 
-void ComponentImplementationDescription::
-add_infoProperty (::CIAO::Config_Handlers::Property const& e)
-{
-infoProperty_.push_back (e);
-}
+    void ComponentImplementationDescription::
+    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      infoProperty_.push_back (e);
+    }
 
-size_t ComponentImplementationDescription::
-count_infoProperty(void) const
-{
-return infoProperty_.size ();
-}
+    size_t ComponentImplementationDescription::
+    count_infoProperty(void) const
+    {
+      return infoProperty_.size ();
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-contentLocation_p () const
-{
-return contentLocation_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    contentLocation_p () const
+    {
+      return contentLocation_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-contentLocation () const
-{
-return *contentLocation_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+    contentLocation () const
+    {
+      return *contentLocation_;
+    }
 
-void ComponentImplementationDescription::
-contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (contentLocation_.get ())
-{
-*contentLocation_ = e;
-}
+    void ComponentImplementationDescription::
+    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (contentLocation_.get ())
+      {
+        *contentLocation_ = e;
+      }
 
-else
-{
-contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-contentLocation_->container (this);
-}
-}
+      else
+      {
+        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        contentLocation_->container (this);
+      }
+    }
 
-// ComponentImplementationDescription
-//
-bool ComponentImplementationDescription::
-href_p () const
-{
-return href_.get () != 0;
-}
+    // ComponentImplementationDescription
+    // 
+    bool ComponentImplementationDescription::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-href () const
-{
-return *href_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+    href () const
+    {
+      return *href_;
+    }
 
-::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-href ()
-{
-return *href_;
-}
+    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+    href ()
+    {
+      return *href_;
+    }
 
-void ComponentImplementationDescription::
-href (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (href_.get ())
-{
-*href_ = e;
-}
+    void ComponentImplementationDescription::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+      {
+        *href_ = e;
+      }
 
-else
-{
-href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-href_->container (this);
-}
-}
-}
+      else
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-// SubcomponentInstantiationDescription
-//
+  namespace Config_Handlers
+  {
+    // SubcomponentInstantiationDescription
+    //
 
-SubcomponentInstantiationDescription::
-SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    SubcomponentInstantiationDescription::
+    SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "basePackage")
-{
-::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-basePackage (t);
-}
+        else if (n == "basePackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
+          basePackage (t);
+        }
 
-else if (n == "specializedConfig")
-{
-::CIAO::Config_Handlers::PackageConfiguration t (e);
-specializedConfig (t);
-}
+        else if (n == "specializedConfig")
+        {
+          ::CIAO::Config_Handlers::PackageConfiguration t (e);
+          specializedConfig (t);
+        }
 
-else if (n == "selectRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_selectRequirement (t);
-}
+        else if (n == "selectRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_selectRequirement (t);
+        }
 
-else if (n == "configProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_configProperty (t);
-}
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
 
-else if (n == "referencedPackage")
-{
-::CIAO::Config_Handlers::ComponentPackageReference t (e);
-referencedPackage (t);
-}
+        else if (n == "referencedPackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
+          referencedPackage (t);
+        }
 
-else if (n == "importedPackage")
-{
-::CIAO::Config_Handlers::ComponentPackageImport t (e);
-importedPackage (t);
-}
+        else if (n == "importedPackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageImport t (e);
+          importedPackage (t);
+        }
 
-else
-{
-}
-}
+        else 
+        {
+        }
+      }
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "id")
-{
-::XMLSchema::ID< ACE_TCHAR > t (a);
-id (t);
-}
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "id")
+        {
+          ::XMLSchema::ID< ACE_TCHAR > t (a);
+          id (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// SubcomponentPropertyReference
-//
+    // SubcomponentPropertyReference
+    //
 
-SubcomponentPropertyReference::
-SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    SubcomponentPropertyReference::
+    SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "propertyName")
-{
-propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-propertyName_->container (this);
-}
+        if (n == "propertyName")
+        {
+          propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          propertyName_->container (this);
+        }
 
-else if (n == "instance")
-{
-instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-instance_->container (this);
-}
+        else if (n == "instance")
+        {
+          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          instance_->container (this);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// AssemblyPropertyMapping
-//
+    // AssemblyPropertyMapping
+    //
 
-AssemblyPropertyMapping::
-AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    AssemblyPropertyMapping::
+    AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
 
-else if (n == "externalName")
-{
-externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-externalName_->container (this);
-}
+        else if (n == "externalName")
+        {
+          externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          externalName_->container (this);
+        }
 
-else if (n == "delegatesTo")
-{
-::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
-add_delegatesTo (t);
-}
+        else if (n == "delegatesTo")
+        {
+          ::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
+          add_delegatesTo (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// ComponentAssemblyDescription
-//
+    // ComponentAssemblyDescription
+    //
 
-ComponentAssemblyDescription::
-ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    ComponentAssemblyDescription::
+    ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "instance")
-{
-::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
-add_instance (t);
-}
+        if (n == "instance")
+        {
+          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
+          add_instance (t);
+        }
 
-else if (n == "connection")
-{
-::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
-add_connection (t);
-}
+        else if (n == "connection")
+        {
+          ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
+          add_connection (t);
+        }
 
-else if (n == "externalProperty")
-{
-::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
-add_externalProperty (t);
-}
+        else if (n == "externalProperty")
+        {
+          ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
+          add_externalProperty (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// MonolithicImplementationDescription
-//
+    // MonolithicImplementationDescription
+    //
 
-MonolithicImplementationDescription::
-MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    MonolithicImplementationDescription::
+    MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "nodeExecParameter")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_nodeExecParameter (t);
-}
+        if (n == "nodeExecParameter")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_nodeExecParameter (t);
+        }
 
-else if (n == "componentExecParameter")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_componentExecParameter (t);
-}
+        else if (n == "componentExecParameter")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_componentExecParameter (t);
+        }
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::ImplementationRequirement t (e);
-add_deployRequirement (t);
-}
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::ImplementationRequirement t (e);
+          add_deployRequirement (t);
+        }
 
-else if (n == "primaryArtifact")
-{
-::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-add_primaryArtifact (t);
-}
+        else if (n == "primaryArtifact")
+        {
+          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+          add_primaryArtifact (t);
+        }
 
-else
-{
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
 
-// ComponentImplementationDescription
-//
+    // ComponentImplementationDescription
+    //
 
-ComponentImplementationDescription::
-ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
+    ComponentImplementationDescription::
+    ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-::XSCRT::Parser< ACE_TCHAR > p (e);
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
+        if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
 
-else if (n == "UUID")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-UUID (t);
-}
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
 
-else if (n == "implements")
-{
-::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-implements (t);
-}
+        else if (n == "implements")
+        {
+          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+          implements (t);
+        }
 
-else if (n == "assemblyImpl")
-{
-::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
-assemblyImpl (t);
-}
+        else if (n == "assemblyImpl")
+        {
+          ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
+          assemblyImpl (t);
+        }
 
-else if (n == "monolithicImpl")
-{
-::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
-monolithicImpl (t);
-}
+        else if (n == "monolithicImpl")
+        {
+          ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
+          monolithicImpl (t);
+        }
 
-else if (n == "configProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_configProperty (t);
-}
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
 
-else if (n == "capability")
-{
-::CIAO::Config_Handlers::Capability t (e);
-add_capability (t);
-}
+        else if (n == "capability")
+        {
+          ::CIAO::Config_Handlers::Capability t (e);
+          add_capability (t);
+        }
 
-else if (n == "dependsOn")
-{
-::CIAO::Config_Handlers::ImplementationDependency t (e);
-add_dependsOn (t);
-}
+        else if (n == "dependsOn")
+        {
+          ::CIAO::Config_Handlers::ImplementationDependency t (e);
+          add_dependsOn (t);
+        }
 
-else if (n == "infoProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_infoProperty (t);
-}
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
 
-else if (n == "contentLocation")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-contentLocation (t);
-}
+        else if (n == "contentLocation")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          contentLocation (t);
+        }
 
-else
-{
-}
-}
+        else 
+        {
+        }
+      }
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "href")
-{
-::XMLSchema::string< ACE_TCHAR > t (a);
-href (t);
-}
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
 
-else
-{
-}
-}
-}
-}
+        else 
+        {
+        }
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace
-{
-::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-struct SubcomponentInstantiationDescriptionTypeInfoInitializer
-{
-SubcomponentInstantiationDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct SubcomponentInstantiationDescriptionTypeInfoInitializer
+      {
+        SubcomponentInstantiationDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-SubcomponentInstantiationDescriptionTypeInfoInitializer SubcomponentInstantiationDescriptionTypeInfoInitializer_;
+      SubcomponentInstantiationDescriptionTypeInfoInitializer SubcomponentInstantiationDescriptionTypeInfoInitializer_;
 
-struct SubcomponentPropertyReferenceTypeInfoInitializer
-{
-SubcomponentPropertyReferenceTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (SubcomponentPropertyReference));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct SubcomponentPropertyReferenceTypeInfoInitializer
+      {
+        SubcomponentPropertyReferenceTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (SubcomponentPropertyReference));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-SubcomponentPropertyReferenceTypeInfoInitializer SubcomponentPropertyReferenceTypeInfoInitializer_;
+      SubcomponentPropertyReferenceTypeInfoInitializer SubcomponentPropertyReferenceTypeInfoInitializer_;
 
-struct AssemblyPropertyMappingTypeInfoInitializer
-{
-AssemblyPropertyMappingTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (AssemblyPropertyMapping));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct AssemblyPropertyMappingTypeInfoInitializer
+      {
+        AssemblyPropertyMappingTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (AssemblyPropertyMapping));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-AssemblyPropertyMappingTypeInfoInitializer AssemblyPropertyMappingTypeInfoInitializer_;
+      AssemblyPropertyMappingTypeInfoInitializer AssemblyPropertyMappingTypeInfoInitializer_;
 
-struct ComponentAssemblyDescriptionTypeInfoInitializer
-{
-ComponentAssemblyDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentAssemblyDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ComponentAssemblyDescriptionTypeInfoInitializer
+      {
+        ComponentAssemblyDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentAssemblyDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ComponentAssemblyDescriptionTypeInfoInitializer ComponentAssemblyDescriptionTypeInfoInitializer_;
+      ComponentAssemblyDescriptionTypeInfoInitializer ComponentAssemblyDescriptionTypeInfoInitializer_;
 
-struct MonolithicImplementationDescriptionTypeInfoInitializer
-{
-MonolithicImplementationDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (MonolithicImplementationDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct MonolithicImplementationDescriptionTypeInfoInitializer
+      {
+        MonolithicImplementationDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (MonolithicImplementationDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-MonolithicImplementationDescriptionTypeInfoInitializer MonolithicImplementationDescriptionTypeInfoInitializer_;
+      MonolithicImplementationDescriptionTypeInfoInitializer MonolithicImplementationDescriptionTypeInfoInitializer_;
 
-struct ComponentImplementationDescriptionTypeInfoInitializer
-{
-ComponentImplementationDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentImplementationDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
+      struct ComponentImplementationDescriptionTypeInfoInitializer
+      {
+        ComponentImplementationDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentImplementationDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
 
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
 
-ComponentImplementationDescriptionTypeInfoInitializer ComponentImplementationDescriptionTypeInfoInitializer_;
-}
-}
+      ComponentImplementationDescriptionTypeInfoInitializer ComponentImplementationDescriptionTypeInfoInitializer_;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-// SubcomponentInstantiationDescription
-//
-//
-
-void SubcomponentInstantiationDescription::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-if (o.basePackage_p ()) basePackage (o);
-else basePackage_none (o);
-if (o.specializedConfig_p ()) specializedConfig (o);
-else specializedConfig_none (o);
-selectRequirement (o);
-configProperty (o);
-if (o.referencedPackage_p ()) referencedPackage (o);
-else referencedPackage_none (o);
-if (o.importedPackage_p ()) importedPackage (o);
-else importedPackage_none (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
-
-void SubcomponentInstantiationDescription::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-if (o.basePackage_p ()) basePackage (o);
-else basePackage_none (o);
-if (o.specializedConfig_p ()) specializedConfig (o);
-else specializedConfig_none (o);
-selectRequirement (o);
-configProperty (o);
-if (o.referencedPackage_p ()) referencedPackage (o);
-else referencedPackage_none (o);
-if (o.importedPackage_p ()) importedPackage (o);
-else importedPackage_none (o);
-if (o.id_p ()) id (o);
-else id_none (o);
-post (o);
-}
-
-void SubcomponentInstantiationDescription::
-pre (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-pre (Type const&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-name (Type& o)
-{
-dispatch (o.name ());
-}
-
-void SubcomponentInstantiationDescription::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
-
-void SubcomponentInstantiationDescription::
-basePackage (Type& o)
-{
-dispatch (o.basePackage ());
-}
-
-void SubcomponentInstantiationDescription::
-basePackage (Type const& o)
-{
-dispatch (o.basePackage ());
-}
-
-void SubcomponentInstantiationDescription::
-basePackage_none (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-basePackage_none (Type const&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-specializedConfig (Type& o)
-{
-dispatch (o.specializedConfig ());
-}
-
-void SubcomponentInstantiationDescription::
-specializedConfig (Type const& o)
-{
-dispatch (o.specializedConfig ());
-}
-
-void SubcomponentInstantiationDescription::
-specializedConfig_none (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-specializedConfig_none (Type const&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-SubcomponentInstantiationDescription::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
-
-if (b != e)
-{
-selectRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) selectRequirement_next (o);
-}
-
-selectRequirement_post (o);
-}
-
-else selectRequirement_none (o);
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-SubcomponentInstantiationDescription::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
-
-if (b != e)
-{
-selectRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) selectRequirement_next (o);
-}
-
-selectRequirement_post (o);
-}
-
-else selectRequirement_none (o);
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_pre (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_pre (Type const&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_next (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_next (Type const&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_post (Type&)
-{
-}
-
-void SubcomponentInstantiationDescription::
-selectRequirement_post (Type const&)
-{
-}
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // SubcomponentInstantiationDescription
+      //
+      //
 
-void SubcomponentInstantiationDescription::
-selectRequirement_none (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        if (o.basePackage_p ()) basePackage (o);
+        else basePackage_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        selectRequirement (o);
+        configProperty (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void SubcomponentInstantiationDescription::
-selectRequirement_none (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        if (o.basePackage_p ()) basePackage (o);
+        else basePackage_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        selectRequirement (o);
+        configProperty (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.id_p ()) id (o);
+        else id_none (o);
+        post (o);
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-SubcomponentInstantiationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+      void SubcomponentInstantiationDescription::
+      pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void SubcomponentInstantiationDescription::
+      pre (Type const&)
+      {
+      }
 
-configProperty_post (o);
-}
+      void SubcomponentInstantiationDescription::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-else configProperty_none (o);
-}
+      void SubcomponentInstantiationDescription::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-SubcomponentInstantiationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+      void SubcomponentInstantiationDescription::
+      basePackage (Type& o)
+      {
+        dispatch (o.basePackage ());
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void SubcomponentInstantiationDescription::
+      basePackage (Type const& o)
+      {
+        dispatch (o.basePackage ());
+      }
 
-configProperty_post (o);
-}
+      void SubcomponentInstantiationDescription::
+      basePackage_none (Type&)
+      {
+      }
 
-else configProperty_none (o);
-}
+      void SubcomponentInstantiationDescription::
+      basePackage_none (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_pre (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      specializedConfig (Type& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_pre (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      specializedConfig (Type const& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_next (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      specializedConfig_none (Type&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_next (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      specializedConfig_none (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_post (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        SubcomponentInstantiationDescription::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
-void SubcomponentInstantiationDescription::
-configProperty_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          selectRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) selectRequirement_next (o);
+          }
+
+          selectRequirement_post (o);
+        }
 
-void SubcomponentInstantiationDescription::
-configProperty_none (Type&)
-{
-}
+        else selectRequirement_none (o);
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_none (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        SubcomponentInstantiationDescription::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
-void SubcomponentInstantiationDescription::
-referencedPackage (Type& o)
-{
-dispatch (o.referencedPackage ());
-}
+        if (b != e)
+        {
+          selectRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) selectRequirement_next (o);
+          }
+
+          selectRequirement_post (o);
+        }
 
-void SubcomponentInstantiationDescription::
-referencedPackage (Type const& o)
-{
-dispatch (o.referencedPackage ());
-}
+        else selectRequirement_none (o);
+      }
 
-void SubcomponentInstantiationDescription::
-referencedPackage_none (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_pre (Type&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-referencedPackage_none (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_pre (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-importedPackage (Type& o)
-{
-dispatch (o.importedPackage ());
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_next (Type&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-importedPackage (Type const& o)
-{
-dispatch (o.importedPackage ());
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_next (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-importedPackage_none (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_post (Type&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-importedPackage_none (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_post (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-id (Type& o)
-{
-dispatch (o.id ());
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_none (Type&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-id (Type const& o)
-{
-dispatch (o.id ());
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_none (Type const&)
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-id_none (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      configProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        SubcomponentInstantiationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-void SubcomponentInstantiationDescription::
-id_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void SubcomponentInstantiationDescription::
-post (Type&)
-{
-}
+        else configProperty_none (o);
+      }
 
-void SubcomponentInstantiationDescription::
-post (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      configProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        SubcomponentInstantiationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-// SubcomponentPropertyReference
-//
-//
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void SubcomponentPropertyReference::
-traverse (Type& o)
-{
-pre (o);
-propertyName (o);
-instance (o);
-post (o);
-}
+        else configProperty_none (o);
+      }
 
-void SubcomponentPropertyReference::
-traverse (Type const& o)
-{
-pre (o);
-propertyName (o);
-instance (o);
-post (o);
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_pre (Type&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-pre (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_pre (Type const&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-pre (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_next (Type&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-propertyName (Type& o)
-{
-dispatch (o.propertyName ());
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_next (Type const&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-propertyName (Type const& o)
-{
-dispatch (o.propertyName ());
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_post (Type&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-instance (Type& o)
-{
-dispatch (o.instance ());
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_post (Type const&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-instance (Type const& o)
-{
-dispatch (o.instance ());
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_none (Type&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-post (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_none (Type const&)
+      {
+      }
 
-void SubcomponentPropertyReference::
-post (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      referencedPackage (Type& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
 
-// AssemblyPropertyMapping
-//
-//
+      void SubcomponentInstantiationDescription::
+      referencedPackage (Type const& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
 
-void AssemblyPropertyMapping::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-externalName (o);
-delegatesTo (o);
-post (o);
-}
+      void SubcomponentInstantiationDescription::
+      referencedPackage_none (Type&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-externalName (o);
-delegatesTo (o);
-post (o);
-}
+      void SubcomponentInstantiationDescription::
+      referencedPackage_none (Type const&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-pre (Type&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      importedPackage (Type& o)
+      {
+        dispatch (o.importedPackage ());
+      }
 
-void AssemblyPropertyMapping::
-pre (Type const&)
-{
-}
+      void SubcomponentInstantiationDescription::
+      importedPackage (Type const& o)
+      {
+        dispatch (o.importedPackage ());
+      }
 
-void AssemblyPropertyMapping::
-name (Type& o)
-{
-dispatch (o.name ());
-}
+      void SubcomponentInstantiationDescription::
+      importedPackage_none (Type&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
+      void SubcomponentInstantiationDescription::
+      importedPackage_none (Type const&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-externalName (Type& o)
-{
-dispatch (o.externalName ());
-}
+      void SubcomponentInstantiationDescription::
+      id (Type& o)
+      {
+        dispatch (o.id ());
+      }
 
-void AssemblyPropertyMapping::
-externalName (Type const& o)
-{
-dispatch (o.externalName ());
-}
+      void SubcomponentInstantiationDescription::
+      id (Type const& o)
+      {
+        dispatch (o.id ());
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo (Type& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyPropertyMapping::Type::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
+      void SubcomponentInstantiationDescription::
+      id_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-delegatesTo_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) delegatesTo_next (o);
-}
+      void SubcomponentInstantiationDescription::
+      id_none (Type const&)
+      {
+      }
 
-delegatesTo_post (o);
-}
-}
+      void SubcomponentInstantiationDescription::
+      post (Type&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo (Type const& o)
-{
-// VC6 anathema strikes again
-//
-AssemblyPropertyMapping::Type::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
+      void SubcomponentInstantiationDescription::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-delegatesTo_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) delegatesTo_next (o);
-}
+      // SubcomponentPropertyReference
+      //
+      //
 
-delegatesTo_post (o);
-}
-}
+      void SubcomponentPropertyReference::
+      traverse (Type& o)
+      {
+        pre (o);
+        propertyName (o);
+        instance (o);
+        post (o);
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_pre (Type&)
-{
-}
+      void SubcomponentPropertyReference::
+      traverse (Type const& o)
+      {
+        pre (o);
+        propertyName (o);
+        instance (o);
+        post (o);
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_pre (Type const&)
-{
-}
+      void SubcomponentPropertyReference::
+      pre (Type&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_next (Type&)
-{
-}
+      void SubcomponentPropertyReference::
+      pre (Type const&)
+      {
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_next (Type const&)
-{
-}
+      void SubcomponentPropertyReference::
+      propertyName (Type& o)
+      {
+        dispatch (o.propertyName ());
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_post (Type&)
-{
-}
+      void SubcomponentPropertyReference::
+      propertyName (Type const& o)
+      {
+        dispatch (o.propertyName ());
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_post (Type const&)
-{
-}
+      void SubcomponentPropertyReference::
+      instance (Type& o)
+      {
+        dispatch (o.instance ());
+      }
 
-void AssemblyPropertyMapping::
-post (Type&)
-{
-}
+      void SubcomponentPropertyReference::
+      instance (Type const& o)
+      {
+        dispatch (o.instance ());
+      }
 
-void AssemblyPropertyMapping::
-post (Type const&)
-{
-}
+      void SubcomponentPropertyReference::
+      post (Type&)
+      {
+      }
 
-// ComponentAssemblyDescription
-//
-//
+      void SubcomponentPropertyReference::
+      post (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-traverse (Type& o)
-{
-pre (o);
-instance (o);
-connection (o);
-externalProperty (o);
-post (o);
-}
+      // AssemblyPropertyMapping
+      //
+      //
 
-void ComponentAssemblyDescription::
-traverse (Type const& o)
-{
-pre (o);
-instance (o);
-connection (o);
-externalProperty (o);
-post (o);
-}
+      void AssemblyPropertyMapping::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        externalName (o);
+        delegatesTo (o);
+        post (o);
+      }
 
-void ComponentAssemblyDescription::
-pre (Type&)
-{
-}
+      void AssemblyPropertyMapping::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        externalName (o);
+        delegatesTo (o);
+        post (o);
+      }
 
-void ComponentAssemblyDescription::
-pre (Type const&)
-{
-}
+      void AssemblyPropertyMapping::
+      pre (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-instance (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
+      void AssemblyPropertyMapping::
+      pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-instance_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) instance_next (o);
-}
+      void AssemblyPropertyMapping::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
 
-instance_post (o);
-}
-}
+      void AssemblyPropertyMapping::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
 
-void ComponentAssemblyDescription::
-instance (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
+      void AssemblyPropertyMapping::
+      externalName (Type& o)
+      {
+        dispatch (o.externalName ());
+      }
 
-if (b != e)
-{
-instance_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) instance_next (o);
-}
+      void AssemblyPropertyMapping::
+      externalName (Type const& o)
+      {
+        dispatch (o.externalName ());
+      }
 
-instance_post (o);
-}
-}
+      void AssemblyPropertyMapping::
+      delegatesTo (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyPropertyMapping::Type::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-void ComponentAssemblyDescription::
-instance_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          delegatesTo_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) delegatesTo_next (o);
+          }
+
+          delegatesTo_post (o);
+        }
+      }
 
-void ComponentAssemblyDescription::
-instance_pre (Type const&)
-{
-}
+      void AssemblyPropertyMapping::
+      delegatesTo (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        AssemblyPropertyMapping::Type::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-void ComponentAssemblyDescription::
-instance_next (Type&)
-{
-}
+        if (b != e)
+        {
+          delegatesTo_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) delegatesTo_next (o);
+          }
+
+          delegatesTo_post (o);
+        }
+      }
 
-void ComponentAssemblyDescription::
-instance_next (Type const&)
-{
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_pre (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-instance_post (Type&)
-{
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_pre (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-instance_post (Type const&)
-{
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_next (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-connection (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+      void AssemblyPropertyMapping::
+      delegatesTo_next (Type const&)
+      {
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_post (Type&)
+      {
+      }
 
-connection_post (o);
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_post (Type const&)
+      {
+      }
 
-else connection_none (o);
-}
+      void AssemblyPropertyMapping::
+      post (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-connection (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+      void AssemblyPropertyMapping::
+      post (Type const&)
+      {
+      }
 
-if (b != e)
-{
-connection_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) connection_next (o);
-}
+      // ComponentAssemblyDescription
+      //
+      //
 
-connection_post (o);
-}
+      void ComponentAssemblyDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        instance (o);
+        connection (o);
+        externalProperty (o);
+        post (o);
+      }
 
-else connection_none (o);
-}
+      void ComponentAssemblyDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        instance (o);
+        connection (o);
+        externalProperty (o);
+        post (o);
+      }
 
-void ComponentAssemblyDescription::
-connection_pre (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      pre (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-connection_pre (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      pre (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-connection_next (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      instance (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
-void ComponentAssemblyDescription::
-connection_next (Type const&)
-{
-}
+        if (b != e)
+        {
+          instance_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) instance_next (o);
+          }
+
+          instance_post (o);
+        }
+      }
 
-void ComponentAssemblyDescription::
-connection_post (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      instance (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
 
-void ComponentAssemblyDescription::
-connection_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          instance_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) instance_next (o);
+          }
+
+          instance_post (o);
+        }
+      }
 
-void ComponentAssemblyDescription::
-connection_none (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      instance_pre (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-connection_none (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      instance_pre (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
+      void ComponentAssemblyDescription::
+      instance_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-externalProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalProperty_next (o);
-}
+      void ComponentAssemblyDescription::
+      instance_next (Type const&)
+      {
+      }
 
-externalProperty_post (o);
-}
+      void ComponentAssemblyDescription::
+      instance_post (Type&)
+      {
+      }
 
-else externalProperty_none (o);
-}
+      void ComponentAssemblyDescription::
+      instance_post (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentAssemblyDescription::Type::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
+      void ComponentAssemblyDescription::
+      connection (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-if (b != e)
-{
-externalProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) externalProperty_next (o);
-}
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-externalProperty_post (o);
-}
+        else connection_none (o);
+      }
 
-else externalProperty_none (o);
-}
+      void ComponentAssemblyDescription::
+      connection (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-void ComponentAssemblyDescription::
-externalProperty_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          connection_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) connection_next (o);
+          }
+
+          connection_post (o);
+        }
 
-void ComponentAssemblyDescription::
-externalProperty_pre (Type const&)
-{
-}
+        else connection_none (o);
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_next (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_pre (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_next (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_pre (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_post (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_next (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_post (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_next (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_none (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_post (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_none (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_post (Type const&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-post (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_none (Type&)
+      {
+      }
 
-void ComponentAssemblyDescription::
-post (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      connection_none (Type const&)
+      {
+      }
 
-// MonolithicImplementationDescription
-//
-//
+      void ComponentAssemblyDescription::
+      externalProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-void MonolithicImplementationDescription::
-traverse (Type& o)
-{
-pre (o);
-nodeExecParameter (o);
-componentExecParameter (o);
-deployRequirement (o);
-primaryArtifact (o);
-post (o);
-}
+        if (b != e)
+        {
+          externalProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalProperty_next (o);
+          }
+
+          externalProperty_post (o);
+        }
 
-void MonolithicImplementationDescription::
-traverse (Type const& o)
-{
-pre (o);
-nodeExecParameter (o);
-componentExecParameter (o);
-deployRequirement (o);
-primaryArtifact (o);
-post (o);
-}
+        else externalProperty_none (o);
+      }
 
-void MonolithicImplementationDescription::
-pre (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      externalProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentAssemblyDescription::Type::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-void MonolithicImplementationDescription::
-pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          externalProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) externalProperty_next (o);
+          }
+
+          externalProperty_post (o);
+        }
 
-void MonolithicImplementationDescription::
-nodeExecParameter (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
+        else externalProperty_none (o);
+      }
 
-if (b != e)
-{
-nodeExecParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) nodeExecParameter_next (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_pre (Type&)
+      {
+      }
 
-nodeExecParameter_post (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_pre (Type const&)
+      {
+      }
 
-else nodeExecParameter_none (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_next (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
+      void ComponentAssemblyDescription::
+      externalProperty_next (Type const&)
+      {
+      }
 
-if (b != e)
-{
-nodeExecParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) nodeExecParameter_next (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_post (Type&)
+      {
+      }
 
-nodeExecParameter_post (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_post (Type const&)
+      {
+      }
 
-else nodeExecParameter_none (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_none (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_pre (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      externalProperty_none (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_pre (Type const&)
-{
-}
+      void ComponentAssemblyDescription::
+      post (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_next (Type&)
-{
-}
+      void ComponentAssemblyDescription::
+      post (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_next (Type const&)
-{
-}
+      // MonolithicImplementationDescription
+      //
+      //
 
-void MonolithicImplementationDescription::
-nodeExecParameter_post (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        nodeExecParameter (o);
+        componentExecParameter (o);
+        deployRequirement (o);
+        primaryArtifact (o);
+        post (o);
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_post (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        nodeExecParameter (o);
+        componentExecParameter (o);
+        deployRequirement (o);
+        primaryArtifact (o);
+        post (o);
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_none (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      pre (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_none (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      pre (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
+      void MonolithicImplementationDescription::
+      nodeExecParameter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-if (b != e)
-{
-componentExecParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) componentExecParameter_next (o);
-}
+        if (b != e)
+        {
+          nodeExecParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) nodeExecParameter_next (o);
+          }
+
+          nodeExecParameter_post (o);
+        }
 
-componentExecParameter_post (o);
-}
+        else nodeExecParameter_none (o);
+      }
 
-else componentExecParameter_none (o);
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-void MonolithicImplementationDescription::
-componentExecParameter (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::componentExecParameter_const_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
+        if (b != e)
+        {
+          nodeExecParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) nodeExecParameter_next (o);
+          }
+
+          nodeExecParameter_post (o);
+        }
 
-if (b != e)
-{
-componentExecParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) componentExecParameter_next (o);
-}
+        else nodeExecParameter_none (o);
+      }
 
-componentExecParameter_post (o);
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_pre (Type&)
+      {
+      }
 
-else componentExecParameter_none (o);
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_pre (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_pre (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_next (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_pre (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_next (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_next (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_post (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_next (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_post (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_post (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_none (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_post (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_none (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_none (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
 
-void MonolithicImplementationDescription::
-componentExecParameter_none (Type const&)
-{
-}
+        if (b != e)
+        {
+          componentExecParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) componentExecParameter_next (o);
+          }
+
+          componentExecParameter_post (o);
+        }
 
-void MonolithicImplementationDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+        else componentExecParameter_none (o);
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::componentExecParameter_const_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
 
-deployRequirement_post (o);
-}
+        if (b != e)
+        {
+          componentExecParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) componentExecParameter_next (o);
+          }
+
+          componentExecParameter_post (o);
+        }
 
-else deployRequirement_none (o);
-}
+        else componentExecParameter_none (o);
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+      void MonolithicImplementationDescription::
+      componentExecParameter_pre (Type&)
+      {
+      }
 
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_pre (Type const&)
+      {
+      }
 
-deployRequirement_post (o);
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_next (Type&)
+      {
+      }
 
-else deployRequirement_none (o);
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_next (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_pre (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_post (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_pre (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_post (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_next (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_none (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_next (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_none (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_post (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void MonolithicImplementationDescription::
-deployRequirement_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-void MonolithicImplementationDescription::
-deployRequirement_none (Type&)
-{
-}
+        else deployRequirement_none (o);
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_none (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-void MonolithicImplementationDescription::
-primaryArtifact (Type& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
 
-if (b != e)
-{
-primaryArtifact_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) primaryArtifact_next (o);
-}
+        else deployRequirement_none (o);
+      }
 
-primaryArtifact_post (o);
-}
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact (Type const& o)
-{
-// VC6 anathema strikes again
-//
-MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+      void MonolithicImplementationDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
 
-if (b != e)
-{
-primaryArtifact_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) primaryArtifact_next (o);
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_next (Type&)
+      {
+      }
 
-primaryArtifact_post (o);
-}
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_pre (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_post (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_pre (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_next (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_none (Type&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_next (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_post (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
 
-void MonolithicImplementationDescription::
-primaryArtifact_post (Type const&)
-{
-}
+        if (b != e)
+        {
+          primaryArtifact_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) primaryArtifact_next (o);
+          }
+
+          primaryArtifact_post (o);
+        }
+      }
 
-void MonolithicImplementationDescription::
-post (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
 
-void MonolithicImplementationDescription::
-post (Type const&)
-{
-}
+        if (b != e)
+        {
+          primaryArtifact_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) primaryArtifact_next (o);
+          }
+
+          primaryArtifact_post (o);
+        }
+      }
 
-// ComponentImplementationDescription
-//
-//
+      void MonolithicImplementationDescription::
+      primaryArtifact_pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-traverse (Type& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.implements_p ()) implements (o);
-else implements_none (o);
-if (o.assemblyImpl_p ()) assemblyImpl (o);
-else assemblyImpl_none (o);
-if (o.monolithicImpl_p ()) monolithicImpl (o);
-else monolithicImpl_none (o);
-configProperty (o);
-capability (o);
-dependsOn (o);
-infoProperty (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-traverse (Type const& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.implements_p ()) implements (o);
-else implements_none (o);
-if (o.assemblyImpl_p ()) assemblyImpl (o);
-else assemblyImpl_none (o);
-if (o.monolithicImpl_p ()) monolithicImpl (o);
-else monolithicImpl_none (o);
-configProperty (o);
-capability (o);
-dependsOn (o);
-infoProperty (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_next (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-pre (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_next (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-pre (Type const&)
-{
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_post (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-label (Type& o)
-{
-dispatch (o.label ());
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_post (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
+      void MonolithicImplementationDescription::
+      post (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-label_none (Type&)
-{
-}
+      void MonolithicImplementationDescription::
+      post (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-label_none (Type const&)
-{
-}
+      // ComponentImplementationDescription
+      //
+      //
 
-void ComponentImplementationDescription::
-UUID (Type& o)
-{
-dispatch (o.UUID ());
-}
+      void ComponentImplementationDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.implements_p ()) implements (o);
+        else implements_none (o);
+        if (o.assemblyImpl_p ()) assemblyImpl (o);
+        else assemblyImpl_none (o);
+        if (o.monolithicImpl_p ()) monolithicImpl (o);
+        else monolithicImpl_none (o);
+        configProperty (o);
+        capability (o);
+        dependsOn (o);
+        infoProperty (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
 
-void ComponentImplementationDescription::
-UUID (Type const& o)
-{
-dispatch (o.UUID ());
-}
+      void ComponentImplementationDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.implements_p ()) implements (o);
+        else implements_none (o);
+        if (o.assemblyImpl_p ()) assemblyImpl (o);
+        else assemblyImpl_none (o);
+        if (o.monolithicImpl_p ()) monolithicImpl (o);
+        else monolithicImpl_none (o);
+        configProperty (o);
+        capability (o);
+        dependsOn (o);
+        infoProperty (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
 
-void ComponentImplementationDescription::
-UUID_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-UUID_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-implements (Type& o)
-{
-dispatch (o.implements ());
-}
+      void ComponentImplementationDescription::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
 
-void ComponentImplementationDescription::
-implements (Type const& o)
-{
-dispatch (o.implements ());
-}
+      void ComponentImplementationDescription::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
 
-void ComponentImplementationDescription::
-implements_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      label_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-implements_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      label_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-assemblyImpl (Type& o)
-{
-dispatch (o.assemblyImpl ());
-}
+      void ComponentImplementationDescription::
+      UUID (Type& o)
+      {
+        dispatch (o.UUID ());
+      }
 
-void ComponentImplementationDescription::
-assemblyImpl (Type const& o)
-{
-dispatch (o.assemblyImpl ());
-}
+      void ComponentImplementationDescription::
+      UUID (Type const& o)
+      {
+        dispatch (o.UUID ());
+      }
 
-void ComponentImplementationDescription::
-assemblyImpl_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      UUID_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-assemblyImpl_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      UUID_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-monolithicImpl (Type& o)
-{
-dispatch (o.monolithicImpl ());
-}
+      void ComponentImplementationDescription::
+      implements (Type& o)
+      {
+        dispatch (o.implements ());
+      }
 
-void ComponentImplementationDescription::
-monolithicImpl (Type const& o)
-{
-dispatch (o.monolithicImpl ());
-}
+      void ComponentImplementationDescription::
+      implements (Type const& o)
+      {
+        dispatch (o.implements ());
+      }
 
-void ComponentImplementationDescription::
-monolithicImpl_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      implements_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-monolithicImpl_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      implements_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-configProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+      void ComponentImplementationDescription::
+      assemblyImpl (Type& o)
+      {
+        dispatch (o.assemblyImpl ());
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void ComponentImplementationDescription::
+      assemblyImpl (Type const& o)
+      {
+        dispatch (o.assemblyImpl ());
+      }
 
-configProperty_post (o);
-}
+      void ComponentImplementationDescription::
+      assemblyImpl_none (Type&)
+      {
+      }
 
-else configProperty_none (o);
-}
+      void ComponentImplementationDescription::
+      assemblyImpl_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-configProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+      void ComponentImplementationDescription::
+      monolithicImpl (Type& o)
+      {
+        dispatch (o.monolithicImpl ());
+      }
 
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
+      void ComponentImplementationDescription::
+      monolithicImpl (Type const& o)
+      {
+        dispatch (o.monolithicImpl ());
+      }
 
-configProperty_post (o);
-}
+      void ComponentImplementationDescription::
+      monolithicImpl_none (Type&)
+      {
+      }
 
-else configProperty_none (o);
-}
+      void ComponentImplementationDescription::
+      monolithicImpl_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-configProperty_pre (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      configProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-void ComponentImplementationDescription::
-configProperty_pre (Type const&)
-{
-}
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void ComponentImplementationDescription::
-configProperty_next (Type&)
-{
-}
+        else configProperty_none (o);
+      }
 
-void ComponentImplementationDescription::
-configProperty_next (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      configProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-void ComponentImplementationDescription::
-configProperty_post (Type&)
-{
-}
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
 
-void ComponentImplementationDescription::
-configProperty_post (Type const&)
-{
-}
+        else configProperty_none (o);
+      }
 
-void ComponentImplementationDescription::
-configProperty_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      configProperty_pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-configProperty_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      configProperty_pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-capability (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::capability_iterator b (o.begin_capability()), e (o.end_capability());
+      void ComponentImplementationDescription::
+      configProperty_next (Type&)
+      {
+      }
 
-if (b != e)
-{
-capability_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) capability_next (o);
-}
+      void ComponentImplementationDescription::
+      configProperty_next (Type const&)
+      {
+      }
 
-capability_post (o);
-}
+      void ComponentImplementationDescription::
+      configProperty_post (Type&)
+      {
+      }
 
-else capability_none (o);
-}
+      void ComponentImplementationDescription::
+      configProperty_post (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-capability (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::capability_const_iterator b (o.begin_capability()), e (o.end_capability());
+      void ComponentImplementationDescription::
+      configProperty_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-capability_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) capability_next (o);
-}
+      void ComponentImplementationDescription::
+      configProperty_none (Type const&)
+      {
+      }
 
-capability_post (o);
-}
+      void ComponentImplementationDescription::
+      capability (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::capability_iterator b (o.begin_capability()), e (o.end_capability());
 
-else capability_none (o);
-}
+        if (b != e)
+        {
+          capability_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) capability_next (o);
+          }
+
+          capability_post (o);
+        }
 
-void ComponentImplementationDescription::
-capability_pre (Type&)
-{
-}
+        else capability_none (o);
+      }
 
-void ComponentImplementationDescription::
-capability_pre (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      capability (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::capability_const_iterator b (o.begin_capability()), e (o.end_capability());
 
-void ComponentImplementationDescription::
-capability_next (Type&)
-{
-}
+        if (b != e)
+        {
+          capability_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) capability_next (o);
+          }
+
+          capability_post (o);
+        }
 
-void ComponentImplementationDescription::
-capability_next (Type const&)
-{
-}
+        else capability_none (o);
+      }
 
-void ComponentImplementationDescription::
-capability_post (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      capability_pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-capability_post (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      capability_pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-capability_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      capability_next (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-capability_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      capability_next (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+      void ComponentImplementationDescription::
+      capability_post (Type&)
+      {
+      }
 
-if (b != e)
-{
-dependsOn_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) dependsOn_next (o);
-}
+      void ComponentImplementationDescription::
+      capability_post (Type const&)
+      {
+      }
 
-dependsOn_post (o);
-}
+      void ComponentImplementationDescription::
+      capability_none (Type&)
+      {
+      }
 
-else dependsOn_none (o);
-}
+      void ComponentImplementationDescription::
+      capability_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+      void ComponentImplementationDescription::
+      dependsOn (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
-if (b != e)
-{
-dependsOn_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) dependsOn_next (o);
-}
+        if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
+          }
+
+          dependsOn_post (o);
+        }
 
-dependsOn_post (o);
-}
+        else dependsOn_none (o);
+      }
 
-else dependsOn_none (o);
-}
+      void ComponentImplementationDescription::
+      dependsOn (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
-void ComponentImplementationDescription::
-dependsOn_pre (Type&)
-{
-}
+        if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
+          }
+
+          dependsOn_post (o);
+        }
 
-void ComponentImplementationDescription::
-dependsOn_pre (Type const&)
-{
-}
+        else dependsOn_none (o);
+      }
 
-void ComponentImplementationDescription::
-dependsOn_next (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn_next (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn_post (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_next (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn_post (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_next (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_post (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-dependsOn_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      dependsOn_post (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+      void ComponentImplementationDescription::
+      dependsOn_none (Type&)
+      {
+      }
 
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
+      void ComponentImplementationDescription::
+      dependsOn_none (Type const&)
+      {
+      }
 
-infoProperty_post (o);
-}
+      void ComponentImplementationDescription::
+      infoProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-else infoProperty_none (o);
-}
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
 
-void ComponentImplementationDescription::
-infoProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentImplementationDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+        else infoProperty_none (o);
+      }
 
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
+      void ComponentImplementationDescription::
+      infoProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentImplementationDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-infoProperty_post (o);
-}
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
 
-else infoProperty_none (o);
-}
+        else infoProperty_none (o);
+      }
 
-void ComponentImplementationDescription::
-infoProperty_pre (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_pre (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_pre (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_pre (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_next (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_next (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_next (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_next (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_post (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_post (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_post (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_post (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-infoProperty_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      infoProperty_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-contentLocation (Type& o)
-{
-dispatch (o.contentLocation ());
-}
+      void ComponentImplementationDescription::
+      contentLocation (Type& o)
+      {
+        dispatch (o.contentLocation ());
+      }
 
-void ComponentImplementationDescription::
-contentLocation (Type const& o)
-{
-dispatch (o.contentLocation ());
-}
+      void ComponentImplementationDescription::
+      contentLocation (Type const& o)
+      {
+        dispatch (o.contentLocation ());
+      }
 
-void ComponentImplementationDescription::
-contentLocation_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      contentLocation_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-contentLocation_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      contentLocation_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-href (Type& o)
-{
-dispatch (o.href ());
-}
+      void ComponentImplementationDescription::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
 
-void ComponentImplementationDescription::
-href (Type const& o)
-{
-dispatch (o.href ());
-}
+      void ComponentImplementationDescription::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
 
-void ComponentImplementationDescription::
-href_none (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      href_none (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-href_none (Type const&)
-{
-}
+      void ComponentImplementationDescription::
+      href_none (Type const&)
+      {
+      }
 
-void ComponentImplementationDescription::
-post (Type&)
-{
-}
+      void ComponentImplementationDescription::
+      post (Type&)
+      {
+      }
 
-void ComponentImplementationDescription::
-post (Type const&)
-{
-}
-}
-}
+      void ComponentImplementationDescription::
+      post (Type const&)
+      {
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-// SubcomponentInstantiationDescription
-//
-//
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // SubcomponentInstantiationDescription
+      //
+      //
 
-SubcomponentInstantiationDescription::
-SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      SubcomponentInstantiationDescription::
+      SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-SubcomponentInstantiationDescription::
-SubcomponentInstantiationDescription ()
-{
-}
+      SubcomponentInstantiationDescription::
+      SubcomponentInstantiationDescription ()
+      {
+      }
 
-void SubcomponentInstantiationDescription::
-traverse (Type const& o)
-{
-Traversal::SubcomponentInstantiationDescription::traverse (o);
-}
+      void SubcomponentInstantiationDescription::
+      traverse (Type const& o)
+      {
+        Traversal::SubcomponentInstantiationDescription::traverse (o);
+      }
 
-void SubcomponentInstantiationDescription::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::SubcomponentInstantiationDescription::name (o);
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::SubcomponentInstantiationDescription::name (o);
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-basePackage (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
-Traversal::SubcomponentInstantiationDescription::basePackage (o);
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      basePackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
+        Traversal::SubcomponentInstantiationDescription::basePackage (o);
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-specializedConfig (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
-Traversal::SubcomponentInstantiationDescription::specializedConfig (o);
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      specializedConfig (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
+        Traversal::SubcomponentInstantiationDescription::specializedConfig (o);
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-selectRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
+      }
 
-void SubcomponentInstantiationDescription::
-selectRequirement_next (Type const& o)
-{
-selectRequirement_post (o);
-selectRequirement_pre (o);
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_next (Type const& o)
+      {
+        selectRequirement_post (o);
+        selectRequirement_pre (o);
+      }
 
-void SubcomponentInstantiationDescription::
-selectRequirement_post (Type const&)
-{
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      selectRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_next (Type const& o)
-{
-configProperty_post (o);
-configProperty_pre (o);
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
 
-void SubcomponentInstantiationDescription::
-configProperty_post (Type const&)
-{
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      configProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-referencedPackage (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
-Traversal::SubcomponentInstantiationDescription::referencedPackage (o);
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      referencedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
+        Traversal::SubcomponentInstantiationDescription::referencedPackage (o);
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-importedPackage (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
-Traversal::SubcomponentInstantiationDescription::importedPackage (o);
-pop_ ();
-}
+      void SubcomponentInstantiationDescription::
+      importedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
+        Traversal::SubcomponentInstantiationDescription::importedPackage (o);
+        pop_ ();
+      }
 
-void SubcomponentInstantiationDescription::
-id (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-attr_ (&a);
-Traversal::SubcomponentInstantiationDescription::id (o);
-attr_ (0);
-}
+      void SubcomponentInstantiationDescription::
+      id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+        attr_ (&a);
+        Traversal::SubcomponentInstantiationDescription::id (o);
+        attr_ (0);
+      }
 
-// SubcomponentPropertyReference
-//
-//
+      // SubcomponentPropertyReference
+      //
+      //
 
-SubcomponentPropertyReference::
-SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      SubcomponentPropertyReference::
+      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-SubcomponentPropertyReference::
-SubcomponentPropertyReference ()
-{
-}
+      SubcomponentPropertyReference::
+      SubcomponentPropertyReference ()
+      {
+      }
 
-void SubcomponentPropertyReference::
-traverse (Type const& o)
-{
-Traversal::SubcomponentPropertyReference::traverse (o);
-}
+      void SubcomponentPropertyReference::
+      traverse (Type const& o)
+      {
+        Traversal::SubcomponentPropertyReference::traverse (o);
+      }
 
-void SubcomponentPropertyReference::
-propertyName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
-Traversal::SubcomponentPropertyReference::propertyName (o);
-pop_ ();
-}
+      void SubcomponentPropertyReference::
+      propertyName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
+        Traversal::SubcomponentPropertyReference::propertyName (o);
+        pop_ ();
+      }
 
-void SubcomponentPropertyReference::
-instance (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-Traversal::SubcomponentPropertyReference::instance (o);
-pop_ ();
-}
+      void SubcomponentPropertyReference::
+      instance (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+        Traversal::SubcomponentPropertyReference::instance (o);
+        pop_ ();
+      }
 
-// AssemblyPropertyMapping
-//
-//
+      // AssemblyPropertyMapping
+      //
+      //
 
-AssemblyPropertyMapping::
-AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      AssemblyPropertyMapping::
+      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-AssemblyPropertyMapping::
-AssemblyPropertyMapping ()
-{
-}
+      AssemblyPropertyMapping::
+      AssemblyPropertyMapping ()
+      {
+      }
 
-void AssemblyPropertyMapping::
-traverse (Type const& o)
-{
-Traversal::AssemblyPropertyMapping::traverse (o);
-}
+      void AssemblyPropertyMapping::
+      traverse (Type const& o)
+      {
+        Traversal::AssemblyPropertyMapping::traverse (o);
+      }
 
-void AssemblyPropertyMapping::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::AssemblyPropertyMapping::name (o);
-pop_ ();
-}
+      void AssemblyPropertyMapping::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::AssemblyPropertyMapping::name (o);
+        pop_ ();
+      }
 
-void AssemblyPropertyMapping::
-externalName (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
-Traversal::AssemblyPropertyMapping::externalName (o);
-pop_ ();
-}
+      void AssemblyPropertyMapping::
+      externalName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
+        Traversal::AssemblyPropertyMapping::externalName (o);
+        pop_ ();
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_next (Type const& o)
-{
-delegatesTo_post (o);
-delegatesTo_pre (o);
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_next (Type const& o)
+      {
+        delegatesTo_post (o);
+        delegatesTo_pre (o);
+      }
 
-void AssemblyPropertyMapping::
-delegatesTo_post (Type const&)
-{
-pop_ ();
-}
+      void AssemblyPropertyMapping::
+      delegatesTo_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// ComponentAssemblyDescription
-//
-//
+      // ComponentAssemblyDescription
+      //
+      //
 
-ComponentAssemblyDescription::
-ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      ComponentAssemblyDescription::
+      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-ComponentAssemblyDescription::
-ComponentAssemblyDescription ()
-{
-}
+      ComponentAssemblyDescription::
+      ComponentAssemblyDescription ()
+      {
+      }
 
-void ComponentAssemblyDescription::
-traverse (Type const& o)
-{
-Traversal::ComponentAssemblyDescription::traverse (o);
-}
+      void ComponentAssemblyDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentAssemblyDescription::traverse (o);
+      }
 
-void ComponentAssemblyDescription::
-instance_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-}
+      void ComponentAssemblyDescription::
+      instance_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+      }
 
-void ComponentAssemblyDescription::
-instance_next (Type const& o)
-{
-instance_post (o);
-instance_pre (o);
-}
+      void ComponentAssemblyDescription::
+      instance_next (Type const& o)
+      {
+        instance_post (o);
+        instance_pre (o);
+      }
 
-void ComponentAssemblyDescription::
-instance_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentAssemblyDescription::
+      instance_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentAssemblyDescription::
-connection_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-}
+      void ComponentAssemblyDescription::
+      connection_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+      }
 
-void ComponentAssemblyDescription::
-connection_next (Type const& o)
-{
-connection_post (o);
-connection_pre (o);
-}
+      void ComponentAssemblyDescription::
+      connection_next (Type const& o)
+      {
+        connection_post (o);
+        connection_pre (o);
+      }
 
-void ComponentAssemblyDescription::
-connection_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentAssemblyDescription::
+      connection_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
-}
+      void ComponentAssemblyDescription::
+      externalProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_next (Type const& o)
-{
-externalProperty_post (o);
-externalProperty_pre (o);
-}
+      void ComponentAssemblyDescription::
+      externalProperty_next (Type const& o)
+      {
+        externalProperty_post (o);
+        externalProperty_pre (o);
+      }
 
-void ComponentAssemblyDescription::
-externalProperty_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentAssemblyDescription::
+      externalProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// MonolithicImplementationDescription
-//
-//
+      // MonolithicImplementationDescription
+      //
+      //
 
-MonolithicImplementationDescription::
-MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      MonolithicImplementationDescription::
+      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-MonolithicImplementationDescription::
-MonolithicImplementationDescription ()
-{
-}
+      MonolithicImplementationDescription::
+      MonolithicImplementationDescription ()
+      {
+      }
 
-void MonolithicImplementationDescription::
-traverse (Type const& o)
-{
-Traversal::MonolithicImplementationDescription::traverse (o);
-}
+      void MonolithicImplementationDescription::
+      traverse (Type const& o)
+      {
+        Traversal::MonolithicImplementationDescription::traverse (o);
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nodeExecParameter", top_ ()));
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nodeExecParameter", top_ ()));
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_next (Type const& o)
-{
-nodeExecParameter_post (o);
-nodeExecParameter_pre (o);
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_next (Type const& o)
+      {
+        nodeExecParameter_post (o);
+        nodeExecParameter_pre (o);
+      }
 
-void MonolithicImplementationDescription::
-nodeExecParameter_post (Type const&)
-{
-pop_ ();
-}
+      void MonolithicImplementationDescription::
+      nodeExecParameter_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentExecParameter", top_ ()));
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentExecParameter", top_ ()));
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_next (Type const& o)
-{
-componentExecParameter_post (o);
-componentExecParameter_pre (o);
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_next (Type const& o)
+      {
+        componentExecParameter_post (o);
+        componentExecParameter_pre (o);
+      }
 
-void MonolithicImplementationDescription::
-componentExecParameter_post (Type const&)
-{
-pop_ ();
-}
+      void MonolithicImplementationDescription::
+      componentExecParameter_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
 
-void MonolithicImplementationDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
+      void MonolithicImplementationDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_next (Type const& o)
-{
-primaryArtifact_post (o);
-primaryArtifact_pre (o);
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_next (Type const& o)
+      {
+        primaryArtifact_post (o);
+        primaryArtifact_pre (o);
+      }
 
-void MonolithicImplementationDescription::
-primaryArtifact_post (Type const&)
-{
-pop_ ();
-}
+      void MonolithicImplementationDescription::
+      primaryArtifact_post (Type const&)
+      {
+        pop_ ();
+      }
 
-// ComponentImplementationDescription
-//
-//
+      // ComponentImplementationDescription
+      //
+      //
 
-ComponentImplementationDescription::
-ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
+      ComponentImplementationDescription::
+      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
 
-ComponentImplementationDescription::
-ComponentImplementationDescription ()
-{
-}
+      ComponentImplementationDescription::
+      ComponentImplementationDescription ()
+      {
+      }
 
-void ComponentImplementationDescription::
-traverse (Type const& o)
-{
-Traversal::ComponentImplementationDescription::traverse (o);
-}
+      void ComponentImplementationDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentImplementationDescription::traverse (o);
+      }
 
-void ComponentImplementationDescription::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::ComponentImplementationDescription::label (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::ComponentImplementationDescription::label (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-UUID (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-Traversal::ComponentImplementationDescription::UUID (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      UUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+        Traversal::ComponentImplementationDescription::UUID (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-implements (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
-Traversal::ComponentImplementationDescription::implements (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      implements (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
+        Traversal::ComponentImplementationDescription::implements (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-assemblyImpl (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
-Traversal::ComponentImplementationDescription::assemblyImpl (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      assemblyImpl (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
+        Traversal::ComponentImplementationDescription::assemblyImpl (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-monolithicImpl (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
-Traversal::ComponentImplementationDescription::monolithicImpl (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      monolithicImpl (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
+        Traversal::ComponentImplementationDescription::monolithicImpl (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-configProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-}
+      void ComponentImplementationDescription::
+      configProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+      }
 
-void ComponentImplementationDescription::
-configProperty_next (Type const& o)
-{
-configProperty_post (o);
-configProperty_pre (o);
-}
+      void ComponentImplementationDescription::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
 
-void ComponentImplementationDescription::
-configProperty_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      configProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-capability_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
-}
+      void ComponentImplementationDescription::
+      capability_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
+      }
 
-void ComponentImplementationDescription::
-capability_next (Type const& o)
-{
-capability_post (o);
-capability_pre (o);
-}
+      void ComponentImplementationDescription::
+      capability_next (Type const& o)
+      {
+        capability_post (o);
+        capability_pre (o);
+      }
 
-void ComponentImplementationDescription::
-capability_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      capability_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-dependsOn_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
-}
+      void ComponentImplementationDescription::
+      dependsOn_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
+      }
 
-void ComponentImplementationDescription::
-dependsOn_next (Type const& o)
-{
-dependsOn_post (o);
-dependsOn_pre (o);
-}
+      void ComponentImplementationDescription::
+      dependsOn_next (Type const& o)
+      {
+        dependsOn_post (o);
+        dependsOn_pre (o);
+      }
 
-void ComponentImplementationDescription::
-dependsOn_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      dependsOn_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-infoProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-}
+      void ComponentImplementationDescription::
+      infoProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+      }
 
-void ComponentImplementationDescription::
-infoProperty_next (Type const& o)
-{
-infoProperty_post (o);
-infoProperty_pre (o);
-}
+      void ComponentImplementationDescription::
+      infoProperty_next (Type const& o)
+      {
+        infoProperty_post (o);
+        infoProperty_pre (o);
+      }
 
-void ComponentImplementationDescription::
-infoProperty_post (Type const&)
-{
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      infoProperty_post (Type const&)
+      {
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-contentLocation (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-Traversal::ComponentImplementationDescription::contentLocation (o);
-pop_ ();
-}
+      void ComponentImplementationDescription::
+      contentLocation (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+        Traversal::ComponentImplementationDescription::contentLocation (o);
+        pop_ ();
+      }
 
-void ComponentImplementationDescription::
-href (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-attr_ (&a);
-Traversal::ComponentImplementationDescription::href (o);
-attr_ (0);
-}
-}
-}
+      void ComponentImplementationDescription::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::ComponentImplementationDescription::href (o);
+        attr_ (0);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
diff --git a/CIAO/tools/Config_Handlers/cid.hpp b/CIAO/tools/Config_Handlers/cid.hpp
index 069c7407eae..c0b74ebc810 100644
--- a/CIAO/tools/Config_Handlers/cid.hpp
+++ b/CIAO/tools/Config_Handlers/cid.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,23 +15,23 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef CID_HPP
 #define CID_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class SubcomponentInstantiationDescription;
-class SubcomponentPropertyReference;
-class AssemblyPropertyMapping;
-class ComponentAssemblyDescription;
-class MonolithicImplementationDescription;
-class ComponentImplementationDescription;
-}
+  namespace Config_Handlers
+  {
+    class SubcomponentInstantiationDescription;
+    class SubcomponentPropertyReference;
+    class AssemblyPropertyMapping;
+    class ComponentAssemblyDescription;
+    class MonolithicImplementationDescription;
+    class ComponentImplementationDescription;
+  }
 }
 
 #include <memory>
@@ -41,7 +40,7 @@ class ComponentImplementationDescription;
 
 #include "Basic_Deployment_Data.hpp"
 
-#include "cpd.hpp"
+#include "ccd.hpp"
 
 #include "iad.hpp"
 
@@ -49,2013 +48,2007 @@ class ComponentImplementationDescription;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// basePackage
-//
-public:
-bool basePackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
-void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
-
-// specializedConfig
-//
-public:
-bool specializedConfig_p () const;
-::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
-void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
-
-// selectRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
-selectRequirement_iterator begin_selectRequirement ();
-selectRequirement_iterator end_selectRequirement ();
-selectRequirement_const_iterator begin_selectRequirement () const;
-selectRequirement_const_iterator end_selectRequirement () const;
-void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_selectRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// referencedPackage
-//
-public:
-bool referencedPackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
-void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
-
-// importedPackage
-//
-public:
-bool importedPackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
-void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
-
-// id
-//
-public:
-bool id_p () const;
-::XMLSchema::ID< ACE_TCHAR > const& id () const;
-::XMLSchema::ID< ACE_TCHAR >& id ();
-void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-public:
-SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
-
-SubcomponentInstantiationDescription&
-operator= (SubcomponentInstantiationDescription const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// propertyName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
-void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
-
-// instance
-//
-public:
-::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
-
-public:
-SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
-
-SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
-
-SubcomponentPropertyReference&
-operator= (SubcomponentPropertyReference const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// externalName
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& externalName () const;
-void externalName (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
-
-// delegatesTo
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::iterator delegatesTo_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::const_iterator delegatesTo_const_iterator;
-delegatesTo_iterator begin_delegatesTo ();
-delegatesTo_iterator end_delegatesTo ();
-delegatesTo_const_iterator begin_delegatesTo () const;
-delegatesTo_const_iterator end_delegatesTo () const;
-void add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
-size_t count_delegatesTo (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
-
-public:
-AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-::XMLSchema::string< ACE_TCHAR > const& externalName__);
-
-AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
-AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
-
-AssemblyPropertyMapping&
-operator= (AssemblyPropertyMapping const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// instance
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
-instance_iterator begin_instance ();
-instance_iterator end_instance ();
-instance_const_iterator begin_instance () const;
-instance_const_iterator end_instance () const;
-void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-size_t count_instance (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-// connection
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
-connection_iterator begin_connection ();
-connection_iterator end_connection ();
-connection_const_iterator begin_connection () const;
-connection_const_iterator end_connection () const;
-void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
-size_t count_connection (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
-
-// externalProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::iterator externalProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::const_iterator externalProperty_const_iterator;
-externalProperty_iterator begin_externalProperty ();
-externalProperty_iterator end_externalProperty ();
-externalProperty_const_iterator begin_externalProperty () const;
-externalProperty_const_iterator end_externalProperty () const;
-void add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
-size_t count_externalProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
-
-public:
-ComponentAssemblyDescription ();
-
-ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
-
-ComponentAssemblyDescription&
-operator= (ComponentAssemblyDescription const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// nodeExecParameter
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator nodeExecParameter_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator nodeExecParameter_const_iterator;
-nodeExecParameter_iterator begin_nodeExecParameter ();
-nodeExecParameter_iterator end_nodeExecParameter ();
-nodeExecParameter_const_iterator begin_nodeExecParameter () const;
-nodeExecParameter_const_iterator end_nodeExecParameter () const;
-void add_nodeExecParameter (::CIAO::Config_Handlers::Property const& );
-size_t count_nodeExecParameter (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > nodeExecParameter_;
-
-// componentExecParameter
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator componentExecParameter_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator componentExecParameter_const_iterator;
-componentExecParameter_iterator begin_componentExecParameter ();
-componentExecParameter_iterator end_componentExecParameter ();
-componentExecParameter_const_iterator begin_componentExecParameter () const;
-componentExecParameter_const_iterator end_componentExecParameter () const;
-void add_componentExecParameter (::CIAO::Config_Handlers::Property const& );
-size_t count_componentExecParameter (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > componentExecParameter_;
-
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
-
-// primaryArtifact
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
-primaryArtifact_iterator begin_primaryArtifact ();
-primaryArtifact_iterator end_primaryArtifact ();
-primaryArtifact_const_iterator begin_primaryArtifact () const;
-primaryArtifact_const_iterator end_primaryArtifact () const;
-void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-size_t count_primaryArtifact (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
-
-public:
-MonolithicImplementationDescription ();
-
-MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
-
-MonolithicImplementationDescription&
-operator= (MonolithicImplementationDescription const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// implements
-//
-public:
-bool implements_p () const;
-::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
-void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
-
-// assemblyImpl
-//
-public:
-bool assemblyImpl_p () const;
-::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
-void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
-
-// monolithicImpl
-//
-public:
-bool monolithicImpl_p () const;
-::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
-void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
-
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// capability
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Capability >::iterator capability_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Capability >::const_iterator capability_const_iterator;
-capability_iterator begin_capability ();
-capability_iterator end_capability ();
-capability_const_iterator begin_capability () const;
-capability_const_iterator end_capability () const;
-void add_capability (::CIAO::Config_Handlers::Capability const& );
-size_t count_capability (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Capability > capability_;
-
-// dependsOn
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
-dependsOn_iterator begin_dependsOn ();
-dependsOn_iterator end_dependsOn ();
-dependsOn_const_iterator begin_dependsOn () const;
-dependsOn_const_iterator end_dependsOn () const;
-void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-size_t count_dependsOn (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-// infoProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-infoProperty_iterator begin_infoProperty ();
-infoProperty_iterator end_infoProperty ();
-infoProperty_const_iterator begin_infoProperty () const;
-infoProperty_const_iterator end_infoProperty () const;
-void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_infoProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-// contentLocation
-//
-public:
-bool contentLocation_p () const;
-::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-// href
-//
-public:
-bool href_p () const;
-::XMLSchema::string< ACE_TCHAR > const& href () const;
-::XMLSchema::string< ACE_TCHAR >& href ();
-void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-public:
-ComponentImplementationDescription ();
-
-ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentImplementationDescription (ComponentImplementationDescription const& s);
-
-ComponentImplementationDescription&
-operator= (ComponentImplementationDescription const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // basePackage
+      // 
+      public:
+      bool basePackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
+      void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
+
+      // specializedConfig
+      // 
+      public:
+      bool specializedConfig_p () const;
+      ::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
+      void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
+
+      // selectRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
+      selectRequirement_iterator begin_selectRequirement ();
+      selectRequirement_iterator end_selectRequirement ();
+      selectRequirement_const_iterator begin_selectRequirement () const;
+      selectRequirement_const_iterator end_selectRequirement () const;
+      void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_selectRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // referencedPackage
+      // 
+      public:
+      bool referencedPackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
+      void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
+
+      // importedPackage
+      // 
+      public:
+      bool importedPackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
+      void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
+
+      // id
+      // 
+      public:
+      bool id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& id ();
+      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+      public:
+      SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+      SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
+
+      SubcomponentInstantiationDescription&
+      operator= (SubcomponentInstantiationDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // propertyName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
+      void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
+
+      // instance
+      // 
+      public:
+      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+      public:
+      SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
+                                     ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
+
+      SubcomponentPropertyReference&
+      operator= (SubcomponentPropertyReference const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // externalName
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& externalName () const;
+      void externalName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
+
+      // delegatesTo
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::iterator delegatesTo_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::const_iterator delegatesTo_const_iterator;
+      delegatesTo_iterator begin_delegatesTo ();
+      delegatesTo_iterator end_delegatesTo ();
+      delegatesTo_const_iterator begin_delegatesTo () const;
+      delegatesTo_const_iterator end_delegatesTo () const;
+      void add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
+      size_t count_delegatesTo (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
+
+      public:
+      AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+                               ::XMLSchema::string< ACE_TCHAR > const& externalName__);
+
+      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
+
+      AssemblyPropertyMapping&
+      operator= (AssemblyPropertyMapping const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // instance
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
+      instance_iterator begin_instance ();
+      instance_iterator end_instance ();
+      instance_const_iterator begin_instance () const;
+      instance_const_iterator end_instance () const;
+      void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
+      size_t count_instance (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
+
+      // connection
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
+      connection_iterator begin_connection ();
+      connection_iterator end_connection ();
+      connection_const_iterator begin_connection () const;
+      connection_const_iterator end_connection () const;
+      void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
+      size_t count_connection (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
+
+      // externalProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::iterator externalProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::const_iterator externalProperty_const_iterator;
+      externalProperty_iterator begin_externalProperty ();
+      externalProperty_iterator end_externalProperty ();
+      externalProperty_const_iterator begin_externalProperty () const;
+      externalProperty_const_iterator end_externalProperty () const;
+      void add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
+      size_t count_externalProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
+
+      public:
+      ComponentAssemblyDescription ();
+
+      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
+
+      ComponentAssemblyDescription&
+      operator= (ComponentAssemblyDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // nodeExecParameter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator nodeExecParameter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator nodeExecParameter_const_iterator;
+      nodeExecParameter_iterator begin_nodeExecParameter ();
+      nodeExecParameter_iterator end_nodeExecParameter ();
+      nodeExecParameter_const_iterator begin_nodeExecParameter () const;
+      nodeExecParameter_const_iterator end_nodeExecParameter () const;
+      void add_nodeExecParameter (::CIAO::Config_Handlers::Property const& );
+      size_t count_nodeExecParameter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > nodeExecParameter_;
+
+      // componentExecParameter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator componentExecParameter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator componentExecParameter_const_iterator;
+      componentExecParameter_iterator begin_componentExecParameter ();
+      componentExecParameter_iterator end_componentExecParameter ();
+      componentExecParameter_const_iterator begin_componentExecParameter () const;
+      componentExecParameter_const_iterator end_componentExecParameter () const;
+      void add_componentExecParameter (::CIAO::Config_Handlers::Property const& );
+      size_t count_componentExecParameter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > componentExecParameter_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
+
+      // primaryArtifact
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
+      primaryArtifact_iterator begin_primaryArtifact ();
+      primaryArtifact_iterator end_primaryArtifact ();
+      primaryArtifact_const_iterator begin_primaryArtifact () const;
+      primaryArtifact_const_iterator end_primaryArtifact () const;
+      void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+      size_t count_primaryArtifact (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
+
+      public:
+      MonolithicImplementationDescription ();
+
+      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
+
+      MonolithicImplementationDescription&
+      operator= (MonolithicImplementationDescription const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // implements
+      // 
+      public:
+      bool implements_p () const;
+      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
+      void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
+
+      // assemblyImpl
+      // 
+      public:
+      bool assemblyImpl_p () const;
+      ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
+      void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
+
+      // monolithicImpl
+      // 
+      public:
+      bool monolithicImpl_p () const;
+      ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
+      void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // capability
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Capability >::iterator capability_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Capability >::const_iterator capability_const_iterator;
+      capability_iterator begin_capability ();
+      capability_iterator end_capability ();
+      capability_const_iterator begin_capability () const;
+      capability_const_iterator end_capability () const;
+      void add_capability (::CIAO::Config_Handlers::Capability const& );
+      size_t count_capability (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Capability > capability_;
+
+      // dependsOn
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
+      dependsOn_iterator begin_dependsOn ();
+      dependsOn_iterator end_dependsOn ();
+      dependsOn_const_iterator begin_dependsOn () const;
+      dependsOn_const_iterator end_dependsOn () const;
+      void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
+      size_t count_dependsOn (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
+
+      // infoProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+      infoProperty_iterator begin_infoProperty ();
+      infoProperty_iterator end_infoProperty ();
+      infoProperty_const_iterator begin_infoProperty () const;
+      infoProperty_const_iterator end_infoProperty () const;
+      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_infoProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+      // contentLocation
+      // 
+      public:
+      bool contentLocation_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+      // href
+      // 
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+      public:
+      ComponentImplementationDescription ();
+
+      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentImplementationDescription (ComponentImplementationDescription const& s);
+
+      ComponentImplementationDescription&
+      operator= (ComponentImplementationDescription const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
-{
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-basePackage (Type&);
+        virtual void
+        basePackage (Type&);
 
-virtual void
-basePackage (Type const&);
+        virtual void
+        basePackage (Type const&);
 
-virtual void
-basePackage_none (Type&);
+        virtual void
+        basePackage_none (Type&);
 
-virtual void
-basePackage_none (Type const&);
+        virtual void
+        basePackage_none (Type const&);
 
-virtual void
-specializedConfig (Type&);
+        virtual void
+        specializedConfig (Type&);
 
-virtual void
-specializedConfig (Type const&);
+        virtual void
+        specializedConfig (Type const&);
 
-virtual void
-specializedConfig_none (Type&);
+        virtual void
+        specializedConfig_none (Type&);
 
-virtual void
-specializedConfig_none (Type const&);
+        virtual void
+        specializedConfig_none (Type const&);
 
-virtual void
-selectRequirement (Type&);
+        virtual void
+        selectRequirement (Type&);
 
-virtual void
-selectRequirement (Type const&);
+        virtual void
+        selectRequirement (Type const&);
 
-virtual void
-selectRequirement_pre (Type&);
+        virtual void
+        selectRequirement_pre (Type&);
 
-virtual void
-selectRequirement_pre (Type const&);
+        virtual void
+        selectRequirement_pre (Type const&);
 
-virtual void
-selectRequirement_next (Type&);
+        virtual void
+        selectRequirement_next (Type&);
 
-virtual void
-selectRequirement_next (Type const&);
+        virtual void
+        selectRequirement_next (Type const&);
 
-virtual void
-selectRequirement_post (Type&);
+        virtual void
+        selectRequirement_post (Type&);
 
-virtual void
-selectRequirement_post (Type const&);
+        virtual void
+        selectRequirement_post (Type const&);
 
-virtual void
-selectRequirement_none (Type&);
+        virtual void
+        selectRequirement_none (Type&);
 
-virtual void
-selectRequirement_none (Type const&);
+        virtual void
+        selectRequirement_none (Type const&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-referencedPackage (Type&);
+        virtual void
+        referencedPackage (Type&);
 
-virtual void
-referencedPackage (Type const&);
+        virtual void
+        referencedPackage (Type const&);
 
-virtual void
-referencedPackage_none (Type&);
+        virtual void
+        referencedPackage_none (Type&);
 
-virtual void
-referencedPackage_none (Type const&);
+        virtual void
+        referencedPackage_none (Type const&);
 
-virtual void
-importedPackage (Type&);
+        virtual void
+        importedPackage (Type&);
 
-virtual void
-importedPackage (Type const&);
+        virtual void
+        importedPackage (Type const&);
 
-virtual void
-importedPackage_none (Type&);
+        virtual void
+        importedPackage_none (Type&);
 
-virtual void
-importedPackage_none (Type const&);
+        virtual void
+        importedPackage_none (Type const&);
 
-virtual void
-id (Type&);
+        virtual void
+        id (Type&);
 
-virtual void
-id (Type const&);
+        virtual void
+        id (Type const&);
 
-virtual void
-id_none (Type&);
+        virtual void
+        id_none (Type&);
 
-virtual void
-id_none (Type const&);
+        virtual void
+        id_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-propertyName (Type&);
+        virtual void
+        propertyName (Type&);
 
-virtual void
-propertyName (Type const&);
+        virtual void
+        propertyName (Type const&);
 
-virtual void
-instance (Type&);
+        virtual void
+        instance (Type&);
 
-virtual void
-instance (Type const&);
+        virtual void
+        instance (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-externalName (Type&);
+        virtual void
+        externalName (Type&);
 
-virtual void
-externalName (Type const&);
+        virtual void
+        externalName (Type const&);
 
-virtual void
-delegatesTo (Type&);
+        virtual void
+        delegatesTo (Type&);
 
-virtual void
-delegatesTo (Type const&);
+        virtual void
+        delegatesTo (Type const&);
 
-virtual void
-delegatesTo_pre (Type&);
+        virtual void
+        delegatesTo_pre (Type&);
 
-virtual void
-delegatesTo_pre (Type const&);
+        virtual void
+        delegatesTo_pre (Type const&);
 
-virtual void
-delegatesTo_next (Type&);
+        virtual void
+        delegatesTo_next (Type&);
 
-virtual void
-delegatesTo_next (Type const&);
+        virtual void
+        delegatesTo_next (Type const&);
 
-virtual void
-delegatesTo_post (Type&);
+        virtual void
+        delegatesTo_post (Type&);
 
-virtual void
-delegatesTo_post (Type const&);
+        virtual void
+        delegatesTo_post (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-instance (Type&);
+        virtual void
+        instance (Type&);
 
-virtual void
-instance (Type const&);
+        virtual void
+        instance (Type const&);
 
-virtual void
-instance_pre (Type&);
+        virtual void
+        instance_pre (Type&);
 
-virtual void
-instance_pre (Type const&);
+        virtual void
+        instance_pre (Type const&);
 
-virtual void
-instance_next (Type&);
+        virtual void
+        instance_next (Type&);
 
-virtual void
-instance_next (Type const&);
+        virtual void
+        instance_next (Type const&);
 
-virtual void
-instance_post (Type&);
+        virtual void
+        instance_post (Type&);
 
-virtual void
-instance_post (Type const&);
+        virtual void
+        instance_post (Type const&);
 
-virtual void
-connection (Type&);
+        virtual void
+        connection (Type&);
 
-virtual void
-connection (Type const&);
+        virtual void
+        connection (Type const&);
 
-virtual void
-connection_pre (Type&);
+        virtual void
+        connection_pre (Type&);
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type&);
+        virtual void
+        connection_next (Type&);
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type&);
+        virtual void
+        connection_post (Type&);
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-connection_none (Type&);
+        virtual void
+        connection_none (Type&);
 
-virtual void
-connection_none (Type const&);
+        virtual void
+        connection_none (Type const&);
 
-virtual void
-externalProperty (Type&);
+        virtual void
+        externalProperty (Type&);
 
-virtual void
-externalProperty (Type const&);
+        virtual void
+        externalProperty (Type const&);
 
-virtual void
-externalProperty_pre (Type&);
+        virtual void
+        externalProperty_pre (Type&);
 
-virtual void
-externalProperty_pre (Type const&);
+        virtual void
+        externalProperty_pre (Type const&);
 
-virtual void
-externalProperty_next (Type&);
+        virtual void
+        externalProperty_next (Type&);
 
-virtual void
-externalProperty_next (Type const&);
+        virtual void
+        externalProperty_next (Type const&);
 
-virtual void
-externalProperty_post (Type&);
+        virtual void
+        externalProperty_post (Type&);
 
-virtual void
-externalProperty_post (Type const&);
+        virtual void
+        externalProperty_post (Type const&);
 
-virtual void
-externalProperty_none (Type&);
+        virtual void
+        externalProperty_none (Type&);
 
-virtual void
-externalProperty_none (Type const&);
+        virtual void
+        externalProperty_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-nodeExecParameter (Type&);
+        virtual void
+        nodeExecParameter (Type&);
 
-virtual void
-nodeExecParameter (Type const&);
+        virtual void
+        nodeExecParameter (Type const&);
 
-virtual void
-nodeExecParameter_pre (Type&);
+        virtual void
+        nodeExecParameter_pre (Type&);
 
-virtual void
-nodeExecParameter_pre (Type const&);
+        virtual void
+        nodeExecParameter_pre (Type const&);
 
-virtual void
-nodeExecParameter_next (Type&);
+        virtual void
+        nodeExecParameter_next (Type&);
 
-virtual void
-nodeExecParameter_next (Type const&);
+        virtual void
+        nodeExecParameter_next (Type const&);
 
-virtual void
-nodeExecParameter_post (Type&);
+        virtual void
+        nodeExecParameter_post (Type&);
 
-virtual void
-nodeExecParameter_post (Type const&);
+        virtual void
+        nodeExecParameter_post (Type const&);
 
-virtual void
-nodeExecParameter_none (Type&);
+        virtual void
+        nodeExecParameter_none (Type&);
 
-virtual void
-nodeExecParameter_none (Type const&);
+        virtual void
+        nodeExecParameter_none (Type const&);
 
-virtual void
-componentExecParameter (Type&);
+        virtual void
+        componentExecParameter (Type&);
 
-virtual void
-componentExecParameter (Type const&);
+        virtual void
+        componentExecParameter (Type const&);
 
-virtual void
-componentExecParameter_pre (Type&);
+        virtual void
+        componentExecParameter_pre (Type&);
 
-virtual void
-componentExecParameter_pre (Type const&);
+        virtual void
+        componentExecParameter_pre (Type const&);
 
-virtual void
-componentExecParameter_next (Type&);
+        virtual void
+        componentExecParameter_next (Type&);
 
-virtual void
-componentExecParameter_next (Type const&);
+        virtual void
+        componentExecParameter_next (Type const&);
 
-virtual void
-componentExecParameter_post (Type&);
+        virtual void
+        componentExecParameter_post (Type&);
 
-virtual void
-componentExecParameter_post (Type const&);
+        virtual void
+        componentExecParameter_post (Type const&);
 
-virtual void
-componentExecParameter_none (Type&);
+        virtual void
+        componentExecParameter_none (Type&);
 
-virtual void
-componentExecParameter_none (Type const&);
+        virtual void
+        componentExecParameter_none (Type const&);
 
-virtual void
-deployRequirement (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-deployRequirement (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-deployRequirement_pre (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-deployRequirement_none (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-deployRequirement_none (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-primaryArtifact (Type&);
+        virtual void
+        primaryArtifact (Type&);
 
-virtual void
-primaryArtifact (Type const&);
+        virtual void
+        primaryArtifact (Type const&);
 
-virtual void
-primaryArtifact_pre (Type&);
+        virtual void
+        primaryArtifact_pre (Type&);
 
-virtual void
-primaryArtifact_pre (Type const&);
+        virtual void
+        primaryArtifact_pre (Type const&);
 
-virtual void
-primaryArtifact_next (Type&);
+        virtual void
+        primaryArtifact_next (Type&);
 
-virtual void
-primaryArtifact_next (Type const&);
+        virtual void
+        primaryArtifact_next (Type const&);
 
-virtual void
-primaryArtifact_post (Type&);
+        virtual void
+        primaryArtifact_post (Type&);
 
-virtual void
-primaryArtifact_post (Type const&);
+        virtual void
+        primaryArtifact_post (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-implements (Type&);
+        virtual void
+        implements (Type&);
 
-virtual void
-implements (Type const&);
+        virtual void
+        implements (Type const&);
 
-virtual void
-implements_none (Type&);
+        virtual void
+        implements_none (Type&);
 
-virtual void
-implements_none (Type const&);
+        virtual void
+        implements_none (Type const&);
 
-virtual void
-assemblyImpl (Type&);
+        virtual void
+        assemblyImpl (Type&);
 
-virtual void
-assemblyImpl (Type const&);
+        virtual void
+        assemblyImpl (Type const&);
 
-virtual void
-assemblyImpl_none (Type&);
+        virtual void
+        assemblyImpl_none (Type&);
 
-virtual void
-assemblyImpl_none (Type const&);
+        virtual void
+        assemblyImpl_none (Type const&);
 
-virtual void
-monolithicImpl (Type&);
+        virtual void
+        monolithicImpl (Type&);
 
-virtual void
-monolithicImpl (Type const&);
+        virtual void
+        monolithicImpl (Type const&);
 
-virtual void
-monolithicImpl_none (Type&);
+        virtual void
+        monolithicImpl_none (Type&);
 
-virtual void
-monolithicImpl_none (Type const&);
+        virtual void
+        monolithicImpl_none (Type const&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-capability (Type&);
+        virtual void
+        capability (Type&);
 
-virtual void
-capability (Type const&);
+        virtual void
+        capability (Type const&);
 
-virtual void
-capability_pre (Type&);
+        virtual void
+        capability_pre (Type&);
 
-virtual void
-capability_pre (Type const&);
+        virtual void
+        capability_pre (Type const&);
 
-virtual void
-capability_next (Type&);
+        virtual void
+        capability_next (Type&);
 
-virtual void
-capability_next (Type const&);
+        virtual void
+        capability_next (Type const&);
 
-virtual void
-capability_post (Type&);
+        virtual void
+        capability_post (Type&);
 
-virtual void
-capability_post (Type const&);
+        virtual void
+        capability_post (Type const&);
 
-virtual void
-capability_none (Type&);
+        virtual void
+        capability_none (Type&);
 
-virtual void
-capability_none (Type const&);
+        virtual void
+        capability_none (Type const&);
 
-virtual void
-dependsOn (Type&);
+        virtual void
+        dependsOn (Type&);
 
-virtual void
-dependsOn (Type const&);
+        virtual void
+        dependsOn (Type const&);
 
-virtual void
-dependsOn_pre (Type&);
+        virtual void
+        dependsOn_pre (Type&);
 
-virtual void
-dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-virtual void
-dependsOn_next (Type&);
+        virtual void
+        dependsOn_next (Type&);
 
-virtual void
-dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-virtual void
-dependsOn_post (Type&);
+        virtual void
+        dependsOn_post (Type&);
 
-virtual void
-dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-virtual void
-dependsOn_none (Type&);
+        virtual void
+        dependsOn_none (Type&);
 
-virtual void
-dependsOn_none (Type const&);
+        virtual void
+        dependsOn_none (Type const&);
 
-virtual void
-infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-virtual void
-infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-virtual void
-infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-virtual void
-infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-virtual void
-contentLocation (Type&);
+        virtual void
+        contentLocation (Type&);
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-contentLocation_none (Type&);
+        virtual void
+        contentLocation_none (Type&);
 
-virtual void
-contentLocation_none (Type const&);
+        virtual void
+        contentLocation_none (Type const&);
 
-virtual void
-href (Type&);
+        virtual void
+        href (Type&);
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-virtual void
-href_none (Type&);
+        virtual void
+        href_none (Type&);
 
-virtual void
-href_none (Type const&);
+        virtual void
+        href_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
-SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
+        SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-basePackage (Type &o)
-{
+        virtual void 
+        basePackage (Type &o)
+        {
 
-this->basePackage (const_cast <Type const &> (o));
-}
+          this->basePackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-basePackage (Type const&);
+        virtual void
+        basePackage (Type const&);
 
-virtual void
-specializedConfig (Type &o)
-{
+        virtual void 
+        specializedConfig (Type &o)
+        {
 
-this->specializedConfig (const_cast <Type const &> (o));
-}
+          this->specializedConfig (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-specializedConfig (Type const&);
+        virtual void
+        specializedConfig (Type const&);
 
-virtual void
-selectRequirement_pre (Type &o)
-{
+        virtual void 
+        selectRequirement_pre (Type &o)
+        {
 
-this->selectRequirement_pre (const_cast <Type const &> (o));
-}
+          this->selectRequirement_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_pre (Type const&);
+        virtual void
+        selectRequirement_pre (Type const&);
 
-virtual void
-selectRequirement_next (Type &o)
-{
+        virtual void 
+        selectRequirement_next (Type &o)
+        {
 
-this->selectRequirement_next (const_cast <Type const &> (o));
-}
+          this->selectRequirement_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_next (Type const&);
+        virtual void
+        selectRequirement_next (Type const&);
 
-virtual void
-selectRequirement_post (Type &o)
-{
+        virtual void 
+        selectRequirement_post (Type &o)
+        {
 
-this->selectRequirement_post (const_cast <Type const &> (o));
-}
+          this->selectRequirement_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_post (Type const&);
+        virtual void
+        selectRequirement_post (Type const&);
 
-virtual void
-configProperty_pre (Type &o)
-{
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type &o)
-{
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type &o)
-{
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-referencedPackage (Type &o)
-{
+        virtual void 
+        referencedPackage (Type &o)
+        {
 
-this->referencedPackage (const_cast <Type const &> (o));
-}
+          this->referencedPackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-referencedPackage (Type const&);
+        virtual void
+        referencedPackage (Type const&);
 
-virtual void
-importedPackage (Type &o)
-{
+        virtual void 
+        importedPackage (Type &o)
+        {
 
-this->importedPackage (const_cast <Type const &> (o));
-}
+          this->importedPackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-importedPackage (Type const&);
+        virtual void
+        importedPackage (Type const&);
 
-virtual void
-id (Type &o)
-{
+        virtual void 
+        id (Type &o)
+        {
 
-this->id (const_cast <Type const &> (o));
-}
+          this->id (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-id (Type const&);
+        virtual void
+        id (Type const&);
 
-protected:
-SubcomponentInstantiationDescription ();
-};
+        protected:
+        SubcomponentInstantiationDescription ();
+      };
 
-struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
-SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
+        SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-propertyName (Type &o)
-{
+        virtual void 
+        propertyName (Type &o)
+        {
 
-this->propertyName (const_cast <Type const &> (o));
-}
+          this->propertyName (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-propertyName (Type const&);
+        virtual void
+        propertyName (Type const&);
 
-virtual void
-instance (Type &o)
-{
+        virtual void 
+        instance (Type &o)
+        {
 
-this->instance (const_cast <Type const &> (o));
-}
+          this->instance (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-instance (Type const&);
+        virtual void
+        instance (Type const&);
 
-protected:
-SubcomponentPropertyReference ();
-};
+        protected:
+        SubcomponentPropertyReference ();
+      };
 
-struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
-AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
+        AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-externalName (Type &o)
-{
+        virtual void 
+        externalName (Type &o)
+        {
 
-this->externalName (const_cast <Type const &> (o));
-}
+          this->externalName (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-externalName (Type const&);
+        virtual void
+        externalName (Type const&);
 
-virtual void
-delegatesTo_pre (Type &o)
-{
+        virtual void 
+        delegatesTo_pre (Type &o)
+        {
 
-this->delegatesTo_pre (const_cast <Type const &> (o));
-}
+          this->delegatesTo_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-delegatesTo_pre (Type const&);
+        virtual void
+        delegatesTo_pre (Type const&);
 
-virtual void
-delegatesTo_next (Type &o)
-{
+        virtual void 
+        delegatesTo_next (Type &o)
+        {
 
-this->delegatesTo_next (const_cast <Type const &> (o));
-}
+          this->delegatesTo_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-delegatesTo_next (Type const&);
+        virtual void
+        delegatesTo_next (Type const&);
 
-virtual void
-delegatesTo_post (Type &o)
-{
+        virtual void 
+        delegatesTo_post (Type &o)
+        {
 
-this->delegatesTo_post (const_cast <Type const &> (o));
-}
+          this->delegatesTo_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-delegatesTo_post (Type const&);
+        virtual void
+        delegatesTo_post (Type const&);
 
-protected:
-AssemblyPropertyMapping ();
-};
+        protected:
+        AssemblyPropertyMapping ();
+      };
 
-struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
-ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
+        ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-instance_pre (Type &o)
-{
+        virtual void 
+        instance_pre (Type &o)
+        {
 
-this->instance_pre (const_cast <Type const &> (o));
-}
+          this->instance_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-instance_pre (Type const&);
+        virtual void
+        instance_pre (Type const&);
 
-virtual void
-instance_next (Type &o)
-{
+        virtual void 
+        instance_next (Type &o)
+        {
 
-this->instance_next (const_cast <Type const &> (o));
-}
+          this->instance_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-instance_next (Type const&);
+        virtual void
+        instance_next (Type const&);
 
-virtual void
-instance_post (Type &o)
-{
+        virtual void 
+        instance_post (Type &o)
+        {
 
-this->instance_post (const_cast <Type const &> (o));
-}
+          this->instance_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-instance_post (Type const&);
+        virtual void
+        instance_post (Type const&);
 
-virtual void
-connection_pre (Type &o)
-{
+        virtual void 
+        connection_pre (Type &o)
+        {
 
-this->connection_pre (const_cast <Type const &> (o));
-}
+          this->connection_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_pre (Type const&);
+        virtual void
+        connection_pre (Type const&);
 
-virtual void
-connection_next (Type &o)
-{
+        virtual void 
+        connection_next (Type &o)
+        {
 
-this->connection_next (const_cast <Type const &> (o));
-}
+          this->connection_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_next (Type const&);
+        virtual void
+        connection_next (Type const&);
 
-virtual void
-connection_post (Type &o)
-{
+        virtual void 
+        connection_post (Type &o)
+        {
 
-this->connection_post (const_cast <Type const &> (o));
-}
+          this->connection_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-connection_post (Type const&);
+        virtual void
+        connection_post (Type const&);
 
-virtual void
-externalProperty_pre (Type &o)
-{
+        virtual void 
+        externalProperty_pre (Type &o)
+        {
 
-this->externalProperty_pre (const_cast <Type const &> (o));
-}
+          this->externalProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-externalProperty_pre (Type const&);
+        virtual void
+        externalProperty_pre (Type const&);
 
-virtual void
-externalProperty_next (Type &o)
-{
+        virtual void 
+        externalProperty_next (Type &o)
+        {
 
-this->externalProperty_next (const_cast <Type const &> (o));
-}
+          this->externalProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-externalProperty_next (Type const&);
+        virtual void
+        externalProperty_next (Type const&);
 
-virtual void
-externalProperty_post (Type &o)
-{
+        virtual void 
+        externalProperty_post (Type &o)
+        {
 
-this->externalProperty_post (const_cast <Type const &> (o));
-}
+          this->externalProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-externalProperty_post (Type const&);
+        virtual void
+        externalProperty_post (Type const&);
 
-protected:
-ComponentAssemblyDescription ();
-};
+        protected:
+        ComponentAssemblyDescription ();
+      };
 
-struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
-MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
+        MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-nodeExecParameter_pre (Type &o)
-{
+        virtual void 
+        nodeExecParameter_pre (Type &o)
+        {
 
-this->nodeExecParameter_pre (const_cast <Type const &> (o));
-}
+          this->nodeExecParameter_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-nodeExecParameter_pre (Type const&);
+        virtual void
+        nodeExecParameter_pre (Type const&);
 
-virtual void
-nodeExecParameter_next (Type &o)
-{
+        virtual void 
+        nodeExecParameter_next (Type &o)
+        {
 
-this->nodeExecParameter_next (const_cast <Type const &> (o));
-}
+          this->nodeExecParameter_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-nodeExecParameter_next (Type const&);
+        virtual void
+        nodeExecParameter_next (Type const&);
 
-virtual void
-nodeExecParameter_post (Type &o)
-{
+        virtual void 
+        nodeExecParameter_post (Type &o)
+        {
 
-this->nodeExecParameter_post (const_cast <Type const &> (o));
-}
+          this->nodeExecParameter_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-nodeExecParameter_post (Type const&);
+        virtual void
+        nodeExecParameter_post (Type const&);
 
-virtual void
-componentExecParameter_pre (Type &o)
-{
+        virtual void 
+        componentExecParameter_pre (Type &o)
+        {
 
-this->componentExecParameter_pre (const_cast <Type const &> (o));
-}
+          this->componentExecParameter_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-componentExecParameter_pre (Type const&);
+        virtual void
+        componentExecParameter_pre (Type const&);
 
-virtual void
-componentExecParameter_next (Type &o)
-{
+        virtual void 
+        componentExecParameter_next (Type &o)
+        {
 
-this->componentExecParameter_next (const_cast <Type const &> (o));
-}
+          this->componentExecParameter_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-componentExecParameter_next (Type const&);
+        virtual void
+        componentExecParameter_next (Type const&);
 
-virtual void
-componentExecParameter_post (Type &o)
-{
+        virtual void 
+        componentExecParameter_post (Type &o)
+        {
 
-this->componentExecParameter_post (const_cast <Type const &> (o));
-}
+          this->componentExecParameter_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-componentExecParameter_post (Type const&);
+        virtual void
+        componentExecParameter_post (Type const&);
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type &o)
-{
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type &o)
-{
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-primaryArtifact_pre (Type &o)
-{
+        virtual void 
+        primaryArtifact_pre (Type &o)
+        {
 
-this->primaryArtifact_pre (const_cast <Type const &> (o));
-}
+          this->primaryArtifact_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-primaryArtifact_pre (Type const&);
+        virtual void
+        primaryArtifact_pre (Type const&);
 
-virtual void
-primaryArtifact_next (Type &o)
-{
+        virtual void 
+        primaryArtifact_next (Type &o)
+        {
 
-this->primaryArtifact_next (const_cast <Type const &> (o));
-}
+          this->primaryArtifact_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-primaryArtifact_next (Type const&);
+        virtual void
+        primaryArtifact_next (Type const&);
 
-virtual void
-primaryArtifact_post (Type &o)
-{
+        virtual void 
+        primaryArtifact_post (Type &o)
+        {
 
-this->primaryArtifact_post (const_cast <Type const &> (o));
-}
+          this->primaryArtifact_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-primaryArtifact_post (Type const&);
+        virtual void
+        primaryArtifact_post (Type const&);
 
-protected:
-MonolithicImplementationDescription ();
-};
+        protected:
+        MonolithicImplementationDescription ();
+      };
 
-struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
-ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
+        ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-implements (Type &o)
-{
+        virtual void 
+        implements (Type &o)
+        {
 
-this->implements (const_cast <Type const &> (o));
-}
+          this->implements (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-implements (Type const&);
+        virtual void
+        implements (Type const&);
 
-virtual void
-assemblyImpl (Type &o)
-{
+        virtual void 
+        assemblyImpl (Type &o)
+        {
 
-this->assemblyImpl (const_cast <Type const &> (o));
-}
+          this->assemblyImpl (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-assemblyImpl (Type const&);
+        virtual void
+        assemblyImpl (Type const&);
 
-virtual void
-monolithicImpl (Type &o)
-{
+        virtual void 
+        monolithicImpl (Type &o)
+        {
 
-this->monolithicImpl (const_cast <Type const &> (o));
-}
+          this->monolithicImpl (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-monolithicImpl (Type const&);
+        virtual void
+        monolithicImpl (Type const&);
 
-virtual void
-configProperty_pre (Type &o)
-{
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type &o)
-{
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type &o)
-{
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-capability_pre (Type &o)
-{
+        virtual void 
+        capability_pre (Type &o)
+        {
 
-this->capability_pre (const_cast <Type const &> (o));
-}
+          this->capability_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-capability_pre (Type const&);
+        virtual void
+        capability_pre (Type const&);
 
-virtual void
-capability_next (Type &o)
-{
+        virtual void 
+        capability_next (Type &o)
+        {
 
-this->capability_next (const_cast <Type const &> (o));
-}
+          this->capability_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-capability_next (Type const&);
+        virtual void
+        capability_next (Type const&);
 
-virtual void
-capability_post (Type &o)
-{
+        virtual void 
+        capability_post (Type &o)
+        {
 
-this->capability_post (const_cast <Type const &> (o));
-}
+          this->capability_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-capability_post (Type const&);
+        virtual void
+        capability_post (Type const&);
 
-virtual void
-dependsOn_pre (Type &o)
-{
+        virtual void 
+        dependsOn_pre (Type &o)
+        {
 
-this->dependsOn_pre (const_cast <Type const &> (o));
-}
+          this->dependsOn_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-virtual void
-dependsOn_next (Type &o)
-{
+        virtual void 
+        dependsOn_next (Type &o)
+        {
 
-this->dependsOn_next (const_cast <Type const &> (o));
-}
+          this->dependsOn_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-virtual void
-dependsOn_post (Type &o)
-{
+        virtual void 
+        dependsOn_post (Type &o)
+        {
 
-this->dependsOn_post (const_cast <Type const &> (o));
-}
+          this->dependsOn_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-virtual void
-infoProperty_pre (Type &o)
-{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-this->infoProperty_pre (const_cast <Type const &> (o));
-}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type &o)
-{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-this->infoProperty_next (const_cast <Type const &> (o));
-}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type &o)
-{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-this->infoProperty_post (const_cast <Type const &> (o));
-}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-contentLocation (Type &o)
-{
+        virtual void 
+        contentLocation (Type &o)
+        {
 
-this->contentLocation (const_cast <Type const &> (o));
-}
+          this->contentLocation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type &o)
-{
+        virtual void 
+        href (Type &o)
+        {
 
-this->href (const_cast <Type const &> (o));
-}
+          this->href (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-protected:
-ComponentImplementationDescription ();
-};
-}
-}
+        protected:
+        ComponentImplementationDescription ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // CID_HPP
diff --git a/CIAO/tools/Config_Handlers/cpd.cpp b/CIAO/tools/Config_Handlers/cpd.cpp
index 234843d14d4..c59e5e18fef 100644
--- a/CIAO/tools/Config_Handlers/cpd.cpp
+++ b/CIAO/tools/Config_Handlers/cpd.cpp
@@ -9,23 +9,29 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "cpd.hpp"
-#include <iostream>
+
 namespace CIAO
 {
   namespace Config_Handlers
   {
     // PackagedComponentImplementation
-    //
+    // 
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
                                      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-        referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
-        regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
+    regulator__ ()
     {
       name_->container (this);
       referencedImplementation_->container (this);
@@ -33,1236 +39,1236 @@ namespace CIAO
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
-regulator__ ()
-{
-name_->container (this);
-referencedImplementation_->container (this);
-}
-
-::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation::
-operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
-{
-name (s.name ());
-
-referencedImplementation (s.referencedImplementation ());
-
-return *this;
-}
-
-
-// PackagedComponentImplementation
-//
-::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
-name () const
-{
-return *name_;
-}
-
-void PackagedComponentImplementation::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
-
-// PackagedComponentImplementation
-//
-::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
-referencedImplementation () const
-{
-return *referencedImplementation_;
-}
-
-void PackagedComponentImplementation::
-referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
-{
-*referencedImplementation_ = e;
-}
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      referencedImplementation_->container (this);
+    }
 
+    ::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation::
+    operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
+    {
+      name (s.name ());
 
-// ComponentPackageDescription
-//
+      referencedImplementation (s.referencedImplementation ());
 
-ComponentPackageDescription::
-ComponentPackageDescription ()
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-}
+      return *this;
+    }
 
-ComponentPackageDescription::
-ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
-:
-::XSCRT::Type (),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
-contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-regulator__ ()
-{
-if (label_.get ()) label_->container (this);
-if (UUID_.get ()) UUID_->container (this);
-if (realizes_.get ()) realizes_->container (this);
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
 
-{
-for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
-}
+    // PackagedComponentImplementation
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
+    name () const
+    {
+      return *name_;
+    }
 
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+    void PackagedComponentImplementation::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-if (contentLocation_.get ()) contentLocation_->container (this);
-if (href_.get ()) href_->container (this);
-}
+    // PackagedComponentImplementation
+    // 
+    ::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
+    referencedImplementation () const
+    {
+      return *referencedImplementation_;
+    }
 
-::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription::
-operator= (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
-{
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    void PackagedComponentImplementation::
+    referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
+    {
+      *referencedImplementation_ = e;
+    }
 
-if (s.UUID_.get ()) UUID (*(s.UUID_));
-else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.realizes_.get ()) realizes (*(s.realizes_));
-else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+    // ComponentPackageDescription
+    // 
 
-configProperty_.clear ();
-{
-for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-}
+    ComponentPackageDescription::
+    ComponentPackageDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-implementation_.clear ();
-{
-for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
-}
+    ComponentPackageDescription::
+    ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
+    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+    regulator__ ()
+    {
+      if (label_.get ()) label_->container (this);
+      if (UUID_.get ()) UUID_->container (this);
+      if (realizes_.get ()) realizes_->container (this);
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
+      {
+        for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+      }
+
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
+
+      if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
+    }
 
-infoProperty_.clear ();
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+    ::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription::
+    operator= (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
+    {
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.UUID_.get ()) UUID (*(s.UUID_));
+      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.href_.get ()) href (*(s.href_));
-else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (s.realizes_.get ()) realizes (*(s.realizes_));
+      else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-return *this;
-}
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
+      implementation_.clear ();
+      {
+        for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+      }
 
-// ComponentPackageDescription
-//
-bool ComponentPackageDescription::
-label_p () const
-{
-return label_.get () != 0;
-}
+      infoProperty_.clear ();
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-label () const
-{
-return *label_;
-}
+      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-void ComponentPackageDescription::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
+      return *this;
+    }
 
-// ComponentPackageDescription
-//
-bool ComponentPackageDescription::
-UUID_p () const
-{
-return UUID_.get () != 0;
-}
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-UUID () const
-{
-return *UUID_;
-}
+    // ComponentPackageDescription
+    // 
+    bool ComponentPackageDescription::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-void ComponentPackageDescription::
-UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (UUID_.get ())
-{
-*UUID_ = e;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+    label () const
+    {
+      return *label_;
+    }
 
-else
-{
-UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-UUID_->container (this);
-}
-}
+    void ComponentPackageDescription::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
+
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-// ComponentPackageDescription
-//
-bool ComponentPackageDescription::
-realizes_p () const
-{
-return realizes_.get () != 0;
-}
+    // ComponentPackageDescription
+    // 
+    bool ComponentPackageDescription::
+    UUID_p () const
+    {
+      return UUID_.get () != 0;
+    }
 
-::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
-realizes () const
-{
-return *realizes_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+    UUID () const
+    {
+      return *UUID_;
+    }
 
-void ComponentPackageDescription::
-realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-{
-if (realizes_.get ())
-{
-*realizes_ = e;
-}
+    void ComponentPackageDescription::
+    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (UUID_.get ())
+      {
+        *UUID_ = e;
+      }
+
+      else
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
+    }
 
-else
-{
-realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-realizes_->container (this);
-}
-}
+    // ComponentPackageDescription
+    // 
+    bool ComponentPackageDescription::
+    realizes_p () const
+    {
+      return realizes_.get () != 0;
+    }
 
-// ComponentPackageDescription
-//
-ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
-begin_configProperty ()
-{
-return configProperty_.begin ();
-}
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
+    realizes () const
+    {
+      return *realizes_;
+    }
 
-ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
-end_configProperty ()
-{
-return configProperty_.end ();
-}
+    void ComponentPackageDescription::
+    realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+    {
+      if (realizes_.get ())
+      {
+        *realizes_ = e;
+      }
+
+      else
+      {
+        realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+        realizes_->container (this);
+      }
+    }
 
-ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
-begin_configProperty () const
-{
-return configProperty_.begin ();
-}
+    // ComponentPackageDescription
+    // 
+    ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
 
-ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
-end_configProperty () const
-{
-return configProperty_.end ();
-}
+    ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
 
-void ComponentPackageDescription::
-add_configProperty (::CIAO::Config_Handlers::Property const& e)
-{
-configProperty_.push_back (e);
-}
+    ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
 
-size_t ComponentPackageDescription::
-count_configProperty(void) const
-{
-return configProperty_.size ();
-}
+    ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
 
-// ComponentPackageDescription
-//
-ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
-begin_implementation ()
-{
-return implementation_.begin ();
-}
+    void ComponentPackageDescription::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
 
-ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
-end_implementation ()
-{
-return implementation_.end ();
-}
+    size_t ComponentPackageDescription::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
 
-ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
-begin_implementation () const
-{
-return implementation_.begin ();
-}
+    // ComponentPackageDescription
+    // 
+    ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+    begin_implementation ()
+    {
+      return implementation_.begin ();
+    }
 
-ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
-end_implementation () const
-{
-return implementation_.end ();
-}
+    ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+    end_implementation ()
+    {
+      return implementation_.end ();
+    }
 
-void ComponentPackageDescription::
-add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
-{
-implementation_.push_back (e);
-}
+    ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+    begin_implementation () const
+    {
+      return implementation_.begin ();
+    }
 
-size_t ComponentPackageDescription::
-count_implementation(void) const
-{
-return implementation_.size ();
-}
+    ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+    end_implementation () const
+    {
+      return implementation_.end ();
+    }
 
-// ComponentPackageDescription
-//
-ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
-begin_infoProperty ()
-{
-return infoProperty_.begin ();
-}
+    void ComponentPackageDescription::
+    add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
+    {
+      implementation_.push_back (e);
+    }
 
-ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
-end_infoProperty ()
-{
-return infoProperty_.end ();
-}
+    size_t ComponentPackageDescription::
+    count_implementation(void) const
+    {
+      return implementation_.size ();
+    }
 
-ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
-begin_infoProperty () const
-{
-return infoProperty_.begin ();
-}
+    // ComponentPackageDescription
+    // 
+    ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+    begin_infoProperty ()
+    {
+      return infoProperty_.begin ();
+    }
 
-ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
-end_infoProperty () const
-{
-return infoProperty_.end ();
-}
+    ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+    end_infoProperty ()
+    {
+      return infoProperty_.end ();
+    }
 
-void ComponentPackageDescription::
-add_infoProperty (::CIAO::Config_Handlers::Property const& e)
-{
-infoProperty_.push_back (e);
-}
+    ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+    begin_infoProperty () const
+    {
+      return infoProperty_.begin ();
+    }
 
-size_t ComponentPackageDescription::
-count_infoProperty(void) const
-{
-return infoProperty_.size ();
-}
+    ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+    end_infoProperty () const
+    {
+      return infoProperty_.end ();
+    }
 
-// ComponentPackageDescription
-//
-bool ComponentPackageDescription::
-contentLocation_p () const
-{
-return contentLocation_.get () != 0;
-}
+    void ComponentPackageDescription::
+    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      infoProperty_.push_back (e);
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-contentLocation () const
-{
-return *contentLocation_;
-}
+    size_t ComponentPackageDescription::
+    count_infoProperty(void) const
+    {
+      return infoProperty_.size ();
+    }
 
-void ComponentPackageDescription::
-contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (contentLocation_.get ())
-{
-*contentLocation_ = e;
-}
+    // ComponentPackageDescription
+    // 
+    bool ComponentPackageDescription::
+    contentLocation_p () const
+    {
+      return contentLocation_.get () != 0;
+    }
 
-else
-{
-contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-contentLocation_->container (this);
-}
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+    contentLocation () const
+    {
+      return *contentLocation_;
+    }
 
-// ComponentPackageDescription
-//
-bool ComponentPackageDescription::
-href_p () const
-{
-return href_.get () != 0;
-}
+    void ComponentPackageDescription::
+    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (contentLocation_.get ())
+      {
+        *contentLocation_ = e;
+      }
+
+      else
+      {
+        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        contentLocation_->container (this);
+      }
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-href () const
-{
-return *href_;
-}
+    // ComponentPackageDescription
+    // 
+    bool ComponentPackageDescription::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
-href ()
-{
-return *href_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+    href () const
+    {
+      return *href_;
+    }
 
-void ComponentPackageDescription::
-href (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (href_.get ())
-{
-*href_ = e;
-}
+    ::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
+    href ()
+    {
+      return *href_;
+    }
 
-else
-{
-href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-href_->container (this);
-}
-}
-}
+    void ComponentPackageDescription::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+      {
+        *href_ = e;
+      }
+
+      else
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-// PackagedComponentImplementation
-//
-
-PackagedComponentImplementation::
-PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
-
-::XSCRT::Parser< ACE_TCHAR > p (e);
-
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
-
-else if (n == "referencedImplementation")
-{
-referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
-referencedImplementation_->container (this);
-}
-
-else
-{
-}
-}
-}
-
-// ComponentPackageDescription
-//
-
-ComponentPackageDescription::
-ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
-
-::XSCRT::Parser< ACE_TCHAR > p (e);
-
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
-
-else if (n == "UUID")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-UUID (t);
-}
-
-else if (n == "realizes")
-{
-::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-realizes (t);
-}
-
-else if (n == "configProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_configProperty (t);
-}
-
-else if (n == "implementation")
-{
-::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
-add_implementation (t);
-}
+  namespace Config_Handlers
+  {
+    // PackagedComponentImplementation
+    //
 
-else if (n == "infoProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_infoProperty (t);
-}
+    PackagedComponentImplementation::
+    PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "contentLocation")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-contentLocation (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "referencedImplementation")
+        {
+          referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
+          referencedImplementation_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
 
-else
-{
-}
-}
+    // ComponentPackageDescription
+    //
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "href")
-{
-::XMLSchema::string< ACE_TCHAR > t (a);
-href (t);
-}
+    ComponentPackageDescription::
+    ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else
-{
-}
-}
-}
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
+
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
+
+        else if (n == "realizes")
+        {
+          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+          realizes (t);
+        }
+
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
+
+        else if (n == "implementation")
+        {
+          ::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
+          add_implementation (t);
+        }
+
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
+
+        else if (n == "contentLocation")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          contentLocation (t);
+        }
+
+        else 
+        {
+        }
+      }
+
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace
-{
-::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-struct PackagedComponentImplementationTypeInfoInitializer
-{
-PackagedComponentImplementationTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (PackagedComponentImplementation));
-::XSCRT::ExtendedTypeInfo nf (id);
-
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
-
-PackagedComponentImplementationTypeInfoInitializer PackagedComponentImplementationTypeInfoInitializer_;
-
-struct ComponentPackageDescriptionTypeInfoInitializer
-{
-ComponentPackageDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ComponentPackageDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
-
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
-
-ComponentPackageDescriptionTypeInfoInitializer ComponentPackageDescriptionTypeInfoInitializer_;
-}
-}
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+      struct PackagedComponentImplementationTypeInfoInitializer
+      {
+        PackagedComponentImplementationTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (PackagedComponentImplementation));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      PackagedComponentImplementationTypeInfoInitializer PackagedComponentImplementationTypeInfoInitializer_;
+
+      struct ComponentPackageDescriptionTypeInfoInitializer
+      {
+        ComponentPackageDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPackageDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ComponentPackageDescriptionTypeInfoInitializer ComponentPackageDescriptionTypeInfoInitializer_;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-// PackagedComponentImplementation
-//
-//
-
-void PackagedComponentImplementation::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-referencedImplementation (o);
-post (o);
-}
-
-void PackagedComponentImplementation::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-referencedImplementation (o);
-post (o);
-}
-
-void PackagedComponentImplementation::
-pre (Type&)
-{
-}
-
-void PackagedComponentImplementation::
-pre (Type const&)
-{
-}
-
-void PackagedComponentImplementation::
-name (Type& o)
-{
-dispatch (o.name ());
-}
-
-void PackagedComponentImplementation::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
-
-void PackagedComponentImplementation::
-referencedImplementation (Type& o)
-{
-dispatch (o.referencedImplementation ());
-}
-
-void PackagedComponentImplementation::
-referencedImplementation (Type const& o)
-{
-dispatch (o.referencedImplementation ());
-}
-
-void PackagedComponentImplementation::
-post (Type&)
-{
-}
-
-void PackagedComponentImplementation::
-post (Type const&)
-{
-}
-
-// ComponentPackageDescription
-//
-//
-
-void ComponentPackageDescription::
-traverse (Type& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.realizes_p ()) realizes (o);
-else realizes_none (o);
-configProperty (o);
-implementation (o);
-infoProperty (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
-
-void ComponentPackageDescription::
-traverse (Type const& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-if (o.realizes_p ()) realizes (o);
-else realizes_none (o);
-configProperty (o);
-implementation (o);
-infoProperty (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
-
-void ComponentPackageDescription::
-pre (Type&)
-{
-}
-
-void ComponentPackageDescription::
-pre (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-label (Type& o)
-{
-dispatch (o.label ());
-}
-
-void ComponentPackageDescription::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
-
-void ComponentPackageDescription::
-label_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-label_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-UUID (Type& o)
-{
-dispatch (o.UUID ());
-}
-
-void ComponentPackageDescription::
-UUID (Type const& o)
-{
-dispatch (o.UUID ());
-}
-
-void ComponentPackageDescription::
-UUID_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-UUID_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-realizes (Type& o)
-{
-dispatch (o.realizes ());
-}
-
-void ComponentPackageDescription::
-realizes (Type const& o)
-{
-dispatch (o.realizes ());
-}
-
-void ComponentPackageDescription::
-realizes_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-realizes_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
-
-configProperty_post (o);
-}
-
-else configProperty_none (o);
-}
-
-void ComponentPackageDescription::
-configProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-if (b != e)
-{
-configProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) configProperty_next (o);
-}
-
-configProperty_post (o);
-}
-
-else configProperty_none (o);
-}
-
-void ComponentPackageDescription::
-configProperty_pre (Type&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_pre (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_next (Type&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_next (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_post (Type&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_post (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-configProperty_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-implementation (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
-
-if (b != e)
-{
-implementation_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) implementation_next (o);
-}
-
-implementation_post (o);
-}
-
-else implementation_none (o);
-}
-
-void ComponentPackageDescription::
-implementation (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
-
-if (b != e)
-{
-implementation_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) implementation_next (o);
-}
-
-implementation_post (o);
-}
-
-else implementation_none (o);
-}
-
-void ComponentPackageDescription::
-implementation_pre (Type&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_pre (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_next (Type&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_next (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_post (Type&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_post (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-implementation_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
-
-infoProperty_post (o);
-}
-
-else infoProperty_none (o);
-}
-
-void ComponentPackageDescription::
-infoProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ComponentPackageDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
-
-infoProperty_post (o);
-}
-
-else infoProperty_none (o);
-}
-
-void ComponentPackageDescription::
-infoProperty_pre (Type&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_pre (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_next (Type&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_next (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_post (Type&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_post (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-infoProperty_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-contentLocation (Type& o)
-{
-dispatch (o.contentLocation ());
-}
-
-void ComponentPackageDescription::
-contentLocation (Type const& o)
-{
-dispatch (o.contentLocation ());
-}
-
-void ComponentPackageDescription::
-contentLocation_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-contentLocation_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-href (Type& o)
-{
-dispatch (o.href ());
-}
-
-void ComponentPackageDescription::
-href (Type const& o)
-{
-dispatch (o.href ());
-}
-
-void ComponentPackageDescription::
-href_none (Type&)
-{
-}
-
-void ComponentPackageDescription::
-href_none (Type const&)
-{
-}
-
-void ComponentPackageDescription::
-post (Type&)
-{
-}
-
-void ComponentPackageDescription::
-post (Type const&)
-{
-}
-}
-}
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // PackagedComponentImplementation
+      //
+      //
+
+      void PackagedComponentImplementation::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        referencedImplementation (o);
+        post (o);
+      }
+
+      void PackagedComponentImplementation::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        referencedImplementation (o);
+        post (o);
+      }
+
+      void PackagedComponentImplementation::
+      pre (Type&)
+      {
+      }
+
+      void PackagedComponentImplementation::
+      pre (Type const&)
+      {
+      }
+
+      void PackagedComponentImplementation::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void PackagedComponentImplementation::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void PackagedComponentImplementation::
+      referencedImplementation (Type& o)
+      {
+        dispatch (o.referencedImplementation ());
+      }
+
+      void PackagedComponentImplementation::
+      referencedImplementation (Type const& o)
+      {
+        dispatch (o.referencedImplementation ());
+      }
+
+      void PackagedComponentImplementation::
+      post (Type&)
+      {
+      }
+
+      void PackagedComponentImplementation::
+      post (Type const&)
+      {
+      }
+
+      // ComponentPackageDescription
+      //
+      //
+
+      void ComponentPackageDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.realizes_p ()) realizes (o);
+        else realizes_none (o);
+        configProperty (o);
+        implementation (o);
+        infoProperty (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
+
+      void ComponentPackageDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        if (o.realizes_p ()) realizes (o);
+        else realizes_none (o);
+        configProperty (o);
+        implementation (o);
+        infoProperty (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
+
+      void ComponentPackageDescription::
+      pre (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      pre (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
+
+      void ComponentPackageDescription::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
+
+      void ComponentPackageDescription::
+      label_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      label_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      UUID (Type& o)
+      {
+        dispatch (o.UUID ());
+      }
+
+      void ComponentPackageDescription::
+      UUID (Type const& o)
+      {
+        dispatch (o.UUID ());
+      }
+
+      void ComponentPackageDescription::
+      UUID_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      UUID_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      realizes (Type& o)
+      {
+        dispatch (o.realizes ());
+      }
+
+      void ComponentPackageDescription::
+      realizes (Type const& o)
+      {
+        dispatch (o.realizes ());
+      }
+
+      void ComponentPackageDescription::
+      realizes_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      realizes_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
+
+        else configProperty_none (o);
+      }
+
+      void ComponentPackageDescription::
+      configProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+        if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
+          }
+
+          configProperty_post (o);
+        }
+
+        else configProperty_none (o);
+      }
+
+      void ComponentPackageDescription::
+      configProperty_pre (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_pre (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_next (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_next (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_post (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_post (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      configProperty_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
+
+        if (b != e)
+        {
+          implementation_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) implementation_next (o);
+          }
+
+          implementation_post (o);
+        }
+
+        else implementation_none (o);
+      }
+
+      void ComponentPackageDescription::
+      implementation (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
+
+        if (b != e)
+        {
+          implementation_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) implementation_next (o);
+          }
+
+          implementation_post (o);
+        }
+
+        else implementation_none (o);
+      }
+
+      void ComponentPackageDescription::
+      implementation_pre (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_pre (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_next (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_next (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_post (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_post (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      implementation_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
+
+        else infoProperty_none (o);
+      }
+
+      void ComponentPackageDescription::
+      infoProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
+
+        else infoProperty_none (o);
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_pre (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_pre (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_next (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_next (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_post (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_post (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      contentLocation (Type& o)
+      {
+        dispatch (o.contentLocation ());
+      }
+
+      void ComponentPackageDescription::
+      contentLocation (Type const& o)
+      {
+        dispatch (o.contentLocation ());
+      }
+
+      void ComponentPackageDescription::
+      contentLocation_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      contentLocation_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ComponentPackageDescription::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ComponentPackageDescription::
+      href_none (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      href_none (Type const&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      post (Type&)
+      {
+      }
+
+      void ComponentPackageDescription::
+      post (Type const&)
+      {
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-// PackagedComponentImplementation
-//
-//
-
-PackagedComponentImplementation::
-PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
-
-PackagedComponentImplementation::
-PackagedComponentImplementation ()
-{
-}
-
-void PackagedComponentImplementation::
-traverse (Type const& o)
-{
-Traversal::PackagedComponentImplementation::traverse (o);
-}
-
-void PackagedComponentImplementation::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::PackagedComponentImplementation::name (o);
-pop_ ();
-}
-
-void PackagedComponentImplementation::
-referencedImplementation (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ()));
-Traversal::PackagedComponentImplementation::referencedImplementation (o);
-pop_ ();
-}
-
-// ComponentPackageDescription
-//
-//
-
-ComponentPackageDescription::
-ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
-
-ComponentPackageDescription::
-ComponentPackageDescription ()
-{
-}
-
-void ComponentPackageDescription::
-traverse (Type const& o)
-{
-Traversal::ComponentPackageDescription::traverse (o);
-}
-
-void ComponentPackageDescription::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::ComponentPackageDescription::label (o);
-pop_ ();
-}
-
-void ComponentPackageDescription::
-UUID (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-Traversal::ComponentPackageDescription::UUID (o);
-pop_ ();
-}
-
-void ComponentPackageDescription::
-realizes (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
-Traversal::ComponentPackageDescription::realizes (o);
-pop_ ();
-}
-
-void ComponentPackageDescription::
-configProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-}
-
-void ComponentPackageDescription::
-configProperty_next (Type const& o)
-{
-configProperty_post (o);
-configProperty_pre (o);
-}
-
-void ComponentPackageDescription::
-configProperty_post (Type const&)
-{
-pop_ ();
-}
-
-void ComponentPackageDescription::
-implementation_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-}
-
-void ComponentPackageDescription::
-implementation_next (Type const& o)
-{
-implementation_post (o);
-implementation_pre (o);
-}
-
-void ComponentPackageDescription::
-implementation_post (Type const&)
-{
-pop_ ();
-}
-
-void ComponentPackageDescription::
-infoProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-}
-
-void ComponentPackageDescription::
-infoProperty_next (Type const& o)
-{
-infoProperty_post (o);
-infoProperty_pre (o);
-}
-
-void ComponentPackageDescription::
-infoProperty_post (Type const&)
-{
-pop_ ();
-}
-
-void ComponentPackageDescription::
-contentLocation (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-Traversal::ComponentPackageDescription::contentLocation (o);
-pop_ ();
-}
-
-void ComponentPackageDescription::
-href (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-attr_ (&a);
-Traversal::ComponentPackageDescription::href (o);
-attr_ (0);
-}
-}
-}
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // PackagedComponentImplementation
+      //
+      //
+
+      PackagedComponentImplementation::
+      PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      PackagedComponentImplementation::
+      PackagedComponentImplementation ()
+      {
+      }
+
+      void PackagedComponentImplementation::
+      traverse (Type const& o)
+      {
+        Traversal::PackagedComponentImplementation::traverse (o);
+      }
+
+      void PackagedComponentImplementation::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::PackagedComponentImplementation::name (o);
+        pop_ ();
+      }
+
+      void PackagedComponentImplementation::
+      referencedImplementation (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ()));
+        Traversal::PackagedComponentImplementation::referencedImplementation (o);
+        pop_ ();
+      }
+
+      // ComponentPackageDescription
+      //
+      //
+
+      ComponentPackageDescription::
+      ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ComponentPackageDescription::
+      ComponentPackageDescription ()
+      {
+      }
+
+      void ComponentPackageDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPackageDescription::traverse (o);
+      }
+
+      void ComponentPackageDescription::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::ComponentPackageDescription::label (o);
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      UUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+        Traversal::ComponentPackageDescription::UUID (o);
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      realizes (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
+        Traversal::ComponentPackageDescription::realizes (o);
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      configProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+      }
+
+      void ComponentPackageDescription::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
+
+      void ComponentPackageDescription::
+      configProperty_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      implementation_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
+      }
+
+      void ComponentPackageDescription::
+      implementation_next (Type const& o)
+      {
+        implementation_post (o);
+        implementation_pre (o);
+      }
+
+      void ComponentPackageDescription::
+      implementation_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_next (Type const& o)
+      {
+        infoProperty_post (o);
+        infoProperty_pre (o);
+      }
+
+      void ComponentPackageDescription::
+      infoProperty_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      contentLocation (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+        Traversal::ComponentPackageDescription::contentLocation (o);
+        pop_ ();
+      }
+
+      void ComponentPackageDescription::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::ComponentPackageDescription::href (o);
+        attr_ (0);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
diff --git a/CIAO/tools/Config_Handlers/cpd.hpp b/CIAO/tools/Config_Handlers/cpd.hpp
index d5f6d9dccd7..301c15ec126 100644
--- a/CIAO/tools/Config_Handlers/cpd.hpp
+++ b/CIAO/tools/Config_Handlers/cpd.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,643 +15,639 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef CPD_HPP
 #define CPD_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class PackagedComponentImplementation;
-class ComponentPackageDescription;
-}
+  namespace Config_Handlers
+  {
+    class PackagedComponentImplementation;
+    class ComponentPackageDescription;
+  }
 }
 
 #include <memory>
 #include <list>
 #include "XMLSchema/Types.hpp"
 
-#include "ccd.hpp"
-
 #include "cid.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// referencedImplementation
-//
-public:
-::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
-void referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_;
-
-public:
-PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
-
-PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const&);
-PackagedComponentImplementation (PackagedComponentImplementation const& s);
-
-PackagedComponentImplementation&
-operator= (PackagedComponentImplementation const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// realizes
-//
-public:
-bool realizes_p () const;
-::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// implementation
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::iterator implementation_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::const_iterator implementation_const_iterator;
-implementation_iterator begin_implementation ();
-implementation_iterator end_implementation ();
-implementation_const_iterator begin_implementation () const;
-implementation_const_iterator end_implementation () const;
-void add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
-size_t count_implementation (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
-
-// infoProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-infoProperty_iterator begin_infoProperty ();
-infoProperty_iterator end_infoProperty ();
-infoProperty_const_iterator begin_infoProperty () const;
-infoProperty_const_iterator end_infoProperty () const;
-void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_infoProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-// contentLocation
-//
-public:
-bool contentLocation_p () const;
-::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-// href
-//
-public:
-bool href_p () const;
-::XMLSchema::string< ACE_TCHAR > const& href () const;
-::XMLSchema::string< ACE_TCHAR >& href ();
-void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-public:
-ComponentPackageDescription ();
-
-ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentPackageDescription (ComponentPackageDescription const& s);
-
-ComponentPackageDescription&
-operator= (ComponentPackageDescription const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // referencedImplementation
+      // 
+      public:
+      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
+      void referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_;
+
+      public:
+      PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
+
+      PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PackagedComponentImplementation (PackagedComponentImplementation const& s);
+
+      PackagedComponentImplementation&
+      operator= (PackagedComponentImplementation const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // realizes
+      // 
+      public:
+      bool realizes_p () const;
+      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
+      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // implementation
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::iterator implementation_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::const_iterator implementation_const_iterator;
+      implementation_iterator begin_implementation ();
+      implementation_iterator end_implementation ();
+      implementation_const_iterator begin_implementation () const;
+      implementation_const_iterator end_implementation () const;
+      void add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
+      size_t count_implementation (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
+
+      // infoProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+      infoProperty_iterator begin_infoProperty ();
+      infoProperty_iterator end_infoProperty ();
+      infoProperty_const_iterator begin_infoProperty () const;
+      infoProperty_const_iterator end_infoProperty () const;
+      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_infoProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+      // contentLocation
+      // 
+      public:
+      bool contentLocation_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+      // href
+      // 
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+      public:
+      ComponentPackageDescription ();
+
+      ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPackageDescription (ComponentPackageDescription const& s);
+
+      ComponentPackageDescription&
+      operator= (ComponentPackageDescription const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
-{
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-referencedImplementation (Type&);
+        virtual void
+        referencedImplementation (Type&);
 
-virtual void
-referencedImplementation (Type const&);
+        virtual void
+        referencedImplementation (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-realizes (Type&);
+        virtual void
+        realizes (Type&);
 
-virtual void
-realizes (Type const&);
+        virtual void
+        realizes (Type const&);
 
-virtual void
-realizes_none (Type&);
+        virtual void
+        realizes_none (Type&);
 
-virtual void
-realizes_none (Type const&);
+        virtual void
+        realizes_none (Type const&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-implementation (Type&);
+        virtual void
+        implementation (Type&);
 
-virtual void
-implementation (Type const&);
+        virtual void
+        implementation (Type const&);
 
-virtual void
-implementation_pre (Type&);
+        virtual void
+        implementation_pre (Type&);
 
-virtual void
-implementation_pre (Type const&);
+        virtual void
+        implementation_pre (Type const&);
 
-virtual void
-implementation_next (Type&);
+        virtual void
+        implementation_next (Type&);
 
-virtual void
-implementation_next (Type const&);
+        virtual void
+        implementation_next (Type const&);
 
-virtual void
-implementation_post (Type&);
+        virtual void
+        implementation_post (Type&);
 
-virtual void
-implementation_post (Type const&);
+        virtual void
+        implementation_post (Type const&);
 
-virtual void
-implementation_none (Type&);
+        virtual void
+        implementation_none (Type&);
 
-virtual void
-implementation_none (Type const&);
+        virtual void
+        implementation_none (Type const&);
 
-virtual void
-infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-virtual void
-infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-virtual void
-infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-virtual void
-infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-virtual void
-contentLocation (Type&);
+        virtual void
+        contentLocation (Type&);
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-contentLocation_none (Type&);
+        virtual void
+        contentLocation_none (Type&);
 
-virtual void
-contentLocation_none (Type const&);
+        virtual void
+        contentLocation_none (Type const&);
 
-virtual void
-href (Type&);
+        virtual void
+        href (Type&);
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-virtual void
-href_none (Type&);
+        virtual void
+        href_none (Type&);
 
-virtual void
-href_none (Type const&);
+        virtual void
+        href_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct PackagedComponentImplementation : Traversal::PackagedComponentImplementation,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
-PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct PackagedComponentImplementation : Traversal::PackagedComponentImplementation, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
+        PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-referencedImplementation (Type &o)
-{
+        virtual void 
+        referencedImplementation (Type &o)
+        {
 
-this->referencedImplementation (const_cast <Type const &> (o));
-}
+          this->referencedImplementation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-referencedImplementation (Type const&);
+        virtual void
+        referencedImplementation (Type const&);
 
-protected:
-PackagedComponentImplementation ();
-};
+        protected:
+        PackagedComponentImplementation ();
+      };
 
-struct ComponentPackageDescription : Traversal::ComponentPackageDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
-ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct ComponentPackageDescription : Traversal::ComponentPackageDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
+        ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-realizes (Type &o)
-{
+        virtual void 
+        realizes (Type &o)
+        {
 
-this->realizes (const_cast <Type const &> (o));
-}
+          this->realizes (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-realizes (Type const&);
+        virtual void
+        realizes (Type const&);
 
-virtual void
-configProperty_pre (Type &o)
-{
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type &o)
-{
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type &o)
-{
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-implementation_pre (Type &o)
-{
+        virtual void 
+        implementation_pre (Type &o)
+        {
 
-this->implementation_pre (const_cast <Type const &> (o));
-}
+          this->implementation_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-implementation_pre (Type const&);
+        virtual void
+        implementation_pre (Type const&);
 
-virtual void
-implementation_next (Type &o)
-{
+        virtual void 
+        implementation_next (Type &o)
+        {
 
-this->implementation_next (const_cast <Type const &> (o));
-}
+          this->implementation_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-implementation_next (Type const&);
+        virtual void
+        implementation_next (Type const&);
 
-virtual void
-implementation_post (Type &o)
-{
+        virtual void 
+        implementation_post (Type &o)
+        {
 
-this->implementation_post (const_cast <Type const &> (o));
-}
+          this->implementation_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-implementation_post (Type const&);
+        virtual void
+        implementation_post (Type const&);
 
-virtual void
-infoProperty_pre (Type &o)
-{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-this->infoProperty_pre (const_cast <Type const &> (o));
-}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type &o)
-{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-this->infoProperty_next (const_cast <Type const &> (o));
-}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type &o)
-{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-this->infoProperty_post (const_cast <Type const &> (o));
-}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-contentLocation (Type &o)
-{
+        virtual void 
+        contentLocation (Type &o)
+        {
 
-this->contentLocation (const_cast <Type const &> (o));
-}
+          this->contentLocation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type &o)
-{
+        virtual void 
+        href (Type &o)
+        {
 
-this->href (const_cast <Type const &> (o));
-}
+          this->href (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-protected:
-ComponentPackageDescription ();
-};
-}
-}
+        protected:
+        ComponentPackageDescription ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // CPD_HPP
diff --git a/CIAO/tools/Config_Handlers/iad.cpp b/CIAO/tools/Config_Handlers/iad.cpp
index e799fd544fb..e05cc1272b1 100644
--- a/CIAO/tools/Config_Handlers/iad.cpp
+++ b/CIAO/tools/Config_Handlers/iad.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "iad.hpp"
 
 namespace CIAO
@@ -16,16 +22,16 @@ namespace CIAO
   namespace Config_Handlers
   {
     // NamedImplementationArtifact
-    //
+    // 
 
     NamedImplementationArtifact::
     NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
                                  ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-        referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
-        regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
+    regulator__ ()
     {
       name_->container (this);
       referencedArtifact_->container (this);
@@ -33,1478 +39,1478 @@ namespace CIAO
 
     NamedImplementationArtifact::
     NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
-regulator__ ()
-{
-name_->container (this);
-referencedArtifact_->container (this);
-}
-
-::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
-operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-{
-name (s.name ());
-
-referencedArtifact (s.referencedArtifact ());
-
-return *this;
-}
-
-
-// NamedImplementationArtifact
-//
-::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
-name () const
-{
-return *name_;
-}
-
-void NamedImplementationArtifact::
-name (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-*name_ = e;
-}
-
-// NamedImplementationArtifact
-//
-::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
-referencedArtifact () const
-{
-return *referencedArtifact_;
-}
-
-void NamedImplementationArtifact::
-referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
-{
-*referencedArtifact_ = e;
-}
-
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      referencedArtifact_->container (this);
+    }
 
-// ImplementationArtifactDescription
-//
+    ::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
+    operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
+    {
+      name (s.name ());
 
-ImplementationArtifactDescription::
-ImplementationArtifactDescription ()
-:
-::XSCRT::Type (),
-regulator__ ()
-{
-}
+      referencedArtifact (s.referencedArtifact ());
 
-ImplementationArtifactDescription::
-ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-:
-::XSCRT::Type (),
-label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-regulator__ ()
-{
-if (label_.get ()) label_->container (this);
-if (UUID_.get ()) UUID_->container (this);
-{
-for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-}
+      return *this;
+    }
 
-{
-for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-}
 
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+    // NamedImplementationArtifact
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
+    name () const
+    {
+      return *name_;
+    }
 
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+    void NamedImplementationArtifact::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
 
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+    // NamedImplementationArtifact
+    // 
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
+    referencedArtifact () const
+    {
+      return *referencedArtifact_;
+    }
 
-if (contentLocation_.get ()) contentLocation_->container (this);
-if (href_.get ()) href_->container (this);
-}
+    void NamedImplementationArtifact::
+    referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
+    {
+      *referencedArtifact_ = e;
+    }
 
-::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
-operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-{
-if (s.label_.get ()) label (*(s.label_));
-else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-if (s.UUID_.get ()) UUID (*(s.UUID_));
-else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+    // ImplementationArtifactDescription
+    // 
 
-location_.clear ();
-{
-for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-}
+    ImplementationArtifactDescription::
+    ImplementationArtifactDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
+    {
+    }
 
-dependsOn_.clear ();
-{
-for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-}
+    ImplementationArtifactDescription::
+    ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+    regulator__ ()
+    {
+      if (label_.get ()) label_->container (this);
+      if (UUID_.get ()) UUID_->container (this);
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
+
+      {
+        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+      }
+
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
+
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
+
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
+
+      if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
+    }
 
-execParameter_.clear ();
-{
-for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-}
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
+    operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+    {
+      if (s.label_.get ()) label (*(s.label_));
+      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-infoProperty_.clear ();
-{
-for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
-}
+      if (s.UUID_.get ()) UUID (*(s.UUID_));
+      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-deployRequirement_.clear ();
-{
-for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-}
+      location_.clear ();
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
 
-if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      dependsOn_.clear ();
+      {
+        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+      }
 
-if (s.href_.get ()) href (*(s.href_));
-else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      execParameter_.clear ();
+      {
+        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+      }
 
-return *this;
-}
+      infoProperty_.clear ();
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
+      deployRequirement_.clear ();
+      {
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+      }
 
-// ImplementationArtifactDescription
-//
-bool ImplementationArtifactDescription::
-label_p () const
-{
-return label_.get () != 0;
-}
+      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-label () const
-{
-return *label_;
-}
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-void ImplementationArtifactDescription::
-label (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (label_.get ())
-{
-*label_ = e;
-}
+      return *this;
+    }
 
-else
-{
-label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-label_->container (this);
-}
-}
 
-// ImplementationArtifactDescription
-//
-bool ImplementationArtifactDescription::
-UUID_p () const
-{
-return UUID_.get () != 0;
-}
+    // ImplementationArtifactDescription
+    // 
+    bool ImplementationArtifactDescription::
+    label_p () const
+    {
+      return label_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-UUID () const
-{
-return *UUID_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+    label () const
+    {
+      return *label_;
+    }
 
-void ImplementationArtifactDescription::
-UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (UUID_.get ())
-{
-*UUID_ = e;
-}
+    void ImplementationArtifactDescription::
+    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (label_.get ())
+      {
+        *label_ = e;
+      }
+
+      else
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
+    }
 
-else
-{
-UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-UUID_->container (this);
-}
-}
+    // ImplementationArtifactDescription
+    // 
+    bool ImplementationArtifactDescription::
+    UUID_p () const
+    {
+      return UUID_.get () != 0;
+    }
 
-// ImplementationArtifactDescription
-//
-ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-begin_location ()
-{
-return location_.begin ();
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+    UUID () const
+    {
+      return *UUID_;
+    }
 
-ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-end_location ()
-{
-return location_.end ();
-}
+    void ImplementationArtifactDescription::
+    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (UUID_.get ())
+      {
+        *UUID_ = e;
+      }
+
+      else
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
+    }
 
-ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-begin_location () const
-{
-return location_.begin ();
-}
+    // ImplementationArtifactDescription
+    // 
+    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+    begin_location ()
+    {
+      return location_.begin ();
+    }
 
-ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-end_location () const
-{
-return location_.end ();
-}
+    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+    end_location ()
+    {
+      return location_.end ();
+    }
 
-void ImplementationArtifactDescription::
-add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-location_.push_back (e);
-}
+    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+    begin_location () const
+    {
+      return location_.begin ();
+    }
 
-size_t ImplementationArtifactDescription::
-count_location(void) const
-{
-return location_.size ();
-}
+    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+    end_location () const
+    {
+      return location_.end ();
+    }
 
-// ImplementationArtifactDescription
-//
-ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-begin_dependsOn ()
-{
-return dependsOn_.begin ();
-}
+    void ImplementationArtifactDescription::
+    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      location_.push_back (e);
+    }
 
-ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-end_dependsOn ()
-{
-return dependsOn_.end ();
-}
+    size_t ImplementationArtifactDescription::
+    count_location(void) const
+    {
+      return location_.size ();
+    }
 
-ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-begin_dependsOn () const
-{
-return dependsOn_.begin ();
-}
+    // ImplementationArtifactDescription
+    // 
+    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+    begin_dependsOn ()
+    {
+      return dependsOn_.begin ();
+    }
 
-ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-end_dependsOn () const
-{
-return dependsOn_.end ();
-}
+    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+    end_dependsOn ()
+    {
+      return dependsOn_.end ();
+    }
 
-void ImplementationArtifactDescription::
-add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-{
-dependsOn_.push_back (e);
-}
+    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+    begin_dependsOn () const
+    {
+      return dependsOn_.begin ();
+    }
 
-size_t ImplementationArtifactDescription::
-count_dependsOn(void) const
-{
-return dependsOn_.size ();
-}
+    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+    end_dependsOn () const
+    {
+      return dependsOn_.end ();
+    }
 
-// ImplementationArtifactDescription
-//
-ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
-begin_execParameter ()
-{
-return execParameter_.begin ();
-}
+    void ImplementationArtifactDescription::
+    add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+    {
+      dependsOn_.push_back (e);
+    }
 
-ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
-end_execParameter ()
-{
-return execParameter_.end ();
-}
+    size_t ImplementationArtifactDescription::
+    count_dependsOn(void) const
+    {
+      return dependsOn_.size ();
+    }
 
-ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
-begin_execParameter () const
-{
-return execParameter_.begin ();
-}
+    // ImplementationArtifactDescription
+    // 
+    ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+    begin_execParameter ()
+    {
+      return execParameter_.begin ();
+    }
 
-ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
-end_execParameter () const
-{
-return execParameter_.end ();
-}
+    ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+    end_execParameter ()
+    {
+      return execParameter_.end ();
+    }
 
-void ImplementationArtifactDescription::
-add_execParameter (::CIAO::Config_Handlers::Property const& e)
-{
-execParameter_.push_back (e);
-}
+    ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+    begin_execParameter () const
+    {
+      return execParameter_.begin ();
+    }
 
-size_t ImplementationArtifactDescription::
-count_execParameter(void) const
-{
-return execParameter_.size ();
-}
+    ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+    end_execParameter () const
+    {
+      return execParameter_.end ();
+    }
 
-// ImplementationArtifactDescription
-//
-ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
-begin_infoProperty ()
-{
-return infoProperty_.begin ();
-}
+    void ImplementationArtifactDescription::
+    add_execParameter (::CIAO::Config_Handlers::Property const& e)
+    {
+      execParameter_.push_back (e);
+    }
 
-ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
-end_infoProperty ()
-{
-return infoProperty_.end ();
-}
+    size_t ImplementationArtifactDescription::
+    count_execParameter(void) const
+    {
+      return execParameter_.size ();
+    }
 
-ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
-begin_infoProperty () const
-{
-return infoProperty_.begin ();
-}
+    // ImplementationArtifactDescription
+    // 
+    ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+    begin_infoProperty ()
+    {
+      return infoProperty_.begin ();
+    }
 
-ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
-end_infoProperty () const
-{
-return infoProperty_.end ();
-}
+    ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+    end_infoProperty ()
+    {
+      return infoProperty_.end ();
+    }
 
-void ImplementationArtifactDescription::
-add_infoProperty (::CIAO::Config_Handlers::Property const& e)
-{
-infoProperty_.push_back (e);
-}
+    ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+    begin_infoProperty () const
+    {
+      return infoProperty_.begin ();
+    }
 
-size_t ImplementationArtifactDescription::
-count_infoProperty(void) const
-{
-return infoProperty_.size ();
-}
+    ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+    end_infoProperty () const
+    {
+      return infoProperty_.end ();
+    }
 
-// ImplementationArtifactDescription
-//
-ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
-begin_deployRequirement ()
-{
-return deployRequirement_.begin ();
-}
+    void ImplementationArtifactDescription::
+    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      infoProperty_.push_back (e);
+    }
 
-ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
-end_deployRequirement ()
-{
-return deployRequirement_.end ();
-}
+    size_t ImplementationArtifactDescription::
+    count_infoProperty(void) const
+    {
+      return infoProperty_.size ();
+    }
 
-ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
-begin_deployRequirement () const
-{
-return deployRequirement_.begin ();
-}
+    // ImplementationArtifactDescription
+    // 
+    ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+    begin_deployRequirement ()
+    {
+      return deployRequirement_.begin ();
+    }
 
-ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
-end_deployRequirement () const
-{
-return deployRequirement_.end ();
-}
+    ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+    end_deployRequirement ()
+    {
+      return deployRequirement_.end ();
+    }
 
-void ImplementationArtifactDescription::
-add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-{
-deployRequirement_.push_back (e);
-}
+    ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+    begin_deployRequirement () const
+    {
+      return deployRequirement_.begin ();
+    }
 
-size_t ImplementationArtifactDescription::
-count_deployRequirement(void) const
-{
-return deployRequirement_.size ();
-}
+    ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+    end_deployRequirement () const
+    {
+      return deployRequirement_.end ();
+    }
 
-// ImplementationArtifactDescription
-//
-bool ImplementationArtifactDescription::
-contentLocation_p () const
-{
-return contentLocation_.get () != 0;
-}
+    void ImplementationArtifactDescription::
+    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      deployRequirement_.push_back (e);
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-contentLocation () const
-{
-return *contentLocation_;
-}
+    size_t ImplementationArtifactDescription::
+    count_deployRequirement(void) const
+    {
+      return deployRequirement_.size ();
+    }
 
-void ImplementationArtifactDescription::
-contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (contentLocation_.get ())
-{
-*contentLocation_ = e;
-}
+    // ImplementationArtifactDescription
+    // 
+    bool ImplementationArtifactDescription::
+    contentLocation_p () const
+    {
+      return contentLocation_.get () != 0;
+    }
 
-else
-{
-contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-contentLocation_->container (this);
-}
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+    contentLocation () const
+    {
+      return *contentLocation_;
+    }
 
-// ImplementationArtifactDescription
-//
-bool ImplementationArtifactDescription::
-href_p () const
-{
-return href_.get () != 0;
-}
+    void ImplementationArtifactDescription::
+    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (contentLocation_.get ())
+      {
+        *contentLocation_ = e;
+      }
+
+      else
+      {
+        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        contentLocation_->container (this);
+      }
+    }
 
-::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-href () const
-{
-return *href_;
-}
+    // ImplementationArtifactDescription
+    // 
+    bool ImplementationArtifactDescription::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
 
-::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-href ()
-{
-return *href_;
-}
+    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+    href () const
+    {
+      return *href_;
+    }
 
-void ImplementationArtifactDescription::
-href (::XMLSchema::string< ACE_TCHAR > const& e)
-{
-if (href_.get ())
-{
-*href_ = e;
-}
+    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+    href ()
+    {
+      return *href_;
+    }
 
-else
-{
-href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-href_->container (this);
-}
-}
-}
+    void ImplementationArtifactDescription::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+      {
+        *href_ = e;
+      }
+
+      else
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-// NamedImplementationArtifact
-//
-
-NamedImplementationArtifact::
-NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
-
-::XSCRT::Parser< ACE_TCHAR > p (e);
-
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-if (n == "name")
-{
-name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-name_->container (this);
-}
-
-else if (n == "referencedArtifact")
-{
-referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
-referencedArtifact_->container (this);
-}
-
-else
-{
-}
-}
-}
-
-// ImplementationArtifactDescription
-//
-
-ImplementationArtifactDescription::
-ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-:Base__ (e), regulator__ ()
-{
-
-::XSCRT::Parser< ACE_TCHAR > p (e);
-
-while (p.more_elements ())
-{
-::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-if (n == "label")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-label (t);
-}
-
-else if (n == "UUID")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-UUID (t);
-}
-
-else if (n == "location")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-add_location (t);
-}
-
-else if (n == "dependsOn")
-{
-::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-add_dependsOn (t);
-}
-
-else if (n == "execParameter")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_execParameter (t);
-}
-
-else if (n == "infoProperty")
-{
-::CIAO::Config_Handlers::Property t (e);
-add_infoProperty (t);
-}
+  namespace Config_Handlers
+  {
+    // NamedImplementationArtifact
+    //
 
-else if (n == "deployRequirement")
-{
-::CIAO::Config_Handlers::Requirement t (e);
-add_deployRequirement (t);
-}
+    NamedImplementationArtifact::
+    NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else if (n == "contentLocation")
-{
-::XMLSchema::string< ACE_TCHAR > t (e);
-contentLocation (t);
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "referencedArtifact")
+        {
+          referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
+          referencedArtifact_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
 
-else
-{
-}
-}
+    // ImplementationArtifactDescription
+    //
 
-while (p.more_attributes ())
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-if (n == "href")
-{
-::XMLSchema::string< ACE_TCHAR > t (a);
-href (t);
-}
+    ImplementationArtifactDescription::
+    ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
 
-else
-{
-}
-}
-}
-}
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
+
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
+
+        else if (n == "location")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_location (t);
+        }
+
+        else if (n == "dependsOn")
+        {
+          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+          add_dependsOn (t);
+        }
+
+        else if (n == "execParameter")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_execParameter (t);
+        }
+
+        else if (n == "infoProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_infoProperty (t);
+        }
+
+        else if (n == "deployRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_deployRequirement (t);
+        }
+
+        else if (n == "contentLocation")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          contentLocation (t);
+        }
+
+        else 
+        {
+        }
+      }
+
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace
-{
-::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-struct NamedImplementationArtifactTypeInfoInitializer
-{
-NamedImplementationArtifactTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (NamedImplementationArtifact));
-::XSCRT::ExtendedTypeInfo nf (id);
-
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
-
-NamedImplementationArtifactTypeInfoInitializer NamedImplementationArtifactTypeInfoInitializer_;
-
-struct ImplementationArtifactDescriptionTypeInfoInitializer
-{
-ImplementationArtifactDescriptionTypeInfoInitializer ()
-{
-::XSCRT::TypeId id (typeid (ImplementationArtifactDescription));
-::XSCRT::ExtendedTypeInfo nf (id);
-
-nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-}
-};
-
-ImplementationArtifactDescriptionTypeInfoInitializer ImplementationArtifactDescriptionTypeInfoInitializer_;
-}
-}
+  namespace Config_Handlers
+  {
+    namespace
+    {
+      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+      struct NamedImplementationArtifactTypeInfoInitializer
+      {
+        NamedImplementationArtifactTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (NamedImplementationArtifact));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      NamedImplementationArtifactTypeInfoInitializer NamedImplementationArtifactTypeInfoInitializer_;
+
+      struct ImplementationArtifactDescriptionTypeInfoInitializer
+      {
+        ImplementationArtifactDescriptionTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ImplementationArtifactDescription));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ImplementationArtifactDescriptionTypeInfoInitializer ImplementationArtifactDescriptionTypeInfoInitializer_;
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-// NamedImplementationArtifact
-//
-//
-
-void NamedImplementationArtifact::
-traverse (Type& o)
-{
-pre (o);
-name (o);
-referencedArtifact (o);
-post (o);
-}
-
-void NamedImplementationArtifact::
-traverse (Type const& o)
-{
-pre (o);
-name (o);
-referencedArtifact (o);
-post (o);
-}
-
-void NamedImplementationArtifact::
-pre (Type&)
-{
-}
-
-void NamedImplementationArtifact::
-pre (Type const&)
-{
-}
-
-void NamedImplementationArtifact::
-name (Type& o)
-{
-dispatch (o.name ());
-}
-
-void NamedImplementationArtifact::
-name (Type const& o)
-{
-dispatch (o.name ());
-}
-
-void NamedImplementationArtifact::
-referencedArtifact (Type& o)
-{
-dispatch (o.referencedArtifact ());
-}
-
-void NamedImplementationArtifact::
-referencedArtifact (Type const& o)
-{
-dispatch (o.referencedArtifact ());
-}
-
-void NamedImplementationArtifact::
-post (Type&)
-{
-}
-
-void NamedImplementationArtifact::
-post (Type const&)
-{
-}
-
-// ImplementationArtifactDescription
-//
-//
-
-void ImplementationArtifactDescription::
-traverse (Type& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-location (o);
-dependsOn (o);
-execParameter (o);
-infoProperty (o);
-deployRequirement (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
-
-void ImplementationArtifactDescription::
-traverse (Type const& o)
-{
-pre (o);
-if (o.label_p ()) label (o);
-else label_none (o);
-if (o.UUID_p ()) UUID (o);
-else UUID_none (o);
-location (o);
-dependsOn (o);
-execParameter (o);
-infoProperty (o);
-deployRequirement (o);
-if (o.contentLocation_p ()) contentLocation (o);
-else contentLocation_none (o);
-if (o.href_p ()) href (o);
-else href_none (o);
-post (o);
-}
-
-void ImplementationArtifactDescription::
-pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-label (Type& o)
-{
-dispatch (o.label ());
-}
-
-void ImplementationArtifactDescription::
-label (Type const& o)
-{
-dispatch (o.label ());
-}
-
-void ImplementationArtifactDescription::
-label_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-label_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-UUID (Type& o)
-{
-dispatch (o.UUID ());
-}
-
-void ImplementationArtifactDescription::
-UUID (Type const& o)
-{
-dispatch (o.UUID ());
-}
-
-void ImplementationArtifactDescription::
-UUID_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-UUID_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-location (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
-
-if (b != e)
-{
-location_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) location_next (o);
-}
-
-location_post (o);
-}
-
-else location_none (o);
-}
-
-void ImplementationArtifactDescription::
-location (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
-
-if (b != e)
-{
-location_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) location_next (o);
-}
-
-location_post (o);
-}
-
-else location_none (o);
-}
-
-void ImplementationArtifactDescription::
-location_pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_next (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_next (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_post (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-location_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-if (b != e)
-{
-dependsOn_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) dependsOn_next (o);
-}
-
-dependsOn_post (o);
-}
-
-else dependsOn_none (o);
-}
-
-void ImplementationArtifactDescription::
-dependsOn (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-if (b != e)
-{
-dependsOn_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) dependsOn_next (o);
-}
-
-dependsOn_post (o);
-}
-
-else dependsOn_none (o);
-}
-
-void ImplementationArtifactDescription::
-dependsOn_pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_next (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_next (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_post (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-dependsOn_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
-
-execParameter_post (o);
-}
-
-else execParameter_none (o);
-}
-
-void ImplementationArtifactDescription::
-execParameter (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-if (b != e)
-{
-execParameter_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) execParameter_next (o);
-}
-
-execParameter_post (o);
-}
-
-else execParameter_none (o);
-}
-
-void ImplementationArtifactDescription::
-execParameter_pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_next (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_next (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_post (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-execParameter_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
-
-infoProperty_post (o);
-}
-
-else infoProperty_none (o);
-}
-
-void ImplementationArtifactDescription::
-infoProperty (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-if (b != e)
-{
-infoProperty_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) infoProperty_next (o);
-}
-
-infoProperty_post (o);
-}
-
-else infoProperty_none (o);
-}
-
-void ImplementationArtifactDescription::
-infoProperty_pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_next (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_next (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_post (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-infoProperty_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement (Type& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
-
-deployRequirement_post (o);
-}
-
-else deployRequirement_none (o);
-}
-
-void ImplementationArtifactDescription::
-deployRequirement (Type const& o)
-{
-// VC6 anathema strikes again
-//
-ImplementationArtifactDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-if (b != e)
-{
-deployRequirement_pre (o);
-for (; b != e;)
-{
-dispatch (*b);
-if (++b != e) deployRequirement_next (o);
-}
-
-deployRequirement_post (o);
-}
-
-else deployRequirement_none (o);
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_pre (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_pre (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_next (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_next (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_post (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-contentLocation (Type& o)
-{
-dispatch (o.contentLocation ());
-}
-
-void ImplementationArtifactDescription::
-contentLocation (Type const& o)
-{
-dispatch (o.contentLocation ());
-}
-
-void ImplementationArtifactDescription::
-contentLocation_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-contentLocation_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-href (Type& o)
-{
-dispatch (o.href ());
-}
-
-void ImplementationArtifactDescription::
-href (Type const& o)
-{
-dispatch (o.href ());
-}
-
-void ImplementationArtifactDescription::
-href_none (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-href_none (Type const&)
-{
-}
-
-void ImplementationArtifactDescription::
-post (Type&)
-{
-}
-
-void ImplementationArtifactDescription::
-post (Type const&)
-{
-}
-}
-}
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      // NamedImplementationArtifact
+      //
+      //
+
+      void NamedImplementationArtifact::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        referencedArtifact (o);
+        post (o);
+      }
+
+      void NamedImplementationArtifact::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        referencedArtifact (o);
+        post (o);
+      }
+
+      void NamedImplementationArtifact::
+      pre (Type&)
+      {
+      }
+
+      void NamedImplementationArtifact::
+      pre (Type const&)
+      {
+      }
+
+      void NamedImplementationArtifact::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void NamedImplementationArtifact::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void NamedImplementationArtifact::
+      referencedArtifact (Type& o)
+      {
+        dispatch (o.referencedArtifact ());
+      }
+
+      void NamedImplementationArtifact::
+      referencedArtifact (Type const& o)
+      {
+        dispatch (o.referencedArtifact ());
+      }
+
+      void NamedImplementationArtifact::
+      post (Type&)
+      {
+      }
+
+      void NamedImplementationArtifact::
+      post (Type const&)
+      {
+      }
+
+      // ImplementationArtifactDescription
+      //
+      //
+
+      void ImplementationArtifactDescription::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        location (o);
+        dependsOn (o);
+        execParameter (o);
+        infoProperty (o);
+        deployRequirement (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
+
+      void ImplementationArtifactDescription::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.label_p ()) label (o);
+        else label_none (o);
+        if (o.UUID_p ()) UUID (o);
+        else UUID_none (o);
+        location (o);
+        dependsOn (o);
+        execParameter (o);
+        infoProperty (o);
+        deployRequirement (o);
+        if (o.contentLocation_p ()) contentLocation (o);
+        else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        post (o);
+      }
+
+      void ImplementationArtifactDescription::
+      pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      label (Type& o)
+      {
+        dispatch (o.label ());
+      }
+
+      void ImplementationArtifactDescription::
+      label (Type const& o)
+      {
+        dispatch (o.label ());
+      }
+
+      void ImplementationArtifactDescription::
+      label_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      label_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      UUID (Type& o)
+      {
+        dispatch (o.UUID ());
+      }
+
+      void ImplementationArtifactDescription::
+      UUID (Type const& o)
+      {
+        dispatch (o.UUID ());
+      }
+
+      void ImplementationArtifactDescription::
+      UUID_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      UUID_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
+
+        if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) location_next (o);
+          }
+
+          location_post (o);
+        }
+
+        else location_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      location (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
+
+        if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) location_next (o);
+          }
+
+          location_post (o);
+        }
+
+        else location_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      location_pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_next (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_next (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_post (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      location_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+        if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
+          }
+
+          dependsOn_post (o);
+        }
+
+        else dependsOn_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+        if (b != e)
+        {
+          dependsOn_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) dependsOn_next (o);
+          }
+
+          dependsOn_post (o);
+        }
+
+        else dependsOn_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_next (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_next (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_post (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
+
+        else execParameter_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+
+        if (b != e)
+        {
+          execParameter_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) execParameter_next (o);
+          }
+
+          execParameter_post (o);
+        }
+
+        else execParameter_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_next (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_next (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_post (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
+
+        else infoProperty_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+        if (b != e)
+        {
+          infoProperty_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) infoProperty_next (o);
+          }
+
+          infoProperty_post (o);
+        }
+
+        else infoProperty_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_next (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_next (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_post (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
+
+        else deployRequirement_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ImplementationArtifactDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+        if (b != e)
+        {
+          deployRequirement_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployRequirement_next (o);
+          }
+
+          deployRequirement_post (o);
+        }
+
+        else deployRequirement_none (o);
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_pre (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_pre (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_next (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_next (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_post (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      contentLocation (Type& o)
+      {
+        dispatch (o.contentLocation ());
+      }
+
+      void ImplementationArtifactDescription::
+      contentLocation (Type const& o)
+      {
+        dispatch (o.contentLocation ());
+      }
+
+      void ImplementationArtifactDescription::
+      contentLocation_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      contentLocation_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ImplementationArtifactDescription::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ImplementationArtifactDescription::
+      href_none (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      href_none (Type const&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      post (Type&)
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      post (Type const&)
+      {
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-// NamedImplementationArtifact
-//
-//
-
-NamedImplementationArtifact::
-NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
-
-NamedImplementationArtifact::
-NamedImplementationArtifact ()
-{
-}
-
-void NamedImplementationArtifact::
-traverse (Type const& o)
-{
-Traversal::NamedImplementationArtifact::traverse (o);
-}
-
-void NamedImplementationArtifact::
-name (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-Traversal::NamedImplementationArtifact::name (o);
-pop_ ();
-}
-
-void NamedImplementationArtifact::
-referencedArtifact (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedArtifact", top_ ()));
-Traversal::NamedImplementationArtifact::referencedArtifact (o);
-pop_ ();
-}
-
-// ImplementationArtifactDescription
-//
-//
-
-ImplementationArtifactDescription::
-ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-: ::XSCRT::Writer< ACE_TCHAR > (e)
-{
-}
-
-ImplementationArtifactDescription::
-ImplementationArtifactDescription ()
-{
-}
-
-void ImplementationArtifactDescription::
-traverse (Type const& o)
-{
-Traversal::ImplementationArtifactDescription::traverse (o);
-}
-
-void ImplementationArtifactDescription::
-label (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-Traversal::ImplementationArtifactDescription::label (o);
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-UUID (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-Traversal::ImplementationArtifactDescription::UUID (o);
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-location_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-}
-
-void ImplementationArtifactDescription::
-location_next (Type const& o)
-{
-location_post (o);
-location_pre (o);
-}
-
-void ImplementationArtifactDescription::
-location_post (Type const&)
-{
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-dependsOn_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
-}
-
-void ImplementationArtifactDescription::
-dependsOn_next (Type const& o)
-{
-dependsOn_post (o);
-dependsOn_pre (o);
-}
-
-void ImplementationArtifactDescription::
-dependsOn_post (Type const&)
-{
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-execParameter_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-}
-
-void ImplementationArtifactDescription::
-execParameter_next (Type const& o)
-{
-execParameter_post (o);
-execParameter_pre (o);
-}
-
-void ImplementationArtifactDescription::
-execParameter_post (Type const&)
-{
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-infoProperty_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-}
-
-void ImplementationArtifactDescription::
-infoProperty_next (Type const& o)
-{
-infoProperty_post (o);
-infoProperty_pre (o);
-}
-
-void ImplementationArtifactDescription::
-infoProperty_post (Type const&)
-{
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_pre (Type const&)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_next (Type const& o)
-{
-deployRequirement_post (o);
-deployRequirement_pre (o);
-}
-
-void ImplementationArtifactDescription::
-deployRequirement_post (Type const&)
-{
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-contentLocation (Type const& o)
-{
-push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-Traversal::ImplementationArtifactDescription::contentLocation (o);
-pop_ ();
-}
-
-void ImplementationArtifactDescription::
-href (Type const& o)
-{
-::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-attr_ (&a);
-Traversal::ImplementationArtifactDescription::href (o);
-attr_ (0);
-}
-}
-}
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      // NamedImplementationArtifact
+      //
+      //
+
+      NamedImplementationArtifact::
+      NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      NamedImplementationArtifact::
+      NamedImplementationArtifact ()
+      {
+      }
+
+      void NamedImplementationArtifact::
+      traverse (Type const& o)
+      {
+        Traversal::NamedImplementationArtifact::traverse (o);
+      }
+
+      void NamedImplementationArtifact::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::NamedImplementationArtifact::name (o);
+        pop_ ();
+      }
+
+      void NamedImplementationArtifact::
+      referencedArtifact (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedArtifact", top_ ()));
+        Traversal::NamedImplementationArtifact::referencedArtifact (o);
+        pop_ ();
+      }
+
+      // ImplementationArtifactDescription
+      //
+      //
+
+      ImplementationArtifactDescription::
+      ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ImplementationArtifactDescription::
+      ImplementationArtifactDescription ()
+      {
+      }
+
+      void ImplementationArtifactDescription::
+      traverse (Type const& o)
+      {
+        Traversal::ImplementationArtifactDescription::traverse (o);
+      }
+
+      void ImplementationArtifactDescription::
+      label (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::ImplementationArtifactDescription::label (o);
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      UUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+        Traversal::ImplementationArtifactDescription::UUID (o);
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      location_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+      }
+
+      void ImplementationArtifactDescription::
+      location_next (Type const& o)
+      {
+        location_post (o);
+        location_pre (o);
+      }
+
+      void ImplementationArtifactDescription::
+      location_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_next (Type const& o)
+      {
+        dependsOn_post (o);
+        dependsOn_pre (o);
+      }
+
+      void ImplementationArtifactDescription::
+      dependsOn_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_next (Type const& o)
+      {
+        execParameter_post (o);
+        execParameter_pre (o);
+      }
+
+      void ImplementationArtifactDescription::
+      execParameter_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_next (Type const& o)
+      {
+        infoProperty_post (o);
+        infoProperty_pre (o);
+      }
+
+      void ImplementationArtifactDescription::
+      infoProperty_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_next (Type const& o)
+      {
+        deployRequirement_post (o);
+        deployRequirement_pre (o);
+      }
+
+      void ImplementationArtifactDescription::
+      deployRequirement_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      contentLocation (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+        Traversal::ImplementationArtifactDescription::contentLocation (o);
+        pop_ ();
+      }
+
+      void ImplementationArtifactDescription::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::ImplementationArtifactDescription::href (o);
+        attr_ (0);
+      }
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
diff --git a/CIAO/tools/Config_Handlers/iad.hpp b/CIAO/tools/Config_Handlers/iad.hpp
index f5a5c82399a..85366d71951 100644
--- a/CIAO/tools/Config_Handlers/iad.hpp
+++ b/CIAO/tools/Config_Handlers/iad.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,19 +15,19 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef IAD_HPP
 #define IAD_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class NamedImplementationArtifact;
-class ImplementationArtifactDescription;
-}
+  namespace Config_Handlers
+  {
+    class NamedImplementationArtifact;
+    class ImplementationArtifactDescription;
+  }
 }
 
 #include <memory>
@@ -39,741 +38,739 @@ class ImplementationArtifactDescription;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// name
-//
-public:
-::XMLSchema::string< ACE_TCHAR > const& name () const;
-void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-// referencedArtifact
-//
-public:
-::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
-void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
-
-public:
-NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
-
-NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
-NamedImplementationArtifact (NamedImplementationArtifact const& s);
-
-NamedImplementationArtifact&
-operator= (NamedImplementationArtifact const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// location
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-location_iterator begin_location ();
-location_iterator end_location ();
-location_const_iterator begin_location () const;
-location_const_iterator end_location () const;
-void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_location (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-// dependsOn
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
-dependsOn_iterator begin_dependsOn ();
-dependsOn_iterator end_dependsOn ();
-dependsOn_const_iterator begin_dependsOn () const;
-dependsOn_const_iterator end_dependsOn () const;
-void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-size_t count_dependsOn (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
-
-// execParameter
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
-execParameter_iterator begin_execParameter ();
-execParameter_iterator end_execParameter ();
-execParameter_const_iterator begin_execParameter () const;
-execParameter_const_iterator end_execParameter () const;
-void add_execParameter (::CIAO::Config_Handlers::Property const& );
-size_t count_execParameter (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
-
-// infoProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-infoProperty_iterator begin_infoProperty ();
-infoProperty_iterator end_infoProperty ();
-infoProperty_const_iterator begin_infoProperty () const;
-infoProperty_const_iterator end_infoProperty () const;
-void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_infoProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-// deployRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-deployRequirement_iterator begin_deployRequirement ();
-deployRequirement_iterator end_deployRequirement ();
-deployRequirement_const_iterator begin_deployRequirement () const;
-deployRequirement_const_iterator end_deployRequirement () const;
-void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_deployRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-// contentLocation
-//
-public:
-bool contentLocation_p () const;
-::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-// href
-//
-public:
-bool href_p () const;
-::XMLSchema::string< ACE_TCHAR > const& href () const;
-::XMLSchema::string< ACE_TCHAR >& href ();
-void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-public:
-ImplementationArtifactDescription ();
-
-ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
-
-ImplementationArtifactDescription&
-operator= (ImplementationArtifactDescription const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // referencedArtifact
+      // 
+      public:
+      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
+      void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
+
+      public:
+      NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
+                                   ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
+
+      NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      NamedImplementationArtifact (NamedImplementationArtifact const& s);
+
+      NamedImplementationArtifact&
+      operator= (NamedImplementationArtifact const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // location
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+      location_iterator begin_location ();
+      location_iterator end_location ();
+      location_const_iterator begin_location () const;
+      location_const_iterator end_location () const;
+      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_location (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+      // dependsOn
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
+      dependsOn_iterator begin_dependsOn ();
+      dependsOn_iterator end_dependsOn ();
+      dependsOn_const_iterator begin_dependsOn () const;
+      dependsOn_const_iterator end_dependsOn () const;
+      void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+      size_t count_dependsOn (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
+
+      // execParameter
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+      execParameter_iterator begin_execParameter ();
+      execParameter_iterator end_execParameter ();
+      execParameter_const_iterator begin_execParameter () const;
+      execParameter_const_iterator end_execParameter () const;
+      void add_execParameter (::CIAO::Config_Handlers::Property const& );
+      size_t count_execParameter (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+      // infoProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+      infoProperty_iterator begin_infoProperty ();
+      infoProperty_iterator end_infoProperty ();
+      infoProperty_const_iterator begin_infoProperty () const;
+      infoProperty_const_iterator end_infoProperty () const;
+      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_infoProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+      // deployRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+      deployRequirement_iterator begin_deployRequirement ();
+      deployRequirement_iterator end_deployRequirement ();
+      deployRequirement_const_iterator begin_deployRequirement () const;
+      deployRequirement_const_iterator end_deployRequirement () const;
+      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_deployRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+      // contentLocation
+      // 
+      public:
+      bool contentLocation_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+      // href
+      // 
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+      public:
+      ImplementationArtifactDescription ();
+
+      ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
+
+      ImplementationArtifactDescription&
+      operator= (ImplementationArtifactDescription const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
-{
-virtual void
-traverse (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-name (Type&);
+        virtual void
+        name (Type&);
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-referencedArtifact (Type&);
+        virtual void
+        referencedArtifact (Type&);
 
-virtual void
-referencedArtifact (Type const&);
+        virtual void
+        referencedArtifact (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        post (Type const&);
+      };
 
-struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
-{
-virtual void
-traverse (Type&);
+      struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-pre (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-label (Type&);
+        virtual void
+        label (Type&);
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-location (Type&);
+        virtual void
+        location (Type&);
 
-virtual void
-location (Type const&);
+        virtual void
+        location (Type const&);
 
-virtual void
-location_pre (Type&);
+        virtual void
+        location_pre (Type&);
 
-virtual void
-location_pre (Type const&);
+        virtual void
+        location_pre (Type const&);
 
-virtual void
-location_next (Type&);
+        virtual void
+        location_next (Type&);
 
-virtual void
-location_next (Type const&);
+        virtual void
+        location_next (Type const&);
 
-virtual void
-location_post (Type&);
+        virtual void
+        location_post (Type&);
 
-virtual void
-location_post (Type const&);
+        virtual void
+        location_post (Type const&);
 
-virtual void
-location_none (Type&);
+        virtual void
+        location_none (Type&);
 
-virtual void
-location_none (Type const&);
+        virtual void
+        location_none (Type const&);
 
-virtual void
-dependsOn (Type&);
+        virtual void
+        dependsOn (Type&);
 
-virtual void
-dependsOn (Type const&);
+        virtual void
+        dependsOn (Type const&);
 
-virtual void
-dependsOn_pre (Type&);
+        virtual void
+        dependsOn_pre (Type&);
 
-virtual void
-dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-virtual void
-dependsOn_next (Type&);
+        virtual void
+        dependsOn_next (Type&);
 
-virtual void
-dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-virtual void
-dependsOn_post (Type&);
+        virtual void
+        dependsOn_post (Type&);
 
-virtual void
-dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-virtual void
-dependsOn_none (Type&);
+        virtual void
+        dependsOn_none (Type&);
 
-virtual void
-dependsOn_none (Type const&);
+        virtual void
+        dependsOn_none (Type const&);
 
-virtual void
-execParameter (Type&);
+        virtual void
+        execParameter (Type&);
 
-virtual void
-execParameter (Type const&);
+        virtual void
+        execParameter (Type const&);
 
-virtual void
-execParameter_pre (Type&);
+        virtual void
+        execParameter_pre (Type&);
 
-virtual void
-execParameter_pre (Type const&);
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-execParameter_next (Type&);
+        virtual void
+        execParameter_next (Type&);
 
-virtual void
-execParameter_next (Type const&);
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-execParameter_post (Type&);
+        virtual void
+        execParameter_post (Type&);
 
-virtual void
-execParameter_post (Type const&);
+        virtual void
+        execParameter_post (Type const&);
 
-virtual void
-execParameter_none (Type&);
+        virtual void
+        execParameter_none (Type&);
 
-virtual void
-execParameter_none (Type const&);
+        virtual void
+        execParameter_none (Type const&);
 
-virtual void
-infoProperty (Type&);
+        virtual void
+        infoProperty (Type&);
 
-virtual void
-infoProperty (Type const&);
+        virtual void
+        infoProperty (Type const&);
 
-virtual void
-infoProperty_pre (Type&);
+        virtual void
+        infoProperty_pre (Type&);
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type&);
+        virtual void
+        infoProperty_next (Type&);
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type&);
+        virtual void
+        infoProperty_post (Type&);
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-infoProperty_none (Type&);
+        virtual void
+        infoProperty_none (Type&);
 
-virtual void
-infoProperty_none (Type const&);
+        virtual void
+        infoProperty_none (Type const&);
 
-virtual void
-deployRequirement (Type&);
+        virtual void
+        deployRequirement (Type&);
 
-virtual void
-deployRequirement (Type const&);
+        virtual void
+        deployRequirement (Type const&);
 
-virtual void
-deployRequirement_pre (Type&);
+        virtual void
+        deployRequirement_pre (Type&);
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type&);
+        virtual void
+        deployRequirement_next (Type&);
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type&);
+        virtual void
+        deployRequirement_post (Type&);
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-deployRequirement_none (Type&);
+        virtual void
+        deployRequirement_none (Type&);
 
-virtual void
-deployRequirement_none (Type const&);
+        virtual void
+        deployRequirement_none (Type const&);
 
-virtual void
-contentLocation (Type&);
+        virtual void
+        contentLocation (Type&);
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-contentLocation_none (Type&);
+        virtual void
+        contentLocation_none (Type&);
 
-virtual void
-contentLocation_none (Type const&);
+        virtual void
+        contentLocation_none (Type const&);
 
-virtual void
-href (Type&);
+        virtual void
+        href (Type&);
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-virtual void
-href_none (Type&);
+        virtual void
+        href_none (Type&);
 
-virtual void
-href_none (Type const&);
+        virtual void
+        href_none (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct NamedImplementationArtifact : Traversal::NamedImplementationArtifact,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
-NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct NamedImplementationArtifact : Traversal::NamedImplementationArtifact, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
+        NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-name (Type &o)
-{
+        virtual void 
+        name (Type &o)
+        {
 
-this->name (const_cast <Type const &> (o));
-}
+          this->name (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-name (Type const&);
+        virtual void
+        name (Type const&);
 
-virtual void
-referencedArtifact (Type &o)
-{
+        virtual void 
+        referencedArtifact (Type &o)
+        {
 
-this->referencedArtifact (const_cast <Type const &> (o));
-}
+          this->referencedArtifact (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-referencedArtifact (Type const&);
+        virtual void
+        referencedArtifact (Type const&);
 
-protected:
-NamedImplementationArtifact ();
-};
+        protected:
+        NamedImplementationArtifact ();
+      };
 
-struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
-ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
+        ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-location_pre (Type &o)
-{
+        virtual void 
+        location_pre (Type &o)
+        {
 
-this->location_pre (const_cast <Type const &> (o));
-}
+          this->location_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_pre (Type const&);
+        virtual void
+        location_pre (Type const&);
 
-virtual void
-location_next (Type &o)
-{
+        virtual void 
+        location_next (Type &o)
+        {
 
-this->location_next (const_cast <Type const &> (o));
-}
+          this->location_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_next (Type const&);
+        virtual void
+        location_next (Type const&);
 
-virtual void
-location_post (Type &o)
-{
+        virtual void 
+        location_post (Type &o)
+        {
 
-this->location_post (const_cast <Type const &> (o));
-}
+          this->location_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_post (Type const&);
+        virtual void
+        location_post (Type const&);
 
-virtual void
-dependsOn_pre (Type &o)
-{
+        virtual void 
+        dependsOn_pre (Type &o)
+        {
 
-this->dependsOn_pre (const_cast <Type const &> (o));
-}
+          this->dependsOn_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_pre (Type const&);
+        virtual void
+        dependsOn_pre (Type const&);
 
-virtual void
-dependsOn_next (Type &o)
-{
+        virtual void 
+        dependsOn_next (Type &o)
+        {
 
-this->dependsOn_next (const_cast <Type const &> (o));
-}
+          this->dependsOn_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_next (Type const&);
+        virtual void
+        dependsOn_next (Type const&);
 
-virtual void
-dependsOn_post (Type &o)
-{
+        virtual void 
+        dependsOn_post (Type &o)
+        {
 
-this->dependsOn_post (const_cast <Type const &> (o));
-}
+          this->dependsOn_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-dependsOn_post (Type const&);
+        virtual void
+        dependsOn_post (Type const&);
 
-virtual void
-execParameter_pre (Type &o)
-{
+        virtual void 
+        execParameter_pre (Type &o)
+        {
 
-this->execParameter_pre (const_cast <Type const &> (o));
-}
+          this->execParameter_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-execParameter_pre (Type const&);
+        virtual void
+        execParameter_pre (Type const&);
 
-virtual void
-execParameter_next (Type &o)
-{
+        virtual void 
+        execParameter_next (Type &o)
+        {
 
-this->execParameter_next (const_cast <Type const &> (o));
-}
+          this->execParameter_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-execParameter_next (Type const&);
+        virtual void
+        execParameter_next (Type const&);
 
-virtual void
-execParameter_post (Type &o)
-{
+        virtual void 
+        execParameter_post (Type &o)
+        {
 
-this->execParameter_post (const_cast <Type const &> (o));
-}
+          this->execParameter_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-execParameter_post (Type const&);
+        virtual void
+        execParameter_post (Type const&);
 
-virtual void
-infoProperty_pre (Type &o)
-{
+        virtual void 
+        infoProperty_pre (Type &o)
+        {
 
-this->infoProperty_pre (const_cast <Type const &> (o));
-}
+          this->infoProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_pre (Type const&);
+        virtual void
+        infoProperty_pre (Type const&);
 
-virtual void
-infoProperty_next (Type &o)
-{
+        virtual void 
+        infoProperty_next (Type &o)
+        {
 
-this->infoProperty_next (const_cast <Type const &> (o));
-}
+          this->infoProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_next (Type const&);
+        virtual void
+        infoProperty_next (Type const&);
 
-virtual void
-infoProperty_post (Type &o)
-{
+        virtual void 
+        infoProperty_post (Type &o)
+        {
 
-this->infoProperty_post (const_cast <Type const &> (o));
-}
+          this->infoProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-infoProperty_post (Type const&);
+        virtual void
+        infoProperty_post (Type const&);
 
-virtual void
-deployRequirement_pre (Type &o)
-{
+        virtual void 
+        deployRequirement_pre (Type &o)
+        {
 
-this->deployRequirement_pre (const_cast <Type const &> (o));
-}
+          this->deployRequirement_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_pre (Type const&);
+        virtual void
+        deployRequirement_pre (Type const&);
 
-virtual void
-deployRequirement_next (Type &o)
-{
+        virtual void 
+        deployRequirement_next (Type &o)
+        {
 
-this->deployRequirement_next (const_cast <Type const &> (o));
-}
+          this->deployRequirement_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_next (Type const&);
+        virtual void
+        deployRequirement_next (Type const&);
 
-virtual void
-deployRequirement_post (Type &o)
-{
+        virtual void 
+        deployRequirement_post (Type &o)
+        {
 
-this->deployRequirement_post (const_cast <Type const &> (o));
-}
+          this->deployRequirement_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-deployRequirement_post (Type const&);
+        virtual void
+        deployRequirement_post (Type const&);
 
-virtual void
-contentLocation (Type &o)
-{
+        virtual void 
+        contentLocation (Type &o)
+        {
 
-this->contentLocation (const_cast <Type const &> (o));
-}
+          this->contentLocation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type &o)
-{
+        virtual void 
+        href (Type &o)
+        {
 
-this->href (const_cast <Type const &> (o));
-}
+          this->href (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-href (Type const&);
+        virtual void
+        href (Type const&);
 
-protected:
-ImplementationArtifactDescription ();
-};
-}
-}
+        protected:
+        ImplementationArtifactDescription ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // IAD_HPP
diff --git a/CIAO/tools/Config_Handlers/pcd.cpp b/CIAO/tools/Config_Handlers/pcd.cpp
index 1021d178ad6..b74723f1265 100644
--- a/CIAO/tools/Config_Handlers/pcd.cpp
+++ b/CIAO/tools/Config_Handlers/pcd.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "pcd.hpp"
 
 namespace CIAO
@@ -16,21 +22,21 @@ namespace CIAO
   namespace Config_Handlers
   {
     // ComponentPackageImport
-    //
+    // 
 
     ComponentPackageImport::
     ComponentPackageImport ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     ComponentPackageImport::
     ComponentPackageImport (::CIAO::Config_Handlers::ComponentPackageImport const& s)
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    :
+    ::XSCRT::Type (),
+    regulator__ ()
     {
       {
         for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
@@ -50,7 +56,7 @@ namespace CIAO
 
 
     // ComponentPackageImport
-    //
+    // 
     ComponentPackageImport::location_iterator ComponentPackageImport::
     begin_location ()
     {
@@ -89,29 +95,28 @@ namespace CIAO
 
 
     // PackageConfiguration
-    //
+    // 
 
     PackageConfiguration::
     PackageConfiguration ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
     }
 
     PackageConfiguration::
     PackageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s)
-      :
-      ::XSCRT::Type (),
-      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-          basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
-          specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
-          importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
-          referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
-          contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-            href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-              regulator__ ()
+    :
+    ::XSCRT::Type (),
+    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+    basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
+    specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
+    importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
+    referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
+    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
@@ -128,7 +133,6 @@ namespace CIAO
       }
 
       if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
     }
 
     ::CIAO::Config_Handlers::PackageConfiguration& PackageConfiguration::
@@ -165,15 +169,12 @@ namespace CIAO
       if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
       else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
-
       return *this;
     }
 
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     label_p () const
     {
@@ -190,19 +191,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-        {
-          *label_ = e;
-        }
+      {
+        *label_ = e;
+      }
 
       else
-        {
-          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          label_->container (this);
-        }
+      {
+        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        label_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     UUID_p () const
     {
@@ -219,19 +220,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-        {
-          *UUID_ = e;
-        }
+      {
+        *UUID_ = e;
+      }
 
       else
-        {
-          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          UUID_->container (this);
-        }
+      {
+        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        UUID_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     basePackage_p () const
     {
@@ -248,19 +249,19 @@ namespace CIAO
     basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
     {
       if (basePackage_.get ())
-        {
-          *basePackage_ = e;
-        }
+      {
+        *basePackage_ = e;
+      }
 
       else
-        {
-          basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-          basePackage_->container (this);
-        }
+      {
+        basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+        basePackage_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     specializedConfig_p () const
     {
@@ -277,19 +278,19 @@ namespace CIAO
     specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
       if (specializedConfig_.get ())
-        {
-          *specializedConfig_ = e;
-        }
+      {
+        *specializedConfig_ = e;
+      }
 
       else
-        {
-          specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
-          specializedConfig_->container (this);
-        }
+      {
+        specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+        specializedConfig_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     importedPackage_p () const
     {
@@ -306,19 +307,19 @@ namespace CIAO
     importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
       if (importedPackage_.get ())
-        {
-          *importedPackage_ = e;
-        }
+      {
+        *importedPackage_ = e;
+      }
 
       else
-        {
-          importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
-          importedPackage_->container (this);
-        }
+      {
+        importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
+        importedPackage_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     referencedPackage_p () const
     {
@@ -335,19 +336,19 @@ namespace CIAO
     referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
       if (referencedPackage_.get ())
-        {
-          *referencedPackage_ = e;
-        }
+      {
+        *referencedPackage_ = e;
+      }
 
       else
-        {
-          referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-          referencedPackage_->container (this);
-        }
+      {
+        referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+        referencedPackage_->container (this);
+      }
     }
 
     // PackageConfiguration
-    //
+    // 
     PackageConfiguration::selectRequirement_iterator PackageConfiguration::
     begin_selectRequirement ()
     {
@@ -385,7 +386,7 @@ namespace CIAO
     }
 
     // PackageConfiguration
-    //
+    // 
     PackageConfiguration::configProperty_iterator PackageConfiguration::
     begin_configProperty ()
     {
@@ -423,7 +424,7 @@ namespace CIAO
     }
 
     // PackageConfiguration
-    //
+    // 
     bool PackageConfiguration::
     contentLocation_p () const
     {
@@ -440,50 +441,15 @@ namespace CIAO
     contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (contentLocation_.get ())
-        {
-          *contentLocation_ = e;
-        }
-
-      else
-        {
-          contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          contentLocation_->container (this);
-        }
-    }
-
-    // PackageConfiguration
-    //
-    bool PackageConfiguration::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
-
-    ::XMLSchema::string< ACE_TCHAR > const& PackageConfiguration::
-    href () const
-    {
-      return *href_;
-    }
-
-    ::XMLSchema::string< ACE_TCHAR >& PackageConfiguration::
-    href ()
-    {
-      return *href_;
-    }
-
-    void PackageConfiguration::
-    href (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (href_.get ())
-        {
-          *href_ = e;
-        }
+      {
+        *contentLocation_ = e;
+      }
 
       else
-        {
-          href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          href_->container (this);
-        }
+      {
+        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        contentLocation_->container (this);
+      }
     }
   }
 }
@@ -497,26 +463,26 @@ namespace CIAO
 
     ComponentPackageImport::
     ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "location")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_location (t);
+        }
+
+        else 
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "location")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              add_location (t);
-            }
-
-          else
-            {
-            }
         }
+      }
     }
 
     // PackageConfiguration
@@ -524,89 +490,74 @@ namespace CIAO
 
     PackageConfiguration::
     PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "label")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          label (t);
+        }
+
+        else if (n == "UUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          UUID (t);
+        }
+
+        else if (n == "basePackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
+          basePackage (t);
+        }
+
+        else if (n == "specializedConfig")
+        {
+          ::CIAO::Config_Handlers::PackageConfiguration t (e);
+          specializedConfig (t);
+        }
+
+        else if (n == "importedPackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageImport t (e);
+          importedPackage (t);
+        }
+
+        else if (n == "referencedPackage")
+        {
+          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
+          referencedPackage (t);
+        }
+
+        else if (n == "selectRequirement")
+        {
+          ::CIAO::Config_Handlers::Requirement t (e);
+          add_selectRequirement (t);
+        }
+
+        else if (n == "configProperty")
+        {
+          ::CIAO::Config_Handlers::Property t (e);
+          add_configProperty (t);
+        }
+
+        else if (n == "contentLocation")
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "label")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              label (t);
-            }
-
-          else if (n == "UUID")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              UUID (t);
-            }
-
-          else if (n == "basePackage")
-            {
-              ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-              basePackage (t);
-            }
-
-          else if (n == "specializedConfig")
-            {
-              ::CIAO::Config_Handlers::PackageConfiguration t (e);
-              specializedConfig (t);
-            }
-
-          else if (n == "importedPackage")
-            {
-              ::CIAO::Config_Handlers::ComponentPackageImport t (e);
-              importedPackage (t);
-            }
-
-          else if (n == "referencedPackage")
-            {
-              ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-              referencedPackage (t);
-            }
-
-          else if (n == "selectRequirement")
-            {
-              ::CIAO::Config_Handlers::Requirement t (e);
-              add_selectRequirement (t);
-            }
-
-          else if (n == "configProperty")
-            {
-              ::CIAO::Config_Handlers::Property t (e);
-              add_configProperty (t);
-            }
-
-          else if (n == "contentLocation")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (e);
-              contentLocation (t);
-            }
-
-          else
-            {
-            }
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          contentLocation (t);
         }
 
-      while (p.more_attributes ())
+        else 
         {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-          if (n == "href")
-            {
-              ::XMLSchema::string< ACE_TCHAR > t (a);
-              href (t);
-            }
-
-          else
-            {
-            }
         }
+      }
     }
   }
 }
@@ -703,16 +654,16 @@ namespace CIAO
         ComponentPackageImport::Type::location_iterator b (o.begin_location()), e (o.end_location());
 
         if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
           {
-            location_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) location_next (o);
-              }
-
-            location_post (o);
+            dispatch (*b);
+            if (++b != e) location_next (o);
           }
+
+          location_post (o);
+        }
       }
 
       void ComponentPackageImport::
@@ -723,16 +674,16 @@ namespace CIAO
         ComponentPackageImport::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
 
         if (b != e)
+        {
+          location_pre (o);
+          for (; b != e;)
           {
-            location_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) location_next (o);
-              }
-
-            location_post (o);
+            dispatch (*b);
+            if (++b != e) location_next (o);
           }
+
+          location_post (o);
+        }
       }
 
       void ComponentPackageImport::
@@ -799,8 +750,6 @@ namespace CIAO
         configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
         post (o);
       }
 
@@ -824,8 +773,6 @@ namespace CIAO
         configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
         post (o);
       }
 
@@ -979,17 +926,17 @@ namespace CIAO
         PackageConfiguration::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
         if (b != e)
+        {
+          selectRequirement_pre (o);
+          for (; b != e;)
           {
-            selectRequirement_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) selectRequirement_next (o);
-              }
-
-            selectRequirement_post (o);
+            dispatch (*b);
+            if (++b != e) selectRequirement_next (o);
           }
 
+          selectRequirement_post (o);
+        }
+
         else selectRequirement_none (o);
       }
 
@@ -1001,17 +948,17 @@ namespace CIAO
         PackageConfiguration::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
         if (b != e)
+        {
+          selectRequirement_pre (o);
+          for (; b != e;)
           {
-            selectRequirement_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) selectRequirement_next (o);
-              }
-
-            selectRequirement_post (o);
+            dispatch (*b);
+            if (++b != e) selectRequirement_next (o);
           }
 
+          selectRequirement_post (o);
+        }
+
         else selectRequirement_none (o);
       }
 
@@ -1063,17 +1010,17 @@ namespace CIAO
         PackageConfiguration::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
           {
-            configProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) configProperty_next (o);
-              }
-
-            configProperty_post (o);
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
           }
 
+          configProperty_post (o);
+        }
+
         else configProperty_none (o);
       }
 
@@ -1085,17 +1032,17 @@ namespace CIAO
         PackageConfiguration::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
+        {
+          configProperty_pre (o);
+          for (; b != e;)
           {
-            configProperty_pre (o);
-            for (; b != e;)
-              {
-                dispatch (*b);
-                if (++b != e) configProperty_next (o);
-              }
-
-            configProperty_post (o);
+            dispatch (*b);
+            if (++b != e) configProperty_next (o);
           }
 
+          configProperty_post (o);
+        }
+
         else configProperty_none (o);
       }
 
@@ -1162,28 +1109,6 @@ namespace CIAO
       }
 
       void PackageConfiguration::
-      href (Type& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void PackageConfiguration::
-      href (Type const& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void PackageConfiguration::
-      href_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      href_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
       post (Type&)
       {
       }
@@ -1208,7 +1133,7 @@ namespace CIAO
 
       ComponentPackageImport::
       ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -1248,7 +1173,7 @@ namespace CIAO
 
       PackageConfiguration::
       PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -1356,15 +1281,6 @@ namespace CIAO
         Traversal::PackageConfiguration::contentLocation (o);
         pop_ ();
       }
-
-      void PackageConfiguration::
-      href (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-        attr_ (&a);
-        Traversal::PackageConfiguration::href (o);
-        attr_ (0);
-      }
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/pcd.hpp b/CIAO/tools/Config_Handlers/pcd.hpp
index d58c46fc5d9..d18119a5fc4 100644
--- a/CIAO/tools/Config_Handlers/pcd.hpp
+++ b/CIAO/tools/Config_Handlers/pcd.hpp
@@ -1,14 +1,13 @@
 /* $Id$
-* This code was generated by the XML Schema Compiler.
-*
-* Changes made to this code will most likely be overwritten
-* when the handlers are recompiled.
-*
-* If you find errors or feel that there are bugfixes to be made,
-* please contact the current XSC maintainer:
-*             Will Otte <wotte@dre.vanderbilt.edu>
-*/
-
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
@@ -16,19 +15,19 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef PCD_HPP
 #define PCD_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class ComponentPackageImport;
-class PackageConfiguration;
-}
+  namespace Config_Handlers
+  {
+    class ComponentPackageImport;
+    class PackageConfiguration;
+  }
 }
 
 #include <memory>
@@ -41,658 +40,622 @@ class PackageConfiguration;
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class XSC_XML_Handlers_Export ComponentPackageImport : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// location
-//
-public:
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-location_iterator begin_location ();
-location_iterator end_location ();
-location_const_iterator begin_location () const;
-location_const_iterator end_location () const;
-void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-size_t count_location (void) const;
-
-protected:
-::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-public:
-ComponentPackageImport ();
-
-ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR > const&);
-ComponentPackageImport (ComponentPackageImport const& s);
-
-ComponentPackageImport&
-operator= (ComponentPackageImport const& s);
-
-private:
-char regulator__;
-};
-
-
-class XSC_XML_Handlers_Export PackageConfiguration : public ::XSCRT::Type
-{
-//@@ VC6 anathema
-typedef ::XSCRT::Type Base__;
-
-// label
-//
-public:
-bool label_p () const;
-::XMLSchema::string< ACE_TCHAR > const& label () const;
-void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-// UUID
-//
-public:
-bool UUID_p () const;
-::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-// basePackage
-//
-public:
-bool basePackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
-void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
-
-// specializedConfig
-//
-public:
-bool specializedConfig_p () const;
-::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
-void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
-
-// importedPackage
-//
-public:
-bool importedPackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
-void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
-
-// referencedPackage
-//
-public:
-bool referencedPackage_p () const;
-::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
-void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-protected:
-::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
-
-// selectRequirement
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
-selectRequirement_iterator begin_selectRequirement ();
-selectRequirement_iterator end_selectRequirement ();
-selectRequirement_const_iterator begin_selectRequirement () const;
-selectRequirement_const_iterator end_selectRequirement () const;
-void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-size_t count_selectRequirement (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-// configProperty
-//
-public:
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-configProperty_iterator begin_configProperty ();
-configProperty_iterator end_configProperty ();
-configProperty_const_iterator begin_configProperty () const;
-configProperty_const_iterator end_configProperty () const;
-void add_configProperty (::CIAO::Config_Handlers::Property const& );
-size_t count_configProperty (void) const;
-
-protected:
-::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-// contentLocation
-//
-public:
-bool contentLocation_p () const;
-::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-// href
-//
-public:
-bool href_p () const;
-::XMLSchema::string< ACE_TCHAR > const& href () const;
-::XMLSchema::string< ACE_TCHAR >& href ();
-void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-protected:
-::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-public:
-PackageConfiguration ();
-
-PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const&);
-PackageConfiguration (PackageConfiguration const& s);
-
-PackageConfiguration&
-operator= (PackageConfiguration const& s);
-
-private:
-char regulator__;
-};
-}
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export ComponentPackageImport : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // location
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+      location_iterator begin_location ();
+      location_iterator end_location ();
+      location_const_iterator begin_location () const;
+      location_const_iterator end_location () const;
+      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+      size_t count_location (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+      public:
+      ComponentPackageImport ();
+
+      ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPackageImport (ComponentPackageImport const& s);
+
+      ComponentPackageImport&
+      operator= (ComponentPackageImport const& s);
+
+      private:
+      char regulator__;
+    };
+
+
+    class XSC_XML_Handlers_Export PackageConfiguration : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // label
+      // 
+      public:
+      bool label_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& label () const;
+      void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+      // UUID
+      // 
+      public:
+      bool UUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+      // basePackage
+      // 
+      public:
+      bool basePackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
+      void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
+
+      // specializedConfig
+      // 
+      public:
+      bool specializedConfig_p () const;
+      ::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
+      void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
+
+      // importedPackage
+      // 
+      public:
+      bool importedPackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
+      void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
+
+      // referencedPackage
+      // 
+      public:
+      bool referencedPackage_p () const;
+      ::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
+      void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
+
+      // selectRequirement
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
+      selectRequirement_iterator begin_selectRequirement ();
+      selectRequirement_iterator end_selectRequirement ();
+      selectRequirement_const_iterator begin_selectRequirement () const;
+      selectRequirement_const_iterator end_selectRequirement () const;
+      void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
+      size_t count_selectRequirement (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
+
+      // configProperty
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+      configProperty_iterator begin_configProperty ();
+      configProperty_iterator end_configProperty ();
+      configProperty_const_iterator begin_configProperty () const;
+      configProperty_const_iterator end_configProperty () const;
+      void add_configProperty (::CIAO::Config_Handlers::Property const& );
+      size_t count_configProperty (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+      // contentLocation
+      // 
+      public:
+      bool contentLocation_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+      public:
+      PackageConfiguration ();
+
+      PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PackageConfiguration (PackageConfiguration const& s);
+
+      PackageConfiguration&
+      operator= (PackageConfiguration const& s);
+
+      private:
+      char regulator__;
+    };
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Traversal
-{
-struct XSC_XML_Handlers_Export ComponentPackageImport : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageImport >
-{
-virtual void
-traverse (Type&);
-
-virtual void
-traverse (Type const&);
-
-virtual void
-pre (Type&);
+  namespace Config_Handlers
+  {
+    namespace Traversal
+    {
+      struct XSC_XML_Handlers_Export ComponentPackageImport : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageImport >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-pre (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-location (Type&);
+        virtual void
+        pre (Type&);
 
-virtual void
-location (Type const&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-location_pre (Type&);
+        virtual void
+        location (Type&);
 
-virtual void
-location_pre (Type const&);
+        virtual void
+        location (Type const&);
 
-virtual void
-location_next (Type&);
+        virtual void
+        location_pre (Type&);
 
-virtual void
-location_next (Type const&);
+        virtual void
+        location_pre (Type const&);
 
-virtual void
-location_post (Type&);
+        virtual void
+        location_next (Type&);
 
-virtual void
-location_post (Type const&);
+        virtual void
+        location_next (Type const&);
 
-virtual void
-post (Type&);
+        virtual void
+        location_post (Type&);
 
-virtual void
-post (Type const&);
-};
+        virtual void
+        location_post (Type const&);
 
-struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
-{
-virtual void
-traverse (Type&);
-
-virtual void
-traverse (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-pre (Type&);
+        virtual void
+        post (Type const&);
+      };
 
-virtual void
-pre (Type const&);
+      struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
+      {
+        virtual void
+        traverse (Type&);
 
-virtual void
-label (Type&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type const&);
+        virtual void
+        pre (Type&);
 
-virtual void
-label_none (Type&);
+        virtual void
+        pre (Type const&);
 
-virtual void
-label_none (Type const&);
+        virtual void
+        label (Type&);
 
-virtual void
-UUID (Type&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type const&);
+        virtual void
+        label_none (Type&);
 
-virtual void
-UUID_none (Type&);
+        virtual void
+        label_none (Type const&);
 
-virtual void
-UUID_none (Type const&);
+        virtual void
+        UUID (Type&);
 
-virtual void
-basePackage (Type&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-basePackage (Type const&);
+        virtual void
+        UUID_none (Type&);
 
-virtual void
-basePackage_none (Type&);
+        virtual void
+        UUID_none (Type const&);
 
-virtual void
-basePackage_none (Type const&);
+        virtual void
+        basePackage (Type&);
 
-virtual void
-specializedConfig (Type&);
+        virtual void
+        basePackage (Type const&);
 
-virtual void
-specializedConfig (Type const&);
+        virtual void
+        basePackage_none (Type&);
 
-virtual void
-specializedConfig_none (Type&);
+        virtual void
+        basePackage_none (Type const&);
 
-virtual void
-specializedConfig_none (Type const&);
+        virtual void
+        specializedConfig (Type&);
 
-virtual void
-importedPackage (Type&);
+        virtual void
+        specializedConfig (Type const&);
 
-virtual void
-importedPackage (Type const&);
+        virtual void
+        specializedConfig_none (Type&);
 
-virtual void
-importedPackage_none (Type&);
+        virtual void
+        specializedConfig_none (Type const&);
 
-virtual void
-importedPackage_none (Type const&);
+        virtual void
+        importedPackage (Type&);
 
-virtual void
-referencedPackage (Type&);
+        virtual void
+        importedPackage (Type const&);
 
-virtual void
-referencedPackage (Type const&);
+        virtual void
+        importedPackage_none (Type&);
 
-virtual void
-referencedPackage_none (Type&);
+        virtual void
+        importedPackage_none (Type const&);
 
-virtual void
-referencedPackage_none (Type const&);
+        virtual void
+        referencedPackage (Type&);
 
-virtual void
-selectRequirement (Type&);
+        virtual void
+        referencedPackage (Type const&);
 
-virtual void
-selectRequirement (Type const&);
+        virtual void
+        referencedPackage_none (Type&);
 
-virtual void
-selectRequirement_pre (Type&);
+        virtual void
+        referencedPackage_none (Type const&);
 
-virtual void
-selectRequirement_pre (Type const&);
+        virtual void
+        selectRequirement (Type&);
 
-virtual void
-selectRequirement_next (Type&);
+        virtual void
+        selectRequirement (Type const&);
 
-virtual void
-selectRequirement_next (Type const&);
+        virtual void
+        selectRequirement_pre (Type&);
 
-virtual void
-selectRequirement_post (Type&);
+        virtual void
+        selectRequirement_pre (Type const&);
 
-virtual void
-selectRequirement_post (Type const&);
+        virtual void
+        selectRequirement_next (Type&);
 
-virtual void
-selectRequirement_none (Type&);
+        virtual void
+        selectRequirement_next (Type const&);
 
-virtual void
-selectRequirement_none (Type const&);
+        virtual void
+        selectRequirement_post (Type&);
 
-virtual void
-configProperty (Type&);
+        virtual void
+        selectRequirement_post (Type const&);
 
-virtual void
-configProperty (Type const&);
+        virtual void
+        selectRequirement_none (Type&);
 
-virtual void
-configProperty_pre (Type&);
+        virtual void
+        selectRequirement_none (Type const&);
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty (Type&);
 
-virtual void
-configProperty_next (Type&);
+        virtual void
+        configProperty (Type const&);
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_pre (Type&);
 
-virtual void
-configProperty_post (Type&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_next (Type&);
 
-virtual void
-configProperty_none (Type&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_none (Type const&);
+        virtual void
+        configProperty_post (Type&);
 
-virtual void
-contentLocation (Type&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        configProperty_none (Type&);
 
-virtual void
-contentLocation_none (Type&);
+        virtual void
+        configProperty_none (Type const&);
 
-virtual void
-contentLocation_none (Type const&);
+        virtual void
+        contentLocation (Type&);
 
-virtual void
-href (Type&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type const&);
+        virtual void
+        contentLocation_none (Type&);
 
-virtual void
-href_none (Type&);
+        virtual void
+        contentLocation_none (Type const&);
 
-virtual void
-href_none (Type const&);
+        virtual void
+        post (Type&);
 
-virtual void
-post (Type&);
-
-virtual void
-post (Type const&);
-};
-}
-}
+        virtual void
+        post (Type const&);
+      };
+    }
+  }
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-namespace Writer
-{
-struct ComponentPackageImport : Traversal::ComponentPackageImport,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::ComponentPackageImport Type;
-ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >&);
+  namespace Config_Handlers
+  {
+    namespace Writer
+    {
+      struct ComponentPackageImport : Traversal::ComponentPackageImport, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPackageImport Type;
+        ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-location_pre (Type &o)
-{
+        virtual void 
+        location_pre (Type &o)
+        {
 
-this->location_pre (const_cast <Type const &> (o));
-}
+          this->location_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_pre (Type const&);
+        virtual void
+        location_pre (Type const&);
 
-virtual void
-location_next (Type &o)
-{
+        virtual void 
+        location_next (Type &o)
+        {
 
-this->location_next (const_cast <Type const &> (o));
-}
+          this->location_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_next (Type const&);
+        virtual void
+        location_next (Type const&);
 
-virtual void
-location_post (Type &o)
-{
+        virtual void 
+        location_post (Type &o)
+        {
 
-this->location_post (const_cast <Type const &> (o));
-}
+          this->location_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-location_post (Type const&);
+        virtual void
+        location_post (Type const&);
 
-protected:
-ComponentPackageImport ();
-};
+        protected:
+        ComponentPackageImport ();
+      };
 
-struct PackageConfiguration : Traversal::PackageConfiguration,
-virtual ::XSCRT::Writer< ACE_TCHAR >
-{
-typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
-PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >&);
+      struct PackageConfiguration : Traversal::PackageConfiguration, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
+        PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-virtual void
-traverse (Type &o)
-{
+        virtual void 
+        traverse (Type &o)
+        {
 
-this->traverse (const_cast <Type const &> (o));
-}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-virtual void
-label (Type &o)
-{
+        virtual void 
+        label (Type &o)
+        {
 
-this->label (const_cast <Type const &> (o));
-}
+          this->label (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-label (Type const&);
+        virtual void
+        label (Type const&);
 
-virtual void
-UUID (Type &o)
-{
+        virtual void 
+        UUID (Type &o)
+        {
 
-this->UUID (const_cast <Type const &> (o));
-}
+          this->UUID (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-UUID (Type const&);
+        virtual void
+        UUID (Type const&);
 
-virtual void
-basePackage (Type &o)
-{
+        virtual void 
+        basePackage (Type &o)
+        {
 
-this->basePackage (const_cast <Type const &> (o));
-}
+          this->basePackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-basePackage (Type const&);
+        virtual void
+        basePackage (Type const&);
 
-virtual void
-specializedConfig (Type &o)
-{
+        virtual void 
+        specializedConfig (Type &o)
+        {
 
-this->specializedConfig (const_cast <Type const &> (o));
-}
+          this->specializedConfig (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-specializedConfig (Type const&);
+        virtual void
+        specializedConfig (Type const&);
 
-virtual void
-importedPackage (Type &o)
-{
+        virtual void 
+        importedPackage (Type &o)
+        {
 
-this->importedPackage (const_cast <Type const &> (o));
-}
+          this->importedPackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-importedPackage (Type const&);
+        virtual void
+        importedPackage (Type const&);
 
-virtual void
-referencedPackage (Type &o)
-{
+        virtual void 
+        referencedPackage (Type &o)
+        {
 
-this->referencedPackage (const_cast <Type const &> (o));
-}
+          this->referencedPackage (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-referencedPackage (Type const&);
+        virtual void
+        referencedPackage (Type const&);
 
-virtual void
-selectRequirement_pre (Type &o)
-{
+        virtual void 
+        selectRequirement_pre (Type &o)
+        {
 
-this->selectRequirement_pre (const_cast <Type const &> (o));
-}
+          this->selectRequirement_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_pre (Type const&);
+        virtual void
+        selectRequirement_pre (Type const&);
 
-virtual void
-selectRequirement_next (Type &o)
-{
+        virtual void 
+        selectRequirement_next (Type &o)
+        {
 
-this->selectRequirement_next (const_cast <Type const &> (o));
-}
+          this->selectRequirement_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_next (Type const&);
+        virtual void
+        selectRequirement_next (Type const&);
 
-virtual void
-selectRequirement_post (Type &o)
-{
+        virtual void 
+        selectRequirement_post (Type &o)
+        {
 
-this->selectRequirement_post (const_cast <Type const &> (o));
-}
+          this->selectRequirement_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-selectRequirement_post (Type const&);
+        virtual void
+        selectRequirement_post (Type const&);
 
-virtual void
-configProperty_pre (Type &o)
-{
+        virtual void 
+        configProperty_pre (Type &o)
+        {
 
-this->configProperty_pre (const_cast <Type const &> (o));
-}
+          this->configProperty_pre (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_pre (Type const&);
+        virtual void
+        configProperty_pre (Type const&);
 
-virtual void
-configProperty_next (Type &o)
-{
+        virtual void 
+        configProperty_next (Type &o)
+        {
 
-this->configProperty_next (const_cast <Type const &> (o));
-}
+          this->configProperty_next (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_next (Type const&);
+        virtual void
+        configProperty_next (Type const&);
 
-virtual void
-configProperty_post (Type &o)
-{
+        virtual void 
+        configProperty_post (Type &o)
+        {
 
-this->configProperty_post (const_cast <Type const &> (o));
-}
+          this->configProperty_post (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-configProperty_post (Type const&);
+        virtual void
+        configProperty_post (Type const&);
 
-virtual void
-contentLocation (Type &o)
-{
+        virtual void 
+        contentLocation (Type &o)
+        {
 
-this->contentLocation (const_cast <Type const &> (o));
-}
+          this->contentLocation (const_cast <Type const &> (o));
+        }
 
 
-virtual void
-contentLocation (Type const&);
+        virtual void
+        contentLocation (Type const&);
 
-virtual void
-href (Type &o)
-{
-
-this->href (const_cast <Type const &> (o));
-}
-
-
-virtual void
-href (Type const&);
-
-protected:
-PackageConfiguration ();
-};
-}
-}
+        protected:
+        PackageConfiguration ();
+      };
+    }
+  }
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-}
+  namespace Config_Handlers
+  {
+  }
 }
 
 #endif // PCD_HPP
diff --git a/CIAO/tools/Config_Handlers/test.cpp b/CIAO/tools/Config_Handlers/test.cpp
index 549700fb79d..88a7d8f2a24 100644
--- a/CIAO/tools/Config_Handlers/test.cpp
+++ b/CIAO/tools/Config_Handlers/test.cpp
@@ -4,8 +4,8 @@
 
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
 #include "DnC_Dump.h"
@@ -52,7 +52,7 @@ int main (int argc, char *argv[])
     return 1;
 
   // Initialize an ORB so Any will work
-  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
   ACE_UNUSED_ARG (orb);
 
   //Create an XML_Helper for all the file work
diff --git a/CIAO/tools/Config_Handlers/toplevel.cpp b/CIAO/tools/Config_Handlers/toplevel.cpp
index 25c9a04929d..4a06443d8fb 100644
--- a/CIAO/tools/Config_Handlers/toplevel.cpp
+++ b/CIAO/tools/Config_Handlers/toplevel.cpp
@@ -9,6 +9,12 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
 #include "toplevel.hpp"
 
 namespace CIAO
@@ -16,49 +22,75 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TopLevelPackageDescription
-    //
+    // 
 
     TopLevelPackageDescription::
-    TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__)
-      :
-      ::XSCRT::Type (),
-      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (package__)),
-      regulator__ ()
+    TopLevelPackageDescription ()
+    : 
+    ::XSCRT::Type (), 
+    regulator__ ()
     {
-      package_->container (this);
     }
 
     TopLevelPackageDescription::
     TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
-      :
-      ::XSCRT::Type (),
-      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (*s.package_)),
-      regulator__ ()
+    :
+    ::XSCRT::Type (),
+    regulator__ ()
     {
-      package_->container (this);
+      {
+        for (basePackage_const_iterator i (s.basePackage_.begin ());i != s.basePackage_.end ();++i) add_basePackage (*i);
+      }
     }
 
     ::CIAO::Config_Handlers::TopLevelPackageDescription& TopLevelPackageDescription::
     operator= (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
     {
-      package (s.package ());
+      basePackage_.clear ();
+      {
+        for (basePackage_const_iterator i (s.basePackage_.begin ());i != s.basePackage_.end ();++i) add_basePackage (*i);
+      }
 
       return *this;
     }
 
 
     // TopLevelPackageDescription
-    //
-    ::CIAO::Config_Handlers::PackageConfiguration const& TopLevelPackageDescription::
-    package () const
+    // 
+    TopLevelPackageDescription::basePackage_iterator TopLevelPackageDescription::
+    begin_basePackage ()
+    {
+      return basePackage_.begin ();
+    }
+
+    TopLevelPackageDescription::basePackage_iterator TopLevelPackageDescription::
+    end_basePackage ()
+    {
+      return basePackage_.end ();
+    }
+
+    TopLevelPackageDescription::basePackage_const_iterator TopLevelPackageDescription::
+    begin_basePackage () const
+    {
+      return basePackage_.begin ();
+    }
+
+    TopLevelPackageDescription::basePackage_const_iterator TopLevelPackageDescription::
+    end_basePackage () const
     {
-      return *package_;
+      return basePackage_.end ();
     }
 
     void TopLevelPackageDescription::
-    package (::CIAO::Config_Handlers::PackageConfiguration const& e)
+    add_basePackage (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      *package_ = e;
+      basePackage_.push_back (e);
+    }
+
+    size_t TopLevelPackageDescription::
+    count_basePackage(void) const
+    {
+      return basePackage_.size ();
     }
   }
 }
@@ -72,26 +104,26 @@ namespace CIAO
 
     TopLevelPackageDescription::
     TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      :Base__ (e), regulator__ ()
+    :Base (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "basePackage")
+        {
+          ::CIAO::Config_Handlers::PackageConfiguration t (e);
+          add_basePackage (t);
+        }
+
+        else 
         {
-          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-          if (n == "package")
-            {
-              package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
-              package_->container (this);
-            }
-
-          else
-            {
-            }
         }
+      }
     }
   }
 }
@@ -144,7 +176,7 @@ namespace CIAO
       traverse (Type& o)
       {
         pre (o);
-        package (o);
+        basePackage (o);
         post (o);
       }
 
@@ -152,7 +184,7 @@ namespace CIAO
       traverse (Type const& o)
       {
         pre (o);
-        package (o);
+        basePackage (o);
         post (o);
       }
 
@@ -167,15 +199,73 @@ namespace CIAO
       }
 
       void TopLevelPackageDescription::
-      package (Type& o)
+      basePackage (Type& o)
       {
-        dispatch (o.package ());
+        // VC6 anathema strikes again
+        //
+        TopLevelPackageDescription::Type::basePackage_iterator b (o.begin_basePackage()), e (o.end_basePackage());
+
+        if (b != e)
+        {
+          basePackage_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) basePackage_next (o);
+          }
+
+          basePackage_post (o);
+        }
       }
 
       void TopLevelPackageDescription::
-      package (Type const& o)
+      basePackage (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        TopLevelPackageDescription::Type::basePackage_const_iterator b (o.begin_basePackage()), e (o.end_basePackage());
+
+        if (b != e)
+        {
+          basePackage_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) basePackage_next (o);
+          }
+
+          basePackage_post (o);
+        }
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_pre (Type&)
+      {
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_pre (Type const&)
+      {
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_next (Type&)
+      {
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_next (Type const&)
+      {
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_post (Type&)
+      {
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_post (Type const&)
       {
-        dispatch (o.package ());
       }
 
       void TopLevelPackageDescription::
@@ -203,7 +293,7 @@ namespace CIAO
 
       TopLevelPackageDescription::
       TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -219,10 +309,21 @@ namespace CIAO
       }
 
       void TopLevelPackageDescription::
-      package (Type const& o)
+      basePackage_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_next (Type const& o)
+      {
+        basePackage_post (o);
+        basePackage_pre (o);
+      }
+
+      void TopLevelPackageDescription::
+      basePackage_post (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("package", top_ ()));
-        Traversal::TopLevelPackageDescription::package (o);
         pop_ ();
       }
     }
diff --git a/CIAO/tools/Config_Handlers/toplevel.hpp b/CIAO/tools/Config_Handlers/toplevel.hpp
index 09964cff90b..468b927cc59 100644
--- a/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -9,17 +9,16 @@
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
 
-
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
 #ifndef TOPLEVEL_HPP
 #define TOPLEVEL_HPP
 
+#include "XSC_XML_Handlers_Export.h"
 // Forward declarations.
 //
 namespace CIAO
@@ -42,29 +41,33 @@ namespace CIAO
   {
     class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
     {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+      typedef ::XSCRT::Type Base;
+
+      // basePackage
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::iterator basePackage_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator basePackage_const_iterator;
+      basePackage_iterator begin_basePackage ();
+      basePackage_iterator end_basePackage ();
+      basePackage_const_iterator begin_basePackage () const;
+      basePackage_const_iterator end_basePackage () const;
+      void add_basePackage (::CIAO::Config_Handlers::PackageConfiguration const& );
+      size_t count_basePackage (void) const;
 
-      // package
-      //
-    public:
-      ::CIAO::Config_Handlers::PackageConfiguration const& package () const;
-      void package (::CIAO::Config_Handlers::PackageConfiguration const& );
-
-    protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_;
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::PackageConfiguration > basePackage_;
 
-    public:
-      TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__);
+      public:
+      TopLevelPackageDescription ();
 
       TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       TopLevelPackageDescription (TopLevelPackageDescription const& s);
-      
-      ~TopLevelPackageDescription () {};
+
       TopLevelPackageDescription&
       operator= (TopLevelPackageDescription const& s);
 
-    private:
+      private:
       char regulator__;
     };
   }
@@ -87,29 +90,47 @@ namespace CIAO
     {
       struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
       {
-	virtual void
-	traverse (Type&);
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        basePackage (Type&);
+
+        virtual void
+        basePackage (Type const&);
 
-	virtual void
-	traverse (Type const&);
+        virtual void
+        basePackage_pre (Type&);
 
-	virtual void
-	pre (Type&);
+        virtual void
+        basePackage_pre (Type const&);
 
-	virtual void
-	pre (Type const&);
+        virtual void
+        basePackage_next (Type&);
 
-	virtual void
-	package (Type&);
+        virtual void
+        basePackage_next (Type const&);
 
-	virtual void
-	package (Type const&);
+        virtual void
+        basePackage_post (Type&);
 
-	virtual void
-	post (Type&);
+        virtual void
+        basePackage_post (Type const&);
 
-	virtual void
-	post (Type const&);
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
       };
     }
   }
@@ -123,36 +144,58 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription,
-					  virtual ::XSCRT::Writer< ACE_TCHAR >
+      struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
       {
-	typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
-	TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+        typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
+        TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-	virtual void
-	traverse (Type &o)
-	{
+        virtual void 
+        traverse (Type &o)
+        {
 
-	  this->traverse (const_cast <Type const &> (o));
-	}
+          this->traverse (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	traverse (Type const&);
+        virtual void
+        traverse (Type const&);
 
-	virtual void
-	package (Type &o)
-	{
+        virtual void 
+        basePackage_pre (Type &o)
+        {
 
-	  this->package (const_cast <Type const &> (o));
-	}
+          this->basePackage_pre (const_cast <Type const &> (o));
+        }
 
 
-	virtual void
-	package (Type const&);
+        virtual void
+        basePackage_pre (Type const&);
 
-      protected:
-	TopLevelPackageDescription ();
+        virtual void 
+        basePackage_next (Type &o)
+        {
+
+          this->basePackage_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        basePackage_next (Type const&);
+
+        virtual void 
+        basePackage_post (Type &o)
+        {
+
+          this->basePackage_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        basePackage_post (Type const&);
+
+        protected:
+        TopLevelPackageDescription ();
       };
     }
   }
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 38fc2a1f7df..c78710c2154 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -1535,7 +1535,7 @@ idl3_to_idl2_visitor::create_scoped_name (const char *prefix,
 {
   ACE_CString local_string (prefix,
                             0,
-                            0);
+                            false);
   local_string += local_name;
   local_string += suffix;
   Identifier *local_id = 0;
diff --git a/TAO/COPYING b/TAO/COPYING
index 2a8822bc2a8..4296f4649cf 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,21 +1,22 @@
 
      _________________________________________________________________
-
+   
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
   CoSMIC(TM)
-
+  
    [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
    [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-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
    and distribute modified versions of this software. You must, however,
-   include this copyright statement along with code built using DOC
-   software.
-
+   include this copyright statement along with any code built using DOC
+   software that you release. No copyright statement needs to be provided
+   if you just ship binary executables of your software products.
+   
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not do
@@ -26,7 +27,7 @@
    software in your software, though we encourage you to let [10]us know
    so we can promote your project in the [11]DOC software success
    stories.
-
+   
    The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
@@ -44,7 +45,7 @@
    modification of such Submissions is entirely at the discretion of the
    moderators of the open-source DOC software projects or their
    designees.
-
+   
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -62,13 +63,13 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-
+   
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
    world provide commercial support for DOC software, however.
-
+   
    DOC software is Y2K-compliant, as long as the underlying OS platform
    is Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
@@ -77,7 +78,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-
+   
    The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
@@ -88,13 +89,13 @@
    Vanderbilt University appear in their names, without express written
    permission from Washington University, UC Irvine, and Vanderbilt
    University.
-
+   
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
-
+   
    [21]Douglas C. Schmidt
      _________________________________________________________________
-
+   
    Back to the [22]ACE home page.
 
 References
@@ -120,4 +121,4 @@ References
   19. http://www.cs.wustl.edu/~schmidt/commercial-support.html
   20. mailto:d.schmidt@vanderbilt.edu
   21. http://www.dre.vanderbilt.edu/~schmidt/
-  22. http://www.cs.wustl.edu/~schmidt/ACE.html
+  22. http://www.cs.wustl.edu/ACE.html
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 49a38e31e12..ace5e754a84 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,4295 @@
+
+Wed Mar 21 12:12:26 CDT 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+	* TAO version 1.5.7 released.
+
+Mon Mar 19 19:34:48 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+
+          The code to set the null terminator on the "kind" read from
+          the persistence file was purposely removed. However, the original
+          reason that it was there was that this string was the only string
+          that was often of length zero.  When fgets read nothing into the
+          string, it was then null terminated which yielded a string of zero
+          length.  Without it, the string was filled with garbage.
+
+          The correct modification was to initialize the string passed to
+          fgets to an empty string and then call fgets.  This handles cases
+          where nothing is read from the file.  I have made this change in
+          each place where fgets is called.
+
+Mon Mar 19 19:24:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Added an entry about the unexpected exception handler for Ossama
+          Othman.
+
+Mon Mar 19 19:22:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Added an entry about the IDL compiler code generation for a
+          comma-separated list of sequence typedefs for Jeff Parsons.
+
+Mon Mar 19 19:13:59 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2654_Regression/server.cpp:
+
+          Wait for threads started by the Hello implementation to avoid
+          access violations.
+
+Mon Mar 19 16:21:11 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+
+          Added the code to set the null terminator on the "kind" read from
+          the persistence file.  It was accidentally removed in the Thu Mar
+          9 00:08:52 UTC 2007 commit.
+
+Thu Mar 15 14:19:57 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp:
+          Fixed invalid read reported by valgrind
+
+Thu Mar 15 12:14:57 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DynUnion_Test/DynUnionTest.cpp:
+          Added include for static builds
+
+Thu Mar 15 11:55:54 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/CORBA_e_Implicit_Activation/server.cpp:
+
+          TAO should throw a CORBA::INV_POLICY when implicit activation is
+          used.  Thanks to Johnny Willemsen for pointing this out.
+
+Thu Mar 15 08:05:57 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CORBA_e_Implicit_Activation/server.cpp:
+          Fixed variable not used warning
+
+Wed Mar 14 17:24:57 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
+
+         Modified this test to use explicit activation to support
+         CORBA e compact.
+
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+
+          Used explicit activation in one place, however there are more
+          places where implicit activation is used in this test and in the
+          Event core library.
+
+Wed Mar 14 16:14:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Bug_2800_Regression/client.cpp:
+
+          Corrected debug message.
+
+        * performance-tests/Throughput/Throughput.mpc:
+
+          Reverted my change from Tue Mar 13 18:24:27 UTC 2007.  It should
+          not have been committed.
+
+        * examples/ior_corbaloc/server.cpp:
+        * tests/IDL_Test/main.cpp:
+        * tests/Multiple/server.cpp:
+
+          Modified these tests to use explicit activation to support
+          CORBA e compact.
+
+Wed Mar 14 13:38:15 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Servant_To_Reference_Test/run_test.pl:
+
+          Increase the timeout to allow slower hardware to complete the
+          test.
+
+Wed Mar 14 13:11:52 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/File_IO/File_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+        * tests/Nested_Upcall_Crash/Client_Peer.cpp:
+        * tests/Nested_Upcall_Crash/Server_Peer.cpp:
+        * tests/Portable_Interceptors/PICurrent/test_i.cpp:
+
+          Reverted my changes from Tue Mar 13 18:24:27 UTC 2007.  They were
+          not correct.
+
+        * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp:
+        * tests/RTCORBA/Linear_Priority/server.cpp:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+        * tests/RTCORBA/Thread_Pool/server.cpp:
+
+          Modified my changes from Tue Mar 13 18:24:27 UTC 2007.  They were
+          also incorrect.
+
+Wed Mar 14 08:12:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DynUnion_Test/DynUnionTest.cpp:
+          Fixed conversion warnings
+
+Tue Mar 14 05:32:38 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Array_Traits_T.h (copy_range):
+
+          Made this trait method a member template to provide support for
+          checked destination iterators.
+
+Tue Mar 13 20:05:54 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Simple_Naming/client.h:
+        * orbsvcs/tests/Simple_Naming/client.cpp:
+
+          Modified this test to use explicit activation to support
+          CORBA e compact.
+
+Tue Mar 13 18:42:44 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * performance-tests/Throughput/Receiver_Factory.cpp:
+
+          Modified this performance-test to use explicit activation to
+          support CORBA e compact.
+
+Tue Mar 13 18:24:27 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/PluggableUDP/tests/Basic/client.cpp:
+        * examples/PluggableUDP/tests/Basic/server.cpp:
+        * examples/Simple/grid/Grid_i.cpp:
+        * examples/Simple/time-date/Time_Date.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp:
+        * performance-tests/Latency/Single_Threaded/server.cpp:
+        * performance-tests/Latency/Thread_Per_Connection/server.cpp:
+        * performance-tests/Latency/Thread_Pool/server.cpp:
+        * performance-tests/POA/Object_Creation_And_Registration/registration.cpp:
+        * performance-tests/Sequence_Latency/Single_Threaded/server.cpp:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp:
+        * performance-tests/Sequence_Latency/Thread_Pool/server.cpp:
+        * performance-tests/Throughput/Throughput.mpc:
+        * performance-tests/Throughput/server.cpp:
+        * tests/AMH_Exceptions/server.cpp:
+        * tests/AMH_Oneway/server.cpp:
+        * tests/AMI/server.cpp:
+        * tests/AMI/simple_client.cpp:
+        * tests/AMI_Buffering/admin.cpp:
+        * tests/AMI_Buffering/client.cpp:
+        * tests/AMI_Buffering/server.cpp:
+        * tests/AMI_Timeouts/client.cpp:
+        * tests/AMI_Timeouts/server.cpp:
+        * tests/Abstract_Interface/server.cpp:
+        * tests/Abstract_Interface/test_i.h:
+        * tests/Abstract_Interface/test_i.cpp:
+        * tests/Any/Recursive/server.cpp:
+        * tests/BiDirectional/client.cpp:
+        * tests/BiDirectional_DelayedUpcall/client.cpp:
+        * tests/BiDirectional_NestedUpcall/client.cpp:
+        * tests/Big_AMI/client.cpp:
+        * tests/Big_AMI/server.cpp:
+        * tests/Big_Oneways/client.cpp:
+        * tests/Big_Oneways/server.cpp:
+        * tests/Big_Reply/server.cpp:
+        * tests/Big_Request_Muxing/server.cpp:
+        * tests/Big_Twoways/client.cpp:
+        * tests/Big_Twoways/server.cpp:
+        * tests/Blocking_Sync_None/server.cpp:
+        * tests/Bug_1020_Basic_Regression/client.cpp:
+        * tests/Bug_1020_Basic_Regression/server.cpp:
+        * tests/Bug_1020_Regression/client.cpp:
+        * tests/Bug_1020_Regression/server.cpp:
+        * tests/Bug_1254_Regression/server.cpp:
+        * tests/Bug_1269_Regression/client.cpp:
+        * tests/Bug_1269_Regression/server.cpp:
+        * tests/Bug_1270_Regression/client.cpp:
+        * tests/Bug_1270_Regression/server.cpp:
+        * tests/Bug_1330_Regression/server.cpp:
+        * tests/Bug_1361_Regression/client.cpp:
+        * tests/Bug_1361_Regression/server.cpp:
+        * tests/Bug_1383_Regression/SimpleClient.cpp:
+        * tests/Bug_1383_Regression/SimpleServer.cpp:
+        * tests/Bug_1476_Regression/server.cpp:
+        * tests/Bug_1482_Regression/server.cpp:
+        * tests/Bug_1495_Regression/Server_Task.cpp:
+        * tests/Bug_1551_Regression/server.cpp:
+        * tests/Bug_1568_Regression/server.cpp:
+        * tests/Bug_1627_Regression/server.cpp:
+        * tests/Bug_1670_Regression/server.cpp:
+        * tests/Bug_1676_Regression/server.cpp:
+        * tests/Bug_2084_Regression/Client_Task.cpp:
+        * tests/Bug_2084_Regression/Server_Task.cpp:
+        * tests/Bug_2134_Regression/Hello.cpp:
+        * tests/Bug_2174_Regression/server.cpp:
+        * tests/Bug_2183_Regression/server.cpp:
+        * tests/Bug_2186_Regression/client.cpp:
+        * tests/Bug_2186_Regression/server.cpp:
+        * tests/Bug_2188_Regression/server.cpp:
+        * tests/Bug_2289_Regression/client.cpp:
+        * tests/Bug_2289_Regression/server.cpp:
+        * tests/Bug_2319_Regression/server.cpp:
+        * tests/Bug_2328_Regression/server.cpp:
+        * tests/Bug_2349_Regression/server.cpp:
+        * tests/Bug_2417_Regression/client.cpp:
+        * tests/Bug_2417_Regression/server.cpp:
+        * tests/Bug_2429_Regression/client.cpp:
+        * tests/Bug_2429_Regression/server.cpp:
+        * tests/Bug_2494_Regression/server.cpp:
+        * tests/Bug_2503_Regression/test_i.cpp:
+        * tests/Bug_2560_Regression/server.cpp:
+        * tests/Bug_2593_Regression/server.cpp:
+        * tests/Bug_2595_Regression/server.cpp:
+        * tests/Bug_2669_Regression/client.cpp:
+        * tests/Bug_2683_Regression/server.cpp:
+        * tests/COIOP/COIOP_Simple_Test.cpp:
+        * tests/COIOP/Server_Task.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+        * tests/Cache_Growth_Test/server.cpp:
+        * tests/CallbackTest/client.cpp:
+        * tests/CallbackTest/server.cpp:
+        * tests/Client_Leaks/Process_Factory.cpp:
+        * tests/Client_Leaks/child.cpp:
+        * tests/Client_Leaks/server.cpp:
+        * tests/CodeSets/simple/server.cpp:
+        * tests/Collocation_Exception_Test/Server_Task.cpp:
+        * tests/Collocation_Oneway_Tests/Server_Task.cpp:
+        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
+        * tests/Collocation_Tests/Server_Task.cpp:
+        * tests/Connect_Strategy_Test/server.cpp:
+        * tests/Connection_Purging/server.cpp:
+        * tests/Crash_On_Write/server.cpp:
+        * tests/Crashed_Callback/client.cpp:
+        * tests/Crashed_Callback/server.cpp:
+        * tests/DII_Collocation_Tests/oneway/Server_Task.cpp:
+        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp:
+        * tests/DLL_ORB/Test_Server_Module.cpp:
+        * tests/DSI_AMI_Gateway/server.cpp:
+        * tests/DSI_Gateway/server.cpp:
+        * tests/Explicit_Event_Loop/server.cpp:
+        * tests/FL_Cube/server.cpp:
+        * tests/Faults/client.cpp:
+        * tests/Faults/middle.cpp:
+        * tests/Faults/ping.cpp:
+        * tests/Faults/pong.cpp:
+        * tests/Faults/server.cpp:
+        * tests/File_IO/File_i.cpp:
+        * tests/Forwarding/server.cpp:
+        * tests/GIOP_Fragments/Java_Big_Request/server.cpp:
+        * tests/Hang_Shutdown/server.cpp:
+        * tests/Hello/server.cpp:
+        * tests/ICMG_Any_Bug/Hello.cpp:
+        * tests/ICMG_Any_Bug/server.cpp:
+        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp:
+        * tests/IPV6/server.cpp:
+        * tests/Leader_Followers/server.cpp:
+        * tests/LongDouble/server.cpp:
+        * tests/LongUpcalls/AMI_Manager.cpp:
+        * tests/LongUpcalls/ami_client.cpp:
+        * tests/LongUpcalls/ami_server.cpp:
+        * tests/LongUpcalls/blocking_client.cpp:
+        * tests/LongUpcalls/blocking_server.cpp:
+        * tests/MProfile/server.cpp:
+        * tests/MProfile_Connection_Timeout/server.cpp:
+        * tests/MProfile_Forwarding/server.cpp:
+        * tests/MT_BiDir/client.cpp:
+        * tests/MT_Client/server.cpp:
+        * tests/MT_Server/server.cpp:
+        * tests/MT_Timeout/server.cpp:
+        * tests/Multiple/server.cpp:
+        * tests/Muxed_GIOP_Versions/server.cpp:
+        * tests/Muxing/server.cpp:
+        * tests/Native_Exceptions/server.cpp:
+        * tests/NestedUpcall/MT_Client_Test/local_server.cpp:
+        * tests/NestedUpcall/Simple/client.cpp:
+        * tests/NestedUpcall/Simple/server.cpp:
+        * tests/NestedUpcall/Simple/simple-client.cpp:
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+        * tests/Nested_Event_Loop/server.cpp:
+        * tests/Nested_Upcall_Crash/Client_Peer.cpp:
+        * tests/Nested_Upcall_Crash/Server_Peer.cpp:
+        * tests/Nested_Upcall_Crash/client.cpp:
+        * tests/Nested_Upcall_Crash/server.cpp:
+        * tests/No_Server_MT_Connect_Test/server.cpp:
+        * tests/OBV/Any/server.cpp:
+        * tests/OBV/Collocated/Forward/Server_Task.cpp:
+        * tests/OBV/Factory/server.cpp:
+        * tests/OBV/Forward/server.cpp:
+        * tests/OBV/TC_Alignment/server.cpp:
+        * tests/OBV/Truncatable/server.cpp:
+        * tests/OBV/ValueBox/server.cpp:
+        * tests/ORB_shutdown/server.cpp:
+        * tests/Object_Loader/Loader.cpp:
+        * tests/Objref_Sequence_Test/server.cpp:
+        * tests/OctetSeq/server.cpp:
+        * tests/Ondemand_Write/server.cpp:
+        * tests/Oneway_Buffering/admin.cpp:
+        * tests/Oneway_Buffering/server.cpp:
+        * tests/Oneways_Invoking_Twoways/client.cpp:
+        * tests/Oneways_Invoking_Twoways/server.cpp:
+        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp:
+        * tests/POA/Object_Reactivation/Object_Reactivation.cpp:
+        * tests/POA/POA_Destruction/POA_Destruction.cpp:
+        * tests/POA/Persistent_ID/server.cpp:
+        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp:
+        * tests/POA/wait_for_completion/wait_for_completion.cpp:
+        * tests/Parallel_Connect_Strategy/server.cpp:
+        * tests/Portable_Interceptors/AMI/server.cpp:
+        * tests/Portable_Interceptors/AdvSlot/server.cpp:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+        * tests/Portable_Interceptors/AdvSlotExt/server.cpp:
+        * tests/Portable_Interceptors/ORB_Shutdown/server.cpp:
+        * tests/Portable_Interceptors/PICurrent/test_i.cpp:
+        * tests/Portable_Interceptors/Redirection/server.cpp:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp:
+        * tests/QtTests/server.cpp:
+        * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp:
+        * tests/RTCORBA/Linear_Priority/server.cpp:
+        * tests/RTCORBA/Policy_Combinations/server.cpp:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+        * tests/RTCORBA/Thread_Pool/server.cpp:
+        * tests/Reliable_Oneways/server.cpp:
+        * tests/Server_Connection_Purging/server.cpp:
+        * tests/Server_Leaks/server.cpp:
+        * tests/Server_Port_Zero/server.cpp:
+        * tests/Single_Read/server.cpp:
+        * tests/Smart_Proxies/Benchmark/server.cpp:
+        * tests/Smart_Proxies/On_Demand/server.cpp:
+        * tests/Smart_Proxies/Policy/server.cpp:
+        * tests/Smart_Proxies/server.cpp:
+        * tests/Stack_Recursion/server.cpp:
+        * tests/Strategies/server.cpp:
+        * tests/Timed_Buffered_Oneways/server.cpp:
+        * tests/Timeout/server.cpp:
+        * tests/Two_Objects/Object_Factory_i.cpp:
+        * tests/Two_Objects/server.cpp:
+        * tests/Typedef_String_Array/server.cpp:
+        * tests/UNKNOWN_Exception/server.cpp:
+        * tests/Xt_Stopwatch/server.cpp:
+
+          Modified the majority of the TAO tests, performance-tests and
+          examples to use explicit activation to support CORBA e compact.
+
+        * tests/CORBA_e_Implicit_Activation:
+        * tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc:
+        * tests/CORBA_e_Implicit_Activation/Hello.h:
+        * tests/CORBA_e_Implicit_Activation/Hello.cpp:
+        * tests/CORBA_e_Implicit_Activation/Test.idl:
+        * tests/CORBA_e_Implicit_Activation/run_test.pl:
+        * tests/CORBA_e_Implicit_Activation/server.cpp:
+
+          Added a new test to ensure that CORBA e compact builds throw the
+          correct exception when implicit activation is used.
+
+        * tests/Object_Loader/driver.cpp:
+
+          Check the object reference after the _narrow() to avoid a core
+          dump.
+
+        * tests/Object_Loader/run_test.pl:
+
+          Use the PerlACE::add_lib_path() function to add the library
+          directory instead of directly modifying the PATH environment
+          variable.
+
+        * tests/Nested_Event_Loop/test_i.cpp:
+
+          Fixed an exception message to match the right method name.
+
+Tue Mar 13 18:00:34 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Valuetype/Valuetype_Traits_T.h (copy_range):
+
+          Made this trait method a member template to provide support for
+          checked destination iterators.
+
+Tue Mar 13 14:17:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/server.cpp:
+          Wait on the thread manager until all tasks are ready
+
+Tue Mar 13 12:19:58 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * MPC/config/tao_vc8warnings.mpb: Reversed the defaults for VC8
+          STL deprecated warnings since Ossama added the checked iterator
+          stuff.
+
+Tue Mar 13 09:55:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DynUnion_Test/*:
+          New DynUnion test, thanks to M. Arshad Khan
+          <khan dot m dot arshad at gmail dot com>
+          for creating this test. According to the reporter this failed with 1.5
+          but it works on svn head without problems.
+
+Mon Mar 12 22:29:32 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/checked_iterator.h:
+
+          Moved to ACE.
+
+        * tao/Generic_Sequence_T.h:
+        * tao/Unbounded_Octet_Sequence_T.h:
+
+          Updated include directives.  The checked_iterator.h header is
+          now in ACE.
+
+          Updated checked iterator factory function calls to use new name,
+          ACE_make_checked_array_iterator.
+
+        * tao/Object_Reference_Traits_T.h (copy_range):
+        * tao/String_Traits_T.h (copy_range):
+
+          Made this trait method a member template to simplify support for
+          checked destination iterators.
+
+        * tao/Makefile.am:
+        * tao/tao.mpc:
+
+          Removed tao/checked_iterator.h header from the appropriate
+          header lists.  It has been moved to ACE.
+
+Mon Mar 12 21:35:25 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          Fixed compilation errors on WinCE 5.0 builds.
+
+Mon Mar 12 21:03:15 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/checked_iterator.h (TAO_checked_array_iterator):
+
+          New function template that returns a checked iterator if
+          supported by the platform (currently VC8 or better), and a
+          pointer otherwise.
+
+        * tao/Generic_Sequence_T.h (generic_sequence, length):
+        * tao/Unbounded_Octet_Sequence_T.h (length):
+
+          Call new TAO_checked_array_iterator<>() iterator factory
+          function to generate destination iterator.  Addresses VC8
+          "C4996" warnings when security related warnings are enabled.
+
+        * tao/Value_Traits_T.h (copy_range):
+
+          Made this trait method a member template to simplify support for
+          checked destination iterators.
+
+        * tao/Makefile.am:
+        * tao/tao.mpc:
+
+          Added new tao/checked_iterator.h header to the appropriate
+          header lists.
+
+Mon Mar 12 17:38:26 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * MPC/config/tao_vc8warnings.mpb: Added disabler for the
+          "warning C4996: 'std::_Copy_opt' was declared deprecated" warnings
+          emanating from Microsoft's STL. Added it for both the vc8 and
+          nmake types. Also, added a nmake specific option to disable
+          the inherits-via-dominance warning and removed that one from
+          the ACE vc8nmake.mpb.
+
+          Also moved the warning 4290 disabler (unimplemented exception
+          spec) from ACE's vc8nmake.mpb to here.
+
+Mon Mar 11 13:52:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2800_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
+          Exit with -1 when we can't activate the test tasks
+
+Mon Mar 11 13:44:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DiffServ/server.cpp:
+        * tests/DiffServ/client.cpp:
+          Include DiffservPolicy.h so that the static initializers to run
+          in a static build
+
+Sat Mar 10 22:49:01 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * MPC/config/tao_vc8warnings.mpb: New base containing features that
+          turn VC8 warnings on/off. Some of these may benefit from some looking
+          at; if you want to see them, regenerate projects with the feature
+          turned off.
+
+        * MPC/config/taodefaults.mpb:
+        * TAO_IDL/tao_idl.mpc: Inherit from tao_vc8warnings.mpb to
+          shut off the VC8 warnings.
+
+Fri Mar  9 13:47:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DiffServ/client.cpp:
+        * tests/DiffServ/server.cpp:
+          Added missing duplicate calls
+
+Fri Mar  9 11:03:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Adapter_Registry.cpp:
+        * tao/Argument.cpp:
+        * tao/Bind_Dispatcher_Guard.cpp:
+        * tao/Cleanup_Func_Registry.cpp:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Connect_Strategy.cpp:
+          Layout changes
+
+Fri Mar  9 06:43:52 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp (operator>>):
+
+          Addressed ambiguous ACE_CString constructor calls caused by
+          recent changes to constructor "release" parameter type.
+
+Fri Mar  9 00:27:39 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/util/utl_identifier.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Changed the signature of ACE_CString constructor calls to avoid
+          ambiguity errors due to recent changes in the ACE_CString
+          class.
+
+Fri Mar  9 00:08:52 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp (operator>>):
+
+          Addressed problem where ACE_CString length was not set, which
+          resulted in no-op copy to another ACE_CString.
+
+Thu Mar  8 21:27:54 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * orbsvcs/IFR_Service/be_init.cpp (BE_save_orb_args):
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp (get_local_addr_str):
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp (update_key):
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp (valid_id):
+          Changed the signature of ACE_CString constructor calls to avoid
+          ambiguity errors due to recent changes in the ACE_CString
+          class.
+
+Thu Mar  8 17:49:52 UTC 2007  Trevor Fields  <fields_t@ociweb.com>
+
+          Fixed the Event Service crashing when dispatching
+          queue fills up and using the MT dispatching.
+
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+
+          Check for non-NULL TAO_EC_Queue_Full_Service_Object before
+          attempting to use.
+
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
+
+          Pass in the TAO_EC_Queue_Full_Service_Object reference into
+          the TAO_EC_Dispatching_Task constrcutor.
+
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h:
+
+          Add -o parameter to delay the client for a number of
+          seconds upon the reception of the first event.
+
+        * orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf:
+        * orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml:
+        * orbsvcs/tests/EC_Throughput/run_test_overflow.pl:
+
+          Added a test to try and stress the event service enough
+          to fill a dispatching queue.  This test does not always
+          fill the queue and therefore can succeed on systems
+          where a filled queue can result in crash of the
+          Event_Service.
+
+
+Thu Mar  8 15:56:40 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          Moving the -ORBDebugLevel processing from the process-global
+          initialization section to the ORB-specific initialization. This
+          resolves bug#2809 by allowing new ORBs to change the global
+          debug level.
+
+Wed Mar  8 01:28:17 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+
+          Corrected zero buffer length handling to match previous
+          behavior.
+
+Wed Mar  7 18:28:14 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMH/Roundtrip.cpp:
+
+          We don't need to do set_result() when using AMH.
+
+Wed Mar  7 17:58:38 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMH/Roundtrip.cpp:
+
+          Corrected the return value when using AMH to invoke_reply.
+
+Wed Mar  7 14:07:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_var.{h,cpp}:
+          The const operator->() should return a T*, not T const *,
+          removed the non const operator->(), no need for it. This makes
+          the Servant_var compliant with the CORBA C++ mapping. Thanks to
+          Andres Hurtis <andrej100 at gmail dot com> for reporting this.
+          This fixes bugzilla 2847.
+
+        * tao/AnyTypeCode/Marshal.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+          Layout change
+
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
+          Bool change
+
+Wed Mar  7 12:32:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rules.tao.GNU:
+          Removed the old tao_idl rules, this is now all in the generated
+          GNU makefiles. The rules for the event channel are also removed,
+          they didn't work anymore
+
+Tue Mar  6 13:46:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/IDL_Test/Makefile.am:
+        * tests/IDL_Test/valuetype.idl:
+        * tests/Any/Recursive/Test.idl:
+          Moved new tests to Any/Recursive and readded -GA, this way
+          we don't have issues with build systems that have not
+          done a full clean
+
+Tue Mar  6 13:21:24 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Updated this file to clarify that the TAO license need
+          not be shipped with binary-only releases.  Thanks to Michael
+          Kircher <michael dot kircher at siemens dot com> and Werner
+          Burger <werner dot burger at siemens dot com> for motivating
+          this.
+
+Tue Mar  6 09:52:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_AMI/run_test.pl:
+        * tests/Big_Reply/run_test.pl:
+        * tests/Bug_1330_Regression/run_test.pl:
+        * tests/Bug_1627_Regression/run_test.pl:
+        * tests/Bug_2234_Regression/run_test.pl:
+        * tests/Connection_Purging/run_test.pl:
+        * tests/Leader_Followers/run_test.pl:
+        * tests/MT_Client/run_test.pl:
+        * tests/Multiple_Inheritance/run_test.pl:
+        * tests/Native_Exceptions/run_test.pl:
+        * tests/Nested_Event_Loop/run_test.pl:
+        * tests/OctetSeq/run_test.pl:
+        * tests/OctetSeq/run_test1.pl:
+        * tests/OctetSeq/run_test2.pl:
+        * tests/Oneways_Invoking_Twoways/run_test.pl:
+        * tests/Oneways_Invoking_Twoways/run_test_svc.pl:
+        * tests/Reliable_Oneways/run_sync_none.pl:
+        * tests/Reliable_Oneways/run_sync_with_server.pl:
+        * tests/Reliable_Oneways/run_sync_with_target.pl:
+        * tests/Reliable_Oneways/run_sync_with_transport.pl:
+        * tests/Reliable_Oneways/run_test.pl:
+        * tests/Server_Leaks/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 09:50:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/Adapter_Activator/run_test.pl:
+        * examples/POA/Default_Servant/run_test.pl:
+        * examples/POA/DSI/run_test.pl:
+        * examples/POA/Explicit_Activation/run_test.pl:
+        * examples/POA/FindPOA/run_test.pl:
+        * examples/POA/Forwarding/run_test.pl:
+        * examples/POA/Loader/run_test.pl:
+        * examples/POA/NewPOA/run_test.pl:
+        * examples/POA/On_Demand_Activation/run_test.pl:
+        * examples/POA/On_Demand_Loading/run_test.pl:
+        * examples/POA/POA_BiDir/run_test.pl:
+        * examples/POA/Reference_Counted_Servant/run_test.pl:
+        * examples/POA/RootPOA/run_test.pl:
+        * examples/POA/TIE/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 09:38:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation/run_test.pl:
+        * tests/Collocation_Exception_Test/run_test.pl:
+        * tests/Collocation_Oneway_Tests/run_test.pl:
+        * tests/Collocation_Tests/run_test.pl:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl:
+        * tests/RTCORBA/Client_Propagated/run_test.pl:
+        * tests/RTCORBA/Server_Declared/run_test.pl:
+        * tests/Servant_To_Reference_Test/run_test.pl:
+        * tests/UNKNOWN_Exception/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 09:06:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DSI_AMH/run_test.pl:
+        * tests/DSI_AMI_Gateway/run_test.pl:
+        * tests/DSI_Gateway/run_test.pl:
+        * tests/DynAny_Test/run_test.pl:
+        * tests/Explicit_Event_Loop/run_test.pl:
+        * tests/ORB_destroy/run_test.pl:
+        * tests/ORB_init/run_test.pl:
+        * tests/ORB_Local_Config/run_tests_all.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 09:03:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Bug_2511_Regression/run_test.pl:
+        * tests/POA/Current/run_test.pl:
+        * tests/POA/Deactivate_Object/run_test.pl:
+        * tests/POA/Default_Servant/run_test.pl:
+        * tests/POA/Etherealization/run_test.pl:
+        * tests/POA/Excessive_Object_Deactivations/run_test.pl:
+        * tests/POA/Identity/run_test.pl:
+        * tests/POA/MT_Servant_Locator/run_test.pl:
+        * tests/POA/Nested_Non_Servant_Upcalls/run_test.pl:
+        * tests/POA/Non_Servant_Upcalls/run_test.pl:
+        * tests/POA/Object_Reactivation/run_test.pl:
+        * tests/POA/Persistent_ID/run_test.pl:
+        * tests/POA/POA_Destruction/run_test.pl:
+        * tests/POA/POAManagerFactory/run_test.pl:
+        * tests/POA/Policies/run_test.pl:
+        * tests/POA/Reference_Counting/run_test.pl:
+        * tests/POA/Single_Threaded_POA/run_test.pl:
+        * tests/POA/wait_for_completion/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 08:59:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Codec/run_test.pl:
+        * tests/POA/Bug_1592_Regression/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlot/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotExt/run_test.pl:
+        * tests/Portable_Interceptors/Benchmark/run_test.pl:
+        * tests/Portable_Interceptors/Bug_1559/run_test.pl:
+        * tests/Portable_Interceptors/Bug_2088/run_test.pl:
+        * tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl:
+        * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl:
+        * tests/Portable_Interceptors/Dynamic/run_test.pl:
+        * tests/Portable_Interceptors/ForwardRequest/run_test.pl:
+        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
+        * tests/Portable_Interceptors/ORB_Shutdown/run_test.pl:
+        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl:
+        * tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl:
+        * tests/Portable_Interceptors/Redirection/run_test.pl:
+        * tests/Portable_Interceptors/Register_Initial_References/run_test.pl:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl:
+        * tests/Portable_Interceptors/Slot/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
+Tue Mar  6 08:15:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/Test.idl:
+          Added another test case
+
+        * tests/Any/Recursive/client.cpp:
+          Extended with more tests
+
+        * tests/POA/Current/Current.cpp:
+          Layout changes
+
+Tue Mar  6 03:08:49 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/POA/Bug_1592_Regression/run_test.pl:
+          Must use $ACE_ROOT/bin instead of ../../bin otherwise it does
+          not work for checkouts with ACE and TAO at the same level (such
+          as directly from the trunk.)
+
+Mon Mar  5 20:13:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/ast/ast_sequence.cpp:
+          Fixed last part of bug 2776, the typecode for recursive valuetype s
+          is now generated correctly as recursive
+
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * TAO_IDL/include/ast_valuetype.h:
+          Moved in_recursion method from be to ast class
+
+Mon Mar  5 19:00:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * 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 bug 2776 partially, improved the detection whether we have
+          a recursive type or not. Thanks to Martin Corino
+          <mcorino at remedy dot nl> for reporting this issue.
+
+Mon Mar  5 14:45:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/valuetype.idl:
+          Added Recursive2 and Recursive3 types, both do result in
+          an invalid generated typecode. The generated code does compile
+          but will result in a crash when used runtime.
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Don't use -GA for valuetype anymore, is too complex
+
+Mon Mar  5 13:41:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/Test.idl:
+          Added RecursiveUnion2 as another test
+
+        * tests/Any/Recursive/client.cpp:
+          Added call with RecursiveUnion2, also fails
+
+        * tests/IDL_Test/union.idl:
+        * tests/IDL_Test/valuetype.idl
+          Some more tests
+
+Mon Mar  5 11:09:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * tao/AnyTypeCode/Struct_TypeCode.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode.h:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+          Layout changes
+
+Mon Mar  5 11:03:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Object_Reference_Sequence_T.h:
+        * tao/Unbounded_Object_Reference_Sequence_T.h:
+          Reverted the change for bugzilla 2829, some builds show errors,
+          will investigate these builds first
+
+Mon Mar  5 09:44:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+
+        * tao/Bounded_Object_Reference_Sequence_T.h:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+        * tao/Makefile.am:
+        * tao/Object_Reference_Const_Sequence_Element_T.h:
+        * tao/String_Const_Sequence_Element_T.h:
+        * tao/tao.mpc:
+        * tao/Unbounded_Object_Reference_Sequence_T.h:
+          Fixed bugzilla 2829, make it possible to use .in()
+          on the element returned by const operator [] for an
+          object reference sequence
+
+        * tao/ORB_Core.cpp:
+          layout change
+
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch.cpp
+        * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+        * TAO_IDL/be_include/be_codegen.h
+        * TAO_IDL/be_include/be_visitor_union_branch.h
+        * TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
+          Fixed bugzilla 2839, when an union is created by default
+          and the discriminator is for a value that is allocated
+          from the heap then allocate a value else we get
+          a crash when marshaling this default union
+
+Fri Mar  2 22:15:32 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMI_Gateway/test_dsi.cpp:
+
+          Fixed a memory leak.
+
+Fri Mar  2 20:48:45 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * TAO-INSTALL.html: Added a description of cross-compiling on
+          Windows with Visual Studio.
+
+        * orbsvcs/ImplRepo_Service/Activator_NT_Service.{h cpp}:
+        * orbsvcs/ImplRepo_Service/Locator_NT_Service.{h cpp}:
+        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Service.{h cpp}:
+        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+        * orbsvcs/Notify_Service/NT_Notify_Service.{h cpp}: Don't try this
+          on ACE_WIN32 platforms where ACE_LACKS_WIN32_SERVICES.
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp (open_config):
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: Don't try to build
+          the Windows registry-using code where ACE_LACKS_WIN32_REGISTRY.
+
+Fri Mar  2 21:00:23 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMI_Gateway/test_dsi.cpp:
+        * tests/DSI_Gateway/test_dsi.cpp:
+
+          Fixed an unused argument warning.
+
+Fri Mar  2 20:31:11 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+
+          Don't need the exception_type_ data memember.
+          It is inherited from its parent class AMH_Response_Handler.
+
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+
+          Move the exception_type_ from private section to protected section.
+          so that the AMH_DSI_Response_Handler as a child class can access
+          this data member.
+
+Fri Mar  2 18:45:34 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.inl:
+        * tao/DynamicInterface/DII_Reply_Handler.inl:
+
+          Added the missing versioned namespace guard.
+
+Fri Mar  2 07:21:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_attribute.cpp:
+          No need to set the flag that an operation has been seen
+
+        * TAO_IDL/be/be_union.cpp:
+          When we have an union with an enum as discriminator and the
+          number of labels is the same as the enum has members we don't
+          need to generate a default case. Fixes bugzilla 2838
+
+Thu Mar  1 21:32:04 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/DII_Reply_Handler.cpp:
+
+          Cosmetic change.
+
+Thu Mar  1 21:22:25 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMH/DSI_AMH.mpc:
+
+          Fixed a mpc error.
+
+Thu Mar  1 21:13:06 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+
+          Fixed a Intel compiler warning.
+
+Thu Mar  1 20:21:19 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/DSI_AMI_Gateway/test_dsi.cpp:
+
+          Fixed a unused argument warning.
+
+Thu Mar  1 19:58:16 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h:
+        * tao/DynamicInterface/DII_Reply_Handler.h:
+        * tao/DynamicInterface/DII_Reply_Handler.cpp:
+
+          Added the missing versioned namespace guard.
+
+Thu Mar  1 19:36:47 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * tao/DynamicInterface/DII_Reply_Handler.h:
+        * tao/DynamicInterface/DII_Reply_Handler.cpp:
+
+          Removed use of deprecated macros. Changed to use c++ cast.
+          Removed a check for gcc > 2.8 since it is not supported.
+
+Thu Mar  1 19:14:18 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+
+          Moved implemention code from header file to cpp file.
+
+Thu Mar  1 18:58:47 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/DII_Reply_Handler.h:
+        * tao/DynamicInterface/DII_Reply_Handler.inl:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Request.cpp:
+        * tests/DSI_AMH/DSI_AMH.mpc:
+        * tests/DSI_AMH/README:
+        * tests/DSI_AMH/Roundtrip.cpp:
+        * tests/DSI_AMH/server.cpp:
+        * tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp:
+        * tests/DSI_AMI_Gateway/gateway.cpp:
+        * tests/DSI_AMI_Gateway/test_dsi.h:
+        * tests/DSI_AMI_Gateway/test_dsi.inl:
+        * tests/DSI_AMI_Gateway/test_dsi.cpp:
+
+          Changed some lengthy lines to be less than 80 characters.
+
+Thu Mar  1 16:14:43 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/Makefile.am:
+
+          Manually added several new files to this file.
+
+Thu Mar  1 14:53:53 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+
+          No need to check for null pointer since dynamic_cast already
+          does the check for us.
+
+Thu Mar  1 14:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Server_Request.cpp:
+        * tao/DynamicInterface/Unknown_User_Exception.h:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Transport.h:
+        * tao/Transport_Connector.cpp:
+        * tao/Transport_Queueing_Strategies.cpp:
+        * tao/Transport_Selection_Guard.cpp:
+          Layout changes
+
+Thu Mar  1 13:23:32 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/Makefile.am:
+
+          Since these are not automatically generated, we must add new files
+          by hand.
+
+Thu Mar  1 13:12:28 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+
+          Replaced ACE_static_cast and ACE_const_cast with the correct
+          casts.
+
+Wed Feb 28 20:02:07 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.inl:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * tao/DynamicInterface/DII_Invocation.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.h:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/DII_Reply_Handler.h:
+        * tao/DynamicInterface/DII_Reply_Handler.inl:
+        * tao/DynamicInterface/DII_Reply_Handler.cpp:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Request.cpp:
+
+        * tao/Invocation_Utils.h:
+
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+
+          Extended current DynamicInterface to allow DII+AMI+DSI+AMH.
+
+        * tests/DSI_AMH:
+        * tests/DSI_AMH/DSI_AMH.mpc:
+        * tests/DSI_AMH/README:
+        * tests/DSI_AMH/Roundtrip.h:
+        * tests/DSI_AMH/Roundtrip.cpp:
+        * tests/DSI_AMH/Test.idl:
+        * tests/DSI_AMH/client.cpp:
+        * tests/DSI_AMH/run_test.pl:
+        * tests/DSI_AMH/server.cpp:
+
+          Added a new test for the new DSI+AMH feature.
+
+        * tests/DSI_AMI_Gateway:
+        * tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc:
+        * tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h:
+        * tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp:
+        * tests/DSI_AMI_Gateway/README:
+        * tests/DSI_AMI_Gateway/client.cpp:
+        * tests/DSI_AMI_Gateway/gateway.cpp:
+        * tests/DSI_AMI_Gateway/run_exception_test.pl:
+        * tests/DSI_AMI_Gateway/run_test.pl:
+        * tests/DSI_AMI_Gateway/server.cpp:
+        * tests/DSI_AMI_Gateway/test.idl:
+        * tests/DSI_AMI_Gateway/test_dsi.h:
+        * tests/DSI_AMI_Gateway/test_dsi.inl:
+        * tests/DSI_AMI_Gateway/test_dsi.cpp:
+        * tests/DSI_AMI_Gateway/test_i.h:
+        * tests/DSI_AMI_Gateway/test_i.inl:
+        * tests/DSI_AMI_Gateway/test_i.cpp:
+
+          Added a new test to experience the whole AMI+DII+AMH+DSI feature.
+
+Wed Feb 28 15:24:30 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * MPC/config/diffservpolicy.mpb:
+
+          Added avoids_minimum_corba, avoids_corba_e_compact, and
+          avoids_corba_e_micro as base projects and removed the install base
+          project.  This library is not available when minimum_corba,
+          corba_e_compact or corba_e_micro is enabled.  And, users of this
+          library may not want/need their binary or library to be installed.
+
+Wed Feb 28 14:59:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp:
+          Fixed unreferenced local variable warnings
+
+Wed Feb 28 14:44:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/options.cpp:
+          Fixed memory leak when reading ior file
+
+Wed Feb 28 12:42:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.h:
+        * tao/CodecFactory/CodecFactory.cpp:
+        * tao/CodecFactory/CodecFactory.h:
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+        * tao/CodecFactory/CodecFactory_impl.h:
+          Layout changes
+
+Wed Feb 28 12:34:55 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+
+          Removed an ACE_THROW_RETURN that somehow made it back in.
+
+Wed Feb 28 10:05:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+          Zapped another few old exception macros
+
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+          Layout changes
+
+Wed Feb 28 09:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/*:
+        * Release:
+          Added new bin directory and moved some scripts of the ACE_wrappers/bin
+          to this directory so that we don't ship TAO specific scripts with ACE
+
+Tue Feb 27 21:09:01 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/MCAST_Parser.cpp (parse_string):
+
+          Removed emulated exception macro that snuck back in to the
+          source during the merge.
+
+Tue Feb 27 18:43:11 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Exception.h:
+        * tao/SystemException.h:
+
+          Made copy constructor public again to silence VC7.1 level 4
+          warnings.  This constructor should be protected, but VC7.1 at
+          warning level 4 complains about the inaccessible copy
+          constructor preventing it from being caught.  However, that
+          probably isn't true for most cases since CORBA exceptions are
+          typically caught by reference, not by copy.
+
+          Added a note describing why the copy constructor is not
+          protected.
+
+        * tao/diffs/Object_Key.diff:
+
+          Synchronized with latest version of Object_KeyC.cpp.
+
+Tue Feb 27 13:21:05 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/IDL_Test/union.idl:
+
+          Changed to only exclude the union with negative cases from SunCC
+          version 5.8 or below.
+
+Tue Feb 27 12:41:52 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/TypeCode_Creation/main.cpp:
+        * examples/TypeCode_Creation/test.idl:
+
+          Modified the idl union to not use negative numbers in the cases.
+
+        * tests/IDL_Test/union.idl:
+
+          Added a union that uses negative numbers in the cases.  This is
+          currently #ifdef'ed to not be processed by the Sun preprocessor as
+          it separates the negative sign and the number causing problems for
+          the tao_idl lexer/scanner.  This is for bugzilla bug #2821.
+
+Tue Feb 27 11:05:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+
+          Some compilers do not process the #if before the macro subsitution
+          adjacent string concatination.
+
+Tue Feb 27 06:32:42 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp (create_policy):
+
+          It seems the const TAO object reference sequence element
+          operator[] no longer returns a "_var" or managed type.  Drop the
+          newly added ".in()" accessor call.  Addresses g++ 4.1 build
+          errors.
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp (operator >>):
+
+          Fixed partial merge where a number of changes were not
+          committed.
+
+          Addressed comparison signed/unsigned warnings.
+
+Mon Feb 26 23:27:03 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * NEWS:
+
+          Updated to reflect latest changes.
+
+        * TAO_IDL/include/fe_extern.h (File, FE_set_yyin):
+        * TAO_IDL/fe/fe_extern.cpp (FE_set_yyin):
+
+          Removed useless "File" class forward declaration.  Just use
+          the standard "FILE" type instead.
+
+        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+
+          Added missing visit_scope() method return value check detected
+          by Coverity.
+
+        * 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:
+
+          Added missing accept() method return value check detected by
+          Coverity.
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+
+          Fixed buffer overrun detected by Coverity.
+
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * tao/Acceptor_Registry.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
+
+          Added missing dynamic_cast<> return value check detected by
+          Coverity, i.e. a Coverity FORWARD_NULL error.
+
+        * TAO_IDL/be/be_interface_strategy.cpp (compute_coll_names):
+
+          Place full_coll_name_ and local_coll_name_ pointer members in a
+          well defined state by resetting them to zero  after deallocating
+          memory they pointed to in case this method returns prematurely,
+          and attempts to access them later on occur.  Addresses a problem
+          flagged by Coverity.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
+        * tao/CodecFactory/CodecFactory.cpp:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/RTCORBA/RT_PolicyFactory.cpp:
+
+          Initialize generated CORBA::Object_ptr skeleton variables with
+          CORBA::Object_ptr() instead of CORBA::Object::_nil().  Addresses
+          Coverity UNUSED_VALUE errors.
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.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_operation/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+
+          Moved zero pointer check before the pointer is actually
+          dereferenced.  Addresses Coverity REVERSE_INULL error.
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Include "tao/ORB_Constants.h" if operations or valuetypes are
+          seen.  Users may check SystemException minor codes.
+
+          Corrected npos constant scope.  s/ACE_SString/ACE_CString/g
+
+          Const-correctness improvements.
+
+          Delay array instantiation optimization until it is needed.
+          Minor performance optimization in presence of bad function
+          parameters.
+
+        * TAO_IDL/be/be_interface.cpp (gen_def_ctors):
+
+          Issue diagnostic message if inheritance graph traversal fails.
+
+        * TAO_IDL/be/be_decl.cpp:
+
+          Do not continue if scope narrowing fails.
+
+        * TAO_IDL/ast/ast_constant.cpp:
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/ast/ast_enum.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_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+
+          Check for null pointer before dereferencing.  Addresses Coverity
+          FORWARD_NULL errors.
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+
+          Improved consistency between local variable and return value
+          types.
+
+          Improved const-correctness.
+
+          Fixed dead code related to IDL comment scanning.  Flagged by
+          Coverity.
+
+          Cleaned up node memory management.
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Removed useless "File" class forward declaration.  Just use
+          the standard "FILE" type instead.
+
+          Removed use of "friggin'" from TAO_IDL error diagnostic.  Some
+          users may not appreciate this humor.
+
+        * TAO_IDL/util/utl_string.cpp:
+
+          Use operator new() instead of malloc().
+
+          (~UTL_String):
+
+          Deallocate string array members.  Addresses exception-safety
+          issues, as well as Coverity CTOR_DTOR_LEAK errors.
+
+          (destroy):
+
+          Deallocate string array members, and reset them to zero.
+
+        * tao/Exception.h:
+        * tao/SystemException.h:
+
+          Made copy constructor protected, as required by the C++
+          mapping.
+
+        * tao/IIOP_Acceptor.cpp:
+
+          Addressed buffer overrun.
+
+        * tao/IIOP_Connector.cpp:
+
+          Corrected method name in diagnostic message.
+
+          Cosmetic changes.
+
+        * tao/MCAST_Parser.cpp:
+        * tao/MCAST_Parser.h:
+        * tao/MCAST_Parser.inl:
+
+          Replaced unnecessary delayed conversions from port and TTL
+          strings to integral values.  Just store and use the integral
+          values directly instead of passing around a bunch of strings.
+          Simplifies implementation.
+
+          Added valid TTL check.  The valid TTL range is (0,255].
+
+          Corrected string position variable type to match return value of
+          ACE_CString::find(), i.e. ACE_CString::size_type.
+
+        * tao/Object_KeyC.h:
+        * tao/Object_KeyC.cpp (encode_sequence_to_string):
+          (decode_string_to_sequence):
+        * tao/diffs/Object_Key.diff:
+
+          In the decoding case, ensure sequence length value does not
+          exceed maximum value for sequence index type (CORBA::ULong).
+          This is mostly an issue for 64-bit MS Windows builds.
+
+          Corrected types used in explicit casts.
+
+          Improved const-correctness.
+
+          Improved performance.
+
+        * tao/Policy_Set.cpp:
+
+          Verify TAO_Cached_Policy_Type value is greater than zero before
+          using it as an array index.  Addresses Coverity NEGATIVE_RETURNS
+          errors.
+
+        * tao/Queued_Message.h:
+
+          Removed include directive for "ace/Time_Value.h".  A forward
+          declaration will suffice.
+
+        * tao/TAO_Internal.cpp (open_services):
+
+          Addressed warning regarding potential conflict with similarly
+          named variables in different scopes.
+
+        * tao/Transport.cpp (cleanup_queue_i):
+
+          Corrected byte count type to match message length type.
+
+        * tao/orbconf.h (TAO_DEFAULT_ADAPTER_REGISTRY_SIZE):
+        * tao/IORTable/Table_Adapter.cpp (priority):
+
+          Created this new constant, and used it where appropriate.
+
+        * tao/AnyTypeCode/String_TypeCode_Traits.h:
+
+          Initialize CORBA::TypeCode_ptr variables with
+          CORBA::TypeCode_ptr() instead of CORBA::TypeCode::_nil().
+          Addresses Coverity UNUSED_VALUE errors.
+
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+
+          Removed dead/unreachable code.
+
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+
+          Only issue diagnostic message if debugging is enabled by user.
+
+        * tao/RTCORBA/RT_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp:
+
+          Initialize CORBA::Policy_ptr variables with CORBA::Policy_ptr()
+          instead of CORBA::Policy::_nil().  Addresses Coverity
+          UNUSED_VALUE errors.
+
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+          Added missing dynamic_cast<> return value check detected by
+          Coverity, i.e. a Coverity FORWARD_NULL error.
+
+          Initialize CORBA::TypeCode_ptr variables with
+          CORBA::TypeCode_ptr() instead of CORBA::TypeCode::_nil().
+          Addresses Coverity UNUSED_VALUE errors.
+
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+
+          Verify buffer size falls into a valid range instead of just
+          checking for a non-zero value.  Addresses Coverity
+          TAINTED_SCALAR errors.
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+
+          Fixed potential memory leaks.  Addresses Coverity RESOURCE_LEAK
+          errors.
+
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
+
+          Fixed potential dynamic deallocation of a statically
+          instantiated object.
+
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+
+          Explicitly cast return value of "attrs.load()" call to void.  We
+          don't appear to care about it.  Address Coverity CHECKED_RETURN
+          error.
+
+        From Russell Mora
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp (read):
+
+          Fix for coverity flaged REVERSE_INULL problem.  Do not
+          dereference null pointer.
+
+Mon Feb 26 19:30:28 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/IDL_Test/constants.idl:
+
+          Added constants built through various mathematic operations to
+          flush out problems with preprocessors that don't handle negative
+          signs correctly.  This is for bugzilla bug #2821.
+
+Mon Feb 26 17:25:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+
+          Removed persistance options that rely on non-minimum corba.
+
+Mon Feb 26 17:18:20 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
+
+          Added a #include for the octet-sequence specialization.
+
+Mon Feb 26 14:44:07 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Reverted my change (committed by Jeff Parsons on my behalf) from
+          Tue Nov 28 19:32:46 UTC 2006.  While it fixed an issues with the
+          Sun preprocessor (e.g., negative numbers coming out like "- 9"),
+          it causes problems with normal subtraction.  Thanks to Jules
+          Colding <colding at omesc dot com> for reporting this.  This fixes
+          bugzilla bug #2821.
+
+Mon Feb 26 13:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/*.{h,cpp}:
+        * tao/UB_String_Argument_T.{cpp,inl}:
+          Refactored layout using 1.12 version of StyleManager
+
+Mon Feb 26 13:43:45 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+        * tao/ORB.cpp:
+        * tao/ORB_Core.cpp:
+
+          Pass correct buffer length to ACE_OS::snprintf().
+          Thanks to Yves Alloyer <alloyer at ipanematech dot com> for
+          reporting this and providing initial patch. This fixes Bug #2797.
+
+Mon Feb 26 13:43:44 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tests/DiffServ/server.cpp:
+
+          Removed usage of old macros.
+
+Sun Feb 25 21:56:31 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tests/DiffServ/server.cpp:
+
+          Removed ACE_THROW_SPEC in the function definitions and
+          declarations. Helps fix the fuzz build errors.
+
+Sun Feb 25 17:28:52 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tests/DiffServ/run_test.pl:
+
+          Added a regression test script for the DiffServ policy test.
+
+Sun Feb 25 17:09:10 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tests/DiffServ:
+        * tests/DiffServ/client.cpp:
+        * tests/DiffServ/diffserv.mpc:
+        * tests/DiffServ/test.idl:
+        * tests/DiffServ/server.cpp:
+        * tests/DiffServ/README:
+
+          Added a new test for the DiffServ policy.
+
+Sat Feb 24 19:34:08 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * MPC/config/diffservpolicy.mpb:
+
+          Added a MPC project file for the DiffServ policy.
+
+Sat Feb 24 06:56:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+          Use false instead of 0
+
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/PortableServer/Adapter_Activator.cpp:
+          Layout change
+
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/HTTP_Parser.cpp:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/Messaging/Messaging_ORBInitializer.cpp:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+          Removed not needed catch
+
+        * tao/Object.cpp:
+          Fixed _validate_connection
+
+        * tests/Bug_2826_Regression/*:
+          New regression for bug 2826 that is about a problem with
+          validate_connection. Thanks to Steven Xie
+          <steven dot xie at mpathix dot com> for reporting this
+          and making the test program
+
+Thu Feb 22 09:35:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/GSSUP.idl:
+
+          This file includes CSI.idl, but this should be relative to TAO/orbsvcs for
+          end user use.
+
+Thu Feb 22 09:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Bug_1592_Regression/client.cpp:
+          Added this file, missed it in a previous commit
+
+Wed Feb 21 14:47:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Makefile.am:
+          Updated for some changes
+
+        * tao/AnyTypeCode/Any.cpp:
+          Documentation update
+
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Layout changes
+
+Wed Feb 21 14:25:05 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+
+          Added a new set_dscp_codepoint () method.
+
+Wed Feb 21 14:21:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Bug_1592_Regression/*:
+          New test program for bug 1592, not fixed yet.
+
+        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc:
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
+          Simplified
+
+Wed Feb 21 14:15:38 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+
+          Modified the pre_invoke_remote_request () method
+          to add checks specific to the DiffServ policy,
+          to add DiffServ codepoints on the server replies.
+
+Wed Feb 21 12:23:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Bug_2511_Regression/server.cpp:
+          Return the error count, in case of a failure then the test
+          framework will notice this
+
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+          Don't call postinvoke when we don't have a servant. Fixes bugzilla
+          bugs 2511 and 2658. Thanks to Martin Cornelius
+          <Martin dot Cornelius at smiths-heimann dot com> and Milan
+          Cvetkovic <milan dot cvetkovic at mpathix dot com> for reporting
+          this and providing a test case and a proposed fix.
+
+Wed Feb 21 11:42:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1383_Regression/*:
+          Code for this test, not enabled for automatic testing, just
+          integrated this and validated that it just works
+
+Wed Feb 21 10:41:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+          Layout changes
+
+Wed Feb 21 08:28:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/Test.idl:
+          Added another test case
+
+        * tests/Hello/server.cpp:
+          Layout change
+
+Wed Feb 21 08:24:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/Quoter/Simple/Server/index.html:
+          Updated because of throw spec removal
+
+        * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.{h,cpp}:
+        * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.{h,cpp}:
+          Use throw()
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+          Use false instead of 0
+
+        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.{h,cpp}:
+          Make destroyed a real bool
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable.h:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp:
+          Layout change
+
+        * orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/Servant_var.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Servant_var.inl:
+          Use std::swap instead of ACE_Swap
+
+        * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc:
+          Simplified this file
+
+Wed Feb 21 08:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Layout changes
+
+        * Utils/Servant_Var.inl:
+          Use std::swap instead of ACE_Swap
+
+Tue Feb 20 20:59:38 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/TAO_Internal.cpp:
+
+          Removed the process directive for Default Network Priority
+          Protocols Hooks.
+
+        * tao/DiffServPolicy/DiffServPolicy.cpp:
+
+          Added code to set the name of the DiffServ Network
+          Priority Protocols Hooks with the ORB Core. At ORB
+          initialization time, the ORB Core will open a service
+          configurator based on this name, to set the network
+          priority protocols hooks.
+
+        * tao/ORB_Core.cpp:
+
+          Previosuly, during the initializations of the protocols hooks,
+          if the protocols hooks turned out to be 0, a initialization
+          error was thrown. Removed that, because now the protocols
+          hooks could be 0, because we have removed the default
+          implementations.
+
+        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp:
+
+          Check if the returned network priority protocolos hooks
+          from the ORB Core is not 0, before using it.
+
+        * tao/Remote_Invocation.cpp:
+
+          Modified the send_message () to check if DiffServ policy is being
+          used to set the DiffServ codepoints on the requests and replies.
+          This method already has code to check the enable_network_priority
+          flag from the RTCORBA library, to set DiffServ codepoints
+          on the requests and replies. Now, using DiffServ library always
+          takes precedence irrespective if whether the application uses
+          RTCORBA or not.
+
+Tue Feb 20 20:36:12 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/tao.mpc:
+
+          Removed Default_Network_Priority_Protocols_Hooks.{h,cpp}.
+
+Tue Feb 20 20:28:28 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/Default_Network_Priority_Protocols_Hooks.{cpp,h}:
+
+          Removed. The network_priority_protocols_hooks is no
+          longer going to incur virtual call overhead, and instead
+          just remains as a pointer, which is 0 or not. Non-zero
+          instance means, that the DiffServ library is linked in.
+
+Tue Feb 20 20:10:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Default_Protocols_Hooks.{cpp,h}:
+          Removed, instead of just invoking the protocol hooks, just
+          check if the protocol_hook pointer is 0 or not. If non zero
+          then invoke the method
+
+        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp:
+          Added missing include to build with Borland
+
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/Remote_Invocation.cpp:
+        * tao/RTCORBA/RT_Current.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/orbsvcs/orbsvcs/SSLIOP_Connection_Handler.cpp:
+          When invoking the protocol hooks, check if we have a valid pointer.
+          This increases performance and decreases footprint. Fixes bugzilla
+          2823.
+
+        * tao/tao.mpc:
+          Removed Default_Protocols_Hooks.{h,cpp}
+
+        * tao/TAO_Internal.cpp:
+          Removed default protocol hooks
+
+        * tao/Default_Collocation_Resolver.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Layout change
+
+Tue Feb 20 18:35:50 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (ssliop_connect):
+          Call remove_reference() on svc_handler so that we don't leak
+          handles.  Thanks to Ken Sedgwick <ken+5a4 at bonsai dot com> for
+          reporting this and testing the fix.  This fixes bugid 1506.
+
+Tue Feb 20 17:56:25 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * COPYING: Clarified how the COPYING file need to be included with
+          any code released.  Thanks to Scott Mark <sjm at pobox dot com>
+          for helping clarify this.
+
+Tue Feb 20 16:03:13 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+
+          Modified the pre_invoke_remote_request () method to do
+          some processing, specific to the DiffServ library, to add
+          DiffServ codepoints on the replies. The method relegates the
+          processing to a network priority hook, defined on the POA,
+          and specialized by the DiffServ library.
+
+Tue Feb 20 15:10:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp,inl}:
+          Layout changes
+
+Tue Feb 20 13:21:08 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp:
+        * tests/Bug_2809_Regression/server.cpp:
+
+          Deal with conversion from string constant to char*.  Store the
+          string constants in a const char* and then use const_cast<> where
+          necessary.
+
+Tue Feb 20 06:38:34 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.cpp:
+
+          Added a new set_dscp_codepoint () method with a CORBA::Long
+          as an input argument. This function is added as part of the
+          DiffServ policy support.
+
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.h:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.h:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+
+          Concrete protocol implementations of the above defined method.
+
+Tue Feb 20 05:14:39 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/IOP_IOR.pidl:
+
+          Changed the value of the newly added ServiceID (REP_NWPRIORITY)
+          to be among the TAO reserved range.
+
+Mon Feb 19 21:01:10 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/DiffServPolicy/DiffServPolicy.pidl:
+
+          Changed the PolicyType value to use a value from
+          the TAO reserved range.
+
+Mon Feb 19 20:34:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
+          Added install as base project so that the executables to
+          get installed
+
+        * 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/LifeCycle_Service/Makefile.am:
+          Updated because of change above. Fixes bugzilla bug 2813, thanks
+          to Thomas Girard <thomas dot g dot girard at free dot fr>
+          for reporting this.
+
+Mon Feb 19 19:55:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/CDR/allocator.cpp:
+
+          Use a static cast to avoid warnings about converting from
+          ACE_hrtime_t to double.
+
+Mon Feb 19 19:44:59 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1495_Regression/Client_Task.cpp:
+        * tests/Bug_1495_Regression/test_i.cpp:
+        * tests/Bug_2084_Regression/EventNode.cpp:
+        * tests/Bug_2084_Regression/Hello.cpp:
+
+          Use a combination of C-style cast and static_cast<> to avoid
+          warnings from gcc in 64-bit mode.
+
+Mon Feb 19 19:00:24 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Crash_On_Write/run_test.pl:
+
+          Extend the client timeout so that very slow machines can complete
+          the test.
+
+Mon Feb 19 18:59:01 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h:
+
+          Fixed the fuzz build errors.
+
+Mon Feb 19 18:48:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Adapter.cpp:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Transport_Connector.cpp:
+          Layout changes
+
+Mon Feb 19 18:42:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Crash_On_Write/run_test.pl:
+
+          Check for -1 instead of -10 to indicate timeout.
+
+Mon Feb 19 18:41:22 UTC 2007  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tao/Default_Network_Priority_Protocols_Hooks.cpp:
+          Fixed return types in two versions of get_dscp_codepoint().  The
+          return type did not match the header file types.
+
+Mon Feb 19 16:37:26 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp:
+
+          Fixed the RTEMS_NO_NETWORK build errors. The errors were in
+          throwing exceptions in lines 96 and 102.
+
+Mon Feb 19 14:42:08 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/Network_Priority_Protocols_Hooks.h:
+        * tao/Default_Network_Priority_Protocols_Hooks.h:
+        * tao/Default_Network_Priority_Protocols_Hooks.cpp:
+        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.h:
+        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp:
+
+          Modified the signature of get_dscp_codepoint () methods, to get rid
+          of the "type qualifier meaningless" errors in most of the TAO
+          builds.
+
+Mon Feb 19 14:36:33 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/TAO_Internal.cpp:
+
+          Added a process directive to fix the ORB initialization errors.
+
+Mon Feb 19 12:32:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup.idl:
+          Improved doxygen
+
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
+        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
+
+          Layout/const changes
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+          Fixed compile problems when SSLIOP_DEBUG_PEER_CERTIFICATE is
+          enabled
+
+Mon Feb 19 04:42:49 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp:
+
+          Fixed a compilation error.
+
+Fri Feb 16 16:55:51 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/PortableServer/Network_Priority_Hook.h:
+        * tao/PortableServer/Network_Priority_Hook.cpp:
+
+          Added a hook in the POA to make a call on the DiffServ library
+          to do DiffServ policy related processing on the server side
+          of the application. The specialized implementation of the hook
+          is provided by the DiffServ library.
+
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.cpp:
+
+          Added code to initialize the above mentioned hook.
+
+          Added get and set methods for the above mentioned hook.
+
+          Added a get method to return the POA's cached policies.
+
+        * tao/PortableServer/POA_Cached_Policies.h:
+        * tao/PortableServer/POA_Cached_Policies.cpp:
+        * tao/PortableServer/POA_Cached_Policies.inl:
+
+          Added get and set methods for returning DiffServ policy related
+          artifacts. These methods are used in the server side for setting
+          the DiffServ codepoints on the replies.
+
+Fri Feb 16 16:51:38 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.inl:
+
+          Since a new type of protocols hooks was added as part of the
+          TAO DiffServ policy support, the ORB core files are modified to
+          instantiate the new type of protocols hooks, if the application
+          uses the DiffServ library.
+
+          Get and set methods are added to return the new type of protocols
+          hooks.
+
+          Modified the service_context_list () to add DiffServ policy specific
+          service context entry, just like how the method adds RTCORBA policy
+          specific service context entry.
+
+Fri Feb 16 16:50:00 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/tao.mpc:
+
+          Added the new type of protocols hooks files for compilation.
+
+        * tao/DiffServPolicy.mpc:
+
+          Added a mpc file for compiling the DiffServ library.
+
+Fri Feb 16 16:45:30 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/Network_Priority_Protocols_Hooks.h:
+        * tao/Network_Priority_Protocols_Hooks.cpp:
+
+          Added a new type of protocols hook, that is used by the ORB core
+          to add in code to do DiffServ policy specific processing. If an
+          application uses the DiffServ library, then the library provides
+          the specialized hook that needs to be used for adding DiffServ
+          codepoints to requests/replies.
+
+        * tao/Default_Network_Priority_Protocols_Hooks.h:
+        * tao/Default_Network_Priority_Protocols_Hooks.cpp:
+
+          The default implementations of the above mentioned new type
+          of protocols hooks. This implementation is used, in case the
+          application does not use the DiffServ library.
+
+Fri Feb 16 16:43:10 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/orbconf.h:
+
+          Added new TAO_Cached_Policy_Type definitions for the
+          newly added DiffServ policies.
+
+        * tao/IOP_IOR.pidl:
+
+          Added a new service context ServiceId for the DiffServ policy
+          support.
+
+Fri Feb 16 16:35:43 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/DiffServPolicy:
+
+          Checked in TAO support to specify client-side and server-side
+          policies to add DiffServ codepoints to requests and replies. This
+          support is different from the current RTCORBA support for adding
+          DiffServ codepoints, where there is a one-to-one mapping between
+          the RTCORBA thread priorities and the DiffServ codepoints that
+          are added to the IP packets. This support defines policies on the
+          client as well as the server side, to specify the DiffServ codepoints
+          that need to be added to the requests/replies. And the policy
+          can be overridden at the ORB, THREAD, and the OBJECT levels.
+
+Thu Feb 15 15:22:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTPortableServer/RT_Acceptor_Filters.cpp:
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_POA.inl:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.h:
+          Code layout changes and cleanup now we zapped the emulated exception
+          macros
+
+Thu Feb 15 13:23:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Base_Transport_Property.h:
+        * tao/ORB.cpp:
+        * tao/PI/ClientRequestDetails.h:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/Interceptor_List_T.h:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitInfo.h:
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/PI_PolicyFactory.h:
+        * tao/PI/PICurrent.cpp:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PICurrent_Loader.h:
+        * tao/PI/PolicyFactory_Registry.cpp:
+        * tao/PI/PolicyFactory_Registry.h:
+        * tao/PI/ProcessingModePolicy.h:
+        * tao/PI/RequestInfo_Util.cpp:
+        * tao/PI/RequestInfo_Util.h:
+        * tao/PortableServer/DII_Arguments_Converter.h:
+          Layout changes
+
+        * tao/Asynch_Reply_Dispatcher_Base.h
+        * tao/Asynch_Reply_Dispatcher_Base.inl
+        * tao/Utils/Implicit_Deactivator.cpp:
+        * tao/Utils/Implicit_Deactivator.h:
+        * tao/Utils/ORB_Destroyer.cpp:
+        * tao/Utils/ORB_Destroyer.h:
+        * tao/Utils/PolicyList_Destroyer.cpp:
+        * tao/Utils/PolicyList_Destroyer.h:
+        * tao/Utils/Servant_Var.h:
+        * tao/Utils/Servant_Var.inl:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Messaging/AMH_Response_Handler.h:
+          Use empty throw()
+
+Thu Feb 15 13:09:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        * examples/Simple/bank/bank.mpc:
+        * examples/ior_corbaloc/ior_corbaloc.mpc:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc:
+        * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc:
+        * orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
+        * orbsvcs/tests/Notify/Discarding/Discarding.mpc:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc:
+        * performance-tests/Callback/Callback.mpc:
+        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+        * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * tests/ICMG_Any_Bug/Hello.mpc:
+        * tests/OctetSeq/OctetSeq.mpc:
+
+          Re-arranged the generated source files so that they are at the
+          beginning (like MPC would do if it were automatically generating
+          the list of source files).  This is required for template
+          instantiation to work properly for Visual Age 6.0.
+
+        * tests/Bug_1676_Regression/client.cpp:
+        * tests/MT_BiDir/client.cpp:
+
+          Changed "catched" to "caught".
+
+Thu Feb 15 07:46:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2560_Regression/server.cpp:
+          Added missing include
+
+Wed Feb 14 19:20:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2809_Regression/*:
+          New regression test for bug 2809, thanks to Martin Corino
+          for creating the regression
+
+Wed Feb 14 15:19:10 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2709_Regression/client.cpp:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp:
+        * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp:
+
+          Include tao/PI/PI.h to ensure PI library is actually linked into
+          the executable when statically linking on MacOS X Panther.
+
+Wed Feb 14 11:18:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Advanced/ch_8_and_10/client.cpp:
+          Layout changes
+
+        * examples/Advanced/ch_8_and_10/server.cpp:
+          Removed workaround for bug 2611, with the recent changes to the
+          string sequences this is not needed anymore
+
+Wed Feb 14 10:04:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2800_Regression/*:
+          Extended this test so that it runs automatically and does a
+          clean shutdown
+
+Tue Feb 13 19:49:59 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * TAO_IDL/be/be_global.cpp:
+          Added -Gdcps to the usage output
+
+Tue Feb 13 19:50:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/Test.idl:
+        * tests/Any/Recursive/client.cpp:
+          Integrated regression of bug 2804, thanks to Tommy Person
+          <tpe at ida dot liu dot se> for creating the test. No fix
+          yet for this problem.
+
+Tue Feb 13 19:44:49 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
+
+          Removing a stray ';'
+
+Tue Feb 13 14:21:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CodeSets/simple/CodeSets_simple.mpc:
+        * 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/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/IPV6/IPV6_Hello.mpc:
+        * tests/Leader_Followers/Leader_Followers.mpc:
+        * tests/LongUpcalls/LongUpcalls.mpc:
+        * tests/MProfile/MProfile.mpc:
+        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
+        * tests/MProfile_Forwarding/MProfile_Forwarding.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/Nested_Event_Loop/Nested_Event_Loop.mpc:
+        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+        * tests/Objref_Sequence_Test/Objref_Sequence_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:
+        * tests/Ondemand_Write/Ondemand_Write.mpc:
+        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
+        * tests/POA/EndpointPolicy/EndpointPolicy.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/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
+        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
+        * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc:
+        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
+        * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.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:
+        * 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/dtor/dtor.mpc:
+        * tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc:
+        * tests/Smart_Proxies/Policy/SP_Policy.mpc:
+        * tests/Smart_Proxies/Smart_Proxies.mpc:
+        * tests/Stack_Recursion/Stack_Recursion.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:
+          Simplified these mpc files, these all have a custom idl project
+          so the client and server can both have an after on this idl
+          project, the client doesn't need an after on the server
+
+Tue Feb 13 14:09:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
+          Fixed compile error
+
+Tue Feb 13 14:08:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/ami_test_i.cpp:
+          Fixed warning in gcc builds
+
+Tue Feb 13 12:59:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc:
+
+          Re-arranged the generated source files so that they are at the
+          beginning (like MPC would do if it were automatically generating
+          the list of source files).  This is required for template
+          instantiation to work properly for Visual Age 6.0.
+
+        * tests/Server_Connection_Purging/client.cpp:
+
+          Decreased the number of connections from 80 to 55 to support
+          platforms with limited resources.
+
+Tue Feb 13 08:10:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/AMI.mpc:
+        * tests/AMI/ami_test_i.cpp:
+        * tests/AMI/ami_test_i.h:
+        * tests/AMI/client.cpp:
+        * tests/AMI/run_test.pl:
+        * tests/AMI/simple_client.cpp:
+          Extended this test to detect argument corruption when using AMI
+          collocated. This bug is not fixed, just adding a new regression
+
+Tue Feb 13 07:41:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Metrics.idl
+        * orbsvcs/orbsvcs/Metrics/*:
+          Removed, wasn't maintained for years
+
+Mon Feb 12 20:15:22 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+
+          Trying to fix a compiler warning for VxWorks5.5.1_x86_GCC2.96_Exceptions
+          build on DOC group scoreboard.
+
+Mon Feb 12 19:51:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.h:
+        * orbsvcs/orbsvcs/Channel_Clients_T.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h:
+        * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h:
+        * orbsvcs/orbsvcs/IFRService/concrete_classes.h:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Contained_i.h:
+        * orbsvcs/orbsvcs/IFRService/Container_i.h:
+        * orbsvcs/orbsvcs/IFRService/EmitsDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FactoryDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FinderDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FixedDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/IDLType_i.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
+        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Options.h:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
+        * orbsvcs/orbsvcs/IOR_Multicast.h:
+        * orbsvcs/orbsvcs/Naming/Entries.cpp:
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable.inl:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.h:
+        * orbsvcs/orbsvcs/Sched/DynSched.inl:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.h:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.inl:
+        * orbsvcs/orbsvcs/Sched/Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp:
+        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h:
+        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h:
+        * orbsvcs/orbsvcs/Scheduler_Utilities.h:
+        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h:
+          Converted to doxygen style
+
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h:
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl:
+          Use prefix increment/decrement
+
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp:
+          Zapped environment macro code
+
+Mon Feb 12 15:32:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Fixed the TAO 1.5.7 version number.
+
+        * examples/Advanced/ch_3/Advanced_ch_3.mpc:
+        * examples/Buffered_AMI/Buffered_AMI.mpc:
+        * examples/Callback_Quoter/Callback_Quoter.mpc:
+        * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc:
+        * examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc:
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+        * examples/Quoter/Quoter.mpc:
+        * examples/Simple/bank/bank.mpc:
+        * examples/Simple/chat/chat.mpc:
+        * examples/Simple/grid/grid.mpc:
+        * examples/ior_corbaloc/ior_corbaloc.mpc:
+        * orbsvcs/examples/Security/Send_File/Security_Send_File.mpc:
+        * orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc:
+        * orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc:
+        * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc:
+        * orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc:
+        * orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc:
+        * orbsvcs/tests/Notify/Discarding/Discarding.mpc:
+        * orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc:
+        * orbsvcs/tests/Notify/Ordering/Ordering.mpc:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc:
+        * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Latency/DII/DII.mpc:
+        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+        * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * performance-tests/Protocols/Protocols.mpc:
+        * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc:
+        * performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc:
+        * performance-tests/Throughput/Throughput.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+        * tests/Big_Oneways/Big_Oneways.mpc:
+        * tests/Big_Twoways/Big_Twoways.mpc:
+        * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
+        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
+        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
+        * tests/Bug_2188_Regression/broken.mpc:
+        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
+        * tests/Client_Leaks/Client_Leaks.mpc:
+        * tests/File_IO/File_IO.mpc:
+        * tests/Hang_Shutdown/Hang.mpc:
+        * tests/ICMG_Any_Bug/Hello.mpc:
+        * tests/NestedUpcall/Simple/Simple.mpc:
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Simple/OBV_Simple.mpc:
+        * tests/OctetSeq/OctetSeq.mpc:
+        * tests/Oneway_Timeouts/test.mpc:
+        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
+        * tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc:
+        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
+        * tests/Timeout/Timeout.mpc:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/Two_Objects/Two_Objects.mpc:
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
+
+          Re-arranged the generated source files so that they are at the
+          beginning (like MPC would do if it were automatically generating
+          the list of source files).  This is required for template
+          instantiation to work properly for Visual Age 6.0.
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp:
+
+          Added include files to get AnyTypeCode definitions.
+
+        * tao/Fixed_Array_Argument_T.inl:
+
+          Fixed a typo of a type name in a Visual Age 6.0 specific section
+          of a C-style cast.
+
+Mon Feb 12 14:48:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Acceptor_Impl.cpp
+        * tao/AnyTypeCode/append.cpp
+        * tao/AnyTypeCode/skip.cpp
+        * tao/Codeset/Codeset_Descriptor.cpp
+        * tao/Codeset/Codeset_Translator_Factory.cpp
+        * tao/Codeset/Codeset_Translator_Factory_T.cpp
+        * tao/Codeset/UTF16_BOM_Factory.cpp
+        * tao/Codeset/UTF16_BOM_Factory.h
+        * tao/Codeset/UTF8_Latin1_Translator.cpp
+        * tao/Codeset_Translator_Base.cpp
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.h
+        * tao/DynamicInterface/Dynamic_Implementation.h
+        * tao/DynamicInterface/ExceptionList.h
+        * tao/DynamicInterface/Server_Request.h
+        * tao/IORManipulation/IORManip_Loader.h
+        * tao/IORManipulation/IORManipulation.h
+        * tao/RTCORBA/Linear_Network_Priority_Mapping.h
+        * tao/RTCORBA/Linear_Priority_Mapping.h
+        * tao/RTCORBA/Multi_Priority_Mapping.h
+        * tao/RTPortableServer/RTPortableServer.cpp
+        * tao/Strategies/UIOP_Factory.h
+        * tao/Strategies/UIOP_Lite_Factory.h
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+          Converted to doxygen style
+
+Mon Feb 12 13:42:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * interop-tests/*.{h,cpp}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+Mon Feb 12 12:22:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+Mon Feb 12 11:40:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+        * tests/*.mpc:
+          Simplified several mpc files
+
+Mon Feb 12 10:53:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/*.{h,cpp,inl}:
+
+        * MPC/config/naming_serv.mpb:
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+          Removed the avoids ace_for_tao, the naming service will build
+          fine in this configuration
+
+Mon Feb 12 07:27:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Array_Sequence_T.h:
+        * tao/Unbounded_Array_Sequence_T.h:
+          Removed check for nill sequence, is done at a different place in TAO
+          already and resolves the compile errors on the scoreboard
+
+        * orbsvcs/orbsvcs/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+Sun Feb 11 18:58:14 2007  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/DynamicAny/DynUnion_i.cpp:
+
+          (Hopefully) Last change to handle inconsistency between statically declared (IDL
+          compiler) union typecodes and dynamically declared typecodes where
+          the discriminator type is an enum.
+
+Sun Feb 11 12:38:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
+Fri Feb  9 16:45:45 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * MPC/config/portableserver.mpb:
+
+          The portableserver base project now inherits from core_anytypecode
+          instead of anytypecode.  This is to prevent the situation where
+          inheriting from from portablserver causes changes to the IDL compiler
+          options, specifically inclusion of support for Anys and Typecodes.
+          User projects that inherit from portableserver need to also inherit
+          from anytypecode to get the options that generate Anys and Typecodes
+          passed to the IDL compiler.  The assumption is that a significant
+          number of projects inhert from portableserver yet have no interest in
+          the added footprint of Any and Typecode support in generated code.
+
+Thu Feb  8 19:21:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/compiler.html:
+          Removed documentation for -Ge 2, that has been removed
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_interface.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_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/arglist.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/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_visitor_operation/operation.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h:
+          Removed generation of ACE_THROW_SPEC
+
+Thu Feb  8 18:42:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Connection_Handler.h:
+        * tao/Strategies/COIOP_Connection_Handler.h:
+        * tao/Strategies/DIOP_Connection_Handler.h:
+        * tao/Strategies/SCIOP_Connection_Handler.h:
+        * tao/Strategies/UIOP_Connection_Handler.h:
+          Removed not needed forward declaration
+
+        * tao/IIOP_Transport.h:
+          Layout change
+
+Thu Feb  8 18:00:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Base.h:
+        * tao/IIOP_Connection_Handler.h:
+          Layout changes
+
+        * orbsvcs/tests/Bug_2800_Regression/*:
+          New regression test for bugzilla bug 2800 created by
+          Martin Corino
+
+        * orbsvcs/tests/COIOP_Naming_Test/*:
+          New test using COIOP and the naming service together
+
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+          Initialise pointer with 0
+
+Thu Feb  8 16:26:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/ExceptionA.h
+        * tao/AnyTypeCode/TypeCode.cpp
+        * tao/Asynch_Reply_Dispatcher_Base.cpp
+        * tao/DynamicInterface/Context.h
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Invocation.cpp
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp
+        * tao/DynamicInterface/DII_Invocation_Adapter.h
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.h
+        * tao/DynamicInterface/Dynamic_Implementation.cpp
+        * tao/DynamicInterface/Dynamic_Implementation.h
+        * tao/DynamicInterface/ExceptionList.h
+        * tao/DynamicInterface/Server_Request.cpp
+        * tao/DynamicInterface/Server_Request.h
+        * tao/DynamicInterface/Unknown_User_Exception.cpp
+        * tao/DynamicInterface/Unknown_User_Exception.h
+        * tao/Exception.h
+        * tao/GIOP_Message_Base.cpp
+        * tao/GIOP_Message_Lite.cpp
+        * tao/ImR_Client/ImR_Client.cpp
+        * tao/ImR_Client/ServerObject_i.h
+        * tao/Invocation_Adapter.cpp
+        * tao/Messaging/Asynch_Invocation.cpp
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp
+        * tao/Messaging/Asynch_Invocation_Adapter.h
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Muxed_TMS.cpp
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+        * tao/ORB.cpp
+        * tao/PolicyC.cpp
+        * tao/RTCORBA/RTCORBAC.cpp
+        * tao/SystemException.cpp
+        * tao/Tagged_Components.cpp
+        * tao/Tagged_Profile.cpp
+        * tao/WrongTransactionC.cpp
+          Layout changes
+
+Wed Feb  7 23:12:03 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+
+          Changed to use Any_Impl instead of Any to fix memory crash
+          problem since Any_Impl is refcounted. Refer to Bug 2798 or
+          RT 9552 for more info.
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+
+          Repercussion changes are required here.
+
+        * orbsvcs/examples/Notify/Filter/Filter.cpp:
+        * orbsvcs/examples/Notify/Filter/Notify_Filter.mpc:
+
+          Added a new case to test IN operator for the ETCL.
+
+        * orbsvcs/examples/Notify/Subscribe/Subscribe.h:
+        * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp:
+
+          Fixed an incorrect initialization of a sequence object.  Added
+          code to detect consumer receiving not subscribed event.  Thanks
+          to Olli Savia <ops at iki dot fi> for reporting this problem and
+          helping track down the problem.
+
+Wed Feb  7 20:52:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+          Throw a cannotproceed exception on any system exception, not just
+          timeout exceptions, fixes bugzilla bug 2800
+
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+        * orbsvcs/tests/Property/client.cpp
+        * orbsvcs/tests/Redundant_Naming/client.cpp
+        * orbsvcs/tests/RTCosScheduling/client.cpp
+        * orbsvcs/tests/RTCosScheduling/server.cpp
+          Layout change
+
+Wed Feb  7 20:46:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Exception_Test/Client_Task.cpp:
+          Also test the minor code of the exception caught
+
+        * tao/POA/Default_Servant/Default_Servant.cpp:
+          Layout change
+
+Wed Feb  7 20:16:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Alias_TypeCode.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/Collocated_Invocation.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * tao/CSD_Framework/CSD_POA.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.inl:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
+        * tao/ORB.cpp:
+        * tao/Tagged_Components.cpp:
+        * tao/Wait_On_Leader_Follower.h:
+          Layout changes
+
+Wed Feb  7 20:08:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TransportCurrent/lib/Client_ORBInitializer.cpp:
+        * tao/TransportCurrent/lib/Client_ORBInitializer.h:
+        * tao/TransportCurrent/lib/Client_Request_Interceptor.cpp:
+        * tao/TransportCurrent/lib/Client_Request_Interceptor.h:
+        * tao/TransportCurrent/lib/Current_Test_Impl.h:
+        * tao/TransportCurrent/lib/Server_ORBInitializer.cpp:
+        * tao/TransportCurrent/lib/Server_ORBInitializer.h:
+        * tao/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+        * tao/TransportCurrent/lib/Server_Request_Interceptor.h:
+          Use ACE_THROW_SPEC then plain throw
+
+Wed Feb  7 15:31:20 UTC 2007  Vadym Ridosh <vridosh@prismtech.com>
+
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+          This fixes bug 2774
+
+Tue Feb  6 20:14:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/ORB.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+          Layout change
+
+        * tao/String_Const_Sequence_Element_T.h:
+          Const improvements to improve ownership
+
+Tue Feb  6 19:00:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/String_Alloc.cpp:
+          Layout changes
+
+        * tao/String_Sequence_Element_T.h:
+          Added missing out/inout/_retn, this fixes bugzilla bug 2795,
+          thanks to Frank Pilhofer <fp at mc dot com> for reporting this
+
+        * tests/Bug_2792_Regression/client.cpp:
+          Small improvement
+
+        * tests/Bug_2795_Regression/Bug_2795_Regression.mpc:
+        * tests/Bug_2795_Regression/client.cpp:
+        * tests/Bug_2795_Regression/run_test.pl:
+          New test for bug 2795
+
+        * tests/Collocation_Exception_Test/Server_Task.cpp:
+          Initialise pointer with 0
+
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+          No need to pass 0 orb name
+
+        * tests/UNKNOWN_Exception/server.cpp:
+          Layout change
+
+Tue Feb  6 16:33:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Collocated_Invocation.cpp:
+          Added a check that we don't rethrow an user exception that is
+          not in the signature list, if that is the case we throw
+          an unknown. Fixes bugzilla 2064
+
+        * tao/operation_details.cpp
+        * tao/operation_details.h
+        * tao/operation_details.inl
+          Added support to check whether an exception is in the list of
+          exceptions for this operation
+
+        * tao/Invocation_Base.cpp:
+          Some more changes related to removing ACE_THROW_SPEC
+
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Arguments.inl
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+        * tao/Exception.h
+        * tao/GIOP_Message_Generator_Parser_10.cpp
+        * tao/GIOP_Message_State.cpp
+        * tao/GIOP_Message_State.inl
+        * tao/GIOP_Message_Version.inl
+        * tao/Invocation_Endpoint_Selectors.cpp
+        * tao/Invocation_Endpoint_Selectors.h
+        * tao/IOR_Parser.h
+        * tao/IORInterceptor_Adapter.h
+        * tao/IORInterceptor_Adapter_Factory.h
+        * tao/LocateRequest_Invocation.cpp
+        * tao/LocateRequest_Invocation_Adapter.cpp
+        * tao/MCAST_Parser.cpp
+        * tao/Object.cpp
+        * tao/Object_Ref_Table.cpp
+        * tao/Object_Ref_Table.inl
+        * tao/Object_T.cpp
+        * tao/ObjectKey_Table.cpp
+        * tao/RTScheduling/Request_Interceptor.cpp
+        * tao/Strategies/SCIOP_Endpoint.cpp
+        * tao/Strategies/SCIOP_Factory.cpp
+        * tao/Strategies/SCIOP_Transport.cpp
+        * tao/Strategies/SHMIOP_Acceptor.cpp
+        * tao/Strategies/SHMIOP_Transport.cpp
+        * tao/Strategies/SHMIOP_Transport.h
+        * tao/Strategies/UIOP_Transport.cpp
+        * tao/TransportCurrent/Current_ORBInitializer.h
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h
+        * tao/Valuetype/AbstractBase.cpp
+        * tao/Valuetype/ValueBase.cpp
+        * tao/Valuetype/ValueFactory.cpp
+        * tao/Valuetype/ValueFactory_Map.cpp
+          Layout changes
+
+Mon Feb  5 23:30:42 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+
+          Removed the check which lets the class definition for
+          an anonymous sequence be generated only once. If an
+          anonymous sequence is shared as the base type of more
+          than one typedef (as it is in a comma separated list
+          of typedef declarations), it will need to be generated
+          once for each typedef, each generated class having the
+          name of the typedef identifier. In the case of two or
+          more anonymous sequence members of the same base type,
+          the generated #ifdef guard for the class will be the
+          same in each case, and the C++ preprocessor will pass
+          only one.
+
+        * TAO_IDL/ast/ast_decl.cpp(set_name):
+
+          When the scoped name is reset from outside the node,
+          the char* members flat_name, full_name and repoID
+          are now deleted, zeroed, and eventually recomputed
+          (the last happens on demand), similarly to what is
+          already done for the other members local_name and
+          original_local_name.
+
+        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
+
+          Added check for the context state before generating a
+          class declaration for an anonymous sequence member. For
+          valuetypes, this should be done only once, even though
+          the scope is visited twice more in the corresponding
+          OBV_ class, and we can no longer depend on the previous
+          check for anonymous sequences to avoid multiple
+          generation (see the first item in this entry).
+
+Mon Feb  5 20:46:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orbconf.h:
+          Make sure ACE_THROW_SPEC expands to nothing
+
+        * tao/GIOP_Message_Base.cpp:
+          Layout change
+
+Mon Feb  5 20:16:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Collocated_Invocation.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/Invocation_Base.cpp:
+        * tao/Invocation_Base.h:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/ORB.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/TAO_Singleton_Manager.h:
+          Committed on behalf of Ossama Othman. Added needed code to
+          work correctly in case of C++ exceptions without ACE_THROW_SPEC
+          spefication. To make sure this all works we are changing ACE
+          to expand ACE_THROW_SPEC to nothing, when the scoreboard shows
+          no problems we will zap ACE_THROW_SPEC from all source code.
+
+Mon Feb  5 06:20:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynCommon.cpp:
+          Layout changes
+
+Sun Feb  4 19:57:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/String_Const_Sequence_Element_T.h:
+        * tao/String_Sequence_Element_T.h:
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+          Fixed bug 2792, thanks to Frank Pilhofer <fp at mc dot com>
+          for reporting this
+
+        * tao/Bug_2792_Regression/Bug_2792_Regression.mpc:
+        * tao/Bug_2792_Regression/Bug_2792_Regression/client.cpp:
+        * tao/Bug_2792_Regression/Bug_2792_Regression/run_test.pl:
+          New regression test
+
+Sun Feb  4 18:51:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Object.cpp
+        * tao/Object_T.cpp
+        * tao/Object_T.h
+        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+        * tao/PortableServer/LifespanStrategyPersistent.cpp
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/ORT_Adapter.h
+        * tao/PortableServer/POA_Current.cpp
+        * tao/PortableServer/POA_Current_Factory.h
+        * tao/PortableServer/POA_Current_Impl.cpp
+        * tao/PortableServer/POA_Current_Impl.h
+        * tao/PortableServer/POA_Guard.cpp
+        * tao/PortableServer/POA_Guard.h
+        * tao/PortableServer/POA_Policy_Set.cpp
+        * tao/PortableServer/POA_Policy_Set.inl
+        * tao/PortableServer/POAManager.cpp
+        * tao/PortableServer/POAManager.h
+        * tao/PortableServer/POAManager.inl
+        * tao/PortableServer/POAManagerFactory.cpp
+        * tao/PortableServer/POAManagerFactory.h
+        * tao/PortableServer/Regular_POA.cpp
+        * tao/PortableServer/RequestProcessingStrategy.cpp
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.h
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantManager.h
+        * tao/PortableServer/Servant_Base.h
+        * tao/PortableServer/Servant_Dispatcher.h
+        * tao/PortableServer/Servant_Upcall.cpp
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+        * tao/Strategies/advanced_resource.cpp
+        * tao/Strategies/COIOP_Acceptor.cpp
+        * tao/Strategies/COIOP_Connection_Handler.cpp
+        * tao/Strategies/DIOP_Endpoint.cpp
+        * tao/Strategies/SCIOP_Connector.cpp
+        * tao/Strategies/UIOP_Connection_Handler.cpp
+        * tao/TkResource/TkResource_Loader.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.h
+        * tao/TypeCodeFactory/Recursive_TypeCode.inl
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+        * tao/ULongLongSeq.pidl
+        * tao/ULongSeq.pidl
+          Layout and const fixes
+
+Fri Feb  2 18:38:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+          Fixed problem introduced when removing ACE_THROW_RETURN
+
+Fri Feb  2 16:16:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.cpp:
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+        * examples/Load_Balancing/Load_Balancer_i.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * examples/Logging/Logger_i.cpp:
+        * examples/Persistent_Grid/Grid_i.cpp:
+        * examples/POA/Default_Servant/File_i.cpp:
+        * examples/POA/DSI/Database_i.cpp:
+        * examples/POA/Forwarding/Servant_Activator.cpp:
+        * examples/POA/Loader/Servant_Activator.cpp:
+        * examples/POA/Loader/Servant_Locator.cpp:
+        * examples/POA/On_Demand_Activation/Servant_Activator.cpp:
+        * examples/POA/On_Demand_Activation/Servant_Locator.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Activator.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Locator.cpp:
+        * examples/Quoter/Factory_Finder_i.cpp:
+        * examples/Quoter/Generic_Factory_i.cpp:
+        * examples/Quoter/Quoter_i.cpp:
+        * examples/Simple/bank/AccountManager_i.cpp:
+        * examples/Simple/echo/Echo_i.cpp:
+        * examples/Simple/grid/Grid_i.cpp:
+        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
+        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
+        * orbsvcs/examples/ImR/Combined_Service/dynserver.cpp:
+        * orbsvcs/examples/Log/Event/Event_Consumer.cpp:
+        * orbsvcs/examples/Log/Event/Event_Supplier.cpp:
+        * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp:
+        * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp:
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp:
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp:
+        * orbsvcs/ImplRepo_Service/Activator_Loader.cpp:
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Loader.cpp:
+        * orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/LogActivator.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
+        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp:
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Client.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Client.h
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Server.h
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Notify/Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.cpp:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Security/Security_Current.cpp:
+        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+        * orbsvcs/tests/Concurrency/CC_command.cpp:
+        * orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp:
+        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp:
+        * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.h
+        * tao/Synch_Invocation.cpp:
+        * tao/Synch_Queued_Message.cpp:
+        * tao/SystemException.cpp:
+        * tao/SystemException.h
+        * tests/Abstract_Interface/test_i.cpp:
+        * tests/AMI/ami_test_i.cpp:
+        * tests/Bug_2234_Regression/server.cpp:
+        * tests/Client_Leaks/Process_Factory.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp:
+        * tests/File_IO/File_i.cpp:
+        * tests/MProfile_Forwarding/Servant_Locator.cpp:
+        * tests/MT_BiDir/Sender_i.cpp:
+        * tests/OctetSeq/test_i.cpp:
+        * tests/Param_Test/param_test_i.cpp:
+        * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp:
+        * tests/Smart_Proxies/On_Demand/server.cpp:
+        * tests/Smart_Proxies/Policy/server.cpp:
+        * tests/Smart_Proxies/server.cpp:
+        * utils/catior/catior.cpp:
+          Layout changes and replaced ACE_THROW_RETURN with throw
+
+Fri Feb  2 14:07:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Acceptor_Registry.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/NVList.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
+        * tao/Bounded_Array_Sequence_T.h
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/Connector_Registry.cpp:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynAnyUtils_T.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynValue_i.cpp:
+        * tao/DynamicAny/DynValueBox_i.cpp:
+        * tao/DynamicAny/DynValueCommon_i.cpp:
+        * tao/DynamicInterface/Context.cpp:
+        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/DynamicInterface/ExceptionList.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/IORInterceptor/IORInfo.cpp:
+        * tao/IORManipulation/IORManipulation.cpp:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/LocalObject.cpp:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+        * tao/Messaging/Messaging_PolicyFactory.cpp:
+        * tao/Object.cpp:
+        * tao/Object_T.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
+        * tao/operation_details.cpp:
+        * tao/ORB.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/PI_PolicyFactory.cpp:
+        * tao/PI/PolicyFactory_Registry.cpp:
+        * tao/PI/PolicyFactoryC.cpp:
+        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POA_Current.cpp:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/Var_Size_SArgument_T.cpp:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Remote_Invocation.cpp:
+        * tao/Remote_Object_Proxy_Broker.cpp:
+        * tao/RTCORBA/RT_Current.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_Mutex.cpp:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_Policy_i.cpp:
+        * tao/RTCORBA/RT_PolicyFactory.cpp:
+        * tao/RTCORBA/RT_Stub.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/Service_Callbacks.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/Thread_Lane_Resources.cpp:
+        * tao/Transport_Connector.cpp:
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+        * tao/TypeCodeFactory/Recursive_TypeCode.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tao/Unbounded_Array_Sequence_T.h
+        * tao/Utils/RIR_Narrow.cpp:
+        * tao/Valuetype/ValueBase.cpp:
+          Layout changes and replaced ACE_THROW_RETURN with throw
+
+Fri Feb  2 13:32:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORB.h:
+        * tao/ORB_Core.h:
+          Removed CORBA::ORB_init method that accepts a CORBA Environment
+          argument, we don't support emulated exceptions anymore
+
+        * tao/CORBA_methods.h:
+        * tao/Objref_VarOut_T.cpp
+        * tao/TypeCodeFactory_Adapter.h:
+          Updated includes
+
+        * examples/POA/Default_Servant/client.cpp:
+        * examples/POA/Default_Servant/server.cpp:
+        * examples/POA/DSI/server.cpp:
+        * examples/POA/FindPOA/FindPOA.cpp:
+        * examples/POA/Forwarding/client.cpp:
+        * examples/POA/On_Demand_Activation/server.cpp:
+        * examples/POA/RootPOA/RootPOA.cpp:
+        * examples/POA/TIE/client.cpp:
+        * examples/POA/TIE/server.cpp:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp:
+        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
+        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
+        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
+        * orbsvcs/tests/ImplRepo/scale/server_i.cpp:
+        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
+        * performance-tests/Latency/Collocation/Collocated_Test.cpp:
+        * tests/Collocation/Collocation_Tester.cpp:
+        * tests/File_IO/client.cpp:
+        * tests/File_IO/server.cpp:
+        * tests/Multiple_Inheritance/client.cpp:
+        * tests/POA/Identity/Identity.cpp:
+        * tests/Smart_Proxies/Collocation/Coll_Tester.cpp:
+          No need anymore to pass an empty string as orbname
+
+Fri Feb  2 13:10:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/orbsvcs/CosNaming.idl:
+          Doxygen improvements
+
+        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+        * orbsvcs/orbsvcs/CosNaming.idl
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
+        * orbsvcs/tests/Event/Basic/Complex.cpp:
+        * orbsvcs/tests/Event/Basic/Control.cpp:
+        * orbsvcs/tests/Event/Basic/Observer.cpp:
+        * orbsvcs/tests/Event/Basic/Disconnect.cpp:
+        * orbsvcs/tests/Event/Basic/Wildcard.cpp:
+        * orbsvcs/tests/Event/Basic/MT_Disconnect.cpp:
+        * orbsvcs/tests/Event/Basic/Bitmask.cpp:
+        * orbsvcs/tests/Event/Basic/Gateway.cpp:
+        * orbsvcs/tests/Event/Basic/Negation.cpp:
+        * orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp:
+        * orbsvcs/tests/Event/Basic/Random.cpp:
+        * orbsvcs/tests/Event/Basic/Timeout.cpp:
+        * orbsvcs/tests/Event/Performance/Latency.cpp:
+        * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
+        * orbsvcs/tests/Event/lib/Driver.cpp:
+        * orbsvcs/tests/Event/Mcast/Complex/supplier.cpp:
+        * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
+        * orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp:
+        * orbsvcs/tests/Event/Mcast/Simple/supplier.cpp:
+        * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp:
+        * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp:
+        * orbsvcs/tests/Event/UDP/sender.cpp:
+        * orbsvcs/tests/Event/UDP/receiver.cpp:
+        * orbsvcs/tests/ImplRepo/NameService/test.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
+        * orbsvcs/tests/Bug_1395_Regression/client.cpp:
+        * orbsvcs/tests/Bug_1395_Regression/server.cpp:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * orbsvcs/tests/ior_corbaname/server.cpp:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+        * orbsvcs/tests/Miop/McastHello/client.cpp:
+        * orbsvcs/tests/Miop/McastHello/server.cpp:
+        * orbsvcs/tests/Security/Crash_Test/server.cpp:
+        * orbsvcs/tests/Security/Crash_Test/client.cpp:
+        * orbsvcs/tests/Security/Secure_Invocation/server.cpp:
+        * orbsvcs/tests/Security/Secure_Invocation/client.cpp:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp:
+        * orbsvcs/tests/Security/BiDirectional/client.cpp:
+        * orbsvcs/tests/Security/BiDirectional/server.cpp:
+        * orbsvcs/tests/Security/Big_Request/server.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/client.cpp:
+        * orbsvcs/tests/Security/Callback/server.cpp:
+        * orbsvcs/tests/Security/Callback/client.cpp:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+        * orbsvcs/tests/HTIOP/Hello/client.cpp:
+        * orbsvcs/tests/HTIOP/Hello/server.cpp:
+        * orbsvcs/tests/HTIOP/AMI/client.cpp:
+        * orbsvcs/tests/HTIOP/AMI/server.cpp:
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp:
+        * orbsvcs/tests/HTIOP/BiDirectional/client.cpp:
+        * orbsvcs/tests/HTIOP/BiDirectional/server.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Push_Event.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Random.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Disconnect.cpp:
+        * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2615_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/server2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/server.cpp:
+        * orbsvcs/tests/FaultTolerance/IOGR/server.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
+        * orbsvcs/tests/EC_MT_Mcast/MCast.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp:
+        * orbsvcs/examples/Log/Event/Event_Supplier.cpp:
+        * orbsvcs/examples/Log/Event/Event_Consumer.cpp:
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp:
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp:
+        * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp:
+        * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp:
+        * orbsvcs/examples/Security/SecurityLevel1/client.cpp:
+        * orbsvcs/examples/Security/SecurityLevel1/server.cpp:
+        * orbsvcs/examples/Security/Send_File/server.cpp:
+        * orbsvcs/examples/Security/Send_File/client.cpp:
+        * orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp:
+        * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp:
+        * orbsvcs/examples/CosEC/Simple/Service.cpp:
+        * orbsvcs/examples/CosEC/Simple/Supplier.cpp:
+        * orbsvcs/examples/CosEC/Simple/Consumer.cpp:
+        * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp:
+        * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp:
+        * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp:
+        * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp:
+        * orbsvcs/examples/RtEC/Kokyu/Service.cpp:
+        * orbsvcs/examples/RtEC/MCast/MCast.cpp:
+        * orbsvcs/examples/RtEC/Simple/Service.cpp:
+        * orbsvcs/examples/RtEC/Simple/Supplier.cpp:
+        * orbsvcs/examples/RtEC/Simple/Consumer.cpp:
+        * orbsvcs/examples/RtEC/Schedule/Service.cpp:
+        * orbsvcs/examples/LoadBalancing/server.cpp:
+        * orbsvcs/examples/LoadBalancing/client.cpp:
+        * performance-tests/Latency/DSI/client.cpp:
+        * performance-tests/Latency/DSI/server.cpp:
+        * performance-tests/Latency/Deferred/client.cpp:
+        * performance-tests/Latency/Deferred/server.cpp:
+        * performance-tests/Latency/Thread_Pool/client.cpp:
+        * performance-tests/Latency/Thread_Pool/server.cpp:
+        * performance-tests/Latency/Single_Threaded/client.cpp:
+        * performance-tests/Latency/Single_Threaded/server.cpp:
+        * performance-tests/Latency/DII/client.cpp:
+        * performance-tests/Latency/DII/server.cpp:
+        * performance-tests/Latency/AMH_Single_Threaded/client.cpp:
+        * performance-tests/Latency/AMH_Single_Threaded/server.cpp:
+        * performance-tests/Latency/AMI/client.cpp:
+        * performance-tests/Latency/AMI/server.cpp:
+        * performance-tests/Latency/Thread_Per_Connection/client.cpp:
+        * performance-tests/Latency/Thread_Per_Connection/server.cpp:
+        * performance-tests/POA/Create_Reference/create_reference.cpp:
+        * performance-tests/POA/Demux/demux_test_server.cpp:
+        * performance-tests/POA/Demux/demux_test_client.cpp:
+        * performance-tests/POA/Implicit_Activation/client.cpp:
+        * performance-tests/POA/Implicit_Activation/server.cpp:
+        * performance-tests/POA/Implicit_Activation/collocated.cpp:
+        * performance-tests/Protocols/receiver.cpp:
+        * performance-tests/Sequence_Latency/DSI/client.cpp:
+        * performance-tests/Sequence_Latency/DSI/server.cpp:
+        * performance-tests/Sequence_Latency/Deferred/client.cpp:
+        * performance-tests/Sequence_Latency/Deferred/server.cpp:
+        * performance-tests/Sequence_Latency/Thread_Pool/client.cpp:
+        * performance-tests/Sequence_Latency/Thread_Pool/server.cpp:
+        * performance-tests/Sequence_Latency/Single_Threaded/client.cpp:
+        * performance-tests/Sequence_Latency/Single_Threaded/server.cpp:
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+        * performance-tests/Sequence_Latency/DII/server.cpp:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp:
+        * performance-tests/Sequence_Latency/AMI/client.cpp:
+        * performance-tests/Sequence_Latency/AMI/server.cpp:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp:
+        * performance-tests/Memory/Single_Threaded/client.cpp:
+        * performance-tests/Memory/Single_Threaded/server.cpp:
+        * performance-tests/Memory/IORsize/client.cpp:
+        * performance-tests/Memory/IORsize/server.cpp:
+        * performance-tests/Throughput/client.cpp:
+        * performance-tests/Throughput/server.cpp:
+        * performance-tests/Callback/client.cpp:
+        * performance-tests/Callback/server.cpp:
+        * performance-tests/RTCorba/Thread_Pool/client.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp:
+        * tests/Server_Connection_Purging/server.cpp:
+        * tests/Two_Objects/client.cpp:
+        * tests/Two_Objects/server.cpp:
+        * tests/CollocationLockup/CollocationLockup.cpp:
+        * tests/CollocationLockup/SimpleNamingService.cpp:
+        * tests/Bug_1270_Regression/client.cpp:
+        * tests/Bug_1270_Regression/server.cpp:
+        * tests/Bug_1270_Regression/shutdown.cpp:
+        * tests/MT_Timeout/client.cpp:
+        * tests/MT_Timeout/server.cpp:
+        * tests/Parallel_Connect_Strategy/client.cpp:
+        * tests/Parallel_Connect_Strategy/server.cpp:
+        * tests/MT_BiDir/server.cpp:
+        * tests/MT_BiDir/client.cpp:
+        * tests/Oneway_Buffering/server.cpp:
+        * tests/Oneway_Buffering/client.cpp:
+        * tests/Oneway_Buffering/admin.cpp:
+        * tests/Client_Leaks/server.cpp:
+        * tests/Client_Leaks/client.cpp:
+        * tests/Client_Leaks/child.cpp:
+        * tests/Faults/middle.cpp:
+        * tests/Faults/pong.cpp:
+        * tests/Faults/server.cpp:
+        * tests/Faults/client.cpp:
+        * tests/Faults/ping.cpp:
+        * tests/Big_Twoways/server.cpp:
+        * tests/Big_Twoways/client.cpp:
+        * tests/Stack_Recursion/client.cpp:
+        * tests/Stack_Recursion/server.cpp:
+        * tests/AMH_Exceptions/client.cpp:
+        * tests/Muxing/client.cpp:
+        * tests/Muxing/server.cpp:
+        * tests/Server_Leaks/client.cpp:
+        * tests/Server_Leaks/server.cpp:
+        * tests/Bug_2702_Regression/client.cpp:
+        * tests/AMH_Oneway/client.cpp:
+        * tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/server.cpp:
+        * tests/Muxed_GIOP_Versions/client.cpp:
+        * tests/Muxed_GIOP_Versions/server.cpp:
+        * tests/AMI_Buffering/server.cpp:
+        * tests/AMI_Buffering/client.cpp:
+        * tests/AMI_Buffering/admin.cpp:
+        * tests/DSI_Gateway/client.cpp:
+        * tests/DSI_Gateway/gateway.cpp:
+        * tests/DSI_Gateway/server.cpp:
+        * tests/Big_Request_Muxing/client.cpp:
+        * tests/Big_Request_Muxing/server.cpp:
+        * tests/Bug_2669_Regression/client.cpp:
+        * tests/Connection_Timeout/client.cpp:
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/server.cpp:
+        * tests/Server_Port_Zero/server.cpp:
+        * tests/MProfile/client.cpp:
+        * tests/MProfile/server.cpp:
+        * tests/Bug_1020_Regression/server.cpp:
+        * tests/Bug_1020_Regression/client.cpp:
+        * tests/IPV6/client.cpp:
+        * tests/IPV6/server.cpp:
+        * tests/Bug_2503_Regression/common.cpp:
+        * tests/Timeout/client.cpp:
+        * tests/Timeout/server.cpp:
+        * tests/Bug_1551_Regression/client.cpp:
+        * tests/Bug_1551_Regression/server.cpp:
+        * tests/Servant_To_Reference_Test/server.cpp:
+        * tests/Hello/client.cpp:
+        * tests/Hello/server.cpp:
+        * tests/Connection_Failure/client.cpp:
+        * tests/Connect_Strategy_Test/client.cpp:
+        * tests/Connect_Strategy_Test/server.cpp:
+        * tests/Big_Reply/client.cpp:
+        * tests/Big_Reply/server.cpp:
+        * tests/MT_Client/server.cpp:
+        * tests/MT_Client/orb_creation.cpp:
+        * tests/MT_Client/client.cpp:
+        * tests/Typedef_String_Array/client.cpp:
+        * tests/Typedef_String_Array/server.cpp:
+        * tests/Crashed_Callback/client.cpp:
+        * tests/Crashed_Callback/server.cpp:
+        * tests/Big_AMI/client.cpp:
+        * tests/Big_AMI/server.cpp:
+        * tests/OctetSeq/server.cpp:
+        * tests/OctetSeq/client.cpp:
+        * tests/Bug_1635_Regression/client.cpp:
+        * tests/Exposed_Policies/Policy_Tester.cpp:
+        * tests/Exposed_Policies/Policy_Verifier.cpp:
+        * tests/Bug_1568_Regression/client.cpp:
+        * tests/Bug_1568_Regression/server.cpp:
+        * tests/BiDirectional_DelayedUpcall/client.cpp:
+        * tests/BiDirectional_DelayedUpcall/server.cpp:
+        * tests/Blocking_Sync_None/client.cpp:
+        * tests/Blocking_Sync_None/server.cpp:
+        * tests/Crash_On_Write/client.cpp:
+        * tests/Crash_On_Write/server.cpp:
+        * tests/MT_Server/client.cpp:
+        * tests/MT_Server/server.cpp:
+        * tests/Policies/Manipulation.cpp:
+        * tests/BiDirectional/client.cpp:
+        * tests/BiDirectional/server.cpp:
+        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp:
+        * tests/Strategies/client.cpp:
+        * tests/Strategies/server.cpp:
+        * tests/Bug_1020_Basic_Regression/client.cpp:
+        * tests/Bug_1020_Basic_Regression/server.cpp:
+        * tests/LongUpcalls/ami_client.cpp:
+        * tests/LongUpcalls/blocking_server.cpp:
+        * tests/LongUpcalls/blocking_client.cpp:
+        * tests/LongUpcalls/ami_server.cpp:
+        * tests/Bug_1361_Regression/server.cpp:
+        * tests/Bug_1361_Regression/shutdown.cpp:
+        * tests/Bug_1361_Regression/client.cpp:
+        * tests/Bug_1254_Regression/client.cpp:
+        * tests/Bug_1254_Regression/server.cpp:
+        * tests/Connection_Purging/server.cpp:
+        * tests/Connection_Purging/client.cpp:
+        * tests/Bug_1670_Regression/client.cpp:
+        * tests/Bug_1670_Regression/server.cpp:
+        * tests/Bug_1482_Regression/client.cpp:
+        * tests/Bug_1482_Regression/server.cpp:
+        * tests/CallbackTest/client.cpp:
+        * tests/CallbackTest/server.cpp:
+        * tests/Bug_1476_Regression/client.cpp:
+        * tests/Bug_1476_Regression/server.cpp:
+        * tests/MProfile_Forwarding/client.cpp:
+        * tests/MProfile_Forwarding/server.cpp:
+        * tests/FL_Cube/client.cpp:
+        * tests/FL_Cube/server.cpp:
+        * tests/AMI_Timeouts/client.cpp:
+        * tests/AMI_Timeouts/server.cpp:
+        * tests/Compression/server.cpp:
+        * tests/Bug_2595_Regression/client.cpp:
+        * tests/Bug_2595_Regression/server.cpp:
+        * tests/Big_Oneways/server.cpp:
+        * tests/Big_Oneways/client.cpp:
+        * tests/Portable_Interceptors/Dynamic/server.cpp:
+        * tests/Portable_Interceptors/Dynamic/client.cpp:
+        * tests/Portable_Interceptors/Bug_2510_Regression/server.cpp:
+        * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp:
+        * tests/Portable_Interceptors/Benchmark/server.cpp:
+        * tests/Portable_Interceptors/Benchmark/client.cpp:
+        * tests/Portable_Interceptors/Bug_2088/client.cpp:
+        * tests/Portable_Interceptors/Register_Initial_References/server.cpp:
+        * tests/Portable_Interceptors/Bug_1559/server.cpp:
+        * tests/Portable_Interceptors/Bug_1559/client.cpp:
+        * tests/Portable_Interceptors/AMI/server.cpp:
+        * tests/Portable_Interceptors/AMI/client.cpp:
+        * tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp:
+        * tests/No_Server_MT_Connect_Test/client.cpp:
+        * tests/No_Server_MT_Connect_Test/server.cpp:
+        * tests/Bug_1330_Regression/client.cpp:
+        * tests/Bug_1330_Regression/server.cpp:
+        * tests/Bug_2134_Regression/Hello.cpp:
+        * tests/Bug_2417_Regression/client.cpp:
+        * tests/Bug_2417_Regression/server.cpp:
+        * tests/Bug_2174_Regression/client.cpp:
+        * tests/Bug_2174_Regression/server.cpp:
+        * tests/Cache_Growth_Test/client.cpp:
+        * tests/Cache_Growth_Test/server.cpp:
+        * tests/Bug_1627_Regression/client.cpp:
+        * tests/Bug_1627_Regression/server.cpp:
+        * tests/Bug_2188_Regression/client.cpp:
+        * tests/Bug_2188_Regression/server.cpp:
+        * tests/Bug_2289_Regression/client.cpp:
+        * tests/Bug_2289_Regression/server.cpp:
+        * tests/AMI/server.cpp:
+        * tests/AMI/client.cpp:
+        * tests/AMI/simple_client.cpp:
+        * tests/POA/Deactivate_Object/server.cpp:
+        * tests/POA/EndpointPolicy/client.cpp:
+        * tests/POA/Reference_Counting/test.cpp:
+        * tests/ICMG_Any_Bug/client.cpp:
+        * tests/ICMG_Any_Bug/server.cpp:
+        * tests/Optimized_Connection/oc_client.cpp:
+        * tests/Xt_Stopwatch/server.cpp:
+        * tests/Xt_Stopwatch/client.cpp:
+        * tests/Bug_2183_Regression/client.cpp:
+        * tests/Bug_2183_Regression/server.cpp:
+        * tests/Bug_2654_Regression/server.cpp:
+        * tests/Bug_2593_Regression/client.cpp:
+        * tests/Bug_2593_Regression/server.cpp:
+        * tests/Bug_1676_Regression/client.cpp:
+        * tests/Bug_1676_Regression/server.cpp:
+        * tests/MProfile_Connection_Timeout/client.cpp:
+        * tests/MProfile_Connection_Timeout/server.cpp:
+        * tests/Nested_Upcall_Crash/client.cpp:
+        * tests/Nested_Upcall_Crash/server.cpp:
+        * tests/Nested_Upcall_Crash/scavenger.cpp:
+        * tests/GIOP_Fragments/PMB_With_Fragments/server.cpp:
+        * tests/GIOP_Fragments/Java_Big_Request/server.cpp:
+        * tests/GIOP_Fragments/Java_Big_Reply/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+        * tests/Reliable_Oneways/client.cpp:
+        * tests/Reliable_Oneways/server.cpp:
+        * tests/OBV/Supports/client.cpp:
+        * tests/OBV/Supports/server.cpp:
+        * tests/OBV/Forward/client.cpp:
+        * tests/OBV/Forward/server.cpp:
+        * tests/OBV/Truncatable/client.cpp:
+        * tests/OBV/Truncatable/server.cpp:
+        * tests/OBV/ValueBox/client.cpp:
+        * tests/OBV/ValueBox/server.cpp:
+        * tests/OBV/Any/client.cpp:
+        * tests/OBV/Any/server.cpp:
+        * tests/OBV/Factory/client.cpp:
+        * tests/OBV/Factory/server.cpp:
+        * tests/Oneways_Invoking_Twoways/server.cpp:
+        * tests/Oneways_Invoking_Twoways/client.cpp:
+        * tests/Native_Exceptions/client.cpp:
+        * tests/Native_Exceptions/server.cpp:
+        * tests/Bug_2328_Regression/client.cpp:
+        * tests/Bug_2328_Regression/server.cpp:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp:
+        * tests/RTCORBA/Client_Propagated/client.cpp:
+        * tests/RTCORBA/Client_Propagated/server.cpp:
+        * tests/RTCORBA/Server_Protocol/server.cpp:
+        * tests/RTCORBA/Server_Protocol/client.cpp:
+        * tests/RTCORBA/Private_Connection/client.cpp:
+        * tests/RTCORBA/Private_Connection/server.cpp:
+        * tests/RTCORBA/Server_Declared/client.cpp:
+        * tests/RTCORBA/Server_Declared/server.cpp:
+        * tests/RTCORBA/Client_Protocol/client.cpp:
+        * tests/RTCORBA/Client_Protocol/server.cpp:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp:
+        * tests/RTCORBA/Thread_Pool/client.cpp:
+        * tests/RTCORBA/Dynamic_Thread_Pool/client.cpp:
+        * tests/RTCORBA/Diffserv/client.cpp:
+        * tests/RTCORBA/Diffserv/server.cpp:
+        * tests/RTCORBA/RTMutex/server.cpp:
+        * tests/RTCORBA/Explicit_Binding/client.cpp:
+        * tests/RTCORBA/Explicit_Binding/server.cpp:
+        * tests/Bug_2186_Regression/client.cpp:
+        * tests/Bug_2186_Regression/server.cpp:
+        * tests/Bug_1269_Regression/client.cpp:
+        * tests/Bug_1269_Regression/server.cpp:
+        * tests/Bug_1269_Regression/shutdown.cpp:
+        * tests/Ondemand_Write/client.cpp:
+        * tests/Ondemand_Write/server.cpp:
+        * tests/Forwarding/client.cpp:
+        * tests/Forwarding/server.cpp:
+        * tests/BiDirectional_NestedUpcall/client.cpp:
+        * tests/BiDirectional_NestedUpcall/server.cpp:
+        * tests/ORB_shutdown/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
+        * examples/AMI/FL_Callback/progress.cpp:
+        * examples/AMI/FL_Callback/peer.cpp:
+        * examples/PluggableUDP/tests/Basic/client.cpp:
+        * examples/PluggableUDP/tests/Basic/server.cpp:
+          No need anymore to pass an empty string as orbname
+
+Thu Feb  1 22:47:04 UTC 2007  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+
+          Replaced htonl, htons, ntohl, and ntohs with the appropriate
+          ACE_XTOYZ macro (ACE_HTONL, for example).  QNX doesn't have htonl and
+          friends without adding extra #includes.
+
+Thu Feb  1 18:08:03 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/ast_typedef.h:
+        * TAO_IDL/ast/ast_typedef.cpp:
+
+          Added mutator for the boolean owns_base_type_ member
+          so it can be managed from outside the class. This
+          member is false by default, but if the base type is
+          an anonymous sequence or array, the constructor sets
+          it to true.
+
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+
+          When there is a comma-separated list of typedef declarations,
+          the list iteration calls the new method above after the
+          first loop and sets the member to false. This call has no
+          effect except when the base type is an anonymouse sequence
+          or array, in which case we want to prevent the shared base
+          type node from being destroyed more than once. Thanks to
+          Will Otte <wotte at dre dot vanderbilt dot edu> and Dipa Suri
+          <dipa dot suri at lmco dot com> for supplying the IDL that
+          uncovered this bug.
+
+        * TAO_IDL/util/utl_decllist.cpp:
+
+          Cosmetic changes.
+
+        * tests/IDL_Test/typedef.idl:
+
+          Added test case for the above bug.
+
+Thu Feb  1 15:43:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Thread_Pool.cpp:
+          Layout changes
+
+Thu Feb  1 14:37:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Default_Stub_Factory.cpp:
+        * tao/Default_Stub_Factory.h:
+        * tao/ORB_Core.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/Upcall_Command.h:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/Stub.cpp:
+          Layout changes
+
+Wed Jan 31 22:49:14 2007  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/DynamicAny/DynUnion_i.cpp:
+
+          Changed to handle inconsistency between statically declared (IDL
+          compiler) union typecodes and dynamically declared typecodes where
+          the discriminator type is an enum.
+          With statically declared typecodes the label values are stored as
+          actual enum values while with dynamically stored typecodes these
+          label values are stored as ULong.
+
+Wed Jan 31 19:00:44 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/LongDouble:
+        * tests/LongDouble/Global.h:
+        * tests/LongDouble/Global.cpp:
+        * tests/LongDouble/LongDoubleTest.h:
+        * tests/LongDouble/LongDoubleTest.cpp:
+        * tests/LongDouble/LongDoubleTest.mpc:
+        * tests/LongDouble/Test.idl:
+        * tests/LongDouble/client.cpp:
+        * tests/LongDouble/run_test.pl:
+        * tests/LongDouble/server.cpp:
+
+          Added a test that sends a CORBA::LongDouble from server to client
+          to ensure that ACE and TAO correctly handles them.
+
+Wed Jan 31 17:23:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_ACE.mwc:
+
+          Exclude $(ACE_ROOT)/protocols/tests and
+          Exclude $(ACE_ROOT)/protocols/examples.  They should not be built
+          as part of this workspace.
+
+Wed Jan 31 15:00:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+          Layout improvements for the generated code now we don't generate
+          emulated exception macros
+
+Wed Jan 31 14:44:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+          Layout improvements for the generated code now we don't generate
+          emulated exception macros
+
+Tue Jan 30 12:37:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/Compression_Manager.{h,cpp}:
+          Fixed layout and warnings in single threaded build
+
+Tue Jan 30 12:03:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/Compressor_Factory.{h,cpp}:
+          Fixed layout and warnings in single threaded build
+
+Tue Jan 30 11:14:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+          Fixed argument not used warning
+
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Fixed_TypeCode.cpp:
+        * tao/AnyTypeCode/Fixed_TypeCode.h:
+        * tao/AnyTypeCode/Marshal.h:
+        * tao/AnyTypeCode/Objref_TypeCode.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/ORB.cpp:
+          Layout changes
+
+Tue Jan 30 10:52:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/COIOP/COIOP_Simple_Test.cpp:
+          New simplified COIOP test
+
+        * tests/COIOP/COIOP_Test.cpp:
+          Added advanced_resource.h include to force static
+          link
+
+        * tests/COIOP/COIOP_Tests.mpc:
+          Add custom project for the IDL files and added the
+          new simple test
+
+        * tests/COIOP/Server_Task.cpp:
+          Initialise pointer with 0
+
+        * tests/COIOP/run_test.pl:
+        * tests/Collocation_Tests/run_test.pl:
+          Fixed bug in these two perl script, last test case was not
+          unique
+
+Tue Jan 30 09:33:14 2007  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/DynamicAny/DynUnion_i.cpp:
+
+          Fixed broken DynUnion support (see Bug #2785).
+
+Tue Jan 30 01:16:13 2007  James H. Hill     <hillj@isis.vanderbilt.edu>
+
+        * tao/Utils/Servant_Var.inl:
+
+          Fixed syntax error in catch (...) statements that was
+          prevent TAO from building in some cases.
+
+Mon Jan 29 19:27:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+          Removed not needed return statements after ACE_THROW_RETURN, fixes
+          warnings with HP aCC on IA64
+
+Mon Jan 29 19:11:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Adapter_Registry.cpp:
+        * tao/AnyTypeCode/Any.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_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/PolicyA.cpp:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/WrongTransactionA.cpp:
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/Codeset/Codeset_Manager_Factory.cpp:
+        * tao/Codeset/Codeset_Translator_Factory.cpp:
+        * tao/Collocated_Invocation.cpp:
+        * tao/CORBANAME_Parser.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.inl
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/DynamicInterface/DII_Arguments.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/FILE_Parser.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Lite.h:
+        * tao/HTTP_Parser.cpp:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/Invocation_Base.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/IORTable/IOR_Table_Impl.h:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/Leader_Follower_Flushing_Strategy.cpp:
+        * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Event.cpp:
+        * tao/LF_Event.h:
+        * tao/LF_Event_Binder.h:
+        * tao/LF_Follower_Auto_Adder.h:
+        * tao/LF_Strategy_Complete.h:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/Messaging/Messaging_ORBInitializer.cpp:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+        * tao/MProfile.cpp:
+        * tao/Muxed_TMS.cpp:
+        * tao/Null_Fragmentation_Strategy.cpp:
+        * tao/Null_Fragmentation_Strategy.h:
+        * tao/NVList_Adapter.h:
+        * tao/Object.cpp:
+        * tao/Object.h:
+        * tao/Object_T.cpp:
+        * tao/ObjectKey_Table.cpp:
+        * tao/ObjectKey_Table.h:
+        * tao/Objref_VarOut_T.h:
+        * tao/operation_details.cpp:
+        * tao/ORB.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.inl
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORBInitializer_Registry.h:
+        * tao/ORBInitializer_Registry_Adapter.h:
+        * tao/Parser_Registry.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+        * tao/Pluggable_Messaging.h:
+        * tao/Pluggable_Messaging_Utils.inl
+        * tao/Policy_Current_Impl.cpp:
+        * tao/Policy_Current_Impl.h:
+        * tao/Policy_Current_Impl.inl
+        * tao/Policy_Manager.cpp:
+        * tao/Policy_Manager.h:
+        * tao/Policy_Manager.inl
+        * tao/Policy_Set.cpp:
+        * tao/Policy_Set.h:
+        * tao/Policy_Validator.cpp:
+        * tao/Policy_Validator.h:
+        * tao/PolicyFactory_Registry_Adapter.h:
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+        * tao/PortableServer/Local_Servant_Base.cpp:
+        * tao/PortableServer/Local_Servant_Base.h:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/Profile.cpp:
+        * tao/Reactive_Connect_Strategy.cpp:
+        * tao/Reactive_Flushing_Strategy.cpp:
+        * tao/Remote_Invocation.cpp:
+        * tao/Remote_Invocation.h:
+        * tao/RTCORBA/RT_Current.h:
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_ORB_Loader.h:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.cpp:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/RT_Stub.h:
+        * tao/RTCORBA/RT_Stub_Factory.h:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTCORBA/Thread_Pool.h:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/Service_Callbacks.cpp:
+        * tao/Service_Context.h:
+        * tao/Strategies/advanced_resource.h:
+        * tao/Strategies/COIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Factory.cpp:
+        * tao/Strategies/UIOP_Lite_Factory.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.h:
+        * tao/TAO_Server_Request.cpp:
+        * tao/TAO_Server_Request.h:
+        * tao/Transport_Queueing_Strategies.cpp:
+        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/TransportCurrent/Current_Loader.cpp:
+        * tao/TransportCurrent/Current_ORBInitializer.cpp:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+        * tao/Utils/ORB_Manager.cpp:
+        * tao/Utils/Servant_Var.inl
+        * tao/Utils/Server_Main.cpp:
+        * tao/Valuetype/AbstractBase_T.cpp:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/Wait_Strategy.h:
+          Layout changes, const improvements and some cleanup of old code
+          that is not needed anymore now we removed emulated exceptions
+
 Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * TAO version 1.5.6 released.
diff --git a/TAO/MPC/config/diffservpolicy.mpb b/TAO/MPC/config/diffservpolicy.mpb
new file mode 100644
index 00000000000..23bc3fce24f
--- /dev/null
+++ b/TAO/MPC/config/diffservpolicy.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : taolib, portableserver, pi, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after   += DiffServPolicy
+  libs    += TAO_DiffServPolicy
+}
diff --git a/TAO/MPC/config/naming_serv.mpb b/TAO/MPC/config/naming_serv.mpb
index 7b1e8caf783..2c89a3d8380 100644
--- a/TAO/MPC/config/naming_serv.mpb
+++ b/TAO/MPC/config/naming_serv.mpb
@@ -2,7 +2,6 @@
 // $Id$
 
 project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils {
-  avoids    += ace_for_tao        // Requires MMAP_Memory_Pool
   after     += CosNaming_Serv
   libs      += TAO_CosNaming_Serv
 }
diff --git a/TAO/MPC/config/portableserver.mpb b/TAO/MPC/config/portableserver.mpb
index 2fc99e7a876..e671d0016fb 100644
--- a/TAO/MPC/config/portableserver.mpb
+++ b/TAO/MPC/config/portableserver.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib, anytypecode {
+project : taolib_with_idl, core_anytypecode {
   after   += PortableServer
   libs    += TAO_PortableServer
 }
diff --git a/TAO/MPC/config/tao_vc8warnings.mpb b/TAO/MPC/config/tao_vc8warnings.mpb
new file mode 100644
index 00000000000..30ded5376ac
--- /dev/null
+++ b/TAO/MPC/config/tao_vc8warnings.mpb
@@ -0,0 +1,35 @@
+// -*- MPC -*-
+// $Id$
+
+// This file contains optional features that disable VC8 warnings that were
+// not present in earlier versions. Some people may consider these superfluous
+// or have already checked code to be sure it causes no trouble. So these
+// warnings are disabled by default. To enable them, generate your projects
+// with the feature set to 0.
+
+feature(vc8_avoid_dominance_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4250
+  }
+  specific(nmake) {
+    compile_flags += /wd4250
+  }
+}
+
+feature(!vc8_stl_deprecated_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4996
+  }
+  specific(nmake) {
+    compile_flags += /wd4996
+  }
+}
+
+feature(vc8_avoid_unimpl_exception_spec_warnings) {
+  specific(vc8) {
+    DisableSpecificWarnings += 4290
+  }
+  specific(nmake) {
+    compile_flags += /wd4290
+  }
+}
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index 481150f68c2..bdfac6286fc 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : exceptions {
+project : exceptions, tao_vc8warnings {
   staticflags += TAO_AS_STATIC_LIBS
   includes    += $(TAO_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/TAO/NEWS b/TAO/NEWS
index 7a3a4d84d9e..535feb8bea5 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -6,14 +6,36 @@ 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.7"
+. (Remedy) Add ZIOP support
+
+PLANNED CHANGES FOR "TAO-1.5.7"
 ===============================
 
-. (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.
-. (Remedy) Add ZIOP support
+USER VISIBLE CHANGES BETWEEN TAO-1.5.6 and TAO-1.5.7
+====================================================
+
+. Removed ACE_THROW_RETURN.
+
+. Fixed a memory crash problem when using ETCL IN operator with
+  Notify Service filter.
+
+. Remove exception specifications from ORB mediated operations (C++
+  mapping requirement)
+
+. New diffserv library to specify diffserv priorities
+  independent of RTCORBA
+
+. Addressed Coverity errors in core TAO libraries, TAO_IDL compiler,
+  stubs and skeletons generated by TAO_IDL and the TAO Notification
+  Service.
+
+. Extended current DynamicInterface to allow DII+AMI+DSI+AMH.
+  (Thanks to OMC <www.omesc.com> for the sponsorship.)
+
+. Fixed bug in IDL compiler code generation for a comma-separated list of
+  sequence typedefs.
+
+. TAO no longer sets the unexpected exception handler.
 
 USER VISIBLE CHANGES BETWEEN TAO-1.5.5 and TAO-1.5.6
 ====================================================
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 9a16027b1f5..c2e46e3c1b4 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.6
-    ACE VERSION: 5.5.6
+    TAO VERSION: 1.5.7
+    ACE VERSION: 5.5.7
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/Release b/TAO/Release
index 744d1e015b6..5e802654836 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -24,6 +24,7 @@ CONTROLLED_FILES = \
         TAO/TAO_*.mwc \
 	TAO/TAO_IDL \
 	TAO/VERSION \
+        TAO/bin \
 	TAO/configure.ac \
 	TAO/docs \
 	TAO/examples \
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index eb9425bc1c7..929e5235d91 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -219,21 +219,42 @@ href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p>
     <H4>Modifying the default location for the IDL compiler</H4>
 
     <P>By default TAO assumes that the IDL compiler is located in:
-      <CODE>$TAO_ROOT/bin/tao_idl</CODE> and that the GPERF tool
+      <CODE>$ACE_ROOT/bin/tao_idl</CODE> and that the GPERF tool
       is located in <CODE>$ACE_ROOT/bin/gperf</CODE>, this is fine for
       hosted builds, but not for cross-compilation.
       Unfortunately there is no good default for cross-compilation
       builds because different sites choose a different location for
       their tools.
     </P>
-    <P>You can override the default values by adding several new lines in your
-      platform_macros.GNU file assuming $(HOST_ROOT) is set to the location
-      of your host build where you have build gperf and tao_idl, as follows:
+    <P>
+      The location of the IDL compiler is set when the makefiles (whether
+      GNU, Visual Studio projects, or any other type) are generated using
+      MPC. If you are using GNU make for the target build, you can follow the
+      procedure below with no further steps. If, however, you are using
+      Visual Studio for the target build, you must generate the Visual Studio
+      projects with a specification of where the hosted IDL compiler is. One
+      common way to do this is to use the MPC <code>-value_template</code>
+      option to specify the path to the IDL compiler, either using a
+      fully specified path or an environment variable. For example, to specify
+      the location with the <code>HOST_TAO_IDL</code> environment variable,
+      generate your projects with the MPC command line option
+      <code>-value_template tao_idl=$(HOST_TAO_IDL)</code>. Then before
+      running Visual Studio to cross-build for the target, be sure that the
+      <code>HOST_TAO_IDL</code> environment variable is set to the location
+      of the host-built IDL compiler. Note that if the host-built IDL compiler
+      requires a PATH setting different from what's set in the Visual Studio
+      environment, you must set the PATH environment variable and specify the
+      <code>/USEENV</code> option to devenv.
+    </P>
+    <P>If your builds are using GNU make, you can override the default values
+      by adding several lines to your <code>platform_macros.GNU</code> file.
+      Assuming $(HOST_ROOT) is set to the location of your host build where
+      you previously built gperf and tao_idl, you can change the target
+      build by adding the following lines:
 <PRE>
-$ echo 'TAO_IDL := $(HOST_ROOT)/bin/tao_idl' \
-$ echo 'TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf' \
-$ echo 'TAO_IDL_DEP := $(HOST_ROOT)/bin/tao_idl$(EXEEXT)' \
-     >> platform_macros.GNU
+TAO_IDL := $(HOST_ROOT)/bin/tao_idl
+TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
+TAO_IDL_DEP := $(HOST_ROOT)/bin/tao_idl$(EXEEXT)
 </PRE>
 
     <P>Obviously you must first build the tools for the host platform,
diff --git a/TAO/TAO_ACE.mwc b/TAO/TAO_ACE.mwc
index ea79df75604..5a66093eb26 100644
--- a/TAO/TAO_ACE.mwc
+++ b/TAO/TAO_ACE.mwc
@@ -14,6 +14,8 @@ workspace {
   utils
   orbsvcs
   exclude {
+    $(ACE_ROOT)/protocols/tests
+    $(ACE_ROOT)/protocols/examples
     orbsvcs/tests
     orbsvcs/performance-tests
     orbsvcs/examples
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index 2ff7bad52cd..451611ad0bf 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -302,10 +302,10 @@ AST_Constant::enum_full_name (void)
 {
   if (this->pd_et == AST_Expression::EV_enum)
     {
-      UTL_Scope *s = this->defined_in ();
-      AST_Decl *d = s->lookup_by_name (this->pd_constant_value->n (),
-                                       1);
-      return (ScopeAsDecl (d->defined_in ()))->name ();
+      UTL_Scope * const s = this->defined_in ();
+      AST_Decl  * const d = s->lookup_by_name (this->pd_constant_value->n (),
+                                               1);
+      return (d ? (ScopeAsDecl (d->defined_in ()))->name () : 0);
     }
   else
     {
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index b1ed63db3e6..e42735dff0c 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -861,7 +861,7 @@ AST_Decl::full_name (void)
 {
   if (this->full_name_ == 0)
     {
-      compute_full_name ();
+      this->compute_full_name ();
     }
 
   return this->full_name_;
@@ -1274,6 +1274,16 @@ AST_Decl::set_name (UTL_ScopedName *n)
         }
 
       this->original_local_name (n->last_component ());
+
+      // These will be recomputed on demand.
+      delete [] this->flat_name_;
+      this->flat_name_ = 0;
+
+      delete [] this->full_name_;
+      this->full_name_ = 0;
+
+      delete [] this->repoID_;
+      this->repoID_ = 0;
     }
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index b1b290cd6d5..c7696d4abb9 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -278,7 +278,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 
       t1->set_name (sn);
     }
-
+      
   // Already defined and cannot be redefined? Or already used?
   if ((d = this->lookup_for_add (t, false)) != 0)
     {
@@ -316,6 +316,9 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
                            false,
                            t->local_name ());
 
+  if (t1 == 0)
+    return 0;  // Prevent dereferencing null pointer in nested calls.
+
   // Add it to enclosing scope.
   idl_global->scopes ().next_to_top ()->fe_add_enum_val (t1);
 
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 2591325814a..164a806a9a5 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -3038,7 +3038,10 @@ AST_Expression::dump (ACE_OSTREAM_TYPE &o)
       break;
     // Unevaluated symbol.
     case EC_symbol:
-      this->pd_n->dump (o);
+      if (this->pd_n)
+        this->pd_n->dump (o);
+      else
+        o << ACE_TEXT ("(nil symbolic name)");
       break;
     case EC_none:
       break;
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 1a36324cc4a..9805b45940d 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -174,6 +174,7 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
   if (nt != AST_Decl::NT_struct
       && nt != AST_Decl::NT_union
+      && nt != AST_Decl::NT_valuetype
       && nt != AST_Decl::NT_sequence)
     {
       return false;
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index e5f83a1c0b8..41452119f62 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -695,7 +695,7 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
 
               fd->redefine (i);
               AST_StructureFwd *fwd = fd->fwd_decl ();
-              
+
               if (0 != fwd)
                 {
                   // So the fwd decl won't destroy us at cleanup time.
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 515bebb07be..f5ca665d442 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -103,7 +103,7 @@ AST_Typedef::AST_Typedef (AST_Type *bt,
     owns_base_type_ (false)
 {
   AST_Decl::NodeType nt = bt->node_type ();
-  
+
   if (AST_Decl::NT_array == nt || AST_Decl::NT_sequence == nt)
     {
       this->owns_base_type_ = true;
@@ -151,6 +151,12 @@ AST_Typedef::is_local (void)
   return this->pd_base_type->is_local ();
 }
 
+void
+AST_Typedef::owns_base_type (bool val)
+{
+  this->owns_base_type_ = val;
+}
+
 // Dump this AST_Typedef node to the ostream o.
 void
 AST_Typedef::dump (ACE_OSTREAM_TYPE&o)
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 459525d98b3..f3bba8945d5 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -73,6 +73,91 @@ AST_ValueType::~AST_ValueType (void)
 {
 }
 
+bool
+AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
+{
+  // We should calculate this only once. If it has already been
+  // done, just return it.
+  if (this->in_recursion_ != -1)
+    {
+      return this->in_recursion_;
+    }
+
+  list.enqueue_tail (this);
+
+  for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
+       !si.is_done ();
+       si.next())
+    {
+      AST_Decl *d = si.item ();
+
+      if (!d)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_valuetype::in_recursion - "
+                             "bad node in this scope\n"),
+                            0);
+        }
+
+      AST_Field *field = AST_Field::narrow_from_decl (d);
+
+      if (field == 0)
+        {
+          continue;
+        }
+
+      AST_Type *type = field->field_type ();
+
+      // A valuetype may contain itself as a member. This will not
+      // cause a problem when checking if the valuetype itself is
+      // recursive, but if another valuetype contains a recursive
+      // one, the string compare below is not sufficient, and we
+      // will go into an infinite recursion of calls to in_recursion ;-).
+      // The check below will catch that use case.
+      if (this == type)
+        {
+          this->in_recursion_ = 1;
+          idl_global->recursive_type_seen_ = true;
+          return this->in_recursion_;
+        }
+
+      if (type == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_valuetype::in_recursion - "
+                             "bad base type\n"),
+                            0);
+        }
+
+      // IDL doesn't have such a feature as name reuse so
+      // just compare fully qualified names.
+      if (this->match_names (this, list))
+        {
+          this->in_recursion_ = 1;
+          idl_global->recursive_type_seen_ = true;
+          return this->in_recursion_;
+        }
+
+      if (type->node_type () == AST_Decl::NT_typedef)
+        {
+          AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+          type = td->primitive_base_type ();
+        }
+
+      // Now hand over to our field type.
+      if (type->in_recursion (list))
+        {
+          this->in_recursion_ = 1;
+          idl_global->recursive_type_seen_ = true;
+          return this->in_recursion_;
+        }
+
+    } // end of for loop
+
+  this->in_recursion_ = 0;
+  return this->in_recursion_;
+}
+
 void
 AST_ValueType::redefine (AST_Interface *from)
 {
@@ -271,7 +356,7 @@ AST_ValueType::destroy (void)
   delete [] this->pd_supports;
   this->pd_supports = 0;
   this->pd_n_supports = 0;
-  
+
   this->AST_Interface::destroy ();
 }
 
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index ad32663ab16..3856bc4bcdb 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -77,11 +77,6 @@ be_attribute::be_attribute (bool ro,
            be_operation_default_strategy (0));
   this->set_strategy_ = bods;
 
-  // TAO_IDL generated attribute methods currently have an exception
-  // specification containing CORBA::SystemException.  Make sure we
-  // generate a "tao/SystemException.h" include directive.
-  idl_global->operation_seen_ = true;
-
   if (!this->imported () && !this->is_local ())
     {
       // For the return types of the two operations
@@ -147,14 +142,14 @@ be_attribute::destroy (void)
       delete this->get_strategy_;
       this->get_strategy_ = 0;
     }
-  
+
   if (0 != this->set_strategy_)
     {
       this->set_strategy_->destroy ();
       delete this->set_strategy_;
       this->set_strategy_ = 0;
     }
-  
+
   this->be_decl::destroy ();
   this->AST_Attribute::destroy ();
 }
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index d18af7c1b1b..720f4c52c4d 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -463,7 +463,7 @@ TAO_CodeGen::start_server_header (const char *fname)
       // String'ifying the name.
       UTL_String idl_name_str (idl_name);
 
-      const char* server_hdr =
+      char const * const server_hdr =
         BE_GlobalData::be_get_server_hdr (&idl_name_str, 1);
 
       idl_name_str.destroy ();
@@ -897,7 +897,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
               ACE_CString final_hdr = "tao/AnyTypeCode/";
               ACE_CString::size_type pos = work_hdr.rfind ('/');
 
-              if (pos != ACE_SString::npos)
+              if (pos != ACE_CString::npos)
                 {
                   ACE_CString scope (work_hdr.substr (0, pos - 1));
 
@@ -909,7 +909,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
                   // Only .pidl files in $TAO_ROOT/tao itself have
                   // their generated *A.* files moved to the AnyTypeCode
                   // library.
-                  if (scope.find ('/') == ACE_SString::npos)
+                  if (scope.find ('/') == ACE_CString::npos)
                     {
                       work_hdr = work_hdr.substr (pos + 1);
                       final_hdr += work_hdr;
@@ -1243,7 +1243,11 @@ TAO_CodeGen::end_server_inline (void)
 int
 TAO_CodeGen::end_implementation_header (const char *fname)
 {
-  char macro_name [NAMEBUFSIZE] = { 0 };
+  if (fname == 0)
+    {
+      // Bad file name.
+      return -1;
+    }
 
   const char *suffix = ACE_OS::strrchr (fname, '.');
 
@@ -1251,17 +1255,11 @@ TAO_CodeGen::end_implementation_header (const char *fname)
     {
       // File seems to have no extension, so let us take the name
       // as it is.
-      if (fname == 0)
-        {
-          // Bad file name.
-          return -1;
-        }
-      else
-        {
-          suffix = fname;
-        }
+      suffix = fname;
     }
 
+  char macro_name [NAMEBUFSIZE] = { 0 };
+
   // Convert letters in fname to upper case.
   for (int i = 0; i < (suffix - fname); ++i)
     {
@@ -1627,6 +1625,15 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   this->gen_standard_include (this->client_header_,
                               "tao/Basic_Types.h");
 
+  // May need ORB_Constants if users check SystemException minor
+  // codes.
+  this->gen_cond_file_include (
+      idl_global->operation_seen_ || idl_global->valuefactory_seen_
+         || idl_global->valuebase_seen_,
+      "tao/ORB_Constants.h",
+      this->client_header_
+    );
+
   // Conditionally included.
 
   // DDS/DCPS marshaling.
@@ -1696,10 +1703,10 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     {
       for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j)
         {
-          char* idl_name = idl_global->included_idl_files ()[j];
+          char * const idl_name = idl_global->included_idl_files ()[j];
 
           ACE_CString pidl_checker (idl_name);
-          bool got_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
@@ -1709,7 +1716,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
               // Make a String out of it.
               UTL_String idl_name_str = idl_name;
 
-              const char *anyop_hdr =
+              char const * const anyop_hdr =
                 BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
 
               idl_name_str.destroy ();
@@ -1718,9 +1725,9 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
               ACE_CString final_hdr = "tao/AnyTypeCode/";
-              ACE_CString::size_type pos = work_hdr.rfind ('/');
+              ACE_CString::size_type const pos = work_hdr.rfind ('/');
 
-              if (pos != ACE_SString::npos)
+              if (pos != ACE_CString::npos)
                 {
                   ACE_CString scope (work_hdr.substr (0, pos));
 
@@ -1732,7 +1739,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                   // Only .pidl files in $TAO_ROOT/tao itself have
                   // their generated *A.* files moved to the AnyTypeCode
                   // library.
-                  if (scope.find ('/') == ACE_SString::npos)
+                  if (scope.find ('/') == ACE_CString::npos)
                     {
                       work_hdr = work_hdr.substr (pos + 1);
                       final_hdr += work_hdr;
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index f930a198fd7..42689b51ad0 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -186,7 +186,7 @@ be_decl::compute_full_name  (const char *prefix,
   else
     {
       // Get scope name.
-      be_decl *parent =
+      be_decl * const parent =
         be_scope::narrow_from_scope (this->defined_in ())->decl ();
 
       if (parent == 0)
@@ -195,6 +195,8 @@ be_decl::compute_full_name  (const char *prefix,
                       "(%N:%l) be_decl::"
                       "compute_full_name - "
                       "scope name is nil\n"));
+
+          return;
         }
 
       // Parent name.
@@ -251,7 +253,7 @@ be_decl::compute_flat_name  (const char *prefix,
   else
     {
       // Get scope name.
-      be_decl *parent =
+      be_decl * const parent =
         be_scope::narrow_from_scope (this->defined_in ())->decl ();
       if (parent == 0)
         {
@@ -259,6 +261,8 @@ be_decl::compute_flat_name  (const char *prefix,
                       "(%N:%l) be_decl::"
                       "compute_flat_name - "
                       "scope name is nil\n"));
+
+          return;
         }
 
       // Parent name.
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index e6f1b26e4ba..7018ad84b65 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -83,7 +83,6 @@ BE_GlobalData::BE_GlobalData (void)
     gen_assign_op_ (false),
     gen_thru_poa_collocation_ (true), // Default is thru_poa.
     gen_direct_collocation_ (false),
-    use_raw_throw_ (false),
     opt_tc_ (false),
     ami_call_back_ (false),
     gen_amh_classes_ (false),
@@ -1025,18 +1024,6 @@ BE_GlobalData::gen_direct_collocation (void) const
 }
 
 void
-BE_GlobalData::use_raw_throw (bool val)
-{
-  this->use_raw_throw_ = val;
-}
-
-bool
-BE_GlobalData::use_raw_throw (void) const
-{
-  return this->use_raw_throw_;
-}
-
-void
 BE_GlobalData::opt_tc (bool val)
 {
   this->opt_tc_ = val;
@@ -1784,7 +1771,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == '\0')
           {
             idl_global->append_idl_flag (av[i + 1]);
-            ACE_CString tmp (av[i + 1], 0, 0);
+            ACE_CString tmp (av[i + 1], 0, false);
 #if defined (ACE_WIN32)
             // WIN32's CreateProcess needs the full executable name
             // when the gperf path is modified, but not for the default
@@ -1951,15 +1938,6 @@ BE_GlobalData::parse_args (long &i, char **av)
             // Any operators into a separate set of files.
             be_global->gen_anyop_files (true);
           }
-        else if (av[i][2] == 'e')
-          {
-            idl_global->append_idl_flag (av[i + 1]);
-            int option = ACE_OS::atoi (av[i + 1]);
-
-            // Use of raw 'throw'.
-            be_global->use_raw_throw (option == 2);
-            ++i;
-          }
         else if (av[i][2] == 's')
           {
             if (av[i][3] == 'p')
@@ -2019,7 +1997,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 if (av[i][4] == 'p' && av[i][5] =='s' && '\0' == av[i][6])
                   {
-                    // DDS DCSP type support.
+                    // DDS DCPS type support.
                     be_global->gen_dcps_type_support (true);
                   }
                 else
@@ -2554,8 +2532,7 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Ge 2\t\t\tUse raw throw instead of ACE_THROW macro")
-      ACE_TEXT (" (disabled by default)\n")
+      ACE_TEXT (" -Gdcps \t\tGenerate code supporting DDS DCPS type definitions.\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index e8fd08e7155..af58c09bf28 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -480,10 +480,11 @@ be_interface::redefine (AST_Interface *from)
 void
 be_interface::gen_def_ctors (TAO_OutStream *os)
 {
-  (void) this->traverse_inheritance_graph (
-      be_interface::gen_def_ctors_helper,
-      os
-    );
+  if (this->traverse_inheritance_graph (be_interface::gen_def_ctors_helper,
+                                        os) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "(%N:%l) be_interface::gen_def_ctors "
+                "error inheritance graph\n"));
 }
 
 
@@ -1287,7 +1288,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
                                         AST_Decl *d,
                                         const char *prefix,
                                         bool /* direct */,
-                                        UTL_ExceptList *list,
+                                        UTL_ExceptList *,
                                         TAO_OutStream *os)
 {
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
@@ -1301,10 +1302,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
       << be_idt << be_idt_nl
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
-      << "int num_args" << be_uidt_nl
-      << ")";
-
-  be_interface::gen_throw_spec (list, os);
+      << "int num_args)" << be_uidt_nl;
 
   *os << be_uidt_nl
       << "{" << be_idt_nl
@@ -1313,11 +1311,9 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
       << be_idt << be_idt_nl
       << "servant," << be_nl
       << "args," << be_nl
-      << "num_args" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "num_args);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}"<< be_nl;
-
-
 }
 
 void
@@ -2151,8 +2147,6 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
       return 0;
     }
 
-  UTL_ExceptList *list = 0;
-
   for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
        !si.is_done ();
        si.next ())
@@ -2171,12 +2165,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
               << "int num_args" << be_uidt_nl
-              << ")";
-
-          list = be_operation::narrow_from_decl (d)->exceptions ();
-          be_interface::gen_throw_spec (list, os);
-
-          *os << ";";
+              << ");";
         }
       else if (d->node_type () == AST_Decl::NT_attr)
         {
@@ -2193,12 +2182,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
               << "int num_args" << be_uidt_nl
-              << ")";
-
-          list = attr->get_get_exceptions ();
-          be_interface::gen_throw_spec (list, os);
-
-          *os << ";";
+              << ");";
 
           if (!attr->readonly ())
             {
@@ -2212,12 +2196,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
                   << "TAO_Abstract_ServantBase *servant, " << be_nl
                   << "TAO::Argument ** args," << be_nl
                   << "int num_args" << be_uidt_nl
-                  << ")";
-
-              list = attr->get_set_exceptions ();
-              be_interface::gen_throw_spec (list, os);
-
-              *os << ";";
+                  << ");";
             }
         }
     }
@@ -2422,35 +2401,6 @@ be_interface::gen_abstract_init_helper (be_interface *node,
 }
 
 void
-be_interface::gen_throw_spec (UTL_ExceptList *list,
-                              TAO_OutStream *os)
-{
-  const char *throw_spec_open = "throw (";
-  const char *throw_spec_close = ")";
-
-  if (!be_global->use_raw_throw ())
-    {
-      throw_spec_open = "ACE_THROW_SPEC ((";
-      throw_spec_close = "))";
-    }
-
-  *os << be_nl << throw_spec_open;
-  *os << be_idt_nl << "::CORBA::SystemException";
-
-  // Initialize an iterator to iterate thru the exception list.
-  for (UTL_ExceptlistActiveIterator ei (list);
-       !ei.is_done ();
-       ei.next ())
-    {
-      *os << "," << be_nl
-          << "::" << ei.item ()->name ();
-    }
-
-  *os << be_uidt_nl
-      << throw_spec_close << be_uidt;
-}
-
-void
 be_interface::destroy (void)
 {
   // We know that it cannot be 0, but..
diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp
index 29894b7e2ae..a6752990e64 100644
--- a/TAO/TAO_IDL/be/be_interface_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp
@@ -74,6 +74,11 @@ be_interface_strategy::compute_coll_names (int type,
       this->cached_type_ = type;
       delete [] this->full_coll_name_;
       delete [] this->local_coll_name_;
+
+      // Reset to zero in case allocations below fail, and cause
+      // premature return to caller.
+      this->full_coll_name_ = 0;
+      this->local_coll_name_ = 0;
     }
 
   static const char *collocated_names[] = {"_tao_thru_poa_collocated_",
@@ -641,7 +646,7 @@ be_interface_default_strategy::flat_server_scope (void)
 
   size_t offset = ACE_OS::strlen (name);
   size_t length = ACE_OS::strlen (full_name) - offset;
-  ACE_NEW_RETURN (this->flat_client_scope_,
+  ACE_NEW_RETURN (this->flat_server_scope_,
                   char[length + 1],
                   0);
 
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index fb8131c0c32..a5ed3dcf72e 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -304,6 +304,13 @@ be_sequence::managed_type (void)
 
       bt = be_type::narrow_from_decl (this->base_type ());
 
+      if (!bt)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "TAO_IDL (%N:%l) "
+                           "be_type::narrow_from_decl "
+                           "failed\n"),
+                          be_sequence::MNG_UNKNOWN);
+
       if (bt->node_type () == AST_Decl::NT_typedef)
         {
           // Get the primitive base type of this typedef node.
@@ -339,8 +346,16 @@ be_sequence::managed_type (void)
             break;
           case AST_Decl::NT_pre_defined:
             {
-              be_predefined_type *bpd =
+              be_predefined_type * const bpd =
                 be_predefined_type::narrow_from_decl (prim_type);
+
+              if (!bt)
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "TAO_IDL (%N:%l) "
+                                   "be_predefined_type::narrow_from_decl "
+                                   "failed\n"),
+                                  be_sequence::MNG_UNKNOWN);
+
               AST_PredefinedType::PredefinedType pt = bpd->pt ();
 
               switch (pt)
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 7d23e07703d..88793203862 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -26,6 +26,7 @@
 #include "be_extern.h"
 
 #include "ast_union_branch.h"
+#include "ast_enum.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
 #include "global_extern.h"
@@ -124,7 +125,7 @@ be_union::destroy (void)
   this->be_scope::destroy ();
   this->be_type::destroy ();
   this->AST_Union::destroy ();
-  
+
 }
 
 // Visitor method.
@@ -146,9 +147,26 @@ be_union::gen_empty_default_label (void)
   AST_ConcreteType *disc = this->disc_type ();
   AST_Decl::NodeType nt = disc->node_type ();
 
+  unsigned long n_labels = this->nlabels ();
+
   if (nt == AST_Decl::NT_enum)
     {
-      return true;
+      AST_Enum *ast_enum = AST_Enum::narrow_from_decl (disc);
+      if (ast_enum == 0)
+        {
+          return true;
+        }
+
+      // If we have an enum and the number of labels if as big as the enum
+      // has members we don't have to generate a default label
+      if (n_labels == (unsigned long)ast_enum->member_count ())
+        {
+           return false;
+        }
+      else
+        {
+          return true;
+        }
     }
 
   AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc);
@@ -158,8 +176,6 @@ be_union::gen_empty_default_label (void)
       return true;
     }
 
-  unsigned long n_labels = this->nlabels ();
-
   if (pdt->pt () == AST_PredefinedType::PT_boolean && n_labels == 2)
     {
       return false;
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 6ee774cc817..f97c9cf3f37 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -658,84 +658,6 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
 }
 
 bool
-be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
-{
-  list.enqueue_tail (this);
-
-  for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next())
-    {
-      AST_Decl *d = si.item ();
-
-      if (!d)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_valuetype::in_recursion - "
-                             "bad node in this scope\n"),
-                            0);
-        }
-
-      AST_Field *field = AST_Field::narrow_from_decl (d);
-
-      if (!field)
-        {
-          continue;
-        }
-
-      AST_Type *type = field->field_type ();
-
-      // A valuetype may contain itself as a member. This will not
-      // cause a problem when checking if the valuetype itself is
-      // recursive, but if another valuetype contains a recursive
-      // one, the string compare below is not sufficient, and we
-      // will go into an infinite recursion of calls to in_recursion ;-).
-      // The check below will catch that use case.
-      if (this == type)
-        {
-          this->in_recursion_ = 1;
-          idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
-        }
-
-      if (!type)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_valuetype::in_recursion - "
-                             "bad base type\n"),
-                            0);
-        }
-
-      // IDL doesn't have such a feature as name reuse so
-      // just compare fully qualified names.
-      if (this->match_names (this, list))
-        {
-          this->in_recursion_ = 1;
-          idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
-        }
-
-      if (type->node_type () == AST_Decl::NT_typedef)
-        {
-          AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
-          type = td->primitive_base_type ();
-        }
-
-      // Now hand over to our field type.
-      if (type->in_recursion (list))
-        {
-          this->in_recursion_ = 1;
-          idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
-        }
-
-    } // end of for loop
-
-  this->in_recursion_ = 0;
-  return this->in_recursion_;
-}
-
-bool
 be_valuetype::supports_abstract (void) const
 {
   return this->supports_abstract_;
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..a51955b96ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -153,8 +153,14 @@ be_visitor_amh_pre_proc::create_response_handler (
   class_name += node->local_name ();
   class_name += "ResponseHandler";
 
-  UTL_ScopedName *amh_name =
+  UTL_ScopedName * const amh_name =
     dynamic_cast<UTL_ScopedName*> (node->name ()->copy ());
+
+  if (!amh_name)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "be_visitor_amh_pre_proc::create_response_handler"
+                       " - Scope downcast failed.\n"),
+                      0);
   Identifier *local_name = amh_name->last_component ();
   local_name->replace_string (class_name.c_str ());
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 90d84dd5a39..efa5b83f276 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -46,7 +46,6 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   // Retrieve the type.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
 
   if (!bt)
     {
@@ -57,6 +56,8 @@ int be_visitor_array_ch::visit_array (be_array *node)
                         -1);
     }
 
+  AST_Decl::NodeType nt = bt->node_type ();
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
                << "// " __FILE__ << ":" << __LINE__;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index 821748d1328..3fd6280cded 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -44,7 +44,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   // If we contain an anonymous sequence, generate code for it here.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
 
   if (!bt)
     {
@@ -55,6 +54,8 @@ int be_visitor_array_ci::visit_array (be_array *node)
                         -1);
     }
 
+  AST_Decl::NodeType nt = bt->node_type ();
+
   if (nt == AST_Decl::NT_sequence)
     {
       if (this->gen_anonymous_base_type (bt,
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..0b97bca2fdb 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
@@ -59,7 +59,6 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
 
   // Retrieve the base type.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
 
   if (!bt)
     {
@@ -70,6 +69,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
                         -1);
     }
 
+  AST_Decl::NodeType nt = bt->node_type ();
+
   // If we contain an anonymous sequence,
   // generate code for the sequence here.
 
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..9fff70e75a4 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
@@ -60,7 +60,6 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
 
   // Retrieve the base type.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
 
   if (!bt)
     {
@@ -70,6 +69,8 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
                          "Bad base type\n"),
                         -1);
     }
+  
+  AST_Decl::NodeType nt = bt->node_type ();
 
   // If we contain an anonymous sequence,
   // generate code for the sequence here.
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index a1268a29bec..cc1c23e6aeb 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -951,7 +951,7 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
   push_op->set_name (op_full_name);
   ACE_CString arg_string ("the_",
                           0,
-                          0);
+                          false);
   arg_string += node->local_name ();
   Identifier arg_id (arg_string.fast_rep ());
   UTL_ScopedName arg_name (&arg_id,
@@ -1843,7 +1843,7 @@ be_visitor_ccm_pre_proc::create_scoped_name (const char *prefix,
 {
   ACE_CString local_string (prefix,
                             0,
-                            0);
+                            false);
   local_string += local_name;
   local_string += suffix;
   Identifier *local_id = 0;
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..e3291848913 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -194,8 +194,8 @@ be_visitor_component_sh::visit_component (be_component *node)
   *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
-      << ");" << be_uidt_nl << be_nl;
+      << "void *servant_upcall);" << be_uidt
+      << be_uidt_nl << be_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
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..c1f5ced2ea5 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
@@ -73,7 +73,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << "this->value_->_tao_decode (cdr);" << be_uidt_nl
           << "}" << be_uidt_nl
-          << "catch ( ::CORBA::Exception &)"
+          << "catch (const ::CORBA::Exception &)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index ce9d86f8d83..8632f973afc 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -76,7 +76,15 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
     {
       be_visitor_context new_ctx (*this->ctx_);
       be_visitor_cdr_op_field_decl field_decl (&new_ctx);
-      field_decl.visit_scope (node);
+
+      if (field_decl.visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception_cdr_op_cs::"
+                             "visit_exception - "
+                             "codegen for field decl scope failed\n"), 
+                            -1);
+        }        
 
       // some members
       *os << "// First marshal the repository ID." << be_nl
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..dbc90dd7d4d 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -325,26 +325,30 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
         be_field::narrow_from_decl (this->ctx_->node ());
       node->field_node (member_node);
 
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-
-      // First generate the sequence declaration.
-      be_visitor_sequence_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
+      // This was already generated in the corresponding valuetype class.
+      if (this->ctx_->state () != TAO_CodeGen::TAO_VALUETYPE_OBV_CH)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"),
-                            -1);
+          be_visitor_context ctx (*this->ctx_);
+          ctx.node (node);
+
+          // First generate the sequence declaration.
+          be_visitor_sequence_ch visitor (&ctx);
+
+          if (node->accept (&visitor) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                "(%N:%l) be_visitor_field_ch::"
+                                "visit_sequence - "
+                                "codegen failed\n"),
+                                -1);
+            }
         }
 
       // 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)
         {
           // Generate the anonymous sequence member typedef.
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..03c6a69d249 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -76,7 +76,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << "TAO_Stub *stub = this->_create_stub ();" << be_nl << be_nl;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
-      << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
+      << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl
       << be_nl
       << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl
       << "stub->servant_orb_var ()->orb_core ()->"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index fe23f84f78c..88b1d1db183 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -149,39 +149,36 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
       // emit  nested variation of any operators
       *os << be_nl << be_nl
-          << "// Copying insertion." << be_nl
+          << "/// Copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr _tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl
           << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
           << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      *os << "// Non-copying insertion." << be_nl
+      *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr *_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*_tao_elem)" << be_uidt
+          << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "::CORBA::Boolean" << be_nl
           << "operator>>= (" << be_idt << be_idt_nl
           << "const ::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr &_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr &_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::extract ("
@@ -189,8 +186,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt << be_uidt_nl
+          << "_tao_elem)" << be_uidt << be_uidt
+          << be_uidt << be_uidt_nl
           << "}";
 
       be_util::gen_nested_namespace_end (os, module);
@@ -200,41 +197,38 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << be_nl << be_nl
-      << "// Copying insertion." << be_nl
+      << "/// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr _tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
       << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
       << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "*_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "*_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr &_tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::extract ("
@@ -242,9 +236,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}";
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
+      << "}" << be_nl;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 468e5c56e06..79a828435b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -69,8 +69,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->full_name () << "_ptr _tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->full_name () << "_ptr _tao_objref)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract ())
@@ -95,8 +95,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
-      << node->full_name () << "_ptr &_tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr &_tao_objref)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract ())
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..180aa049fa7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -219,16 +219,8 @@ 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
-          << "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
-          << "ACE_THROW_SPEC ((" << be_idt_nl
-          << "::CORBA::SystemException," << be_nl
-          << "::Components::CCMException" << be_uidt_nl
-          << "));" << be_uidt_nl << be_nl;
+          << "virtual void ciao_preactivate (void);" << be_nl
+          << "virtual void ciao_postactivate (void);" << be_nl;
     }
 
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
@@ -304,8 +296,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           *os << "// Concrete non-local interface only." << be_nl
               << node->local_name () << " (" << be_idt << be_idt_nl
               << "IOP::IOR *ior," << be_nl
-              << "TAO_ORB_Core *orb_core = 0" << be_uidt_nl
-              << ");" << be_uidt_nl << be_nl;
+              << "TAO_ORB_Core *orb_core = 0);" << be_uidt
+              << be_uidt_nl << be_nl;
         }
 
       *os << "// Non-local interface only." << be_nl
@@ -313,8 +305,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << "TAO_Stub *objref," << be_nl
           << "::CORBA::Boolean _tao_collocated = false," << be_nl
           << "TAO_Abstract_ServantBase *servant = 0," <<  be_nl
-          << "TAO_ORB_Core *orb_core = 0" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
+          << "TAO_ORB_Core *orb_core = 0);" << be_uidt
+          << be_uidt_nl << be_nl;
     }
 
   // Protected destructor.
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..e63fb67926e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -68,8 +68,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->name () << "_ptr" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::duplicate ("
           << be_idt << be_idt_nl
-          << node->name () << "_ptr p" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->name () << "_ptr p)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return " << node->name () << "::_duplicate (p);" << be_uidt_nl
           << "}";
@@ -78,8 +77,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "void" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::release ("
           << be_idt << be_idt_nl
-          << node->name () << "_ptr p" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->name () << "_ptr p)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::release (p);" << be_uidt_nl
           << "}";
@@ -97,8 +95,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
           << be_idt << be_idt_nl
           << "const " << node->name () << "_ptr p," << be_nl
-          << "TAO_OutputCDR & cdr" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << "TAO_OutputCDR & cdr)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return ";
 
@@ -342,15 +339,11 @@ 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
-          << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
-          << "                 ::Components::CCMException))" << be_uidt_nl
+          << node->full_name () << "::ciao_preactivate (void)" << be_nl
           << "{" << be_nl
           << "}" << be_nl << be_nl
           << "void" << be_nl
-          << node->full_name () << "::ciao_postactivate (void)" << be_idt_nl
-          << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
-          << "                 ::Components::CCMException))" << be_uidt_nl
+          << node->full_name () << "::ciao_postactivate (void)" << be_nl
           << "{" << be_nl
           << "}" << be_nl << be_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 6c5f1929e09..aa6f995848c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -163,9 +163,8 @@ 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
-          << "ACE_THROW_SPEC (( ::CORBA::SystemException));"
-          << be_uidt_nl << be_nl;
+          << "virtual ::CORBA::Boolean ciao_is_substitutable (const char *event_repo_id);" << be_nl
+          << be_nl << be_nl;
     }
 
   // _is_a
@@ -203,15 +202,15 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   *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
-      << ");" << be_uidt_nl << be_nl;
+      << "void * servant);" << be_uidt
+      << 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
-      << ");" << be_uidt_nl << be_nl;
+      << "void * servant_upcall);" << be_uidt
+      << be_uidt_nl << be_nl;
 
   this->this_method (node);
 
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 be81c7d5fc1..701de416ee9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -153,7 +153,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << local_name_prefix << node_local_name
       << " (void)" << be_nl;
   *os << "{" << be_nl;
-  *os << "}";
+  *os << "}" << be_nl;
 
   // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) == -1)
@@ -210,8 +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
-        << ")" << be_uidt_nl;
+        << "void * servant)" << be_uidt << be_uidt_nl;
     *os << "{" << be_idt;
 
     // Generate exception list.
@@ -317,8 +316,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
-        << ")" << be_uidt_nl;
+        << "void * servant)" << be_uidt << be_uidt_nl;
     *os << "{" << be_idt;
 
     // Generate exception list.
@@ -388,7 +386,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}";
+        << "}" << be_nl;
 
     non_existent.destroy ();
     rt.destroy ();
@@ -426,8 +424,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
-        << ")" << be_uidt_nl;
+        << "void * servant)" << be_uidt << be_uidt_nl;
     *os << "{" << be_idt;
 
     // Generate exception list.
@@ -511,8 +508,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
-      << ")" << be_uidt_nl;
+      << "void * servant)" << be_uidt << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
       << "ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ("
@@ -521,9 +517,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << ");" << be_uidt_nl << be_uidt_nl;
   *os << "if (_tao_adapter == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1,"
-      << be_nl
-      << "                                  ::CORBA::COMPLETED_NO);"
+      << "throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO);"
       << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
@@ -533,16 +527,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << full_skel_name << " *> (servant);"
       << be_uidt_nl;
 
-  *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl
-      << "impl->_get_interface ();" << be_uidt
+  *os << "::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface ();"
+      << be_nl
       << "server_request.init_reply ();" << be_nl
       << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
       << be_nl << be_nl
       << "::CORBA::Boolean const _tao_result =" << be_idt_nl
-      << "_tao_adapter->interfacedef_cdr_insert (" << be_idt << be_idt_nl
-      << "_tao_out," << be_nl
-      << "_tao_retval" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl << be_nl
+      << "_tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval);"
+      << be_uidt_nl << be_nl
       << "_tao_adapter->dispose (_tao_retval);" << be_nl << be_nl;
 
   *os << "if (_tao_result == false)" << be_idt_nl
@@ -705,8 +697,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     {
       *os << be_nl << be_nl
           << "::CORBA::Boolean " << be_nl << full_skel_name
-          << "::ciao_is_substitutable (const char *)" << be_idt_nl
-          << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
+          << "::ciao_is_substitutable (const char *)" << be_nl
           << "{" << be_idt_nl
           << "return true;" << be_uidt_nl
           << "}";
@@ -863,7 +854,9 @@ be_visitor_interface_ss::this_method (be_interface *node)
       << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
-  *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();"
+  /* Coverity whines about an unused return value from _nil() when
+     initializing tmp.  Just use zero instead. */
+  *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();"
       << be_nl << be_nl
       << "::CORBA::Boolean const _tao_opt_colloc =" << be_idt_nl
       << "stub->servant_orb_var ()->orb_core ()->"
@@ -903,14 +896,10 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "void " << node->full_skel_name ()
-      << "::_dispatch (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall" << be_uidt_nl
-      << ")" << be_uidt_nl;
+      << "::_dispatch (TAO_ServerRequest & req, void * servant_upcall)"
+      << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "this->synchronous_upcall_dispatch (req," << be_nl
-      << "                                   servant_upcall," << be_nl
-      << "                                   this);"
+  *os << "this->synchronous_upcall_dispatch (req, servant_upcall, this);"
       << be_uidt_nl;
   *os << "}";
 }
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..f275be94303 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,7 @@ 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 (::CORBA::Object_ptr obj);" << be_nl;
 
   *os << be_nl << be_nl
       << "void" << be_nl
@@ -65,8 +64,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
       << "TAO::Collocation_Strategy strategy" << be_uidt_nl
-      << ")" << be_nl
-      << "ACE_THROW_SPEC (( ::CORBA::Exception));";
+      << ");" << be_nl;
 
   *os << be_uidt_nl << be_nl
       << "static " << node->strategized_proxy_broker_name ()
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..5014915c5aa 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
@@ -68,8 +68,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << node->full_strategized_proxy_broker_name () << "::"
       << "get_strategy (" << be_idt << be_idt_nl
       << "::CORBA::Object_ptr obj" << be_uidt_nl
-      << ")" << be_nl
-      << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
+      << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Collocation_Strategy strategy =" << be_idt_nl
       << "TAO_ORB_Core::collocation_strategy (obj);" << be_uidt
@@ -88,8 +87,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
       << "TAO::Collocation_Strategy strategy" << be_uidt_nl
-      << ")" << be_nl
-      << "ACE_THROW_SPEC (( ::CORBA::Exception))" << be_uidt_nl
+      << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;" << be_nl
       << "collocation_upcall_wrapper.upcall (" << be_idt_nl
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..a32733c740c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -84,29 +84,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
     }
 
   *os << be_uidt_nl
-      << ")" << be_uidt_nl;
-
-  if (be_global->use_raw_throw ())
-    {
-      *os << "throw (";
-    }
-  else
-    {
-      *os << "ACE_THROW_SPEC ((";
-    }
-
-  *os << " ::CORBA::SystemException";
-
-  if (be_global->use_raw_throw ())
-    {
-      *os << ")";
-    }
-  else
-    {
-      *os << "))";
-    }
-
-  *os << " = 0;";
+      << ") = 0;" << be_uidt_nl;
 
   return 0;
 }
@@ -118,8 +96,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
   this->generate_shared_prologue (node, os, "_get_");
 
   *os << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
+      << ") = 0;" << be_uidt_nl;
 
   if (node->readonly ())
     {
@@ -145,8 +122,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
       return -1;
     }
 
-  *os << be_uidt_nl << ")" << be_uidt_nl
-      << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
+  *os << be_uidt_nl << ") = 0;" << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 6f01e55accd..c03dd389ea8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -358,6 +358,14 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node,
   be_interface *intf =
     be_interface::narrow_from_scope (node->defined_in ());
 
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) generate_shared_section - "
+                         "bad interface scope\n"),
+                        -1);
+    }
+
   // Create the response handler
   char *buf;
   intf->compute_full_name ("TAO_AMH_", "ResponseHandler", buf);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index ab820a630a9..f66724444f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -77,17 +77,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
       *os << "void";
     }
 
-  *os << be_uidt_nl<< ")";
-
-  // Now generate the throw specs.
-  if (this->gen_throw_spec (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%N:%l) be_visitor_operation_arglist")
-                         ACE_TEXT ("::visit_operation - ")
-                         ACE_TEXT ("Failed to generate throw spec\n")),
-                        -1);
-    }
+  *os << ")" << be_uidt << be_uidt;
 
   switch (this->ctx_->state ())
     {
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..314e5c95c5c 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
@@ -71,11 +71,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
       << "int" << be_uidt_nl
       << ")";
 
-  if (this->gen_throw_spec (node) != 0)
-    {
-      return -1;
-    }
-
   *os << be_uidt_nl
       << "{" << be_idt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index f766694a58a..66a0c2dcc2f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -41,8 +41,17 @@ be_visitor_operation::void_return_type (be_type *bt)
 {
   if (bt->node_type () == AST_Decl::NT_pre_defined)
     {
-      AST_PredefinedType::PredefinedType pdt =
-        be_predefined_type::narrow_from_decl (bt)->pt ();
+      be_predefined_type * const bpd =
+        be_predefined_type::narrow_from_decl (bt);
+
+      if (!bpd)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "TAO_IDL (%N:%l) "
+                           "be_predefined_type::narrow_from_decl "
+                           "failed\n"),
+                          0);
+
+      AST_PredefinedType::PredefinedType const pdt = bpd->pt ();
 
       if (pdt == AST_PredefinedType::PT_void)
         {
@@ -119,74 +128,6 @@ be_visitor_operation::is_amh_exception_holder (be_interface *node)
   return is_an_amh_exception_holder;
 }
 
-// Method to generate the throw specs for exceptions that are thrown by the
-// operation.
-int
-be_visitor_operation::gen_throw_spec (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  const char *throw_spec_open = "throw (";
-  const char *throw_spec_close = ")";
-
-  if (!be_global->use_raw_throw ())
-    {
-      throw_spec_open = "ACE_THROW_SPEC ((";
-      throw_spec_close = "))";
-    }
-
-  UTL_Scope *scope = node->defined_in ();
-  be_interface *iface = be_interface::narrow_from_scope (scope);
-
-  /***************************************************************************/
-  // 2.6
-  // Generate the Right Throw Spec if it is an AMH ExceptionHolder
-  /***************************************************************************/
-  // Check if this is (IF and it's not VT) or (it is an AMH ExceptionHolder).
-  if (iface != 0)
-    {
-      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)
-        {
-          *os << be_nl << throw_spec_open;
-          *os << be_idt_nl << "::CORBA::SystemException";
-
-          if (node->exceptions ())
-            {
-              // Initialize an iterator to iterate thru the exception list.
-              for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
-                   !ei.is_done ();
-                   ei.next ())
-                {
-                  be_exception *excp =
-                    be_exception::narrow_from_decl (ei.item ());
-
-                  if (excp == 0)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_visitor_operation"
-                                         "gen_throw_spec - "
-                                         "bad exception node\n"),
-                                        -1);
-
-                    }
-
-                  *os << "," << be_nl
-                      << "::" << excp->name ();
-                }
-            }
-
-          *os << be_uidt_nl << throw_spec_close << be_uidt;
-        }
-    }
-  /*******************************************************************************/
-  return 0;
-}
-
 int
 be_visitor_operation::gen_raise_exception (const char *exception_name,
                                            const char *exception_arguments)
@@ -212,8 +153,8 @@ be_visitor_operation::gen_stub_operation_body (
   if (!intf)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
-                         "visit_operation - "
+                         "(%N:%l) be_visitor_operation::"
+                         "gen_stub_operation_body - "
                          "bad interface scope\n"),
                         -1);
     }
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..5b0fe601a71 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -209,8 +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
-      << ")" << be_uidt_nl;
+      << "void * servant)" << be_uidt << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the
   // argument types is "native", we do not generate any skeleton
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..cd415930bfd 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
@@ -43,21 +43,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
       << "int num_args" << be_uidt_nl
-      << ")";
-
-  if (this->gen_throw_spec (node) != 0)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "(%N:%l) be_visitor_operation_proxy_impl_xh::"
-          "visit_operation - "
-          "throw spec generation failed\n"
-        ),
-        -1
-      );
-    }
-
-  *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 455b7be3ff1..744c4e4af82 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
@@ -97,6 +97,15 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
     ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
     : be_interface::narrow_from_scope (node->defined_in ());
 
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_upcall_command_ss::"
+                         "visit - "
+                         "bad interface scope\n"),
+                        -1);
+    }
+
   be_module *module = 0;
 
   // Is our enclosing scope a module? We need this check because for
@@ -126,16 +135,8 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
   os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  // Generate the operation-specific TAO::Upcall_Command concrete class.
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_upcall_command_ss::"
-                         "visit - "
-                         "bad interface scope\n"),
-                        -1);
-    }
+  // Generate the operation-specific TAO::Upcall_Command concrete
+  // class.
 
   // Generate an operation-specific concrete TAO::Upcall_Command
   // class, an instance of which will be invoked by the
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..bb24a94bec1 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -50,7 +50,14 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  if (node->cli_hdr_gen () || node->imported ())
+  // We don't check cli_hdr_gen() here. If we are generated more
+  // than once as an anonymous sequence, the name guard will cause
+  // the C++ preprocessor to catch it. If we are generated more than
+  // once as a typedef (caused by a comma separated list of
+  // typedefs), our name will be changed by the call above and the
+  // name guard will not catch it, but that's ok - we want to
+  // be generated for each typedef.
+  if (node->imported ())
     {
       return 0;
     }
@@ -99,6 +106,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+
   os->gen_ifdef_macro (node->flat_name ());
 
   if (this->ctx_->tdef () != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index 2463764b749..3a73067e503 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -119,7 +119,15 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
   else
     {
       new_ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      field_decl.visit_scope (node);
+
+      if (field_decl.visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_structure_cdr_op_cs::"
+                             "visit_structure - "
+                             "codegen for field decl scope failed\n"), 
+                            -1);
+        }        
 
       *os << "return" << be_idt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
index f99dbf45b27..92357117fbf 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
@@ -84,7 +84,16 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node)
   {
     be_visitor_context new_ctx (*this->ctx_);
     be_visitor_serializer_op_field_decl field_decl (&new_ctx);
-    field_decl.visit_scope (node);
+
+    if (field_decl.visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_serializer_op_cs::"
+                             "visit_structure - "
+                             "codegen for field decl scope failed\n"), 
+                            -1);
+        }        
+
 #ifdef DCPS_DEBUG_IDL
     *os << "size_t result = 0;" << be_nl;
 #else
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..5e3445f3f77 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -130,8 +130,6 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
   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 *";
 
   // Generate the TypeCode instantiation.
   os << "static ";
@@ -190,9 +188,24 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
       be_type * const member_type =
         be_type::narrow_from_decl ((*member_ptr)->field_type ());
 
-      if (this->is_typecode_generation_required (member_type))
+      if (this->is_typecode_generation_required (member_type)
+          && member_type->accept (this) != 0)
         {
-          (void) member_type->accept (this);
+          return -1;
+        }
+
+      be_structure *bs = be_structure::narrow_from_decl (node);
+      if (bs)
+        {
+          be_visitor_typecode_defn::QNode const * const qnode =
+            this->queue_lookup (this->tc_queue_, bs);
+
+          ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+          if (qnode
+            && member_type->in_recursion (recursion_queue))
+            {
+              this->is_recursive_ = true;
+            }
         }
     }
 
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..d2ed9a8e3ff 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -745,8 +745,12 @@ be_visitor_typecode_defn::push (ACE_CDR::Long val)
     {
       return -1;
     }
+  else if (this->index_ < 0)  // (should only be -1)
+    this->index_ = 0;  // Empty.
 
-  this->scope_stack_ [++this->index_] = val;
+  this->scope_stack_ [this->index_++] = val;  // Must post-increment
+                                              // to avoid buffer
+                                              // overrun.
   return 0;
 }
 
@@ -758,7 +762,7 @@ be_visitor_typecode_defn::pop (ACE_CDR::Long &val)
       return -1;
     }
 
-  val = this->scope_stack_[this->index_--];
+  val = this->scope_stack_[this->index_--];  // Must post-increment!
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
index fcc83155482..8ebe800becc 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -133,8 +133,21 @@ TAO::be_visitor_union_typecode::gen_case_typecodes (be_union * node)
       be_type * const member_type =
         be_type::narrow_from_decl ((*member_ptr)->field_type ());
 
-      if (this->is_typecode_generation_required (member_type))
-        member_type->accept (this);
+      if (this->is_typecode_generation_required (member_type)
+          && member_type->accept (this) != 0)
+        {
+          return -1;
+        }
+
+      be_visitor_typecode_defn::QNode const * const qnode =
+        this->queue_lookup (this->tc_queue_, node);
+
+      ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+      if (qnode
+        && member_type->in_recursion (recursion_queue))
+        {
+          this->is_recursive_ = true;
+        }
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index 14516069c35..98ccc47ebc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -203,11 +203,18 @@ TAO::be_visitor_value_typecode::gen_member_typecodes (be_valuetype * node)
       be_type * const member_type =
         be_type::narrow_from_decl (field->field_type ());
 
-      if (this->is_typecode_generation_required (member_type))
+      if (this->is_typecode_generation_required (member_type)
+          && member_type->accept (this) != 0)
         {
-          member_type->accept (this);
+          return -1;
         }
-      else if (member_type == static_cast<be_type *> (node))
+
+      be_visitor_typecode_defn::QNode const * const qnode =
+        this->queue_lookup (this->tc_queue_, node);
+
+      ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+      if (qnode
+        && member_type->in_recursion (recursion_queue))
         {
           this->is_recursive_ = true;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 3405d6c8fb9..bab9c2a18ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -137,6 +137,20 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
   *os << ";";
 
+  if (dv.computed_ == 0)
+    {
+      *os << be_nl;
+      be_visitor_union_branch_public_constructor_cs const_visitor (this->ctx_);
+      if (ub->accept (&const_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_union_cs::"
+                             "visit union - "
+                             "codegen for constructor failed\n"),
+                            -1);
+        }
+    }
+
   *os << be_uidt_nl << "}" << be_nl << be_nl;
 
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
index 80aedbb4775..0759cc2a9b4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
@@ -47,6 +47,7 @@
 
 #include "be_visitor_union_branch/private_ch.cpp"
 #include "be_visitor_union_branch/public_assign_cs.cpp"
+#include "be_visitor_union_branch/public_constructor_cs.cpp"
 #include "be_visitor_union_branch/public_reset_cs.cpp"
 #include "be_visitor_union_branch/public_ch.cpp"
 #include "be_visitor_union_branch/public_ci.cpp"
@@ -56,6 +57,6 @@
 #include "be_visitor_union_branch/serializer_op_ch.cpp"
 #include "be_visitor_union_branch/serializer_op_cs.cpp"
 
-ACE_RCSID (be, 
-           be_visitor_union_branch, 
+ACE_RCSID (be,
+           be_visitor_union_branch,
            "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
new file mode 100644
index 00000000000..c225deac5b0
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
@@ -0,0 +1,328 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_constructor_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch for the constructor operator
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_constructor_cs,
+           "$Id$")
+
+// **********************************************
+//  visitor for union_branch in the client stubs file generating the code for
+//  the copy ctor and assignment operator
+// **********************************************
+
+// constructor
+be_visitor_union_branch_public_constructor_cs::
+be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+// destructor
+be_visitor_union_branch_public_constructor_cs::
+~be_visitor_union_branch_public_constructor_cs (void)
+{
+}
+
+// visit the union_branch node
+int
+be_visitor_union_branch_public_constructor_cs::visit_union_branch (
+    be_union_branch *node)
+{
+  // first generate the type information
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_union_branch - "
+                         "Bad union_branch type\n"
+                         ), -1);
+    }
+
+  this->ctx_->node (node); // save the node
+
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_union_branch - "
+                         "codegen for union_branch type failed\n"
+                         ), -1);
+    }
+
+  return 0;
+}
+
+// =visit operations on all possible data types  that a union_branch can be
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node)
+{
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+  be_union *bu =
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
+  be_type *bt;
+
+  // Check if we are visiting this node via a visit to a typedef node.
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // for anonymous arrays, the type name has a _ prepended. We compute the
+  // full_name with or without the underscore and use it later on.
+  char fname [NAMEBUFSIZE];  // to hold the full and
+
+  // save the node's local name and full name in a buffer for quick use later
+  // on
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // for anonymous arrays ...
+      // we have to generate a name for us that has an underscope prepended to
+      // our local name. This needs to be inserted after the parents's name
+
+      if (bt->is_nested ())
+        {
+          be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
+                           bt->local_name ()->get_string ());
+        }
+      else
+        {
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
+        }
+    }
+  else
+    {
+      // typedefed node
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
+    }
+
+  // set the discriminant to the appropriate label
+  *os << "this->u_." << ub->local_name ()
+      << "_ = " << be_idt_nl
+      << fname << "_alloc ();" << be_uidt << be_uidt;
+
+  return 0;
+}
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_predefined_type (
+    be_predefined_type *node
+  )
+{
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+  be_union *bu =
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
+  be_type *bt;
+
+  // Check if we are visiting this node via a visit to a typedef node.
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_predefined_type - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // set the discriminant to the appropriate label
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_any:
+      *os << "ACE_NEW (" << be_idt << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl
+          << bt->name () << ");" << be_uidt;
+
+      break;
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_sequence (be_sequence *node)
+{
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+  be_union *bu =
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
+  be_type *bt;
+
+  // Check if we are visiting this node via a visit to a typedef node.
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << "ACE_NEW (" << be_idt_nl
+      << "this->u_." << ub->local_name () << "_," << be_nl
+      << bt->name () << ");" << be_uidt;
+
+  return 0;
+}
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_structure (be_structure *node)
+{
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+  be_union *bu =
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
+  be_type *bt;
+
+  // Check if we are visiting this node via a visit to a typedef node.
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (bt->size_type () == be_type::VARIABLE || node->has_constructor ())
+    {
+      *os << "ACE_NEW (" << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl
+          << bt->name () << ");" << be_uidt;
+    }
+
+  return 0;
+}
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node); // save the typedef node for use in code generation
+                           // as we visit the base type
+
+  // the node to be visited in the base primitve type that gets typedefed
+  be_type *bt = node->primitive_base_type ();
+
+  if (!bt || (bt->accept (this) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_typedef - "
+                         "Bad primitive type\n"
+                         ), -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_union_branch_public_constructor_cs::visit_union (be_union *node)
+{
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+  be_union *bu =
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
+  be_type *bt;
+
+  // Check if we are visiting this node via a visit to a typedef node.
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_constructor_cs::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << "ACE_NEW (" << be_idt_nl
+      << "this->u_." << ub->local_name () << "_," << be_nl
+      << bt->name () << ");" << be_uidt;
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index 37a40381b20..fc433bf9d42 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union_branch, 
-           public_reset_cs, 
+ACE_RCSID (be_visitor_union_branch,
+           public_reset_cs,
            "$Id$")
 
 // *****************************************************
@@ -41,8 +41,7 @@ be_visitor_union_branch_public_reset_cs::
 // visit the union_branch node
 int
 be_visitor_union_branch_public_reset_cs::visit_union_branch (
-    be_union_branch *node
-  )
+    be_union_branch *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_type *bt = be_type::narrow_from_decl (node->field_type ());
@@ -52,14 +51,14 @@ be_visitor_union_branch_public_reset_cs::visit_union_branch (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cs::"
                          "visit_union_branch - "
-                         "Bad union_branch type\n"), 
+                         "Bad union_branch type\n"),
                         -1);
     }
 
   this->ctx_->node (node); // save the node
-  
+
   *os << be_nl;
-  
+
   for (unsigned long i = 0; i < node->label_list_length (); ++i)
     {
       // check if we are printing the default case
@@ -84,7 +83,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_branch (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cs::"
                          "visit_union_branch - "
-                         "codegen for union_branch type failed\n"), 
+                         "codegen for union_branch type failed\n"),
                         -1);
     }
 
@@ -114,7 +113,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_enum - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                          -1);
     }
 
@@ -124,8 +123,8 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
 
   // save the node's local name and full name in a buffer for quick use later
   // on
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
@@ -174,7 +173,7 @@ be_visitor_union_branch_public_reset_cs::visit_enum (be_enum *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_enum - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -197,7 +196,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -225,7 +224,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_interface_fwd - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -253,7 +252,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox (be_valuebox *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_valuebox - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -281,7 +280,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype (be_valuetype *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_valuetype - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -309,7 +308,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (be_valuetype_fwd *
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_valuetype_fwd - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -339,7 +338,7 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_predefined_type - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -395,7 +394,7 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (be_sequence *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_sequence - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -424,7 +423,7 @@ be_visitor_union_branch_public_reset_cs::visit_string (be_string *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_string - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -471,7 +470,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_structure - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -505,7 +504,7 @@ be_visitor_union_branch_public_reset_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -526,7 +525,7 @@ be_visitor_union_branch_public_reset_cs::visit_union (be_union *)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
                          "visit_union - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index 3d62e15856b..640572ba84c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -104,8 +104,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " *_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::add_ref (_tao_elem);" << be_nl
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
@@ -115,16 +114,14 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " **_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*_tao_elem);" << be_uidt << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "::CORBA::Boolean" << 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..4d329b3edee 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -177,6 +177,16 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   AST_Type * at = node->boxed_type()->unaliased_type();
   be_type *bt = be_type::narrow_from_decl (at);
+
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuebox_cs::"
+                         "visit_valuebox - "
+                         "Bad type\n"),
+                        -1);
+    }
+
   bool is_array = false;
   const char * unmarshal_arg;
   be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt);
@@ -275,7 +285,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
-  if (!bt || (bt->accept (this) == -1))
+  if (bt->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          " (%N:%l) be_visitor_valuebox_cs::visit_valuebox - "
@@ -421,7 +431,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   if (bt == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuebox_ch::"
+                         "(%N:%l) be_visitor_valuebox_cs::"
                          "visit_sequence - "
                          "Bad element type\n"),
                         -1);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 05849c401e2..e9f799fa90c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -97,11 +97,6 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
   be_visitor_context ctx = *this->ctx_;
   be_visitor_operation operation_visitor (&ctx);
 
-  if (operation_visitor.gen_throw_spec (node) == -1)
-    {
-      return -1;
-    }
-
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index 5a245ed5c27..e61f3800d68 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -544,7 +544,8 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
-      && bt->is_child (bu))
+      && bt->is_child (bu)
+      && this->ctx_->state () != TAO_CodeGen::TAO_VALUETYPE_OBV_CH)
     {
       be_field *member_node =
         be_field::narrow_from_decl (this->ctx_->node ());
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 190c730ec48..a317e67f4c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -99,7 +99,15 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   be_visitor_context new_ctx = *this->ctx_;
   be_visitor_valuetype_field_cdr_decl field_out_cdr (&new_ctx);
-  field_out_cdr.visit_scope (node);
+
+  if (field_out_cdr.visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_marshal_cs::"
+                         "visit_valuetype - "
+                         "codegen for field out cdr scope failed\n"), 
+                        -1);
+    }
 
   if (node->data_members_count () > 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
index ba41ba1371a..21099873485 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
@@ -65,20 +65,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node)
       os << "void)" << be_idt;
     }
 
-  // Now generate the throw specs.
-  if (this->gen_throw_spec (node) == -1)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          ACE_TEXT ("(%N:%l) be_visitor_valuetype_init_arglist_ch")
-          ACE_TEXT ("::visit_factory - ")
-          ACE_TEXT ("Failed to generate throw spec\n")
-        ),
-        -1
-      );
-    }
-
-  return 0;
+   return 0;
 }
 
 int
@@ -116,53 +103,3 @@ be_visitor_valuetype_init_arglist_ch::post_process (be_decl *bd)
   return 0;
 }
 
-int
-be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->exceptions ())
-    {
-      const char *throw_spec_open = "throw (";
-      const char *throw_spec_close = ")";
-
-      if (!be_global->use_raw_throw ())
-        {
-          throw_spec_open = "ACE_THROW_SPEC ((";
-          throw_spec_close = "))";
-        }
-
-      *os << be_nl << throw_spec_open << be_idt;
-      
-      bool first = true;
-
-      // Initialize an iterator to iterate thru the exception list.
-      for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
-           !ei.is_done ();
-           ei.next ())
-        {
-          be_exception *excp =
-            be_exception::narrow_from_decl (ei.item ());
-
-          if (excp == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_operation"
-                                 "gen_throw_spec - "
-                                 "bad exception node\n"),
-                                -1);
-
-            }
-
-          *os << (first ? "" : ",") << be_nl
-              << excp->name ();
-              
-           first = false;
-        }
-        
-      *os << be_uidt_nl << throw_spec_close << be_uidt;
-    }
-
-  return 0;
-}
-
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index eb5d05505a3..c2d2158ea23 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -207,7 +207,7 @@ public:
       TAO_TC_DEFN_ENCAP_LEN,                  // encap size computation
       TAO_TC_DEFN_SCOPE_LEN,                  // scope size computation
 
-      // Means we are not generating the assignment operator.
+      // Means we are generating the copy constructor
       TAO_UNION_COPY_CONSTRUCTOR,
 
       // Generating the _var template parameter in sequence of arrays.
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 4149c88c881..5f83c6120c8 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -424,12 +424,6 @@ public:
   bool gen_direct_collocation (void) const;
   // Check if we want to generate Direct collocation stubs.
 
-  void use_raw_throw (bool);
-  // Set replacement of 'ACE_THROW_SPEC' with 'throw'.
-
-  bool use_raw_throw (void) const;
-  // Check if raw 'throw' generation option is set.
-
   void opt_tc (bool);
   // Set optimized typecodes.
 
@@ -698,9 +692,6 @@ private:
   bool gen_direct_collocation_;
   // are we generating Direct collocated stubs?
 
-  bool use_raw_throw_;
-  // Another possible option if the above is TRUE.
-
   bool opt_tc_;
   // do we generate optimized typecodes?
 
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index bde3d221124..ea40b5813d7 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -368,11 +368,6 @@ private:
   void gen_linear_search_instance (const char *flat_name);
   // Create an instance of the linear search optable.
 
-  static void gen_throw_spec (UTL_ExceptList *list,
-                              TAO_OutStream *os);
-  // Helper for the helpers that generate collocated static
-  // base class methods.
-
 protected:
   int var_out_seq_decls_gen_;
   // Have these been done already?
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index 9acbfe5ebb7..392b708e346 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -125,9 +125,6 @@ public:
     );
   // Compute the count of private/public/all data members.
 
-  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
-  // Check if we are in recursion.
-
   static int abstract_supports_helper (be_interface *node,
                                        be_interface *base,
                                        TAO_OutStream *os);
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..7513653d63e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -58,9 +58,6 @@ public:
   /// 0:false, 1:true
   virtual int is_amh_exception_holder (be_interface *node);
 
-  virtual int gen_throw_spec (be_operation *node);
-  // generate the throw specification
-
   virtual int gen_raise_exception (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_union_branch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
index 3fffe3fa0cf..860ec5c5363 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
@@ -28,6 +28,7 @@
 #include "be_visitor_union_branch/public_ci.h"
 #include "be_visitor_union_branch/public_cs.h"
 #include "be_visitor_union_branch/public_assign_cs.h"
+#include "be_visitor_union_branch/public_constructor_cs.h"
 #include "be_visitor_union_branch/public_reset_cs.h"
 #include "be_visitor_union_branch/private_ch.h"
 #include "be_visitor_union_branch/cdr_op_ch.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
new file mode 100644
index 00000000000..fc42f3d814c
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_constructor_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the constructor of the union class
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_
+#define _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_
+
+class be_visitor_union_branch_public_constructor_cs : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_constructor_cs
+  //
+  // = DESCRIPTION
+  //    This is used to generate the body of the constructor
+  //
+public:
+  be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_union_branch_public_constructor_cs (void);
+  // destructor
+
+  virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
+
+  // =visit operations on all possible data types that a union_branch can be
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
+
+  virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
+
+  virtual int visit_structure (be_structure *node);
+  // visit structure type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
+
+  virtual int visit_union (be_union *node);
+  // visit union type
+};
+
+#endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
index 1601886c5e7..35438202c9b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
@@ -48,9 +48,6 @@ public:
 
   virtual int post_process (be_decl *);
   // stuff to o/p after each element of the scope is handled
-
-  virtual int gen_throw_spec (be_factory *);
-  // IDL3 extension.
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_INIT_ARGLIST_CH_H_ */
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 297b6225517..ad62e10afb8 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -710,7 +710,7 @@ DRV_check_for_include (const char* buf)
   if (*h == '\0')
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("IDL: No friggin' input files\n")));
+                  ACE_TEXT ("TAO_IDL: No input files\n")));
 
 
       idl_global->set_err_count (idl_global->err_count () + 1);
@@ -854,7 +854,7 @@ DRV_convert_includes (const char* buf)
   if (*r == '\0')
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("IDL: No friggin' input files\n")));
+                  ACE_TEXT ("TAO_IDL: No input files\n")));
 
 
       idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1253,7 +1253,7 @@ DRV_pre_proc (const char *myfile)
       throw FE_Bailout ();
     }
 
-  FE_set_yyin (reinterpret_cast<File *> (yyin));
+  FE_set_yyin (yyin);
 
   if (idl_global->compile_flags () & IDL_CF_ONLY_PREPROC)
     {
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index 3d5bf971689..2fc35f6d22a 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -97,9 +97,9 @@ FE_yyparse (void)
 }
 
 void
-FE_set_yyin (File *f)
+FE_set_yyin (FILE * f)
 {
-  tao_yyin = reinterpret_cast<FILE *> (f);
+  tao_yyin = f;
 }
 
 // Constructor interfaces.
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 8095930cb8a..07fe0398257 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -388,7 +388,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
           // If the lookup now succeeds, without the full_def_only
           // constraint, it's an error.
           d = s->lookup_by_name (item, true, true);
-          
+
           if (0 != d)
             {
               idl_global->err ()->inheritance_fwd_error (
@@ -772,7 +772,7 @@ FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
         {
           return 0;
         }
-        
+
       if (d == concrete)
         {
           return 0;
@@ -823,15 +823,8 @@ FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n,
                         false),
     pd_base_component (0)
 {
-  if (base_component != 0 && supports != 0)
-    {
-      idl_global->err ()->derived_supports_error (n);
-    }
-  else
-    {
-      this->compile_inheritance (base_component);
-      this->compile_supports (supports);
-    }
+  this->compile_inheritance (base_component);
+  this->compile_supports (supports);
 }
 
 FE_ComponentHeader::~FE_ComponentHeader (void)
@@ -1055,18 +1048,11 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
     pd_base_home (0),
     pd_primary_key (0)
 {
-  if (base_home != 0 && supports != 0)
-    {
-      idl_global->err ()->derived_supports_error (n);
-    }
-  else
-    {
-      // No need to call compile_supports(), it got done in
-      // the call to the base class FE_ComponentHeader.
-      this->compile_inheritance (base_home);
-      this->compile_managed_component (managed_component);
-      this->compile_primary_key (primary_key);
-    }
+  // No need to call compile_supports(), it got done in
+  // the call to the base class FE_ComponentHeader.
+  this->compile_inheritance (base_home);
+  this->compile_managed_component (managed_component);
+  this->compile_primary_key (primary_key);
 }
 
 FE_HomeHeader::~FE_HomeHeader (void)
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 598d764391b..9f788d54443 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -218,16 +218,16 @@ oneway          return IDL_ONEWAY;
   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,7 +235,7 @@ 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;
                 }
@@ -243,7 +243,7 @@ oneway          return IDL_ONEWAY;
                   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;
                 }
@@ -254,8 +254,8 @@ oneway          return IDL_ONEWAY;
 
 (\"([^\\\"]*|\\[ntvbrfax\\\?\'\"]|\\[0-7]{1,3})*\"[ \t]*)+ {
                   /* Skip the quotes */
-                  char *tmp = ace_yytext;
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  char * const tmp = ace_yytext;
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -272,7 +272,7 @@ oneway          return IDL_ONEWAY;
 (L\"([^\\\"]*|\\[ntvbrfax\\\?\'\"]|\\[0-7]{1,3}|\\u([0-9a-fA-F]{1,4}))*\"[ \t]*)+ {
                   /* Skip the bookends */
                   char *tmp = ACE_OS::strdup (ace_yytext);
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -348,15 +348,16 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" {
                 }
 "/*"            {
                   for(;;) {
-                    char c = yyinput();
+                    char const c = yyinput();
                     if (c == '*') {
-                      char next = yyinput();
+                      char const next = yyinput();
                       if (next == '/')
                         break;
                       else
                         yyunput(c, NULL);
-                      if (c == '\n')
-                        idl_global->set_lineno(idl_global->lineno() + 1);
+                    }
+                    else if (c == '\n') {
+                      idl_global->set_lineno(idl_global->lineno() + 1);
                     }
                   }
                 }
@@ -1086,7 +1087,7 @@ idl_valid_version (char *s)
         }
     }
 
-  int len = minor - s;
+  ptrdiff_t const len = minor - s;
 
   for (i = 0; i < len; ++i)
     {
@@ -1109,22 +1110,22 @@ idl_valid_version (char *s)
 static AST_Decl *
 idl_find_node (char *s)
 {
-  UTL_ScopedName *node = idl_global->string_to_scoped_name (s);
-  AST_Decl *d = 0;
+  UTL_ScopedName * node = idl_global->string_to_scoped_name (s);
+  AST_Decl * d = 0;
 
   if (node != 0)
     {
       d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
                                                                  true);
-    }
 
-  if (d == 0)
-    {
-      idl_global->err ()->lookup_error (node);
+      if (d == 0)
+        {
+          idl_global->err ()->lookup_error (node);
+        }
+
+      node->destroy ();
+      delete node;
     }
 
-  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..9af975a64de 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -611,7 +611,7 @@ interface_header :
                                               false,
                                               true),
                           1);
-                          
+
           if (0 != $2)
             {
               $2->destroy ();
@@ -642,7 +642,7 @@ interface_header :
                                               false,
                                               true),
                           1);
-                          
+
           if (0 != $3)
             {
               $3->destroy ();
@@ -673,7 +673,7 @@ interface_header :
                                               true,
                                               true),
                           1);
-                          
+
           if (0 != $3)
             {
               $3->destroy ();
@@ -886,14 +886,14 @@ value_header :
                                         $4,
                                         $2 ? $2->truncatable () : false),
                           1);
-                          
+
           if (0 != $4)
             {
               $4->destroy ();
               delete $4;
               $4 = 0;
             }
-                          
+
           if (0 != $2)
             {
               $2->destroy ();
@@ -965,7 +965,7 @@ value_forward_decl :
                                                             true);
               (void) s->fe_add_valuetype_fwd (f);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -990,7 +990,7 @@ value_forward_decl :
                                                             false);
               (void) s->fe_add_valuetype_fwd (f);
             }
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -1033,7 +1033,7 @@ value_box_decl
               else
                 {
                   AST_Decl::NodeType nt = tp->node_type ();
-                  
+
                   if (nt == AST_Decl::NT_valuetype
                       || nt == AST_Decl::NT_eventtype)
                     {
@@ -1055,7 +1055,7 @@ value_box_decl
                     }
                 }
             }
-              
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -1322,7 +1322,7 @@ interface_forward :
                                       );
               (void) s->add_predefined_type (pdt);
               s->add_to_scope (pdt);
-            
+
               $1->destroy ();
               delete $1;
               $1 = 0;
@@ -1344,7 +1344,7 @@ interface_forward :
                                                             0);
               (void) s->fe_add_interface_fwd (f);
             }
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -1372,7 +1372,7 @@ interface_forward :
                                                             0);
               (void) s->fe_add_interface_fwd (f);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -1400,7 +1400,7 @@ interface_forward :
                                                             1);
               (void) s->fe_add_interface_fwd (f);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -1514,7 +1514,7 @@ const_type
           AST_Decl *d =
             s->lookup_by_name ($1,
                                true);
-                               
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -1764,7 +1764,7 @@ primary_expr
               $$ =
                 idl_global->gen ()->create_expr (c->constant_value (),
                                                  c->et ());
-              
+
               $1->destroy ();
               delete $1;
               $1 = 0;
@@ -1956,7 +1956,7 @@ type_dcl
                */
               (void) s->fe_add_native (node);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -1980,6 +1980,7 @@ type_declarator :
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           FE_Declarator *d = 0;
           AST_Typedef *t = 0;
+          unsigned long index = 0UL;
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclaratorsSeen);
 
           /*
@@ -2016,6 +2017,17 @@ type_declarator :
                                                           d->name (),
                                                           s->is_local (),
                                                           s->is_abstract ());
+
+                  // If the base type is a sequence or array, the typedef
+                  // constructor sets owns_base_type_ to true. But if
+                  // there is a comma-separated list of such typedefs,
+                  // the base type can be destroyed only once. In all
+                  // other cases, the line below has no effect.
+                  if (index++ > 0)
+                    {
+                      t->owns_base_type (false);
+                    }
+
                   (void) s->fe_add_typedef (t);
                 }
 
@@ -2397,7 +2409,7 @@ struct_type
            * Push the scope of the struct on the scopes stack.
            */
           idl_global->scopes ().push (d);
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -2507,7 +2519,7 @@ member_i :
                   (void) s->fe_add_field (f);
                 }
             }
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -2597,7 +2609,7 @@ union_type
            * Push the scope of the union on the scopes stack
            */
           idl_global->scopes ().push (u);
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -2766,7 +2778,7 @@ switch_type_spec :
           if ($$ == 0)
             {
               idl_global->err ()->lookup_error ($1);
-            
+
               $1->destroy ();
               delete $1;
               $1 = 0;
@@ -2774,7 +2786,7 @@ switch_type_spec :
               /* If we don't return here, we'll crash later.*/
               return 1;
             }
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -2822,7 +2834,7 @@ case_branch :
                                         f->name ()
                                       );
               (void) s->fe_add_union_branch (b);
-              
+
               // f has passed its field type to the union branch,
               // but the rest still needs to be cleaned up.
               f->AST_Decl::destroy ();
@@ -2965,7 +2977,7 @@ element_spec :
                                                $3->name ()
                                              );
                 }
-                
+
               $3->destroy ();
               delete $3;
               $3 = 0;
@@ -2990,7 +3002,7 @@ struct_forward_type
               d = idl_global->gen ()->create_structure_fwd (&n);
               (void) s->fe_add_structure_fwd (d);
             }
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -3014,7 +3026,7 @@ union_forward_type
               u = idl_global->gen ()->create_union_fwd (&n);
               (void) s->fe_add_union_fwd (u);
             }
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -3055,7 +3067,7 @@ enum_type :
            * Push the enum scope on the scopes stack.
            */
           idl_global->scopes ().push (e);
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -3176,7 +3188,7 @@ sequence_type_spec
             {
               ev = $4->coerce (AST_Expression::EV_ulong);
             }
-            
+
           if (0 == $4 || 0 == ev)
             {
               idl_global->err ()->coercion_error ($4,
@@ -3211,7 +3223,7 @@ sequence_type_spec
                                           );
                 }
             }
-            
+
           delete ev;
           ev = 0;
         }
@@ -3313,12 +3325,12 @@ string_type_spec
            * Create a node representing a string.
            */
           AST_Expression::AST_ExprValue *ev = 0;
-          
+
           if ($4 != 0)
             {
               ev = $4->coerce (AST_Expression::EV_ulong);
             }
-            
+
           if (0 == $4 || 0 == ev)
             {
               idl_global->err ()->coercion_error ($4,
@@ -3337,7 +3349,7 @@ string_type_spec
                                                 )
                                             );
             }
-            
+
           delete ev;
           ev = 0;
         }
@@ -3466,11 +3478,11 @@ array_declarator :
                                         0,
                                         0
                                       );
-                                      
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               sn.destroy ();
             }
         }
@@ -3537,12 +3549,12 @@ array_dim :
            * positive integers.
            */
           AST_Expression::AST_ExprValue *ev = 0;
-           
+
           if ($3 != 0)
             {
               ev = $3->coerce (AST_Expression::EV_ulong);
             }
-           
+
           if (0 == $3 || 0 == ev)
             {
               idl_global->err ()->coercion_error ($3,
@@ -3553,7 +3565,7 @@ array_dim :
             {
               $$ = $3;
             }
-            
+
           delete ev;
           ev = 0;
         }
@@ -3632,7 +3644,7 @@ attribute_readonly :
                   if ($9 != 0)
                     {
                       (void) a->fe_add_get_exceptions ($9);
-          
+
                       $9->destroy ();
                       delete $9;
                       $9 = 0;
@@ -3641,7 +3653,7 @@ attribute_readonly :
                   (void) s->fe_add_attribute (a);
                 }
             }
-            
+
           $7->destroy ();
           delete $7;
           $7 = 0;
@@ -3716,7 +3728,7 @@ attribute_readwrite :
                   if ($7 != 0)
                     {
                       (void) a->fe_add_get_exceptions ($7);
-          
+
                       $7->destroy ();
                       delete $7;
                       $7 = 0;
@@ -3725,7 +3737,7 @@ attribute_readwrite :
                   if ($9 != 0)
                     {
                       (void) a->fe_add_set_exceptions ($9);
-          
+
                       $9->destroy ();
                       delete $9;
                       $9 = 0;
@@ -3734,7 +3746,7 @@ attribute_readwrite :
                   (void) s->fe_add_attribute (a);
                 }
             }
-            
+
           $5->destroy ();
           delete $5;
           $5 = 0;
@@ -3772,7 +3784,7 @@ exception :
            * Push the exception scope on the scope stack.
            */
           idl_global->scopes ().push (e);
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -3953,14 +3965,14 @@ init_decl
                           ACE_TEXT ("factory construct.\n"),
                           idl_global->filename ()->get_string (),
                           idl_global->lineno ()));
-                          
+
               idl_global->set_err_count (idl_global->err_count () + 1);
             }
 
           Identifier id ($3);
           ACE::strdelete ($3);
           $3 = 0;
-          
+
           UTL_ScopedName n (&id,
                             0);
           AST_Factory *factory = 0;
@@ -4078,7 +4090,7 @@ in_parameter :
                   (void) s->fe_add_argument (a);
                 }
             }
-            
+
           $5->destroy ();
           delete $5;
           $5 = 0;
@@ -4168,7 +4180,7 @@ parameter :
                     }
                 }
             }
-            
+
           $5->destroy ();
           delete $5;
           $5 = 0;
@@ -4410,11 +4422,11 @@ typeid_dcl
                      $3->get_string ()
                    );
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -4448,11 +4460,11 @@ typeprefix_dcl
                      $3->get_string ()
                    );
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -4486,7 +4498,7 @@ component_forward_decl :
               f = idl_global->gen ()->create_component_fwd (&n);
               (void) s->fe_add_component_fwd (f);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -4587,14 +4599,14 @@ component_header :
                                               $6,
                                               false),
                           1);
-                          
+
           if (0 != $6)
             {
               $6->destroy ();
               delete $6;
               $6 = 0;
             }
-                          
+
           if (0 != $4)
             {
               $4->destroy ();
@@ -4706,15 +4718,15 @@ provides_decl :
               if (0 == d)
                 {
                   idl_global->err ()->lookup_error ($2);
-                         
+
                   $2->destroy ();
                   delete $2;
                   $2 = 0;
-                  
+
                   $3->destroy ();
                   delete $3;
                   $3 = 0;
-                  
+
                   break;
                 }
               else if (d->node_type () != AST_Decl::NT_interface)
@@ -4726,19 +4738,19 @@ provides_decl :
                         != 0)
                     {
                       idl_global->err ()->interface_expected (d);
-                         
+
                       $2->destroy ();
                       delete $2;
                       $2 = 0;
-                  
+
                       $3->destroy ();
                       delete $3;
                       $3 = 0;
-                  
+
                       break;
                     }
                 }
-                
+
               AST_Type *interface_type =
                 AST_Type::narrow_from_decl (d);
 
@@ -4747,7 +4759,7 @@ provides_decl :
               pd.impl = interface_type;
               c->provides ().enqueue_tail (pd);
             }
-                         
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -4800,15 +4812,15 @@ uses_decl :
           if (0 == d)
             {
               idl_global->err ()->lookup_error ($3);
-                         
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-          
+
               $4->destroy ();
               delete $4;
               $4 = 0;
-                  
+
               break;
             }
           else if (d->node_type () != AST_Decl::NT_interface)
@@ -4818,15 +4830,15 @@ uses_decl :
                     != 0)
                 {
                   idl_global->err ()->interface_expected (d);
-                         
+
                   $3->destroy ();
                   delete $3;
                   $3 = 0;
-              
+
                   $4->destroy ();
                   delete $4;
                   $4 = 0;
-                  
+
                   break;
                 }
             }
@@ -4852,7 +4864,7 @@ uses_decl :
                   idl_global->create_uses_multiple_stuff (c, ud);
                 }
             }
-                         
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -4885,29 +4897,29 @@ emits_decl :
           if (0 == d)
             {
               idl_global->err ()->lookup_error ($2);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else if (d->node_type () != AST_Decl::NT_eventtype)
             {
               idl_global->err ()->eventtype_expected (d);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else
@@ -4923,7 +4935,7 @@ emits_decl :
                   c->emits ().enqueue_tail (pd);
                 }
             }
-              
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -4943,29 +4955,29 @@ publishes_decl :
           if (0 == d)
             {
               idl_global->err ()->lookup_error ($2);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else if (d->node_type () != AST_Decl::NT_eventtype)
             {
               idl_global->err ()->eventtype_expected (d);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else
@@ -4981,7 +4993,7 @@ publishes_decl :
                   c->publishes ().enqueue_tail (pd);
                 }
             }
-              
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -5001,29 +5013,29 @@ consumes_decl :
           if (0 == d)
             {
               idl_global->err ()->lookup_error ($2);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else if (d->node_type () != AST_Decl::NT_eventtype)
             {
               idl_global->err ()->eventtype_expected (d);
-              
+
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               $3->destroy ();
               delete $3;
               $3 = 0;
-              
+
               break;
             }
           else
@@ -5039,7 +5051,7 @@ consumes_decl :
                   c->consumes ().enqueue_tail (pd);
                 }
             }
-              
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -5146,25 +5158,25 @@ home_header :
                                          $11,
                                          $13),
                           1);
-                          
+
           $11->destroy ();
           delete $11;
           $11 = 0;
-          
+
           if (0 != $5)
             {
               $5->destroy ();
               delete $5;
               $5 = 0;
             }
-          
+
           if (0 != $13)
             {
               $13->destroy ();
               delete $13;
               $13 = 0;
             }
-          
+
           if (0 != $7)
             {
               $7->destroy ();
@@ -5352,7 +5364,7 @@ finder_decl :
               home->finders ().enqueue_tail (o);
             }
 
-          $2->destroy (); 
+          $2->destroy ();
           delete $2;
           $2 = 0;
 
@@ -5425,7 +5437,7 @@ event_concrete_forward_decl :
                                                             false);
               (void) s->fe_add_valuetype_fwd (f);
             }
-            
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -5454,7 +5466,7 @@ event_abs_forward_decl :
                                                             true);
               (void) s->fe_add_valuetype_fwd (f);
             }
-            
+
           $3->destroy ();
           delete $3;
           $3 = 0;
@@ -5503,7 +5515,7 @@ event_abs_decl :
            * Push it on the scope stack.
            */
           idl_global->scopes ().push (e);
-            
+
           $1->destroy ();
           delete $1;
           $1 = 0;
@@ -5586,19 +5598,19 @@ event_rest_of_header :
                               0,
                               $1,
                               $3,
-                              $1 
+                              $1
                                 ? $1->truncatable ()
                                 : false
                             ),
                           1);
-                          
+
           if (0 != $3)
             {
               $3->destroy ();
               delete $3;
               $3 = 0;
             }
-                          
+
           if (0 != $1)
             {
               $1->destroy ();
@@ -5651,7 +5663,7 @@ event_decl :
               $2->destroy ();
               delete $2;
               $2 = 0;
-              
+
               sn.destroy ();
             }
 
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 43423a53333..76378720d17 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -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;
@@ -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];
@@ -1515,8 +1513,8 @@ case 77:
 TAO_YY_RULE_SETUP
 {
                   /* Skip the quotes */
-                  char *tmp = ace_tao_yytext;
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  char * const tmp = ace_tao_yytext;
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -1535,8 +1533,8 @@ case 78:
 TAO_YY_RULE_SETUP
 {
                   /* Skip the bookends */
-                  char *tmp = ACE_OS::strdup (ace_tao_yytext);
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  char * const tmp = ACE_OS::strdup (ace_tao_yytext);
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -1657,15 +1655,16 @@ case 100:
 TAO_YY_RULE_SETUP
 {
                   for(;;) {
-                    char c = tao_yyinput();
+                    char const c = tao_yyinput();
                     if (c == '*') {
-                      char next = tao_yyinput();
+                      char const next = tao_yyinput();
                       if (next == '/')
                         break;
                       else
                         tao_yyunput(c, 0);
-                      if (c == '\n')
-                        idl_global->set_lineno(idl_global->lineno() + 1);
+                    }
+                    else if (c == '\n') {
+                      idl_global->set_lineno(idl_global->lineno() + 1);
                     }
                   }
                 }
@@ -1980,7 +1979,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 +2014,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;
         }
@@ -2808,7 +2807,7 @@ idl_store_pragma (char *buf)
             {
               idl_global->root ()->prefix (new_prefix);
             }
-                
+
           if (idl_global->in_main_file ())
             {
               idl_global->root ()->set_imported (false);
@@ -3291,7 +3290,7 @@ idl_valid_version (char *s)
         }
     }
 
-  int len = minor - s;
+  ptrdiff_t const len = minor - s;
 
   for (i = 0; i < len; ++i)
     {
@@ -3314,22 +3313,22 @@ idl_valid_version (char *s)
 static AST_Decl *
 idl_find_node (char *s)
 {
-  UTL_ScopedName *node = idl_global->string_to_scoped_name (s);
-  AST_Decl *d = 0;
+  UTL_ScopedName * node = idl_global->string_to_scoped_name (s);
+  AST_Decl * d = 0;
 
   if (node != 0)
     {
       d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
                                                                  true);
-    }
 
-  if (d == 0)
-    {
-      idl_global->err ()->lookup_error (node);
+      if (d == 0)
+        {
+          idl_global->err ()->lookup_error (node);
+        }
+
+      node->destroy ();
+      delete node;
     }
 
-  node->destroy ();
-  delete node;
-  node = 0;
   return d;
 }
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 0b58b9b6047..005104aa44e 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -2898,7 +2898,7 @@ tao_yyreduce:
               else
                 {
                   AST_Decl::NodeType nt = tp->node_type ();
-                  
+
                   if (nt == AST_Decl::NT_valuetype
                       || nt == AST_Decl::NT_eventtype)
                     {
@@ -3962,6 +3962,7 @@ tao_yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           FE_Declarator *d = 0;
           AST_Typedef *t = 0;
+          unsigned long index = 0UL;
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclaratorsSeen);
 
           /*
@@ -3998,6 +3999,17 @@ tao_yyreduce:
                                                           d->name (),
                                                           s->is_local (),
                                                           s->is_abstract ());
+
+                  // If the base type is a sequence or array, the typedef
+                  // constructor sets owns_base_type_ to true. But if
+                  // there is a comma-separated list of such typedefs,
+                  // the base type can be destroyed only once. In all
+                  // other cases, the line below has no effect.
+                  if (index++ > 0)
+                    {
+                      t->owns_base_type (false);
+                    }
+
                   (void) s->fe_add_typedef (t);
                 }
 
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index d21987bce57..643023a5522 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -98,10 +98,13 @@ public:
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
-  
+
   virtual bool is_local (void);
   // Override the base class method.
 
+  void owns_base_type (bool val);
+  // Sometimes this has to be managed from outside.
+
   // Narrowing.
   DEF_NARROW_METHODS1(AST_Typedef, AST_Type);
   DEF_NARROW_FROM_DECL(AST_Typedef);
@@ -124,7 +127,7 @@ private:
 
   AST_Type *pd_base_type;
   // Typedef base type.
-  
+
   bool owns_base_type_;
   // If our base type is anonymous array or sequence, we're
   // responsible for destroying it.
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index 8283d388664..1cf1bdf81b6 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -26,6 +26,9 @@ public:
 
   virtual ~AST_ValueType (void);
 
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  // Are we or the node represented by node involved in recursion.
+
   // This also calls the base class version.
   virtual void redefine (AST_Interface *from);
 
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index e75f5b90ca3..f630c943774 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -78,13 +78,11 @@ TAO_IDL_FE_Export void FE_store_env_include_paths (void);
 TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (void);
 TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (void);
 
-class File;
-
 TAO_IDL_FE_Export int
 FE_yyparse (void);
 
 TAO_IDL_FE_Export void
-FE_set_yyin (File *);    // Set yyin
+FE_set_yyin (FILE *);    // Set yyin
 
 // Interface to constructors for objects need by the driver
 
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index f1b717bda81..c7936c7aef1 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -228,9 +228,6 @@ public:
   void supports_error (UTL_ScopedName *n,
                        AST_Decl *d);
 
-  // Report an attempt to have a derived component or home support something.
-  void derived_supports_error (UTL_ScopedName *n);
-
   // Report an attempt to illegally inherit from an abstract type.
   void abstract_inheritance_error (UTL_ScopedName *v,
                                    UTL_ScopedName *i);
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 5af3fb1eb94..ad32450cd3c 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -46,7 +46,7 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile, tao_vc8warnings {
   sharedname   = TAO_IDL_BE
   libs        += TAO_IDL_FE
   dynamicflags = TAO_IDL_BE_BUILD_DLL
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
index dd34ce2c344..2afa0aeddde 100644
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_decllist.cpp
@@ -70,25 +70,25 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // NOTE: This list class only works correctly because we use single public
 //       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
+//   It relies on a type-unsafe cast from UTL_List to subclasses, which
+//   will cease to operate correctly if you use either multiple or
+//   public virtual inheritance.
 
 #include "utl_decllist.h"
 #include "fe_declarator.h"
 
-ACE_RCSID (util, 
-           utl_decllist, 
+ACE_RCSID (util,
+           utl_decllist,
            "$Id$")
 
 /*
  * Constructor(s)
  */
 
-UTL_DeclList::UTL_DeclList (FE_Declarator *s, 
+UTL_DeclList::UTL_DeclList (FE_Declarator *s,
                             UTL_DeclList *cdr)
-  : UTL_List(cdr),
-	  pd_car_data(s)
+  : UTL_List (cdr),
+    pd_car_data (s)
 {
 }
 
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 1b7eeb85dd2..15e4d85ea4c 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -924,21 +924,6 @@ UTL_Error::supports_error (UTL_ScopedName *n,
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
-// Report an attempt to have a derived component or home support something.
-void
-UTL_Error::derived_supports_error (UTL_ScopedName *n)
-{
-  idl_error_header (EIDL_CANT_SUPPORT,
-                    idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
-  ACE_ERROR ((LM_ERROR,
-              "derived component or home "));
-  n->dump (*ACE_DEFAULT_LOG_STREAM);
-  ACE_ERROR ((LM_ERROR,
-              " may not directly support interfaces\n"));
-  idl_global->set_err_count (idl_global->err_count () + 1);
-}
-
 // Report illegal inheritance from non-abstract valuetype or interface.
 void
 UTL_Error::abstract_inheritance_error (UTL_ScopedName *v,
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index dbb5f016cdd..017a5372ae1 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1154,7 +1154,7 @@ IDL_GlobalData::update_prefix (char *filename)
       return;
     }
 
-  ACE_CString tmp ("", 0, 0);
+  ACE_CString tmp ("", 0, false);
   char *main_filename = this->pd_main_filename->get_string ();
 
   char *prefix = 0;
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index 18fd8ee813f..926e7f8517e 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -99,7 +99,7 @@ Identifier::Identifier (const char *s)
 
       shift = true;
       this->escaped_ = true;
-      ACE_CString str (s, 0, 0);
+      ACE_CString str (s, 0, false);
 
       if (str.find ("_tc_") == 0
           || str.find ("_tao_") == 0)
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 1d99aec546e..b11bd3d452b 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -384,7 +384,7 @@ UTL_Scope::idl_keyword_clash (Identifier *e)
 
   ACE_CString ext_id (utl_tmp.get_canonical_rep (),
                       0,
-                      0);
+                      false);
 
   int status = idl_global->idl_keywords ().find (ext_id);
 
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index bb12f2001f3..e718114dbe6 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -97,7 +97,7 @@ UTL_String::UTL_String (const char *str)
     {
       this->len = ACE_OS::strlen (str);
       this->p_str = ACE::strnew (str);
-      this->c_str = (char *) ACE_OS::malloc (this->len + 1);
+      this->c_str = new char[this->len + 1];
       this->canonicalize ();
     }
 }
@@ -124,7 +124,7 @@ UTL_String::UTL_String (UTL_String *s)
         {
           this->len = ACE_OS::strlen (b);
           this->p_str = ACE::strnew (b);
-          this->c_str = (char *) ACE_OS::malloc (this->len + 1);
+          this->c_str = new char[this->len + 1];
           this->canonicalize ();
         }
     }
@@ -132,6 +132,8 @@ UTL_String::UTL_String (UTL_String *s)
 
 UTL_String::~UTL_String (void)
 {
+  ACE::strdelete (this->p_str);
+  delete [] this->c_str;
 }
 
 // Compute a canonical form for this string. This is (implemented as)
@@ -230,17 +232,11 @@ UTL_String::compare_quiet (UTL_String *s)
 void
 UTL_String::destroy (void)
 {
-  if (this->p_str != 0)
-    {
-      ACE::strdelete (this->p_str);
-      this->p_str = 0;
-    }
+  ACE::strdelete (this->p_str);
+  this->p_str = 0;
 
-  if (this->c_str != 0)
-    {
-      ACE_OS::free (this->c_str);
-      this->c_str = 0;
-    }
+  delete [] this->c_str;
+  this->c_str = 0;
 }
 
 // Get the char * from a String.
@@ -256,7 +252,7 @@ UTL_String::get_canonical_rep (void)
 {
   if (this->c_str == 0)
     {
-      this->c_str = (char *) ACE_OS::malloc (this->len + 1);
+      this->c_str = new char[this->len + 1];
       this->canonicalize ();
     }
 
diff --git a/TAO/VERSION b/TAO/VERSION
index 55dc2de4368..e6b60995c08 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.5.6, released Sun Jan 28 19:59:14 2007.
+This is TAO version 1.5.7, released Wed Mar 21 12:12:26 CDT 2007
 
 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/ACE/bin/ADDIDL.DSM b/TAO/bin/ADDIDL.DSM
index b53ea3eb636..b53ea3eb636 100644
--- a/ACE/bin/ADDIDL.DSM
+++ b/TAO/bin/ADDIDL.DSM
diff --git a/ACE/bin/corba-boolean.perl b/TAO/bin/corba-boolean.perl
index 92e793fc941..92e793fc941 100755
--- a/ACE/bin/corba-boolean.perl
+++ b/TAO/bin/corba-boolean.perl
diff --git a/ACE/bin/rm_exception_macros.pl b/TAO/bin/rm_exception_macros.pl
index 1f671cf154f..7f3691380a1 100755
--- a/ACE/bin/rm_exception_macros.pl
+++ b/TAO/bin/rm_exception_macros.pl
@@ -36,7 +36,8 @@ my(%macros) = ('ACE_ENV_TYPE'                  => 'CORBA::Environment',
                'ACE_CHECK_RETURN *\(.*\)'      => '',
                'ACE_THROW_INT *\((.*)\)'       => 'throw $1',
                'ACE_THROW *\((.*)\)'           => 'throw $1',
-#               'ACE_THROW_RETURN *\((.*),.+\)' => 'throw $1',
+               'ACE_THROW_RETURN *\((.*),.+\)' => 'throw $1',
+               'ACE_THROW_SPEC *\((.*)\)'      => '',
                'ACE_TRY'                       => 'try',
                'ACE_TRY_NEW_ENV'               => 'try',
                'ACE_TRY_EX *\([^\)]+\)'        => 'try',
@@ -72,18 +73,18 @@ sub process_file {
     my(@lines) = ();
     my($mod)   = undef;
     my($line)  = '';
-    my($cont_until_semicolon) = undef;
+    my($cont_until_this) = undef;
     while(<$fh>) {
       my($part) = $_;
       $part =~ s/\s+$//;
 
-      if ($cont_until_semicolon) {
+      if ($cont_until_this) {
         if ($part =~ s/^\s+// && $line =~ /[,\)]$/) {
           $part = ' ' . $part;
         }
         $line .= $part;
-        if (index($part, ';') >= 0) {
-          $cont_until_semicolon = undef;
+        if (index($part, $cont_until_this) >= 0) {
+          $cont_until_this = undef;
         }
         else {
           next;
@@ -95,10 +96,13 @@ sub process_file {
 
       my($skip_blank) = undef;
       foreach my $key (@keys) {
-        my($base) = undef;
+        my($ats)    = (index($key, 'ACE_THROW_SPEC') == 0);
+        my($search) = ($ats ? '))' : ';');
+        my($base)   = undef;
         if ($key =~ /^([^\s]+\s\*\\\()/) {
           $base = $1;
         }
+
         if ($line =~ /^(\s*)?($key\s*[;]?)/) {
           my($space)  = $1;
           my($rest)   = $2;
@@ -123,9 +127,22 @@ sub process_file {
           }
 
           $line =~ s/^(\s*)?($key\s*[;]?)//;
-          $val .= ';' if ($val ne '' && $rest =~ /;$/);
-          $line = $space . $val . $line;
-          $line =~ s/^\s+$//;
+
+          ## A special concession for ACE_THROW_SPEC.  In the header
+          ## we want to ensure that the semi-colon is preserved and if
+          ## possible placed on the previous line.  In the source file
+          ## we want the whole thing to go away.
+          $val .= ';' if (($ats || $val ne '') && $rest =~ /;$/);
+          if ($ats && index($val, ';') == 0 &&
+              !($lines[$#lines] =~ /\/\/.*$/ ||
+                $lines[$#lines] =~ /\/\*.*\*\/$/)) {
+            $lines[$#lines] .= $val;                          
+            $line = '';
+          }
+          else {
+            $line = $space . $val . $line;
+            $line =~ s/^\s+$//;
+          }
 
           ## Fix up problems where ACE_TRY_THROW is used
           ## on a line by itself with the parenthesis following
@@ -188,8 +205,8 @@ sub process_file {
           last;
         }
         elsif (defined $base &&
-               index($line, ';') == -1 && $line =~ /^(\s*)?$base/) {
-          $cont_until_semicolon = 1;
+               index($line, $search) == -1 && $line =~ /^(\s*)?$base/) {
+          $cont_until_this = $search;
           last;
         }
       }
@@ -197,7 +214,7 @@ sub process_file {
       if ($line =~ s/ACE_ANY_EXCEPTION/ex/g) {
         $mod = 1;
       }
-      if (!$cont_until_semicolon) {
+      if (!$cont_until_this) {
         if ($line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL_WITH_DEFAULTS// ||
             $line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL_NOT_USED// ||
             $line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL// ||
diff --git a/ACE/bin/subst_env.pl b/TAO/bin/subst_env.pl
index be4007b7a61..be4007b7a61 100755
--- a/ACE/bin/subst_env.pl
+++ b/TAO/bin/subst_env.pl
diff --git a/ACE/bin/tao_env.pl b/TAO/bin/tao_env.pl
index 0ac889ef308..0ac889ef308 100755
--- a/ACE/bin/tao_env.pl
+++ b/TAO/bin/tao_env.pl
diff --git a/ACE/bin/tao_svcconf.pl b/TAO/bin/tao_svcconf.pl
index 56d05830f59..56d05830f59 100755
--- a/ACE/bin/tao_svcconf.pl
+++ b/TAO/bin/tao_svcconf.pl
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 7f761398266..a1dce542419 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -640,24 +640,6 @@ also receives other options that are specific to it.<p>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="Ge flag">
-    <td><tt>-Ge </tt><i>flag</i></td>
-    <td>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
-        the generation of environment variables in argument lists for all generated
-        operations, including base class overrides not defined in application IDL.</td>
-    <td>As of TAO 1.5, support for emulated exceptions is in the process of being
-        dropped. The environment variable macros are still present in ORB code and in
-        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>
-  </tr>
-
   <tr><a name="Gp">
     <td><tt>-Gp </tt></td>
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/index.html b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
index 92f4a5f90ba..51f4958af17 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
@@ -71,14 +71,14 @@ private:
 class Quoter_Stock_i : public POA_Quoter::Stock {
 public:
   // some details omitted
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 };
 
 // In the .cpp file:
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
@@ -86,17 +86,6 @@ Quoter_Stock_i::symbol () throw (CORBA::SystemException)
     <P>The other attributes and methods are similar, so we don't
       reproduce them here.
     </P>
-    <P>The first question is what are those <CODE>throw()</CODE>
-      specifications doing there?  Any CORBA operation or attribute
-      can raise a <CODE>CORBA::SystemException</CODE>.  The IDL compiler
-      must generate a throw specification that includes the CORBA
-      system exceptions and any user exceptions listed in the
-      <CODE>raise</CODE> clause.  In turn, the C++ specification requires
-      that any derived classes cannot add exceptions to a throw
-      specification, so you must have a throw specification in your
-      methods, either including <CODE>CORBA::SystemException</CODE> or
-      empty.
-    </P>
 
     <H4>Memory management rules for arguments</H4>
 
@@ -157,8 +146,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory
 public:
   Quoter_Stock_Factory ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   Quoter_Stock_i rhat_;
@@ -173,7 +161,6 @@ private:
 <PRE>
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (strcmp (symbol, "RHAT") == 0) {
     return this->rhat_._this();
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 978df100a3e..aa1359906aa 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -76,7 +76,6 @@ AMH_Servant::parse_args (int &argc, char **argv)
 void
 AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                           Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -121,7 +120,6 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 
 void
 AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -135,7 +133,6 @@ AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
 
 void
 AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
index 26db1af6dba..ea66a38b1b9 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
@@ -33,15 +33,12 @@ public:
   virtual int parse_args (int& argc, char **argv);
 
   // = The skeleton methods
-  virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
-  virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
   virtual void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                            Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
 protected:
   ACE_Reactor *reactor_;
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 48699b49cdd..60c59f02396 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -12,7 +12,6 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 
 void
 Peer_Handler_i::request (CORBA::Long retval)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
@@ -25,19 +24,16 @@ Peer_Handler_i::request (CORBA::Long retval)
 void
 Peer_Handler_i::request_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Peer_Handler_i::start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Peer_Handler_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
 }
@@ -55,7 +51,6 @@ void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
               const ACE_Time_Value &delay)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
@@ -69,14 +64,12 @@ Peer_i::init (CORBA::ORB_ptr orb,
 
 void
 Peer_i::reply (CORBA::Long result)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->progress_->recv_reply (result);
 }
 
 CORBA::Long
 Peer_i::request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
   ACE_OS::sleep (tv);
@@ -87,7 +80,6 @@ Peer_i::request (CORBA::Long id)
 void
 Peer_i::start (const PeerSet &the_peers,
                CORBA::Long iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
     this->reply_handler_._this ();
@@ -104,7 +96,6 @@ Peer_i::start (const PeerSet &the_peers,
 
 void
 Peer_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 99e5436445e..f778761bb69 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -27,17 +27,13 @@ public:
   Peer_Handler_i (Peer_i *peer);
   // The peer
 
-  virtual void request (CORBA::Long retval)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request (CORBA::Long retval);
 
-  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   Peer_i *peer_;
@@ -55,24 +51,19 @@ public:
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
-             const ACE_Time_Value &delay)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+             const ACE_Time_Value &delay);
 
-  void reply (CORBA::Long result)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void reply (CORBA::Long result);
   // Used by the Reply_Handler to indicate that a reply has been
   // received.
 
    // = See test.idl for an explanation of these methods.
-  CORBA::Long request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long request (CORBA::Long id);
 
   void start (const PeerSet& the_peers,
-              CORBA::Long iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              CORBA::Long iterations);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   Peer_Handler_i reply_handler_;
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 4bf0e7e1054..d998c68fc29 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -16,7 +16,6 @@ Progress_i::Progress_i (Progress_Window *window)
 
 void
 Progress_i::sent_request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
   this->window_->sent_request (id);
@@ -24,14 +23,12 @@ Progress_i::sent_request (CORBA::Long id)
 
 void
 Progress_i::recv_reply (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->recv_reply (id);
 }
 
 CORBA::Long
 Progress_i::bind (Peer_ptr a_peer)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
   return this->window_->bind (a_peer);
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 3761dd58206..7d9c8fbe9ee 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -73,12 +73,9 @@ public:
   // ctor
 
   // = The Progress methods.
-  void sent_request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void recv_reply (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  CORBA::Long bind (Peer_ptr a_peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void sent_request (CORBA::Long id);
+  void recv_reply (CORBA::Long id);
+  CORBA::Long bind (Peer_ptr a_peer);
 
 private:
   Progress_Window* window_;
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 14fbfa282a2..05e3a50db81 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 34c26812fda..d8e6a59f4e8 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index 16f24c89b7e..d20f18f86d7 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -12,8 +12,8 @@ project(*client) : taoclient, anytypecode {
   after += *idl
   requires += corba_messaging
   source_files {
-    client.cpp
     timeC.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -22,9 +22,9 @@ project(*client) : taoclient, anytypecode {
 project(*server) : taoserver {
   after += *idl
   source_files {
-    server.cpp
-    timeS.cpp
     timeC.cpp
+    timeS.cpp
+    server.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp
index 593d3bd28b3..6c09361882f 100644
--- a/TAO/examples/Advanced/ch_8_and_10/client.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp
@@ -161,7 +161,7 @@ main(int argc, char * argv[])
             ctrl = CCS::Controller::_narrow(obj.in());
         } catch (const CORBA::SystemException & se) {
 			std::cerr << "Cannot narrow controller reference: "
-                 //<< se 
+                 //<< se
                  << std::endl;
             throw 0;
         }
@@ -186,18 +186,18 @@ main(int argc, char * argv[])
 
         // Show details for each device.
         for (CORBA::ULong i = 0; i < list->length(); i++)
-			std::cout << list[i].in();
-		std::cout << std::endl;
+          std::cout << list[i].in();
+        std::cout << std::endl;
 
         // Change the location of first device in the list
         CCS::AssetType anum = list[(CORBA::ULong) 0]->asset_num();
-		std::cout << "Changing location of device "
-			<< anum << "." << std::endl;
+        std::cout << "Changing location of device "
+                  << anum << "." << std::endl;
         list[(CORBA::ULong) 0]->location("Earth");
         // Check that the location was updated
-		std::cout << "New details for device "
-			<< anum << " are:" << std::endl;
-		std::cout << list[(CORBA::ULong) 0] << std::endl;
+        std::cout << "New details for device "
+                  << anum << " are:" << std::endl;
+        std::cout << list[(CORBA::ULong) 0] << std::endl;
 
         // Find first thermostat in list.
         CCS::Thermostat_var tmstat;
@@ -257,8 +257,8 @@ main(int argc, char * argv[])
 			std::cerr << ec;                     // Overloaded <<
         }
     } catch (const CORBA::Exception & e) {
-		std::cerr << "Uncaught CORBA exception: " 
-             //<< e 
+		std::cerr << "Uncaught CORBA exception: "
+             //<< e
              << std::endl;
         return 1;
     } catch (...) {
diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp
index f81f40ae13a..f11c10a100a 100644
--- a/TAO/examples/Advanced/ch_8_and_10/server.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp
@@ -333,7 +333,7 @@ change (
             // to the errors sequence.
             CORBA::ULong len = ec.errors.length ();
             ec.errors.length (len + 1);
-            ec.errors[len].tmstat_ref = CCS::Thermostat::_duplicate (tlist[i]);
+            ec.errors[len].tmstat_ref = tlist[i];
             ec.errors[len].info = bt.details;
         }
     }
@@ -455,8 +455,8 @@ main (int argc, char * argv[])
         orb->run ();
     }
     catch (const CORBA::Exception & e) {
-        std::cerr << "Uncaught CORBA exception: " 
-                  //<< e 
+        std::cerr << "Uncaught CORBA exception: "
+                  //<< e
                   << std::endl;
         return 1;
     }
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 5194742ca10..4681a366900 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -12,10 +12,10 @@ project(*Server): messaging, taoserver, ami {
   exename = server
   after += *IDL
   Source_Files {
-    test_i.cpp
-    server.cpp
     testS.cpp
     testC.cpp
+    test_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -25,9 +25,9 @@ project(*Client): messaging, taoserver, ami {
   exename = client
   after += *IDL
   Source_Files {
-    client.cpp
     testS.cpp
     testC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index acc617edb2d..4304f182270 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -53,7 +53,6 @@ class Reply_Handler : public POA_AMI_testHandler
 {
 public:
   void method (CORBA::ULong reply_number)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "client: AMI Reply %d @ %T\n",
@@ -65,7 +64,6 @@ public:
     }
 
   void method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
       {
@@ -78,12 +76,10 @@ public:
   }
 
   void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void shutdown_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
       {
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 683b7cb6ed7..188952f828e 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -12,7 +12,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 void
 test_i::method (CORBA::ULong request_number,
                 CORBA::ULong_out reply_number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server: Iteration %d @ %T\n",
@@ -23,7 +22,6 @@ test_i::method (CORBA::ULong request_number,
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index e1263790a91..d136bfb0567 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -29,11 +29,9 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               CORBA::ULong_out reply_number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               CORBA::ULong_out reply_number);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index ab9ad6c7c48..08011a0f403 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -11,7 +11,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server: Iteration %d @ %T\n",
@@ -20,7 +19,6 @@ test_i::method (CORBA::ULong request_number)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index 674e65be4f9..bed392b0324 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -28,11 +28,9 @@ public:
   // ctor.
 
   // = The test interface methods.
-  void method (CORBA::ULong request_number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (CORBA::ULong request_number);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index d3e1d5cb42b..a714c274f5f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -38,7 +38,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow(obj.in());
@@ -47,7 +47,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   for (CORBA::Long i = 1; i <= 100; i++)
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index f5659723d0e..83ecc32166d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -25,7 +25,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -35,7 +34,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -44,7 +42,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -53,7 +50,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -72,16 +68,13 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
+  ++this->count_op5_;;
 }
 
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index 2829a446f59..b7b33f0638e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -14,23 +14,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index 3f3330912ac..f7aec920724 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -45,7 +45,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -55,7 +55,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -74,7 +74,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the thread pool servant dispatching strategy object, and
@@ -87,7 +87,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the servant object.
@@ -108,7 +108,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to activate servant (Foo_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Stringify the object reference
@@ -123,7 +123,7 @@ ServerApp::run(int argc, char* argv[])
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Cannot open output file for writing IOR: %s",
                  this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in ());
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index b5ce48c7133..42a35f0c15d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -38,7 +38,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow(obj.in());
@@ -47,7 +47,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   for (CORBA::Long i = 1; i <= 100; i++)
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index a6773b691ee..461047110cc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -23,7 +23,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -33,7 +32,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -42,7 +40,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -51,7 +48,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -70,16 +66,13 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
+  ++this->count_op5_;;
 }
 
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index e81153d9dc6..695b1219e49 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -16,23 +16,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 0ea97ea6429..0b30358473b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -48,7 +48,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -58,7 +58,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -79,7 +79,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   policies[0]->destroy ();
@@ -96,7 +96,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   FooServantList servants(this->ior_filename_.c_str(),
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index 9a330589bd5..a1956a49971 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -13,8 +13,8 @@ project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
   after += *idl
 
   Source_Files {
-    FooS.cpp
     FooC.cpp
+    FooS.cpp
     Foo_i.cpp
     OrbTask.cpp
     ServerApp.cpp
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index f5301dfc2d2..f4f861490d6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -38,7 +38,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow(obj.in());
@@ -47,7 +47,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   for (CORBA::Long i = 1; i <= 100; i++)
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index bbc9b5fa385..426b75936a0 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -17,14 +17,12 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
 }
@@ -32,7 +30,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -41,7 +38,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
 }
@@ -49,7 +45,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   throw FooException();
 }
@@ -57,7 +52,6 @@ Foo_i::op5(void)
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index 7bd860e3640..eb1ca654c5a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -12,23 +12,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
   private:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 62a7bb49b6b..8f488b1fe10 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -48,7 +48,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -58,7 +58,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -77,7 +77,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the thread pool servant dispatching strategy object, and
@@ -90,7 +90,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the servant object.
@@ -111,7 +111,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to activate servant (Foo_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Stringify the object reference
@@ -126,7 +126,7 @@ ServerApp::run(int argc, char* argv[])
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Cannot open output file for writing IOR: %s",
                  this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in ());
@@ -159,7 +159,7 @@ ServerApp::run(int argc, char* argv[])
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW_RETURN (TestException(), -1);
+          throw TestException();
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index 61712fb4fae..9c328747bfc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -15,9 +15,6 @@ Callback_i::~Callback_i ()
 void
 Callback_i::test_method (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index d9e41b60de4..18f8b0f6631 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
 };
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 9ae1781b873..56d95507f92 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -22,7 +22,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -32,7 +31,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -41,7 +39,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -50,7 +47,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -69,14 +65,12 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n"));
   unsigned newcount = ++this->count_op5_;
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Counter is now %d.\n", newcount));
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));
-  ACE_THROW_SPEC (FooException());
+  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));;
 }
 
 
@@ -85,9 +79,6 @@ Foo_i::op6 (
   const char * user_name,
   char *& message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_CString str(message);
   str += user_name;
@@ -101,9 +92,6 @@ void
 Foo_i::test_unbounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
                        ACE_TEXT("got unbounded string %s\n"),
@@ -115,9 +103,6 @@ void
 Foo_i::test_bounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
                        ACE_TEXT("got bounded string %s\n"),
@@ -129,9 +114,6 @@ void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   for (CORBA::ULong i = 0; i < 20; i++)
     {
@@ -146,9 +128,6 @@ void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -160,9 +139,6 @@ void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -174,9 +150,6 @@ void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -187,9 +160,6 @@ void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -200,9 +170,6 @@ void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
                        ACE_TEXT(" %s \n"), messages[0].in ()));
@@ -217,9 +184,6 @@ void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
                        ACE_TEXT(" got special basic arg: %d \n"), value));
@@ -230,9 +194,6 @@ void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
@@ -244,9 +205,6 @@ void
 Foo_i::callback_object (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
 }
@@ -254,9 +212,6 @@ ACE_THROW_SPEC ((
 void
 Foo_i::test_callback (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
@@ -271,7 +226,6 @@ ACE_THROW_SPEC ((
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index bb209487d87..bda78300650 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -17,114 +17,69 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_var_array_arg (
         const ::Var_Array messages
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void callback_object (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_callback (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
+      );
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index 09a9a31049a..877a651de56 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -54,7 +54,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR ((LM_ERROR,
                   " (%P|%t) Panic: nil PolicyManager\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
     CORBA::Any policy_value;
@@ -79,7 +79,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -89,7 +89,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -109,7 +109,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the ChildPoa_1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var child_poa_2 = root_poa->create_POA("ChildPoa_2",
@@ -120,7 +120,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the ChildPoa_2.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   policies[0]->destroy ();
@@ -139,7 +139,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa 1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo1 = this->create_foo(child_poa_1.in(),
@@ -170,7 +170,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
         "(%P|%t) Failed to open the collocated client1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   ClientTask client2 (foo2.in (), callback2.in ());
@@ -178,7 +178,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
         "(%P|%t) Failed to open the collocated client2.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Run the ORB event loop.
@@ -270,7 +270,7 @@ ServerApp::create_foo (
       ACE_ERROR((LM_ERROR,
                   "(%P|%t) Failed to activate servant (%s).\n",
                   servant_name));
-      ACE_THROW_RETURN (TestException(), Foo::_nil ());
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow (obj.in ());
@@ -298,7 +298,7 @@ ServerApp::create_callback(
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Failed to activate servant (%s).\n",
       servant_name));
-    ACE_THROW_RETURN (TestException(), Callback::_nil ());
+    throw TestException();
   }
 
   Callback_var callback = Callback::_narrow (obj.in ());
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index 61712fb4fae..9c328747bfc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -15,9 +15,6 @@ Callback_i::~Callback_i ()
 void
 Callback_i::test_method (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index 016ff3fb464..d45d948fb53 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 };
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index ae572aae83e..86374211588 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -44,7 +44,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow(obj.in());
@@ -53,7 +53,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the callback object using the child poa with the custom
@@ -64,7 +64,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -74,7 +74,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -93,7 +93,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the thread pool servant dispatching strategy object, and
@@ -108,7 +108,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   // Create the servant object.
@@ -129,7 +129,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to activate servant (Callback_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Callback_var callback = Callback::_narrow (obj.in ());
@@ -138,7 +138,7 @@ ClientApp::run(int argc, char* argv[])
 
   if (client_task.open () != 0)
     {
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
     // Activate the POA Manager
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index de8c5c5b9e8..e749ebdab9f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -24,7 +24,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -34,7 +33,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -43,7 +41,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
 
@@ -58,7 +55,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -77,7 +73,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
   throw FooException();
@@ -89,9 +84,6 @@ Foo_i::op6 (
   const char * user_name,
   char *& message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_CString str(message);
   str += user_name;
@@ -105,9 +97,6 @@ void
 Foo_i::test_unbounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
                        ACE_TEXT("got unbounded string %s\n"),
@@ -119,9 +108,6 @@ void
 Foo_i::test_bounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
                        ACE_TEXT("got bounded string %s\n"),
@@ -133,9 +119,6 @@ void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   for (CORBA::ULong i = 0; i < 20; i++)
     {
@@ -150,9 +133,6 @@ void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -164,9 +144,6 @@ void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -178,9 +155,6 @@ void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -191,9 +165,6 @@ void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -204,9 +175,6 @@ void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
                        ACE_TEXT(" %s \n"), messages[0].in ()));
@@ -221,9 +189,6 @@ void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
                        ACE_TEXT(" got special basic arg: %d \n"), value));
@@ -234,9 +199,6 @@ void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
@@ -248,9 +210,6 @@ void
 Foo_i::callback_object (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
 }
@@ -258,9 +217,6 @@ ACE_THROW_SPEC ((
 void
 Foo_i::test_callback (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
@@ -275,7 +231,6 @@ ACE_THROW_SPEC ((
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 9b0db58c201..5173fa40f6e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -16,114 +16,69 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_var_array_arg (
         const ::Var_Array messages
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void callback_object (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_callback (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
+      );
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
     void active (bool flag);
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index 82162205ef5..25380861656 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -53,7 +53,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -63,7 +63,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -85,7 +85,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   policies[0]->destroy ();
@@ -102,7 +102,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   FooServantList servants(this->ior_filename_.c_str(),
@@ -144,7 +144,7 @@ ServerApp::run(int argc, char* argv[])
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW_RETURN (TestException(), -1);
+          throw TestException();
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index 20122bafaea..824dca4d76d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -15,8 +15,8 @@ project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, avoids_corba_
   after += *idl
 
   Source_Files {
-    FooS.cpp
     FooC.cpp
+    FooS.cpp
     Foo_i.cpp
     ServerApp.cpp
     server_main.cpp
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index 13d30e1711f..a9e90ec1351 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -38,7 +38,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
   Foo_var foo = Foo::_narrow(obj.in());
@@ -47,7 +47,7 @@ ClientApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
+      throw TestException();
     }
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index f2044eb4e8b..336c96d8b53 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -26,7 +26,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -36,7 +35,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -45,7 +43,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -54,7 +51,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -73,7 +69,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
   throw FooException();
@@ -82,7 +77,6 @@ Foo_i::op5(void)
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index 2858ec966ad..a5bf36c4040 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -12,23 +12,17 @@ class Foo_i
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 3fe87380250..4754d132955 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -46,7 +46,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   PortableServer::POA_var root_poa
@@ -56,7 +56,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   PortableServer::POAManager_var poa_manager
@@ -78,7 +78,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   policies[0]->destroy ();
@@ -93,7 +93,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   // Create the Foo_i object.
@@ -109,7 +109,7 @@ ServerApp::run(int argc, char* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to activate servant foo_tie_i.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   // Stringify the object reference
@@ -124,7 +124,7 @@ ServerApp::run(int argc, char* argv[])
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Cannot open output file for writing IOR: %s",
                  this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);;
+      throw TestException();;
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in ());
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 01387043653..5b96007db67 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -12,12 +12,12 @@ project(*IDL): taoidldefaults {
 project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro {
   after += *IDL
   Source_Files {
+    NotifierC.cpp
+    NotifierS.cpp
+    ConsumerC.cpp
     Notifier_i.cpp
     Notifier_Input_Handler.cpp
     notifier.cpp
-    NotifierS.cpp
-    NotifierC.cpp
-    ConsumerC.cpp
   }
   IDL_Files {
   }
@@ -26,14 +26,14 @@ project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro {
 project(Callback_Quoter consumer): namingexe, portableserver {
   after += *IDL
   Source_Files {
+    ConsumerC.cpp
+    ConsumerS.cpp
+    NotifierC.cpp
     Consumer_Input_Handler.cpp
     Consumer_Signal_Handler.cpp
     Consumer_Handler.cpp
     consumer.cpp
     Consumer_i.cpp
-    ConsumerS.cpp
-    ConsumerC.cpp
-    NotifierC.cpp
   }
   IDL_Files {
   }
@@ -42,13 +42,13 @@ project(Callback_Quoter consumer): namingexe, portableserver {
 project(Callback_Quoter supplier): namingexe, portableserver {
   after += *IDL
   Source_Files {
+    ConsumerC.cpp
+    ConsumerS.cpp
+    NotifierC.cpp
     Supplier_i.cpp
     Supplier_Timer_Handler.cpp
     supplier.cpp
     Consumer_i.cpp
-    ConsumerS.cpp
-    ConsumerC.cpp
-    NotifierC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index 131e606e112..871286236c1 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -29,7 +29,6 @@ Consumer_i::~Consumer_i (void)
 
 void
 Consumer_i::push (const Callback_Quoter::Info &data)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // On getting the needed information you now proceed to the next
   // step, which could be obtaining the shares.
@@ -42,7 +41,6 @@ Consumer_i::push (const Callback_Quoter::Info &data)
 
 void
 Consumer_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Instruct the ORB to shutdown.
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index efdaa0c8801..0645b3962c9 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -39,12 +39,10 @@ public:
   ~Consumer_i (void);
   // Destructor.
 
-  void push (const Callback_Quoter::Info & data)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const Callback_Quoter::Info & data);
   // Gets the stock information from the Notifier.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Used to get the consumer to shut down.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 5448a187d08..f98cc97b1be 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -38,8 +38,6 @@ void
 Notifier_i::register_callback (const char *stock_name,
                                CORBA::Long threshold_value,
                                Callback_Quoter::Consumer_ptr consumer_handler)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Callback_Quoter::Invalid_Stock))
 {
   // Store the client information.
   Consumer_Data consumer_data;
@@ -107,8 +105,6 @@ Notifier_i::orb (CORBA::ORB_ptr orb)
 
 void
 Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Callback_Quoter::Invalid_Handle))
 {
   // The consumer_map consists of a map of stocknames with consumers
   // and their threshold values attached to it. To unregister a
@@ -154,7 +150,6 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer)
 void
 Notifier_i::market_status (const char *stock_name,
                            CORBA::Long stock_value)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Notifier_i:: The stockname is %s with price %d\n",
@@ -202,7 +197,6 @@ Notifier_i::market_status (const char *stock_name,
 
 void
 Notifier_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->consumer_map_.close () > 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index db15a8de06f..51c6573664c 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -51,27 +51,21 @@ public:
 
   virtual void register_callback (const char *stock_name,
                                   CORBA::Long threshold_value,
-                                  Callback_Quoter::Consumer_ptr consumer_handler)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Callback_Quoter::Invalid_Stock));
+                                  Callback_Quoter::Consumer_ptr consumer_handler);
   // Register a distributed callback handler that is invoked when the
   // given stock reaches the desired threshold value.
 
-  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Callback_Quoter::Invalid_Handle));
+  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler);
   // Remove the consumer object.
 
   virtual void market_status (const char *stock_name,
-                              CORBA::Long stock_value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Long stock_value);
   // Get the market status.
 
   void orb (CORBA::ORB_ptr orb);
   // Get the orb pointer.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown the Notifier.
 
   // CONSUMER_MAP* get_consumer_map_ptr ();
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 3172a2ddd7f..02b9580e694 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -13,11 +13,11 @@ project(*Server): messaging, taoserver, ami, namingexe {
   after += *IDL
   avoids += ace_for_tao
   Source_Files {
+    Web_ServerS.cpp
+    Web_ServerC.cpp
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
-    Web_ServerS.cpp
-    Web_ServerC.cpp
   }
   IDL_Files {
   }
@@ -28,10 +28,10 @@ project(*Client): messaging, taoserver, ami, namingexe {
   after += *IDL
   avoids += ace_for_tao
   Source_Files {
-    client.cpp
-    Iterator_Handler.cpp
     Web_ServerS.cpp
     Web_ServerC.cpp
+    client.cpp
+    Iterator_Handler.cpp
   }
   IDL_Files {
   }
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 55754368e9a..25839b2ea8e 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -27,7 +27,6 @@ Content_Iterator_i::~Content_Iterator_i (void)
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
                                 Web_Server::Chunk_Type_out chunk)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
   chunk = new Web_Server::Chunk_Type;
@@ -106,7 +105,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 
 void
 Content_Iterator_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   (void) this->file_io_.close ();
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index 8fba05df706..c5f475d069b 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -52,13 +52,11 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
-                                     Web_Server::Chunk_Type_out chunk)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Web_Server::Chunk_Type_out chunk);
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroy the iterator.
 
 private:
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index 934865fbd92..05e196fc903 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -19,7 +19,6 @@ void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
                                   Web_Server::Metadata_Type_out metadata)
-  ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Received request for file: <%s>\n"),
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index 26cb3a8380d..dcf30076d82 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -45,9 +45,7 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+                             Web_Server::Metadata_Type_out metadata);
   // This factory method returns a <Content_Iterator> that can be used
   // to read the <contents> associated with <pathname> one ``chunk''
   // at a time.  The <metadata> reports information about the
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 4237416f0af..32e79cf6724 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -36,7 +36,6 @@ Iterator_Handler::~Iterator_Handler (void)
 void
 Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
                               const Web_Server::Chunk_Type &chunk_data)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (pending_data)
     {
@@ -79,7 +78,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
 }
 void
 Iterator_Handler::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate this reply handler.
   this->deactivate ();
@@ -90,8 +88,6 @@ void
 Iterator_Handler::run (int *request_count,
                        const char *pathname,
                        Web_Server::Iterator_Factory_ptr factory)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result))
 {
   if (request_count != 0)
       this->request_count_ = request_count;
@@ -114,8 +110,6 @@ void
 Iterator_Handler::initialize_content_iterator
   (const char *pathname,
    Web_Server::Iterator_Factory_ptr factory)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result))
 {
   // Obtain a Content Iterator for the desired file.
   factory->get_iterator (pathname,
@@ -141,7 +135,6 @@ Iterator_Handler::initialize_content_iterator
 
 void
 Iterator_Handler::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index 9427fef211b..bc63b1361f8 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -53,25 +53,21 @@ public:
   // name of the file being retrieved from the web server.
 
   virtual void next_chunk (CORBA::Boolean pending_data,
-                   const Web_Server::Chunk_Type & chunk)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   const Web_Server::Chunk_Type & chunk);
 
   virtual void next_chunk_excep (
       ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException)) {}
+    {}
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void destroy_excep (
       ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException)) {}
+    {}
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+            Web_Server::Iterator_Factory_ptr factory);
   // Activate and run this Reply Handler.  The contents (not the
   // pointer itself) of the <request_count> parameter will be
   // incremented when file retrieval begins, and decremented when file
@@ -83,13 +79,10 @@ private:
   // on the heap).
 
   void initialize_content_iterator (const char *pathname,
-                                    Web_Server::Iterator_Factory_ptr factory)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+                                    Web_Server::Iterator_Factory_ptr factory);
   // Initialize the Content Iterator used to retrieve the file.
 
-  void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate (void);
   // Deactivate this reply handler.
 
   int get_viewer (char *viewer, size_t length);
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 1fd4ed054b7..da88ca65b4f 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -29,7 +29,6 @@ Callback_Handler::~Callback_Handler (void)
 
 void
 Callback_Handler::next_chunk (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->last_chunk_ == 1)
     {
@@ -84,7 +83,6 @@ Callback_Handler::next_chunk (void)
 void
 Callback_Handler::next_chunk_excep
   (::Messaging::ExceptionHolder *excep_holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->last_chunk_ = 1;
 
@@ -104,8 +102,6 @@ Callback_Handler::next_chunk_excep
 
 void
 Callback_Handler::run (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result))
 {
   // Open the file to be downloaded
   this->open_file ();
@@ -121,8 +117,6 @@ Callback_Handler::run (void)
 
 void
 Callback_Handler::open_file (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result))
 {
   // Create a temporary file to store the retrieved data.
   ACE_FILE_Connector connector;
@@ -139,7 +133,6 @@ Callback_Handler::open_file (void)
 
 void
 Callback_Handler::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index 79f7a7dba99..90f05d3e1e6 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -77,16 +77,12 @@ public:
   // Constructor that creates a content iterator corresponding to the
   // name of the file being retrieved from the web server.
 
-  virtual void next_chunk (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void next_chunk (void);
   // The callback for this reply handler.
 
-  virtual void next_chunk_excep (::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void next_chunk_excep (::Messaging::ExceptionHolder *);
 
-  void run (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+  void run (void);
   // Activate and run this Reply Handler.  The contents (not the
   // pointer itself) of the <request_count> parameter will be
   // incremented when file retrieval begins, and decremented when file
@@ -97,13 +93,10 @@ private:
   // Destructor (private to ensure that Callback_Handler is allocated
   // on the heap).
 
-  void open_file (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result));
+  void open_file (void);
   // Open the file to be uploaded to the client callback.
 
-  void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate (void);
   // Deactivate this reply handler.
 
 private:
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index c2c60adbecf..778bc7d16a6 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -52,7 +52,6 @@ Callback_i::~Callback_i (void)
 void
 Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
                         CORBA::Boolean last_chunk)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!last_chunk)
     {
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index 18690abce63..5105bd46689 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -61,8 +61,7 @@ public:
   // Constructor
 
   virtual void next_chunk (const Web_Server::Chunk_Type &chunk,
-                           CORBA::Boolean last_chunk)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::Boolean last_chunk);
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index b4bfb2755ec..307a025fc74 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -19,11 +19,9 @@ Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
   (const char *pathname,
    Web_Server::Callback_ptr client_callback)
-  ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   if (CORBA::is_nil (client_callback))  // @@ Will it ever be nil?
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      0);
+    throw CORBA::BAD_PARAM ();
 
   // What goes on in this method is a bit strange at first glance
   // since the client can potentially receive all of the data before
@@ -54,8 +52,7 @@ Push_Iterator_Factory_i::register_callback
   if (ACE_OS::stat (pathname,
                     &file_status) == -1)
     // HTTP 1.1 "Internal Server Error".
-    ACE_THROW_RETURN (Web_Server::Error_Result (500),
-                      0);
+    throw Web_Server::Error_Result (500);
 
   Web_Server::Metadata_Type *meta_tmp = 0;
   ACE_NEW_THROW_EX (meta_tmp,
@@ -67,14 +64,12 @@ Push_Iterator_Factory_i::register_callback
   if (this->modification_date (&file_status,
                                metadata.inout ()) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW_RETURN (Web_Server::Error_Result (500),
-                      0);
+    throw Web_Server::Error_Result (500);
 
   if (this->content_type (pathname,
                           metadata.inout ()) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW_RETURN (Web_Server::Error_Result (500),
-                      0);
+    throw Web_Server::Error_Result (500);
 
   return metadata._retn ();
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
index 7bf0c2dacc2..1ccd1880e53 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
@@ -53,9 +53,7 @@ class Push_Iterator_Factory_i :
 public:
   Web_Server::Metadata_Type *register_callback
     (const char *pathname,
-     Web_Server::Callback_ptr client_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+     Web_Server::Callback_ptr client_callback);
   // This registration method passes a <Callback> that the Web server
   // uses to ``push'' data associated with <pathname> one ``chunk'' at
   // a time.  The <metadata> reports information about the <pathname>.
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 46c920b873d..85033aa0412 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -26,7 +26,6 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 void
 Push_Iterator_Handler::register_callback
   (const Web_Server::Metadata_Type &metadata)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
@@ -38,8 +37,6 @@ void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
                             Web_Server::Iterator_Factory_ptr factory)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Web_Server::Error_Result))
 {
   ACE_NEW_THROW_EX (this->callback_servant_,
                     Callback_i (request_count),
@@ -64,7 +61,6 @@ Push_Iterator_Handler::run (int *request_count,
 
 void
 Push_Iterator_Handler::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index a884c218600..5e973a68824 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -62,9 +62,7 @@ public:
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+            Web_Server::Iterator_Factory_ptr factory);
   // Activate and run this Reply Handler.  The contents (not the
   // pointer itself) of the <request_count> parameter will be
   // incremented when file retrieval begins, and decremented when file
@@ -77,17 +75,15 @@ private:
   // on the heap).
 
   virtual void register_callback
-  (const Web_Server::Metadata_Type &metadata)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  (const Web_Server::Metadata_Type &metadata);
   // AMI callback that is invoked when a response from the
   // corresponding server method is received.
 
   virtual void register_callback_excep
   (::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException)) {}
+    {}
 
-  void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate (void);
   // Deactivate this handler.
 
 private:
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 3aef112e8d5..198305ac78b 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -28,7 +28,6 @@ Content_Iterator_i::~Content_Iterator_i (void)
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
                                 Web_Server::Chunk_Type_out chunk)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
   Web_Server::Chunk_Type *tmp = 0;
@@ -117,7 +116,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 
 void
 Content_Iterator_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   (void) this->file_io_.close ();
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index 7d61b296a03..0f8579ff5bd 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -52,13 +52,11 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
-                                     Web_Server::Chunk_Type_out chunk)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Web_Server::Chunk_Type_out chunk);
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroy the iterator.
 
 private:
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index d43c37035ed..5020c75bd2c 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -15,7 +15,6 @@ void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
                                   Web_Server::Metadata_Type_out metadata)
-  ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Received request for file: <%s>\n"),
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index e68a29079c7..7b7bfb5164f 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -47,9 +47,7 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Web_Server::Error_Result));
+                             Web_Server::Metadata_Type_out metadata);
   // This factory method returns a <Content_Iterator> that can be used
   // to read the <contents> associated with <pathname> one ``chunk''
   // at a time.  The <metadata> reports information about the
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 50068489754..5eca63c879e 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -161,10 +161,6 @@ The filtering criteria will not work.\n"));
 void
 Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
                        const char *filtering_criteria)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   Event_Comm::Notifier::CannotSubscribe
-                   ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::subscribe for %x with filtering criteria \"%s\"\n",
@@ -224,10 +220,6 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 void
 Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
                          const char *filtering_criteria)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   Event_Comm::Notifier::CannotUnsubscribe
-                   ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::unsubscribe for %x\n",
@@ -281,7 +273,6 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 
 void
 Notifier_i::disconnect (const char *reason)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::send_disconnect = %s\n",
@@ -332,7 +323,6 @@ Notifier_i::disconnect (const char *reason)
 
 void
 Notifier_i::push (const Event_Comm::Event &event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::send_notification = %s\n",
@@ -410,7 +400,6 @@ Consumer_i::~Consumer_i (void)
 
 void
 Consumer_i::push (const Event_Comm::Event &event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *tmpstr = event.tag_;
 
@@ -424,7 +413,6 @@ Consumer_i::push (const Event_Comm::Event &event)
 
 void
 Consumer_i::disconnect (const char *reason)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "**** got disconnected due to %s\n",
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index 61529ad22e6..1df87e6751e 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -61,12 +61,10 @@ public:
   void set_reactor (ACE_Reactor *reactor);
   // set the <ACE_Reactor> to use when quitting.
 
-  virtual void push (const Event_Comm::Event & event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const Event_Comm::Event & event);
   // Pass the <event> to the <Consumer>.
 
-  virtual void disconnect (const char * reason)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect (const char * reason);
 
   // Disconnect the <Consumer> from the <Notifier>, giving it the
   // <reason>.
@@ -96,30 +94,20 @@ public:
   Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE);
   // Initialize a Notifier_i object with the specified size hint.
 
-  virtual void disconnect (const char *reason)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect (const char *reason);
   // Disconnect all the receivers, giving them the <reason>.
 
-  virtual void push (const Event_Comm::Event &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const Event_Comm::Event &event);
   // Send the <event> to all the consumers who have subscribed and who
   // match the filtering criteria.
 
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
-                           const char * filtering_criteria)
-     ACE_THROW_SPEC ((
-                      CORBA::SystemException,
-                      Event_Comm::Notifier::CannotSubscribe
-                      ));
+                           const char * filtering_criteria);
   // Subscribe the <Consumer> to receive events that match
   // <filtering_criteria> applied by the <Notifier>.
 
  void unsubscribe (Event_Comm::Consumer *consumer,
-                    const char *filtering_criteria)
-   ACE_THROW_SPEC ((
-                    CORBA::SystemException,
-                    Event_Comm::Notifier::CannotUnsubscribe
-                    ));
+                    const char *filtering_criteria);
   // Unsubscribe the <Consumer>.
 
 private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 30b2df14acd..5730aaacbf4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -16,14 +16,12 @@ using namespace std;
 
 EDF_Scheduling::SchedulingParameter
 EDF_Sched_Param_Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
 EDF_Sched_Param_Policy::value (const EDF_Scheduling::SchedulingParameter& value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
@@ -92,7 +90,6 @@ EDF_Scheduler::shutdown (void)
 
 EDF_Scheduling::SchedulingParameterPolicy_ptr
 EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /* MEASURE: Time to create scheduling parameter */
   DSUI_EVENT_LOG (EDF_SCHED_FAM, CREATE_SCHED_PARAM, 0, 0, NULL);
@@ -117,8 +114,6 @@ EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -158,8 +153,6 @@ EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
                                                 const char *name,
                                                 CORBA::Policy_ptr sched_param,
                                                 CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -177,8 +170,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
                                           CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   ACE_UNUSED_ARG ((name));
   ACE_UNUSED_ARG ((implicit_sched_param));
@@ -208,7 +199,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
 void
 EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                        const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   int int_guid;
@@ -227,7 +217,6 @@ void
 EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char *,
                                               CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -239,8 +228,6 @@ EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdTyp
 
 void
 EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -348,8 +335,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param_out*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
@@ -477,8 +462,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 
 void
 EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::ForwardRequest))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -489,7 +472,6 @@ EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
 
 void
 EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -576,8 +558,6 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -590,8 +570,6 @@ EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   int int_guid;
   ACE_OS::memcpy (&int_guid,
@@ -604,7 +582,6 @@ EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
 
@@ -679,8 +656,6 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_EXCEPTION, 0, 0, NULL);
 
@@ -689,8 +664,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, NULL);
@@ -702,52 +675,45 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 EDF_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 EDF_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 EDF_Scheduler::poa_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
 EDF_Scheduler::scheduling_discipline_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 RTScheduling::ResourceManager_ptr
 EDF_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 EDF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index e1a7a27c903..77c52f15dc5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -51,11 +51,9 @@ public EDF_Scheduling::SchedulingParameterPolicy,
 {
  public:
 
-    EDF_Scheduling::SchedulingParameter value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    EDF_Scheduling::SchedulingParameter value (void);
 
-    void value (const EDF_Scheduling::SchedulingParameter & value)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void value (const EDF_Scheduling::SchedulingParameter & value);
 
  private:
     EDF_Scheduling::SchedulingParameter value_;
@@ -77,102 +75,70 @@ public TAO_Local_RefCounted_Object
 
   virtual EDF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 );
 
   void shutdown (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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                             CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                                CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                          CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Policy_ptr scheduling_parameter);
 
   Kokyu::DSRT_Dispatcher_Factory<EDF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
     kokyu_dispatcher_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index fed6b3777bc..13a67c98bc0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -26,9 +26,6 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
 FP_Scheduling::SegmentSchedulingParameter
 FP_Segment_Sched_Param_Policy::value (
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   return value_;
 }
@@ -37,16 +34,12 @@ void
 FP_Segment_Sched_Param_Policy::value (
         const FP_Scheduling::SegmentSchedulingParameter & value
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
 FP_Segment_Sched_Param_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Segment_Sched_Param_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
@@ -58,7 +51,6 @@ FP_Segment_Sched_Param_Policy::copy (void)
 
 void
 FP_Segment_Sched_Param_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -127,9 +119,6 @@ FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
 Fixed_Priority_Scheduler::create_segment_scheduling_parameter (
         const FP_Scheduling::SegmentSchedulingParameter & value
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     segment_sched_param_policy;
@@ -152,8 +141,6 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -188,8 +175,6 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
                                                            CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -202,8 +187,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
                                           CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   ACE_UNUSED_ARG ((name));
   ACE_UNUSED_ARG ((implicit_sched_param));
@@ -233,7 +216,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
 void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                        const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
   int int_guid;
@@ -250,7 +232,6 @@ void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
                                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -258,8 +239,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
 
 void
 Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
@@ -350,8 +329,6 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param_out*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
 
@@ -434,14 +411,11 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 
 void
 Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::Priority desired_priority = 0;
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
@@ -506,23 +480,18 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 
 void
 Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
   RTCORBA::Priority desired_priority=0;
@@ -580,68 +549,57 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
 
 void
 Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 Fixed_Priority_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 Fixed_Priority_Scheduler::poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
 Fixed_Priority_Scheduler::scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index 5d9a3d001c8..ea2f0dd541e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -46,23 +46,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
      FP_Segment_Sched_Param_Policy (const FP_Segment_Sched_Param_Policy &rhs);
 
      FP_Scheduling::SegmentSchedulingParameter value (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
      void value (
         const FP_Scheduling::SegmentSchedulingParameter & value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
-     virtual CORBA::Policy_ptr copy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual CORBA::Policy_ptr copy ();
 
-     virtual void destroy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual void destroy ();
 
  private:
   FP_Scheduling::SegmentSchedulingParameter value_;
@@ -86,102 +78,68 @@ public TAO_Local_RefCounted_Object
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (
         const FP_Scheduling::SegmentSchedulingParameter & value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                             CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                                CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                          CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Policy_ptr scheduling_parameter);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 73a767d6413..cf42475ac28 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -25,21 +25,18 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
 
 MIF_Scheduling::SchedulingParameter
 MIF_Sched_Param_Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
 MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
 MIF_Sched_Param_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -52,7 +49,6 @@ MIF_Sched_Param_Policy::copy (void)
 
 void
 MIF_Sched_Param_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -117,7 +113,6 @@ MIF_Scheduler::shutdown (void)
 
 MIF_Scheduling::SchedulingParameterPolicy_ptr
 MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
   ACE_NEW_THROW_EX (sched_param_policy,
@@ -139,8 +134,6 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -175,8 +168,6 @@ MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
                                                            CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -189,8 +180,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
                                           CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   ACE_UNUSED_ARG ((name));
   ACE_UNUSED_ARG ((implicit_sched_param));
@@ -219,7 +208,6 @@ void
 MIF_Scheduler::end_scheduling_segment (
                     const RTScheduling::Current::IdType &guid,
                     const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
   int int_guid;
@@ -237,7 +225,6 @@ MIF_Scheduler::end_nested_scheduling_segment (
                    const RTScheduling::Current::IdType &,
                    const char *,
                    CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -245,8 +232,6 @@ MIF_Scheduler::end_nested_scheduling_segment (
 
 void
 MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
@@ -336,8 +321,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param_out*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
 
@@ -419,7 +402,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 
 void
 MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Short importance = 0;
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
@@ -489,30 +471,23 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 
 void
 MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
   CORBA::Short importance=0;
@@ -569,67 +544,56 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 MIF_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 MIF_Scheduler::poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
 MIF_Scheduler::scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 RTScheduling::ResourceManager_ptr
 MIF_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index 7803ce173f3..cf1829ccb50 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -45,17 +45,13 @@ public MIF_Scheduling::SchedulingParameterPolicy,
      MIF_Sched_Param_Policy ();
      MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs);
 
-    MIF_Scheduling::SchedulingParameter value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    MIF_Scheduling::SchedulingParameter value (void);
 
-    void value (const MIF_Scheduling::SchedulingParameter & value)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void value (const MIF_Scheduling::SchedulingParameter & value);
 
-     virtual CORBA::Policy_ptr copy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual CORBA::Policy_ptr copy ();
 
-     virtual void destroy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual void destroy ();
 
  private:
     MIF_Scheduling::SchedulingParameter value_;
@@ -77,102 +73,70 @@ public TAO_Local_RefCounted_Object
 
   virtual MIF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 );
 
   void shutdown (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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                             CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                                CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                          CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Policy_ptr scheduling_parameter);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index fdcde8a9872..a1a28cdcb81 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -25,21 +25,18 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
 
 MUF_Scheduling::SchedulingParameter
 MUF_Sched_Param_Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
 MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
 MUF_Sched_Param_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Sched_Param_Policy* tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -52,7 +49,6 @@ MUF_Sched_Param_Policy::copy (void)
 
 void
 MUF_Sched_Param_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -117,7 +113,6 @@ MUF_Scheduler::shutdown (void)
 
 MUF_Scheduling::SchedulingParameterPolicy_ptr
 MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
   ACE_NEW_THROW_EX (sched_param_policy,
@@ -139,8 +134,6 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -179,8 +172,6 @@ MUF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
                                                            CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -193,8 +184,6 @@ MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
                                           CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   ACE_UNUSED_ARG ((name));
   ACE_UNUSED_ARG ((implicit_sched_param));
@@ -223,7 +212,6 @@ MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
 void
 MUF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                        const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
   int int_guid;
@@ -240,15 +228,12 @@ void
 MUF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
                                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
 MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
@@ -350,8 +335,6 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param_out*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
 
@@ -446,14 +429,11 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 
 void
 MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
@@ -534,23 +514,18 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 
 void
 MUF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 MUF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   send_reply (ri);
 }
 
 void
 MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
 
@@ -618,68 +593,57 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 MUF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 MUF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   receive_reply (ri);
 }
 
 void
 MUF_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 MUF_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
 MUF_Scheduler::poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
 MUF_Scheduler::scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 RTScheduling::ResourceManager_ptr
 MUF_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 MUF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index 11b15ee9e91..e9b70810567 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -61,17 +61,13 @@ public MUF_Scheduling::SchedulingParameterPolicy,
     MUF_Sched_Param_Policy ();
     MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs);
 
-    MUF_Scheduling::SchedulingParameter value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    MUF_Scheduling::SchedulingParameter value (void);
 
-    void value (const MUF_Scheduling::SchedulingParameter & value)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void value (const MUF_Scheduling::SchedulingParameter & value);
 
-     virtual CORBA::Policy_ptr copy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual CORBA::Policy_ptr copy ();
 
-     virtual void destroy ()
-     ACE_THROW_SPEC ((CORBA::SystemException));
+     virtual void destroy ();
 
  private:
     MUF_Scheduling::SchedulingParameter value_;
@@ -93,102 +89,70 @@ public TAO_Local_RefCounted_Object
 
   virtual MUF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 );
 
   void shutdown (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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                             CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                                CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                          CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Policy_ptr scheduling_parameter);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 96589c1d2eb..657f65d7bcb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
index a9d12fa4794..5a74bab0021 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
@@ -12,10 +12,10 @@ project(fp_server): kokyu_dsrt_scheduler_server {
   exename = fp_server
   after += *IDL
   Source_Files {
+    testC.cpp
+    testS.cpp
     test_i.cpp
     server.cpp
-    testS.cpp
-    testC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 8700bc9964c..b583b30cb5e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index a7bb67610a1..4cb98a72a1f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (0);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
index 45c7c4449fc..c1fdefe2374 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
@@ -36,11 +36,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index f47fe54a5cf..efdcb948c8e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 5f6739fbf9f..90210fb78e1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 6ac6bf963e1..8573e0973ad 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (0);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
index 45c7c4449fc..c1fdefe2374 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
@@ -36,11 +36,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index e6d676b39a0..2ed9544b9d7 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -146,7 +146,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 76e68cb70f6..18dfb3831c6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 6ac6bf963e1..8573e0973ad 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (0);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
index 45c7c4449fc..c1fdefe2374 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
@@ -36,11 +36,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index 9cb33e89fe2..72ed692d4b4 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -26,7 +26,6 @@ Identity_i::~Identity_i (void)
 void
 Identity_i::get_name (CORBA::String_out name
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
 }
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 7a6abd8c61c..d6810cb9a7f 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -30,8 +30,7 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void get_name (CORBA::String_out name);
   // Returns the name of this object.
 
 private:
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index 7206c16db88..7211d5964e1 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -34,8 +34,6 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_round_robin (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
   return make_group (0,
                      id);
@@ -43,8 +41,6 @@ Object_Group_Factory_i::make_round_robin (const char * id)
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_random (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
   return make_group (1,
                      id);
@@ -53,8 +49,6 @@ Object_Group_Factory_i::make_random (const char * id)
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
                                     const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
   ACE_CString group_id (id);
 
@@ -62,8 +56,7 @@ Object_Group_Factory_i::make_group (int random,
   // <id>.
   if (rr_groups_.find (group_id) == 0
       || random_groups_.find (group_id) == 0)
-    ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
-                      Load_Balancer::Object_Group::_nil ());
+    throw Load_Balancer::duplicate_group ();
   else
     {
       // Store our result here for return.
@@ -93,8 +86,7 @@ Object_Group_Factory_i::make_group (int random,
       if (random)
         {
           if (random_groups_.bind (group_id, group) == -1)
-            ACE_THROW_RETURN (CORBA::INTERNAL (),
-                              Load_Balancer::Object_Group::_nil ());
+            throw CORBA::INTERNAL ();
 
           ACE_DEBUG ((LM_DEBUG,
                       "Load_Balancer: Created new Random Group"
@@ -103,8 +95,7 @@ Object_Group_Factory_i::make_group (int random,
       else
         {
           if (rr_groups_.bind (group_id, group) == -1)
-            ACE_THROW_RETURN (CORBA::INTERNAL (),
-                              Load_Balancer::Object_Group::_nil ());
+            throw CORBA::INTERNAL ();
           ACE_DEBUG ((LM_DEBUG,
                       "Load_Balancer: Created new Round Robin Group"
                       " with id <%s>\n", id));
@@ -116,16 +107,13 @@ Object_Group_Factory_i::make_group (int random,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::resolve (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group))
 {
   ACE_CString group_id (id);
   Load_Balancer::Object_Group_var group;
 
   if (rr_groups_.find (group_id, group) == -1
       && random_groups_.find (group_id, group) == -1)
-    ACE_THROW_RETURN (Load_Balancer::no_such_group (),
-                      Load_Balancer::Object_Group::_nil ());
+    throw Load_Balancer::no_such_group ();
   else
     return group._retn ();
 }
@@ -172,14 +160,12 @@ Object_Group_Factory_i::list_groups (int random)
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::round_robin_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::random_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return list_groups (1);
 }
@@ -205,15 +191,12 @@ Object_Group_i::~Object_Group_i (void)
 
 char *
 Object_Group_i::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
 Object_Group_i::bind (const Load_Balancer::Member & member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::duplicate_member))
 {
   ACE_CString member_id (member.id);
   CORBA::Object_var obj = CORBA::Object::_duplicate (member.obj.in ());
@@ -245,8 +228,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
 
 void
 Object_Group_i::unbind (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   ACE_CString member_id (id);
 
@@ -274,22 +255,18 @@ Object_Group_i::unbind (const char * id)
 
 CORBA::Object_ptr
 Object_Group_i::resolve_with_id (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   CORBA::Object_var obj;
   ACE_CString member_id (id);
 
   if (members_.find (member_id, obj) == -1)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      obj._retn ());
+    throw Load_Balancer::no_such_member ();
 
   return obj._retn ();
 }
 
 Load_Balancer::Member_ID_List *
 Object_Group_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list;
 
@@ -317,7 +294,6 @@ Object_Group_i::members (void)
 
 void
 Object_Group_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -347,7 +323,6 @@ Random_Object_Group::~Random_Object_Group (void)
 
 void
 Random_Object_Group::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -358,15 +333,12 @@ Random_Object_Group::destroy (void)
 
 CORBA::Object_ptr
 Random_Object_Group::resolve (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   CORBA::Object_var obj;
 
   size_t group_size = members_.current_size ();
   if (group_size == 0)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      obj._retn ());
+    throw Load_Balancer::no_such_member ();
 
   // Generate random number in the range [0, group_size - 1]
   size_t member = ACE_OS::rand() % group_size;
@@ -397,7 +369,6 @@ RR_Object_Group::~RR_Object_Group (void)
 
 void
 RR_Object_Group::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -408,15 +379,12 @@ RR_Object_Group::destroy (void)
 
 CORBA::Object_ptr
 RR_Object_Group::resolve (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   CORBA::Object_var obj;
 
   size_t group_size = members_.current_size ();
   if (group_size == 0)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      obj._retn ());
+    throw Load_Balancer::no_such_member ();
 
   // Get the id of the member to return to the client.
   ACE_CString *id = 0;
@@ -431,16 +399,13 @@ RR_Object_Group::resolve (void)
 
   // Return the object reference corresponding to the found id to the client.
   if (members_.find (*id, obj) == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      CORBA::Object::_nil ());
+    throw CORBA::INTERNAL ();
 
    return obj._retn ();
 }
 
 void
 RR_Object_Group::unbind (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   ACE_CString member_id (id);
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 923216e992e..79b9c8d73a9 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -53,40 +53,32 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id);
   // Creates an <Object_Group> that resolves requests for arbitrary
   // members in round robin order.  If an <Object_Group>, of any
   // type, with Group_ID <id> has already been created by this
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+  Load_Balancer::Object_Group_ptr make_random (const char * id);
   // Creates an <Object_Group> that resolves requests for arbitrary
   // members in random order.  If an <Object_Group>, of any
   // type, with Group_ID <id> has already been created by this
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group));
+  Load_Balancer::Object_Group_ptr resolve (const char * id);
   // Locates and returns an <Object_Group> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Group_List * round_robin_groups (void);
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Group_List * random_groups (void);
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing random
@@ -107,9 +99,7 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+                                              const char * id);
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
@@ -159,46 +149,36 @@ public:
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * id (void);
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_member));
+  void bind (const Load_Balancer::Member & member);
   // Adds a new <member> to the <Object_Group>.  Note that each
   // <Member_ID> in an <Object_Group> must be unique.  If the
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  void unbind (const char * id);
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
   CORBA::Object_ptr resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member)) = 0;
+    = 0;
   // Returns a member object from this <Object_Group> in accordance with
   // load balancing policy it implements, i.e., ``random'' or
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  CORBA::Object_ptr resolve_with_id (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  CORBA::Object_ptr resolve_with_id (const char * id);
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Member_ID_List * members (void);
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
   // <id> should become available.  <Object_Group_Factory>
@@ -251,14 +231,11 @@ public:
   ~Random_Object_Group (void);
   // Destructor.
 
-  CORBA::Object_ptr resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  CORBA::Object_ptr resolve (void);
   // Returns a member object from this <Object_Group> in accordance with
   // the "random" load balancing policy.
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
   // <id> should become available.  <Object_Group_Factory>
@@ -280,21 +257,16 @@ public:
   ~RR_Object_Group (void);
   // Destructor.
 
-  void unbind (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  void unbind (const char * id);
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  CORBA::Object_ptr resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  CORBA::Object_ptr resolve (void);
   // Returns a member object from this <Object_Group> in accordance with
   // the "round robin" load balancing policy.
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
   // <id> should become available.  <Object_Group_Factory>
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index e636694850c..711ed4e8235 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -29,9 +29,6 @@ project(*Client): taoclient, utils, portableserver {
   avoids += repo
   after += *IDL
 
-  // XXX is this dependency necessary?
-  after += *Server
-
   IDL_Files {
   }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index efa5f20eedf..c71e4c8f293 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -27,14 +27,12 @@ Identity_i::~Identity_i (void)
 
 void
 Identity_i::get_name (CORBA::String_out name)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
 }
 
 PortableServer::POA_ptr
 Identity_i::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index b06b626b78a..100750ee4e8 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -31,12 +31,10 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void get_name (CORBA::String_out name);
   // Returns the name of this object.
 
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index cf89d7d37c3..07f96faaa63 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -40,7 +40,6 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void)
 
 PortableServer::POA_ptr
 Object_Group_Factory_i::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -48,8 +47,6 @@ Object_Group_Factory_i::_default_POA (void)
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_round_robin (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
 
   if (this->mem_pool_->find (rr_name_bind,
@@ -76,8 +73,6 @@ Object_Group_Factory_i::make_round_robin (const char * id)
 
 void
 Object_Group_Factory_i::unbind_round_robin (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group))
 {
   if (this->rr_groups_ == 0)
     {
@@ -116,8 +111,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id)
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_random (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
 
   if (this->mem_pool_->find (random_name_bind, (void * &)this->random_groups_) == -1)
@@ -145,8 +138,6 @@ Object_Group_Factory_i::make_random (const char * id)
 
 void
 Object_Group_Factory_i::unbind_random (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group))
 {
   if (this->random_groups_ == 0)
     {
@@ -185,8 +176,6 @@ Object_Group_Factory_i::unbind_random (const char * id)
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
                                     const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group))
 {
   // Store our result here for return.
   Load_Balancer::Object_Group_var group;
@@ -201,15 +190,13 @@ Object_Group_Factory_i::make_group (int random,
     {
       if (this->random_groups_->find (const_cast<char *> (id),
                                       this->mem_pool_) == 0)
-        ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
-                          Load_Balancer::Object_Group::_nil ());
+        throw Load_Balancer::duplicate_group ();
     }
   else
     {
       if (this->rr_groups_->find (const_cast<char *> (id),
                                   this->mem_pool_) == 0)
-        ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
-                          Load_Balancer::Object_Group::_nil ());
+        throw Load_Balancer::duplicate_group ();
     }
 
 
@@ -243,8 +230,7 @@ Object_Group_Factory_i::make_group (int random,
   char *ptr = (char *) this->mem_pool_->malloc (id_len + kind_len);
 
   if (ptr == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (),
-                      Load_Balancer::Object_Group::_nil ());
+    throw CORBA::NO_MEMORY ();
 
   char * id_ptr =  ptr;
   char * ior_ptr = ptr + id_len;
@@ -279,8 +265,7 @@ Object_Group_Factory_i::make_group (int random,
       // For some reason the  bind failed. Free our
       // dynamically allocated  memory.
       this->mem_pool_->free ((void *) ptr);
-      ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
-                        Load_Balancer::Object_Group::_nil ());
+      throw Load_Balancer::duplicate_group ();
 
     }
 
@@ -293,8 +278,6 @@ Object_Group_Factory_i::make_group (int random,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::resolve (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group))
 {
 
 
@@ -352,8 +335,7 @@ Object_Group_Factory_i::resolve (const char * id)
       && random_groups_->find (const_cast<char *> (id),
                                ior,
                                this->mem_pool_) == -1)
-    ACE_THROW_RETURN (Load_Balancer::no_such_group (),
-                      0);
+    throw Load_Balancer::no_such_group ();
 
   CORBA::Object_var objref =
     this->orb_->string_to_object (ior);
@@ -421,14 +403,12 @@ Object_Group_Factory_i::list_groups (int random)
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::round_robin_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::random_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return list_groups (1);
 }
@@ -558,7 +538,6 @@ Object_Group_i::~Object_Group_i (void)
 
 PortableServer::POA_ptr
 Object_Group_i::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -566,15 +545,12 @@ Object_Group_i::_default_POA (void)
 
 char *
 Object_Group_i::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
 Object_Group_i::bind (const Load_Balancer::Member & member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::duplicate_member))
 {
 
   if (this->members_ == 0)
@@ -667,8 +643,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
 
 void
 Object_Group_i::unbind (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   // Check whether the this->member_ is NULL
   if (this->members_ == 0)
@@ -718,16 +692,13 @@ Object_Group_i::unbind (const char * id)
 
 char *
 Object_Group_i::resolve_with_id (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   CORBA::String_var ior;
 
 
   if (this->members_->find (const_cast<char *> (id),
                       ior.out (), this->allocator_) == -1)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      0);
+    throw Load_Balancer::no_such_member ();
 
   char *retn_ptr = CORBA::string_dup (ior.in ());
 
@@ -737,7 +708,6 @@ Object_Group_i::resolve_with_id (const char * id)
 
 Load_Balancer::Member_ID_List *
 Object_Group_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list = 0;
 
@@ -769,7 +739,6 @@ Object_Group_i::members (void)
 
 void
 Object_Group_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -826,16 +795,13 @@ Random_Object_Group::Random_Object_Group (const char *id,
 
 char *
 Random_Object_Group::resolve (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
 
   this->read_from_memory ();
 
   size_t group_size = this->members_->current_size ();
   if (group_size == 0)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      0);
+    throw Load_Balancer::no_such_member ();
 
   // Generate random number in the range [0, group_size - 1]
   size_t member = ACE_OS::rand() % group_size;
@@ -865,8 +831,6 @@ RR_Object_Group::RR_Object_Group (const char *id,
 
 char *
 RR_Object_Group::resolve (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
   char *objref = 0;
 
@@ -874,8 +838,7 @@ RR_Object_Group::resolve (void)
 
   size_t group_size = this->members_->current_size ();
   if (group_size == 0)
-    ACE_THROW_RETURN (Load_Balancer::no_such_member (),
-                      0);
+    throw Load_Balancer::no_such_member ();
 
   // Get the id of the member to return to the client.
   char **id = 0;
@@ -891,8 +854,7 @@ RR_Object_Group::resolve (void)
   if (this->members_->find (*id,
                             objref,
                             this->allocator_) == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      0);
+    throw CORBA::INTERNAL ();
 
   char *retn_ptr = CORBA::string_dup (objref);
 
@@ -901,8 +863,6 @@ RR_Object_Group::resolve (void)
 
 void
 RR_Object_Group::unbind (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Load_Balancer::no_such_member))
 {
 
   if (this->members_ == 0)
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index fd0ab4097dd..408ca548e00 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -61,56 +61,43 @@ public:
   // Destructor.
 
 
-  PortableServer::POA_ptr _default_POA (void)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id);
   // Creates an <Object_Group> that resolves requests for arbitrary
   // members in round robin order.  If an <Object_Group>, of any
   // type, with Group_ID <id> has already been created by this
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_round_robin (const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group));
+  void unbind_round_robin (const char *id);
 
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+  Load_Balancer::Object_Group_ptr make_random (const char * id);
   // Creates an <Object_Group> that resolves requests for arbitrary
   // members in random order.  If an <Object_Group>, of any
   // type, with Group_ID <id> has already been created by this
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_random (const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group));
+  void unbind_random (const char *id);
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_group));
+  Load_Balancer::Object_Group_ptr resolve (const char * id);
   // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Group_List * round_robin_groups (void);
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Group_List * random_groups (void);
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing random
@@ -127,9 +114,7 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_group));
+                                              const char * id);
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
@@ -198,51 +183,40 @@ public:
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * id (void);
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::duplicate_member));
+  void bind (const Load_Balancer::Member & member);
   // Adds a new <member> to the <Object_Group>.  Note that each
   // <Member_ID> in an <Object_Group> must be unique.  If the
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  void unbind (const char * id);
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
   char * resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member)) = 0;
+    = 0;
   // Returns a member object from this <Object_Group> in accordance with
   // load balancing policy it implements, i.e., ``random'' or
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  char * resolve_with_id (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  char * resolve_with_id (const char * id);
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  Load_Balancer::Member_ID_List * members (void);
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
   // <id> should become available.  <Object_Group_Factory>
@@ -293,9 +267,7 @@ public:
                        PortableServer::POA_ptr poa);
   // Constructor.
 
-  char * resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  char * resolve (void);
   // Returns a member object from this <Object_Group> in accordance with
   // the "random" load balancing policy.
 
@@ -313,16 +285,12 @@ public:
                    PortableServer::POA_ptr poa);
   // Constructor.
 
-  void unbind (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  void unbind (const char * id);
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  char * resolve (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Load_Balancer::no_such_member));
+  char * resolve (void);
   // Returns a member object from this <Object_Group> in accordance with
   // the "round robin" load balancing policy.
 
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 8f9b28bd67a..58d9e384606 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -20,7 +20,6 @@ Logger_Factory_i::~Logger_Factory_i (void)
 
 Logger_ptr
 Logger_Factory_i::make_logger (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
   // If name is already in the map, <find> will assign <result> to the
@@ -46,8 +45,7 @@ Logger_Factory_i::make_logger (const char *name)
   if (hash_map_.bind (name, result) == -1)
     {
       delete result;
-      ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                        Logger::_nil ());
+      throw CORBA::UNKNOWN ();
     }
   else
     // Logger of name <name> already bound.  <result> is set
@@ -110,14 +108,12 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 
 void
 Logger_i::log (const Logger::Log_Record &log_rec)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity_level_);
 }
 
 void
 Logger_i::log_twoway (const Logger::Log_Record &log_rec)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity_level_);
 }
@@ -125,7 +121,6 @@ Logger_i::log_twoway (const Logger::Log_Record &log_rec)
 void
 Logger_i::logv_twoway (const Logger::Log_Record &log_rec,
                        Logger::Verbosity_Level verbosity)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity);
 }
@@ -133,7 +128,6 @@ Logger_i::logv_twoway (const Logger::Log_Record &log_rec,
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
   // code. Since Logger::Log_Priority enum tags don't cleanly map to
@@ -181,7 +175,6 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 
 void
 Logger_i::verbosity (Logger::Verbosity_Level level)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;
 }
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index cfc4ed15cac..d5a5a36cc5e 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -36,28 +36,23 @@ public:
   virtual ~Logger_i (void);
   // destructor
 
-  virtual void log (const Logger::Log_Record &log_rec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void log (const Logger::Log_Record &log_rec);
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
-                     Logger::Verbosity_Level verbosity)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     Logger::Verbosity_Level verbosity);
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-  virtual void log_twoway (const Logger::Log_Record &log_rec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void log_twoway (const Logger::Log_Record &log_rec);
   // Writes the <log_rec> to the standard output.
 
   virtual void logv_twoway (const Logger::Log_Record &log_rec,
-                            Logger::Verbosity_Level verbosity)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            Logger::Verbosity_Level verbosity);
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-   void verbosity (Logger::Verbosity_Level level)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+   void verbosity (Logger::Verbosity_Level level);
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
 
@@ -90,8 +85,7 @@ public:
   ~Logger_Factory_i (void);
   // Destructor.
 
-  virtual Logger_ptr make_logger (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Logger_ptr make_logger (const char *name);
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
   // logger of name <name> is returned
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 9ed260294f0..9c937c513ff 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -104,7 +104,6 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 void
 Checkpoint_i::put_event (Event *event)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In general this function would be a dispatcher which looks at the
   // origin id and finds an event handler object for the event. The
@@ -134,7 +133,6 @@ Checkpoint_i::put_event (Event *event)
 
 Event_List *
 Checkpoint_i::get_critical_events (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The skeleton should not steal our list by decrementing
   // the reference counter.
@@ -151,7 +149,6 @@ Checkpoint_i::get_critical_events (void)
 
 void
 Checkpoint_i::shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n%s\n",
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index bd1259e9c5f..8341c26165e 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -37,15 +37,12 @@ public:
 
   virtual void put_event (
         Event * e
-  )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   virtual Event_List * get_critical_events (
-  )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
-  virtual void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown the server.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index d8866966fca..02469a4f9d6 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -13,12 +13,12 @@ project(*server): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corb
   exename = server
   after += *IDL
   Source_Files {
+    Event_TypesS.cpp
+    Event_TypesC.cpp
     Server_i.cpp
     Event_Types_impl.cpp
     ../Simple_util.cpp
     server.cpp
-    Event_TypesS.cpp
-    Event_TypesC.cpp
   }
   IDL_Files {
   }
@@ -28,12 +28,12 @@ project(*client): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corb
   exename = client
   after += *IDL
   Source_Files {
+    Event_TypesS.cpp
+    Event_TypesC.cpp
     Client_i.cpp
     Event_Types_impl.cpp
     ../Simple_util.cpp
     client.cpp
-    Event_TypesS.cpp
-    Event_TypesC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index 2fdde3aee4a..e6420cec3d2 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -61,19 +61,19 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_2>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_3, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_3, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_3>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 8ef9b338672..503e5550e8e 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -60,8 +60,7 @@ public:
                      CORBA::ORB_ptr orb);
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                  const char *name);
 
   CORBA::PolicyList first_poa_policies_;
   CORBA::PolicyList second_poa_policies_;
@@ -82,7 +81,6 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager
 CORBA::Boolean
 Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (name, "firstPOA") == 0)
     {
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index 3395bbc3385..99a97076236 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -136,15 +136,11 @@ Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
                                    const Database::NVPairSequence &initial_attributes)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Duplicate_Key))
 {
   // Create a new entry in the database:
   if (ACE_OS::strcmp (entry_type, "Employee") != 0
       || initial_attributes.length () != 2)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+    throw Database::Unknown_Type ();
 
   const char *name = 0;
   CORBA::Long id = 0;
@@ -156,8 +152,7 @@ DatabaseImpl::Agent::create_entry (const char *key,
 
   if (ACE_OS::strcmp (first.name.in (), "name") != 0
       || ACE_OS::strcmp (second.name.in (), "id") != 0)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+    throw Database::Unknown_Type ();
 
   first.value >>= name;
   second.value >>= id;
@@ -199,14 +194,10 @@ DatabaseImpl::Agent::create_entry (const char *key,
 Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
                                  const char *entry_type)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Not_Found))
 {
   if (ACE_OS::strcmp (entry_type,
                       "Employee") != 0)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+    throw Database::Unknown_Type ();
 
   void *temp;
   Database::Entry_var entry;
@@ -239,8 +230,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
                   "Employee with key = %s not found\n",
                   key));
 
-      ACE_THROW_RETURN (Database::Not_Found (),
-                        Database::Entry::_nil ());
+      throw Database::Not_Found ();
     }
 
   return entry._retn ();
@@ -249,9 +239,6 @@ DatabaseImpl::Agent::find_entry (const char *key,
 void
 DatabaseImpl::Agent::destroy_entry (const char *key,
                                     const char *entry_type)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Unknown_Key))
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     throw Database::Unknown_Type ();
@@ -282,7 +269,6 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 
 void
 DatabaseImpl::Agent::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
@@ -331,14 +317,12 @@ DatabaseImpl::Employee::~Employee (void)
 
 const char *
 DatabaseImpl::Employee::name (void) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->name_;
 }
 
 void
 DatabaseImpl::Employee::name (const char* name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DATABASE::instance ()->free (this->name_);
 
@@ -351,14 +335,12 @@ DatabaseImpl::Employee::name (const char* name)
 
 CORBA::Long
 DatabaseImpl::Employee::id (void) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 void
 DatabaseImpl::Employee::id (CORBA::Long id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->id_ = id;
 }
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index e29d77dc6ec..dde6908f8ff 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -75,25 +75,15 @@ public:
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
-                                              const Database::NVPairSequence &initial_attributes)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Duplicate_Key));
+                                              const Database::NVPairSequence &initial_attributes);
 
     virtual Database::Entry_ptr find_entry (const char *key,
-                                            const char *entry_type)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Not_Found));
+                                            const char *entry_type);
 
     virtual void destroy_entry (const char *key,
-                                const char *entry_type)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Unknown_Key));
+                                const char *entry_type);
 
-    virtual void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void shutdown (void);
 
     virtual PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA for this servant.
@@ -118,15 +108,11 @@ public:
 
     ~Employee (void);
 
-    const char *name (void) const
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    void name (const char* name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    const char *name (void) const;
+    void name (const char* name);
 
-    CORBA::Long id (void) const
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    void id (CORBA::Long id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long id (void) const;
+    void id (CORBA::Long id);
 
     void *operator new (size_t);
     void operator delete (void *pointer);
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index 3aa7c5efefc..377f2a1146e 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -18,7 +18,7 @@ $CL = new PerlACE::Process ("client", "-f $iorfile -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 31cbc500b94..12ebe32112f 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 0728e000e67..92b1ad8865c 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -45,8 +45,6 @@ FileImpl::System::_default_POA (void)
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   // Do an ACE_OS::open
   ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
@@ -55,7 +53,7 @@ FileImpl::System::open (const char *file_name,
 
   if (file_descriptor == ACE_INVALID_HANDLE)
     {
-      ACE_THROW_RETURN (File::IOError (), 0);
+      throw File::IOError ();
     }
 
   char file_descriptor_buffer[BUFSIZ];
@@ -152,8 +150,6 @@ FileImpl::Descriptor::fd (void)
 
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -165,13 +161,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
   if (len > 0)
     return len;
 
-  ACE_THROW_RETURN (File::IOError (), 0);
+  throw File::IOError ();
 }
 
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -185,14 +179,12 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes)
                                              1);
 
   File::Descriptor::DataBuffer::freebuf (buffer);
-  ACE_THROW_RETURN (File::IOError (), 0);
+  throw File::IOError ();
 }
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -200,14 +192,13 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
                                                     offset,
                                                     whence);
   if (result == -1)
-    ACE_THROW_RETURN (File::IOError (), 0);
+    throw File::IOError ();
 
   return (CORBA::ULong) result;
 }
 
 void
 FileImpl::Descriptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index 1a6ba088622..3b4858c1c18 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -37,24 +37,16 @@ public:
     PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-    // Reads num_bytes from the file and returns it
-                       File::IOError));
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes);
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+                                CORBA::Long whence);
     // seek to the offset in file from whence
 
-    virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (void);
     // closes the file corresponding to the requested ObjectID
 
   private:
@@ -81,9 +73,7 @@ public:
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+                               CORBA::Long flags);
     // Opens a file ,creates a Descriptor reference with the
     // ACE_HANDLE and returns that reference
 
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index abf27200e44..6756bb01394 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index f637b579140..83b273d7b95 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -23,7 +23,7 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 9bfef6166d5..58e785b9d62 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 871e64eef07..9ebf7650f5f 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -62,19 +62,19 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_2>\n";
     $SV->Kill (); 
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_3, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_3, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_3>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index b999a0ef89c..4af3e001392 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -60,7 +60,7 @@ main (int argc, char **argv)
   // Initialize the ORB
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl
index f5923faca34..3b048dafd55 100755
--- a/TAO/examples/POA/FindPOA/run_test.pl
+++ b/TAO/examples/POA/FindPOA/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $T = new PerlACE::Process ("FindPOA");
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
index eedc9664cb6..49f4d0825bd 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
@@ -15,16 +15,11 @@ ACE_RCSID(Forwarding, Servant_Activator, "$Id$")
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &,
                              PortableServer::POA_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   this->orb_->shutdown (0);
 
   // Throw forward exception
-  ACE_THROW_RETURN (
-                    PortableServer::ForwardRequest (
-                                                    this->forward_to_.in ()),
-                    0);
+  throw PortableServer::ForwardRequest (this->forward_to_.in ());
 }
 
 void
@@ -33,7 +28,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
                                PortableServer::Servant servant,
                                CORBA::Boolean,
                                CORBA::Boolean)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   delete servant;
 }
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index eda11fdaefc..081a137a852 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -39,16 +39,13 @@ public:
                     CORBA::Object_ptr forward_to);
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid,
-                                             PortableServer::POA_ptr adapter)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::POA_ptr adapter);
 
   virtual void etherealize (const PortableServer::ObjectId & oid,
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant serv,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Boolean remaining_activations);
 
   void forward_requests (void);
   // Object should be forwarded from now on.
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index b5b6309b044..e38df86410c 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 75a9c22bbd1..f0063a4d849 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -27,7 +27,7 @@ $CL  = new PerlACE::Process ("client", "-s 3 -k file://$iorfile3");
 
 $SV1->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV1->Kill (); 
     exit 1;
@@ -35,7 +35,7 @@ if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
 
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV1->Kill (); 
     $SV2->Kill ();
@@ -44,7 +44,7 @@ if (PerlACE::waitforfile_timed ($iorfile2, 15) == -1) {
 
 $SV3->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile3, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile3, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <server3>\n";
     $SV1->Kill (); 
     $SV2->Kill ();
diff --git a/TAO/examples/POA/Forwarding/test_i.cpp b/TAO/examples/POA/Forwarding/test_i.cpp
index e5b253f86ab..b973b929ffc 100644
--- a/TAO/examples/POA/Forwarding/test_i.cpp
+++ b/TAO/examples/POA/Forwarding/test_i.cpp
@@ -19,15 +19,12 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 CORBA::Long
 test_i::doit (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
 test_i::forward (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   test::Cannot_Forward))
 {
   this->activator_.forward_requests ();
 
@@ -40,7 +37,6 @@ test_i::forward (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/POA/Forwarding/test_i.h b/TAO/examples/POA/Forwarding/test_i.h
index b72e64413e6..023e60b962a 100644
--- a/TAO/examples/POA/Forwarding/test_i.h
+++ b/TAO/examples/POA/Forwarding/test_i.h
@@ -25,16 +25,12 @@ public:
                 ServantActivator &activator,
                 CORBA::Long value);
 
-  virtual CORBA::Long doit (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (void);
 
   // Setup forwarding
-  virtual void forward (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     test::Cannot_Forward));
+  virtual void forward (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   virtual PortableServer::POA_ptr _default_POA (void);
   // Returns the default POA for this servant.
diff --git a/TAO/examples/POA/Generic_Servant/test_i.cpp b/TAO/examples/POA/Generic_Servant/test_i.cpp
index d43196aea2a..787cbbd889e 100644
--- a/TAO/examples/POA/Generic_Servant/test_i.cpp
+++ b/TAO/examples/POA/Generic_Servant/test_i.cpp
@@ -22,13 +22,11 @@ test_i::_default_POA (void)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 test_i::oneway_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -50,7 +48,6 @@ test_i::sleep (CORBA::ULong timeout,
 
 void
 test_i::timed_method (CORBA::ULong timeout)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->sleep (timeout,
                "test_i::timed_method");
@@ -58,7 +55,6 @@ test_i::timed_method (CORBA::ULong timeout)
 
 void
 test_i::timed_oneway_method (CORBA::ULong timeout)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->sleep (timeout,
                "test_i::timed_oneway_method");
@@ -66,7 +62,6 @@ test_i::timed_oneway_method (CORBA::ULong timeout)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/POA/Generic_Servant/test_i.h b/TAO/examples/POA/Generic_Servant/test_i.h
index 6c0ff86e610..24094760497 100644
--- a/TAO/examples/POA/Generic_Servant/test_i.h
+++ b/TAO/examples/POA/Generic_Servant/test_i.h
@@ -25,24 +25,19 @@ public:
   PortableServer::POA_ptr _default_POA (void);
   // Returns the Default POA of this servant
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
   // A twoway operation.
 
-  void oneway_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_method (void);
   // A oneway operation.
 
-  void timed_method (CORBA::ULong timeout)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void timed_method (CORBA::ULong timeout);
   // A timed twoway operation.
 
-  void timed_oneway_method (CORBA::ULong timeout)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void timed_oneway_method (CORBA::ULong timeout);
   // A timed twoway operation.
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Shutdown the ORB
 
   void sleep (CORBA::ULong timeout,
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index c3f24418416..5bcaf80b63e 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -65,8 +65,6 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   // Obtain the servant else exception.
   PortableServer::Servant servant =
@@ -76,8 +74,7 @@ ServantActivator::incarnate (const PortableServer::ObjectId &oid,
   if (servant != 0)
     return servant;
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 // This is the method invoked when the object is deactivated or the
@@ -89,7 +86,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid,
                                PortableServer::Servant servant,
                                CORBA::Boolean,
                                CORBA::Boolean remaining_activations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
   // with test servant, deactivate it by calling the
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index a0a3ec2e174..77df93604ba 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -64,9 +64,7 @@ public:
   // Initialization.
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::POA_ptr poa);
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
   // RETAIN policies, whenever it receives a request for a
   // test object that is not currently active. When an servant
@@ -81,8 +79,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Boolean remaining_activations);
   // This method is invoked whenever a test object is
   // deactivated. This occurs when the POA is destroyed or the Object
   // is deactivated. When the POA is getting destroyed, it needs to
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 5a0442e04b7..461870a85dd 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -70,8 +70,6 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr poa,
                            const char * /* operation */,
                            PortableServer::ServantLocator::Cookie &cookie)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   PortableServer::Servant servant =
     (*servant_supplier_) (oid,
@@ -86,8 +84,7 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
       return servant;
     }
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 // Since the servant gets invoked per operation, the servant has to be
@@ -100,7 +97,6 @@ ServantLocator::postinvoke (const PortableServer::ObjectId &oid,
                             const char * /* operation */,
                             PortableServer::ServantLocator::Cookie cookie,
                             PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
   PortableServer::Servant my_servant =
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index eeedf1fb6c1..06396147ff5 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -69,9 +69,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::ServantLocator::Cookie &the_cookie);
   // This method is invoked by a POA whenever it receives a request
   // for test object that is not currently active.  When the POA is
   // created using the NON_RETAIN policy the Active Object Map is not
@@ -86,8 +84,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           PortableServer::Servant the_servant);
   // This method is invoked whenever a test servant completes a
   // request. As the Servant Loactor interface is used when the POA
   // doesnt maintain the Active Object Map, its necessary to get rid
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index b6376c3bbf5..f304108f73f 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -59,13 +59,13 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_2>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl
index d32447d3a0c..68e217ee405 100755
--- a/TAO/examples/POA/NewPOA/run_test.pl
+++ b/TAO/examples/POA/NewPOA/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $T = new PerlACE::Process ("NewPOA");
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index 2f445782f5b..7b20091b85f 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -33,8 +33,6 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb)
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   // Convert ObjectId to String.
 
@@ -47,7 +45,7 @@ ServantActivator::incarnate (const PortableServer::ObjectId &oid,
     return new test_i (this->orb_.in (), poa);
   else
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 }
 
@@ -58,7 +56,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
                                PortableServer::Servant servant,
                                CORBA::Boolean ,
                                CORBA::Boolean remaining_activations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
   // with test_i delete it.
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index 860e67077a5..e6252375228 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -31,9 +31,7 @@ public:
   ServantActivator (CORBA::ORB_ptr orb);
 
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                     PortableServer::POA_ptr poa);
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
   // RETAIN policies, whenever it receives a request for a test object
   // that is not currently active.
@@ -42,8 +40,7 @@ public:
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Boolean remaining_activations);
   // This method is invoked whenever a test object is deactivated.
 
 private:
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 93b1b8c6e3b..083ef55fbee 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -37,8 +37,6 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr poa,
                            const char * /* operation */,
                            PortableServer::ServantLocator::Cookie &cookie)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   // Convert ObjectID to String.
 
@@ -59,7 +57,7 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
     }
   else
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 }
 
@@ -69,7 +67,6 @@ ServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */,
                             const char * /* operation */,
                             PortableServer::ServantLocator::Cookie cookie,
                             PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index cd0556ec60c..ecf820f2886 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -39,9 +39,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::ServantLocator::Cookie &the_cookie);
   // This method is invoked by a POA whenever it receives a request
   // for test object that is not currently active.
 
@@ -49,8 +47,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           PortableServer::Servant the_servant);
   // This method is invoked whenever a test servant completes a
   // request.
 
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 8501109eabc..1b624e5b33b 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -60,13 +60,13 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
     $SV->Kill (); 
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_2>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index dc264f997e3..9191ad43dca 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -106,7 +106,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 5a30dec4d78..aea5dc9147e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -35,8 +35,6 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb)
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   // Convert ObjectId to String.
    CORBA::String_var s =
@@ -49,8 +47,7 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   if (servant != 0)
     return servant;
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 // This is the method invoked when the object is deactivated or the
@@ -62,7 +59,6 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid,
                                  PortableServer::Servant servant,
                                  CORBA::Boolean,
                                  CORBA::Boolean remaining_activations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
   // with test servant, deactivate it.  Etheralization happens on
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index dfb116a8157..9c6f2250bb0 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -42,9 +42,7 @@ public:
   // Initialization.
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::POA_ptr poa);
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
   // RETAIN policies, whenever it receives a request for a test object
   // that is not currently active. When an servant pointer
@@ -59,8 +57,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Boolean remaining_activations);
   // This method is invoked whenever a test servant is
   // deactivated. This occurs when the POA is destroyed or the Object
   // is deactivated. When the POA is getting destroyed, it needs to
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index 6e9f9f60340..d54ae5d09f7 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -37,8 +37,6 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
                              PortableServer::ServantLocator::Cookie &cookie)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   // Convert ObjectID to String.
 
@@ -60,8 +58,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
       return servant;
     }
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 // Since the servant gets invoked per operation, the servant has to be
@@ -74,7 +71,6 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
                               const char * /* operation */,
                               PortableServer::ServantLocator::Cookie cookie,
                               PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index e28daa6b5b1..385170cd40e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -47,9 +47,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::ServantLocator::Cookie &the_cookie);
   // This method is invoked by a POA whenever it receives a request
   // for test object that is not currently active.  When the POA is
   // created using the NON_RETAIN policy the Active Object Map is not
@@ -64,8 +62,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           PortableServer::Servant the_servant);
   // This method is invoked whenever a test servant completes a
   // request. As the Servant Loactor interface is used when the POA
   // doesnt maintain the Active Object Map, its necessary to get rid
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 4eb95e0141c..41559f4ba25 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -62,13 +62,13 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/examples/POA/POA_BiDir/run_test.pl b/TAO/examples/POA/POA_BiDir/run_test.pl
index e4f5ec4fac8..c56bd463c57 100755
--- a/TAO/examples/POA/POA_BiDir/run_test.pl
+++ b/TAO/examples/POA/POA_BiDir/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $T = new PerlACE::Process ("POA_BiDir");
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index ef074067c61..f83ff34b970 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -56,7 +56,7 @@ if ($server != 0) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index d80786263f2..c74deb6f070 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -35,7 +35,7 @@ main (int argc, char **argv)
   try
     {
       // Initilize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
diff --git a/TAO/examples/POA/RootPOA/run_test.pl b/TAO/examples/POA/RootPOA/run_test.pl
index c5cc16c716e..0f45dd22fc5 100755
--- a/TAO/examples/POA/RootPOA/run_test.pl
+++ b/TAO/examples/POA/RootPOA/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $T = new PerlACE::Process ("RootPOA");
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 4c42701fc9d..173bdd9ca9f 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -173,7 +173,7 @@ main (int argc, char **argv)
   try
     {
         // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl
index 465fc84eaea..e18329ba492 100755
--- a/TAO/examples/POA/TIE/run_test.pl
+++ b/TAO/examples/POA/TIE/run_test.pl
@@ -36,7 +36,7 @@ $SV->Spawn ();
 
 # In this example all the files are written out at the same time. So  make a
 # check only for the first file
-if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find ior files\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 81064c725e1..712c773dcda 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -32,7 +32,7 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB_init");
 
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
diff --git a/TAO/examples/POA/TIE/test_i.cpp b/TAO/examples/POA/TIE/test_i.cpp
index bc557892f28..8fc84b1abae 100644
--- a/TAO/examples/POA/TIE/test_i.cpp
+++ b/TAO/examples/POA/TIE/test_i.cpp
@@ -32,7 +32,6 @@ Tie_i::~Tie_i (void)
 // Return this->value
 CORBA::Long
 Tie_i::doit (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -48,7 +47,6 @@ A_i::A_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 A_i::doit (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -71,7 +69,6 @@ Outer_i::B_i::B_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 Outer_i::B_i::doit (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -94,7 +91,6 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 Outer_i::Inner_i::C_i::doit (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
diff --git a/TAO/examples/POA/TIE/test_i.h b/TAO/examples/POA/TIE/test_i.h
index b2a456bc0bf..3450c129f8a 100644
--- a/TAO/examples/POA/TIE/test_i.h
+++ b/TAO/examples/POA/TIE/test_i.h
@@ -27,8 +27,7 @@ public:
   virtual ~Tie_i (void);
 
   // Simple doit method
-  virtual CORBA::Long doit (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (void);
 
 protected:
 
@@ -43,8 +42,7 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (void);
 
   // Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (void);
@@ -69,8 +67,7 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long doit (void);
 
     // Returns the Default POA of this Servant object
     virtual PortableServer::POA_ptr _default_POA (void);
@@ -95,8 +92,7 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Long doit (void);
 
       // Returns the Default POA of this Servant object
       virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 05197509721..99caf3105fc 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -61,8 +61,6 @@ void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
              CORBA::Long value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
@@ -78,14 +76,12 @@ Grid_i::set (CORBA::Short x,
 CORBA::Long
 Grid_i::get (CORBA::Short x,
              CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
       || x >= width_
       || y >= height_)
-    ACE_THROW_RETURN (Grid::RANGE_ERROR (), -1);
+    throw Grid::RANGE_ERROR ();
   else
     return array_[x][y];
 }
@@ -94,28 +90,24 @@ Grid_i::get (CORBA::Short x,
 
 CORBA::Short
 Grid_i::width (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
 Grid_i::height (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
 Grid_i::width (CORBA::Short x)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
 Grid_i::height (CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
 }
@@ -123,7 +115,6 @@ Grid_i::height (CORBA::Short y)
 // Destroy the grid
 void
 Grid_i::destroy ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
   for (int i = 0; i < height_; i++)
@@ -165,7 +156,6 @@ Grid_Factory_i::~Grid_Factory_i (void)
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) Making a new Grid\n"));
@@ -192,7 +182,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
                                  height,
                                  pool_t_);
   if (errno == ENOMEM)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+    throw CORBA::NO_MEMORY ();
 
   errno = prev_no;
 
@@ -213,7 +203,6 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 void
 Grid_Factory_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) %s\n",
@@ -225,7 +214,6 @@ Grid_Factory_i::shutdown (void)
 
 void
 Grid_Factory_i::cleanup (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";
 
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index c6d665d01a6..4773bb54260 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -42,16 +42,13 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Short);
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown the server.
 
-  virtual void cleanup ( )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cleanup ( );
   // Do a clean up of the memory map
 
   void orb (CORBA::ORB_ptr o);
@@ -97,37 +94,28 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short width (void);
   // Returns the width of the grid
 
-  virtual CORBA::Short height (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short height (void);
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void width (CORBA::Short);
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void height (CORBA::Short);
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Grid::RANGE_ERROR));
+                    CORBA::Long);
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Grid::RANGE_ERROR));
+                           CORBA::Short);
   // Gets the grid value.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroy the grid.
 
   void set_pool (pool_t *);
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
index 034a06c97d5..3a493216ddf 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
@@ -30,7 +30,6 @@ void
 UDP_i::invoke (const char * client_name,
                UDP_ptr udpHandler,
                CORBA::Long request_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -75,7 +74,6 @@ UDP_i::invoke (const char * client_name,
 
 void
 UDP_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
index a2c81560b23..993e1228162 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
@@ -46,11 +46,9 @@ public:
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
-                       CORBA::Long request_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       CORBA::Long request_id);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   // Shutdown the server.
 
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
index e4cca3fefb7..4e4b487c01a 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
@@ -79,7 +79,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -120,8 +120,13 @@ main (int argc, char *argv[])
       // let it remember our ORB
       udp_i.orb (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&udp_i);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       UDP_var udpHandler_var =
-        udp_i._this ();
+        UDP::_narrow (object_act.in ());
 
       // Instantiate client
       UDP_Client_i *client = new UDP_Client_i (orb.in (),
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
index 6cb03a3d652..b3809af34e0 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -150,8 +150,13 @@ main (int argc, char *argv[])
 
       udpHandler_i.orb (orb.in ());
 
+      PortableServer::ObjectId_var id_act =
+        persistent_poa->activate_object (&udpHandler_i);
+
+      CORBA::Object_var object_act = persistent_poa->id_to_reference (id_act.in ());
+
       UDP_var udpHandler_var =
-        udpHandler_i._this ();
+        UDP::_narrow (object_act.in ());
 
       // Instantiate client
       UDP_Client_i* client = new UDP_Client_i (orb,
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index 6061703700d..7665ea1e1fc 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -30,7 +30,6 @@ UDP_i::orb (CORBA::ORB_ptr orb)
 
 void
 UDP_i::setResponseHandler (UDP_ptr udpHandler)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (udpHandler))
     ACE_DEBUG ((LM_DEBUG,
@@ -42,7 +41,6 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler)
 void
 UDP_i::invoke (const char * client_name,
                CORBA::Long request_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -91,7 +89,6 @@ UDP_i::invoke (const char * client_name,
 
 void
 UDP_i::reset (const char * client_name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -116,7 +113,6 @@ UDP_i::reset (const char * client_name)
 
 void
 UDP_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index a1c42bfc64d..9754f100c19 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -39,19 +39,15 @@ public:
   ~UDP_i (void);
   // Destructor
 
-  virtual void setResponseHandler (UDP_ptr udpHandler)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void setResponseHandler (UDP_ptr udpHandler);
 
   virtual void invoke (const char *client_name,
-                       CORBA::Long request_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       CORBA::Long request_id);
 
-  virtual void reset (const char * client_name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset (const char * client_name);
 
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   // Shutdown the server.
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index 85160bbc5e5..74daec629d4 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -11,7 +11,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 
 void
 Simple_Server_i::sendCharSeq (const Char_Seq &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
   //ACE_DEBUG ((LM_DEBUG, "."));
@@ -19,7 +18,6 @@ Simple_Server_i::sendCharSeq (const Char_Seq &)
 
 void
 Simple_Server_i::sendOctetSeq (const Octet_Seq &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
   //ACE_DEBUG ((LM_DEBUG, "."));
@@ -27,7 +25,6 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq &)
 
 CORBA::Long
 Simple_Server_i::get_number (CORBA::Long)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long tmp = Simple_Server_count;
   Simple_Server_count = 0;
@@ -36,7 +33,6 @@ Simple_Server_i::get_number (CORBA::Long)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index 6eced0ebb9b..bfd469f86e4 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -31,17 +31,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void sendCharSeq (const Char_Seq & charSeq)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void sendCharSeq (const Char_Seq & charSeq);
 
-  void sendOctetSeq (const Octet_Seq & octetSeq)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void sendOctetSeq (const Octet_Seq & octetSeq);
 
-  CORBA::Long get_number (CORBA::Long num)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long get_number (CORBA::Long num);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 760a754b968..dcd461128ab 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -41,8 +41,6 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
 
 CosLifeCycle::Factories *
 Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory))
 {
   const char *exception_message = "Null Message";
 
@@ -77,7 +75,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key)
 
     // Check if it is a valid Quoter Factory reference
     if (CORBA::is_nil (quoterFactoryObject_var.in()))
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+      throw CosLifeCycle::NoFactory (factory_key);
 
     // create a sequence of factories object
     factories_ptr = new CosLifeCycle::Factories (1);
@@ -87,7 +85,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key)
 
     // Check if it is a valid Quoter Factory reference.
     if (CORBA::is_nil (quoterFactoryObject_var.in ())) // throw a NoFactory exception.
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+      throw CosLifeCycle::NoFactory (factory_key);
 
     // insert the object reference
     (*factories_ptr)[0] = CORBA::Object::_duplicate (quoterFactoryObject_var.in());
@@ -99,7 +97,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key)
   catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Factory_Finder::find_factories - %s\n", exception_message));
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+      throw CosLifeCycle::NoFactory (factory_key);
     }
 
   return factories_ptr;
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 0a3945c5d55..bcd6f4c4996 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -28,9 +28,7 @@ public:
   Quoter_Factory_Finder_i (int debug_level = 1);
   ~Quoter_Factory_Finder_i (void);
 
-  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory));
+  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key);
   // Returns a sequence of Factories if factories matching the
   // factory_key were found. If no factory was found, then the
   // NoFactory exception, defined in CosLifeCycle, is raised.
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index b8b31a9f546..74eb8e88b8f 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -37,7 +37,6 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 
 CORBA::Boolean
 Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -79,8 +78,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
     }
   catch (const CORBA::Exception&)
     {
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
-                        CosNaming::NamingContext::_nil ());
+      throw CosLifeCycle::NoFactory (factory_key);
     }
   return quoterNamingContext_var._retn ();
 }
@@ -90,10 +88,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 CORBA::Object_ptr
 Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
                                          const CosLifeCycle::Criteria &)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria))
 {
   Stock::Quoter_var quoter_var;
   try
@@ -152,8 +146,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
     }
   catch (const CORBA::Exception&)
     {
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
-                        CORBA::Object::_nil ());
+      throw CosLifeCycle::NoFactory (factory_key);
     }
   return quoter_var._retn ();
 }
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index 8245312a87c..d5f46a21778 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -29,17 +29,12 @@ public:
   Quoter_Generic_Factory_i (int debug_level = 1);
   ~Quoter_Generic_Factory_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key);
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria));
+                                   const CosLifeCycle::Criteria &the_criteria);
   // Returns an object reference to a newly created object, though the
   // Generic Factory itself cannot create objects, it will forward the
   // request to a more concrete Factory.
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 49d1da0a283..a3571740a13 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -11,10 +11,10 @@ project(*IDL): taoidldefaults {
 project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corba_e_micro {
   after += *IDL
   Source_Files {
+    QuoterC.cpp
+    QuoterS.cpp
     server.cpp
     Quoter_i.cpp
-    QuoterS.cpp
-    QuoterC.cpp
   }
   IDL_Files {
   }
@@ -23,8 +23,8 @@ 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 {
   after += *IDL
   Source_Files {
-    client.cpp
     QuoterC.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -33,10 +33,10 @@ project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_com
 project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
   after += *IDL
   Source_Files {
+    QuoterC.cpp
+    QuoterS.cpp
     Factory_Finder.cpp
     Factory_Finder_i.cpp
-    QuoterS.cpp
-    QuoterC.cpp
   }
   IDL_Files {
   }
@@ -45,10 +45,10 @@ project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
 project(*Generic Factory): namingexe, lifecycle, avoids_minimum_corba, utils {
   after += *IDL
   Source_Files {
+    QuoterC.cpp
+    QuoterS.cpp
     Generic_Factory.cpp
     Generic_Factory_i.cpp
-    QuoterS.cpp
-    QuoterC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 98c7dbcbc5c..9e0ad3525cc 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -89,8 +89,6 @@ int Quoter_Factory_i::init (void)
 
 Stock::Quoter_ptr
 Quoter_Factory_i::create_quoter (const char *)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Stock::Invalid_Quoter))
 {
   this->next_quoter_ = (this->next_quoter_ + 1) % this->quoter_num_;
 
@@ -126,9 +124,6 @@ Quoter_i::~Quoter_i (void)
 
 CORBA::Long
 Quoter_i::get_quote (char const *)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Stock::Invalid_Stock,
-                       Stock::Invalid_Quoter))
 {
   return 42;
 }
@@ -140,11 +135,6 @@ CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
                 const CosLifeCycle::Criteria &/*the_criteria*/
                 )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::NotCopyable,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria))
 {
   const char *exception_message = "Null message";
   CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr =
@@ -218,8 +208,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
                   ACE_ERROR ((LM_ERROR,
                               "Quoter::copy: Last factory did not work. \n"
                               "No more factories are available. I give up.\n"));
-                  ACE_THROW_RETURN (CosLifeCycle::NoFactory (factoryKey),
-                                    CosLifeCycle::LifeCycleObject::_nil());
+                  throw CosLifeCycle::NoFactory (factoryKey);
                 }
               else
                 {
@@ -259,11 +248,6 @@ void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
                 const CosLifeCycle::Criteria & /* the_criteria */
                 )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::NotMovable,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria))
 {
   ACE_ERROR ((LM_ERROR,
               "Quoter_i::move: The Quoter object is not movable!"));
@@ -276,8 +260,6 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 
 void
 Quoter_i::remove (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NotRemovable))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n"));
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index b0bdc032f20..06d24a017c0 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -43,35 +43,20 @@ public:
   ~Quoter_i (void);
   // Destructor
 
-  virtual CORBA::Long get_quote (const char *stock_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Stock::Invalid_Stock,
-                       Stock::Invalid_Quoter));
+  virtual CORBA::Long get_quote (const char *stock_name);
   // Returns the current quote for the stock <stock_name>
 
   // = Lifecycle methods
 
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
-                                                  const CosLifeCycle::Criteria &the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::NotCopyable,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria));
+                                                  const CosLifeCycle::Criteria &the_criteria);
   // Make a copy of this object
 
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
-                     const CosLifeCycle::Criteria &the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::NotMovable,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria));
+                     const CosLifeCycle::Criteria &the_criteria);
   // Move this object using <there>
 
-  virtual void remove (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NotRemovable));
+  virtual void remove (void);
   // Removes the object.
 
 private:
@@ -105,9 +90,7 @@ public:
   int init (void);
   // Initialize everything in the factory
 
-  virtual Stock::Quoter_ptr create_quoter (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Stock::Invalid_Quoter));
+  virtual Stock::Quoter_ptr create_quoter (const char *name);
   // Return the quoter by the id <name>.
 
 private:
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index a0182cea653..edd048f7776 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -35,7 +35,6 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 
 void
 Job_i::work (CORBA::ULong work)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
 
@@ -52,7 +51,6 @@ Job_i::work (CORBA::ULong work)
 
 void
 Job_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACTIVITY::instance()->job_ended (this);
 }
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 194b9bd2b1e..7421f8897fe 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -38,15 +38,9 @@ class activity_Export Job_i : public POA_Job
   const ACE_CString& poa (void);
 
   /// = inteface Job method implementation.
-  virtual void work (CORBA::ULong work)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void work (CORBA::ULong work);
+
+  virtual void shutdown (void);
  protected:
   /// The name of this Job
   ACE_CString job_name_;
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index b8ee3b265c1..afb34758c29 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -9,21 +9,18 @@ ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
 RTCORBA::Priority
 Segment_Sched_Param_Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
 Segment_Sched_Param_Policy::value (RTCORBA::Priority value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
 Segment_Sched_Param_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -37,7 +34,6 @@ Segment_Sched_Param_Policy::copy (void)
 
 void
 Segment_Sched_Param_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -63,7 +59,6 @@ Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
 
 FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
 Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy;
   ACE_NEW_THROW_EX (segment_policy,
@@ -86,8 +81,6 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
                                                         const char *,
                                                         CORBA::Policy_ptr /*sched_policy*/,
                                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 }
 
@@ -96,8 +89,6 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
                                                            CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -110,8 +101,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
                                                      const char *name,
                                                      CORBA::Policy_ptr sched_param,
                                                      CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -123,7 +112,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
 void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
                                                   const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -131,7 +119,6 @@ void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
                                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -139,8 +126,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
 
 void
 Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   int priority;
@@ -172,8 +157,6 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
                                            CORBA::String_out /*name*/,
                                            CORBA::Policy_out /*sched_param*/,
                                            CORBA::Policy_out /*implicit_sched_param*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext* serv_cxt =
     request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
@@ -217,80 +200,63 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 
 void
 Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 Fixed_Priority_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
 Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 Fixed_Priority_Scheduler::poa_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 char *
 Fixed_Priority_Scheduler::scheduling_discipline_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -298,7 +264,6 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (void)
 RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
                                                    CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -307,6 +272,5 @@ void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                                     const char *,
                                                     CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index 1312733b110..fde76bc7875 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -12,17 +12,13 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
        public TAO_Local_RefCounted_Object
 {
  public:
-  virtual RTCORBA::Priority value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTCORBA::Priority value (void);
 
-  virtual void value (RTCORBA::Priority value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void value (RTCORBA::Priority value);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
  private:
   RTCORBA::Priority value_;
@@ -39,100 +35,68 @@ public TAO_Local_RefCounted_Object
   ~Fixed_Priority_Scheduler (void);
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
-    create_segment_scheduling_parameter (RTCORBA::Priority segment_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    create_segment_scheduling_parameter (RTCORBA::Priority segment_priority);
 
   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_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+					     CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+						CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+					  CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-				       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+				       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
 					      const char * name,
-					      CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					      CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+				CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-								     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+								     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
 					 const char * name,
-					 CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 CORBA::Policy_ptr scheduling_parameter);
 
  private:
   RTScheduling::Current_var current_;
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 6aee5a32c81..d42eb82ae2e 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -53,7 +53,6 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 void
 Job_i::work (CORBA::ULong work,
        CORBA::Short importance)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
 
@@ -125,7 +124,6 @@ Job_i::guid (void)
 
 void
 Job_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   dt_creator_->job_ended ();
 }
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 6a79a8f9c3d..c2d3c5d3861 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -45,20 +45,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work,
-         CORBA::Short importance)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+         CORBA::Short importance);
 
   virtual void post_work (int guid,
         int importance);
 
   void dump_stats (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void shutdown (void);
 
   int guid (void);
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index c97affc9fbc..aa1bb813242 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -32,21 +32,18 @@ DT::resume (void)
 
 CORBA::Short
 Segment_Sched_Param_Policy::importance (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->importance_;
 }
 
 void
 Segment_Sched_Param_Policy::importance (CORBA::Short importance)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->importance_ = importance;
 }
 
 CORBA::Policy_ptr
 Segment_Sched_Param_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -60,7 +57,6 @@ Segment_Sched_Param_Policy::copy (void)
 
 void
 Segment_Sched_Param_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -119,7 +115,6 @@ MIF_Scheduler::resume_main (void)
 
 MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
 MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy;
   ACE_NEW_THROW_EX (segment_policy,
@@ -141,8 +136,6 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   size_t count = 0;
   ACE_OS::memcpy (&count,
@@ -183,8 +176,6 @@ MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
                                                            CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
@@ -197,8 +188,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/
                                           const char* /*name*/,
                                           CORBA::Policy_ptr sched_policy,
                                           CORBA::Policy_ptr /*implicit_sched_param*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   size_t count = 0;
   ACE_OS::memcpy (&count,
@@ -248,7 +237,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/
 void
 MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                        const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   size_t count = 0;
   ACE_OS::memcpy (&count,
@@ -275,14 +263,11 @@ void
 MIF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
                                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
     MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
@@ -364,8 +349,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
                                 CORBA::String_out,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (TAO_debug_level > 0)
@@ -435,7 +418,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 
 void
 MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   RTScheduling::Current::IdType* guid = current_->id ();
@@ -463,8 +445,6 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
 
 void
 MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (ready_que_.message_count () > 0)
     {
@@ -480,8 +460,6 @@ MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
 
 void
 MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
@@ -512,14 +490,11 @@ MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
 
 void
 MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
@@ -567,8 +542,6 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
 
 void
 MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
     MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
@@ -609,8 +582,6 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
 
 void
 MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
  MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
     MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
@@ -651,33 +622,28 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
 
 void
 MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 MIF_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
 MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 MIF_Scheduler::poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
 
 char *
 MIF_Scheduler::scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
@@ -685,7 +651,6 @@ MIF_Scheduler::scheduling_discipline_name (void)
 RTScheduling::ResourceManager_ptr
 MIF_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
@@ -694,6 +659,5 @@ void
 MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index ee1f5371f55..18a16e78234 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -34,17 +34,13 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy,
        public TAO_Local_RefCounted_Object
 {
  public:
-  virtual CORBA::Short importance (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short importance (void);
 
-  virtual void importance (CORBA::Short importance)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void importance (CORBA::Short importance);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
  private:
   CORBA::Short importance_;
@@ -64,8 +60,7 @@ public TAO_Local_RefCounted_Object
 
 
   virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
-    create_segment_scheduling_parameter (CORBA::Short segment_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    create_segment_scheduling_parameter (CORBA::Short segment_priority);
 
   void wait (void);
 
@@ -76,94 +71,63 @@ public TAO_Local_RefCounted_Object
   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_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+               CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+            CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-         RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+            CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-               const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                 const char * name,
-                CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+        CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-         PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
            const char * name,
-           CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+           CORBA::Policy_ptr scheduling_parameter);
 
  private:
   RTScheduling::Current_var current_;
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 43f48446ccf..4357fd8cdcb 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -9,7 +9,6 @@ Synch_i::Synch_i (void)
 
 void
 Synch_i::go (CORBA::Long base_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
 	      "GO\n"));
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index 9758f3bd8c4..248895d9a18 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -10,8 +10,7 @@ class SYNCH_Export Synch_i : public POA_Synch
  public:
 
   Synch_i (void);
-  virtual void go (CORBA::Long base_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void go (CORBA::Long base_time);
 
   int synched (void);
 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index c8f2efdecb5..2cc8345a076 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -46,7 +46,6 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager)
 Bank::Account_ptr
 AccountManager_i::open (const char *name,
                         CORBA::Float initial_balance)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Account_i *result = 0;
 
@@ -73,8 +72,7 @@ AccountManager_i::open (const char *name,
       if (hash_map_.bind (name, result) == -1)
         {
           delete result;
-          ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                            Bank::Account::_nil ());
+          throw CORBA::UNKNOWN ();
         }
     }
   else if (TAO_debug_level > 0)
@@ -92,7 +90,6 @@ AccountManager_i::open (const char *name,
 
 void
 AccountManager_i::close (Bank::Account_ptr account)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -119,7 +116,6 @@ AccountManager_i::close (Bank::Account_ptr account)
 
 void
 AccountManager_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n[SERVER] Process/Thread Id : (%P/%t) %s\n",
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 441152eafa6..f7e37df9d97 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -56,17 +56,14 @@ public:
   // Destructor.
 
   virtual Bank::Account_ptr open (const char *name,
-                                  CORBA::Float initial_balance)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                  CORBA::Float initial_balance);
   // Return the Account interface with the given name from the server.
   // Put the initial balance specified in the new account.
 
-  virtual void close (Bank::Account_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void close (Bank::Account_ptr);
   // Close the given account.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown the server.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index 6243c29e421..ca440ad854c 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -38,22 +38,18 @@ Account_i::orb (CORBA::ORB_ptr o)
 
 CORBA::Float
 Account_i::balance (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return balance_;
 }
 
 void
 Account_i::deposit (CORBA::Float deposit)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   balance_ += deposit;
 }
 
 void
 Account_i::withdraw (CORBA::Float withdrawl)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Bank::Account::Overdraft))
 {
   if (balance_ >= withdrawl)
     balance_ -= withdrawl;
@@ -63,14 +59,12 @@ Account_i::withdraw (CORBA::Float withdrawl)
 
 char *
 Account_i::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
 Account_i::name (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (name);
 }
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index 657a53f1156..77d8c2a20e5 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -42,26 +42,20 @@ public:
   ~Account_i (void);
   // Destructor.
 
-  virtual CORBA::Float balance (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Float balance (void);
 
   // Get the current balance in the account.
 
-  virtual char *name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *name (void);
   // Get the name of the <Account> holder.
 
-  virtual void name (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void name (const char *name);
   // Set the name of the <Account> holder.
 
-  virtual void deposit (CORBA::Float)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deposit (CORBA::Float);
   // Deposit money in the account.
 
-  virtual void withdraw (CORBA::Float)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Bank::Account::Overdraft));
+  virtual void withdraw (CORBA::Float);
   // Withdraw money in the account.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index a8fc2264d0b..34179d05bdd 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -12,12 +12,12 @@ project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
   exename = server
   after += *IDL
   Source_Files {
+    BankC.cpp
+    BankS.cpp
     Account_i.cpp
     AccountManager_i.cpp
     ../Simple_util.cpp
     server.cpp
-    BankS.cpp
-    BankC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index 24ad01cda93..66d570eac15 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -44,10 +44,6 @@ Broadcaster_i::~Broadcaster_i (void)
 void
 Broadcaster_i::add (Receiver_ptr receiver,
                     const char *nickname)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Broadcaster::CannotAdd
-    ))
 {
   Broadcaster_i::Receiver_Data receiver_data;
 
@@ -77,10 +73,6 @@ Broadcaster_i::add (Receiver_ptr receiver,
 
 void
 Broadcaster_i::remove (Receiver_ptr receiver)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Broadcaster::CannotRemove
-    ))
 {
   Broadcaster_i::Receiver_Data receiver_data_to_remove;
 
@@ -117,9 +109,6 @@ Broadcaster_i::remove (Receiver_ptr receiver)
 void
 Broadcaster_i::say (Receiver_ptr receiver,
                     const char *text)
- ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   try
     {
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index dbe9857c821..e893d69adab 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -45,25 +45,14 @@ public:
   // Destructor.
 
   virtual void add (Receiver_ptr receiver,
-                    const char *nickname)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Broadcaster::CannotAdd
-    ));
+                    const char *nickname);
   // Saves receiver references in a list.
 
-  virtual void remove (Receiver_ptr receiver)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Broadcaster::CannotRemove
-    ));
+  virtual void remove (Receiver_ptr receiver);
   // Removes receiver references from the list.
 
   virtual void say (Receiver_ptr receiver,
-                    const char *text)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                    const char *text);
   // Called by Broadcaster clients to send messages.
 
 public:
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index 76f87bb8ec5..acbb73f7f3d 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -29,9 +29,6 @@ Receiver_i::~Receiver_i (void)
 
 void
 Receiver_i::message (const char *msg)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   ACE_DEBUG ((LM_DEBUG,
               ": %s\n",
@@ -40,9 +37,6 @@ Receiver_i::message (const char *msg)
 
 void
 Receiver_i::shutdown (void)
- ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   // Instruct the ORB to shutdown.
   this->orb_->shutdown ();
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 8db9998cc4a..d1e5a900706 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -37,16 +37,10 @@ public:
   ~Receiver_i (void);
   // Destructor.
 
-  virtual void message (const char *msg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  virtual void message (const char *msg);
   // Receives a message string.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  virtual void shutdown (void);
   // Called when the chat server is going away.  The client
   // implementation should shutdown the chat client in response to
   // this.
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index 5b3a353ea50..d8649da64d4 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -14,12 +14,12 @@ project(*server) : taoserver, utils, iortable {
   IDL_Files {
   }
   Source_Files {
+    BroadcasterC.cpp
+    BroadcasterS.cpp
+    ReceiverC.cpp 
     Broadcaster_i.cpp
     Server_i.cpp
     server.cpp
-    BroadcasterS.cpp
-    BroadcasterC.cpp
-    ReceiverC.cpp 
   }
 }
 
@@ -28,11 +28,11 @@ project(*client): taoexe, portableserver, utils {
   IDL_Files {
   }
   Source_Files {
+    ReceiverC.cpp 
+    ReceiverS.cpp 
+    BroadcasterC.cpp
     Receiver_i.cpp
     Client_i.cpp
     client.cpp
-    ReceiverS.cpp 
-    ReceiverC.cpp 
-    BroadcasterC.cpp
   }
 }
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 64bdb6e52f3..f74fbf70e90 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -28,7 +28,6 @@ Echo_i::orb (CORBA::ORB_ptr o)
 
 Echo::List *
 Echo_i::echo_list (const char *)
- ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Echo::List_var list;
 
@@ -61,7 +60,6 @@ Echo_i::echo_list (const char *)
 
 char *
 Echo_i::echo_string (const char *mesg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The pointer mesg was NULL, return.
   if (mesg == 0)
@@ -73,7 +71,7 @@ Echo_i::echo_string (const char *mesg)
   // raised.
 
   if (str.in () == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+    throw CORBA::NO_MEMORY ();
 
   // Got thru! now, make a deep copy of the mesg string and send it
   // back to the client.
@@ -87,7 +85,6 @@ Echo_i::echo_string (const char *mesg)
 
 void
 Echo_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n%s\n",
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 1b5628a6a0e..2ec327e5f8d 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -40,16 +40,13 @@ public:
   ~Echo_i (void);
   // Destructor.
 
-  virtual Echo::List *echo_list (const char *mesg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Echo::List *echo_list (const char *mesg);
   // Return the mesg string back from the server.
 
-  virtual char *echo_string (const char *mesg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *echo_string (const char *mesg);
   // Return the mesg string back from the server.
 
- virtual void shutdown (void)
-   ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void shutdown (void);
   // Shutdown the server.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 47998c5d449..a15811675ba 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -48,8 +48,6 @@ void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
              CORBA::Long value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
@@ -65,14 +63,12 @@ Grid_i::set (CORBA::Short x,
 CORBA::Long
 Grid_i::get (CORBA::Short x,
              CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Grid::RANGE_ERROR))
 {
   if (x < 0
       || y < 0
       || x >= width_
       || y >= height_)
-    ACE_THROW_RETURN (Grid::RANGE_ERROR (), -1);
+    throw Grid::RANGE_ERROR ();
   else
     return array_[x][y];
 }
@@ -81,28 +77,24 @@ Grid_i::get (CORBA::Short x,
 
 CORBA::Short
 Grid_i::width (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
 Grid_i::height (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
 Grid_i::width (CORBA::Short x)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
 Grid_i::height (CORBA::Short y)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
 }
@@ -111,7 +103,6 @@ Grid_i::height (CORBA::Short y)
 
 void
 Grid_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
 
@@ -137,7 +128,6 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 void
 Grid_Factory_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) %s\n",
@@ -166,7 +156,6 @@ Grid_Factory_i::~Grid_Factory_i (void)
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Grid_i *grid_ptr = 0;
 
@@ -188,6 +177,17 @@ Grid_Factory_i::make_grid (CORBA::Short width,
                     CORBA::NO_MEMORY ());
 
   // Register the Grid pointer.
-  Grid_ptr gptr = grid_ptr->_this ();
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (grid_ptr);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+  Grid_ptr gptr = Grid::_narrow (object.in ());
   return gptr;
 }
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 2911b466cca..e1393305fb8 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -41,37 +41,28 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short width (void);
   // Returns the width of the grid
 
-  virtual CORBA::Short height (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short height (void);
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void width (CORBA::Short);
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void height (CORBA::Short);
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Grid::RANGE_ERROR));
+                    CORBA::Long);
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Grid::RANGE_ERROR));
+                           CORBA::Short);
   // Gets the grid value.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   // Destroy the grid.
 
@@ -99,12 +90,10 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Short);
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown the server.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index fea24a387e9..b1560d75e3d 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -12,11 +12,11 @@ project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
   exename = server
   after += *IDL
   Source_Files {
+    GridC.cpp
+    GridS.cpp
     Grid_i.cpp
     server.cpp
     ../Simple_util.cpp
-    GridS.cpp
-    GridC.cpp
   }
   IDL_Files {
   }
@@ -26,10 +26,10 @@ project(*client): namingexe, iortable, utils {
   exename = client
   after += *IDL
   Source_Files {
+    GridC.cpp
     client.cpp
     ../Simple_util.cpp
     Grid_Client_i.cpp
-    GridC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index e2a7aab8d18..4d2c545d02c 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -186,8 +186,19 @@ Time_Date_Servant::init (int argc, char *argv[])
       Time_Date_i * servant = new Time_Date_i;
       PortableServer::ServantBase_var safe_servant = servant;
 
+      CORBA::Object_var poa_object =
+        orb->orb_->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       CORBA::Object_var obj =
-        servant->_this ();
+        CORBA::Object::_narrow (object.in ());
 
       CORBA::String_var str =
         orb->orb_->object_to_string (obj.in ());
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 0f7479f7882..f2996be3ecd 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -8,7 +8,6 @@
 
 void
 Time_Date_i::bin_date (CORBA::Long_out time_date)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_date = ACE_OS::time (0);
 }
@@ -17,7 +16,6 @@ Time_Date_i::bin_date (CORBA::Long_out time_date)
 
 void
 Time_Date_i::str_date (CORBA::String_out time_date)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const time_t time = ACE_OS::time (0);
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index b4dcac8018c..96ef47f8003 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -34,13 +34,11 @@ class Time_Date_i
 public:
   // = Initialization and termination methods.
 
-  virtual void bin_date (CORBA::Long_out time_date)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void bin_date (CORBA::Long_out time_date);
 
   // Obtain the time and date in binary format.
 
-  virtual void str_date (CORBA::String_out time_date)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void str_date (CORBA::String_out time_date);
   // Obtain the time and date in string format.
 
   void orb (CORBA::ORB_ptr orb_ptr);
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index d7db9b30c7b..19ded656f71 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -30,7 +30,6 @@ Time_i::orb (CORBA::ORB_ptr o)
 
 CORBA::Long
 Time_i::current_time (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Long (ACE_OS::time (0));
 }
@@ -39,7 +38,6 @@ Time_i::current_time (void)
 
 void
 Time_i::shutdown ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index 621c8519fe8..904f575851b 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -39,12 +39,10 @@ public:
   ~Time_i (void);
   // Destructor
 
-  virtual CORBA::Long current_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long current_time (void);
   // Return the current time/date on the server
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   // Shutdown the server.
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 9a0daa7cd8a..4061b552e55 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -77,7 +77,6 @@ private:
   public:
 
     virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index bdedb6c27ff..50c27673806 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -278,7 +278,6 @@ DualEC_Supplier::init ()
 
 void
 DualEC_Supplier::Terminator::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 1b9695b9cc0..cb6f64519f6 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -81,8 +81,7 @@ private:
     // = DESCRIPTION
     // Private class that implements a termination servant.
   {
-    void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void shutdown (void);
   };
 
   static ACE_THR_FUNC_RETURN run_orb (void *);
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 0ae7315b44f..3f25d180b64 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -133,7 +133,6 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
 void
 Demo_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Consumer received disconnect from channel.\n"));
@@ -141,7 +140,6 @@ Demo_Consumer::disconnect_push_consumer (void)
 
 void
 Demo_Consumer::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (events.length () == 0)
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index b18544679c8..89c2b4cd905 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -46,13 +46,11 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet &events);
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index bf1953fdf8b..08e9bc9baa3 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
       // Not needed for ORB-created typecodes
       // (see CORBA 2.4.2 section 10.7.3).
       foo_members[0].type_def = CORBA::IDLType::_nil ();
-      CORBA::Short label_value = -3;
+      CORBA::Short label_value = 3;
       foo_members[0].label <<= label_value;
 
       foo_members[1].name = CORBA::string_dup ("foo_str_member");
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
       foo_members[2].name = CORBA::string_dup ("foo_str_member");
       foo_members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
       foo_members[2].type_def = CORBA::IDLType::_nil ();
-      label_value = -1;
+      label_value = 1;
       foo_members[2].label <<= label_value;
 
       // The default member.
diff --git a/TAO/examples/TypeCode_Creation/test.idl b/TAO/examples/TypeCode_Creation/test.idl
index 5633d769d46..e8fda6b204f 100644
--- a/TAO/examples/TypeCode_Creation/test.idl
+++ b/TAO/examples/TypeCode_Creation/test.idl
@@ -12,9 +12,9 @@ interface iface {};
 
 union foo switch (short)
 {
-  case -3:
+  case  3:
   case  4:
-  case -1: string foo_str_member;
+  case  1: string foo_str_member;
   default: iface foo_iface_member;
   case  0: iface foo_iface_member2;
 };
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index 84647e7b5a1..f2c5451d7cd 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -13,10 +13,10 @@ project(*server): namingexe, portableserver {
 
   after += *IDL
   Source_Files {
+    corbalocC.cpp
+    corbalocS.cpp
     status_i.cpp
     server.cpp
-    corbalocS.cpp
-    corbalocC.cpp
   }
   IDL_Files {
   }
@@ -27,9 +27,9 @@ project(*client): namingexe {
 
   after += *IDL
   Source_Files {
+    corbalocC.cpp
     ior_corbaloc_client_i.cpp
     client.cpp
-    corbalocC.cpp
   }
   IDL_Files {
   }
@@ -40,8 +40,8 @@ project(*corbaname client): taoclient {
 
   after += *IDL
   Source_Files {
-    corbaname_client.cpp
     corbalocC.cpp
+    corbaname_client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index af4cf921000..701627d158a 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -39,8 +39,13 @@ int main (int argc, char* argv[])
       corbaloc_Status_i status_i;
       status_i.set_name (argv[1]);
       // Activate it to obtain the reference
+      PortableServer::ObjectId_var id =
+        poa->activate_object (&status_i);
+
+      CORBA::Object_var object = poa->id_to_reference (id.in ());
+
       corbaloc::Status_var status =
-        status_i._this ();
+        corbaloc::Status::_narrow (object.in ());
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index fc47f429511..ebc94e73019 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -10,7 +10,6 @@ corbaloc_Status_i::corbaloc_Status_i ()
 
 CORBA::Boolean
 corbaloc_Status_i::print_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the server received the request from the client, return true
   // == 0;
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 3b3495833db..7873d238dc3 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -11,8 +11,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status
 public:
   corbaloc_Status_i ();
 
-  CORBA::Boolean print_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean print_status (void);
 
   void set_name (const char *name) { server_name_ = name; }
 
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index df242339900..75f819b6970 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -39,7 +39,6 @@ interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
 
 char *
 interop_WChar_Passer_i::orb_name (void)
-    ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::string_dup ("TAO");
 }
@@ -47,14 +46,12 @@ interop_WChar_Passer_i::orb_name (void)
 CORBA::Boolean
 interop_WChar_Passer_i::wchar_to_server (CORBA::WChar test,
                                          CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wchar (key,test);
 }
 
 CORBA::WChar
 interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.get_wchar (key);
 }
@@ -62,14 +59,12 @@ interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstring_to_server (const CORBA::WChar * test,
                                            CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wstring(key,test);
 }
 
 CORBA::WChar *
 interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::wstring_dup (ref_.get_wstring(key));
 }
@@ -77,14 +72,12 @@ interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::warray_to_server (const interop::warray test,
                                           CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_warray(key,test);
 }
 
 interop::warray_slice *
 interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return interop::warray_dup (ref_.get_warray(key));
 }
@@ -92,7 +85,6 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
                                            CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return
     ref_.match_wchar (key,test.st_char) &&
@@ -103,7 +95,6 @@ interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
 
 interop::wstruct *
 interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstruct_var ws = new interop::wstruct ();
   ws->st_char = this->wchar_from_server(key);
@@ -116,7 +107,6 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
                                               CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Boolean result = 1;
   for (CORBA::ULong i = 0; result && i < test.length(); i++)
@@ -128,7 +118,6 @@ interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
 
 interop::wstructseq *
 interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstructseq_var wsListI = new interop::wstructseq();
   wsListI->length(5);
@@ -151,7 +140,6 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key)
 CORBA::Boolean
 interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
                                           CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   switch (test._d()) {
   case interop::is_wchar :
@@ -169,7 +157,6 @@ interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
 interop::wunion *
 interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
                                             interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wunion *wu = new interop::wunion ();
   switch (type) {
@@ -190,7 +177,6 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
 CORBA::Boolean
 interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
                                        CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::WChar wc;
   const CORBA::WChar *ws;
@@ -215,7 +201,6 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
 CORBA::Any*
 interop_WChar_Passer_i::any_from_server (CORBA::Short key,
                                          interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Any *any = new CORBA::Any;
   switch (type) {
@@ -237,15 +222,12 @@ interop_WChar_Passer_i::any_from_server (CORBA::Short key,
 
 CORBA::Any *
 interop_WChar_Passer_i::any_echo (const CORBA::Any &test)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return new CORBA::Any (test);
 }
 
 void
 interop_WChar_Passer_i::exception_test ( CORBA::Short key)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   interop::WChar_Passer::WStringException))
 {
   throw interop::WChar_Passer::WStringException(ref_.get_except(key),
                                                 this->wchar_from_server(key));
@@ -253,7 +235,6 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key)
 
 void
 interop_WChar_Passer_i::shutdown (void)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index bec5f5c7e3c..c81681f9ca9 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,69 +42,50 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (void)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual char * orb_name (void);
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
-                                          CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                          CORBA::Short key);
 
-  virtual CORBA::WChar wchar_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::WChar wchar_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstring_to_server (const CORBA::WChar * test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual CORBA::WChar * wstring_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::WChar * wstring_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean warray_to_server (const interop::warray test,
-                                           CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                           CORBA::Short key);
 
-  virtual interop::warray_slice * warray_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::warray_slice * warray_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstruct_to_server (const interop::wstruct & test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual interop::wstruct * wstruct_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::wstruct * wstruct_from_server (CORBA::Short key);
 
   virtual CORBA::Boolean wstructseq_to_server (const interop::wstructseq & test,
-                                            CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                            CORBA::Short key);
 
-  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key);
 
  virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
-                                           CORBA::Short key)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                           CORBA::Short key);
 
   virtual interop::wunion * wunion_from_server (CORBA::Short key,
-                                                interop::wchar_types type)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
+                                                interop::wchar_types type);
 
   virtual CORBA::Boolean any_to_server (const CORBA::Any &test,
-                                        CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+                                        CORBA::Short key);
 
   virtual CORBA::Any* any_from_server (CORBA::Short key,
-                                       interop::wchar_types type)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+                                       interop::wchar_types type);
 
-  virtual CORBA::Any* any_echo (const CORBA::Any &test)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+  virtual CORBA::Any* any_echo (const CORBA::Any &test);
 
-virtual void exception_test (CORBA::Short key)
-  ACE_THROW_SPEC (( CORBA::SystemException,
-                    interop::WChar_Passer::WStringException ));
+virtual void exception_test (CORBA::Short key);
 
-virtual void shutdown (void)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index dc0082c11ef..5a76e8d875d 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -387,21 +387,18 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 Event_Service::for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_consumers ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 Event_Service::for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_suppliers ();
 }
 
 void
 Event_Service::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ec_impl_->destroy ();
   this->orb_->shutdown ();
@@ -409,20 +406,12 @@ Event_Service::destroy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->ec_impl_->append_observer (observer);
 }
 
 void
 Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->ec_impl_->remove_observer (handle);
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 84c3f46542f..62af2b9691f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -41,24 +41,13 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (void);
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (void);
+  virtual void destroy (void);
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer);
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
 private:
   /// Parse the command line args
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
index dfda930d86d..4b6c9608d08 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRT_Event_Service): orbsvcsexe, utils, rtschedevent, ftrteventchannel, ftorbutils {
+project(FTRT_Event_Service): orbsvcsexe, utils, rtschedevent, ftrteventchannel, ftorbutils, install {
   exename   = ftrt_eventservice
   includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index e3f70a14015..a6373b1b83c 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -20,7 +20,7 @@ if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS = ftrt_eventservice
+bin_PROGRAMS = ftrt_eventservice
 
 ftrt_eventservice_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 45cfae40bcf..6bb082d39e9 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -25,14 +25,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   const PortableGroup::Criteria & the_criteria,
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   )
-  ACE_THROW_SPEC ((
-  CORBA::SystemException
-  , PortableGroup::NoFactory
-  , PortableGroup::ObjectNotCreated
-  , PortableGroup::InvalidCriteria
-  , PortableGroup::InvalidProperty
-  , PortableGroup::CannotMeetCriteria
-  ))
 {
 
   ACE_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n"));
@@ -62,16 +54,12 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
     throw;
   }
 
-    ACE_THROW_RETURN(PortableGroup::ObjectNotCreated(), CORBA::Object::_nil());
+    throw PortableGroup::ObjectNotCreated();
 }
 
 void EventChannelFactory_i::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
   )
-  ACE_THROW_SPEC ((
-  CORBA::SystemException
-  , PortableGroup::ObjectNotFound
-  ))
 {
   ACE_TRACE("EventChannelFactory_i::delete_object");
   CORBA::ULong object_id;
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
index c4f2da131fe..86efcffab16 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
@@ -29,23 +29,11 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::NoFactory
-    , PortableGroup::ObjectNotCreated
-    , PortableGroup::InvalidCriteria
-    , PortableGroup::InvalidProperty
-    , PortableGroup::CannotMeetCriteria
-    )) ;
+    );
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::ObjectNotFound
-    ));
+    );
 
 private:
   CORBA::Object_ptr create_process (
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index 88dc0523ae3..3e1946b0d50 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies {
+project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies, install {
   after    += FaultTolerance
   exename   = ftrtec_factory_service
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index 8d6a8b7cb19..169545c0e30 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -22,7 +22,7 @@ if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS = ftrtec_factory_service
+bin_PROGRAMS = ftrtec_factory_service
 
 ftrtec_factory_service_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 946ed18646a..37438abed0e 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -72,7 +72,7 @@ int main(int argc,  ACE_TCHAR** argv)
 {
   try
   {
-    orb = CORBA::ORB_init (argc, argv, "");
+    orb = CORBA::ORB_init (argc, argv);
 
     if (parse_args(argc, argv)==-1)
       return 1;
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
index 50c652b095d..776ae50a998 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient, strategies {
+project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient, strategies, install {
   exename   = ftrtec_gateway_service
   includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index 9edc7551222..724b01b5f49 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -22,7 +22,7 @@ if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS = ftrtec_gateway_service
+bin_PROGRAMS = ftrtec_gateway_service
 
 ftrtec_gateway_service_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index c824b411c5e..b9aec6de436 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -215,7 +215,6 @@ size_t TAO::FT_FaultConsumer::notifications () const
 void TAO::FT_FaultConsumer::push_structured_event (
   const CosNotification::StructuredEvent &event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
   // Debugging support.
   this->notifications_ += 1;
@@ -266,7 +265,6 @@ void TAO::FT_FaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -277,7 +275,6 @@ void TAO::FT_FaultConsumer::offer_change (
 
 void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //TODO: For now, we are just ignoring the disconnect callback.
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 04f8c3303e1..5731824342f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -105,18 +105,15 @@ namespace TAO
     // CORBA methods
     virtual void push_structured_event (
       const CosNotification::StructuredEvent &notification
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
+      );
 
    virtual void disconnect_structured_push_consumer (
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     //@}
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 33d947d344e..1d3f14c6732 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -46,9 +46,6 @@ TAO::FT_Property_Validator::~FT_Property_Validator (void)
 void
 TAO::FT_Property_Validator::validate_property (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   const CORBA::ULong len = props.length ();
 
@@ -135,9 +132,6 @@ TAO::FT_Property_Validator::validate_property (
 void
 TAO::FT_Property_Validator::validate_criteria (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   const CORBA::ULong len = props.length ();
   PortableGroup::Criteria invalid_criteria;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 77d0d76b6a0..6c1f52f946a 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -48,19 +48,13 @@ namespace TAO
     /// first invalid property is encountered.  The remaining properties
     /// will not be validated.
     virtual
-    void validate_property (const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+    void validate_property (const PortableGroup::Properties & props);
 
     /// Validate the given properties/criteria.  All criteria
     /// will be validated regardless of whether or not an invalid
     /// property was encountered.
     virtual
-    void validate_criteria (const PortableGroup::Properties & criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::CannotMeetCriteria));
+    void validate_criteria (const PortableGroup::Properties & criteria);
 
   private:
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 2d5d6c1084f..19d3dd06682 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -355,7 +355,6 @@ int TAO::FT_ReplicationManager::fini (void)
 void
 TAO::FT_ReplicationManager::register_fault_notifier (
   FT::FaultNotifier_ptr fault_notifier)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->register_fault_notifier_i (fault_notifier);
 }
@@ -364,7 +363,6 @@ TAO::FT_ReplicationManager::register_fault_notifier (
 void
 TAO::FT_ReplicationManager::register_fault_notifier_i (
   FT::FaultNotifier_ptr fault_notifier)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   if (CORBA::is_nil (fault_notifier))
   {
@@ -446,11 +444,10 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
 //CORBA
 FT::FaultNotifier_ptr
 TAO::FT_ReplicationManager::get_fault_notifier ()
-  ACE_THROW_SPEC ( (CORBA::SystemException, FT::InterfaceNotFound))
 {
   if (CORBA::is_nil (this->fault_notifier_.in ()))
   {
-    ACE_THROW_RETURN ( FT::InterfaceNotFound () , FT::FaultNotifier::_nil ());
+    throw FT::InterfaceNotFound ();
   }
   return FT::FaultNotifier::_duplicate (this->fault_notifier_.in ());
 }
@@ -461,7 +458,6 @@ TAO::FT_ReplicationManager::get_fault_notifier ()
 ::PortableGroup::FactoryRegistry_ptr
 TAO::FT_ReplicationManager::get_factory_registry (
   const PortableGroup::Criteria & selection_criteria)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   ACE_UNUSED_ARG (selection_criteria);
   return this->factory_registry_.reference ();
@@ -470,7 +466,6 @@ TAO::FT_ReplicationManager::get_factory_registry (
 // TAO-specific shutdown operation.
 //public
 void TAO::FT_ReplicationManager::shutdown ()
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->quit_ = 1;
 }
@@ -488,7 +483,7 @@ char * TAO::FT_ReplicationManager::type_id (
   }
   else
   {
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), 0);
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result;
 }
@@ -500,9 +495,6 @@ char * TAO::FT_ReplicationManager::type_id (
 void
 TAO::FT_ReplicationManager::set_default_properties (
   const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 
   this->properties_support_.set_default_properties (props);
@@ -512,7 +504,6 @@ TAO::FT_ReplicationManager::set_default_properties (
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_default_properties ()
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->properties_support_.get_default_properties ();
 }
@@ -521,9 +512,6 @@ TAO::FT_ReplicationManager::get_default_properties ()
 void
 TAO::FT_ReplicationManager::remove_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_default_properties (props);
 }
@@ -533,9 +521,6 @@ void
 TAO::FT_ReplicationManager::set_type_properties (
     const char *type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.set_type_properties (
     type_id,
@@ -546,7 +531,6 @@ TAO::FT_ReplicationManager::set_type_properties (
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_type_properties (
     const char *type_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->properties_support_.get_type_properties (type_id);
 }
@@ -556,9 +540,6 @@ void
 TAO::FT_ReplicationManager::remove_type_properties (
     const char *type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_type_properties (
     type_id,
@@ -570,10 +551,6 @@ void
 TAO::FT_ReplicationManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 
   TAO::PG_Object_Group * group = 0;
@@ -591,8 +568,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::Properties_var result;
   ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ());
@@ -604,7 +579,7 @@ TAO::FT_ReplicationManager::get_properties (
   }
   else
   {
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), 0);
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn();
 }
@@ -619,13 +594,6 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::set_primary_member (
   PortableGroup::ObjectGroup_ptr object_group,
   const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (
-    CORBA::SystemException
-    , PortableGroup::ObjectGroupNotFound
-    , PortableGroup::MemberNotFound
-    , FT::PrimaryNotSet
-    , FT::BadReplicationStyle
-  ))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::set_primary_member);
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil();
@@ -643,12 +611,12 @@ TAO::FT_ReplicationManager::set_primary_member (
     }
     else
     {
-      ACE_THROW_RETURN (FT::PrimaryNotSet (), PortableGroup::ObjectGroup::_nil ());
+      throw FT::PrimaryNotSet ();
     }
   }
   else
   {
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), PortableGroup::ObjectGroup::_nil ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   METHOD_RETURN (TAO::FT_ReplicationManager::set_primary_member) result._retn ();
 }
@@ -660,13 +628,6 @@ TAO::FT_ReplicationManager::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
     const PortableGroup::Criteria & the_criteria)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil();
   TAO::PG_Object_Group * group = 0;
@@ -683,7 +644,7 @@ TAO::FT_ReplicationManager::create_member (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::create_member: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn();
 }
@@ -695,10 +656,6 @@ TAO::FT_ReplicationManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::add_member);
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
@@ -722,7 +679,7 @@ TAO::FT_ReplicationManager::add_member (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::add_member to unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   METHOD_RETURN (TAO::FT_ReplicationManager::add_member) result._retn ();
 }
@@ -732,9 +689,6 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -753,7 +707,7 @@ TAO::FT_ReplicationManager::remove_member (
   }
   else
   {
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn ();
 }
@@ -762,8 +716,6 @@ TAO::FT_ReplicationManager::remove_member (
 PortableGroup::Locations *
 TAO::FT_ReplicationManager::locations_of_members (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::Locations * result = 0;
 
@@ -781,7 +733,7 @@ TAO::FT_ReplicationManager::locations_of_members (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::locations_of_members: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), 0);
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result;
 }
@@ -790,7 +742,6 @@ TAO::FT_ReplicationManager::locations_of_members (
 PortableGroup::ObjectGroups *
 TAO::FT_ReplicationManager::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->group_factory_.groups_at_location (the_location);
 }
@@ -799,8 +750,6 @@ TAO::FT_ReplicationManager::groups_at_location (
 PortableGroup::ObjectGroupId
 TAO::FT_ReplicationManager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::ObjectGroupId result = 0;
   TAO::PG_Object_Group * group = 0;
@@ -817,7 +766,7 @@ TAO::FT_ReplicationManager::get_object_group_id (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_id: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result);
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result;
 }
@@ -826,8 +775,6 @@ TAO::FT_ReplicationManager::get_object_group_id (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -845,7 +792,7 @@ TAO::FT_ReplicationManager::get_object_group_ref (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_ref: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn();
 }
@@ -854,10 +801,6 @@ TAO::FT_ReplicationManager::get_object_group_ref (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref_from_id (
     PortableGroup::ObjectGroupId group_id)
-  ACE_THROW_SPEC ( (
-    CORBA::SystemException
-    , PortableGroup::ObjectGroupNotFound
-  ))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -875,7 +818,7 @@ TAO::FT_ReplicationManager::get_object_group_ref_from_id (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_ref_from_id: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn();
 }
@@ -885,9 +828,6 @@ CORBA::Object_ptr
 TAO::FT_ReplicationManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   CORBA::Object_var result = CORBA::Object::_nil();
 
@@ -905,7 +845,7 @@ TAO::FT_ReplicationManager::get_member_ref (
         ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_member_ref: unknown group\n")
         ));
     }
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), result._retn ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
   return result._retn();
 }
@@ -920,12 +860,6 @@ TAO::FT_ReplicationManager::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::create_object)
 
@@ -968,8 +902,6 @@ TAO::FT_ReplicationManager::create_object (
 void
 TAO::FT_ReplicationManager::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
 
   PortableGroup::ObjectGroupId group_id = 0;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 753b8f9340c..c8f1b65c95e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -157,33 +157,20 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     /// Returns the reference of the Fault Notifier.
     virtual FT::FaultNotifier_ptr get_fault_notifier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FT::InterfaceNotFound
-      ));
+      );
 
     /// TAO-specific find factory registry
     virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry (
         const PortableGroup::Criteria & selection_criteria
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     /// TAO-specific shutdown operation.
     virtual void shutdown (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     //@}
 
@@ -196,21 +183,14 @@ namespace TAO
 
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /// Get the default properties used by all object groups.
-    virtual PortableGroup::Properties * get_default_properties ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableGroup::Properties * get_default_properties ();
 
     /// Remove default properties.
     virtual void remove_default_properties (
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /**
      * Set properties associated with a given Replica type.  These
@@ -218,10 +198,7 @@ namespace TAO
      */
     virtual void set_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * Return the properties associated with a given Replica type.  These
@@ -229,16 +206,12 @@ namespace TAO
      * addition to the default properties that were not overridden.
      */
     virtual PortableGroup::Properties * get_type_properties (
-        const char * type_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const char * type_id);
 
     /// Remove the given properties associated with the Replica type ID.
     virtual void remove_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /**
      * Dynamically set the properties associated with a given object
@@ -248,11 +221,7 @@ namespace TAO
      */
     virtual void set_properties_dynamically (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * Return the properties currently in use by the given object
@@ -262,9 +231,7 @@ namespace TAO
      * that weren't overridden.
      */
     virtual PortableGroup::Properties * get_properties (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     //@}
 
@@ -281,24 +248,13 @@ namespace TAO
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberAlreadyPresent,
-                      PortableGroup::NoFactory,
-                      PortableGroup::ObjectNotCreated,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::CannotMeetCriteria));
+        const PortableGroup::Criteria & the_criteria);
 
     /// Add an existing object to the ObjectGroup.
     virtual PortableGroup::ObjectGroup_ptr add_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberAlreadyPresent,
-                      PortableGroup::ObjectNotAdded));
+        CORBA::Object_ptr member);
 
     /**
      * Remove the member at a specific location from an
@@ -313,27 +269,19 @@ namespace TAO
      */
     virtual PortableGroup::ObjectGroup_ptr remove_member (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberNotFound));
+        const PortableGroup::Location & the_location);
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::Locations * locations_of_members (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::ObjectGroups * groups_at_location (
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const PortableGroup::Location & the_location);
 
     /// Return the ObjectGroupId for the given ObjectGroup.
     virtual PortableGroup::ObjectGroupId get_object_group_id (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /**
      * Return an update the IOGR for an object group.  If no changes have
@@ -341,9 +289,7 @@ namespace TAO
      * parameter.
      */
     virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /**
      * TAO-specific extension.
@@ -351,11 +297,7 @@ namespace TAO
      */
      virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
           PortableGroup::ObjectGroupId group_id
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-          , PortableGroup::ObjectGroupNotFound
-        ));
+        );
 
     /**
      * Return the reference corresponding to the Replica of a given
@@ -363,23 +305,13 @@ namespace TAO
      */
     virtual CORBA::Object_ptr get_member_ref (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & loc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberNotFound));
+        const PortableGroup::Location & loc);
 
     /// Sets the primary member of a group.
     virtual PortableGroup::ObjectGroup_ptr set_primary_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::ObjectGroupNotFound
-        , PortableGroup::MemberNotFound
-        , FT::PrimaryNotSet
-        , FT::BadReplicationStyle
-      ));
+      );
 
     //@}
 
@@ -404,13 +336,7 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
         PortableGroup::GenericFactory::FactoryCreationId_out
-          factory_creation_id)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::NoFactory,
-                      PortableGroup::ObjectNotCreated,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::CannotMeetCriteria));
+          factory_creation_id);
 
     /**
      * Delete the object group corresponding to the provided
@@ -420,9 +346,7 @@ namespace TAO
      */
     virtual void delete_object (
         const PortableGroup::GenericFactory::FactoryCreationId &
-          factory_creation_id)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectNotFound));
+          factory_creation_id);
 
     //@}
 
@@ -437,10 +361,7 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
         FT::FaultNotifier_ptr fault_notifier
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     ////////////////
     // Forbidden methods
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index df556a7c958..1ca418ff98c 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -433,10 +433,6 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
 void TAO::FT_FaultDetectorFactory_i::change_properties (
     const PortableGroup::Properties & property_set
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::InvalidProperty
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::change_properties);
 
@@ -471,9 +467,6 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
 }
 
 void TAO::FT_FaultDetectorFactory_i::shutdown (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown);
   InternalGuard guard (this->internals_);
@@ -487,14 +480,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::NoFactory
-    , PortableGroup::ObjectNotCreated
-    , PortableGroup::InvalidCriteria
-    , PortableGroup::InvalidProperty
-    , PortableGroup::CannotMeetCriteria
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::create_object);
 
@@ -594,7 +579,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
       "Throwing 'InvalidCriteria' due to missing %s\n",
       missingParameterName
       ));
-    ACE_THROW_RETURN ( PortableGroup::InvalidCriteria(), CORBA::Object::_nil () );
+    throw PortableGroup::InvalidCriteria();
   }
 
   CORBA::ULong detectorId = allocate_id();
@@ -617,7 +602,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     ACE_ERROR ((LM_ERROR,
       "New FaultDetector_i returned NULL.  Throwing ObjectNotCreated.\n"
       ));
-    ACE_THROW_RETURN ( PortableGroup::ObjectNotCreated(), CORBA::Object::_nil () );
+    throw PortableGroup::ObjectNotCreated();
   }
   auto_ptr<TAO::Fault_Detector_i> detector(pFD);
 
@@ -629,7 +614,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
       "New factory_creation_id returned NULL.  Throwing ObjectNotCreated.\n"
       ));
 
-    ACE_THROW_RETURN ( PortableGroup::ObjectNotCreated(), CORBA::Object::_nil ());
+    throw PortableGroup::ObjectNotCreated();
   }
   (*factory_creation_id) <<= detectorId;
 
@@ -647,10 +632,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 void TAO::FT_FaultDetectorFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::ObjectNotFound
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::delete_object);
 
@@ -677,7 +658,6 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
 }
 
 CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
     1;
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index f6e9fa59a07..289fc1ae775 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -156,16 +156,9 @@ namespace TAO
     // CORBA interface FaultDetectorFactory methods
     virtual void change_properties (
         const PortableGroup::Properties & property_set
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::InvalidProperty
-      ));
+      );
 
-    virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void shutdown (void);
 
     /////////////////////////////////////////
     // CORBA interface GenericFactory methods
@@ -173,29 +166,16 @@ namespace TAO
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-      , PortableGroup::NoFactory
-      , PortableGroup::ObjectNotCreated
-      , PortableGroup::InvalidCriteria
-      , PortableGroup::InvalidProperty
-      , PortableGroup::CannotMeetCriteria
-    ));
+    );
 
     virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-      , PortableGroup::ObjectNotFound
-    ));
+    );
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
 
-    virtual CORBA::Boolean is_alive (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean is_alive (void);
 
     /////////////////////////
     // Implementation methods
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index 2af2e7a10ef..d113228eb47 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -465,7 +465,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb )
 void TAO::FT_FaultNotifier_i::push_structured_fault (
     const CosNotification::StructuredEvent & event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_structured_fault);
 
@@ -477,7 +476,6 @@ void TAO::FT_FaultNotifier_i::push_structured_fault (
 void TAO::FT_FaultNotifier_i::push_sequence_fault (
     const CosNotification::EventBatch & events
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_sequence_fault);
 
@@ -489,7 +487,6 @@ void TAO::FT_FaultNotifier_i::push_sequence_fault (
 ::CosNotifyFilter::Filter_ptr TAO::FT_FaultNotifier_i::create_subscription_filter (
     const char * constraint_grammar
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::create_subscription_filter);
   ACE_UNUSED_ARG (constraint_grammar); //@@todo
@@ -503,7 +500,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::connect_structured_fault_consumer);
 
@@ -567,7 +563,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::connect_sequence_fault_consumer);
   /////////////////////////
@@ -627,7 +622,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
 void TAO::FT_FaultNotifier_i::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::disconnect_consumer);
 
@@ -692,7 +686,6 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
 }
 
 CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1;
 }
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index f182cb50000..cfffe13aec6 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -94,40 +94,33 @@ namespace TAO
 
     virtual void push_structured_fault (
         const CosNotification::StructuredEvent & event
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     virtual void push_sequence_fault (
       const CosNotification::EventBatch & events
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
     virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
       const char * constraint_grammar
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
+    );
 
     virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
       CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
     virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
       CosNotifyComm::SequencePushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
     virtual void disconnect_consumer (
       FT::FaultNotifier::ConsumerId connection
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
+    );
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
-    virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean is_alive (void);
 
 
     /////////////////////////////////////////
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 6a57d0af586..8ea3a129040 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -27,7 +27,7 @@ BE_save_orb_args (int &argc, char *argv[])
           // No-copy constructor.
           ACE_CString tmp (argv[i + 1],
                            0,
-                           0);
+                           false);
 
           // If the arg ends with either .idl or .pidl, we're done.
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 67044b8191c..a9c866e799e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -78,9 +78,8 @@ CORBA::Object_ptr
 ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
                                   ACE_TCHAR **)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index c41f2c947b3..d290fadd236 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -29,8 +29,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
  int run(void);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 81cf67856de..12b98e9e7bf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -13,7 +13,7 @@
 
 #include "Activator_NT_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ImR_Activator_i.h"
 #include "Activator_Options.h"
@@ -107,4 +107,4 @@ Activator_NT_Service::svc (void)
   return -1;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index bde40cf1cd9..6d8294cf5a6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -17,7 +17,7 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -58,8 +58,6 @@ private:
 
 typedef ACE_Singleton<Activator_NT_Service, ACE_Mutex> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #endif /* Activator_NT_Service_H */
-
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index 021fecad545..f893b947636 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -27,7 +27,6 @@ ImR_Adapter::init (PortableServer::ServantLocator_ptr servant)
 CORBA::Boolean
 ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (! CORBA::is_nil(parent));
   ACE_ASSERT (name != 0);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index eda7d41a054..e1396f9c7d4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -46,8 +46,7 @@ public:
   virtual CORBA::Boolean unknown_adapter (
     PortableServer::POA_ptr parent,
     const char *name
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   void init(PortableServer::ServantLocator_ptr servant);
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
index d1d4686e993..cca2a7a9807 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -24,7 +24,7 @@ void AsyncStartupWaiter_i::debug (bool dbg)
 }
 
 void AsyncStartupWaiter_i::wait_for_startup (AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name) ACE_THROW_SPEC ((CORBA::SystemException))
+   const char* name)
 {
   PendingListPtr plst;
   pending_.find(name, plst);
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
index 33c824f5165..59ee659344d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
@@ -48,8 +48,7 @@ public:
 
   void wait_for_startup (
    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name)
-   ACE_THROW_SPEC ((CORBA::SystemException));
+   const char* name);
 
   void unblock_one(const char* name, const char* partial_ior, const char* ior, bool queue);
   void unblock_all(const char* name);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 6f4b0b2830c..4ca91d7002f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -65,7 +65,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
                           const char *,
                           PortableServer::ServantLocator::Cookie &)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
   ACE_ASSERT (! CORBA::is_nil(poa));
   CORBA::Object_var forward_obj;
@@ -140,12 +139,14 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
     }
 
   if (!CORBA::is_nil (forward_obj.in ()))
-    ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0);
+    throw PortableServer::ForwardRequest (forward_obj.in ());
 
   ACE_ERROR ((LM_ERROR, "Error: Forward_to reference is nil.\n"));
-  ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (
-    CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-    CORBA::COMPLETED_NO), 0);
+  throw CORBA::OBJECT_NOT_EXIST (
+    CORBA::SystemException::_tao_minor_code (
+      TAO_IMPLREPO_MINOR_CODE,
+      0),
+    CORBA::COMPLETED_NO);
 }
 
 void
@@ -153,8 +154,7 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            PortableServer::POA_ptr,
                            const char *,
                            PortableServer::ServantLocator::Cookie,
-                           PortableServer::Servant
-                           ) ACE_THROW_SPEC ((CORBA::SystemException))
+                           PortableServer::Servant)
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 91b009f194e..776735491bd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -48,16 +48,14 @@ public:
     const PortableServer::ObjectId &oid,
     PortableServer::POA_ptr poa,
     const char * operation,
-    PortableServer::ServantLocator::Cookie &cookie
-  ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest));
+    PortableServer::ServantLocator::Cookie &cookie);
 
   virtual void postinvoke (
     const PortableServer::ObjectId & oid,
     PortableServer::POA_ptr adapter,
     const char * operation,
     PortableServer::ServantLocator::Cookie the_cookie,
-    PortableServer::Servant the_servant
-    ) ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableServer::Servant the_servant);
 
   void init(CORBA::ORB_ptr orb);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index afa06a09a1f..6820bc9285f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -21,7 +21,6 @@ INS_Locator::INS_Locator (ImR_Locator_i& loc)
 
 char *
 INS_Locator::locate (const char* object_key)
-ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_ASSERT (object_key != 0);
   try
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 82a69c31a7b..c80a9d6d7b5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -42,8 +42,7 @@ public:
   INS_Locator (ImR_Locator_i& loc);
 
   /// Locate the appropriate IOR.
-  char* locate (const char *object_key)
-    ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
+  char* locate (const char *object_key);
 
 private:
   ImR_Locator_i& imr_locator_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 09effd0c661..28caae6dd50 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -80,14 +80,14 @@ run_standalone (Activator_Options& opts)
   return 1;
 }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 ACE_NT_SERVICE_DEFINE (service, Activator_NT_Service, IMR_ACTIVATOR_SERVICE_NAME);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
 run_service (void)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
   ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret);
 
@@ -97,7 +97,7 @@ run_service (void)
   return ret;
 #else /* ACE_WIN32 */
   return 1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 /**
@@ -112,7 +112,7 @@ run_service_command (Activator_Options& opts)
   if (opts.service_command () == Activator_Options::SC_NONE)
     return 0;
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
 
   if (opts.service_command () == Activator_Options::SC_INSTALL ||
@@ -180,7 +180,7 @@ run_service_command (Activator_Options& opts)
 #else /* ACE_WIN32 */
   ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index db232316c29..eb690a35fe2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -256,7 +256,6 @@ ImR_Activator_i::run (void)
 
 void
 ImR_Activator_i::shutdown (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   shutdown (false);
 }
@@ -272,7 +271,6 @@ ImR_Activator_i::start_server(const char* name,
                               const char* cmdline,
                               const char* dir,
                               const ImplementationRepository::EnvironmentList & env)
-                              ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate))
 {
   if (debug_ > 1)
     ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting server <%s>...\n", name));
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index ad84089c25e..3bb71eb164b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -67,11 +67,9 @@ public:
    const char* name,
    const char* cmdline,
    const char* dir,
-   const ImplementationRepository::EnvironmentList & env)
-   ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate));
+   const ImplementationRepository::EnvironmentList & env);
 
-  void shutdown(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown(void);
 
   /// Initialize the Server state - parsing arguments and waiting.
   int init (Activator_Options& opts);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index c11ec1201d9..96c88ecc322 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -77,14 +77,14 @@ run_standalone (Options& opts)
   return 1;
 }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 ACE_NT_SERVICE_DEFINE (service, Locator_NT_Service, IMR_LOCATOR_SERVICE_NAME);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
 run_service (void)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
   SERVICE::instance ()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
 
@@ -96,7 +96,7 @@ run_service (void)
   return ret;
 #else /* ACE_WIN32 */
   return 1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 /**
@@ -111,7 +111,7 @@ run_service_command (Options& opts)
   if (opts.service_command () == Options::SC_NONE)
     return 0;
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
 
   if (opts.service_command () == Options::SC_INSTALL)
@@ -163,7 +163,7 @@ run_service_command (Options& opts)
 #else /* ACE_WIN32 */
   ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 7b9dfe74f2f..d403c3c573d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -217,7 +217,6 @@ ImR_Locator_i::run (void)
 
 void
 ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
-                        ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (servers != 0 && this->repository_.servers ().current_size () > 0)
     {
@@ -368,7 +367,6 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior)
 CORBA::Long
 ImR_Locator_i::register_activator (const char* aname,
                                    ImplementationRepository::Activator_ptr activator)
-                                   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
   ACE_ASSERT (! CORBA::is_nil (activator));
@@ -395,7 +393,6 @@ ImR_Locator_i::register_activator (const char* aname,
 void
 ImR_Locator_i::unregister_activator (const char* aname,
                                      CORBA::Long token)
-                                     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
   Activator_Info_Ptr info = this->get_activator (aname);
@@ -430,7 +427,6 @@ ImR_Locator_i::unregister_activator_i (const char* aname)
 
 void
 ImR_Locator_i::notify_child_death (const char* name)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (name != 0);
 
@@ -457,9 +453,6 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 ImR_Locator_i::activate_server (const char* server)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   if (debug_ > 1)
     ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%s>\n", server));
@@ -471,9 +464,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 char*
 ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   // Activate the server, starting it if necessary. Don't start MANUAL
   // servers unless manual_start=true
@@ -483,7 +473,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   if (info.null ())
     {
       ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name));
-      ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
+      throw ImplementationRepository::NotFound ();
     }
 
   return activate_server_i (*info, manual_start);
@@ -491,9 +481,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 char*
 ImR_Locator_i::activate_server_by_object (const char* object_name)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   ACE_ASSERT (object_name != 0);
 
@@ -509,9 +496,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 char*
 ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   if (info.activation_mode == ImplementationRepository::PER_CLIENT)
     {
@@ -546,8 +530,9 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
           waiter_svt_.unblock_all (info.name.c_str ());
 
-          ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                            (CORBA::string_dup ("Cannot start server.")), 0);
+          throw ImplementationRepository::CannotActivate(
+            CORBA::string_dup (
+              "Cannot start server."));
         }
 
       // Note: We already updated info with StartupInfo in server_is_running ()
@@ -558,9 +543,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 char*
 ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   Server_Info_Ptr shared_info = this->repository_.get_server (info.name);
   do
@@ -593,31 +575,31 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       ACE_DEBUG ((LM_DEBUG,
                   "ImR: Cannot Activate <%s>.\n", info.name.c_str ()));
     }
-  ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                    (CORBA::string_dup ("Cannot start server.")), 0);
+  throw ImplementationRepository::CannotActivate(
+    CORBA::string_dup (
+      "Cannot start server."));
 }
 
 ImplementationRepository::StartupInfo*
 ImR_Locator_i::start_server (Server_Info& info, bool manual_start,
                              int& waiting_clients)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                ImplementationRepository::NotFound,
-                ImplementationRepository::CannotActivate))
 {
   if (info.activation_mode == ImplementationRepository::MANUAL && ! manual_start)
     {
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. ActivationMode=MANUAL\n", info.name.c_str ()));
-      ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                        (CORBA::string_dup ("Cannot implicitly activate MANUAL server.")), 0);
+      throw ImplementationRepository::CannotActivate(
+        CORBA::string_dup (
+          "Cannot implicitly activate MANUAL server."));
     }
   if (info.cmdline.length () == 0)
     {
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>."
                     " No command line.\n", info.name.c_str ()));
-      ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                        (CORBA::string_dup ("No command line registered for server.")), 0);
+      throw ImplementationRepository::CannotActivate(
+        CORBA::string_dup (
+          "No command line registered for server."));
     }
 
   Activator_Info_Ptr ainfo = get_activator (info.activator);
@@ -627,8 +609,9 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. "
                     "Activator <%s> not found.\n", info.name.c_str (), info.activator.c_str ()));
-      ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                        (CORBA::string_dup ("No activator registered for server.")), 0);
+      throw ImplementationRepository::CannotActivate(
+        CORBA::string_dup (
+          "No activator registered for server."));
     }
 
   try
@@ -755,8 +738,6 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 void
 ImR_Locator_i::add_or_update_server (const char* server,
                                 const ImplementationRepository::StartupOptions &options)
-                                ACE_THROW_SPEC ((CORBA::SystemException,
-                                  ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
 
@@ -841,7 +822,6 @@ ImR_Locator_i::add_or_update_server (const char* server,
 
 void
 ImR_Locator_i::remove_server (const char* name)
-ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (name != 0);
   if (this->read_only_)
@@ -902,7 +882,6 @@ ImR_Locator_i::findPOA (const char* name)
 
 void
 ImR_Locator_i::shutdown_server (const char* server)
-ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
 
@@ -968,8 +947,6 @@ void
 ImR_Locator_i::server_is_running (const char* name,
                                   const char* partial_ior,
                                   ImplementationRepository::ServerObject_ptr server)
-                                  ACE_THROW_SPEC ((CORBA::SystemException,
-                                  ImplementationRepository::NotFound))
 {
   ACE_ASSERT (name != 0);
   ACE_ASSERT (partial_ior != 0);
@@ -1033,7 +1010,6 @@ ImR_Locator_i::server_is_running (const char* name,
 
 void
 ImR_Locator_i::server_is_shutting_down (const char* server)
-ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
   Server_Info_Ptr info = this->repository_.get_server (server);
@@ -1060,7 +1036,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 void
 ImR_Locator_i::find (const char* server,
                      ImplementationRepository::ServerInformation_out imr_info)
-                     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (server != 0);
   ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
@@ -1083,8 +1058,7 @@ ImR_Locator_i::find (const char* server,
 void
 ImR_Locator_i::list (CORBA::ULong how_many,
                      ImplementationRepository::ServerInformationList_out server_list,
-                     ImplementationRepository::ServerInformationIterator_out server_iterator
-                     ) ACE_THROW_SPEC ((CORBA::SystemException))
+                     ImplementationRepository::ServerInformationIterator_out server_iterator)
 {
   if (this->debug_ > 1)
     ACE_DEBUG ((LM_DEBUG, "ImR: List servers.\n"));
@@ -1127,7 +1101,7 @@ ImR_Locator_i::list (CORBA::ULong how_many,
       if (this->debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Creating ServerInformation Iterator\n"));
 
-      ImR_Iterator* imr_iter;
+      ImR_Iterator* imr_iter = 0;
 
       ACE_NEW_THROW_EX (imr_iter,
                         ImR_Iterator (n, this->repository_, this->imr_poa_.in ()),
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index ac1a543ba22..03ca0f0e594 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -62,75 +62,46 @@ public:
   // Activator->Locator
 
   virtual CORBA::Long register_activator (const char* name,
-    ImplementationRepository::Activator_ptr admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ImplementationRepository::Activator_ptr admin);
   virtual void unregister_activator (const char* name,
-    CORBA::Long token)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void notify_child_death (const char* name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long token);
+  virtual void notify_child_death (const char* name);
 
   // tao_imr->Locator
 
-  virtual void activate_server (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+  virtual void activate_server (const char * name);
   virtual void add_or_update_server (const char * name,
-    const ImplementationRepository::StartupOptions &options)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void remove_server (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void shutdown_server (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+    const ImplementationRepository::StartupOptions &options);
+  virtual void remove_server (const char * name);
+  virtual void shutdown_server (const char * name);
   virtual void find (const char * name,
-    ImplementationRepository::ServerInformation_out info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ImplementationRepository::ServerInformation_out info);
   virtual void list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ImplementationRepository::ServerInformationIterator_out server_iterator);
+  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers);
 
   // Server->Locator
 
   virtual void server_is_running (const char* name,
     const char* partial_ior,
-    ImplementationRepository::ServerObject_ptr server_object)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void server_is_shutting_down (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+    ImplementationRepository::ServerObject_ptr server_object);
+  virtual void server_is_shutting_down (const char * name);
 
   // Used by the INS_Locator to start a sever given an object name
-  char* activate_server_by_object (const char* object_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+  char* activate_server_by_object (const char* object_name);
 
-  char* activate_server_by_name (const char * name, bool manual_start)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+  char* activate_server_by_name (const char * name, bool manual_start);
 
 private:
 
-  char* activate_server_i (Server_Info& info, bool manual_start)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+  char* activate_server_i (Server_Info& info, bool manual_start);
 
-  char* activate_perclient_server_i (Server_Info info, bool manual_start)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+  char* activate_perclient_server_i (Server_Info info, bool manual_start);
 
   ImplementationRepository::StartupInfo*
-    start_server(Server_Info& info, bool manual_start, int& waiting_clients)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::NotFound,
-    ImplementationRepository::CannotActivate));
+    start_server(Server_Info& info, bool manual_start, int& waiting_clients);
 
   bool is_alive(Server_Info& info);
   int is_alive_i(Server_Info& info);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index b30cb4ab1f3..7e4182e08dc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -23,7 +23,6 @@ ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableSe
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
                       ImplementationRepository::ServerInformationList_out server_list)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
     ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
@@ -81,7 +80,6 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
 
 void
 ImR_Iterator::destroy (void)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid = poa_->servant_to_id (this);
   poa_->deactivate_object (oid.in());
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index eced1e66db8..1dab91eec44 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -39,11 +39,9 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 private:
   Locator_Repository& repo_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index 36d09e380e6..55c0d283a25 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -72,9 +72,8 @@ CORBA::Object_ptr
 ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
                                   ACE_TCHAR**)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), CORBA::Object::_nil ());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 06f7ed93b4b..0489ab6d38e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -28,8 +28,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
  int run(void);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 59a9f6434c9..32d179e1fca 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -13,7 +13,7 @@
 
 #include "Locator_NT_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ImR_Locator_i.h"
 #include "Locator_Options.h"
@@ -108,4 +108,4 @@ Locator_NT_Service::svc (void)
   return -1;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index c2199926f63..09662e95339 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -17,7 +17,7 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -55,8 +55,6 @@ private:
 
 typedef ACE_Singleton<Locator_NT_Service, ACE_Mutex> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #endif /* Locator_NT_Service_H */
-
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ed44f22f9ad..8d5c0cd2eee 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -23,7 +23,7 @@ static const char* SERVERS_ROOT_KEY = "Servers";
 static const char* ACTIVATORS_ROOT_KEY = "Activators";
 static const char* TOKEN = "Token";
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 static const char* WIN32_REG_KEY = "Software\\TAO\\ImplementationRepository";
 #endif
 
@@ -309,7 +309,7 @@ Locator_Repository::init(const Options& opts)
       }
     case Options::REPO_REGISTRY:
       {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
         if (opts.repository_erase ())
           {
             ACE_Configuration_Win32Registry config ( HKEY_LOCAL_MACHINE );
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index a1ddcf0b3d9..b0fe6bb1777 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -19,8 +19,8 @@ void
 Locator_XMLHandler::startElement (const ACEXML_Char*,
                                   const ACEXML_Char*,
                                   const ACEXML_Char* qName,
-                                  ACEXML_Attributes* attrs ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
+                                  ACEXML_Attributes* attrs)
+                                    throw (ACEXML_SAXException)
 {
   ACE_ASSERT (qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0)
@@ -69,8 +69,8 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
 void
 Locator_XMLHandler::endElement (const ACEXML_Char*,
                                 const ACEXML_Char*,
-                                const ACEXML_Char* qName ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
+                                const ACEXML_Char* qName)
+                                  throw (ACEXML_SAXException)
 {
   ACE_ASSERT(qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
index ff8691d0a78..fc7890c4d92 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -61,13 +61,13 @@ public:
   virtual void startElement (const ACEXML_Char* namespaceURI,
                              const ACEXML_Char* localName,
                              const ACEXML_Char* qName,
-                             ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
+                             ACEXML_Attributes* atts)
+                               throw (ACEXML_SAXException);
 
   virtual void endElement (const ACEXML_Char* namespaceURI,
                            const ACEXML_Char* localName,
-                           const ACEXML_Char* qName ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
+                           const ACEXML_Char* qName)
+                             throw (ACEXML_SAXException);
 
  private:
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index bbb2430d7ee..bb6be70b13c 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -36,9 +36,8 @@ Criteria_Evaluator::getInitialization (void)
     this->getCriteriaMember ("initialization");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                         ("No initialization member found.\n"),
-                      0);
+    throw LifeCycleService::Criteria_Evaluator::NotAvailable(
+      "No initialization member found.\n");
 
   *any_ptr >>= sequence_ptr;
 
@@ -53,9 +52,8 @@ Criteria_Evaluator::getFilter (void)
   CORBA::Any_ptr any_ptr = this->getCriteriaMember ("filter");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                        ("No filter member found.\n"),
-                      0);
+    throw LifeCycleService::Criteria_Evaluator::NotAvailable(
+      "No filter member found.\n");
   *any_ptr >>= string;
   return CORBA::string_dup (string);
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 38d32a04cc9..8809942dcac 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, avoids_minimum_corba, utils, install {
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 0bf2b51d52f..198090406b5 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -38,7 +38,6 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 CORBA::Boolean
 Life_Cycle_Service_i::supports (const CosLifeCycle::Key &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -46,10 +45,6 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &)
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
                                      const CosLifeCycle::Criteria &the_criteria)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLifeCycle::NoFactory,
-                   CosLifeCycle::InvalidCriteria,
-                   CosLifeCycle::CannotMeetCriteria))
 {
   if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: called.\n"));
@@ -89,7 +84,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Check if it is a valid Generic Factory reference
       if (CORBA::is_nil (genericFactoryObj_ptr))
-        ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+        throw CosLifeCycle::NoFactory (factory_key);
       else
         {
           CosLifeCycle::GenericFactory_var genericFactory_var;
@@ -144,7 +139,6 @@ Life_Cycle_Service_i::register_factory (const char * name,
                                         const char * location,
                                         const char * description,
                                         CORBA::Object_ptr object)
-  ACE_THROW_SPEC (( CORBA::SystemException))
 {
   if (factory_trader_ptr_ == 0)
     ACE_NEW (factory_trader_ptr_, Factory_Trader(this->debug_level_));
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 327ae2c4b20..2d0aa105925 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -29,17 +29,12 @@ public:
   Life_Cycle_Service_i (int debug_level = 1);
   ~Life_Cycle_Service_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key);
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosLifeCycle::NoFactory,
-                       CosLifeCycle::InvalidCriteria,
-                       CosLifeCycle::CannotMeetCriteria));
+                                   const CosLifeCycle::Criteria &the_criteria);
   // Returns an object reference to a newly created object, though the
   // Generic Factory itself cannot create objects, it will forward the
   // request to a more concrete Factory.
@@ -47,8 +42,7 @@ public:
   void register_factory (const char * name,
                          const char * location,
                          const char * description,
-                         CORBA::Object_ptr object)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+                         CORBA::Object_ptr object);
 
   // Registers a factory with specified properties
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 128cf5a28eb..cd8d1459fb7 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS = LifeCycle_Service
+bin_PROGRAMS = LifeCycle_Service
 
 LifeCycle_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index d2f4003bb36..0b67b92f0b4 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -177,8 +177,7 @@ get_load_monitor (CORBA::ORB_ptr orb,
                       ACE_TEXT ("unimplemented.\n"),
                       ::mtype));
 
-          ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                            CosLoadBalancing::LoadMonitor::_nil ());
+          throw CORBA::NO_IMPLEMENT ();
         }
       else
         {
@@ -187,8 +186,7 @@ get_load_monitor (CORBA::ORB_ptr orb,
                       ACE_TEXT ("type: <%s>.\n"),
                       ::mtype));
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                            CosLoadBalancing::LoadMonitor::_nil ());
+          throw CORBA::BAD_PARAM ();
         }
     }
 }
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index dc1288420cb..d510360f1a2 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -22,7 +22,7 @@
 
 #include "ace/OS.h"
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/Log_Msg.h"
 
@@ -225,4 +225,4 @@ main (int argc, char *argv[])
   return OPTIONS::instance ()->run (argc, argv);
 }
 
-#endif /* ACE_WIN32 */
+#endif /* !ACE_WIN32 || ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 2c1a9364ed6..f96559d086d 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -4,7 +4,7 @@
 
 #include /**/ "NT_Naming_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "Naming_Service.h"
 #include "tao/ORB_Core.h"
@@ -188,4 +188,4 @@ TAO_NT_Naming_Service::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 7d0ced9acf7..6068c9bacbf 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -25,7 +25,7 @@
 
 #include /**/ "ace/OS.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
@@ -93,5 +93,5 @@ private:
 
 typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 #endif /* TAO_NT_NAMING_SERVER_H */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 0b8dfac859c..533420ad49a 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -23,7 +23,7 @@
 
 #include "ace/OS.h"
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/Log_Msg.h"
 
@@ -228,4 +228,4 @@ main (int argc, char *argv[])
   return OPTIONS::instance ()->run (argc, argv);
 }
 
-#endif /* ACE_WIN32 */
+#endif /* !ACE_WIN32 || ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 9ad03908c0c..58a7749730b 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -3,7 +3,7 @@
 
 #include /**/ "NT_Notify_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "Notify_Service.h"
 #include "tao/ORB_Core.h"
@@ -146,4 +146,4 @@ TAO_NT_Notify_Service::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 9ec67e151c0..f736b7b59a0 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -25,7 +25,7 @@
 
 #include /**/ "ace/OS.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
@@ -73,7 +73,5 @@ private:
 
 typedef ACE_Singleton<TAO_NT_Notify_Service, TAO_NT_Notify_Service::MUTEX> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 #endif /* TAO_NT_NOTIFY_SERVER_H */
-
-
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index f070e65ec31..f503e2f22e8 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -60,7 +60,6 @@ TAO_PSDL_Code_Gen::set_codec (void)
 int
 TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
                                      const char *string_obj_ref)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Invoke the helper encode method which will
   // convert the stringified object reference to a CORBA::OctetSeq.
@@ -93,7 +92,6 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
 
 const char *
 TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get from the hash_map saved in the database, the corresponding entry
   // (CORBA::OctetSeq *) for the name. Then, decode the octetseq to
@@ -124,7 +122,6 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
 
 CORBA::OctetSeq *
 TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any data;
   data <<= string_obj_ref;
@@ -140,7 +137,6 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
 
 const char *
 TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *extracted_value;
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
index 7ec81dfdc5e..ac461c40611 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
@@ -50,25 +50,21 @@ class TAO_PSDL_Export TAO_PSDL_Code_Gen
   /// Method to save the name-stringified object reference pair
   /// to the database. Returns -1 on failure.
   int set_name_obj_ref (const char *name,
-                        const char *string_obj_ref)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        const char *string_obj_ref);
 
   /// Get the stringified form of the object reference given the name
   /// of the object.
-  const char *get_obj_ref (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  const char *get_obj_ref (const char *name);
 
  private:
 
   /// Helper method which serializes the data and saves it to the
   /// database.
-  CORBA::OctetSeq *encode (const char *string_obj_ref)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::OctetSeq *encode (const char *string_obj_ref);
 
 
   /// Helper method to get the octet sequence
-  const char *decode (const CORBA::OctetSeq &data)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  const char *decode (const CORBA::OctetSeq &data);
 
   /// File where the persistent data is stored.
   const char *file_name_;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 9ec72d46d84..6bcd6c8d280 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -71,11 +71,6 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::create (const char * channel_id,
                                       CORBA::Boolean store_in_naming_service)
-  ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::DuplicateChannel,
-        CosEventChannelFactory::BindFailed
-      ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -124,43 +119,35 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
     }
   catch (const PortableServer::POA::ServantAlreadyActive&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::DuplicateChannel ();
     }
   catch (const PortableServer::POA::ObjectAlreadyActive&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::DuplicateChannel ();
     }
   catch (const PortableServer::POA::WrongPolicy&)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                        ec_return._retn ());
+      throw CORBA::UNKNOWN ();
     }
   catch (const PortableServer::POA::ObjectNotActive&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::BindFailed ();
     }
   catch (const CosNaming::NamingContext::NotFound&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::BindFailed ();
     }
   catch (const CosNaming::NamingContext::CannotProceed&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::BindFailed ();
     }
   catch (const CosNaming::NamingContext::InvalidName&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::BindFailed ();
     }
   catch (const CosNaming::NamingContext::AlreadyBound&)
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::BindFailed ();
     }
 
   return ec_return._retn ();
@@ -172,10 +159,6 @@ TAO_CosEventChannelFactory_i::destroy
  const char * channel_id,
  CORBA::Boolean unbind_from_naming_service
  )
- ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -227,10 +210,6 @@ TAO_CosEventChannelFactory_i::find
 (
  const char * channel_id
  )
-  ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -248,8 +227,7 @@ TAO_CosEventChannelFactory_i::find
     }
   catch (const CORBA::UserException&)// Translate any user exception.
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        ec_return._retn ());
+      throw CosEventChannelFactory::NoSuchChannel ();
     }
 
   return ec_return._retn ();
@@ -260,10 +238,6 @@ TAO_CosEventChannelFactory_i::find_channel_id
 (
  CosEventChannelAdmin::EventChannel_ptr channel
  )
-  ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -277,8 +251,7 @@ TAO_CosEventChannelFactory_i::find_channel_id
     }
   catch (const CORBA::UserException&)// Translate any user exception.
     {
-      ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        str_return._retn ());
+      throw CosEventChannelFactory::NoSuchChannel ();
     }
 
   return str_return._retn ();
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 0afbde49bd2..13ebcb5b406 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -66,40 +66,23 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean store_in_naming_service
-     )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::DuplicateChannel,
-        CosEventChannelFactory::BindFailed
-      ));
+     );
 
   virtual void destroy
     (
      const char * channel_id,
      CORBA::Boolean unbind_from_naming_service
-     )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ));
+     );
 
   virtual CosEventChannelAdmin::EventChannel_ptr find
     (
      const char * channel_id
-     )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ));
+     );
 
   virtual char * find_channel_id
     (
      CosEventChannelAdmin::EventChannel_ptr channel
-     )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventChannelFactory::NoSuchChannel
-      ));
+     );
  protected:
 
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 44632007a6a..34a7b2c47a7 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -125,8 +125,7 @@ FactoryClient::resolve_factory (void)
 CosEventChannelFactory::ChannelFactory_ptr
 FactoryClient::create_factory (void)
 {
-  ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                    CosEventChannelFactory::ChannelFactory::_nil ());
+  throw CORBA::UNKNOWN ();
 }
 
 CosEventChannelAdmin::EventChannel_ptr
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 8f682906fc3..eb7a53782f0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -27,7 +27,6 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -57,7 +56,6 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index e9895d9c3ab..83689e0dbb0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -47,13 +47,11 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_push_supplier(void);
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_pull_supplier(void);
   // Returns a new ProxyPullSupplier_ptr.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index f3df43e46d5..98f8fb7d23c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -210,21 +210,18 @@ CosEC_ServantBase::deactivate_cosec (void)
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 CosEC_ServantBase::for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->cosec_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 CosEC_ServantBase::for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->cosec_->for_suppliers ();
 }
 
 void
 CosEC_ServantBase::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index 26eaf55e438..293b71c8320 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -67,14 +67,11 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
   // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
 
-  virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroys this Event Channel object.
 
  protected:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index 6559d30c427..75fd15400db 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -70,7 +70,6 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_CosEC_EventChannel_i::for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object.
@@ -80,7 +79,6 @@ TAO_CosEC_EventChannel_i::for_consumers (void)
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_CosEC_EventChannel_i::for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object, same here..
@@ -90,7 +88,6 @@ TAO_CosEC_EventChannel_i::for_suppliers (void)
 
 void
 TAO_CosEC_EventChannel_i::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index 82e16cc01fd..cc30861b4f8 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -54,18 +54,15 @@ public:
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroys this Event Channel object.
 
   void shutdown (void);
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 626c6226fed..2301272e0b6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -31,8 +31,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // Disconnects the push supplier.
 
 private:
@@ -64,7 +63,6 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
 
 void
 TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->supplier_->disconnect_push_supplier ();
 
@@ -97,7 +95,6 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 
 void
 TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
   // Create an event set that does not own the buffer....
@@ -134,7 +131,6 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
 
 void
 TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->proxypushconsumer_->disconnect_push_consumer ();
 
@@ -150,8 +146,6 @@ TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
 
 void
 TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected))
 {
   if (this->connected ())
     throw CosEventChannelAdmin::AlreadyConnected ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index 3d56f52ed16..b4c6bf6bc59 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -53,17 +53,13 @@ public:
   ~TAO_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  virtual void push (const CORBA::Any &data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const CORBA::Any &data);
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   // Disconnects the supplier from the event communication.
 
-  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
+  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier);
   // Connects a push supplier.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 5e64a573392..958e10373ad 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -30,12 +30,10 @@ public:
   ~TAO_CosEC_PushConsumerWrapper (void);
   // Destructor.
 
-  virtual void push (const RtecEventComm::EventSet & data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet & data);
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   // Disconnects the consumer from the event channel.
 
 private:
@@ -61,7 +59,6 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 
 void
 TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
        i < set.length ();
@@ -80,7 +77,6 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
 
 void
 TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the supplier proxy.
   this->consumer_->disconnect_push_consumer ();
@@ -114,7 +110,6 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 
 void
 TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pps_->disconnect_push_supplier ();
 
@@ -133,9 +128,6 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
 
 void
 TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected,
-                       CosEventChannelAdmin::TypeError))
 {
   if (this->connected ())
     throw CosEventChannelAdmin::AlreadyConnected ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index bb26a3ef8fa..875feca65d5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -46,14 +46,10 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected,
-                       CosEventChannelAdmin::TypeError));
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer);
   // Connects the <push_consumer> to the Event Channel.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 09fd6da3817..66800d52839 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -27,7 +27,6 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -56,7 +55,6 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index 7a7c39daf94..bab4970dbbc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -49,13 +49,11 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_push_consumer (void);
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_pull_consumer(void);
   // Returns a new ProxyPullConsumer_ptr.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index b2385f752dc..7a9073af784 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -53,10 +53,6 @@ Consumer::disconnect (void)
 
 void
 Consumer::push (const CORBA::Any &)
- ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Consumer::push\n"));
@@ -66,9 +62,6 @@ Consumer::push (const CORBA::Any &)
 
 void
 Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index d1d61414dbb..7466073ed0f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -46,17 +46,10 @@ public:
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ));
+  virtual void push (const CORBA::Any &data);
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void disconnect_push_consumer (void);
   // disconnect the consumer from the EC.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 886bf57af84..4495a9bdd82 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -55,9 +55,6 @@ Supplier::send_event (const CORBA::Any & data)
 
 void
 Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 1d2d6a0117a..ac7f7e77f35 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -45,10 +45,7 @@ public:
   void send_event (const CORBA::Any &data);
   // Send one event.
 
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void disconnect_push_supplier (void);
   // The POA_CosEventComm::PushSupplier method.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 5755ed1d97d..099d0f4b492 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -90,10 +90,6 @@ Consumer::disconnect (void)
 
 void
 Consumer::push (const CORBA::Any &)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P):%s\n",
@@ -120,9 +116,6 @@ Consumer::push (const CORBA::Any &)
 
 void
 Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index 757c4a062cd..7486ddc9d53 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -53,17 +53,10 @@ public:
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ));
+  virtual void push (const CORBA::Any &data);
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void disconnect_push_consumer (void);
   // disconnect the consumer from the EC.
 
   // = CosEC_Multiple methods.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 3a0e1addb11..d5c45142eeb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -94,9 +94,6 @@ Supplier::send_event (const CORBA::Any & data)
 
 void
 Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((
-        CORBA::SystemException
-        ))
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 1041ae6a163..f5c29b92f62 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -51,10 +51,7 @@ public:
   void send_event (const CORBA::Any &data);
   // Send one event.
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void disconnect_push_supplier (void);
   // The POA_CosEventComm::PushSupplier method.
 
   void run (void);
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 6934b616a9a..1a600a91e0f 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -29,7 +29,7 @@ Consumer::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
@@ -92,7 +92,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const CORBA::Any &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count_ ++;
   if (this->event_count_ % 100 == 0)
@@ -105,7 +104,6 @@ Consumer::push (const CORBA::Any &)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 2915b51441e..ee022ef3e3b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -40,10 +40,8 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const CORBA::Any &event);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 9f43341d23b..7217f16ee8a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -22,7 +22,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         {
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index e87e81c10b4..03a0c13e02a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -29,7 +29,7 @@ Supplier::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (argc <= 1)
         {
@@ -103,7 +103,6 @@ Supplier::run (int argc, char* argv[])
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index ca9e1267edb..789c67bda1f 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -40,8 +40,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index 123e0604a04..a6d24d562cd 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -17,7 +17,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_obj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index cb0a13b15a6..08b0dfec2da 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -17,7 +17,6 @@ Country_i::~Country_i (void)
 
 void Country_i::update_population (const char * country,
                                    CORBA::Long population)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   //Add your implementation here
@@ -27,7 +26,6 @@ void Country_i::update_population (const char * country,
 
 CORBA::Object_ptr
 Country_i::get_typed_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   //Add your implementation here
@@ -43,8 +41,6 @@ Country_i::get_typed_consumer (void)
 void
 Country_i::push (const CORBA::Any & /* data */
                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 
 {
   //Add your implementation here
@@ -52,7 +48,6 @@ Country_i::push (const CORBA::Any & /* data */
 
 void
 Country_i::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   //Add your implementation here
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index 11231abba89..a1ba3fe3826 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -22,18 +22,13 @@ public:
   virtual ~Country_i (void);
 
   virtual void update_population (const char * country,
-                                  CORBA::Long population)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                  CORBA::Long population);
 
-  virtual CORBA::Object_ptr get_typed_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Object_ptr get_typed_consumer (void);
 
-  virtual void push (const CORBA::Any & data)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+  virtual void push (const CORBA::Any & data);
 
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 2617c8f9daf..a51632e9a07 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -14,7 +14,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Obtain the event channel using the Naming Service.
       CORBA::Object_var nam_obj =
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index a2ef5f64119..6974742a02f 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -12,13 +12,11 @@
 
 void
 ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate slot id.
   //
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index 219ef9fa590..18b2210531d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -15,12 +15,10 @@ class ORB_Initializer :
 public:
 
   virtual void
-  pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void
-  post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #endif /* ORB_INITIALIZER_H */
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 0f39c065b71..45db3e629d0 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -216,7 +216,7 @@ namespace
 {
   FT::FTRequestServiceContext*
   extract_context (
-    PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 }
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
@@ -224,8 +224,6 @@ void
 ReplicaController::tao_ft_interception_point (
   PortableInterceptor::ServerRequestInfo_ptr ri,
   CORBA::OctetSeq_out ocs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   FT::FTRequestServiceContext_var ftr (
     extract_context (ri));
@@ -259,7 +257,6 @@ ReplicaController::tao_ft_interception_point (
 void
 ReplicaController::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext_var ftr (
     extract_context (ri));
@@ -424,7 +421,6 @@ namespace
 {
   FT::FTRequestServiceContext*
   extract_context (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceContext_var svc =
       ri->get_request_service_context (IOP::FT_REQUEST);
@@ -475,7 +471,6 @@ namespace
 
 char*
 ReplicaController::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ReplicaController");
 }
@@ -483,30 +478,23 @@ ReplicaController::name (void)
 void
 ReplicaController::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ReplicaController::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ReplicaController::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ReplicaController::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
 }
@@ -514,7 +502,5 @@ ReplicaController::receive_request_service_contexts (
 void
 ReplicaController::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index fe4e1aa1f86..de2e6ebd5c6 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -40,50 +40,37 @@ public:
 
 public:
   virtual char *
-  name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  name (void);
 
   virtual void
-  destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  destroy (void);
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
   virtual void
   tao_ft_interception_point (
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::OctetSeq_out ocs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+    CORBA::OctetSeq_out ocs);
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
   virtual void
   receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void
   receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void
   send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void
   send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void
   send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 private:
   static ACE_THR_FUNC_RETURN
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index ab009dea00a..1373d0a3582 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -9,8 +9,8 @@ project(*idl): taoidldefaults {
 project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors {
   after += *idl
   Source_Files {
-    RolyPolyS.cpp
     RolyPolyC.cpp
+    RolyPolyS.cpp
     RolyPoly_i.cpp
     ORB_Initializer.cpp
     ReplicaController.cpp
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index 20d9f800e63..2115454097c 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -40,7 +40,6 @@ set_state (CORBA::Any const& state)
 
 CORBA::Short
 RolyPoly_i::number (char *&str)
-  ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E))
 {
   CORBA::string_free (str);
 
@@ -63,7 +62,6 @@ RolyPoly_i::number (char *&str)
 
 void
 RolyPoly_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index 99cc4b79c68..5af5fd6064d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -28,12 +28,10 @@ public:
   // RolyPoly
   //
   virtual CORBA::Short
-  number (char *&s)
-    ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
+  number (char *&s);
 
   virtual void
-  shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  shutdown (void);
 
 private:
   CORBA::Short number_;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
index 7a03c0c7de4..9fd7218042f 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
@@ -15,7 +15,6 @@ Manager_i::~Manager_i (void)
 }
 
 CORBA::Long Manager_i::registerServer ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (retry_attempt_ < retry_count_)
   {
@@ -26,14 +25,12 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 }
 
 void Manager_i::startRetry (CORBA::Long count)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   retry_count_ = count;
   retry_attempt_ = 0;
 }
 
 CORBA::Long Manager_i::endRetry ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return retry_count_ - retry_attempt_;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
index 5c45021ce6e..9a5bca21ed9 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
@@ -18,14 +18,11 @@ public:
 
   virtual ~Manager_i (void);
 
-  virtual CORBA::Long registerServer ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long registerServer ();
 
-  virtual void startRetry (CORBA::Long count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void startRetry (CORBA::Long count);
 
-  virtual CORBA::Long endRetry ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long endRetry ();
 
 private:
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
index 235c97a6b6a..c38e3e84944 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
@@ -27,7 +27,7 @@ bool Messenger_i::acknowledgeHit()
 CORBA::Long Messenger_i::send_message (CORBA::Long thread,
                                        CORBA::Long iter,
                                        CORBA::Long obj,
-                                       CORBA::Long req) ACE_THROW_SPEC ((CORBA::SystemException))
+                                       CORBA::Long req)
 {
   cout << "* Invoked: (" << instance_ << "." << thread << "." << iter
     << "." << obj << "." << req << ")" << endl;
@@ -35,7 +35,7 @@ CORBA::Long Messenger_i::send_message (CORBA::Long thread,
   return instance_;
 }
 
-void Messenger_i::shutdownOrb () ACE_THROW_SPEC ((CORBA::SystemException))
+void Messenger_i::shutdownOrb ()
 {
   orb_->shutdown(0);
 }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
index 07730db0cbd..6236bd7b976 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
@@ -24,10 +24,9 @@ public:
       ::CORBA::Long iter,
       ::CORBA::Long obj,
       ::CORBA::Long req
-   ) ACE_THROW_SPEC ((CORBA::SystemException));
+   );
 
-  virtual void shutdownOrb ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdownOrb ();
 
   bool acknowledgeHit();
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index d62ce2c7645..1bfe15b19fa 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -23,14 +23,13 @@ public:
   {
   }
   virtual CORBA::Long process_directive(const char* s)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_ASSERT(s != 0);
     ACE_ASSERT(ACE_OS::strlen(s) > 0);
     return asc_.process_directive(s);
   }
 
-  virtual void reconfigure() ACE_THROW_SPEC ((CORBA::SystemException))
+  virtual void reconfigure()
   {
     asc_.reconfigure();
   }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 2ee3c788095..28f6ea7c526 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -18,13 +18,15 @@ DynServer::DynServer()
 DynServer::~DynServer() {
 }
 
-Long DynServer::get() ACE_THROW_SPEC ((SystemException)) {
+Long DynServer::get()
+{
   ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
   return n_;
 }
 
 namespace {
-  POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poaman) {
+  POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poaman)
+  {
     PolicyList policies (2);
     policies.length (2);
     policies[0] = root_poa->create_id_assignment_policy(USER_ID);
@@ -144,9 +146,8 @@ Object_ptr
 DynServer_Loader::create_object (ORB_ptr,
                                  int,
                                  ACE_TCHAR **)
-                                 ACE_THROW_SPEC ((SystemException))
 {
-  ACE_THROW_RETURN(NO_IMPLEMENT(), Object::_nil());
+  throw NO_IMPLEMENT();
 }
 
 ACE_FACTORY_DEFINE (DynServer, DynServer_Loader)
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index c222ebe531e..94705cc7009 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -18,7 +18,7 @@ class DynServer_Export DynServer
 public:
   DynServer(void);
   virtual ~DynServer();
-  virtual CORBA::Long get() ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get();
 };
 
 class DynServer_ORB_Runner;
@@ -39,8 +39,7 @@ public:
   // Not supported
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index 2298cb7bf6c..3f654bfa934 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -21,7 +21,8 @@ public:
   }
   virtual ~test_i (void) {
   }
-  virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
+  virtual CORBA::Long get (void)
+  {
     ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
     return n_;
   }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index d6da384d62b..1641db55b1e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -21,14 +21,12 @@ ORBInitializer::ORBInitializer (void)
 void
 ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   ACE_NEW_THROW_EX (this->interceptor_,
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
index ac320b21e63..584463e99a7 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
@@ -58,11 +58,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
   /// Return a reference to the LoadAlert object.
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index efe8447563c..cd24d5f5852 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -32,7 +32,6 @@ RPS_Monitor::~RPS_Monitor (void)
 
 CosLoadBalancing::Location *
 RPS_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -48,7 +47,6 @@ RPS_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 RPS_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index 048cd1bb10f..2c81309da6e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -50,8 +50,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -60,8 +59,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index a1a291b4a94..5e200084da9 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -16,22 +16,18 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
 
 char *
 ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
 ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++this->request_count_;
 }
@@ -39,31 +35,24 @@ ServerRequestInterceptor::receive_request_service_contexts (
 void
 ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 15e73de4d43..80f1b2ab4ba 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -61,35 +61,24 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Long request_count (void);
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index cdd1fd226e1..bfe19785090 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -28,7 +28,6 @@ StockFactory::get_stock (const char *symbol)
 
 void
 StockFactory::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 0d721a9a0d3..053fe79e808 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -17,8 +17,7 @@ public:
   Test::Stock_ptr get_stock (const char *symbol)
     throw (Test::Invalid_Stock_Symbol);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index c229a673084..0d8cb687349 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 84f89ecb79b..ead0601c6b2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -227,7 +227,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 47d97183f2a..a400a12eb3b 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -31,7 +31,7 @@ Consumer::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
@@ -51,7 +51,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (),0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -93,7 +93,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const CORBA::Any &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   this->event_count_ ++;
@@ -106,7 +105,6 @@ Consumer::push (const CORBA::Any &)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index d552c48d738..641291357d9 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -42,11 +42,9 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const CORBA::Any &event);
 
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 67b4f42765d..7c55821a082 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -34,7 +34,7 @@ Supplier::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RootPOA");
@@ -50,7 +50,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -203,7 +203,6 @@ Supplier::run (int argc, char* argv[])
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index bc989ce8643..a9370f40a2c 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -42,8 +42,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 6f5ca7c53f0..3ab7a703ce3 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -39,7 +39,7 @@ Consumer::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
@@ -59,7 +59,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -113,10 +113,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const CORBA::Any &event)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   ACE_UNUSED_ARG (event);
 
@@ -130,9 +126,6 @@ Consumer::push (const CORBA::Any &event)
 void
 Consumer::disconnect_push_consumer
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->proxy_supplier_->
     disconnect_push_supplier();
@@ -142,10 +135,6 @@ void
 Consumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 0d2498223fb..f67f8d7c830 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -56,25 +56,14 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier methods
-virtual void push (const CORBA::Any &event)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ));
+virtual void push (const CORBA::Any &event);
 
 
   virtual void disconnect_push_consumer (
-        )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        );
 
 private:
   CORBA::ULong event_count_;
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index f84ba7374ab..f367b06466b 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -43,7 +43,7 @@ Supplier::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 
 
@@ -52,7 +52,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -299,10 +299,6 @@ void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   //No-Op.
 }
@@ -319,9 +315,6 @@ Filter_StructuredPushSupplier::send_event
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index 0326d711dc6..22d20672f07 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -106,18 +106,11 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 };
 
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 17a8ff1634a..ece0cbdf9f1 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -32,7 +32,7 @@ Consumer::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
@@ -69,7 +69,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -130,7 +130,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (events);
 
@@ -143,7 +142,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index b4009a41576..b84035dfc9d 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -43,10 +43,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index e9a9215b19f..07fd17cddfd 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -37,7 +37,7 @@ Supplier::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 
 /*
@@ -76,7 +76,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+        throw CORBA::UNKNOWN ();
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ());
@@ -251,7 +251,6 @@ Supplier::run (int argc, char* argv[])
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 9404dd76d52..cc3fc9bad0d 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -43,8 +43,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 9bd46c2a5a7..1388c36585a 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -146,8 +146,6 @@ private:
   virtual void
   offer_change (EventTypeSeq const&,
                 EventTypeSeq const&)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyComm::InvalidEventType))
   {
     // We don't care.
   }
@@ -156,8 +154,6 @@ private:
   //
   virtual void
   push_structured_event (StructuredEvent const& e)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected))
   {
     // Extract space_craft_name and agent_name.
     //
@@ -182,7 +178,6 @@ private:
 
   virtual void
   disconnect_structured_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // We don't care.
   }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 19187fdb325..e4fb1423e43 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -192,8 +192,6 @@ tracker ()
 
 void Gate::
 push_structured_event (StructuredEvent const& e)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   for (ULong i (0); i < e.header.variable_header.length (); ++i)
   {
@@ -250,7 +248,6 @@ push_structured_event (StructuredEvent const& e)
 
 void Gate::
 disconnect_structured_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We don't care.
 }
@@ -258,8 +255,6 @@ disconnect_structured_push_consumer (void)
 void Gate::
 offer_change (EventTypeSeq const&,
               EventTypeSeq const&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType))
 {
   // We don't care.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index d4838d078ff..ff05025cf66 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -52,21 +52,16 @@ private:
   //
   virtual void
   offer_change (CosNotification::EventTypeSeq const&,
-                CosNotification::EventTypeSeq const&)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyComm::InvalidEventType));
+                CosNotification::EventTypeSeq const&);
 
   // StructuredPushSupplier interface.
   //
   virtual void
-  push_structured_event (CosNotification::StructuredEvent const& e)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+  push_structured_event (CosNotification::StructuredEvent const& e);
 
 
   virtual void
-  disconnect_structured_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  disconnect_structured_push_consumer (void);
 
 private:
   ACE_thread_t thread_;
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 9f9d0c62cac..aeb872a8b54 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -7,7 +7,8 @@ ACE_RCSID(Filter, Filter, "$Id$")
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 #define CA_FILTER "threshold < 20"
-#define SA_FILTER "threshold > 10"
+#define SA_FILTER1 "threshold > 10"
+#define SA_FILTER2 "'pc1' in targetlist"
 #define TCL_GRAMMAR "TCL"
 #define EVENTS_TO_SEND 30
 #define EVENTS_EXPECTED_TO_RECEIVE 9*4  // 2 consumers get the same events from 2 suppliers
@@ -152,10 +153,12 @@ FilterClient::create_supplieradmin (void)
   ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
 
   CosNotifyFilter::ConstraintExpSeq constraint_list (1);
-  constraint_list.length (1);
+  constraint_list.length (2);
 
   constraint_list[0].event_types.length (0);
-  constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
+  constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER1);
+  constraint_list[1].event_types.length (0);
+  constraint_list[1].constraint_expr = CORBA::string_dup (SA_FILTER2);
 
   sa_filter->add_constraints (constraint_list);
 
@@ -258,8 +261,9 @@ FilterClient::send_events (void)
   // FilterableEventBody
   // PropertySeq
   // sequence<Property>: string name, any value
-  event.filterable_data.length (3);
+  event.filterable_data.length (4);
   event.filterable_data[0].name = CORBA::string_dup("threshold");
+  event.filterable_data[0].value <<= (CORBA::Long)4;
 
   event.filterable_data[1].name = CORBA::string_dup("temperature");
   event.filterable_data[1].value <<= (CORBA::Long)70;
@@ -267,7 +271,10 @@ FilterClient::send_events (void)
   event.filterable_data[2].name = CORBA::string_dup("pressure");
   event.filterable_data[2].value <<= (CORBA::Long)80;
 
-  event.filterable_data[0].value <<= (CORBA::Long)4;
+  event.filterable_data[3].name = CORBA::string_dup("targetlist");
+  const char* ids[] = { "pc1", "pc2", "pc3" };
+  CORBA::StringSeq idseq(3, 3, const_cast<char**> (ids), 0);
+  event.filterable_data[3].value <<= idseq;
 
   // any
   event.remainder_of_body <<= (CORBA::Long)4;
@@ -330,10 +337,6 @@ Filter_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
     )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ))
 {
   // No-Op.
 }
@@ -341,10 +344,6 @@ Filter_StructuredPushConsumer::offer_change
 void
 Filter_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
     CORBA::Long val;
 
@@ -367,9 +366,6 @@ Filter_StructuredPushConsumer::push_structured_event
 void
 Filter_StructuredPushConsumer::disconnect_structured_push_consumer
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   // No-Op.
 }
@@ -419,10 +415,6 @@ Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   //No-Op.
 }
@@ -442,9 +434,6 @@ Filter_StructuredPushSupplier::send_event
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index 6f4263808f6..c5fd5ae7da2 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -170,26 +170,15 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   virtual void disconnect_structured_push_consumer (
-        )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        );
 };
 
 /*****************************************************************/
@@ -237,18 +226,11 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 };
 
 #endif /* NOTIFY_FILTER_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
index 0c0e54324fc..8918e07c037 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, notification, notification_skel, naming {
+  exename = Filter
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 17adfa7d657..9c166e7ccdc 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -79,20 +79,12 @@ void
 TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
                                )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   // No-Op.
 }
 
 void
 TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   try
     {
@@ -147,9 +139,6 @@ TAO_Notify_Lanes_Consumer::deactivate (void)
 
 void
 TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index f1f16034ae1..35ac32e3502 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -82,26 +82,15 @@ protected:
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   virtual void disconnect_structured_push_consumer (
-        )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        );
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 44c4a0fd1a6..5210b534d17 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -139,10 +139,6 @@ void
 TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
                                       )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -164,9 +160,6 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e
 
 void
 TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index f7c96ab45c1..d7c2f31af5d 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -64,17 +64,10 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_structured_push_supplier (void);
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 2e3c6a5ff22..bf9b59f62fd 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -186,24 +186,34 @@ Subscribe::send_events (void)
   // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
   CosNotification::EventTypeSeq added_1(1);
   CosNotification::EventTypeSeq removed_1 (0);
+  added_1.length (1);
 
   added_1[0].domain_name =  CORBA::string_dup (DOMAIN_B);
   added_1[0].type_name = CORBA::string_dup (TYPE_B);
-  added_1.length (1);
   removed_1.length (0);
 
   this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
+  // now the expected subscription for consumer 1 should be
+  // A and B
+  this->consumer_1_->expected_subscription_.length (2);
+  this->consumer_1_->expected_subscription_[0] = added[0];
+  this->consumer_1_->expected_subscription_[1] = added_1[0];
 
   // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
   CosNotification::EventTypeSeq added_2(1);
   CosNotification::EventTypeSeq removed_2 (0);
+  added_2.length (1);
 
   added_2[0].domain_name =  CORBA::string_dup (DOMAIN_C);
   added_2[0].type_name = CORBA::string_dup (TYPE_C);
-  added_2.length (1);
   removed_2.length (0);
 
   this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
+  // now the expected subscription for consumer 2 should be
+  // A and C
+  this->consumer_2_->expected_subscription_.length (2);
+  this->consumer_2_->expected_subscription_[0] = added[0];
+  this->consumer_2_->expected_subscription_[1] = added_2[0];
 
   // Create the events - one of each type
   // Event 1
@@ -250,7 +260,8 @@ Subscribe::send_events (void)
 
 /*****************************************************************/
 Subscribe_StructuredPushConsumer::Subscribe_StructuredPushConsumer (Subscribe* subscribe)
-  : subscribe_ (subscribe)
+  : expected_subscription_ (2),
+    subscribe_ (subscribe)
 {
 }
 
@@ -293,10 +304,6 @@ Subscribe_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
     )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ))
 {
   // No-Op.
 }
@@ -304,10 +311,6 @@ Subscribe_StructuredPushConsumer::offer_change
 void
 Subscribe_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   const char* domain_name =
     notification.header.fixed_header.event_type.domain_name;
@@ -315,7 +318,20 @@ Subscribe_StructuredPushConsumer::push_structured_event
   const char* type_name =
     notification.header.fixed_header.event_type.type_name;
 
-  ACE_DEBUG ((LM_DEBUG, "Structured Subscribe Consumer %d received event, domain = %s, type =  %s\n", this->proxy_supplier_id_, domain_name, type_name));
+  bool found = false;
+
+  for (CORBA::ULong i = 0; i < expected_subscription_.length (); i++)
+  {
+    if ( ACE_OS::strcmp (expected_subscription_[i].domain_name, domain_name) == 0)
+      found = true;
+  }
+
+  if (found)
+    ACE_DEBUG ((LM_DEBUG, "Structured Subscribe Consumer %d received subscribed event, domain = %s, type =  %s\n",
+                this->proxy_supplier_id_, domain_name, type_name));
+  else
+    ACE_ERROR ((LM_ERROR, "Error: Structured Subscribe Consumer %d received not subcribed event , domain = %s, type =  %s\n",
+                this->proxy_supplier_id_, domain_name, type_name));
 
   if (++g_result_count == EVENT_COUNT)
     subscribe_->done ();
@@ -325,9 +341,6 @@ Subscribe_StructuredPushConsumer::push_structured_event
 void
 Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   // No-Op.
 }
@@ -382,10 +395,6 @@ Subscribe_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   //No-Op.
 }
@@ -402,9 +411,6 @@ Subscribe_StructuredPushSupplier::send_event
 void
 Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index e309467114b..1205daec5b7 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -139,6 +139,8 @@ class Subscribe_StructuredPushConsumer
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
   // Accessor for the Proxy that we're connected to.
 
+  // public data member for evaluating the results of subscription.
+  CosNotification::EventTypeSeq expected_subscription_;
 protected:
   // = Data members
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
@@ -158,26 +160,15 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   virtual void disconnect_structured_push_consumer (
-        )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        );
 };
 
 /*****************************************************************/
@@ -222,18 +213,11 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 };
 
 #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 29cabc964bb..4a73b95e1d5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -124,10 +124,6 @@ void
 TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
                                )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   // No-Op.
 }
@@ -135,10 +131,6 @@ TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSe
 void
 TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
                                             )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -195,9 +187,6 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void)
 
 void
 TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 3d2b581f8bd..9196cab9603 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -66,26 +66,15 @@ protected:
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   virtual void disconnect_structured_push_consumer (
-        )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+        );
 
   // = Data members
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index d7f25a61eb8..44fa82370f5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -139,10 +139,6 @@ void
 TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
                                       )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -173,9 +169,6 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve
 
 void
 TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 4f46c83ac87..e8b30447a59 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -66,17 +66,10 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_structured_push_supplier (void);
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index 8730f4dfcec..446ed61ebf5 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -16,7 +16,6 @@ CORBA::Object_ptr
 Gateway_ObjRef_Factory::
 make_object (const char *interface_repository_id,
              const PortableInterceptor::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->old_factory_->make_object (interface_repository_id,
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index e0bcb4bbb67..431db81c3d0 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -26,8 +26,7 @@ public:
 
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
-      const PortableInterceptor::ObjectId &id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableInterceptor::ObjectId &id);
 
 private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index d6e510b8edf..ae4ac1dd5ae 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -15,7 +15,6 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 Object_Factory_i::create_object (const char *interface_repository_id,
                                  CORBA::Object_ptr gatewayed_object)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringified_object =
     this->orb_->object_to_string (gatewayed_object);
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index 35febb7b331..ba8db8489ce 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -32,8 +32,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory
 
   CORBA::Object_ptr
     create_object (const char *interface_repository_id,
-                   CORBA::Object_ptr gatewayed_object)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   CORBA::Object_ptr gatewayed_object);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 8806a482225..5809da7409e 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -22,14 +22,12 @@ Server_IORInterceptor::~Server_IORInterceptor (void)
 
 char *
 Server_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_IORInterceptor");
 }
 
 void
 Server_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->gateway_object_factory_);
   this->gateway_object_factory_ = Gateway::Object_Factory::_nil ();
@@ -38,14 +36,12 @@ Server_IORInterceptor::destroy (void)
 void
 Server_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr ior_info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Gateway_ObjRef_Factory *my_factory = 0;
 
@@ -64,7 +60,6 @@ void
 Server_IORInterceptor::adapter_manager_state_changed (
     const char *,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -72,6 +67,5 @@ void
 Server_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 50e62b9e707..fc5b5b2a382 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -36,31 +36,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index c9aeca5ca75..42306c63e67 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -14,14 +14,12 @@ void
 Server_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("Gateway_Object_Factory");
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 51af3ab3a94..f64aa68b211 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -25,12 +25,10 @@ class Server_IORInterceptor_ORBInitializer
 
   //@{
   /// The pre-initialization hook.
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 31987a4feab..fe8a7a38833 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -13,7 +13,6 @@ sum_server_i::sum_server_i ()
 CORBA::Long
 sum_server_i::add_variables (CORBA::Long a,
                              CORBA::Long b)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return a+b;
 }
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index e093073e790..d9eb24f2943 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -31,8 +31,7 @@ class sum_server_i : public virtual POA_ORT::sum_server
 
   /// add variables method
   CORBA::Long add_variables (CORBA::Long a,
-                             CORBA::Long b)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                             CORBA::Long b);
 
 };
 
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.cpp b/TAO/orbsvcs/examples/PSS/Server_i.cpp
index 70480aacaa9..63193c391bc 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Server_i.cpp
@@ -14,7 +14,6 @@ Server_i::~Server_i (void)
 
 char *
 Server_i::get_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("active");
 }
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.h b/TAO/orbsvcs/examples/PSS/Server_i.h
index 24f406c9223..768e94d9a42 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.h
+++ b/TAO/orbsvcs/examples/PSS/Server_i.h
@@ -31,8 +31,7 @@ class Server_i : public virtual POA_Simple_Server::Server
 
   ~Server_i ();
 
-  virtual char *get_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *get_status (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
index efdfdc48b71..3bc1093f353 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
@@ -21,7 +21,6 @@ Naming_Context_i::~Naming_Context_i ()
 int
 Naming_Context_i::bind (const char *n,
                         const char *obj)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Save the binding to database.
   int result =
@@ -32,7 +31,6 @@ Naming_Context_i::bind (const char *n,
 
 char *
 Naming_Context_i::find (const char *n)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the Stringified object reference corresponding to
   // 'n'
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
index 84bb1e2bed4..41174e02c73 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
@@ -36,11 +36,9 @@ class Naming_Context_i : public virtual POA_Simple_Naming::Naming_Context
   ~Naming_Context_i (void);
 
   virtual int bind (const char *n,
-                    const char *obj)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    const char *obj);
 
-  virtual char *find (const char *n)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *find (const char *n);
 
 private:
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index e170689137b..9c2c1d2ffef 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -45,7 +45,7 @@ Consumer::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
@@ -130,7 +130,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -150,7 +149,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index 8541290d29a..a477656b498 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -37,10 +37,8 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   // The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
 
 private:
   int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index e474a7706d7..2831f1b3a23 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -44,7 +44,7 @@ EC::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 14cefe9d1e7..8a6e88ed107 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -45,7 +45,7 @@ Gateway::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 39d93a1f5ad..f016dbfff30 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -45,7 +45,7 @@ Supplier::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
@@ -144,7 +144,6 @@ Supplier::run (int argc, char* argv[])
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index e42042c197d..4e4a3c97fe7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -36,8 +36,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 private:
   int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 20ff6a10b22..3c88f73b002 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -10,7 +10,6 @@ Consumer::Consumer (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index 51bacf725b8..36c247802f6 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -44,10 +44,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 };
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index a80a268c4fb..2f88fb51ba2 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -53,7 +53,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         {
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index ec77f956c8b..9dd7b492b1a 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -38,7 +38,6 @@ Supplier::timeout_occured (void)
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -49,7 +48,6 @@ Timeout_Consumer::Timeout_Consumer (Supplier* supplier)
 
 void
 Timeout_Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -64,7 +62,6 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Timeout_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 0ca45a86b8f..8222337af57 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -46,8 +46,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
   void timeout_occured (void);
@@ -73,10 +72,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index c7ba18ae47b..79c0d07e1bf 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -12,7 +12,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
                       RtecUDPAdmin::UDP_Addr_out addr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index deeced433db..de7aeb6d590 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
 private:
   RtecUDPAdmin::UDP_Addr addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 4f5bbb2cc1e..125c8b7775d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -67,7 +67,6 @@ Consumer::disconnect (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -87,7 +86,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 9985ca129d6..5c4f141719d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -45,10 +45,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index a2be1b837cd..6f7fc2bebab 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -48,7 +48,7 @@ main (int argc, char* argv[])
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 205518d540d..5ad924f7209 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -76,7 +76,6 @@ Supplier::perform_push (void)
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 67c885b6d08..6ee7f3251cd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -49,8 +49,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 20ff6a10b22..3c88f73b002 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -10,7 +10,6 @@ Consumer::Consumer (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 51bacf725b8..36c247802f6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,10 +44,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 };
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 24b985f0f69..6b788914137 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -33,7 +33,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         {
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 9411ec8c3b3..f1714bf8773 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -12,7 +12,6 @@ Supplier::Supplier (void)
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index d255d1e8c7f..8824c4b9f86 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 8ed196efb49..5203f82a466 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -31,7 +31,7 @@ Consumer::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
@@ -114,7 +114,6 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -134,7 +133,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index af6a05b2b3b..8641e434194 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,10 +41,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index c7941fd665f..997078045e7 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -23,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 	  CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 02afe5f88d2..56b0a8063cc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -31,7 +31,7 @@ Supplier::run (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
@@ -123,7 +123,6 @@ Supplier::run (int argc, char* argv[])
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index edc8bd098a4..2587333a271 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,8 +41,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 84448bc0c75..6a3e81510bb 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -15,7 +15,6 @@ static int authorize_2 = 1;
 
 CORBA::Boolean
 SLevel1_Server_i::authorize_level1 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   /// Get a reference to the SecurityCurrent object.
@@ -110,7 +109,6 @@ SLevel1_Server_i::authorize_level1 (void)
 
 CORBA::Boolean
 SLevel1_Server_i::authorize_level2 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// If the owner of this invocation is authorized to invoke this
   /// method, return 0 else return 1.
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index 0e7ae144123..94a2151481d 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -25,11 +25,9 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean authorize_level1 (void);
 
-  CORBA::Boolean authorize_level2 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean authorize_level2 (void);
 
   static int authorized_1;
   static int authorized_2;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 921caee09c5..19d79e4835d 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -37,7 +37,7 @@ main (int argc, char *argv [])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index da28207b229..3ea44aa5a0d 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
     {
       /// Our regular ORB Initialization.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
index 7752e40754b..2dd91e44fd5 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
+++ b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
@@ -11,8 +11,8 @@ project(*Idl) : taoidldefaults {
 project(*Client) : orbsvcsexe, portableserver {
   after += *Idl
   source_files {
-    client.cpp
     testC.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -21,10 +21,10 @@ project(*Client) : orbsvcsexe, portableserver {
 project(*Server) : orbsvcsexe, portableserver {
   after += *Idl
   source_files {
+    testC.cpp
+    testS.cpp
     server.cpp
     test_i.cpp
-    testS.cpp
-    testC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 0286282ca72..46172b69b35 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 9dd9fd398e8..a8566f23ccf 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 858fc2c99d6..0b8df081939 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -10,14 +10,12 @@ ACE_RCSID(Send_File, test_i, "$Id$")
 
 void
 Simple_Server_i::send_line (const char *line)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", line));
 }
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index dce0675446b..729b1d933f8 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_line (const char *line);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 3c7269ca701..29a20d27fc3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1,18 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   AVStreams_i.cpp
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//    Nagarajan Surendran <naga@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   AVStreams_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Sumedh Mungee <sumedh@cs.wustl.edu> Nagarajan Surendran <naga@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/sfp.h"
@@ -81,8 +77,6 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   try
     {
@@ -125,8 +119,6 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   try
     {
@@ -172,8 +164,6 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
 
 void
 TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow))
 {
   try
     {
@@ -218,9 +208,6 @@ CORBA::Boolean
 
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
                                   const AVStreams::flowSpec &/*flowspec*/)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed))
 {
   return 1;
 }
@@ -229,7 +216,6 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
 // E.g., loss of flow, reestablishment of flow, etc..
 void
 TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \""));
@@ -240,9 +226,6 @@ void
 TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
                                     const char  *fp_name,
                                     const CORBA::Any &fp_settings)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::FPError))
 
 {
   if (!CORBA::is_nil (this->sep_a_.in ()))
@@ -254,9 +237,6 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 // Gets the flow connection.
 CORBA::Object_ptr
 TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported))
 {
   ACE_CString flow_name_key (flow_name);
   AVStreams::FlowConnection_var flow_connection_entry;
@@ -266,7 +246,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name)
   }
   else{
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name ));
-    ACE_THROW_RETURN (AVStreams::noSuchFlow (), CORBA::Object::_nil ());
+    throw AVStreams::noSuchFlow ();
   }
 }
 
@@ -274,9 +254,6 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name)
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
                                            CORBA::Object_ptr flow_connection_obj)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::notSupported))
 {
   AVStreams::FlowConnection_var flow_connection;
   try
@@ -311,7 +288,6 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
                            const AVStreams::streamQoS &/* qos_spec */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "TAO_Negotiator::negotiate\n"));
@@ -441,8 +417,6 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   try
     {
@@ -472,8 +446,6 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   try
     {
@@ -505,8 +477,6 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow))
 {
   try
     {
@@ -546,10 +516,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
                            const AVStreams::flowSpec &the_flows)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   try
     {
@@ -881,10 +847,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &stream_qos,
                       const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   this->sep_a_ = AVStreams::StreamEndPoint_A::_duplicate(sep_a);
   this->sep_b_ = AVStreams::StreamEndPoint_B::_duplicate(sep_b);
@@ -981,19 +943,19 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
               AVStreams::FlowEndPoint_var fep;
               result = a_fep_map->find (fep_key, fep);
               if (result == -1)
-                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on A side for flowname: %s\n", flow_spec[i]), 0);
+                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on A side for flowname: %s\n", flow_spec[i].in ()), 0);
 
               result = spec_fep_map_a->bind (fep_key, fep);
               if (result == -1)
-                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i]));
+                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ()));
 
               result = b_fep_map->find (fep_key, fep);
               if (result == -1)
-                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on B side for flowname: %s\n", flow_spec[i]), 0);
+                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on B side for flowname: %s\n", flow_spec[i].in ()), 0);
 
               result = spec_fep_map_b->bind (fep_key, fep);
               if (result == -1)
-                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i]));
+                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ()));
             }
           map_a = spec_fep_map_a;
           map_b = spec_fep_map_b;
@@ -1147,8 +1109,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 
 void
 TAO_StreamCtrl::unbind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed))
 {
   try
     {
@@ -1180,26 +1140,18 @@ TAO_StreamCtrl::unbind (void)
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
                               const AVStreams::flowSpec &/* the_spec */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow))
 {
 }
 
 void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
                             const AVStreams::flowSpec & /* the_spec */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow))
 {
 }
 
 AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
                                   AVStreams::StreamEndPoint_out sep)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed))
 {
   MMDevice_Map_Hash_Key key (adev);
   MMDevice_Map_Entry entry;
@@ -1219,9 +1171,6 @@ CORBA::Boolean
 
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
                             const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
@@ -1324,9 +1273,6 @@ CORBA::Boolean
 TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & qos,
                              const AVStreams::flowSpec & flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   try
     {
@@ -1350,7 +1296,6 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Peer_Info *info;
   try
@@ -1373,7 +1318,6 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
 
 void
 TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->initial_configuration_ = initial;
 }
@@ -1382,8 +1326,6 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
 void
 TAO_MCastConfigIf::set_format (const char * flowName,
                                const char * format_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   Peer_Info *info;
   try
@@ -1409,9 +1351,6 @@ TAO_MCastConfigIf::set_format (const char * flowName,
 void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
                                    const CosPropertyService::Properties & new_params)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException,
-                   AVStreams::streamOpFailed))
 {
   Peer_Info *info;
   try
@@ -1596,10 +1535,6 @@ CORBA::Boolean
 TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                              AVStreams::streamQoS &qos,
                              const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n"));
@@ -1784,8 +1719,6 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
 
 void
 TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
   this->handle_stop (flow_spec);
@@ -1834,8 +1767,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec)
 // Empty the_spec --> apply to all flows
 void
 TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
   // Make the upcall into the app
@@ -1923,8 +1854,6 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec)
 // Close the connection
 void
 TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev");
 
@@ -2055,11 +1984,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                                         CORBA::Boolean /*is_mcast*/,
                                         AVStreams::streamQoS &qos,
                                         AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpDenied,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::FPError))
 
 {
   if (TAO_debug_level > 0)
@@ -2179,9 +2103,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                 const AVStreams::flowSpec &the_flows)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
@@ -2200,7 +2121,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
 
 CORBA::Boolean
 TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -2223,9 +2143,6 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
 
 void
 TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_spec);
 }
@@ -2236,9 +2153,6 @@ void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
                                   const char *fp_name,
                                   const CORBA::Any &fp_settings)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::FPError))
 {
   if (ACE_OS::strcmp (fp_name, "SFP1.0") != 0)
     return;
@@ -2249,9 +2163,6 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
 
 CORBA::Object_ptr
 TAO_StreamEndPoint::get_fep (const char *flow_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::noSuchFlow))
 {
   ACE_CString fep_name_key (flow_name);
   AVStreams::FlowEndPoint_var fep_entry;
@@ -2262,9 +2173,6 @@ TAO_StreamEndPoint::get_fep (const char *flow_name)
 
 char*
 TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
 {
   ACE_CString flow_name;
 
@@ -2292,9 +2200,6 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
 
 char*
 TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
   try
@@ -2316,9 +2221,6 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep)
 
 char *
 TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
 {
   AVStreams::FlowEndPoint_var fep =
     AVStreams::FlowEndPoint::_narrow (fep_obj);
@@ -2334,7 +2236,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj)
       ACE_CString fep_name_key (CORBA::string_dup (flow_name.in ()));
       if (this->fep_map_.bind (fep_name_key, AVStreams::FlowEndPoint::_duplicate (fep.in ())) != 0)
         {
-          ACE_THROW_RETURN (AVStreams::streamOpFailed (), 0);
+          throw AVStreams::streamOpFailed ();
         }
       // increment the flow count.
       this->flow_count_++;
@@ -2357,9 +2259,6 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj)
 
 void
 TAO_StreamEndPoint::remove_fep (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
 {
   try
     {
@@ -2389,7 +2288,6 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name)
 // Sets the negotiator object.
 void
 TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -2411,7 +2309,6 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
                              const AVStreams::key & the_key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -2432,7 +2329,6 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
 // Set the source id.
 void
 TAO_StreamEndPoint::set_source_id (CORBA::Long source_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
 }
@@ -2490,10 +2386,6 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
 CORBA::Boolean
 TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                                     AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n"));
   try
@@ -2667,13 +2559,8 @@ CORBA::Boolean
 TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                     AVStreams::streamQoS & /* the_qos */,
                                     const AVStreams::flowSpec & /* the_flows */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::notSupported))
 {
-  ACE_THROW_RETURN (AVStreams::notSupported (), 0);
+  throw AVStreams::notSupported ();
 }
 
 // Multicast not supported yet.
@@ -2681,10 +2568,6 @@ void
 TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                        const AVStreams::flowSpec & /* theSpec */)
 
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::notSupported))
 {
 
   throw AVStreams::notSupported ();
@@ -2708,11 +2591,6 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 CORBA::Boolean
 TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                                     AVStreams::flowSpec &flow_spec)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::FPError))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n"));
   try
@@ -2847,10 +2725,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
                     const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
@@ -2905,10 +2779,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
                           AVStreams::MCastConfigIf_ptr mcast_peer,
                           AVStreams::streamQoS &/* the_qos */,
                           const AVStreams::flowSpec &/* the_spec */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   this->mcast_peer_ = AVStreams::MCastConfigIf::_duplicate (mcast_peer);
   return 1;
@@ -2917,9 +2787,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
 // applications should override this to handle configuration changes.
 void
 TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException,
-                   AVStreams::streamOpFailed))
 {
 }
 
@@ -2927,8 +2794,6 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/)
 void
 TAO_VDev::set_format (const char *flowName,
                       const char *format_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   try
     {
@@ -2953,9 +2818,6 @@ TAO_VDev::set_format (const char *flowName,
 void
 TAO_VDev::set_dev_params (const char *flowName,
                           const CosPropertyService::Properties &new_params)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException,
-                   AVStreams::streamOpFailed))
 {
   try
     {
@@ -2980,9 +2842,6 @@ TAO_VDev::set_dev_params (const char *flowName,
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &flowspec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
@@ -3045,10 +2904,6 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
                     const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ());
   try
@@ -3078,10 +2933,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
                           const AVStreams::flowSpec &the_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
@@ -3268,12 +3119,6 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
                         const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::noSuchFlow))
 {
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
   AVStreams::StreamEndPoint_var sep;
@@ -3301,12 +3146,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
                         const AVStreams::flowSpec &flow_spec)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::noSuchFlow))
 {
   AVStreams::StreamEndPoint_B_ptr sep_b = AVStreams::StreamEndPoint_B::_nil ();
   AVStreams::StreamEndPoint_var sep;
@@ -3331,8 +3170,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
                        const char * /* vdev_name */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -3344,9 +3181,6 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
 
 char *
 TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::streamOpFailed))
 {
   char* tmp;
   ACE_NEW_RETURN (tmp,
@@ -3374,9 +3208,6 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev)
 // Adds the fdev object to the MMDevice.
 char *
 TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
   AVStreams::FDev_var fdev;
@@ -3408,7 +3239,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
 
 
   if ( (this->fdev_map_.bind (fdev_name_key, fdev )) != 0)
-    ACE_THROW_RETURN (AVStreams::streamOpFailed (), 0);
+    throw AVStreams::streamOpFailed ();
   // increment the flow count.
   this->flow_count_++;
   this->flows_.length (this->flow_count_);
@@ -3432,9 +3263,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
 TAO_MMDevice::get_fdev (const char *flow_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::noSuchFlow))
 {
 
   ACE_CString fdev_name_key (flow_name);
@@ -3447,10 +3275,6 @@ TAO_MMDevice::get_fdev (const char *flow_name)
 // Removes the fdev from this MMDevice.
 void
 TAO_MMDevice::remove_fdev (const char *flow_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::noSuchFlow,
-                   AVStreams::streamOpFailed))
 {
   try
     {
@@ -3519,7 +3343,6 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 // stop this flow.
 void
 TAO_FlowConnection::stop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -3550,7 +3373,6 @@ TAO_FlowConnection::stop (void)
 // start this flow.
 void
 TAO_FlowConnection::start (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -3581,7 +3403,6 @@ TAO_FlowConnection::start (void)
 // destroy this flow.
 void
 TAO_FlowConnection::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -3615,8 +3436,6 @@ TAO_FlowConnection::destroy (void)
 // modify the QoS for this flow.
 CORBA::Boolean
 TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (new_qos);
   return 0;
@@ -3626,9 +3445,6 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos)
 CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
                                        const CORBA::Any & fp_settings)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::FPError,
-                   AVStreams::notSupported))
 {
   this->fp_name_ = fp_name;
   this->fp_settings_ = fp_settings;
@@ -3655,7 +3471,6 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
 
 void
 TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
 }
@@ -3664,10 +3479,6 @@ CORBA::Boolean
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
                                   AVStreams::QoS & flow_qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::QoSRequestFailed))
 {
   CORBA::Boolean result = 0;
   try
@@ -3703,10 +3514,6 @@ CORBA::Boolean
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                              AVStreams::FlowConsumer_ptr consumer,
                              AVStreams::QoS & the_qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::formatMismatch,
-                   AVStreams::FEPMismatch,
-                   AVStreams::alreadyConnected))
 {
   try
     {
@@ -3766,7 +3573,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
 CORBA::Boolean
 TAO_FlowConnection::disconnect (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  0;
 }
@@ -3774,9 +3580,6 @@ TAO_FlowConnection::disconnect (void)
 CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
                                   AVStreams::QoS & the_qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::alreadyConnected,
-                   AVStreams::notSupported))
 {
   try
     {
@@ -3866,8 +3669,6 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
 CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
                                   AVStreams::QoS & the_qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::alreadyConnected))
 {
   try
     {
@@ -3954,8 +3755,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 
 CORBA::Boolean
 TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notConnected))
 {
   ACE_UNUSED_ARG (target);
   return 0;
@@ -4036,7 +3835,6 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // the same flowendpoint.
 CORBA::Boolean
 TAO_FlowEndPoint::lock (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // lock the current flowendpoint
 
@@ -4049,7 +3847,6 @@ TAO_FlowEndPoint::lock (void)
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
 TAO_FlowEndPoint::unlock (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->lock_ = 0;
 }
@@ -4057,7 +3854,6 @@ TAO_FlowEndPoint::unlock (void)
 
 void
 TAO_FlowEndPoint::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
@@ -4070,7 +3866,6 @@ TAO_FlowEndPoint::destroy (void)
 
 AVStreams::StreamEndPoint_ptr
 TAO_FlowEndPoint::related_sep (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ());
@@ -4078,21 +3873,18 @@ TAO_FlowEndPoint::related_sep (void)
 
 void
 TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
 }
 
 AVStreams::FlowConnection_ptr
 TAO_FlowEndPoint::related_flow_connection (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
 }
 
 void
 TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection);
 }
@@ -4100,9 +3892,6 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
 TAO_FlowEndPoint::get_connected_fep (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notConnected,
-                   AVStreams::notSupported))
 {
   return AVStreams::FlowEndPoint::_duplicate (this->peer_fep_.in ());
 }
@@ -4110,9 +3899,6 @@ TAO_FlowEndPoint::get_connected_fep (void)
 CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
                                      const CORBA::Any &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::FPError,
-                   AVStreams::notSupported))
 {
   try
     {
@@ -4133,8 +3919,6 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
 
 void
 TAO_FlowEndPoint::set_format (const char * format)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   this->format_ = format;
   try
@@ -4154,9 +3938,6 @@ TAO_FlowEndPoint::set_format (const char * format)
 
 void
 TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException,
-                   AVStreams::streamOpFailed))
 {
   this->dev_params_ = new_settings;
   try
@@ -4175,8 +3956,6 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
 
 void
 TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   try
     {
@@ -4211,9 +3990,6 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
 
 CORBA::Boolean
 TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::formatMismatch,
-                   AVStreams::deviceQosMismatch))
 {
   const char *exception_message = "";
   try
@@ -4293,9 +4069,6 @@ CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
                             AVStreams::QoS & /* the_qos */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   this->peer_fep_ =
     AVStreams::FlowEndPoint::_duplicate (the_peer_fep);
@@ -4306,8 +4079,6 @@ CORBA::Boolean
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                                   AVStreams::MCastConfigIf_ptr mcast_peer,
                                   AVStreams::QoS & /* the_qos */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed))
 {
   this->mcast_peer_ = AVStreams::MCastConfigIf::_duplicate (mcast_peer);
   return 0;
@@ -4319,10 +4090,6 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                   CORBA::Boolean /*is_mcast*/,
                                   AVStreams::FlowEndPoint_ptr peer_fep,
                                   char *& flowProtocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToListen,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   char direction [BUFSIZ];
   switch (role)
@@ -4407,10 +4174,6 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                      AVStreams::QoS & /*the_qos*/,
                                      const char * address,
                                      const char * use_flow_protocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   char direction [BUFSIZ];
   switch (role)
@@ -4470,7 +4233,6 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 // gets the reverse channel for feedback.
 char *
 TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -4478,7 +4240,6 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
 // The start, stop and destroy are to be handled by the application.
 void
 TAO_FlowProducer::stop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4491,7 +4252,6 @@ TAO_FlowProducer::stop (void)
 
 void
 TAO_FlowProducer::start (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4514,10 +4274,6 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
                                 char *& flowProtocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToListen,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   return this->go_to_listen_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER,
                                the_qos,
@@ -4530,10 +4286,6 @@ CORBA::Boolean
 TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
                                    const char * use_flow_protocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER,
                                   the_qos,
@@ -4546,11 +4298,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
                                  CORBA::Boolean_out /* is_met */,
                                  const char *address,
                                  const char * use_flow_protocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::notSupported,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   // The address variable gives the multicast address to subscribe to.
   for (u_int i=0;i<this->protocols_.length ();i++)
@@ -4589,7 +4336,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
 // sets the key for this flow.
 void
 TAO_FlowProducer::set_key (const AVStreams::key & the_key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -4607,7 +4353,6 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key)
 // source id to be used to distinguish this source from others.
 void
 TAO_FlowProducer::set_source_id (CORBA::Long source_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
 }
@@ -4632,7 +4377,6 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 // The start, stop and destroy are to be handled by the application.
 void
 TAO_FlowConsumer::stop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4642,7 +4386,6 @@ TAO_FlowConsumer::stop (void)
 
 void
 TAO_FlowConsumer::start (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4657,10 +4400,6 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
                                 char *& flowProtocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToListen,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   return this->go_to_listen_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER,
                                the_qos,
@@ -4673,10 +4412,6 @@ CORBA::Boolean
 TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
                                    const char * use_flow_protocol)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER,
                                   the_qos,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index e71d0896172..27eb4180aa7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -83,60 +83,41 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void stop (const AVStreams::flowSpec &the_spec);
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void start (const AVStreams::flowSpec &the_spec);
 
   /**
    * Tears down the stream. This will close the connection, and delete
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void destroy (const AVStreams::flowSpec &the_spec);
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     const AVStreams::flowSpec &the_spec);
 
   /// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   /// E.g., loss of flow, reestablishment of flow, etc..
-  virtual void push_event (const struct CosPropertyService::Property & the_event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push_event (const struct CosPropertyService::Property & the_event);
 
   /// Used to control the flow protocol parameters.
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::FPError));
+                             const CORBA::Any &fp_settings);
 
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported));
+  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name);
 
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
   virtual void set_flow_connection (const char *flow_name,
-                                    CORBA::Object_ptr flow_connection)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported));
+                                    CORBA::Object_ptr flow_connection);
 
 protected:
 
@@ -169,8 +150,7 @@ class TAO_AV_Export TAO_Negotiator
 {
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                                    const AVStreams::streamQoS &qos_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    const AVStreams::streamQoS &qos_spec);
 };
 
 class TAO_MCastConfigIf;
@@ -226,24 +206,18 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void stop (const AVStreams::flowSpec &the_spec);
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void start (const AVStreams::flowSpec &the_spec);
 
   /**
    * Tears down the stream. This will close the connection, and delete
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void destroy (const AVStreams::flowSpec &the_spec);
 
   /**
    * Establish a stream between a_party and b_party,
@@ -255,11 +229,7 @@ public:
   virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party,
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS& the_qos,
-                                    const AVStreams::flowSpec& the_flows)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                    const AVStreams::flowSpec& the_flows);
 
   /**
    * Establish a connection between two streamendpoints. This can
@@ -269,42 +239,25 @@ public:
   virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party,
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
-                               const AVStreams::flowSpec &the_flows)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed));
+                               const AVStreams::flowSpec &the_flows);
 
   virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow));
+                           const AVStreams::flowSpec & the_spec);
 
   /// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
-                             const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow));
+                             const AVStreams::flowSpec &the_spec);
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed));
+  virtual void unbind (void);
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                                AVStreams::StreamEndPoint_out sep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed));
+                                                AVStreams::StreamEndPoint_out sep);
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     const AVStreams::flowSpec &the_spec);
 
 protected:
 
@@ -351,28 +304,18 @@ public:
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
-                                   const AVStreams::flowSpec & the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                   const AVStreams::flowSpec & the_spec);
 
-  virtual void configure (const CosPropertyService::Property & a_configuration)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void configure (const CosPropertyService::Property & a_configuration);
 
-  virtual void set_initial_configuration (const CosPropertyService::Properties & initial)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_initial_configuration (const CosPropertyService::Properties & initial);
 
   virtual void set_format (const char * flowName,
-                           const char * format_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                           const char * format_name);
 
   virtual void set_dev_params (const char * flowName,
                                const CosPropertyService::Properties & new_params)
-
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException,
-                     AVStreams::streamOpFailed));
+;
 
 protected:
   /// checks whether the flowname is  in the flow_spec.
@@ -520,99 +463,62 @@ public:
   TAO_StreamEndPoint (void);
 
    /// Stop the stream. Empty the_spec means, for all the flows
-  virtual void stop (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void stop (const AVStreams::flowSpec &the_spec);
 
   /// Start the stream, Empty the_spec means, for all the flows
-  virtual void start (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void start (const AVStreams::flowSpec &the_spec);
 
   /// Destroy the stream, Empty the_spec means, for all the flows
-  virtual void destroy (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+  virtual void destroy (const AVStreams::flowSpec &the_spec);
 
   /// Called by StreamCtrl. responder is the peer to connect to
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS& qos_spec,
-                                  const AVStreams::flowSpec& the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                  const AVStreams::flowSpec& the_spec);
 
   /// Called by the peer StreamEndPoint. The flow_spec indicates the
   /// flows (which contain transport addresses etc.)
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
-                                             AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpDenied,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::FPError));
+                                             AVStreams::flowSpec &the_spec);
 
   /// Change the transport qos on a stream
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_flows)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     const AVStreams::flowSpec &the_flows);
 
   virtual int change_qos (AVStreams::streamQoS &new_qos,
                           const AVStreams::flowSpec &the_flows);
 
   /// Used to restrict the set of protocols
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec);
 
   /// disconnect the flows
-  virtual void disconnect (const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::streamOpFailed));
+  virtual void disconnect (const AVStreams::flowSpec &the_spec);
 
   /// Used to control the flow
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::FPError));
+                             const CORBA::Any &fp_settings);
 
   /// Not implemented in the light profile, throws notsupported
-  virtual CORBA::Object_ptr get_fep (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::noSuchFlow));
+  virtual CORBA::Object_ptr get_fep (const char *flow_name);
 
   /// Not implemented in the light profile, throws notsupported
-  virtual char * add_fep (CORBA::Object_ptr the_fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+  virtual char * add_fep (CORBA::Object_ptr the_fep);
 
   /// Not implemented in the light profile, throws notsupported
-  virtual void remove_fep (const char *fep_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+  virtual void remove_fep (const char *fep_name);
 
   /// Used to "attach" a negotiator to the endpoint
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator);
 
   /// Used for public key encryption.
   virtual void set_key (const char *flow_name,
-                        const AVStreams::key & the_key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        const AVStreams::key & the_key);
 
   /// Used to set a unique id for packets sent by this streamendpoint
-  virtual void set_source_id (CORBA::Long source_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_source_id (CORBA::Long source_id);
 
   /// Destructor
   virtual ~TAO_StreamEndPoint (void);
@@ -622,14 +528,8 @@ public:
 
 protected:
   /// Helper methods to implement add_fep()
-  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
-  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep);
+  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep);
 
   /// translate from application level to network level qos.
   int translate_qos (const AVStreams::streamQoS& application_qos,
@@ -690,29 +590,16 @@ public:
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                       AVStreams::flowSpec &the_spec);
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
-                                       const AVStreams::flowSpec &the_flows)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::notSupported));
+                                       const AVStreams::flowSpec &the_flows);
 
   /// Used to remove a multicast leaf
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                const AVStreams::flowSpec &theSpec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported));
+                                const AVStreams::flowSpec &theSpec);
 
   /// Destructor
   virtual ~TAO_StreamEndPoint_A (void);
@@ -739,12 +626,7 @@ public:
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::FPError));
+                                       AVStreams::flowSpec &the_spec);
 
   /// Destructor
   virtual ~TAO_StreamEndPoint_B (void);
@@ -768,47 +650,28 @@ public:
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
-                                   const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                   const AVStreams::flowSpec &the_spec);
 
   /// Used to set the streamctrl and multicast device
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
-                                         const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                         const AVStreams::flowSpec &the_spec);
 
   /// Called by the peer VDev to configure the device (catch all)
-  virtual void configure (const CosPropertyService::Property &the_config_mesg)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException,
-                     AVStreams::streamOpFailed));
+  virtual void configure (const CosPropertyService::Property &the_config_mesg);
 
   /// Used to set a format on a flowname
   virtual void set_format (const char *flowName,
-                           const char *format_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                           const char *format_name);
 
   /// Used to set device parameters
   virtual void set_dev_params (const char *flowName,
-                               const CosPropertyService::Properties &new_params)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException,
-                     AVStreams::streamOpFailed));
+                               const CosPropertyService::Properties &new_params);
 
   /// Called to change QoS of the device
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
-                                     const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     const AVStreams::flowSpec &the_spec);
 
 protected:
   /// Destructor for a servant should be protected or private.
@@ -858,21 +721,13 @@ public:
   virtual AVStreams::StreamCtrl_ptr  bind (AVStreams::MMDevice_ptr peer_device,
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
-                                           const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                           const AVStreams::flowSpec &the_spec);
 
   /// Multicast bind
   virtual AVStreams::StreamCtrl_ptr  bind_mcast (AVStreams::MMDevice_ptr first_peer,
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
-                                                 const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                                 const AVStreams::flowSpec &the_spec);
 
   /// Called by StreamCtrl to create a "A" type streamandpoint and vdev
   virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester,
@@ -880,13 +735,7 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::noSuchFlow));
+                                                     const AVStreams::flowSpec &the_spec);
 
   /// Called by StreamCtrl to create a "B" type streamandpoint and vdev
   virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester,
@@ -894,48 +743,27 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::noSuchFlow));
+                                                     const AVStreams::flowSpec &the_spec);
 
   /// Remove the StreamEndPoint and the related vdev
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                        const char *vdev_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                        const char *vdev_name);
 
   /// Not supported in the light profile, raises notsupported
-  virtual char * add_fdev (CORBA::Object_ptr the_fdev)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+  virtual char * add_fdev (CORBA::Object_ptr the_fdev);
 
   /// Not supported in the light profile, raises notsupported
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::noSuchFlow));
+  virtual CORBA::Object_ptr get_fdev (const char *flow_name);
 
   /// Not supported in the light profile, raises notsupported
-  virtual void remove_fdev (const char *flow_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::noSuchFlow,
-                     AVStreams::streamOpFailed));
+  virtual void remove_fdev (const char *flow_name);
 
   /// Destructor
   virtual ~TAO_MMDevice (void);
 
 protected:
   /// Helper method to implement add_fdev()
-  char* add_fdev_i (AVStreams::FDev_ptr fdev)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::streamOpFailed));
+  char* add_fdev_i (AVStreams::FDev_ptr fdev);
 
 protected:
 
@@ -980,73 +808,48 @@ public:
   TAO_FlowConnection (void);
 
   /// stop this flow.
-  virtual void stop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void stop (void);
 
   /// start this flow.
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
   /// destroy this flow.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// modify the QoS for this flow.
-  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed));
+  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos);
 
   /// use the specified flow protocol for this flow.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::FPError,
-                     AVStreams::notSupported));
+                                            const CORBA::Any & fp_settings);
 
   /// pushes an event , to be handled by the application.
-  virtual void push_event (const AVStreams::streamEvent & the_event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push_event (const AVStreams::streamEvent & the_event);
 
 
   /// connect 2 Flow Devices.
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
-                                       AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::QoSRequestFailed));
+                                       AVStreams::QoS & the_qos);
 
   /// Connect a flow producer and consumer under this flow connection.
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
-                                  AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::formatMismatch,
-                     AVStreams::FEPMismatch,
-                     AVStreams::alreadyConnected));
+                                  AVStreams::QoS & the_qos);
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean disconnect (void);
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
-                                       AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::alreadyConnected,
-                     AVStreams::notSupported));
+                                       AVStreams::QoS & the_qos);
 
   /// adds a consumer to this flow connection.
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
-                                       AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::alreadyConnected));
+                                       AVStreams::QoS & the_qos);
 
   /// drops a flow endpoint from the flow.
-  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notConnected));
+  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target);
 
   int set_mcast_addr (ACE_CString addr,u_short port);
   void set_protocol (const char *protocol);
@@ -1104,86 +907,58 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean lock (void);
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void unlock (void);
 
 
   /// destroy this flow.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual AVStreams::StreamEndPoint_ptr related_sep(void);
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep);
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual AVStreams::FlowConnection_ptr related_flow_connection(void);
 
   // accessor for the related flow connection attribute.
 
   /// set method for the related flow connection attribute.
-  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection);
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notConnected,
-                     AVStreams::notSupported));
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void);
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::FPError,
-                     AVStreams::notSupported));
+                                            const CORBA::Any & fp_settings);
 
   /// sets the data format.
-  virtual void set_format (const char * format)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+  virtual void set_format (const char * format);
 
   /// sets the device parameters.
-  virtual void set_dev_params (const CosPropertyService::Properties & new_settings)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException,
-                     AVStreams::streamOpFailed));
+  virtual void set_dev_params (const CosPropertyService::Properties & new_settings);
 
   /// sets the list of protocols to be used.
-  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec);
 
   /// checks whether the passed flowendpoint is compatible with this.
-  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::formatMismatch,
-                     AVStreams::deviceQosMismatch));
+  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep);
 
   /// sets the peer flowendpoint.
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
-                                   AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                   AVStreams::QoS & the_qos);
 
   /// sets the multicast peer flowendpoint, not implemented.
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
-                                         AVStreams::QoS & the_qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed));
+                                         AVStreams::QoS & the_qos);
 
 
   /**
@@ -1194,20 +969,13 @@ public:
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
                                           const char * use_flow_protocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed)) = 0;
+    = 0;
 
   /// connect to the peer endpoint.
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                             AVStreams::QoS & the_qos,
                                             const char * address,
-                                            const char * use_flow_protocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                            const char * use_flow_protocol);
 
   /**
    * This should be implemented in both the FlowProducer and consumer and hence is
@@ -1218,21 +986,14 @@ public:
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
                                char *& flowProtocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToListen,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed)) = 0;
+    = 0;
 
   /// listen request from the peer.
   virtual char * go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                  AVStreams::QoS & the_qos,
                                  CORBA::Boolean is_mcast,
                                  AVStreams::FlowEndPoint_ptr peer,
-                                 char *& flowProtocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToListen,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                 char *& flowProtocol);
 
 
 protected:
@@ -1283,55 +1044,37 @@ public:
    * UDP if the producer is listening and the consumer connects (logically) then the producer needs to
    * know the reverse channel on its peer fep to send data to.
    */
-  virtual char * get_rev_channel (const char * pcol_name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_rev_channel (const char * pcol_name);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void stop (void);
 
   /// start this flow, to be overridden by the application.
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToListen,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                               char *& flowProtocol);
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                          const char * use_flow_protocol);
 
   /// connect to the multicast address, not implemented.
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
-                                const char * use_flow_protocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::notSupported,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                const char * use_flow_protocol);
 
 
 
   /// sets the public key  to be used for encryption of the data.
-  virtual void set_key (const AVStreams::key & the_key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_key (const AVStreams::key & the_key);
 
   /// sets the source id of this flow producer so that it can be used
   /// to distinguish this producer from others in the multicast case.
-  virtual void set_source_id (CORBA::Long source_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_source_id (CORBA::Long source_id);
 
 protected:
   /// source id of this producer.
@@ -1352,29 +1095,19 @@ public:
                     const char *format);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void stop (void);
 
   /// start this flow, to be overridden by the application.
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToListen,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                               char *& flowProtocol);
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                          const char * use_flow_protocol);
 };
 
 /**
@@ -1393,29 +1126,22 @@ public:
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
                                                   AVStreams::PositionKey a_key)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::MediaControl::PostionKeyNotSupported)) =0;
+    =0;
 
   virtual void set_media_position (const AVStreams::Position & a_position)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::MediaControl::PostionKeyNotSupported,
-                     AVStreams::InvalidPosition)) =0;
+    =0;
 
   virtual void start (const AVStreams::Position & a_position)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+    =0;
 
   virtual void pause (const AVStreams::Position & a_position)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+    =0;
 
   virtual void resume (const AVStreams::Position & a_position)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+    =0;
 
   virtual void stop (const AVStreams::Position & a_position)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+    =0;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 97019baa2b0..a0f14fac5ef 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -1,18 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Endpoint_Strategy.cpp
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Endpoint_Strategy.cpp
+ *
+ *  $Id$
+ *
+ *  @author Sumedh Mungee <sumedh@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index da2f6835561..e7d1f5ec94c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -477,7 +477,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void)
 
         ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_);
         inet_addr->addr_to_string (buf,BUFSIZ);
-        ACE_CString cstring (buf, 0, 0);
+        ACE_CString cstring (buf, 0, false);
 
         return cstring.rep ();
       }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 19c338b876f..2537084feb1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -72,11 +72,6 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
                                                    char *& named_fdev)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed))
 {
   // call the bridge method.
   return this->make_producer (the_requester,
@@ -142,11 +137,6 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
                                                    char *& named_fdev)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed))
 {
   return this->make_consumer (the_requester,
                               the_qos,
@@ -160,9 +150,6 @@ AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
                                         AVStreams::QoS & the_qos,
                                         CORBA::Boolean_out is_met)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (peer_device);
   ACE_UNUSED_ARG (the_qos);
@@ -176,9 +163,6 @@ AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
                                               AVStreams::QoS & the_qos,
                                               CORBA::Boolean_out is_met)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
@@ -190,8 +174,6 @@ template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
                                            const char * /* fdev_name */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   // @@ Shouldn't the parameters be made use of!
   // Destroy/delete all the producers and consumers.
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index d600e9d1a32..7ceecd16b24 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -47,12 +47,7 @@ public:
   AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed));
+                                                       char *& named_fdev);
 
   /// bridge method for the application to override the producer object
   /// creation. Default implementation creates a TAO_FlowProducer.
@@ -65,12 +60,7 @@ public:
   virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed));
+                                                       char *& named_fdev);
 
   /// bridge method for the application to override the consumer object
   /// creation. Default implementation creates a TAO_FlowConsumer.
@@ -82,24 +72,16 @@ public:
   /// bind this FDev with another FDev.
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::QoSRequestFailed));
+                                              CORBA::Boolean_out is_met);
 
   /// multicast bind is not implemented yet.
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
-                                                    CORBA::Boolean_out is_met)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::QoSRequestFailed));
+                                                    CORBA::Boolean_out is_met);
 
   /// destroys this FDev.
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
-                        const char * fdev_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                        const char * fdev_name);
 
 protected:
   ACE_DLList <TAO_FlowProducer> producer_list_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index 6eb2d8d8af5..3e56ef3695c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -1,18 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS AVStreams
-//
-// = FILENAME
-//   UDP.h
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   QoS_UDP.h
+ *
+ *  $Id$
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_AV_QOS_UDP_H
 #define TAO_AV_QOS_UDP_H
@@ -39,7 +36,7 @@ public:
   TAO_AV_UDP_QoS_Factory (void);
   virtual ~TAO_AV_UDP_QoS_Factory (void);
   virtual int init (int argc, char *argv[]);
-  // Initialization hook.
+  /// Initialization hook.
   virtual int match_protocol (const char *protocol_string);
   virtual TAO_AV_Acceptor *make_acceptor (void);
   virtual TAO_AV_Connector *make_connector (void);
@@ -115,8 +112,10 @@ class TAO_AV_UDP_QoS_Flow_Handler
 {
 public:
   /// Constructor.
+  /**
+   * Destructor
+   */
   TAO_AV_UDP_QoS_Flow_Handler (void);
-  /// Destructor.
   ~TAO_AV_UDP_QoS_Flow_Handler (void);
   int open (ACE_Addr &address);
   virtual TAO_AV_Transport *transport (void);
@@ -257,7 +256,7 @@ public:
   TAO_AV_UDP_QoS_Flow_Factory (void);
   virtual ~TAO_AV_UDP_QoS_Flow_Factory (void);
   virtual int init (int argc, char *argv[]);
-  // Initialization hook.
+  /// Initialization hook.
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
                                                 TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 8ef82e30bb3..6bcfea4031d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -25,7 +25,7 @@ RTCP_Packet::RTCP_Packet(char* buffer)
   this->chd_.pad_ = (buffer[0] & 0x20) >> 5;
   this->chd_.count_ = buffer[0] & 0x1F;
   this->chd_.pt_ = buffer[1];
-  this->chd_.length_ = ntohs(*(ACE_UINT16*)&buffer[2]);
+  this->chd_.length_ = ACE_NTOHS(*(ACE_UINT16*)&buffer[2]);
   this->packet_data_ = 0;
 }
 
@@ -130,7 +130,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len)
   // Store the source ids of the sources leaving the session
   for (j=0; j<this->chd_.count_; j++)
     {
-      this->ssrc_list_[j] = ntohl(*(ACE_UINT32*)&buffer[index]);
+      this->ssrc_list_[j] = ACE_NTOHL(*(ACE_UINT32*)&buffer[index]);
       index+=4;
     }
 
@@ -223,12 +223,12 @@ RTCP_BYE_Packet::build_packet(void)
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
-  *((ACE_UINT16*)&this->packet_data_[index]) = htons(this->chd_.length_);
+  *((ACE_UINT16*)&this->packet_data_[index]) = ACE_HTONS(this->chd_.length_);
   index+=2;
 
   for (i=0; i<this->chd_.count_; i++)
     {
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->ssrc_list_[i]);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->ssrc_list_[i]);
       index+=4;
     }
 
@@ -302,7 +302,7 @@ RTCP_RR_Packet::RTCP_RR_Packet (char* buffer,
 
   // The common part of the header is initialized in the parent.
   i=4;
-  this->ssrc_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->ssrc_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
   for (unsigned int j=0; j<this->chd_.count_; j++)
     {
@@ -320,19 +320,19 @@ RTCP_RR_Packet::RTCP_RR_Packet (char* buffer,
         }
 
       local_block_ptr->next_ = 0;
-      local_block_ptr->ssrc_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->ssrc_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      ACE_UINT32 temp = ntohl(*(ACE_UINT32*)&buffer[i]);
+      ACE_UINT32 temp = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       local_block_ptr->fraction_ = (temp&0xff000000) >> 24;
       local_block_ptr->lost_ = temp & 0x00ffffff;
       i+=4;
-      local_block_ptr->last_seq_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->last_seq_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->jitter_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->jitter_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->lsr_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->lsr_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->dlsr_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->dlsr_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
     }
 
@@ -391,27 +391,27 @@ RTCP_RR_Packet::build_packet(void)
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
-  *((ACE_UINT16*)&this->packet_data_[index]) = htons(chd_.length_);
+  *((ACE_UINT16*)&this->packet_data_[index]) = ACE_HTONS(chd_.length_);
   index+=2;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->ssrc_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->ssrc_);
   index+=4;
 
   local_block_ptr = this->rr_;
   while (local_block_ptr)
     {
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->ssrc_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->ssrc_);
       index+=4;
-      ACE_UINT32 temp = htonl((local_block_ptr->fraction_&0xff) << 24) &
+      ACE_UINT32 temp = ACE_HTONL((local_block_ptr->fraction_&0xff) << 24) &
                               local_block_ptr->lost_;
       *((ACE_UINT32*)&this->packet_data_[index]) = temp;
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->last_seq_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->last_seq_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->jitter_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->jitter_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->lsr_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->lsr_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->dlsr_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->dlsr_);
       index+=4;
       local_block_ptr = local_block_ptr->next_;
     }
@@ -492,7 +492,7 @@ RTCP_SDES_Packet::RTCP_SDES_Packet(char* buffer, int *len):
         }
       cp->next_ = 0;
       cp->item_ = 0;
-      cp->ssrc_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      cp->ssrc_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
 
       while (buffer[i]!=RTCP_SDES_END)
@@ -835,13 +835,13 @@ RTCP_SDES_Packet::build_packet(void)
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
-  *((ACE_UINT16*)&this->packet_data_[index]) = htons(chd_.length_);
+  *((ACE_UINT16*)&this->packet_data_[index]) = ACE_HTONS(chd_.length_);
   index+=2;
 
   cp = this->chunk_;
   while (cp)
     {
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(cp->ssrc_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(cp->ssrc_);
       index+=4;
 
       ip = cp->item_;
@@ -1035,17 +1035,17 @@ RTCP_SR_Packet::RTCP_SR_Packet (char* buffer,
 
   // The common part of the header is initialized in the parent.
   i=4;
-  this->ssrc_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->ssrc_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
-  this->ntp_ts_msw_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->ntp_ts_msw_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
-  this->ntp_ts_lsw_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->ntp_ts_lsw_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
-  this->rtp_ts_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->rtp_ts_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
-  this->psent_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->psent_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
-  this->osent_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+  this->osent_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
   i+=4;
   for (unsigned int j=0; j<this->chd_.count_; j++)
     {
@@ -1063,19 +1063,19 @@ RTCP_SR_Packet::RTCP_SR_Packet (char* buffer,
         }
 
       local_block_ptr->next_ = 0;
-      local_block_ptr->ssrc_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->ssrc_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      ACE_UINT32 temp = ntohl(*(ACE_UINT32*)&buffer[i]);
+      ACE_UINT32 temp = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       local_block_ptr->fraction_ = (temp&0xff000000) >> 24;
       local_block_ptr->lost_ = temp & 0x00ffffff;
       i+=4;
-      local_block_ptr->last_seq_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->last_seq_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->jitter_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->jitter_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->lsr_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->lsr_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
-      local_block_ptr->dlsr_ = ntohl(*(ACE_UINT32*)&buffer[i]);
+      local_block_ptr->dlsr_ = ACE_NTOHL(*(ACE_UINT32*)&buffer[i]);
       i+=4;
     }
 
@@ -1133,37 +1133,37 @@ void RTCP_SR_Packet::build_packet(void)
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
-  *((ACE_UINT16*)&this->packet_data_[index]) = htons(this->chd_.length_);
+  *((ACE_UINT16*)&this->packet_data_[index]) = ACE_HTONS(this->chd_.length_);
   index+=2;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->ssrc_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->ssrc_);
   index+=4;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->ntp_ts_msw_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->ntp_ts_msw_);
   index+=4;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->ntp_ts_lsw_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->ntp_ts_lsw_);
   index+=4;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->rtp_ts_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->rtp_ts_);
   index+=4;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->psent_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->psent_);
   index+=4;
-  *((ACE_UINT32*)&this->packet_data_[index]) = htonl(this->osent_);
+  *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(this->osent_);
   index+=4;
 
   local_block_ptr = this->rr_;
   while (local_block_ptr)
     {
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->ssrc_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->ssrc_);
       index+=4;
-      ACE_UINT32 temp = htonl((local_block_ptr->fraction_&0xff) << 24) &
+      ACE_UINT32 temp = ACE_HTONL((local_block_ptr->fraction_&0xff) << 24) &
                               local_block_ptr->lost_;
       *((ACE_UINT32*)&this->packet_data_[index]) = temp;
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->last_seq_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->last_seq_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->jitter_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->jitter_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->lsr_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->lsr_);
       index+=4;
-      *((ACE_UINT32*)&this->packet_data_[index]) = htonl(local_block_ptr->dlsr_);
+      *((ACE_UINT32*)&this->packet_data_[index]) = ACE_HTONL(local_block_ptr->dlsr_);
       index+=4;
       local_block_ptr = local_block_ptr->next_;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 2185c7146c7..308bcd713f7 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -13,14 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   target_->push (events);
 }
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   target_->disconnect_push_consumer ();
@@ -28,7 +26,6 @@ ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ()
 
 template<class TARGET> void
 ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ()
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   target_->disconnect_push_supplier ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 5f5a0b217ae..8c964a92548 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -1,26 +1,23 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Channel_Clients_T
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu) and
-//    Douglas Schmidt (schmidt@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    These classes allow applications to be consumer, suppliers, and
-//    consumer suppliers, as well as being active objects.  This is
-//    accomplished with adapters to prevent the use of multiple
-//    inheritence (which is this root of all evil.)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Channel_Clients_T.h
+ *
+ *  $Id$
+ *
+ *  @author Tim Harrison (harrison@cs.wustl.edu) and Douglas Schmidt (schmidt@cs.wustl.edu)
+ *
+ *  These classes allow applications to be consumer, suppliers, and
+ *  consumer suppliers, as well as being active objects.  This is
+ *  accomplished with adapters to prevent the use of multiple
+ *  inheritence (which is this root of all evil.)
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef ACE_CHANNEL_CLIENTS_T_H
 #define ACE_CHANNEL_CLIENTS_T_H
@@ -45,12 +42,10 @@ public:
   ACE_PushConsumer_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
 
   /// Forwards to target_.
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
 
 private:
   TARGET *target_;
@@ -73,8 +68,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 private:
   TARGET *target_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index b1c0dc9822a..c826c2bbebe 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -75,8 +75,7 @@ CC_Lock::try_lock (void)
           return 0;
         }
       else
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          0);
+        throw CORBA::INTERNAL ();
     }
   ACE_DEBUG ((LM_DEBUG,
               "lock_held_: %i, ",
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 2a35c3b7c6c..b49c3bf386e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   CC_LockSet.cpp
-//
-// = AUTHOR
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   CC_LockSet.cpp
+ *
+ *  $Id$
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Concurrency/CC_LockSet.h"
 
@@ -92,7 +89,6 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 
 void
 CC_LockSet::lock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
 
@@ -112,7 +108,6 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode)
 
 CORBA::Boolean
 CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
 
@@ -152,8 +147,6 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 
 void
 CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld))
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_LockSet::unlock\n"));
@@ -196,8 +189,6 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode)
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
                          CosConcurrencyControl::lock_mode new_mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld))
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_LockSet::change_mode\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index b38884f9ae8..6ba6b207376 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -92,24 +92,18 @@ public:
 
   // = CosConcurrencyControl methods
   /// Acquires this lock. Blocks until lock is obtained
-  virtual void lock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void lock (CosConcurrencyControl::lock_mode mode);
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode);
 
   /// Releases this lock.
-  virtual void unlock (CosConcurrencyControl::lock_mode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld));
+  virtual void unlock (CosConcurrencyControl::lock_mode mode);
 
   /// Changes the mode of this lock.
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-                            CosConcurrencyControl::lock_mode new_mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld));
+                            CosConcurrencyControl::lock_mode new_mode);
 
   // = Debugging methods
   /// Dump the state of the object to stdout
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 092216de5ef..9b7f29ca0e6 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -28,7 +28,6 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
 
@@ -43,7 +42,6 @@ CC_LockSetFactory::create (void)
 
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index a1d1fbd238a..42e2e4184ab 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -47,12 +47,10 @@ public:
   /// Destructor.
   ~CC_LockSetFactory (void);
 
-  virtual CosConcurrencyControl::LockSet_ptr create ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosConcurrencyControl::LockSet_ptr create ();
 
   virtual CosConcurrencyControl::LockSet_ptr create_related (
-      CosConcurrencyControl::LockSet_ptr which)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosConcurrencyControl::LockSet_ptr which);
 
 private:
   /// Lock to serialize the access to the factory.
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 5a008bc1d59..8220dcb8478 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -35,7 +35,7 @@ TAO_Concurrency_Loader::init (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0);
+        CORBA::ORB_init (argc, argv);
 
       // This function call initializes the Concurrency Service
       CORBA::Object_var object =
@@ -61,7 +61,6 @@ CORBA::Object_ptr
 TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
                                        int /* argc */,
                                        char * /* argv */ [])
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 56d900178d1..302c7cfd25e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -50,8 +50,7 @@ public:
   /// This function call initializes the Concurrency Service given a
   /// reference to the ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                   int argc, char *argv[]);
 
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 02f47b5c48b..887b373af45 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -89,14 +89,12 @@ TAO_CEC_ConsumerAdmin::shutdown (void)
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_ConsumerAdmin::obtain_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pull_admin_.obtain ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 3f85a431cb5..24f70ef42d3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -83,11 +83,9 @@ public:
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_supplier (void);
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_pull_supplier (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index f5ae3599809..96a058330cc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -22,7 +22,6 @@ TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
 // The DSI invoke request
 void
 TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Trap the _is_a request
   if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0)
@@ -67,7 +66,6 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request)
 CORBA::RepositoryId
 TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::ObjectId &,
                                                          PortableServer::POA_ptr)
-  ACE_THROW_SPEC (())
 {
   return CORBA::string_dup (repository_id_);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index dbaf7a259b7..e4e0257a061 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -42,17 +42,13 @@ public:
   virtual ~TAO_CEC_DynamicImplementationServer (void);
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke (CORBA::ServerRequest_ptr request);
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-    )
-      ACE_THROW_SPEC (());
+      PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA (void);
 
   // Handles the _is_a call
   virtual void is_a (CORBA::ServerRequest_ptr request);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 3decba50304..dfdf410281a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -181,21 +181,18 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier)
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_CEC_EventChannel::for_consumers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->consumer_admin_->_this ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_CEC_EventChannel::for_suppliers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->supplier_admin_->_this ();
 }
 
 void
 TAO_CEC_EventChannel::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index d26f2731cea..3154f1c4fde 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -231,18 +231,15 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_consumers (void);
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_suppliers (void);
 
   /// Commit suicide.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   ServantRetryMap& get_servant_retry_map (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index e2259d6df85..e8f7e35a480 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -82,7 +82,6 @@ CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                      int argc,
                                      ACE_TCHAR *argv[])
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 4af10142439..81e5490e03a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -59,8 +59,7 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 53a57550bd7..de916724b81 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -45,7 +45,6 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 void
 TAO_CEC_ProxyPullConsumer::activate (
     CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
   try
@@ -61,7 +60,6 @@ TAO_CEC_ProxyPullConsumer::activate (
 
 void
 TAO_CEC_ProxyPullConsumer::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -259,8 +257,6 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
       CosEventComm::PullSupplier_ptr pull_supplier)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected))
 {
   // Nil PullSuppliers are illegal
   if (CORBA::is_nil (pull_supplier))
@@ -334,7 +330,6 @@ TAO_CEC_ProxyPullConsumer::apply_policy (CosEventComm::PullSupplier_ptr pre)
 
 void
 TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullSupplier_var supplier;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 4ef91c2091b..aad8a9365cd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -58,12 +58,10 @@ public:
 
   /// Activate in the POA
   virtual void  activate (
-      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deactivate (void);
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -92,11 +90,8 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
-                CosEventComm::PullSupplier_ptr pull_supplier)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_pull_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                CosEventComm::PullSupplier_ptr pull_supplier);
+  virtual void disconnect_pull_consumer (void);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 8098635c66e..5863632eeab 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -44,7 +44,6 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 void
 TAO_CEC_ProxyPullSupplier::activate (
     CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
   try
@@ -60,7 +59,6 @@ TAO_CEC_ProxyPullSupplier::activate (
 
 void
 TAO_CEC_ProxyPullSupplier::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -157,11 +155,9 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event)
 
 CORBA::Any *
 TAO_CEC_ProxyPullSupplier::pull (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventComm::Disconnected))
 {
   if (this->is_connected () == 0)
-    ACE_THROW_RETURN (CosEventComm::Disconnected (), 0);
+    throw CosEventComm::Disconnected ();
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, queue_lock_, 0);
   while (this->queue_.is_empty ())
@@ -171,18 +167,17 @@ TAO_CEC_ProxyPullSupplier::pull (void)
   CORBA::Any any;
   if (this->queue_.dequeue_head (any) != 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
   return new CORBA::Any (any);
 }
 
 CORBA::Any *
 TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event)
-      ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   has_event = 0;
   if (this->is_connected () == 0)
-    ACE_THROW_RETURN (CosEventComm::Disconnected (), 0);
+    throw CosEventComm::Disconnected ();
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, queue_lock_, 0);
   CORBA::Any any;
@@ -194,7 +189,7 @@ TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event)
 
   if (this->queue_.dequeue_head (any) != 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
   has_event = 1;
   return new CORBA::Any (any);
@@ -233,8 +228,6 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
       CosEventComm::PullConsumer_ptr pull_consumer)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -304,7 +297,6 @@ TAO_CEC_ProxyPullSupplier::apply_policy (CosEventComm::PullConsumer_ptr pre)
 
 void
 TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullConsumer_var consumer;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 534549e1859..159be9c7807 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -65,12 +65,10 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deactivate (void);
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -98,15 +96,10 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
-                CosEventComm::PullConsumer_ptr pull_consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
-  virtual CORBA::Any * pull (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event)
-      ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                CosEventComm::PullConsumer_ptr pull_consumer);
+  virtual CORBA::Any * pull (void);
+  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event);
+  virtual void disconnect_pull_supplier (void);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index 6fad8240c31..57d981a8c27 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -45,7 +45,6 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 void
 TAO_CEC_ProxyPushConsumer::activate (
     CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var result;
   try
@@ -61,7 +60,6 @@ TAO_CEC_ProxyPushConsumer::activate (
 
 void
 TAO_CEC_ProxyPushConsumer::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -174,8 +172,6 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPushConsumer::connect_push_supplier (
       CosEventComm::PushSupplier_ptr push_supplier)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -247,7 +243,6 @@ TAO_CEC_ProxyPushConsumer::apply_policy (CosEventComm::PushSupplier_ptr pre)
 
 void
 TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                            this->refcount_,
@@ -261,7 +256,6 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event)
 
 void
 TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 9ea04838f5d..3bf07075cd9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -60,12 +60,10 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deactivate (void);
 
   /// Return false if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -90,13 +88,9 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
-  virtual void push (const CORBA::Any& event)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                CosEventComm::PushSupplier_ptr push_supplier);
+  virtual void push (const CORBA::Any& event);
+  virtual void disconnect_push_consumer (void);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index cab237cbb77..4e964d3c8e7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -98,7 +98,6 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 void
 TAO_CEC_ProxyPushSupplier::activate (
     CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var result;
   try
@@ -114,7 +113,6 @@ TAO_CEC_ProxyPushSupplier::activate (
 
 void
 TAO_CEC_ProxyPushSupplier::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -330,9 +328,6 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPushSupplier::connect_push_consumer (
       CosEventComm::PushConsumer_ptr push_consumer)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected,
-                     CosEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
@@ -512,7 +507,6 @@ TAO_CEC_ProxyPushSupplier::apply_policy
 
 void
 TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushConsumer_var consumer;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index a5f7531a37b..606bd52b2e5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -76,12 +76,10 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushSupplier_ptr &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosEventChannelAdmin::ProxyPushSupplier_ptr &);
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deactivate (void);
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -122,12 +120,8 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
-                CosEventComm::PushConsumer_ptr push_consumer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected,
-                       CosEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                CosEventComm::PushConsumer_ptr push_consumer);
+  virtual void disconnect_push_supplier (void);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index a0c900ff46a..1f77e5ecdba 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -82,14 +82,12 @@ TAO_CEC_SupplierAdmin::shutdown (void)
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CEC_SupplierAdmin::obtain_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_SupplierAdmin::obtain_pull_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pull_admin_.obtain ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 8712301644f..c189bcc064c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -81,11 +81,9 @@ public:
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_consumer (void);
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_pull_consumer (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 1b369165694..17086f22b0c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -29,7 +29,6 @@ TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void)
 
 void
 TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_Propagate_Typed_Event typed_event_worker (typed_event, this->typed_event_channel_);
 
@@ -64,22 +63,14 @@ CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
     const char * /*supported_interface*/
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosTypedEventChannelAdmin::InterfaceNotSupported
-  ))
 {
-  ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (), 0);
+  throw CosTypedEventChannelAdmin::InterfaceNotSupported ();
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
     const char * uses_interface
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosTypedEventChannelAdmin::NoSuchImplementation
-  ))
 
 {
   // Register the consumer uses_interface with the EC
@@ -87,7 +78,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
   if (result == -1)
     {
-      ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
+      throw CosTypedEventChannelAdmin::NoSuchImplementation ();
     }
 
   return this->typed_push_admin_.obtain ();
@@ -95,16 +86,14 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
 }
 
 PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 45b8002f12b..7c39f234645 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -49,8 +49,7 @@ public:
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
 
   /// Invoke the typed event on all the consumers
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
@@ -64,22 +63,16 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_typed_push_supplier (const char * uses_interface)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosTypedEventChannelAdmin::NoSuchImplementation));
+    obtain_typed_push_supplier (const char * uses_interface);
   virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
-    obtain_typed_pull_supplier (const char * supported_interface)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosTypedEventChannelAdmin::InterfaceNotSupported));
+    obtain_typed_pull_supplier (const char * supported_interface);
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_push_supplier (void);
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_pull_supplier (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index aa0da5850e8..f3f41ddcd7c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -526,21 +526,18 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count,
 // The CosTypedEventChannelAdmin::TypedEventChannel methods...
 CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
 TAO_CEC_TypedEventChannel::for_consumers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->typed_consumer_admin_->_this ();
 }
 
 CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
 TAO_CEC_TypedEventChannel::for_suppliers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->typed_supplier_admin_->_this ();
 }
 
 void
 TAO_CEC_TypedEventChannel::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!destroyed_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 10cf213a0fd..be8c2d6d59f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -247,15 +247,12 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedEventChannel methods...
   virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-    for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (void);
 
   virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-    for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   ServantRetryMap& get_servant_retry_map (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
index ec52c543383..51680d76464 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
@@ -164,7 +164,7 @@ TAO_CEC_TypedEventChannel::supported_interface (void) const
 ACE_INLINE CORBA::RepositoryId
 TAO_CEC_TypedEventChannel::base_interfaces (CORBA::ULong index) const
 {
-  return const_cast <CORBA::RepositoryId>(this->base_interfaces_[index]);
+  return const_cast <CORBA::RepositoryId>(this->base_interfaces_[index].in ());
 }
 
 ACE_INLINE CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 44490753e28..97110286488 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -74,7 +74,6 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 void
 TAO_CEC_TypedProxyPushConsumer::activate (
     CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result;
   try
@@ -90,7 +89,6 @@ TAO_CEC_TypedProxyPushConsumer::activate (
 
 void
 TAO_CEC_TypedProxyPushConsumer::deactivate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -204,8 +202,6 @@ TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void)
 void
 TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
       CosEventComm::PushSupplier_ptr push_supplier)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -275,14 +271,12 @@ TAO_CEC_TypedProxyPushConsumer::apply_policy
 
 void
 TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -340,7 +334,6 @@ TAO_CEC_TypedProxyPushConsumer::_remove_ref (void)
 
 CORBA::Object_ptr
 TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   CORBA::Object_var server =
@@ -351,7 +344,6 @@ TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
 
 void
 TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_TypedProxyPushConsumer_Guard ace_mon (this->lock_,
                                                 this->refcount_,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 6f8b2e53b07..547df4ccbfd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -51,12 +51,10 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void deactivate (void);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -74,23 +72,17 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
+                CosEventComm::PushSupplier_ptr push_supplier);
 
-  virtual void push (const CORBA::Any& event)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const CORBA::Any& event);
 
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
   virtual CORBA::Object_ptr get_typed_consumer (
-    )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index d1e7bd34c1a..0f075e4bef4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -58,17 +58,13 @@ CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
     const char * supported_interface
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosTypedEventChannelAdmin::InterfaceNotSupported
-  ))
 
 {
   int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface);
 
   if (result == -1)
     {
-      ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (),0);
+      throw CosTypedEventChannelAdmin::InterfaceNotSupported ();
     }
 
   return this->typed_push_admin_.obtain ();
@@ -78,27 +74,21 @@ CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
     const char * /* uses_interface */
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosTypedEventChannelAdmin::NoSuchImplementation
-  ))
 
 {
-  ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
+  throw CosTypedEventChannelAdmin::NoSuchImplementation ();
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index a804e384981..7a12d3e759a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -57,23 +57,17 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
-    obtain_typed_push_consumer (const char * supported_interface)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosTypedEventChannelAdmin::InterfaceNotSupported));
+    obtain_typed_push_consumer (const char * supported_interface);
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_typed_pull_consumer (const char * uses_interface)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosTypedEventChannelAdmin::NoSuchImplementation));
+    obtain_typed_pull_consumer (const char * uses_interface);
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_push_consumer (void);
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_pull_consumer (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.idl b/TAO/orbsvcs/orbsvcs/CosNaming.idl
index 5b0237d6443..2587ab26e56 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.idl
@@ -196,10 +196,10 @@ module CosNaming
 
       // = Listing the naming context.
 
-      /// Returns at most the requested number of bindings <how_many>
-      /// in <bl>.  If the naming context contains additional bindings,
+      /// Returns at most the requested number of bindings @a how_many
+      /// in @a bl.  If the naming context contains additional bindings,
       /// they are returned with a BindingIterator.  In the naming
-      /// context does not contain any additional bindings <bi>
+      /// context does not contain any additional bindings @a bi
       /// returned as null.
       void list (in unsigned long how_many,
                  out BindingList bl,
@@ -233,10 +233,10 @@ module CosNaming
       /// Stringified form of a Name.
       typedef string StringName;
 
-      /// URL<address> such as myhost.xyz.com.
+      /// URL address such as myhost.xyz.com.
       typedef string Address;
 
-      /// Stringified form of a URL<address> componoent.
+      /// Stringified form of a URL address componoent.
       typedef string URLString;
 
       /// This operation accepts a Name and returns a stringified
@@ -252,7 +252,7 @@ module CosNaming
       Name to_name (in StringName sn)
         raises (InvalidName);
 
-      /// Indicates that the URL<address> is invalid.
+      /// Indicates that the URL address is invalid.
       exception InvalidAddress {
       };
 
@@ -263,7 +263,7 @@ module CosNaming
                         in StringName sn)
         raises (InvalidAddress, InvalidName);
 
-      /// This is similar to <resolve> as in the
+      /// This is similar to @c resolve as in the
       /// CosNaming::NamingContext interface, except that it accepts
       /// a stringified name as an argument instead of a Name.
       Object resolve_str (in StringName n)
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 8e95a22a71e..2aed24d98bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -3,7 +3,6 @@
 // $Id$
 
 project(CosNaming_Serv) : orbsvcslib, install, 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
   tagchecks   += Naming
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index a51b175716f..040c44d4abf 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -9,8 +9,6 @@
 #include "orbsvcs/ESF/ESF_Copy_On_Write.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "tao/Environment.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
@@ -25,7 +23,7 @@ TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   {
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return this->refcount_;
   }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 9388b45d74c..eb3aee99749 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -68,7 +68,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   while (this->busy_count_ >= this->busy_hwm_
          || this->write_delay_count_ >= this->max_write_delay_)
     this->busy_cond_.wait ();
-  this->busy_count_++;
+  ++this->busy_count_;
 
   return 0;
 }
@@ -79,7 +79,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
 
-  this->busy_count_--;
+  --this->busy_count_;
   if (this->busy_count_ == 0)
     {
       this->write_delay_count_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 96b47940659..479b7c21c39 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -16,13 +16,10 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                            *static_cast<CORBA::Environment*> (arg));
       this->target_->connected_i (this->object_);
     }
   else
     {
-      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->connected_i (this->object_);
     }
 
@@ -36,13 +33,10 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *static_cast<CORBA::Environment*> (arg));
       this->target_->reconnected_i (this->object_);
     }
   else
     {
-      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->reconnected_i (this->object_);
     }
   return 0;
@@ -55,13 +49,10 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *static_cast<CORBA::Environment*> (arg));
       this->target_->disconnected_i (this->object_);
     }
   else
     {
-      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->disconnected_i (this->object_);
     }
   return 0;
@@ -74,13 +65,10 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
 {
   if (arg != 0)
     {
-      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *static_cast<CORBA::Environment*> (arg));
       this->target_->shutdown_i ();
     }
   else
     {
-      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->shutdown_i ();
     }
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 474ccde8989..29aa2402b68 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -23,7 +23,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_connected (PEER *peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
@@ -33,7 +32,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_reconnected (PEER *peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
@@ -43,7 +41,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_disconnected (PEER *peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 5e1c81f3194..1333f171dc3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -69,8 +69,7 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void peer_connected (PEER *peer)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void peer_connected (PEER *peer);
 
   /**
    * A <peer> has reconnected, i.e. its client has invoked the
@@ -78,16 +77,14 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void peer_reconnected (PEER *peer)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void peer_reconnected (PEER *peer);
 
   /**
    * A <peer> has been disconnected. The default implementation
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void peer_disconnected (PEER *peer)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void peer_disconnected (PEER *peer);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 6c842836abc..e5952ed3a96 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -29,7 +29,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     obtain (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
   this->event_channel_->create_proxy (proxy);
@@ -49,7 +48,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
@@ -62,14 +60,12 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     connected (PROXY *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     reconnected (PROXY *proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->collection_->reconnected (proxy);
 }
@@ -77,7 +73,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     disconnected (PROXY *proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy->deactivate ();
 // Cannot happen, just following the discipline.
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index e16e340bb1c..7522fb6ad9f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -32,32 +32,32 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * The EVENT_CHANNEL interface must implement:
  *
  * @verbatim
+ * /// create a new proxy
  * void create_proxy (PROXY*&);
- * // create a new proxy
  *
+ * /// destroy a proxy
  * void destroy_proxy (PROXY*);
- * // destroy a proxy
  *
+ * /// create a proxy collection
  * void create_proxy_collection (TAO_ESF_Proxy_Collection<PROXY>*&);
- * // create a proxy collection
  *
+ * /// destroy a proxy collection
  * void destroy_proxy_collection (TAO_ESF_Proxy_Collection<PROXY>*&);
- * // destroy a proxy collection
  * @endverbatim
  *
  * In addition to the requirements imposed by
  * TAO_ESF_Proxy_Collection<>, the PROXY interface must define:
  *
  * @verbatim
+ * /// The T_ptr for the IDL interface implemented by the PROXY.
  * typename .... _ptr_type;
- * // The T_ptr for the IDL interface implemented by the PROXY.
  *
+ * /// The T_var for the IDL interface implemented by the PROXY.
  * typename .... _var_type;
- * // The T_var for the IDL interface implemented by the PROXY.
  *
+ * /// activate the proxy and return the object reference
  * PROXY::_ptr_type
  * PROXY::activate (void) throw ();
- * // activate the proxy and return the object reference
  * @endverbatim
  *
  */
@@ -72,8 +72,7 @@ public:
   virtual ~TAO_ESF_Proxy_Admin (void);
 
   /// Iterate over its internal collection.
-  void for_each (TAO_ESF_Worker<PROXY> *worker)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void for_each (TAO_ESF_Worker<PROXY> *worker);
 
   // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
   // the MSVC compiler (v6.0) gets confused when we do so.  So we have
@@ -82,24 +81,21 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain (void);
 
   /**
    * The Event Channel that owns this Admin object is going
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   /**
    * A <proxy> has connected, this is invoked when the proxy's client
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void connected (PROXY *proxy)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void connected (PROXY *proxy);
 
   /**
    * A <proxy> has reconnected, i.e. its client has invoked the
@@ -107,16 +103,14 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void reconnected (PROXY *proxy)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reconnected (PROXY *proxy);
 
   /**
    * A <proxy> has been disconnected. The default implementation
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void disconnected (PROXY *proxy)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnected (PROXY *proxy);
 
 protected:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
index dfb7f2a7429..f44945d45bf 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
@@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
     for_each (TAO_ESF_Worker<P> *worker)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->collection_->for_each (worker);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
index de454aaefe0..ad9d4618f24 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
@@ -9,14 +9,14 @@ TAO_ESF_RefCount_Guard<T>::
     TAO_ESF_RefCount_Guard (T &refcount)
   :  refcount_ (refcount)
 {
-  this->refcount_++;
+  ++this->refcount_;
 }
 
 template<class T> ACE_INLINE
 TAO_ESF_RefCount_Guard<T>::
     ~TAO_ESF_RefCount_Guard (void)
 {
-  this->refcount_--;
+  --this->refcount_;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index b23273e6a41..17c751db626 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -8,8 +8,8 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/Environment.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "orbsvcs/ETCL/ETCL_Constraint.inl"
@@ -95,6 +95,9 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
               TAO::Unknown_IDL_Type *unk =
                 dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+              if (!unk)
+                throw CORBA::INTERNAL ();
+
               // We don't want unk's rd_ptr to move, in case we are shared by
               // another Any, so we use this to copy the state, not the buffer.
               TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -141,7 +144,8 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
       }
       break;
     case TAO_ETCL_COMPONENT:
-      this->op_.any_ = any;
+      this->op_.any_ = any->impl ();
+      this->op_.any_->_add_ref ();
       break;
     }
 }
@@ -237,7 +241,10 @@ TAO_ETCL_Literal_Constraint::operator CORBA::ULong (void) const
     case TAO_ETCL_COMPONENT:
       {
         CORBA::ULong retval = 0;
-        *this->op_.any_ >>= retval;
+        CORBA::Any tmp;
+        tmp.replace(this->op_.any_);
+        this->op_.any_->_add_ref ();
+        tmp >>= retval;
         return retval;
       }
     default:
@@ -268,7 +275,12 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Long (void) const
     case TAO_ETCL_COMPONENT:
       {
         CORBA::Long retval = 0;
-        *this->op_.any_ >>= retval;
+
+        CORBA::Any tmp;
+        tmp.replace(this->op_.any_);
+        this->op_.any_->_add_ref ();
+        tmp >>= retval;
+
         return retval;
       }
     default:
@@ -290,7 +302,12 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Double (void) const
     case TAO_ETCL_COMPONENT:
       {
         CORBA::Double retval = 0.0;
-        *this->op_.any_ >>= retval;
+
+        CORBA::Any tmp;
+        tmp.replace(this->op_.any_);
+        this->op_.any_->_add_ref ();
+        tmp >>= retval;
+
         return retval;
       }
     default:
@@ -307,7 +324,12 @@ TAO_ETCL_Literal_Constraint::operator const char* (void) const
     case TAO_ETCL_COMPONENT:
       {
         const char *retval = 0;
-        *this->op_.any_ >>= retval;
+
+         CORBA::Any tmp;
+        tmp.replace(this->op_.any_);
+        this->op_.any_->_add_ref ();
+        tmp >>= retval;
+
         return retval;
       }
     default:
@@ -315,7 +337,7 @@ TAO_ETCL_Literal_Constraint::operator const char* (void) const
   }
 }
 
-TAO_ETCL_Literal_Constraint::operator const CORBA::Any* (void) const
+TAO_ETCL_Literal_Constraint::operator TAO::Any_Impl* (void) const
 {
   return (this->type_ == TAO_ETCL_COMPONENT) ? this->op_.any_ : 0;
 }
@@ -716,6 +738,9 @@ TAO_ETCL_Literal_Constraint::widest_type (
 void
 TAO_ETCL_Literal_Constraint::copy (const TAO_ETCL_Literal_Constraint &lit)
 {
+  // save the older type_ before assignment.
+  unsigned short prev_type = this->type_;
+
   this->type_ = lit.type_;
 
   switch (this->type_)
@@ -737,7 +762,10 @@ TAO_ETCL_Literal_Constraint::copy (const TAO_ETCL_Literal_Constraint &lit)
     this->op_.bool_ = lit.op_.bool_;
     break;
   case TAO_ETCL_COMPONENT:
+    if(prev_type == TAO_ETCL_COMPONENT && this->op_.any_ != 0)
+      this->op_.any_->_remove_ref ();
     this->op_.any_ = lit.op_.any_;
+    this->op_.any_->_add_ref ();
     break;
   default:
     this->type_ = TAO_UNKNOWN;
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
index 688b2df872c..7544638d40e 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
@@ -1,20 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/ETCL
-//
-// = FILENAME
-//    ECTL_Constraint
-//
-// = AUTHOR
-//    Carlos O'Ryan (coryan@cs.wustl.edu)
-//    Jeff Parsons (parsons@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ETCL_Constraint.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ *  @author Jeff Parsons (parsons@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef TAO_ETCL_CONSTRAINT_H
 #define TAO_ETCL_CONSTRAINT_H
@@ -28,6 +24,7 @@
 #include "ace/SString.h"
 
 #include "tao/Basic_Types.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -45,9 +42,9 @@ namespace CORBA
 class TAO_ETCL_Export TAO_ETCL_Constraint
 {
 public:
+  /// Constructor and destructor
   TAO_ETCL_Constraint (void);
   virtual ~TAO_ETCL_Constraint (void);
-  // Constructor and destructor
 
   virtual int accept (TAO_ETCL_Constraint_Visitor *visitor) = 0;
 };
@@ -69,19 +66,19 @@ public:
   explicit TAO_ETCL_Literal_Constraint (CORBA::Double doub);
   explicit TAO_ETCL_Literal_Constraint (const char* str);
 
+  /// Copy constructor
   TAO_ETCL_Literal_Constraint (const TAO_ETCL_Literal_Constraint& lit);
-  // Copy constructor
 
+  /// Destructor.
   ~TAO_ETCL_Literal_Constraint(void);
-  // Destructor.
 
+  /// Visitor accept method.
   int accept (TAO_ETCL_Constraint_Visitor* visitor);
-  // Visitor accept method.
 
   TAO_Literal_Type expr_type (void) const;
 
+  /// Assignment operator.
   void operator= (const TAO_ETCL_Literal_Constraint& co);
-  // Assignment operator.
 
   // Conversion routines.
   operator CORBA::Boolean (void) const;
@@ -89,7 +86,7 @@ public:
   operator CORBA::Long (void) const;
   operator CORBA::Double (void) const;
   operator const char* (void) const;
-  operator const CORBA::Any* (void) const;
+  operator TAO::Any_Impl* (void) const;
 
   // Return the type represented by this MysteryOperand.
 
@@ -131,31 +128,31 @@ public:
   TAO_ETCL_Literal_Constraint
   operator- (void);
 
+  /// Ensure both operands are of the same simple numeric type.
   TAO_Literal_Type
   widest_type (const TAO_ETCL_Literal_Constraint& rhs);
-  // Ensure both operands are of the same simple numeric type.
 
+  /// Determine the comparable Expression Type from the CORBA type
   static TAO_Literal_Type
   comparable_type (CORBA::TypeCode_ptr type);
-  // Determine the comparable Expression Type from the CORBA type
 
 private:
+  /// Private copy method.
   void copy (const TAO_ETCL_Literal_Constraint& co);
-  // Private copy method.
 
+  /// Union of the possible literal types.
   union
   {
     char* str_;
-    CORBA::Any_ptr any_;
+    TAO::Any_Impl* any_;
     CORBA::ULong uinteger_;
     CORBA::Long integer_;
     CORBA::Boolean bool_;
     CORBA::Double double_;
   } op_;
-  // Union of the possible literal types.
 
+  /// The actual types of the TAO_ETCL_Literal_Constraint.
   unsigned short type_;
-  // The actual types of the TAO_ETCL_Literal_Constraint.
 };
 
 // ****************************************************************
@@ -165,15 +162,15 @@ class TAO_ETCL_Export TAO_ETCL_Identifier : public TAO_ETCL_Constraint
 public:
   TAO_ETCL_Identifier (const char *value);
 
+  /// Get the value
   const char *value (void) const;
-  // Get the value
 
   // = The Constraint methods.
   int accept (TAO_ETCL_Constraint_Visitor *visitor);
 
 private:
+  /// The value
   ACE_CString string_;
-  // The value
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 03c5ff717fc..9da65cee9b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -581,7 +581,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
           crcparts[cnt] = padding[cnt];
         }
 
-      this->crc = ntohl (this->crc);
+      this->crc = ACE_NTOHL (this->crc);
     }
 
   // Validate.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index 500f4b2eb4c..9df6a92d93b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -20,7 +20,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 6a9b79ce970..8a241a85c17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_ECG_CDR_Message_Sender::init (
       TAO_ECG_Refcounted_Endpoint endpoint_rptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (endpoint_rptr.get () == 0
       || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE)
@@ -33,7 +32,6 @@ TAO_ECG_CDR_Message_Sender::init (
 void
 TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                            const ACE_INET_Addr &addr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->endpoint_rptr_.get () == 0)
     {
@@ -218,7 +216,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
      if (iovcnt > 1)
        {
          crc = ACE::crc32 (iov, iovcnt);
-         crc = htonl (crc);
+         crc = ACE_HTONL (crc);
        }
      for (int cnt=0; cnt<4; ++cnt)
        {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 1faa1eb22bd..c44bbadd074 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -23,7 +23,6 @@
 #include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 
 #include "ace/INET_Addr.h"
 
@@ -94,8 +93,7 @@ public:
    * sender is no longer needed.  If shutdown () is not called by the
    * user, cleanup activities will be performed by the destructor.
    */
-  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   // Shutdown this component.  Frees up the endpoint.
   void shutdown (void);
@@ -131,8 +129,7 @@ public:
    * to send later via the reactor.
    */
   void send_message (const TAO_OutputCDR &cdr,
-                     const ACE_INET_Addr &addr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     const ACE_INET_Addr &addr);
 
 private:
   /// Return the datagram...
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index 5dcd07128ac..73980d20c69 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -125,7 +125,6 @@ void
 TAO_ECG_Complex_Address_Server::get_addr (
                          const RtecEventComm::EventHeader& header,
                          RtecUDPAdmin::UDP_Addr_out addr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long key;
   if (this->is_source_mapping_)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 286aa5fe160..4f51296ef99 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -70,8 +70,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
   /// Prints out complete content of the address server. Useful for
   /// debugging.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 6200c868e9b..82405c6d2b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -131,7 +131,6 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd)
 void
 TAO_ECG_Mcast_EH::update_consumer (
          const RtecEventChannelAdmin::ConsumerQOS& sub)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Address_Set multicast_addresses;
 
@@ -147,7 +146,6 @@ void
 TAO_ECG_Mcast_EH::compute_required_subscriptions (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
     Address_Set& multicast_addresses)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count = sub.dependencies.length ();
   for (CORBA::ULong i = 0; i != count; ++i)
@@ -267,7 +265,6 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& sub)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->eh_)
     this->eh_->update_consumer (sub);
@@ -276,7 +273,6 @@ TAO_ECG_Mcast_EH::Observer::update_consumer (
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS&)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 968a7d4fb07..e899440ebd1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -123,11 +123,9 @@ private:
     /// Event Channel Observer methods
     //@{
     virtual void update_consumer (
-        const RtecEventChannelAdmin::ConsumerQOS& sub)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const RtecEventChannelAdmin::ConsumerQOS& sub);
     virtual void update_supplier (
-        const RtecEventChannelAdmin::SupplierQOS& pub)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const RtecEventChannelAdmin::SupplierQOS& pub);
 
   private:
     /// Handler we notify of subscriptions changes.
@@ -144,8 +142,7 @@ private:
 
   /// The Observer method.  Subscribe/unsubscribe to multicast groups
   /// according to changes in consumer subscriptions.
-  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
 
   typedef ACE_Unbounded_Set<ACE_INET_Addr> Address_Set;
@@ -169,8 +166,7 @@ private:
    */
   void compute_required_subscriptions (
         const RtecEventChannelAdmin::ConsumerQOS& sub,
-              Address_Set& multicast_addresses)
-              ACE_THROW_SPEC ((CORBA::SystemException));
+              Address_Set& multicast_addresses);
 
   /// Unsubscribe from any multicast addresses we are currently
   /// subscribed to that are not in the \a multicast_addresses list.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index a115866b93a..9d10b9f730c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -26,7 +26,6 @@ void
 TAO_ECG_Simple_Address_Server::get_addr (
     const RtecEventComm::EventHeader& /*header*/,
     RtecUDPAdmin::UDP_Addr_out addr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // unsigned long
   addr.ipaddr = this->addr_.get_ip_address ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 8ff36c72745..8bddc3cc95d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 4c7871f5e89..59c1add7710 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -133,7 +133,6 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub)
 
 void
 TAO_ECG_UDP_Receiver::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 34c19e3eeaa..6e580beeb0d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -171,8 +171,7 @@ public:
   /// The PushSupplier idl method.
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
   /// TAO_ECG_Dgram_Handler method.
   /**
@@ -187,7 +186,7 @@ protected:
 
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_UDP_Receiver objects using the static create() method.
-  TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc = 0);
+  TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc = false);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index f3c26bba399..fbf072250d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -137,7 +137,6 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 
 void
 TAO_ECG_UDP_Sender::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
@@ -162,7 +161,6 @@ TAO_ECG_UDP_Sender::shutdown (void)
 
 void
 TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 29b7306ab74..20118e46426 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -174,10 +174,8 @@ public:
   //@{
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void push (const RtecEventComm::EventSet &events)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
+  virtual void push (const RtecEventComm::EventSet &events);
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index e9bc5dcb730..ca8c3eff211 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -124,7 +124,7 @@ TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
   int argc = 0;
   char **argv = 0;
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
   ACE_Reactor *reactor = orb->orb_core ()->reactor ();
   return new TAO_EC_Reactive_Timeout_Generator (reactor);
 }
@@ -225,7 +225,7 @@ TAO_EC_Basic_Factory::create_consumer_control (TAO_EC_Event_Channel_Base* ec)
   int argc = 0;
   char **argv = 0;
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
   // Hard-coded rate to 10 times a second
   ACE_Time_Value rate (0, 100000);
   // Hard-coded polling-timeout to 10 msec
@@ -245,7 +245,7 @@ TAO_EC_Basic_Factory::create_supplier_control (TAO_EC_Event_Channel_Base* ec)
   int argc = 0;
   char **argv = 0;
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
   // Hard-coded rate to 10 times a second
   ACE_Time_Value rate (0, 100000);
   // Hard-coded polling-timeout to 10 msec
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index 81912d74e57..da460bbdd4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -12,8 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Channel_Destroyer_Functor::operator() (
-                           TAO_EC_Event_Channel_Base * event_channel)
-  ACE_THROW_SPEC (())
+                           TAO_EC_Event_Channel_Base * event_channel) throw ()
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
index 4b18ad808fd..5799f06d17c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -26,8 +26,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Channel_Destroyer_Functor
   typedef  TAO_EC_Event_Channel_Base * argument;
 
   /// Destroy @c event_channel
-  void operator() (TAO_EC_Event_Channel_Base * event_channel)
-    ACE_THROW_SPEC (());
+  void operator() (TAO_EC_Event_Channel_Base * event_channel) throw ();
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index d12e6b6fb52..8c7026d2c59 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -27,7 +27,6 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EC_ConsumerAdmin::obtain_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->obtain ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index c6804bd5dcb..623d7154457 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -63,8 +63,7 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_supplier (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index 321bb4b733b..e8a1f41cb43 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -26,8 +26,6 @@ void
 TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
       const RtecEventChannelAdmin::SupplierQOS& qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecEventChannelAdmin::AlreadyConnected))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -85,7 +83,6 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
 
 void
 TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -99,7 +96,6 @@ TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event)
 
 void
 TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushSupplier_var supplier;
   int connected = 0;
@@ -161,14 +157,12 @@ TAO_EC_Default_ProxyPushConsumer::_remove_ref (void)
 void
 TAO_EC_Default_ProxyPushConsumer::activate (
    RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy = this->_this ();
 }
 
 PortableServer::ObjectId
 TAO_EC_Default_ProxyPushConsumer::object_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
     this->default_POA_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 5e518a211bf..7ebb52251b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -49,19 +49,14 @@ public:
   virtual ~TAO_EC_Default_ProxyPushConsumer (void);
 
  virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
 
   // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecEventChannelAdmin::AlreadyConnected));
-  virtual void push (const RtecEventComm::EventSet& event)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::SupplierQOS& qos);
+  virtual void push (const RtecEventComm::EventSet& event);
+  virtual void disconnect_push_consumer (void);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
@@ -71,8 +66,7 @@ public:
 private:
 
   virtual PortableServer::ObjectId
-         object_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         object_id (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index 5b2b612d69c..6b97a3226de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -29,9 +29,6 @@ void
 TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
       const RtecEventChannelAdmin::ConsumerQOS& qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannelAdmin::AlreadyConnected,
-                     RtecEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
@@ -114,7 +111,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
 
 void
 TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var consumer;
   int connected = 0;
@@ -157,14 +153,12 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier ()
 
 void
 TAO_EC_Default_ProxyPushSupplier::suspend_connection (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->suspend_connection_locked ();
 }
 
 void
 TAO_EC_Default_ProxyPushSupplier::resume_connection (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->resume_connection_locked ();
 }
@@ -190,14 +184,12 @@ TAO_EC_Default_ProxyPushSupplier::_remove_ref (void)
 void
 TAO_EC_Default_ProxyPushSupplier::activate (
    RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy = this->_this ();
 }
 
 PortableServer::ObjectId
 TAO_EC_Default_ProxyPushSupplier::object_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
     this->default_POA_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index d577085e134..45fc706138b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -44,22 +44,15 @@ public:
   virtual ~TAO_EC_Default_ProxyPushSupplier (void);
 
   void activate (
-     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy);
 
   /// IDL methods.
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
+  virtual void disconnect_push_supplier (void);
+  virtual void suspend_connection (void);
+  virtual void resume_connection (void);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
@@ -69,8 +62,7 @@ public:
 private:
 
   virtual PortableServer::ObjectId
-            object_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+            object_id (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index a691cefb1d0..9ed27e62a39 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -143,13 +143,17 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
 {
   if (this->msg_queue()->is_full ())
     {
-      int action =
-        this->queue_full_service_object_->queue_full_action (this, proxy,
-                                                             consumer, event);
+      if (0 != this->queue_full_service_object_)
+        {
+          int action =
+            this->queue_full_service_object_->queue_full_action (this, proxy,
+                                                                 consumer, event);
 
-      if (action == TAO_EC_Queue_Full_Service_Object::SILENTLY_DISCARD)
-        return;
-      // if action == WAIT_TO_EMPTY then we just go ahead and queue it
+          if (action == TAO_EC_Queue_Full_Service_Object::SILENTLY_DISCARD)
+            return;
+          // if action == WAIT_TO_EMPTY then we just go ahead and queue it
+        }
+        // else go ahead and queue it
     }
 
   if (this->allocator_ == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 831bd3f1be5..aa68b7259ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -248,21 +248,18 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 TAO_EC_Event_Channel_Base::for_consumers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->consumer_admin_->_this ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_EC_Event_Channel_Base::for_suppliers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->supplier_admin_->_this ();
 }
 
 void
 TAO_EC_Event_Channel_Base::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown ();
 }
@@ -270,10 +267,6 @@ TAO_EC_Event_Channel_Base::destroy (void)
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel_Base::append_observer (
        RtecEventChannelAdmin::Observer_ptr observer)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->observer_strategy_->append_observer (observer);
 }
@@ -281,10 +274,6 @@ TAO_EC_Event_Channel_Base::append_observer (
 void
 TAO_EC_Event_Channel_Base::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->observer_strategy_->remove_observer (handle);
 }
@@ -292,7 +281,6 @@ TAO_EC_Event_Channel_Base::remove_observer (
 void
 TAO_EC_Event_Channel_Base::for_each_consumer (
                     TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_admin_->for_each (worker);
 }
@@ -300,7 +288,6 @@ TAO_EC_Event_Channel_Base::for_each_consumer (
 void
 TAO_EC_Event_Channel_Base::for_each_supplier (
                     TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->supplier_admin_->for_each (worker);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 20df5b0d3a3..cdc66d07297 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -123,12 +123,10 @@ public:
   virtual void shutdown (void);
 
   virtual void for_each_consumer (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker);
 
   virtual void for_each_supplier (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker);
 
   /// Access the dispatching module....
   TAO_EC_Dispatching* dispatching (void) const;
@@ -221,31 +219,20 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this ();
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_consumers (void);
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_suppliers (void);
 
   /// Commit suicide.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+      append_observer (RtecEventChannelAdmin::Observer_ptr);
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+      remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
   /// Return 1 if the event channel is already destroyed.
   int destroyed (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index b21479fe024..84ae467f391 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -190,7 +190,6 @@ TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void)
 void
 TAO_EC_Gateway_IIOP::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& c_qos)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () == 0)
     return;
@@ -422,7 +421,6 @@ TAO_EC_Gateway_IIOP::open_i (
 void
 TAO_EC_Gateway_IIOP::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS&)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 03d35384fe7..cb21f9c16aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -91,10 +91,8 @@ public:
 
   // The following methods are documented in the base class.
   virtual void close (void);
-  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub);
+  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   // Let the gateway reconnect itself to the consumer ec given exisiting QoS
   void reconnect_consumer_ec(void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 118a5b086fe..eed91d2c9f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -16,6 +16,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
      thread_creation_flags_ (thread_creation_flags),
      thread_priority_ (thread_priority),
      force_activate_ (force_activate),
+     task_(0, service_object),
      active_ (0),
      queue_full_service_object_ (service_object)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 5b829d361c6..f2420600055 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -121,7 +121,7 @@ TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
   int argc = 0;
   char **argv = 0;
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
   ACE_Reactor *reactor = orb->orb_core ()->reactor ();
   return new TAO_EC_Reactive_Timeout_Generator (reactor);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index aaa334439b5..877b6993a5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -26,23 +26,13 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  ACE_THROW_RETURN (
-      RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
-      0);
+  throw RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER();
 }
 
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 }
@@ -78,10 +68,6 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr obs)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -93,9 +79,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
                           RtecEventChannelAdmin::Observer::_duplicate (obs));
 
     if (this->observers_.bind (entry.handle, entry) == -1)
-      ACE_THROW_RETURN (
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
-          0);
+      throw RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER();
   }
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
@@ -113,10 +97,6 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
 void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
       RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 6bf462dccf0..3241e5d81bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -65,17 +65,9 @@ public:
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
     = 0;
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
      = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
@@ -107,17 +99,9 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+      append_observer (RtecEventChannelAdmin::Observer_ptr);
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+                        RtecEventChannelAdmin::Observer_Handle);
   virtual void connected (TAO_EC_ProxyPushConsumer*);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*);
   virtual void connected (TAO_EC_ProxyPushSupplier*);
@@ -154,17 +138,9 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+      append_observer (RtecEventChannelAdmin::Observer_ptr);
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+                        RtecEventChannelAdmin::Observer_Handle);
   virtual void connected (TAO_EC_ProxyPushConsumer*);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*);
   virtual void connected (TAO_EC_ProxyPushSupplier*);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 5fa313c5857..16f9e6056f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -69,7 +69,7 @@ public:
   /// Activate in the POA
   virtual void activate (
           RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   /// Deactivate from the POA
   virtual void deactivate (void);
@@ -168,7 +168,7 @@ private:
 
   virtual PortableServer::ObjectId
             object_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 51bd5ee6d0e..fe70c2cf0fa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -134,12 +134,11 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (void) ACE_THROW_SPEC (())
+TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
 {
   try
     {
-      PortableServer::ObjectId id =
-        this->object_id ();
+      PortableServer::ObjectId id = this->object_id ();
       this->default_POA_->deactivate_object (id);
     }
   catch (const CORBA::Exception&)
@@ -170,7 +169,7 @@ TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return this->refcount_;
   }
@@ -198,8 +197,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
     if (this->is_connected_i () == 0)
       return 0;
 
-    result =
-      this->child_->filter (event, qos_info);
+    result = this->child_->filter (event, qos_info);
   }
   return result;
 }
@@ -221,8 +219,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
     if (this->is_connected_i () == 0)
       return 0;
 
-    result =
-      this->child_->filter_nocopy (event, qos_info);
+    result = this->child_->filter_nocopy (event, qos_info);
   }
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 9b80a1241f7..82dbfc8e7f9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -68,20 +68,18 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
-   ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (void)
-    ACE_THROW_SPEC (());
+  virtual void deactivate (void) throw ();
 
   /// Disconnect this from
   virtual void disconnect_push_supplier () = 0;
 
-  /// Return 0 if no consumer is connected...
+  /// Return false if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
 
-  /// Return 1 if it is suspended.
+  /// Return true if it is suspended.
   CORBA::Boolean is_suspended (void) const;
 
   /**
@@ -152,14 +150,10 @@ protected:
   void consumer (RtecEventComm::PushConsumer_ptr consumer);
   void consumer_i (RtecEventComm::PushConsumer_ptr consumer);
 
-  void suspend_connection_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void resume_connection_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void suspend_connection_locked (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void resume_connection_locked (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void suspend_connection_i (void);
+  void resume_connection_i (void);
+  void suspend_connection_locked (void);
+  void resume_connection_locked (void);
 
   /// The private version (without locking) of is_connected().
   CORBA::Boolean is_connected_i (void) const;
@@ -200,7 +194,7 @@ private:
   virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
   virtual PortableServer::ObjectId
             object_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index efe0d76ae82..ae28f7d1ccd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
@@ -6,14 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_EC_ProxyPushSupplier::suspend_connection_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->suspended_ = 1;
 }
 
 ACE_INLINE void
 TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
@@ -25,14 +23,12 @@ TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
 
 ACE_INLINE void
 TAO_EC_ProxyPushSupplier::resume_connection_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->suspended_ = 0;
 }
 
 ACE_INLINE void
 TAO_EC_ProxyPushSupplier::resume_connection_locked (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index f6c327c190e..aef06ea0d5d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -12,8 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
-                       RtecEventComm::PushSupplier_ptr supplier)
-  ACE_THROW_SPEC (())
+                       RtecEventComm::PushSupplier_ptr supplier) throw ()
 {
   try
     {
@@ -26,8 +25,7 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
 
 void
 TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
-                       RtecEventComm::PushConsumer_ptr consumer)
-  ACE_THROW_SPEC (())
+                       RtecEventComm::PushConsumer_ptr consumer) throw ()
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index 8aeda423586..8f3ec8fdbe9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -26,8 +26,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Supplier_Proxy_Disconnect_Functor
   typedef  RtecEventComm::PushSupplier_ptr argument;
 
   /// Disconnect from @c supplier
-  void operator() (RtecEventComm::PushSupplier_ptr supplier)
-    ACE_THROW_SPEC (());
+  void operator() (RtecEventComm::PushSupplier_ptr supplier) throw ();
 };
 
 /**
@@ -54,8 +53,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Consumer_Proxy_Disconnect_Functor
   typedef  RtecEventComm::PushConsumer_ptr argument;
 
   /// Disconnect from @c consumer
-  void operator() (RtecEventComm::PushConsumer_ptr consumer)
-    ACE_THROW_SPEC (());
+  void operator() (RtecEventComm::PushConsumer_ptr consumer) throw ();
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 6856520575c..1b2f58cd72e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -25,7 +25,6 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_EC_SupplierAdmin::obtain_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->obtain ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 57e05628b48..7647eac77d4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -55,8 +55,7 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_consumer (void);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 09b2c3fdcac..8f110b385d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -37,7 +37,6 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
 
 void
 TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var emulated_exceptions_suck =
     this->_this ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index 586d6218b5c..b28c209507c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -35,8 +35,7 @@ public:
   TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec);
   virtual ~TAO_EC_TPC_ProxyPushConsumer (void);
 
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
 
 private:
   typedef TAO_EC_Default_ProxyPushConsumer BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 26b206d447d..91580b75705 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -22,7 +22,6 @@ TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
 
 void
 TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n",
@@ -52,9 +51,6 @@ void
 TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
       const RtecEventChannelAdmin::ConsumerQOS& qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannelAdmin::AlreadyConnected,
-                     RtecEventChannelAdmin::TypeError))
 {
   BASECLASS::connect_push_consumer (push_consumer, qos);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index ceda25e79fe..d4ef0ac955e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -39,13 +39,9 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError));
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
 
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 private:
   typedef TAO_EC_Default_ProxyPushSupplier BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index a52e42d1ca7..2a75a4a9a9a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -20,7 +20,6 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
                                     RtecUDPAdmin::UDP_Addr_out addr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
   addr.port = this->port_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 1b2600c1178..01ea084fa39 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -46,8 +46,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
 private:
   CORBA::UShort port_;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 4a35a62a269..ade4db7d656 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_FT_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ClientORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 
@@ -37,7 +35,6 @@ TAO_FT_ClientORBInitializer::post_init (
 void
 TAO_FT_ClientORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
 
@@ -80,7 +77,6 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
 void
 TAO_FT_ClientORBInitializer::register_client_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index 278a80f3c4b..3a933b94c75 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -39,23 +39,19 @@ class TAO_FT_ClientORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Register the necessary interceptors.
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 56c9b3f7a63..ef3795e1fc2 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -15,8 +15,6 @@ CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
@@ -24,8 +22,7 @@ TAO_FT_ClientPolicyFactory::create_policy (
   else if (type == FT::HEARTBEAT_POLICY)
     return TAO_FT_Heart_Beat_Policy::create (val);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 0e16efe8059..49a8b165b93 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -43,9 +43,7 @@ class TAO_FT_ClientPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any &value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 758e9dc7019..fd0ef8ebc02 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
@@ -16,14 +17,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
 TAO_FT_Request_Duration_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
@@ -33,8 +32,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_FT_Request_Duration_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -57,7 +55,6 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_FT_Request_Duration_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
@@ -69,7 +66,6 @@ TAO_FT_Request_Duration_Policy::copy (void)
 
 void
 TAO_FT_Request_Duration_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -95,7 +91,6 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 
 FT::HeartbeatPolicyValue
 TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
   val.heartbeat = this->heartbeat_;
@@ -111,8 +106,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value = 0;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_FT_Heart_Beat_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -128,7 +122,6 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 
 CORBA::PolicyType
 TAO_FT_Heart_Beat_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
 }
@@ -136,7 +129,6 @@ TAO_FT_Heart_Beat_Policy::policy_type (void)
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
@@ -158,7 +150,6 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 
 void
 TAO_FT_Heart_Beat_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 7ccdac2f82a..870a3c23f6e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -62,17 +62,13 @@ public:
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT request_duration_policy_value (void);
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
@@ -113,17 +109,13 @@ public:
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void);
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 368385946fc..d787f0e0e6d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -49,21 +49,18 @@ namespace TAO
 
   char *
   FT_ClientRequest_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->name_);
   }
 
   void
   FT_ClientRequest_Interceptor::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ClientRequest_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Do Nothing
   }
@@ -71,8 +68,6 @@ namespace TAO
   void
   FT_ClientRequest_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
   {
     if (TAO_debug_level > 3)
       {
@@ -105,15 +100,12 @@ namespace TAO
   void
   FT_ClientRequest_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ClientRequest_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri);
 
@@ -170,8 +162,6 @@ namespace TAO
   void
   FT_ClientRequest_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
   {
 #if 0
     // @@ Will be used later.
@@ -235,7 +225,6 @@ namespace TAO
     FT_ClientRequest_Interceptor::group_version_context (
     PortableInterceptor::ClientRequestInfo_ptr ri,
     IOP::TaggedComponent* tp)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
     {
@@ -298,7 +287,6 @@ namespace TAO
   void
     FT_ClientRequest_Interceptor::request_service_context (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
     {
@@ -375,7 +363,6 @@ namespace TAO
   TimeBase::TimeT
   FT_ClientRequest_Interceptor::request_expiration_time (
     CORBA::Policy *policy)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     FT::RequestDurationPolicy_var p;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 6c8e4424575..8cef31a964b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -76,30 +76,20 @@ namespace TAO
     FT_ClientRequest_Interceptor (void);
 
     /// Canonical name of the interceptor.
-    virtual char * name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * name (void);
 
 
-    virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (void);
 
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   protected:
 
@@ -108,14 +98,11 @@ namespace TAO
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                IOP::TaggedComponent* tp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                IOP::TaggedComponent* tp);
 
-    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy);
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 7adfd628330..4d84c639da7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -24,7 +24,6 @@ TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate (void)
 
 TAO_Service_Callbacks *
 TAO_FT_ClientService_Activate::activate_services (TAO_ORB_Core *orb_core)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Service_Callbacks *ft_service_callback = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index c6b8c863e6f..cb5594e44f8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -54,8 +54,7 @@ public:
    * This method cannot throw any exception, but it can return a nil
    * object to indicate an error condition.
    */
-  virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb);
 
   /// Used to force the initialization.
   static int Initializer (void);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 3a785fe5698..199956473af 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -3,7 +3,6 @@
 #include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
 #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 
 
 ACE_RCSID (FaultTolerance,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index c83f99101e1..98fb0329c25 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -24,8 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
     CORBA::Object_ptr &ior)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::Invalid_IOR))
 {
   // We need to apply the property for every profile in the IOR
 
@@ -77,9 +75,6 @@ TAO_FT_IOGR_Property::set_property (
 CORBA::Boolean
 TAO_FT_IOGR_Property::is_primary_set (
     CORBA::Object_ptr ior)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   if (this->get_primary_profile (ior) != 0)
     return 1;
@@ -91,18 +86,13 @@ TAO_FT_IOGR_Property::is_primary_set (
 CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
     CORBA::Object_ptr ior)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::NotFound
-      ))
 {
 
   TAO_Profile *pfile =
     this->get_primary_profile (ior);
 
   if (pfile == 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::NotFound ();
 
   // Search for the IOP::TAG_FT_PRIMARY in the tagged component of
   // the profile
@@ -145,8 +135,7 @@ TAO_FT_IOGR_Property::get_primary (
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
     {
-      ACE_THROW_RETURN (TAO_IOP::NotFound (),  // ** Changed from Invalid_IOR () **
-                        CORBA::Object::_nil ());
+      throw TAO_IOP::NotFound ();
     }
 
   // Release ownership of the pointers protected by the auto_ptrs since they
@@ -162,11 +151,6 @@ CORBA::Boolean
 TAO_FT_IOGR_Property::set_primary (
     CORBA::Object_ptr &ior1,
     CORBA::Object_ptr ior2)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::NotFound,
-        TAO_IOP::Duplicate
-      ))
 {
   // Check for primary in <ior2>
   IOP::TaggedComponent tagged_components;
@@ -183,8 +167,7 @@ TAO_FT_IOGR_Property::set_primary (
         mprofile.get_profile (i)->tagged_components ();
 
       if (tag_comp.get_component (tagged_components) == 1)
-        ACE_THROW_RETURN (TAO_IOP::Duplicate (),
-                          0);
+        throw TAO_IOP::Duplicate ();
     }
 
   // Check whether ior1 exists in ior2
@@ -217,8 +200,7 @@ TAO_FT_IOGR_Property::set_primary (
   // At the end of the loop check whether we have seen <ior1> in
   // <ior2>
   if (index == -1)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      0);
+    throw TAO_IOP::NotFound ();
 
   CORBA::Boolean val = 1;
 
@@ -342,7 +324,6 @@ CORBA::Boolean
 TAO_FT_IOGR_Property::get_tagged_component (
     const CORBA::Object_ptr iogr,
     FT::TagFTGroupTaggedComponent &fgtc) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Stub *stub =
     iogr->_stubobj ();
@@ -375,16 +356,14 @@ TAO_FT_IOGR_Property::get_tagged_component (
           CORBA::Boolean byte_order;
 
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_THROW_RETURN (CORBA::MARSHAL (),
-                              0);
+            throw CORBA::MARSHAL ();
 
           cdr.reset_byte_order (static_cast<int> (byte_order));
 
           if ((cdr >> fgtc) == 1)
             return 1;
           else
-            ACE_THROW_RETURN (CORBA::MARSHAL (),
-                              0);
+            throw CORBA::MARSHAL ();
         }
     }
 
@@ -394,7 +373,6 @@ TAO_FT_IOGR_Property::get_tagged_component (
 CORBA::Boolean
 TAO_FT_IOGR_Property::remove_primary_tag (
     CORBA::Object_ptr &iogr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the MProfile
   TAO_MProfile &mprofile =
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 36cdbfbfdf8..947686c2c51 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -67,40 +67,23 @@ public:
 
   /// Set the property for the IOGR
   virtual CORBA::Boolean set_property (
-      CORBA::Object_ptr &ior)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR
-    ));
+      CORBA::Object_ptr &ior);
 
   /// Set <ior1> as  primary which is a part of <ior2>
   virtual CORBA::Boolean set_primary (
       CORBA::Object_ptr &ior1,
-      CORBA::Object_ptr ior2)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound,
-      TAO_IOP::Duplicate
-    ));
+      CORBA::Object_ptr ior2);
 
   /// Get the primary member from the IOGR <ior>
   virtual CORBA::Object_ptr get_primary (
-      CORBA::Object_ptr ior)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::NotFound
-      ));
+      CORBA::Object_ptr ior);
 
   /// Is there a primary available for <ior>
   virtual CORBA::Boolean is_primary_set (
-      CORBA::Object_ptr ior)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      CORBA::Object_ptr ior);
 
   virtual CORBA::Boolean remove_primary_tag (
-      CORBA::Object_ptr &iogr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Object_ptr &iogr);
 
   /// Reset the underlying tagged components held by the class
   CORBA::Boolean reset_tagged_components (
@@ -109,8 +92,7 @@ public:
   /// Extract the TagFTGroupTaggedComponent inside the <ior>
   CORBA::Boolean get_tagged_component (
       const CORBA::Object_ptr iogr,
-      FT::TagFTGroupTaggedComponent &ft_group) const
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      FT::TagFTGroupTaggedComponent &ft_group) const;
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index cdc5d50b363..5c6b3cf6212 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -7,7 +7,7 @@
 #include "tao/Profile.h"
 #include "tao/Endpoint.h"
 #include "tao/Base_Transport_Property.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 05312105af0..4d99eaf8b0a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -19,14 +19,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_FT_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 
@@ -38,7 +36,6 @@ TAO_FT_ORBInitializer::post_init (
 void
 TAO_FT_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
 
@@ -81,7 +78,6 @@ TAO_FT_ORBInitializer::register_policy_factories (
 void
 TAO_FT_ORBInitializer::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
@@ -100,7 +96,6 @@ TAO_FT_ORBInitializer::register_server_request_interceptors (
 void
 TAO_FT_ORBInitializer::register_client_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index e3c00a8dc2a..aba180a7e2d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -40,27 +40,22 @@ class TAO_FT_ORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 95419a3a405..2c101c7601f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -16,8 +16,6 @@ CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
@@ -27,8 +25,7 @@ TAO_FT_PolicyFactory::create_policy (
   else if (type == FT::HEARTBEAT_ENABLED_POLICY)
     return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index 849f149480e..fd3ba323a2d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -45,9 +45,7 @@ class TAO_FT_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any &value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 053e1951e89..de34ec90dd8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -13,14 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
 TAO_FT_Request_Duration_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
@@ -30,8 +28,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 
   TAO_FT_Request_Duration_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -54,7 +51,6 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_FT_Request_Duration_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
@@ -66,7 +62,6 @@ TAO_FT_Request_Duration_Policy::copy (void)
 
 void
 TAO_FT_Request_Duration_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -94,7 +89,6 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 
 FT::HeartbeatPolicyValue
 TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
   val.heartbeat = this->heartbeat_;
@@ -110,8 +104,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 
   TAO_FT_Heart_Beat_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -127,7 +120,6 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 
 CORBA::PolicyType
 TAO_FT_Heart_Beat_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
 }
@@ -135,7 +127,6 @@ TAO_FT_Heart_Beat_Policy::policy_type (void)
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
@@ -157,7 +148,6 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 
 void
 TAO_FT_Heart_Beat_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -185,7 +175,6 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
 
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
 }
@@ -197,8 +186,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
   CORBA::Boolean value;
 
   if ((val >>= CORBA::Any::to_boolean (value)) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 
   TAO_FT_Heart_Beat_Enabled_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -211,7 +199,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 
 CORBA::PolicyType
 TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
 }
@@ -219,7 +206,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
@@ -242,7 +228,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 
 void
 TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index b4706c0b528..5e40b4b054c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -60,17 +60,13 @@ public:
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT request_duration_policy_value (void);
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
@@ -111,17 +107,13 @@ public:
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void);
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value,
@@ -171,17 +163,13 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ();
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 99537c5b495..95f66159e6a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -15,16 +15,13 @@ ACE_RCSID (FaultTolerance,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_FT_ServerORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_FT_ServerORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
 }
 
 void
 TAO_FT_ServerORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 
@@ -34,7 +31,6 @@ TAO_FT_ServerORBInitializer::post_init (
 void
 TAO_FT_ServerORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
 
@@ -68,7 +64,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
 void
 TAO_FT_ServerORBInitializer::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index c328b8ccfd3..b45f004765c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -39,23 +39,17 @@ class TAO_FT_ServerORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register FTCORBA policy factories.
-  void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index 3e208e650c7..26803b15aaf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -18,15 +18,12 @@ CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
 
   if (type == FT::HEARTBEAT_ENABLED_POLICY)
     return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index b1f8c50e3fc..55eba9ef6fb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -43,9 +43,7 @@ class TAO_FT_ServerPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any &value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index a5279d8f3a5..ca7daf1007f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -3,6 +3,7 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
@@ -15,7 +16,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
 }
@@ -27,10 +27,9 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
   CORBA::Boolean value;
 
   if ((val >>= CORBA::Any::to_boolean (value)) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
-  TAO_FT_Heart_Beat_Enabled_Policy *tmp;
+  TAO_FT_Heart_Beat_Enabled_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Heart_Beat_Enabled_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -41,7 +40,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 
 CORBA::PolicyType
 TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
 }
@@ -49,9 +47,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_FT_Heart_Beat_Enabled_Policy * tmp;
+  TAO_FT_Heart_Beat_Enabled_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
@@ -71,7 +68,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 
 void
 TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 0fb86dbeb7a..5d602eec42e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -58,17 +58,13 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ();
 
-  virtual CORBA::PolicyType policy_type ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index f609b5c34e9..d9ed6f5259d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -30,22 +30,18 @@ namespace TAO
 
   char *
   FT_ServerRequest_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor");
   }
 
   void
   FT_ServerRequest_Interceptor::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     // Check for the group version service context
     try
@@ -70,8 +66,6 @@ namespace TAO
   void
   FT_ServerRequest_Interceptor::receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     // Check for the group version service context
     CORBA::String_var op =
@@ -89,31 +83,24 @@ namespace TAO
   void
   FT_ServerRequest_Interceptor::send_reply (
       PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::send_exception (
       PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::send_other (
       PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::check_iogr_version (
       const IOP::ServiceContext &svc)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     TAO_InputCDR cdr (reinterpret_cast<const char*> (svc.context_data.get_buffer ()),
                       svc.context_data.length ());
@@ -165,7 +152,6 @@ namespace TAO
   void
   FT_ServerRequest_Interceptor::update_iogr (
       PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->orb_.in () == 0)
       {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 9e5e2b6e869..3af991ac16e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -69,45 +69,31 @@ namespace TAO
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * name (void);
 
-    virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (void);
 
     virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
   private:
 
-    void check_iogr_version (const IOP::ServiceContext &svc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-           PortableInterceptor::ForwardRequest));
+    void check_iogr_version (const IOP::ServiceContext &svc);
 
     void update_iogr (
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 9c0e8ed16a2..9485b217bec 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -22,7 +22,6 @@ TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void)
 
 TAO_Service_Callbacks *
 TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Service_Callbacks *ft_service_callback = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 2ca544403fe..e46044243e7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -13,6 +13,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (FaultTolerance,
            FT_Service_Callbacks,
@@ -21,8 +22,7 @@ ACE_RCSID (FaultTolerance,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (
-    TAO_ORB_Core *orb_core)
+TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *orb_core)
 
   : orb_core_ (orb_core),
     profile_lock_ (0)
@@ -41,8 +41,7 @@ CORBA::Boolean
 TAO_FT_Service_Callbacks::select_profile (const TAO_MProfile &mprofile,
     TAO_Profile *&pfile)
 {
-  CORBA::ULong sz =
-    mprofile.size ();
+  CORBA::ULong const sz = mprofile.size ();
 
   // Iterate through the list in a circular fashion. Stop one before
   // the list instead of trying the same thing again.
@@ -75,12 +74,11 @@ CORBA::Boolean
 TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj)
 {
   // Get the count
-  CORBA::ULong count =
-    obj->_stubobj ()->base_profiles ().profile_count ();
+  CORBA::ULong count = obj->_stubobj ()->base_profiles ().profile_count ();
 
   // If the profile count is zero then return true
   if (count == 0)
-    return 1;
+    return true;
   else
     {
       // else if each of the profile is nil
@@ -92,12 +90,12 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj)
             obj->_stubobj ()->base_profiles ().get_profile (cnt);
 
           if (pfile != 0)
-            return 0;
+            return false;
         }
     }
 
   // If it reaches here then it should be nill
-  return 1;
+  return true;
 
 }
 
@@ -169,8 +167,7 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p,
 }
 
 CORBA::ULong
-TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p,
-                                   CORBA::ULong max)
+TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p, CORBA::ULong max)
 {
   // At this point we assume that all the checks for other things
   // within the profiles have been satisfied
@@ -278,12 +275,11 @@ TAO_FT_Service_Callbacks::raise_comm_failure (
 
   // As the right tags are not found close the connection and throw an
   // exception
-  ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          errno),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_SYSTEM_EXCEPTION);
+  throw CORBA::COMM_FAILURE (
+    CORBA::SystemException::_tao_minor_code (
+      TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
+      errno),
+    CORBA::COMPLETED_MAYBE);
 }
 
 TAO::Invocation_Status
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index 3c74fec8208..de912b10127 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -17,14 +17,12 @@ FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth)
 void
 FTRT_ClientORB_Initializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Initializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   info->add_client_request_interceptor (client_interceptor_.in());
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
index 355ff4bb270..3c46e040344 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -42,11 +42,9 @@ public:
   /// Priority mapping types
   FTRT_ClientORB_Initializer (int transaction_depth);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 private:
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 054fe0838e3..0776f22a784 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -30,29 +30,24 @@ FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void)
 
 char *
 FTRT_ClientORB_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 FTRT_ClientORB_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::send_request");
   try
@@ -98,7 +93,6 @@ FTRT_ClientORB_Interceptor::send_request (
 void
 FTRT_ClientORB_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::receive_reply");
 
@@ -133,16 +127,12 @@ FTRT_ClientORB_Interceptor::receive_reply (
 void
 FTRT_ClientORB_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index 304a186c184..e1eb6fa03ef 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -47,29 +47,19 @@ public:
   virtual ~FTRT_ClientORB_Interceptor ();
 
   /// Canonical name of the interceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 private:
   const char *myname_;
   CORBA::Long transaction_depth_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 83d7e6c3079..208494e8db1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -30,7 +30,6 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
   return obtain_proxy();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index dbaf815d55e..80aedc2752a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -61,8 +61,7 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_supplier (void);
 
   void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 67e075d97e0..e3a38dcd463 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -100,7 +100,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership)
       persistent_poa_.in ());
 
 
-    TAO_FTEC_Event_Channel_Impl* ec;
+    TAO_FTEC_Event_Channel_Impl* ec = 0;
     ACE_NEW_THROW_EX (ec,
       TAO_FTEC_Event_Channel_Impl (attr),
       CORBA::NO_MEMORY());
@@ -140,11 +140,6 @@ void TAO_FTEC_Event_Channel::set_listener(TAO_FTEC_Become_Primary_Listener* list
 void TAO_FTEC_Event_Channel::set_update (
         const FTRT::State & s
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FTRT::InvalidUpdate
-        , FTRT::OutOfSequence
-      ))
 {
     ec_impl_->set_update(s);
 }
@@ -152,9 +147,6 @@ void TAO_FTEC_Event_Channel::set_update (
 void TAO_FTEC_Event_Channel::oneway_set_update (
         const FTRT::State & s
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
     ec_impl_->set_update(s);
 }
@@ -162,14 +154,12 @@ void TAO_FTEC_Event_Channel::oneway_set_update (
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 TAO_FTEC_Event_Channel::for_consumers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return ec_impl_->for_consumers();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_FTEC_Event_Channel::for_suppliers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return ec_impl_->for_suppliers();
 }
@@ -177,7 +167,6 @@ TAO_FTEC_Event_Channel::for_suppliers (void)
 
 void
 TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
-  ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState))
 {
   ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n"));
   ec_impl_->set_state(s);
@@ -185,7 +174,6 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
 
 void
 TAO_FTEC_Event_Channel::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Fault_Detector::instance())
     Fault_Detector::instance()->stop();
@@ -196,24 +184,16 @@ TAO_FTEC_Event_Channel::destroy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   /// we have yet to implement the replication of observers
   /// throw an exception for the moment
-  ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0);
+  throw RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER();
 
   //return this->ec_impl_->append_observer (observer);
 }
 
 void
 TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   /// we have yet to implement the replication of observers
   /// throw an exception for the moment
@@ -229,9 +209,6 @@ TAO_FTEC_Event_Channel::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out location
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   return ec_impl_->start(listener, location);
 }
@@ -241,10 +218,6 @@ TAO_FTEC_Event_Channel::create_group (
         const FTRT::ManagerInfoList & info_list,
         CORBA::ULong object_group_ref_version
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      , FTRT::PredecessorUnreachable
-      ))
 {
   ec_impl_->create_group(info_list, object_group_ref_version);
 }
@@ -253,9 +226,6 @@ void
 TAO_FTEC_Event_Channel::join_group (
         const FTRT::ManagerInfo & info
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->join_group(info);
 }
@@ -265,9 +235,6 @@ TAO_FTEC_Event_Channel::add_member (
         const FTRT::ManagerInfo & info,
         CORBA::ULong object_group_ref_version
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->add_member(info, object_group_ref_version);
 }
@@ -276,9 +243,6 @@ void
 TAO_FTEC_Event_Channel::remove_member (
         const FTRT::Location & crashed_location,
         CORBA::ULong object_group_ref_version)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->remove_member(crashed_location,
                             object_group_ref_version);
@@ -288,9 +252,6 @@ void
 TAO_FTEC_Event_Channel::replica_crashed (
         const FTRT::Location & location
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->replica_crashed(location);
 }
@@ -303,10 +264,6 @@ TAO_FTEC_Event_Channel::connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RtecEventChannelAdmin::TypeError
-      ))
 {
   return ec_impl_->connect_push_consumer(push_consumer, qos);
 }
@@ -317,9 +274,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   return ec_impl_->connect_push_supplier(push_supplier, qos);
 
@@ -329,9 +283,6 @@ void
 TAO_FTEC_Event_Channel::disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->disconnect_push_supplier(oid);
 }
@@ -340,9 +291,6 @@ void
 TAO_FTEC_Event_Channel::disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   ec_impl_->disconnect_push_consumer(oid);
 }
@@ -351,10 +299,6 @@ void
 TAO_FTEC_Event_Channel::suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FtRtecEventComm::InvalidObjectID
-      ))
 {
   ec_impl_->suspend_push_supplier(oid);
 }
@@ -363,10 +307,6 @@ void
 TAO_FTEC_Event_Channel::resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FtRtecEventComm::InvalidObjectID
-      ))
 {
   ec_impl_->resume_push_supplier(oid);
 }
@@ -376,10 +316,6 @@ TAO_FTEC_Event_Channel::push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FtRtecEventComm::InvalidObjectID
-      ))
 {
   ec_impl_->push(oid,
                  data);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index a82b2fddcc8..59da9c56d46 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -64,101 +64,73 @@ public:
   /// RtecEventChannelAdmin::EventChannel Interface
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (void);
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-      RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer);
 
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-      RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
   /// EventChannelFacade Interface, used by FTEC gateway
 
-      virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
-        RtecEventComm::PushConsumer_ptr push_consumer,
-        const RtecEventChannelAdmin::ConsumerQOS & qos)
-      ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ;
+  virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
+    RtecEventComm::PushConsumer_ptr push_consumer,
+    const RtecEventChannelAdmin::ConsumerQOS & qos);
 
+  virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
+      RtecEventComm::PushSupplier_ptr push_supplier,
+      const RtecEventChannelAdmin::SupplierQOS & qos);
 
-    virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
-        RtecEventComm::PushSupplier_ptr push_supplier,
-        const RtecEventChannelAdmin::SupplierQOS & qos)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void disconnect_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void disconnect_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void disconnect_push_consumer (
-        const FtRtecEventChannelAdmin::ObjectId & oid)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void suspend_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void suspend_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid)
-      ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
+  virtual void resume_push_supplier (
+      const FtRtecEventChannelAdmin::ObjectId & oid);
 
-    virtual void resume_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid)
-      ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ;
-
-    virtual void push (
-        const FtRtecEventChannelAdmin::ObjectId & oid,
-        const RtecEventComm::EventSet & data)
-      ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
+  virtual void push (
+      const FtRtecEventChannelAdmin::ObjectId & oid,
+      const RtecEventComm::EventSet & data);
 
   /// FTRT::GroupManager Interfaces
   /// These are used for inter-replica communications
 
-  void set_state (
-    const FTRT::State & s)
-    ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState));
+  void set_state (const FTRT::State & s);
 
-  virtual void set_update (const FTRT::State & s)
-    ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence));
+  virtual void set_update (const FTRT::State & s);
 
-  virtual void oneway_set_update (const FTRT::State & s)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void oneway_set_update (const FTRT::State & s);
 
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void create_group (
-        const FTRT::ManagerInfoList & info_list,
-        CORBA::ULong object_group_ref_version)
-      ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ;
+        FTRT::Location_out cur);
 
-    virtual void join_group (
-        const FTRT::ManagerInfo & info
-      )ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void create_group (
+      const FTRT::ManagerInfoList & info_list,
+      CORBA::ULong object_group_ref_version);
 
-    virtual void add_member (
-        const FTRT::ManagerInfo & info,
-        CORBA::ULong object_group_ref_version)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void join_group (const FTRT::ManagerInfo & info);
 
-    virtual void remove_member (
-        const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_member (
+      const FTRT::ManagerInfo & info,
+      CORBA::ULong object_group_ref_version);
 
-    virtual void replica_crashed (
-        const FTRT::Location & location)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual void remove_member (
+      const FTRT::Location & crashed_location,
+      CORBA::ULong object_group_ref_version);
 
+  virtual void replica_crashed (const FTRT::Location & location);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 5171b434179..0a871bebfdf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -234,7 +234,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object (
 ///    this->consumer_admin ()->_this ();
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 TAO_FTEC_Event_Channel_Impl::for_consumers (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = consumer_admin()->reference();
   obj = IOGR_Maker::instance()->forge_iogr(obj.in());
@@ -246,7 +245,6 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 ///    this->supplier_admin ()->_this ();
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_FTEC_Event_Channel_Impl::for_suppliers (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = supplier_admin()->reference();
   obj = IOGR_Maker::instance()->forge_iogr(obj.in());
@@ -427,7 +425,6 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat)
 
 
 void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s)
-  ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate))
 {
   FTRTEC::Replication_Service::instance()->check_validity();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 6ae1dd368fd..36c72ef69f6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -49,20 +49,17 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_consumers (void);
 
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_suppliers (void);
 
   void get_state (FtRtecEventChannelAdmin::EventChannelState & s);
 
   void set_state (const FTRT::State & stat);
 
-  void set_update (const FTRT::State & s)
-      ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate));
+  void set_update (const FTRT::State & s);
 
   /// EventChannelFacade Interface
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 5ea216610e2..8d79ea9a362 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -61,9 +61,6 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out cur
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   listener_ = listener;
   ACE_NEW_RETURN(cur , FTRT::Location(Fault_Detector::instance()->my_location()), false);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index b154e25448f..97981362ac6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -35,8 +35,7 @@ public:
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        FTRT::Location_out cur);
 
   void create_group (
     const FTRT::ManagerInfoList & info_list,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 75ee7462d2b..146adb31e89 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 FTEC_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTEC_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   Request_Context_Repository().allocate_slots(info);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
index 80502fc5245..877c6a26205 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -27,11 +27,9 @@ class FTEC_ORBInitializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 74aea4e3390..bbadda70bea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -32,7 +32,6 @@ TAO_FTEC_ProxyPushConsumer::id() const
 void
 TAO_FTEC_ProxyPushConsumer::activate (
      RtecEventChannelAdmin::ProxyPushConsumer_ptr &result)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
   try{
@@ -51,8 +50,6 @@ TAO_FTEC_ProxyPushConsumer::activate (
 void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -80,7 +77,6 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
 }
 
 void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 2e45f985862..2da0867c22f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -34,18 +34,14 @@ public:
   TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
 
 
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::SupplierQOS& qos);
+  virtual void disconnect_push_consumer (void);
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
   void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index e215955c4d5..941de2b9a07 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -31,7 +31,6 @@ TAO_FTEC_ProxyPushSupplier::id() const
 void
 TAO_FTEC_ProxyPushSupplier::activate (
        RtecEventChannelAdmin::ProxyPushSupplier_ptr &result)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   result =
@@ -51,9 +50,6 @@ TAO_FTEC_ProxyPushSupplier::activate (
 void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -81,7 +77,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
 
 
 void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -100,7 +95,6 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
 
 
 void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -126,7 +120,6 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
 }
 
 void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 90ad86d0101..976deb54b82 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -35,21 +35,14 @@ public:
                            int validate_connection);
     /// Activate in the POA
  virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
-   ACE_THROW_SPEC ((CORBA::SystemException));
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy);
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
+  virtual void disconnect_push_supplier (void);
+  virtual void suspend_connection (void);
+  virtual void resume_connection (void);
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index 7b1d6ff5b5a..cbf09a94882 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -28,7 +28,6 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin()
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_FTEC_SupplierAdmin::obtain_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return obtain_proxy();
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index cd1e66b26ac..4498166f2c6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -67,8 +67,7 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_consumer (void);
 
   void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index ddf0f152674..cc29293f026 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -73,19 +73,15 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor()
 }
 
 char * ForwardCtrlServerInterceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup("ForwardCtrlServerInterceptor");
 }
 
 void ForwardCtrlServerInterceptor::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-                                                    ACE_THROW_SPEC ((CORBA::SystemException,
-                                                    PortableInterceptor::ForwardRequest))
 {
   try{
     IOP::ServiceContext_var service_context =
@@ -107,8 +103,6 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR
 
 void ForwardCtrlServerInterceptor::receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
 }
 
@@ -120,15 +114,14 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
   CORBA::Boolean byte_order;
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0);
+    throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
   cdr.reset_byte_order (static_cast<int> (byte_order));
 
   FT::FTGroupVersionServiceContext fgvsc;
 
   if ((cdr >> fgvsc) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-    CORBA::COMPLETED_NO), 0);
+    throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
   return fgvsc.object_group_ref_version;
 }
@@ -136,7 +129,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
 
 
 void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
   FT::ObjectGroupRefVersion version=0;
@@ -208,14 +200,10 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
 }
 
 void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
 {
 }
 
 void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index 533fd02215c..3bbced4d4f6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -28,31 +28,20 @@ public:
   ForwardCtrlServerInterceptor();
   ~ForwardCtrlServerInterceptor();
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index ccfd9d70465..a863cef8ebb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -126,13 +126,13 @@ get_transaction_depth_context(
   CORBA::Boolean byte_order;
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1);
+    throw CORBA::BAD_PARAM ();
 
   cdr.reset_byte_order (static_cast<int> (byte_order));
 
   FTRT::TransactionDepth result;
   if ((cdr >> result) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1);
+    throw CORBA::BAD_PARAM ();
 
   return result;
 }
@@ -153,12 +153,12 @@ get_sequence_number_context(
   CORBA::Boolean byte_order;
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   cdr.reset_byte_order (static_cast<int> (byte_order));
 
   if ((cdr >> result) == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   return result;
 }
@@ -185,30 +185,24 @@ FtEventServiceInterceptor::instance()
 
 char *
 FtEventServiceInterceptor::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FtEventServiceInterceptor");
 }
 
 void
 FtEventServiceInterceptor::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FtEventServiceInterceptor::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-  PortableInterceptor::ForwardRequest))
 {
 }
 
 
 void
 FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-                                            ACE_THROW_SPEC ((CORBA::SystemException,
-                                            PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
   if (ACE_OS::strcmp(operation.in(), "push") == 0) {
@@ -257,7 +251,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
 
 void
 FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-                                       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext ft_request_service_context;
   IOP::ServiceContext_var service_context;
@@ -279,15 +272,11 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt
 void
 FtEventServiceInterceptor::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-  PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-                                       ACE_THROW_SPEC ((CORBA::SystemException,
-                                       PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 4e7d566c74c..c362d5f67c9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -54,31 +54,20 @@ public:
   ~FtEventServiceInterceptor();
 
   static FtEventServiceInterceptor* instance();
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
   void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state);
   void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index 37a69cd8ceb..4ca242fd20a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -12,7 +12,6 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler(
 void
 ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
                                   const FTRT::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ami_return_val);
   ACE_UNUSED_ARG(the_location);
@@ -20,25 +19,21 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
 
 void
 ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void ObjectGroupManagerHandler::create_group (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
 ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ObjectGroupManagerHandler::add_member (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (--num_backups_ ==0)
     evt_.signal();
@@ -46,20 +41,17 @@ ObjectGroupManagerHandler::add_member (void)
 
 void
 ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->add_member();
 }
 
 void
 ObjectGroupManagerHandler::set_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 252d0df335d..d1938c74516 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -23,29 +23,21 @@ class ObjectGroupManagerHandler
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
   virtual void start (CORBA::Boolean ami_return_val,
-                      const FTRT::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      const FTRT::Location & the_location);
 
-  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void create_group (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void create_group (void);
 
-  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void add_member (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_member (void);
 
-  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void set_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_state (void);
 
-  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
   ACE_Auto_Event& evt_;
   ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index 4247e0e285c..6c63a849077 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -7,7 +7,7 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
-#include "tao/IOP_IORC.h"
+#include "tao/AnyTypeCode/IOP_IORA.h"
 #include "ace/TSS_T.h"
 
 ACE_RCSID (EventChannel,
@@ -73,7 +73,7 @@ get_object_id(CORBA::Any_var a)
   FtRtecEventChannelAdmin::ObjectId_var result;
 
   if ((a.in() >>= object_id) ==0)
-    ACE_THROW_RETURN(CORBA::NO_MEMORY(), result);
+    throw CORBA::NO_MEMORY();
 
   ACE_NEW_THROW_EX(r,
                    FtRtecEventChannelAdmin::ObjectId(*object_id),
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 9434df42bf9..f688b10864d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/IOP_IORA.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
 #include "orbsvcs/FTRTC.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
@@ -22,21 +23,18 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void)
 
 char *
 TAO_Set_Update_Interceptor::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 TAO_Set_Update_Interceptor::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::send_poll (
                                    PortableInterceptor::ClientRequestInfo_ptr)
-                                   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -44,8 +42,6 @@ TAO_Set_Update_Interceptor::send_poll (
 void
 TAO_Set_Update_Interceptor::send_request (
                                       PortableInterceptor::ClientRequestInfo_ptr ri)
-                                      ACE_THROW_SPEC ((CORBA::SystemException,
-                                      PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
@@ -134,23 +130,18 @@ TAO_Set_Update_Interceptor::send_request (
 void
 TAO_Set_Update_Interceptor::receive_reply (
   PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index e8f28530c9d..5823e871dab 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -47,30 +47,20 @@ public:
   virtual ~TAO_Set_Update_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 5806ef940fd..826664b8a8e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -62,9 +62,6 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
 
 void UpdateableHandler::set_update (
                                     )
-                                    ACE_THROW_SPEC ((
-                                    CORBA::SystemException
-                                    ))
 {
   ACE_DEBUG((LM_DEBUG,"Received reply from "));
   dispatch(&Update_Manager::handle_reply);
@@ -72,9 +69,6 @@ void UpdateableHandler::set_update (
 void UpdateableHandler::set_update_excep (
   ::Messaging::ExceptionHolder * excep_holder
   )
-  ACE_THROW_SPEC ((
-  CORBA::SystemException
-  ))
 {
   ACE_DEBUG((LM_DEBUG, "Received Exception from"));
   try{
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index 14bb614b20d..65e04ce4026 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -37,16 +37,10 @@ public:
     void dispatch(Handler handler) ;
 
     virtual void set_update (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        ));
+      );
     virtual void set_update_excep (
         ::Messaging::ExceptionHolder * excep_holder
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
 private:
   AMI_Primary_Replication_Strategy* strategy_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index f36a3765d6c..ab7250abb9d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -24,8 +24,7 @@ public:
   ~FTEC_Gateway_ConsumerAdmin();
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_supplier (void);
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -37,8 +36,7 @@ public:
   ~FTEC_Gateway_SupplierAdmin();
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_consumer (void);
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -51,16 +49,10 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
+  virtual void disconnect_push_supplier (void);
+  virtual void suspend_connection (void);
+  virtual void resume_connection (void);
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -71,16 +63,12 @@ public:
   FTEC_Gateway_ProxyPushConsumer(FTEC_Gateway_Impl* impl);
   ~FTEC_Gateway_ProxyPushConsumer();
 
-  virtual void push (const RtecEventComm::EventSet & data)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet & data);
       // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::SupplierQOS& qos);
+  virtual void disconnect_push_consumer (void);
 
   FTEC_Gateway_Impl* impl_;
 };
@@ -90,11 +78,9 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler
 public:
   PushConsumerHandler();
   ~PushConsumerHandler();
-  virtual void push (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (void);
 
-  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder);
 };
 
 /**
@@ -228,40 +214,29 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 //= The RtecEventChannelAdmin::EventChannel methods
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 FTEC_Gateway::for_consumers (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in());
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 FTEC_Gateway::for_suppliers (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n"));
   return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in());
 }
 
 void FTEC_Gateway::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->ftec->destroy();
 }
 
 RtecEventChannelAdmin::Observer_Handle
 FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-                               ACE_THROW_SPEC ((
-                               CORBA::SystemException,
-                               RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-                               RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return impl_->ftec->append_observer(observer);
 }
 
 void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
-                                    ACE_THROW_SPEC ((
-                                    CORBA::SystemException,
-                                    RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-                                    RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   impl_->ftec->remove_observer(handle);
 }
@@ -291,7 +266,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
@@ -322,7 +296,6 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin()
 // = The RtecEventChannelAdmin::SupplierAdmin methods...
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
   ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY());
@@ -370,9 +343,6 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier()
 void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   RtecEventComm::PushConsumer_ptr push_consumer,
   const RtecEventChannelAdmin::ConsumerQOS &qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    RtecEventChannelAdmin::AlreadyConnected,
-    RtecEventChannelAdmin::TypeError))
 {
 
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
@@ -381,7 +351,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
 }
 
 void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->disconnect_push_supplier(**oid_ptr);
@@ -390,14 +359,12 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
 }
 
 void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->suspend_push_supplier(**oid_ptr);
 }
 
 void FTEC_Gateway_ProxyPushSupplier::resume_connection (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->resume_push_supplier(**oid_ptr);
@@ -418,7 +385,6 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer()
 // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 
 void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data)
-                         ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
@@ -437,15 +403,12 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data)
 void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
   RtecEventComm::PushSupplier_ptr push_supplier,
   const RtecEventChannelAdmin::SupplierQOS& qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-    RtecEventChannelAdmin::AlreadyConnected))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos);
 }
 
 void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->disconnect_push_consumer(**oid_ptr);
@@ -462,12 +425,10 @@ PushConsumerHandler::~PushConsumerHandler()
 }
 
 void PushConsumerHandler::push (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 61dc86eaec3..10ea3c436a2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -38,28 +38,17 @@ namespace TAO_FTRTEC
 
       //= The RtecEventChannelAdmin::EventChannel methods
       virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-        for_consumers (void)
-          ACE_THROW_SPEC((CORBA::SystemException));
+        for_consumers (void);
 
       virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-        for_suppliers (void)
-          ACE_THROW_SPEC((CORBA::SystemException));
+        for_suppliers (void);
 
-      virtual void destroy (void)
-         ACE_THROW_SPEC((CORBA::SystemException));
+      virtual void destroy (void);
 
       virtual RtecEventChannelAdmin::Observer_Handle
-        append_observer
-          (RtecEventChannelAdmin::Observer_ptr observer) ACE_THROW_SPEC((
-                             CORBA::SystemException,
-                             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-                             RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-
-      virtual void remove_observer
-        (RtecEventChannelAdmin::Observer_Handle)  ACE_THROW_SPEC((
-                            CORBA::SystemException,
-                            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-                            RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+        append_observer (RtecEventChannelAdmin::Observer_ptr observer);
+
+      virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
       void push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer,
                 const RtecEventComm::EventSet & data);
diff --git a/TAO/orbsvcs/orbsvcs/GSSUP.idl b/TAO/orbsvcs/orbsvcs/GSSUP.idl
index 4bb8ed232bc..4342db44853 100644
--- a/TAO/orbsvcs/orbsvcs/GSSUP.idl
+++ b/TAO/orbsvcs/orbsvcs/GSSUP.idl
@@ -13,7 +13,7 @@
 #ifndef _GSSUP_IDL_
 #define _GSSUP_IDL_
 
-#include <CSI.idl>
+#include <orbsvcs/CSI.idl>
 //import ::CSI;
 
 module GSSUP {
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 5a749e78051..245a8c38adb 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -294,6 +294,12 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list
 }
 
 int
+TAO::HTIOP::Connection_Handler::set_dscp_codepoint (CORBA::Long /*dscp*/)
+{
+  return 0;
+}
+
+int
 TAO::HTIOP::Connection_Handler::set_dscp_codepoint (
   CORBA::Boolean /*enable_network_priority*/)
 {
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index 2651dafebd0..0d7ce03cf39 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -115,6 +115,7 @@ namespace TAO
       ///Network Priority This method is a no-op, but implemented to
       ///satisfy the base class interface.
       int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+      int set_dscp_codepoint (CORBA::Long dscp);
 
 
       //@{
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index b41499fce78..96ff901bb8b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -10,7 +10,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Connect_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 03d827bba4c..e2af033bd2a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -7,7 +7,7 @@
 #include "ace/os_include/os_netdb.h"
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 1dc902aea56..5dd94dbdbb0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -26,14 +26,12 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
 
 CORBA::DefinitionKind
 TAO_AbstractInterfaceDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_AbstractInterface;
 }
 
 CORBA::Boolean
 TAO_AbstractInterfaceDef_i::is_a (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -44,7 +42,6 @@ TAO_AbstractInterfaceDef_i::is_a (const char *interface_id)
 
 CORBA::Boolean
 TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index 6d63cbf1b50..78373c4219f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    AbstractInterfaceDef_i.h
-//
-// = DESCRIPTION
-//    AbstractInterfaceDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    AbstractInterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  AbstractInterfaceDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ABSTRACTINTERFACEDEF_I_H
 #define TAO_ABSTRACTINTERFACEDEF_I_H
@@ -45,26 +42,23 @@ class TAO_IFRService_Export TAO_AbstractInterfaceDef_i
   //    Represents an abstract interface definition.
   //
 public:
+  /// Constructor
   TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_AbstractInterfaceDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 1dc15433676..ca9da20fd00 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -27,14 +27,12 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void)
 
 CORBA::DefinitionKind
 TAO_AliasDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Alias;
 }
 
 CORBA::TypeCode_ptr
 TAO_AliasDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -45,7 +43,6 @@ TAO_AliasDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_AliasDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -67,7 +64,7 @@ TAO_AliasDef_i::type_i (void)
                                             this->repo_);
   if (0 == impl)
   {
-     ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
+     throw CORBA::OBJECT_NOT_EXIST();
   }
 
   CORBA::TypeCode_var tc = impl->type_i ();
@@ -79,7 +76,6 @@ TAO_AliasDef_i::type_i (void)
 
 CORBA::IDLType_ptr
 TAO_AliasDef_i::original_type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -90,7 +86,6 @@ TAO_AliasDef_i::original_type_def (void)
 
 CORBA::IDLType_ptr
 TAO_AliasDef_i::original_type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString original_type;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -106,7 +101,6 @@ TAO_AliasDef_i::original_type_def_i (void)
 
 void
 TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -117,7 +111,6 @@ TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
 
 void
 TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *original_type =
     TAO_IFR_Service_Utils::reference_to_path (original_type_def);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index c49b2b306c1..899cbc2050d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    AliasDef_i.h
-//
-// = DESCRIPTION
-//    AliasDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    AliasDef_i.h
+ *
+ *  $Id$
+ *
+ *  AliasDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ALIASDEF_I_H
 #define TAO_ALIASDEF_I_H
@@ -45,44 +42,37 @@ public:
   //    Represents an OMG IDL typedef that aliases another definition.
   //
 public:
+  /// Constructor
   TAO_AliasDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_AliasDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::IDLType_ptr original_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr original_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void original_type_def (
       CORBA::IDLType_ptr original_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void original_type_def_i (
       CORBA::IDLType_ptr original_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 1ca4f010a9b..9cf86a4e01e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -25,14 +25,12 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ArrayDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Array;
 }
 
 void
 TAO_ArrayDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -43,7 +41,6 @@ TAO_ArrayDef_i::destroy (void)
 
 void
 TAO_ArrayDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
   this->destroy_element_type ();
@@ -60,7 +57,6 @@ TAO_ArrayDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ArrayDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -71,7 +67,6 @@ TAO_ArrayDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ArrayDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
     this->element_type_i ();
@@ -86,7 +81,6 @@ TAO_ArrayDef_i::type_i (void)
 
 CORBA::ULong
 TAO_ArrayDef_i::length (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -97,7 +91,6 @@ TAO_ArrayDef_i::length (void)
 
 CORBA::ULong
 TAO_ArrayDef_i::length_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int length = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -109,7 +102,6 @@ TAO_ArrayDef_i::length_i (void)
 
 void
 TAO_ArrayDef_i::length (CORBA::ULong length)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -120,7 +112,6 @@ TAO_ArrayDef_i::length (CORBA::ULong length)
 
 void
 TAO_ArrayDef_i::length_i (CORBA::ULong length)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "length",
@@ -129,7 +120,6 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length)
 
 CORBA::TypeCode_ptr
 TAO_ArrayDef_i::element_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -140,7 +130,6 @@ TAO_ArrayDef_i::element_type (void)
 
 CORBA::TypeCode_ptr
 TAO_ArrayDef_i::element_type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -155,7 +144,6 @@ TAO_ArrayDef_i::element_type_i (void)
 
 CORBA::IDLType_ptr
 TAO_ArrayDef_i::element_type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -166,7 +154,6 @@ TAO_ArrayDef_i::element_type_def (void)
 
 CORBA::IDLType_ptr
 TAO_ArrayDef_i::element_type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -182,7 +169,6 @@ TAO_ArrayDef_i::element_type_def_i (void)
 
 void
 TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -193,7 +179,6 @@ TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
 
 void
 TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_element_type ();
 
@@ -208,7 +193,6 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
 void
 TAO_ArrayDef_i::destroy_element_type (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index 34242a7312c..52c8a670e22 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ArrayDef_i.h
-//
-// = DESCRIPTION
-//    ArrayDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ArrayDef_i.h
+ *
+ *  $Id$
+ *
+ *  ArrayDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ARRAYDEF_I_H
 #define TAO_ARRAYDEF_I_H
@@ -35,92 +32,77 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_ArrayDef_i
+ *
+ * @brief TAO_ArrayDef_i
+ *
+ * Represents an IDL array type.
+ */
 class TAO_IFRService_Export TAO_ArrayDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_ArrayDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an IDL array type.
-  //
 public:
+  /// Constructor
   TAO_ArrayDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ArrayDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+;
 
   virtual void destroy_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::TypeCode_ptr type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::ULong length ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::ULong length_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void length (
       CORBA::ULong length)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void length_i (
       CORBA::ULong length)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::TypeCode_ptr element_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr element_type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr element_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr element_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void element_type_def (
       CORBA::IDLType_ptr element_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void element_type_def_i (
       CORBA::IDLType_ptr element_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
 private:
+  /// Destroys an anonymous non-primitive element type.
   void destroy_element_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Destroys an anonymous non-primitive element type.
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 2c6b43db85d..f8be90a495a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -29,14 +29,12 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
 
 CORBA::DefinitionKind
 TAO_AttributeDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Attribute;
 }
 
 CORBA::Contained::Description *
 TAO_AttributeDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -47,7 +45,6 @@ TAO_AttributeDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_AttributeDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -71,7 +68,6 @@ TAO_AttributeDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_AttributeDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -82,7 +78,6 @@ TAO_AttributeDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_AttributeDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -98,7 +93,6 @@ TAO_AttributeDef_i::type_i (void)
 
 CORBA::IDLType_ptr
 TAO_AttributeDef_i::type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -109,7 +103,6 @@ TAO_AttributeDef_i::type_def (void)
 
 CORBA::IDLType_ptr
 TAO_AttributeDef_i::type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -127,7 +120,6 @@ TAO_AttributeDef_i::type_def_i (void)
 
 void
 TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -138,7 +130,6 @@ TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def)
 
 void
 TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path =
     TAO_IFR_Service_Utils::reference_to_path (type_def);
@@ -150,7 +141,6 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 
 CORBA::AttributeMode
 TAO_AttributeDef_i::mode (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
 
@@ -161,7 +151,6 @@ TAO_AttributeDef_i::mode (void)
 
 CORBA::AttributeMode
 TAO_AttributeDef_i::mode_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -173,7 +162,6 @@ TAO_AttributeDef_i::mode_i (void)
 
 void
 TAO_AttributeDef_i::mode (CORBA::AttributeMode mode)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -184,7 +172,6 @@ TAO_AttributeDef_i::mode (CORBA::AttributeMode mode)
 
 void
 TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "mode",
@@ -195,7 +182,6 @@ void
 TAO_AttributeDef_i::make_description (
     CORBA::AttributeDescription &ad
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ad.name = this->name_i ();
 
@@ -217,7 +203,6 @@ TAO_AttributeDef_i::make_description (
 
 CORBA::ExceptionDefSeq *
 TAO_AttributeDef_i::get_exceptions (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
   int index = 0;
@@ -289,7 +274,6 @@ TAO_AttributeDef_i::get_exceptions (void)
 
 CORBA::ExceptionDefSeq *
 TAO_AttributeDef_i::put_exceptions (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
   int index = 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index 6f222d8947f..6da78ff9605 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    AttributeDef_i.h
-//
-// = DESCRIPTION
-//    AttributeDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    AttributeDef_i.h
+ *
+ *  $Id$
+ *
+ *  AttributeDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ATTRIBUTEDEF_I_H
 #define TAO_ATTRIBUTEDEF_I_H
@@ -35,96 +32,81 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_AttributeDef_i
+ *
+ * @brief TAO_AttributeDef_i
+ *
+ * Represents the information that describes an attribute
+ * of an interface.
+ */
 class TAO_IFRService_Export TAO_AttributeDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_AttributeDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the information that describes an attribute
-  //    of an interface.
-  //
 public:
+  /// Constructor
   TAO_AttributeDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_AttributeDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::IDLType_ptr type_def (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::IDLType_ptr type_def_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void type_def (
       CORBA::IDLType_ptr type_def
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void type_def_i (
       CORBA::IDLType_ptr type_def
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AttributeMode mode (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AttributeMode mode_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void mode (
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void mode_i (
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Common code for InterfaceDef to call in
+  /// making its own description.
   void make_description (
       CORBA::AttributeDescription &ad
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Common code for InterfaceDef to call in
-  // making its own description.
+    );
 
   // These two are called by Contained::move().
   CORBA::ExceptionDefSeq *get_exceptions (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExceptionDefSeq *put_exceptions (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 7c600bfc838..666af7b030e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -35,7 +35,6 @@ TAO_ComponentContainer_i::create_component (
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
@@ -56,7 +55,6 @@ TAO_ComponentContainer_i::create_component_i (
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -153,7 +151,6 @@ TAO_ComponentContainer_i::create_home (
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
@@ -178,7 +175,6 @@ TAO_ComponentContainer_i::create_home_i (
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -276,7 +272,6 @@ TAO_ComponentContainer_i::create_event (
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
 
@@ -307,7 +302,6 @@ TAO_ComponentContainer_i::create_event_i (
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index b12a80ada92..94905e6d65d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ComponentContainer_i.h
-//
-// = DESCRIPTION
-//    ComponentContainer_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ComponentContainer_i.h
+ *
+ *  $Id$
+ *
+ *  ComponentContainer_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COMPONENTCONTAINER_I_H
 #define TAO_COMPONENTCONTAINER_I_H
@@ -59,8 +56,7 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::ComponentDef_ptr create_component_i (
       const char *id,
@@ -68,8 +64,7 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::HomeDef_ptr create_home (
       const char *id,
@@ -79,8 +74,7 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::HomeDef_ptr create_home_i (
       const char *id,
@@ -90,8 +84,7 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::EventDef_ptr create_event (
       const char *id,
@@ -104,8 +97,7 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::EventDef_ptr create_event_i (
       const char *id,
@@ -118,11 +110,10 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exisits.
   static int same_as_tmp_name (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exisits.
 
 protected:
   static const char *tmp_name_holder_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index a521c6767df..0638a787613 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -84,14 +84,12 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ComponentDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Component;
 }
 
 void
 TAO_ComponentDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -102,7 +100,6 @@ TAO_ComponentDef_i::destroy (void)
 
 void
 TAO_ComponentDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our special subsections first, then call destroy_i
   // on our base class.
@@ -142,7 +139,6 @@ TAO_ComponentDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_ComponentDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -153,7 +149,6 @@ TAO_ComponentDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ComponentDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::ComponentDescription cd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription,
@@ -278,7 +273,6 @@ TAO_ComponentDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ComponentDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -289,7 +283,6 @@ TAO_ComponentDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ComponentDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -309,7 +302,6 @@ TAO_ComponentDef_i::type_i (void)
 
 CORBA::InterfaceDefSeq *
 TAO_ComponentDef_i::supported_interfaces (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -320,7 +312,6 @@ TAO_ComponentDef_i::supported_interfaces (void)
 
 CORBA::InterfaceDefSeq *
 TAO_ComponentDef_i::supported_interfaces_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDefSeq *seq = 0;
   ACE_NEW_RETURN (seq,
@@ -368,7 +359,6 @@ void
 TAO_ComponentDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -381,7 +371,6 @@ void
 TAO_ComponentDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove the old supported interfaces.
   this->repo_->config ()->remove_section (this->section_key_,
@@ -427,7 +416,6 @@ TAO_ComponentDef_i::supported_interfaces_i (
 
 CORBA::ComponentIR::ComponentDef_ptr
 TAO_ComponentDef_i::base_component (void)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
@@ -438,7 +426,6 @@ TAO_ComponentDef_i::base_component (void)
 
 CORBA::ComponentIR::ComponentDef_ptr
 TAO_ComponentDef_i::base_component_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString base_id;
   int status =
@@ -460,7 +447,6 @@ void
 TAO_ComponentDef_i::base_component (
     CORBA::ComponentIR::ComponentDef_ptr base_component
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -473,7 +459,6 @@ void
 TAO_ComponentDef_i::base_component_i (
     CORBA::ComponentIR::ComponentDef_ptr base_component
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (base_component))
     {
@@ -513,7 +498,6 @@ TAO_ComponentDef_i::create_provides (
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ());
 
@@ -532,7 +516,6 @@ TAO_ComponentDef_i::create_provides_i (
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     TAO_Port_Utils<
@@ -554,7 +537,6 @@ TAO_ComponentDef_i::create_uses (const char *id,
                                  const char *version,
                                  CORBA::InterfaceDef_ptr interface_type,
                                  CORBA::Boolean is_multiple)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
 
@@ -573,7 +555,6 @@ TAO_ComponentDef_i::create_uses_i (const char *id,
                                    const char *version,
                                    CORBA::InterfaceDef_ptr interface_type,
                                    CORBA::Boolean is_multiple)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     TAO_Port_Utils<
@@ -594,7 +575,6 @@ TAO_ComponentDef_i::create_emits (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
 
@@ -611,7 +591,6 @@ TAO_ComponentDef_i::create_emits_i (const char *id,
                                     const char *name,
                                     const char *version,
                                     CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     TAO_Port_Utils<
@@ -632,7 +611,6 @@ TAO_ComponentDef_i::create_publishes (const char *id,
                                       const char *name,
                                       const char *version,
                                       CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
 
@@ -649,7 +627,6 @@ TAO_ComponentDef_i::create_publishes_i (const char *id,
                                         const char *name,
                                         const char *version,
                                         CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     TAO_Port_Utils<
@@ -670,7 +647,6 @@ TAO_ComponentDef_i::create_consumes (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
 
@@ -687,7 +663,6 @@ TAO_ComponentDef_i::create_consumes_i (const char *id,
                                        const char *name,
                                        const char *version,
                                        CORBA::ValueDef_ptr value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     TAO_Port_Utils<
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index 86d789c6842..7c4ca8835b5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ComponentDef_i.h
-//
-// = DESCRIPTION
-//    ComponentDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ComponentDef_i.h
+ *
+ *  $Id$
+ *
+ *  ComponentDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COMPONENTDEF_I_H
 #define TAO_COMPONENTDEF_I_H
@@ -48,98 +45,81 @@ class TAO_IFRService_Export TAO_ComponentDef_i
   //    Represents a component definition.
   //
 public:
+  /// Constructor
   TAO_ComponentDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ComponentDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
+  /// Remove the repository entry.
   void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::ComponentDef_ptr base_component (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::ComponentDef_ptr base_component_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void base_component (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void base_component_i (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::ProvidesDef_ptr create_provides (
       const char *id,
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::ProvidesDef_ptr create_provides_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::UsesDef_ptr create_uses (
       const char *id,
@@ -147,8 +127,7 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::UsesDef_ptr create_uses_i (
       const char *id,
@@ -156,60 +135,53 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::EmitsDef_ptr create_emits (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::EmitsDef_ptr create_emits_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::PublishesDef_ptr create_publishes (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::PublishesDef_ptr create_publishes_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::ConsumesDef_ptr create_consumes_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exists() when we
+  /// are a base component.
   static int name_clash (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exists() when we
-  // are a base component.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
index 6556910861c..0205ab7070c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ComponentModuleDef_i.h
-//
-// = DESCRIPTION
-//    ComponentModuleDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ComponentModuleDef_i.h
+ *
+ *  $Id$
+ *
+ *  ComponentModuleDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COMPONENTMODULEDEF_I_H
 #define TAO_COMPONENTMODULEDEF_I_H
@@ -46,11 +43,11 @@ class TAO_IFRService_Export TAO_ComponentModuleDef_i
   //    types.
   //
 public:
+  /// Constructor
   TAO_ComponentModuleDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ComponentModuleDef_i (void);
-  // Destructor
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index 8b126b100f8..c06ce1059cc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ComponentRepository_i.h
-//
-// = DESCRIPTION
-//    ComponentRepository servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbiltl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ComponentRepository_i.h
+ *
+ *  $Id$
+ *
+ *  ComponentRepository servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbiltl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COMPONENTREPOSITORY_I_H
 #define TAO_COMPONENTREPOSITORY_I_H
@@ -63,18 +60,19 @@ class TAO_IFRService_Export TAO_ComponentRepository_i
   //    CORBA Components.
   //
 public:
+  /// Constructor.
   TAO_ComponentRepository_i (CORBA::ORB_ptr orb,
                              PortableServer::POA_ptr poa,
                              ACE_Configuration *config);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_ComponentRepository_i (void);
-  // Destructor.
 
+  /// We create a default servant servant for each IR Object
+  /// type and its corresponding POA.
   virtual int create_servants_and_poas (void);
-  // We create a default servant servant for each IR Object
-  // type and its corresponding POA.
 
+  /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (
       CORBA::DefinitionKind def_kind
     ) const;
@@ -84,12 +82,11 @@ public:
   virtual TAO_Contained_i *select_contained (
       CORBA::DefinitionKind def_kind
     ) const;
-  // Return one of our servants for internal use.
 
+  /// Select the right POA for object creation.
   virtual PortableServer::POA_ptr select_poa (
       CORBA::DefinitionKind def_kind
     ) const;
-  // Select the right POA for object creation.
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index f8b9a707618..d9948085b90 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -32,14 +32,12 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ConstantDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Constant;
 }
 
 CORBA::Contained::Description *
 TAO_ConstantDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -50,7 +48,6 @@ TAO_ConstantDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ConstantDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -87,7 +84,6 @@ TAO_ConstantDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ConstantDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -98,7 +94,6 @@ TAO_ConstantDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ConstantDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -113,7 +108,6 @@ TAO_ConstantDef_i::type_i (void)
 
 CORBA::IDLType_ptr
 TAO_ConstantDef_i::type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -124,7 +118,6 @@ TAO_ConstantDef_i::type_def (void)
 
 CORBA::IDLType_ptr
 TAO_ConstantDef_i::type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -140,7 +133,6 @@ TAO_ConstantDef_i::type_def_i (void)
 
 void
 TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -151,7 +143,6 @@ TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def)
 
 void
 TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type_def);
 
@@ -162,7 +153,6 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 
 CORBA::Any *
 TAO_ConstantDef_i::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -173,7 +163,6 @@ TAO_ConstantDef_i::value (void)
 
 CORBA::Any *
 TAO_ConstantDef_i::value_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = this->type_i ();
 
@@ -213,7 +202,6 @@ TAO_ConstantDef_i::value_i (void)
 
 void
 TAO_ConstantDef_i::value (const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -224,7 +212,6 @@ TAO_ConstantDef_i::value (const CORBA::Any &value)
 
 void
 TAO_ConstantDef_i::value_i (const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var my_tc =
     this->type_i ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index d19c6294980..20c9f955f0e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ConstantDef_i.h
-//
-// = DESCRIPTION
-//    ConstantDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ConstantDef_i.h
+ *
+ *  $Id$
+ *
+ *  ConstantDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_CONSTANTDEF_I_H
 #define TAO_CONSTANTDEF_I_H
@@ -35,79 +32,67 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_ConstantDef_i
+ *
+ * @brief TAO_ConstantDef_i
+ *
+ * Represents a named constant.
+ */
 class TAO_IFRService_Export TAO_ConstantDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_ConstantDef_i
-  //
-  // = DESCRIPTION
-  //    Represents a named constant.
-  //
 public:
+  /// Constructor
     TAO_ConstantDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ConstantDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void type_def (
       CORBA::IDLType_ptr type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void type_def_i (
       CORBA::IDLType_ptr type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::Any *value ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::Any *value_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void value (
       const CORBA::Any &value)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void value_i (
       const CORBA::Any &value)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index ce389958510..17844ebd678 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -26,7 +26,6 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ConsumesDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Consumes;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 748a33e4a26..90adc1473c2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ConsumesDef_i.h
-//
-// = DESCRIPTION
-//    ConsumesDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ConsumesDef_i.h
+ *
+ *  $Id$
+ *
+ *  ConsumesDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_CONSUMESDEF_I_H
 #define TAO_CONSUMESDEF_I_H
@@ -46,16 +43,15 @@ class TAO_IFRService_Export TAO_ConsumesDef_i
   //    by a component.
   //
 public:
+  /// Constructor
     TAO_ConsumesDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ConsumesDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 5f2d8d419e5..b378fe7f12a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -29,7 +29,6 @@ TAO_Contained_i::~TAO_Contained_i (void)
 
 void
 TAO_Contained_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -40,7 +39,6 @@ TAO_Contained_i::destroy (void)
 
 void
 TAO_Contained_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -96,7 +94,6 @@ TAO_Contained_i::destroy_i (void)
 
 char *
 TAO_Contained_i::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -107,7 +104,6 @@ TAO_Contained_i::id (void)
 
 char *
 TAO_Contained_i::id_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -119,7 +115,6 @@ TAO_Contained_i::id_i (void)
 
 void
 TAO_Contained_i::id (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -130,7 +125,6 @@ TAO_Contained_i::id (const char *id)
 
 void
 TAO_Contained_i::id_i (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
   if (this->repo_->config ()->get_string_value (
@@ -174,7 +168,6 @@ TAO_Contained_i::id_i (const char *id)
 
 char *
 TAO_Contained_i::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -185,7 +178,6 @@ TAO_Contained_i::name (void)
 
 char *
 TAO_Contained_i::name_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -197,7 +189,6 @@ TAO_Contained_i::name_i (void)
 
 char *
 TAO_Contained_i::version (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -208,7 +199,6 @@ TAO_Contained_i::version (void)
 
 char *
 TAO_Contained_i::version_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -220,7 +210,6 @@ TAO_Contained_i::version_i (void)
 
 void
 TAO_Contained_i::name (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -231,7 +220,6 @@ TAO_Contained_i::name (const char *name)
 
 void
 TAO_Contained_i::name_i (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
   CORBA::Boolean exists = this->name_exists (name);
@@ -265,7 +253,6 @@ TAO_Contained_i::name_i (const char *name)
 
 void
 TAO_Contained_i::version (const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -276,7 +263,6 @@ TAO_Contained_i::version (const char *version)
 
 void
 TAO_Contained_i::version_i (const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "version",
@@ -285,7 +271,6 @@ TAO_Contained_i::version_i (const char *version)
 
 CORBA::Container_ptr
 TAO_Contained_i::defined_in (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ());
 
@@ -296,7 +281,6 @@ TAO_Contained_i::defined_in (void)
 
 CORBA::Container_ptr
 TAO_Contained_i::defined_in_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -325,7 +309,6 @@ TAO_Contained_i::defined_in_i (void)
 
 char *
 TAO_Contained_i::absolute_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -336,7 +319,6 @@ TAO_Contained_i::absolute_name (void)
 
 char *
 TAO_Contained_i::absolute_name_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString absolute_name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -348,7 +330,6 @@ TAO_Contained_i::absolute_name_i (void)
 
 CORBA::Repository_ptr
 TAO_Contained_i::containing_repository (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->repo_->repo_objref ();
 }
@@ -356,7 +337,6 @@ TAO_Contained_i::containing_repository (void)
 CORBA::Contained::Description *
 TAO_Contained_i::describe (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will always be overridden by derived classes.
   return 0;
@@ -365,7 +345,6 @@ TAO_Contained_i::describe (
 CORBA::Contained::Description *
 TAO_Contained_i::describe_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will always be overridden by derived classes.
   return 0;
@@ -375,7 +354,6 @@ void
 TAO_Contained_i::move (CORBA::Container_ptr new_container,
                        const char *new_name,
                        const char *new_version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -389,7 +367,6 @@ TAO_Contained_i::move (CORBA::Container_ptr new_container,
 
 CORBA::Boolean
 TAO_Contained_i::name_exists (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -506,7 +483,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
                          CORBA::Boolean cleanup)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Repository_var my_repo = this->repo_->repo_objref ();
 
@@ -954,7 +930,6 @@ void
 TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
                                    const char *contained_path,
                                    const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *container_path =
     TAO_IFR_Service_Utils::reference_to_path (container);
@@ -1008,7 +983,6 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
 
 void
 TAO_Contained_i::move_contents (CORBA::Container_ptr new_container)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
   ACE_TString version;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index 3abe7761641..ec017de342d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    Contained_i.h
-//
-// = DESCRIPTION
-//    Contained servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Contained_i.h
+ *
+ *  $Id$
+ *
+ *  Contained servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_CONTAINED_I_H
 #define TAO_CONTAINED_I_H
@@ -35,166 +32,147 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_Contained_i
+ *
+ * @brief TAO_Contained_i
+ *
+ * Abstract base class for all IR objects that are contained
+ * by other IR objects.
+ */
 class TAO_IFRService_Export TAO_Contained_i : public virtual TAO_IRObject_i
 {
-  // = TITLE
-  //    TAO_Contained_i
-  //
-  // = DESCRIPTION
-  //    Abstract base class for all IR objects that are contained
-  //    by other IR objects.
-  //
 public:
+  /// Constructor.
   TAO_Contained_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_Contained_i (void);
-  // Destructor.
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual char *id (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   char *id_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void id (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void id_i (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual char *name (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   char *name_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void name (
       const char *name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void name_i (
       const char *name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual char *version (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   char *version_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void version (
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void version_i (
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Container_ptr defined_in (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Container_ptr defined_in_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual char *absolute_name (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   char *absolute_name_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Repository_ptr containing_repository (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
-  virtual CORBA::Contained::Description *describe_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Contained::Description *describe_i ();
 
   virtual void move (
       CORBA::Container_ptr new_container,
       const char *new_name,
       const char *new_version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exists.
   static int same_as_tmp_name (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exists.
 
 protected:
+  /**
+   * Engine for move() with an extra 'cleanup'
+   * parameter. Since a section removal can be
+   * recursive, this need be done only at the top
+   * level.
+   */
   void move_i (
       CORBA::Container_ptr new_container,
       const char *new_name,
       const char *new_version,
       CORBA::Boolean cleanup
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Engine for move() with an extra 'cleanup'
-  // parameter. Since a section removal can be
-  // recursive, this need be done only at the top
-  // level.
+    );
 
 private:
+  /// Check if <name> already exists in our container
   CORBA::Boolean name_exists (
       const char *name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Check if <name> already exists in our container
+    );
 
+  /// Recursively update the scoped name of our contents.
   void contents_name_update (
       ACE_TString stem,
       ACE_Configuration_Section_Key key
     );
-  // Recursively update the scoped name of our contents.
 
+  /**
+   * Mangle the names of references that are also
+   * defined in the scope, so a name clash will
+   * not occur when create_* is called. Create_*
+   * unmangles the names.
+   */
   void move_pre_process (
       CORBA::Container_ptr container,
       const char *contained_path,
       const char *name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Mangle the names of references that are also
-  // defined in the scope, so a name clash will
-  // not occur when create_* is called. Create_*
-  // unmangles the names.
+    );
 
+  /**
+   * Recursively calls move_i for definitions,
+   * as well as operations and attributes if
+   * applicable.
+   */
   void move_contents (
       CORBA::Container_ptr new_container
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Recursively calls move_i for definitions,
-  // as well as operations and attributes if
-  // applicable.
+    );
 
 private:
   static const char *tmp_name_holder_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 9d50d1214c8..627160a2184 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -36,7 +36,6 @@ TAO_Container_i::~TAO_Container_i (void)
 
 void
 TAO_Container_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -47,7 +46,6 @@ TAO_Container_i::destroy (void)
 
 void
 TAO_Container_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
   int status;
@@ -174,7 +172,6 @@ TAO_Container_i::destroy_i (void)
 
 CORBA::Contained_ptr
 TAO_Container_i::lookup (const char *search_name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -185,7 +182,6 @@ TAO_Container_i::lookup (const char *search_name)
 
 CORBA::Contained_ptr
 TAO_Container_i::lookup_i (const char *search_name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
   ACE_Configuration_Section_Key work_key;
@@ -397,7 +393,6 @@ TAO_Container_i::lookup_i (const char *search_name)
 CORBA::ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
                            CORBA::Boolean exclude_inherited)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -410,7 +405,6 @@ TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
 CORBA::ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
                              CORBA::Boolean exclude_inherited)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq *contents = 0;
   ACE_NEW_THROW_EX (contents,
@@ -539,7 +533,6 @@ TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
                               CORBA::Boolean exclude_inherited)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -556,7 +549,6 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
                                 CORBA::Boolean exclude_inherited)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -604,7 +596,6 @@ CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
                                     CORBA::Long max_returned_objs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -619,7 +610,6 @@ CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
                                       CORBA::Long max_returned_objs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq_var contents = this->contents_i (limit_type,
                                                       exclude_inherited);
@@ -675,7 +665,6 @@ CORBA::ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
                                 const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ());
 
@@ -690,7 +679,6 @@ CORBA::ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
                                   const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // new_key is not needed when creating a module, but it is needed
   // by most of the other creation methods, so a blank one gets passed in.
@@ -723,7 +711,6 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *version,
                                   CORBA::IDLType_ptr type,
                                   const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ());
 
@@ -742,7 +729,6 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *version,
                                     CORBA::IDLType_ptr type,
                                     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -826,7 +812,6 @@ TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
                                 const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ());
 
@@ -843,7 +828,6 @@ TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
                                   const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -921,7 +905,6 @@ TAO_Container_i::create_union (const char *id,
                                const char *version,
                                CORBA::IDLType_ptr discriminator_type,
                                const CORBA::UnionMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ());
 
@@ -940,7 +923,6 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *version,
                                  CORBA::IDLType_ptr discriminator_type,
                                  const CORBA::UnionMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1029,7 +1011,6 @@ TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA::EnumMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ());
 
@@ -1046,7 +1027,6 @@ TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
                                 const CORBA::EnumMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1081,7 +1061,7 @@ TAO_Container_i::create_enum_i (const char *id,
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "name",
-                                                members[i]);
+                                                members[i].in ());
     }
 
   CORBA::DefinitionKind def_kind =
@@ -1109,7 +1089,6 @@ TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
                                CORBA::IDLType_ptr original_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ());
 
@@ -1126,7 +1105,6 @@ TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA::IDLType_ptr original_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1164,7 +1142,6 @@ TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
                                    const CORBA::InterfaceDefSeq &base_interfaces)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
@@ -1181,7 +1158,6 @@ TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      const CORBA::InterfaceDefSeq &base_interfaces)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1245,7 +1221,6 @@ TAO_Container_i::create_value (
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
@@ -1276,7 +1251,6 @@ TAO_Container_i::create_value_i (
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key new_key;
   ACE_TString path =
@@ -1313,7 +1287,6 @@ TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
                                    CORBA::IDLType_ptr original_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ());
 
@@ -1331,7 +1304,6 @@ TAO_Container_i::create_value_box_i (const char *id,
                                      const char *version,
                                      CORBA::IDLType_ptr original_type_def
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1369,7 +1341,6 @@ TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
                                    const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ());
 
@@ -1386,7 +1357,6 @@ TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1450,7 +1420,6 @@ CORBA::NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
                                 const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ());
 
@@ -1465,7 +1434,6 @@ CORBA::NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
                                   const char *version)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1497,7 +1465,6 @@ TAO_Container_i::create_abstract_interface (
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AbstractInterfaceDef::_nil ());
 
@@ -1516,7 +1483,6 @@ TAO_Container_i::create_abstract_interface_i (
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1574,7 +1540,6 @@ TAO_Container_i::create_local_interface (
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::LocalInterfaceDef::_nil ());
 
@@ -1593,7 +1558,6 @@ TAO_Container_i::create_local_interface_i (
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1657,7 +1621,6 @@ TAO_Container_i::create_ext_value (
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtValueDef::_nil ());
 
@@ -1688,7 +1651,6 @@ TAO_Container_i::create_ext_value_i (
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key new_key;
   ACE_TString path =
@@ -2082,7 +2044,6 @@ TAO_Container_i::lookup_op (
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
                               const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
 
@@ -2469,9 +2430,9 @@ TAO_Container_i::create_value_common (
                 }
               else
                 {
-                  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
-                                                      CORBA::COMPLETED_NO),
-                                    path);
+                  throw CORBA::BAD_PARAM (
+                    CORBA::OMGVMCID | 12,
+                    CORBA::COMPLETED_NO);
                 }
             }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 8ca8e62b07c..b02f29c15ab 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    Container_i.h
-//
-// = DESCRIPTION
-//    Container servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Container_i.h
+ *
+ *  $Id$
+ *
+ *  Container servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_CONTAINER_I_H
 #define TAO_CONTAINER_I_H
@@ -37,100 +34,89 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Repository_i;
 
+/**
+ * @class TAO_Container_i
+ *
+ * @brief TAO_Container_i
+ *
+ * Abstract base class used to form a containment hierarchy
+ * in the Interface Repository, by containing objects
+ * derived from the Contained interface.
+ */
 class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i
 {
-  // = TITLE
-  //    TAO_Container_i
-  //
-  // = DESCRIPTION
-  //    Abstract base class used to form a containment hierarchy
-  //    in the Interface Repository, by containing objects
-  //    derived from the Contained interface.
-  //
 public:
 //  template<typename T>
 //  friend class TAO_Port_Utils;
 
+  /// Constructor.
   TAO_Container_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_Container_i (void);
-  // Destructor.
 
+  /// Remove our contents.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove our contents.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Contained_ptr lookup (
       const char *search_name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Contained_ptr lookup_i (
       const char *search_name
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ContainedSeq *lookup_name (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ContainedSeq *lookup_name_i (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Container::DescriptionSeq *describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Container::DescriptionSeq *describe_contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ModuleDef_ptr create_module (
       const char *id,
       const char *name,
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ModuleDef_ptr create_module_i (
       const char *id,
       const char *name,
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ConstantDef_ptr create_constant (
       const char *id,
@@ -138,8 +124,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ConstantDef_ptr create_constant_i (
       const char *id,
@@ -147,24 +132,21 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::StructDef_ptr create_struct (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::StructDef_ptr create_struct_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::UnionDef_ptr create_union (
       const char *id,
@@ -172,8 +154,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::UnionDef_ptr create_union_i (
       const char *id,
@@ -181,56 +162,49 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::EnumDef_ptr create_enum (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::EnumDef_ptr create_enum_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AliasDef_ptr create_alias (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AliasDef_ptr create_alias_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::InterfaceDef_ptr create_interface (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDef_ptr create_interface_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef_ptr create_value (
       const char *id,
@@ -243,8 +217,7 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef_ptr create_value_i (
       const char *id,
@@ -257,86 +230,75 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueBoxDef_ptr create_value_box (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueBoxDef_ptr create_value_box_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExceptionDef_ptr create_exception (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExceptionDef_ptr create_exception_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::NativeDef_ptr create_native (
       const char *id,
       const char *name,
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::NativeDef_ptr create_native_i (
       const char *id,
       const char *name,
       const char *version
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AbstractInterfaceDef_ptr create_abstract_interface_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::LocalInterfaceDef_ptr create_local_interface_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CORBA::ExtValueDef_ptr create_ext_value (
       const char *id,
@@ -349,8 +311,7 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtValueDef_ptr create_ext_value_i (
       const char *id,
@@ -363,28 +324,26 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exisits.
   static int same_as_tmp_name (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exisits.
 
+  /// Accesses the static member.
   static void tmp_name_holder (const char *name);
-  // Accesses the static member.
 
+  /// Used with structs, unions and exceptions.
   void update_refs (
       const char *path,
       const char *name = 0
     );
-  // Used with structs, unions and exceptions.
 
 protected:
+  /// Store a union member's label value.
    void store_label (
       ACE_Configuration_Section_Key key,
       const CORBA::Any &value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Store a union member's label value.
+    );
 
   void lookup_attr (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
@@ -409,6 +368,7 @@ private:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited);
 
+  /// Common code for create_value_i and create_ext_value_i.
   ACE_TString create_value_common (
       CORBA::DefinitionKind container_kind,
       ACE_Configuration_Section_Key &container_key,
@@ -423,7 +383,6 @@ private:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces
     );
-  // Common code for create_value_i and create_ext_value_i.
 
 protected:
   static const char *tmp_name_holder_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index c31ea85374a..9d3b9fed6f2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -23,7 +23,6 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
 
 CORBA::DefinitionKind
 TAO_EmitsDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Emits;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index 518a12b290b..4c5b590f3fc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    EmitsDef_i.h
-//
-// = DESCRIPTION
-//    EmitsDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    EmitsDef_i.h
+ *
+ *  $Id$
+ *
+ *  EmitsDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EMITSDEF_I_H
 #define TAO_EMITSDEF_I_H
@@ -46,16 +43,15 @@ class TAO_IFRService_Export TAO_EmitsDef_i
   //    by a component.
   //
 public:
+  /// Constructor
     TAO_EmitsDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_EmitsDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 90a70b66fdb..2b80c8608ea 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -27,14 +27,12 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 
 CORBA::DefinitionKind
 TAO_EnumDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
 CORBA::TypeCode_ptr
 TAO_EnumDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -45,7 +43,6 @@ TAO_EnumDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_EnumDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -66,7 +63,6 @@ TAO_EnumDef_i::type_i (void)
 
 CORBA::EnumMemberSeq *
 TAO_EnumDef_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -77,7 +73,6 @@ TAO_EnumDef_i::members (void)
 
 CORBA::EnumMemberSeq *
 TAO_EnumDef_i::members_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -113,7 +108,6 @@ TAO_EnumDef_i::members_i (void)
 
 void
 TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -124,7 +118,6 @@ TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members)
 
 void
 TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "members",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index a9f901135bf..7f44a8e27e8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    EnumDef_i.h
-//
-// = DESCRIPTION
-//    EnumDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    EnumDef_i.h
+ *
+ *  $Id$
+ *
+ *  EnumDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ENUMDEF_I_H
 #define TAO_ENUMDEF_I_H
@@ -45,44 +42,37 @@ public:
   //    Represents an OMG IDL enumeration definition.
   //
 public:
+  /// Constructor
   TAO_EnumDef_i (TAO_Repository_i *repoy);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_EnumDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::EnumMemberSeq *members ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::EnumMemberSeq *members_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void members (
       const CORBA::EnumMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void members_i (
       const CORBA::EnumMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index e682d651f52..5e96026a120 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -26,14 +26,12 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
 
 CORBA::DefinitionKind
 TAO_EventDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Event;
 }
 
 void
 TAO_EventDef_i::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -44,7 +42,6 @@ TAO_EventDef_i::destroy (void)
 
 void
 TAO_EventDef_i::destroy_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // An event type is a restriction of a value type, not an extension.
   this->TAO_ExtValueDef_i::destroy_i ();
@@ -52,7 +49,6 @@ TAO_EventDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_EventDef_i::describe (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -63,14 +59,12 @@ TAO_EventDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_EventDef_i::describe_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->TAO_ValueDef_i::describe_i ();
 }
 
 CORBA::Boolean
 TAO_EventDef_i::is_a (const char *event_id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -81,7 +75,6 @@ TAO_EventDef_i::is_a (const char *event_id)
 
 CORBA::Boolean
 TAO_EventDef_i::is_a_i (const char *event_id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (event_id, "IDL:omg.org/CORBA/EventBase:1.0") == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index 9746d4289d7..78a0cd7007a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    EventDef_i.h
-//
-// = DESCRIPTION
-//    EventDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    EventDef_i.h
+ *
+ *  $Id$
+ *
+ *  EventDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EVENTDEF_I_H
 #define TAO_EVENTDEF_I_H
@@ -35,55 +32,49 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_EventDef_i
+ *
+ * @brief TAO_EventDef_i
+ *
+ * Represents an event definition. It refers to a ValueDef
+ * object that contains information about the event.
+ */
 class TAO_IFRService_Export TAO_EventDef_i : public virtual TAO_ExtValueDef_i
 {
-  // = TITLE
-  //    TAO_EventDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an event definition. It refers to a ValueDef
-  //    object that contains information about the event.
-  //
 public:
+  /// Constructor
     TAO_EventDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_EventDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *event_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index 71d487f0cdd..5b45b14ee9b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -28,7 +28,6 @@ TAO_EventPortDef_i::~TAO_EventPortDef_i (void)
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
 
@@ -40,7 +39,6 @@ TAO_EventPortDef_i::event (
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -55,7 +53,6 @@ void
 TAO_EventPortDef_i::event (
     CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -68,7 +65,6 @@ void
 TAO_EventPortDef_i::event_i (
     CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_value (this->section_key_,
                                         "base_type");
@@ -101,7 +97,6 @@ CORBA::Boolean
 TAO_EventPortDef_i::is_a (
     const char *event_id
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -114,7 +109,6 @@ CORBA::Boolean
 TAO_EventPortDef_i::is_a_i (
     const char *event_id
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -135,7 +129,6 @@ TAO_EventPortDef_i::is_a_i (
 
 CORBA::Contained::Description *
 TAO_EventPortDef_i::describe (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -146,7 +139,6 @@ TAO_EventPortDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_EventPortDef_i::describe_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::EventPortDescription epd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription,
@@ -174,7 +166,6 @@ TAO_EventPortDef_i::describe_i (void)
 
 CORBA::DefinitionKind
 TAO_EventPortDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_none;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index 0c292797cbb..dfef85ad61e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    EventPortDef_i.h
-//
-// = DESCRIPTION
-//    EventPortDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    EventPortDef_i.h
+ *
+ *  $Id$
+ *
+ *  EventPortDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EVENTPORTDEF_I_H
 #define TAO_EVENTPORTDEF_I_H
@@ -48,59 +45,50 @@ class TAO_IFRService_Export TAO_EventPortDef_i
   //    and ConsumesDef_i inherit from this.
   //
 public:
+  //// Constructor
   TAO_EventPortDef_i (TAO_Repository_i *repo);
-  /// Constructor
 
+  //// Destructor
   virtual ~TAO_EventPortDef_i (void);
-  /// Destructor
 
   virtual CORBA::ComponentIR::EventDef_ptr event (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::EventDef_ptr event_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void event (
       CORBA::ComponentIR::EventDef_ptr event
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void event_i (
       CORBA::ComponentIR::EventDef_ptr event
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *event_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   /// This can be the same for the three derived classes, so it is
   /// implemented here.
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
 private:
+  /// Dummy method so we can consolidate derived class methods
+  /// in this 'abstract' base class.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Dummy method so we can consolidate derived class methods
-  // in this 'abstract' base class.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 44fd01ab2f8..97a956d8bbb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -28,14 +28,12 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ExceptionDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Exception;
 }
 
 void
 TAO_ExceptionDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -46,7 +44,6 @@ TAO_ExceptionDef_i::destroy (void)
 
 void
 TAO_ExceptionDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -57,7 +54,6 @@ TAO_ExceptionDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_ExceptionDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -68,7 +64,6 @@ TAO_ExceptionDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ExceptionDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -104,7 +99,6 @@ TAO_ExceptionDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ExceptionDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -115,7 +109,6 @@ TAO_ExceptionDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ExceptionDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -139,7 +132,6 @@ TAO_ExceptionDef_i::type_i (void)
 
 CORBA::StructMemberSeq *
 TAO_ExceptionDef_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -150,7 +142,6 @@ TAO_ExceptionDef_i::members (void)
 
 CORBA::StructMemberSeq *
 TAO_ExceptionDef_i::members_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -261,7 +252,6 @@ TAO_ExceptionDef_i::members_i (void)
 
 void
 TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -272,7 +262,6 @@ TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members)
 
 void
 TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
   TAO_Container_i::destroy_i ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index ae7c11bbc7f..ec4fb834abe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExceptionDef_i.h
-//
-// = DESCRIPTION
-//    ExceptionDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExceptionDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExceptionDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXCEPTIONDEF_I_H
 #define TAO_EXCEPTIONDEF_I_H
@@ -46,62 +43,51 @@ class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i,
   //    Represents an exception definition.
   //
 public:
+  /// Constructor
   TAO_ExceptionDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExceptionDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
-
+  /// Remove the repository entry.
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::StructMemberSeq *members ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::StructMemberSeq *members_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void members (
       const CORBA::StructMemberSeq & members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void members_i (
       const CORBA::StructMemberSeq & members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 7daca75390d..75bff6fe02b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -30,7 +30,6 @@ TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void)
 // disambiguate multiple inheritance.
 void
 TAO_ExtAbstractInterfaceDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index 46b883aa6b0..22b062b8be7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExtAbstractInterfaceDef_i.h
-//
-// = DESCRIPTION
-//    ExtAbstractInterfaceDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExtAbstractInterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExtAbstractInterfaceDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H
 #define TAO_EXTABSTRACTINTERFACEDEF_I_H
@@ -49,15 +46,14 @@ class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i
   //    Mixes in IDL3 attribute exceptions.
   //
 public:
+  /// Constructor
   TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExtAbstractInterfaceDef_i (void);
-  // Destructor
 
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index c71daebd1a3..96e511c2419 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -29,7 +29,6 @@ TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void)
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -41,7 +40,6 @@ TAO_ExtAttributeDef_i::get_exceptions (
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ExcDescriptionSeq *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -59,7 +57,6 @@ void
 TAO_ExtAttributeDef_i::get_exceptions (
     const CORBA::ExcDescriptionSeq &get_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -72,7 +69,6 @@ void
 TAO_ExtAttributeDef_i::get_exceptions_i (
     const CORBA::ExcDescriptionSeq &get_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->exceptions ("get_excepts",
                     get_exceptions);
@@ -81,7 +77,6 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -93,7 +88,6 @@ TAO_ExtAttributeDef_i::set_exceptions (
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ExcDescriptionSeq *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -111,7 +105,6 @@ void
 TAO_ExtAttributeDef_i::set_exceptions (
     const CORBA::ExcDescriptionSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -124,7 +117,6 @@ void
 TAO_ExtAttributeDef_i::set_exceptions_i (
     const CORBA::ExcDescriptionSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->exceptions ("put_excepts",
                     set_exceptions);
@@ -133,7 +125,6 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -145,7 +136,6 @@ TAO_ExtAttributeDef_i::describe_attribute (
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ExtAttributeDescription *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -162,7 +152,6 @@ void
 TAO_ExtAttributeDef_i::fill_description (
     CORBA::ExtAttributeDescription &desc
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   desc.name = this->name_i ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index 8fe264559e3..16ae7ddbec2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExtAttributeDef_i.h
-//
-// = DESCRIPTION
-//    ExtAttributeDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExtAttributeDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExtAttributeDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXTATTRIBUTEDEF_I_H
 #define TAO_EXTATTRIBUTEDEF_I_H
@@ -45,62 +42,51 @@ class TAO_IFRService_Export TAO_ExtAttributeDef_i
   //    Adds IDL3 extensions to AttributeDef.
   //
 public:
+  /// Constructor
   TAO_ExtAttributeDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExtAttributeDef_i (void);
-  // Destructor
 
   virtual CORBA::ExcDescriptionSeq *get_exceptions (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExcDescriptionSeq *get_exceptions_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void get_exceptions (
       const CORBA::ExcDescriptionSeq &get_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void get_exceptions_i (
       const CORBA::ExcDescriptionSeq &get_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExcDescriptionSeq *set_exceptions (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExcDescriptionSeq *set_exceptions_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void set_exceptions (
       const CORBA::ExcDescriptionSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void set_exceptions_i (
       const CORBA::ExcDescriptionSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExtAttributeDescription *describe_attribute (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtAttributeDescription *describe_attribute_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   // Utility function that fills sequence elements for a
   // ComponentDescription.
   void fill_description (
       CORBA::ExtAttributeDescription &desc
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 private:
   /// Common code for the set and get varieties.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
index 11fecc1e6a5..a56b6c860b6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExtInterfaceDef_i.h
-//
-// = DESCRIPTION
-//    ExtInterfaceDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ExtInterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExtInterfaceDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXTINTERFACEDEF_I_H
 #define TAO_EXTINTERFACEDEF_I_H
@@ -49,11 +46,11 @@ class TAO_IFRService_Export TAO_ExtInterfaceDef_i
   //    Mixes in TAO_InterfaceAttrExtension_i to get attribute exceptions.
   //
 public:
+  /// Constructor
   TAO_ExtInterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExtInterfaceDef_i (void);
-  // Destructor
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index f857c37adb0..c15b0fc00ef 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -30,7 +30,6 @@ TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void)
 // disambiguate multiple inheritance.
 void
 TAO_ExtLocalInterfaceDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index fcf64d09eb7..0718f21dacd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExtLocalInterfaceDef_i.h
-//
-// = DESCRIPTION
-//    ExtLocalInterfaceDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExtLocalInterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExtLocalInterfaceDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXTLOCALINTERFACEDEF_I_H
 #define TAO_EXTLOCALINTERFACEDEF_I_H
@@ -48,15 +45,14 @@ class TAO_IFRService_Export TAO_ExtLocalInterfaceDef_i
   //    Mixes in IDL3 attribute exceptions.
   //
 public:
+  /// Constructor
   TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExtLocalInterfaceDef_i (void);
-  // Destructor
 
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 51b596f3b33..7e0a06bab6f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -31,7 +31,6 @@ TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void)
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -43,7 +42,6 @@ TAO_ExtValueDef_i::ext_initializers (
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ExtInitializerSeq *iseq = 0;
   ACE_NEW_RETURN (iseq,
@@ -143,7 +141,6 @@ void
 TAO_ExtValueDef_i::ext_initializers (
     const CORBA::ExtInitializerSeq &ext_initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -156,7 +153,6 @@ void
 TAO_ExtValueDef_i::ext_initializers_i (
     const CORBA::ExtInitializerSeq &ext_initializers
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration *config = this->repo_->config ();
   config->remove_section (this->section_key_,
@@ -200,7 +196,6 @@ TAO_ExtValueDef_i::ext_initializers_i (
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -212,7 +207,6 @@ TAO_ExtValueDef_i::describe_ext_value (
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ExtValueDef::ExtFullValueDescription *fv_desc = 0;
   ACE_NEW_RETURN (fv_desc,
@@ -314,9 +308,9 @@ TAO_ExtValueDef_i::describe_ext_value_i (
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                                  CORBA::COMPLETED_NO),
-                                0);
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 31,
+                CORBA::COMPLETED_NO);
             }
 
           // Operation contexts.
@@ -710,7 +704,6 @@ TAO_ExtValueDef_i::create_ext_attribute (
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
 
@@ -735,7 +728,6 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index b23c69a8c1a..ad80745511e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ExtValueDef_i.h
-//
-// = DESCRIPTION
-//    ExtValueDef_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExtValueDef_i.h
+ *
+ *  $Id$
+ *
+ *  ExtValueDef_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_EXTVALUEDEF_I_H
 #define TAO_EXTVALUEDEF_I_H
@@ -35,47 +32,42 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_ExtValueDef_i
+ *
+ * @brief TAO_ExtValueDef_i
+ *
+ * Adds member and methods to TAO_ValueDef_i to get IDL3
+ * attribute exceptions.
+ */
 class TAO_IFRService_Export TAO_ExtValueDef_i : public virtual TAO_ValueDef_i
 {
-  // = TITLE
-  //    TAO_ExtValueDef_i
-  //
-  // = DESCRIPTION
-  //    Adds member and methods to TAO_ValueDef_i to get IDL3
-  //    attribute exceptions.
-  //
 public:
+  /// Constructor
   TAO_ExtValueDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ExtValueDef_i (void);
-  // Destructor
 
   virtual CORBA::ExtInitializerSeq *ext_initializers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtInitializerSeq *ext_initializers_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void ext_initializers (
       const CORBA::ExtInitializerSeq &ext_initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void ext_initializers_i (
       const CORBA::ExtInitializerSeq &ext_initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExtAttributeDef_ptr create_ext_attribute (
       const char *id,
@@ -85,8 +77,7 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtAttributeDef_ptr create_ext_attribute_i (
       const char *id,
@@ -96,14 +87,13 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  //// Public because it's also called from
+  //// TAO_Container_i::create_ext_value_i.
   void exceptions (ACE_Configuration_Section_Key &key,
                    const char *sub_section,
                    const CORBA::ExcDescriptionSeq &exceptions);
-  /// Public because it's also called from
-  /// TAO_Container_i::create_ext_value_i.
 
 private:
   /// Common code for the set/get operations with attributes and initializers.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index af181277e96..e5ca2a5d3ce 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -24,7 +24,6 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
 
 CORBA::DefinitionKind
 TAO_FactoryDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Factory;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index 0d4a5f59b5d..133b9772e9d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    FactoryDef_i.h
-//
-// = DESCRIPTION
-//    FactoryDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    FactoryDef_i.h
+ *
+ *  $Id$
+ *
+ *  FactoryDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FACTORYDEF_I_H
 #define TAO_FACTORYDEF_I_H
@@ -35,25 +32,25 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_FactoryDef_i
+ *
+ * @brief TAO_FactoryDef_i
+ *
+ * Represents the definition of a factory operation in a home.
+ */
 class TAO_IFRService_Export TAO_FactoryDef_i : public virtual TAO_OperationDef_i
 {
-  // = TITLE
-  //    TAO_FactoryDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of a factory operation in a home.
-  //
 public:
+  /// Constructor
   TAO_FactoryDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_FactoryDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 8cd8f91422f..ea69e2420e7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -23,7 +23,6 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
 
 CORBA::DefinitionKind
 TAO_FinderDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Finder;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index 12784c9c11e..4085bc3af8f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    FinderDef_i.h
-//
-// = DESCRIPTION
-//    FinderDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    FinderDef_i.h
+ *
+ *  $Id$
+ *
+ *  FinderDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FINDERDEF_I_H
 #define TAO_FINDERDEF_I_H
@@ -36,25 +33,25 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_FinderDef_i
+ *
+ * @brief TAO_FinderDef_i
+ *
+ * Represents the definition of a finder operation in a home.
+ */
 class TAO_IFRService_Export TAO_FinderDef_i : public virtual TAO_OperationDef_i
 {
-  // = TITLE
-  //    TAO_FinderDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of a finder operation in a home.
-  //
 public:
+  /// Constructor
   TAO_FinderDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_FinderDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index 002d747bd15..0a027ade496 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -21,14 +21,12 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
 
 CORBA::DefinitionKind
 TAO_FixedDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Fixed;
 }
 
 void
 TAO_FixedDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -39,14 +37,12 @@ TAO_FixedDef_i::destroy (void)
 
 void
 TAO_FixedDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::TypeCode_ptr
 TAO_FixedDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -57,7 +53,6 @@ TAO_FixedDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_FixedDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return CORBA::TypeCode::_nil ();
@@ -65,7 +60,6 @@ TAO_FixedDef_i::type_i (void)
 
 CORBA::UShort
 TAO_FixedDef_i::digits (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -76,7 +70,6 @@ TAO_FixedDef_i::digits (void)
 
 CORBA::UShort
 TAO_FixedDef_i::digits_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
@@ -84,7 +77,6 @@ TAO_FixedDef_i::digits_i (void)
 
 void
 TAO_FixedDef_i::digits (CORBA::UShort digits)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -96,14 +88,12 @@ TAO_FixedDef_i::digits (CORBA::UShort digits)
 void
 TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
                           )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Short
 TAO_FixedDef_i::scale (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -114,7 +104,6 @@ TAO_FixedDef_i::scale (void)
 
 CORBA::Short
 TAO_FixedDef_i::scale_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
@@ -122,7 +111,6 @@ TAO_FixedDef_i::scale_i (void)
 
 void
 TAO_FixedDef_i::scale (CORBA::Short scale)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -134,7 +122,6 @@ TAO_FixedDef_i::scale (CORBA::Short scale)
 void
 TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
                          )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index 9b65f9b02dc..84f1dc7e5b5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    FixedDef_i.h
-//
-// = DESCRIPTION
-//    FixedDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    FixedDef_i.h
+ *
+ *  $Id$
+ *
+ *  FixedDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FIXEDDEF_I_H
 #define TAO_FIXEDDEF_I_H
@@ -35,80 +32,68 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_FixedDef_i
+ *
+ * @brief TAO_FixedDef_i
+ *
+ * Represents an IDL fixed type.
+ */
 class TAO_IFRService_Export TAO_FixedDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_FixedDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an IDL fixed type.
-  //
 public:
+  /// Constructor
   TAO_FixedDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_FixedDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
   virtual CORBA::UShort digits (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::UShort digits_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void digits (
       CORBA::UShort digits
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void digits_i (
       CORBA::UShort digits
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Short scale (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Short scale_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void scale (
       CORBA::Short scale
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void scale_i (
       CORBA::Short scale
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index f8ae5fb993e..7e8838fdee0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -37,14 +37,12 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
 
 CORBA::DefinitionKind
 TAO_HomeDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Home;
 }
 
 void
 TAO_HomeDef_i::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -55,7 +53,6 @@ TAO_HomeDef_i::destroy (void)
 
 void
 TAO_HomeDef_i::destroy_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our special subsections first, then call destroy_i
   // on our base class.
@@ -77,7 +74,6 @@ TAO_HomeDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_HomeDef_i::describe (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -88,7 +84,6 @@ TAO_HomeDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_HomeDef_i::describe_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::HomeDescription home_desc;
 
@@ -164,7 +159,6 @@ TAO_HomeDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_HomeDef_i::type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -175,7 +169,6 @@ TAO_HomeDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_HomeDef_i::type_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -193,7 +186,6 @@ TAO_HomeDef_i::type_i (void)
 
 CORBA::ComponentIR::HomeDef_ptr
 TAO_HomeDef_i::base_home (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
@@ -204,7 +196,6 @@ TAO_HomeDef_i::base_home (void)
 
 CORBA::ComponentIR::HomeDef_ptr
 TAO_HomeDef_i::base_home_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
   int status =
@@ -228,7 +219,6 @@ void
 TAO_HomeDef_i::base_home (
     CORBA::ComponentIR::HomeDef_ptr base_home
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -241,7 +231,6 @@ void
 TAO_HomeDef_i::base_home_i (
     CORBA::ComponentIR::HomeDef_ptr base_home
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *path = TAO_IFR_Service_Utils::reference_to_path (base_home);
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -252,7 +241,6 @@ TAO_HomeDef_i::base_home_i (
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -264,7 +252,6 @@ TAO_HomeDef_i::supported_interfaces (
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDefSeq *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -312,7 +299,6 @@ void
 TAO_HomeDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -325,7 +311,6 @@ void
 TAO_HomeDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "supported",
@@ -360,7 +345,6 @@ TAO_HomeDef_i::supported_interfaces_i (
 
 CORBA::ComponentIR::ComponentDef_ptr
 TAO_HomeDef_i::managed_component (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
@@ -371,7 +355,6 @@ TAO_HomeDef_i::managed_component (void)
 
 CORBA::ComponentIR::ComponentDef_ptr
 TAO_HomeDef_i::managed_component_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -388,7 +371,6 @@ void
 TAO_HomeDef_i::managed_component (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -401,7 +383,6 @@ void
 TAO_HomeDef_i::managed_component_i (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *path = TAO_IFR_Service_Utils::reference_to_path (managed_component);
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -411,7 +392,6 @@ TAO_HomeDef_i::managed_component_i (
 
 CORBA::ValueDef_ptr
 TAO_HomeDef_i::primary_key (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
@@ -422,7 +402,6 @@ TAO_HomeDef_i::primary_key (void)
 
 CORBA::ValueDef_ptr
 TAO_HomeDef_i::primary_key_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
   int status =
@@ -446,7 +425,6 @@ void
 TAO_HomeDef_i::primary_key (
     CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -459,7 +437,6 @@ void
 TAO_HomeDef_i::primary_key_i (
     CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (primary_key))
     {
@@ -480,7 +457,6 @@ TAO_HomeDef_i::create_factory (const char *id,
                                const char *version,
                                const CORBA::ParDescriptionSeq &params,
                                const CORBA::ExceptionDefSeq &exceptions)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
 
@@ -501,7 +477,6 @@ TAO_HomeDef_i::create_factory_i (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = this->create_common (CORBA::dk_Factory,
                                                id,
@@ -520,7 +495,6 @@ TAO_HomeDef_i::create_finder (const char *id,
                               const char *version,
                               const CORBA::ParDescriptionSeq &params,
                               const CORBA::ExceptionDefSeq &exceptions)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
 
@@ -541,7 +515,6 @@ TAO_HomeDef_i::create_finder_i (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = this->create_common (CORBA::dk_Finder,
                                                id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index ed65ff0c98b..c1252455fe1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    HomeDef_i.h
-//
-// = DESCRIPTION
-//    HomeDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    HomeDef_i.h
+ *
+ *  $Id$
+ *
+ *  HomeDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_HOMEDEF_I_H
 #define TAO_HOMEDEF_I_H
@@ -48,117 +45,94 @@ class TAO_IFRService_Export TAO_HomeDef_i
   //    Represents a home definition, containing factory and finder.
   //
 public:
+  /// Constructor
   TAO_HomeDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_HomeDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
   virtual CORBA::ComponentIR::HomeDef_ptr base_home (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::HomeDef_ptr base_home_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void base_home (
       CORBA::ComponentIR::HomeDef_ptr base_home
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void base_home_i (
       CORBA::ComponentIR::HomeDef_ptr base_home
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::ComponentDef_ptr managed_component_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef_ptr primary_key (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef_ptr primary_key_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void primary_key (
       CORBA::ValueDef_ptr primary_key
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void primary_key_i (
       CORBA::ValueDef_ptr primary_key
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::FactoryDef_ptr create_factory (
       const char *id,
@@ -166,8 +140,7 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::FactoryDef_ptr create_factory_i (
       const char *id,
@@ -175,8 +148,7 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ComponentIR::FinderDef_ptr create_finder (
       const char *id,
@@ -184,8 +156,7 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ComponentIR::FinderDef_ptr create_finder_i (
       const char *id,
@@ -193,8 +164,7 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 private:
   // Common code for create_factory_i and create_finder_i.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index edcd9b89dc9..10dd285d1ea 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    IDLType_i.h
-//
-// = DESCRIPTION
-//    IDLType servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    IDLType_i.h
+ *
+ *  $Id$
+ *
+ *  IDLType servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IDLTYPE_I_H
 #define TAO_IDLTYPE_I_H
@@ -36,32 +33,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Repository_i;
 
+/**
+ * @class TAO_IDLType_i
+ *
+ * @brief TAO_IDLType_i
+ *
+ * Abstract base class for all IR objects that represent
+ * OMG IDL types. Provides access to the TypeCode describing
+ * the type.
+ */
 class TAO_IFRService_Export TAO_IDLType_i : public virtual TAO_IRObject_i
 {
-  // = TITLE
-  //    TAO_IDLType_i
-  //
-  // = DESCRIPTION
-  //    Abstract base class for all IR objects that represent
-  //    OMG IDL types. Provides access to the TypeCode describing
-  //    the type.
-  //
 public:
+  /// Constructor.
   TAO_IDLType_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_IDLType_i (void);
-  // Destructor.
-
+  /// Defined in concrete classes.
   virtual CORBA::TypeCode_ptr type ()
 
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Defined in concrete classes.
-
+    = 0;
+  /// Defined in concrete classes.
   virtual CORBA::TypeCode_ptr type_i ()
 
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Defined in concrete classes.
+    = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index 001a3580327..f218c80aa55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -127,9 +127,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::DefinitionKind def_kind (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_def_kind_skel (
         TAO_ServerRequest & server_request,
@@ -142,9 +140,7 @@ namespace POA_CORBA
 
     virtual void destroy (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void destroy_skel (
         TAO_ServerRequest & server_request,
@@ -224,9 +220,7 @@ namespace POA_CORBA
 
     virtual char * id (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_id_skel (
         TAO_ServerRequest & server_request,
@@ -240,9 +234,7 @@ namespace POA_CORBA
     virtual void id (
         const char * id
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_id_skel (
         TAO_ServerRequest & server_request,
@@ -255,9 +247,7 @@ namespace POA_CORBA
 
     virtual char * name (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_name_skel (
         TAO_ServerRequest & server_request,
@@ -271,9 +261,7 @@ namespace POA_CORBA
     virtual void name (
         const char * name
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_name_skel (
         TAO_ServerRequest & server_request,
@@ -286,9 +274,7 @@ namespace POA_CORBA
 
     virtual char * version (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_version_skel (
         TAO_ServerRequest & server_request,
@@ -302,9 +288,7 @@ namespace POA_CORBA
     virtual void version (
         const char * version
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_version_skel (
         TAO_ServerRequest & server_request,
@@ -317,9 +301,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Container_ptr defined_in (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_defined_in_skel (
         TAO_ServerRequest & server_request,
@@ -332,9 +314,7 @@ namespace POA_CORBA
 
     virtual char * absolute_name (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest & server_request,
@@ -347,9 +327,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Repository_ptr containing_repository (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest & server_request,
@@ -362,9 +340,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Contained::Description * describe (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_skel (
         TAO_ServerRequest & server_request,
@@ -380,9 +356,7 @@ namespace POA_CORBA
         const char * new_name,
         const char * new_version
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void move_skel (
         TAO_ServerRequest & server_request,
@@ -480,9 +454,7 @@ namespace POA_CORBA
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void lookup_skel (
         TAO_ServerRequest & server_request,
@@ -497,9 +469,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void contents_skel (
         TAO_ServerRequest & server_request,
@@ -516,9 +486,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void lookup_name_skel (
         TAO_ServerRequest & server_request,
@@ -534,9 +502,7 @@ namespace POA_CORBA
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_contents_skel (
         TAO_ServerRequest & server_request,
@@ -552,9 +518,7 @@ namespace POA_CORBA
         const char * name,
         const char * version
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_module_skel (
         TAO_ServerRequest & server_request,
@@ -572,9 +536,7 @@ namespace POA_CORBA
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_constant_skel (
         TAO_ServerRequest & server_request,
@@ -591,9 +553,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::StructMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_struct_skel (
         TAO_ServerRequest & server_request,
@@ -611,9 +571,7 @@ namespace POA_CORBA
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_union_skel (
         TAO_ServerRequest & server_request,
@@ -630,9 +588,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::EnumMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_enum_skel (
         TAO_ServerRequest & server_request,
@@ -649,9 +605,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr original_type
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_alias_skel (
         TAO_ServerRequest & server_request,
@@ -668,9 +622,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_interface_skel (
         TAO_ServerRequest & server_request,
@@ -693,9 +645,7 @@ namespace POA_CORBA
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_value_skel (
         TAO_ServerRequest & server_request,
@@ -712,9 +662,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_value_box_skel (
         TAO_ServerRequest & server_request,
@@ -731,9 +679,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::StructMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_exception_skel (
         TAO_ServerRequest & server_request,
@@ -749,9 +695,7 @@ namespace POA_CORBA
         const char * name,
         const char * version
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_native_skel (
         TAO_ServerRequest & server_request,
@@ -768,9 +712,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_abstract_interface_skel (
         TAO_ServerRequest & server_request,
@@ -787,9 +729,7 @@ namespace POA_CORBA
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_local_interface_skel (
         TAO_ServerRequest & server_request,
@@ -812,9 +752,7 @@ namespace POA_CORBA
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_ext_value_skel (
         TAO_ServerRequest & server_request,
@@ -911,9 +849,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_skel (
         TAO_ServerRequest & server_request,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index 1ce7d87c23e..66412576968 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -86,19 +86,13 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -153,112 +147,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -267,10 +225,7 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -325,29 +280,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -355,10 +301,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -368,10 +311,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -380,10 +320,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -392,10 +329,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -406,10 +340,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -419,10 +350,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -433,10 +361,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -446,10 +371,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -459,10 +381,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -472,10 +391,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -491,10 +407,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -504,10 +417,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -517,10 +427,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -529,10 +436,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -542,10 +446,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -555,10 +456,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -574,10 +472,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -632,28 +527,19 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -708,112 +594,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -822,19 +672,13 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index fccfd0f9853..3947d727aaf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -129,9 +129,6 @@ POA_CORBA::IRObject_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -143,9 +140,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::IRObject_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -250,9 +244,6 @@ POA_CORBA::Contained_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -264,9 +255,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -278,9 +266,6 @@ void POA_CORBA::Contained_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -293,9 +278,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -308,9 +290,6 @@ void POA_CORBA::Contained_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -323,9 +302,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -338,9 +314,6 @@ void POA_CORBA::Contained_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -353,9 +326,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -368,9 +338,6 @@ void POA_CORBA::Contained_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -382,9 +349,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -396,9 +360,6 @@ char * POA_CORBA::Contained_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -410,9 +371,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -427,9 +385,6 @@ void POA_CORBA::Contained_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -537,9 +492,6 @@ POA_CORBA::Container_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -551,9 +503,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::Container_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -566,9 +515,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -583,9 +529,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -603,9 +546,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -624,9 +564,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -644,9 +581,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -666,9 +600,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -689,9 +620,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -712,9 +640,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -735,9 +660,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -757,9 +679,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -779,9 +698,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -807,9 +723,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -835,9 +748,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -857,9 +767,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -878,9 +785,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -899,9 +803,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -921,9 +822,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -949,9 +847,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -1066,9 +961,6 @@ POA_CORBA::IDLType_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1080,9 +972,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::IDLType_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1094,9 +983,6 @@ void POA_CORBA::IDLType_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -1201,9 +1087,6 @@ POA_CORBA::TypedefDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1215,9 +1098,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1229,9 +1109,6 @@ void POA_CORBA::TypedefDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -1244,9 +1121,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -1259,9 +1133,6 @@ void POA_CORBA::TypedefDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -1274,9 +1145,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -1289,9 +1157,6 @@ void POA_CORBA::TypedefDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -1304,9 +1169,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -1319,9 +1181,6 @@ void POA_CORBA::TypedefDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -1333,9 +1192,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -1347,9 +1203,6 @@ char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -1361,9 +1214,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -1378,9 +1228,6 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -1395,9 +1242,6 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index a98ed5c6385..dd5d4df25fc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -128,9 +128,7 @@ namespace POA_CORBA
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void lookup_id_skel (
         TAO_ServerRequest & server_request,
@@ -144,9 +142,7 @@ namespace POA_CORBA
     virtual ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void get_canonical_typecode_skel (
         TAO_ServerRequest & server_request,
@@ -160,9 +156,7 @@ namespace POA_CORBA
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void get_primitive_skel (
         TAO_ServerRequest & server_request,
@@ -176,9 +170,7 @@ namespace POA_CORBA
     virtual ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_string_skel (
         TAO_ServerRequest & server_request,
@@ -192,9 +184,7 @@ namespace POA_CORBA
     virtual ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_wstring_skel (
         TAO_ServerRequest & server_request,
@@ -209,9 +199,7 @@ namespace POA_CORBA
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_sequence_skel (
         TAO_ServerRequest & server_request,
@@ -226,9 +214,7 @@ namespace POA_CORBA
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_array_skel (
         TAO_ServerRequest & server_request,
@@ -243,9 +229,7 @@ namespace POA_CORBA
         ::CORBA::UShort digits,
         ::CORBA::Short scale
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_fixed_skel (
         TAO_ServerRequest & server_request,
@@ -870,9 +854,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_skel (
         TAO_ServerRequest & server_request,
@@ -885,9 +867,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -901,9 +881,7 @@ namespace POA_CORBA
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -916,9 +894,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Any * value (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_value_skel (
         TAO_ServerRequest & server_request,
@@ -932,9 +908,7 @@ namespace POA_CORBA
     virtual void value (
         const ::CORBA::Any & value
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_value_skel (
         TAO_ServerRequest & server_request,
@@ -1115,9 +1089,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::StructMemberSeq * members (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_members_skel (
         TAO_ServerRequest & server_request,
@@ -1131,9 +1103,7 @@ namespace POA_CORBA
     virtual void members (
         const ::CORBA::StructMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_members_skel (
         TAO_ServerRequest & server_request,
@@ -1501,9 +1471,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr discriminator_type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_discriminator_type_skel (
         TAO_ServerRequest & server_request,
@@ -1516,9 +1484,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_discriminator_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -1532,9 +1498,7 @@ namespace POA_CORBA
     virtual void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_discriminator_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -1547,9 +1511,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::UnionMemberSeq * members (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_members_skel (
         TAO_ServerRequest & server_request,
@@ -1563,9 +1525,7 @@ namespace POA_CORBA
     virtual void members (
         const ::CORBA::UnionMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_members_skel (
         TAO_ServerRequest & server_request,
@@ -1932,9 +1892,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::EnumMemberSeq * members (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_members_skel (
         TAO_ServerRequest & server_request,
@@ -1948,9 +1906,7 @@ namespace POA_CORBA
     virtual void members (
         const ::CORBA::EnumMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_members_skel (
         TAO_ServerRequest & server_request,
@@ -2137,9 +2093,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr original_type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_original_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -2153,9 +2107,7 @@ namespace POA_CORBA
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_original_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -2516,9 +2468,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::PrimitiveKind kind (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_kind_skel (
         TAO_ServerRequest & server_request,
@@ -2622,9 +2572,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ULong bound (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2638,9 +2586,7 @@ namespace POA_CORBA
     virtual void bound (
         ::CORBA::ULong bound
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2744,9 +2690,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ULong bound (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2760,9 +2704,7 @@ namespace POA_CORBA
     virtual void bound (
         ::CORBA::ULong bound
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2866,9 +2808,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ULong bound (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2882,9 +2822,7 @@ namespace POA_CORBA
     virtual void bound (
         ::CORBA::ULong bound
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_bound_skel (
         TAO_ServerRequest & server_request,
@@ -2897,9 +2835,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr element_type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_element_type_skel (
         TAO_ServerRequest & server_request,
@@ -2912,9 +2848,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr element_type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_element_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -2928,9 +2862,7 @@ namespace POA_CORBA
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_element_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -3034,9 +2966,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ULong length (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_length_skel (
         TAO_ServerRequest & server_request,
@@ -3050,9 +2980,7 @@ namespace POA_CORBA
     virtual void length (
         ::CORBA::ULong length
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_length_skel (
         TAO_ServerRequest & server_request,
@@ -3065,9 +2993,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr element_type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_element_type_skel (
         TAO_ServerRequest & server_request,
@@ -3080,9 +3006,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr element_type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_element_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -3096,9 +3020,7 @@ namespace POA_CORBA
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_element_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -3203,9 +3125,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_skel (
         TAO_ServerRequest & server_request,
@@ -3218,9 +3138,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::StructMemberSeq * members (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_members_skel (
         TAO_ServerRequest & server_request,
@@ -3234,9 +3152,7 @@ namespace POA_CORBA
     virtual void members (
         const ::CORBA::StructMemberSeq & members
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_members_skel (
         TAO_ServerRequest & server_request,
@@ -3596,9 +3512,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_skel (
         TAO_ServerRequest & server_request,
@@ -3611,9 +3525,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -3627,9 +3539,7 @@ namespace POA_CORBA
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -3642,9 +3552,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::AttributeMode mode (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_mode_skel (
         TAO_ServerRequest & server_request,
@@ -3658,9 +3566,7 @@ namespace POA_CORBA
     virtual void mode (
         ::CORBA::AttributeMode mode
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_mode_skel (
         TAO_ServerRequest & server_request,
@@ -3840,9 +3746,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_get_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -3856,9 +3760,7 @@ namespace POA_CORBA
     virtual void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_get_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -3871,9 +3773,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_set_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -3887,9 +3787,7 @@ namespace POA_CORBA
     virtual void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_set_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -3902,9 +3800,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_attribute_skel (
         TAO_ServerRequest & server_request,
@@ -4119,9 +4015,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr result (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_result_skel (
         TAO_ServerRequest & server_request,
@@ -4134,9 +4028,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr result_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_result_def_skel (
         TAO_ServerRequest & server_request,
@@ -4150,9 +4042,7 @@ namespace POA_CORBA
     virtual void result_def (
         ::CORBA::IDLType_ptr result_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_result_def_skel (
         TAO_ServerRequest & server_request,
@@ -4165,9 +4055,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ParDescriptionSeq * params (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_params_skel (
         TAO_ServerRequest & server_request,
@@ -4181,9 +4069,7 @@ namespace POA_CORBA
     virtual void params (
         const ::CORBA::ParDescriptionSeq & params
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_params_skel (
         TAO_ServerRequest & server_request,
@@ -4196,9 +4082,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::OperationMode mode (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_mode_skel (
         TAO_ServerRequest & server_request,
@@ -4212,9 +4096,7 @@ namespace POA_CORBA
     virtual void mode (
         ::CORBA::OperationMode mode
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_mode_skel (
         TAO_ServerRequest & server_request,
@@ -4227,9 +4109,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ContextIdSeq * contexts (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_contexts_skel (
         TAO_ServerRequest & server_request,
@@ -4243,9 +4123,7 @@ namespace POA_CORBA
     virtual void contexts (
         const ::CORBA::ContextIdSeq & contexts
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_contexts_skel (
         TAO_ServerRequest & server_request,
@@ -4258,9 +4136,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExceptionDefSeq * exceptions (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -4274,9 +4150,7 @@ namespace POA_CORBA
     virtual void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_exceptions_skel (
         TAO_ServerRequest & server_request,
@@ -4458,9 +4332,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest & server_request,
@@ -4474,9 +4346,7 @@ namespace POA_CORBA
     virtual void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest & server_request,
@@ -4490,9 +4360,7 @@ namespace POA_CORBA
     virtual ::CORBA::Boolean is_a (
         const char * interface_id
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void is_a_skel (
         TAO_ServerRequest & server_request,
@@ -4505,9 +4373,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_interface_skel (
         TAO_ServerRequest & server_request,
@@ -4525,9 +4391,7 @@ namespace POA_CORBA
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_attribute_skel (
         TAO_ServerRequest & server_request,
@@ -4548,9 +4412,7 @@ namespace POA_CORBA
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_operation_skel (
         TAO_ServerRequest & server_request,
@@ -4917,9 +4779,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_ext_interface_skel (
         TAO_ServerRequest & server_request,
@@ -4939,9 +4799,7 @@ namespace POA_CORBA
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_ext_attribute_skel (
         TAO_ServerRequest & server_request,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index f9dbb974fbf..6e34f9b7d94 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -86,29 +86,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -116,10 +107,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -129,10 +117,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -141,10 +126,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -153,10 +135,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -167,10 +146,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -180,10 +156,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -194,10 +167,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -207,10 +177,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -220,10 +187,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -233,10 +197,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -252,10 +213,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -265,10 +223,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -278,10 +233,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -290,10 +242,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -303,10 +252,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -316,10 +262,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -335,60 +278,42 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup_id (
         const char * search_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -396,10 +321,7 @@ namespace POA_CORBA
     ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -407,10 +329,7 @@ namespace POA_CORBA
     ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -418,10 +337,7 @@ namespace POA_CORBA
     ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -476,29 +392,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -506,10 +413,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -519,10 +423,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -531,10 +432,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -543,10 +441,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -557,10 +452,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -570,10 +462,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -584,10 +473,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -597,10 +483,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -610,10 +493,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -623,10 +503,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -642,10 +519,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -655,10 +529,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -668,10 +539,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -680,10 +548,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -693,10 +558,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -706,10 +568,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -725,103 +584,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -830,10 +656,7 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -888,112 +711,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1002,57 +789,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Any * value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void value (
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -1107,112 +876,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1221,29 +954,20 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1251,10 +975,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1264,10 +985,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1276,10 +994,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1288,10 +1003,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1302,10 +1014,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1315,10 +1024,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1329,10 +1035,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1342,10 +1045,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1355,10 +1055,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1368,10 +1065,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1387,10 +1081,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1400,10 +1091,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1413,10 +1101,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1425,10 +1110,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1438,10 +1120,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1451,10 +1130,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1470,29 +1146,20 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void members (
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -1547,112 +1214,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1661,29 +1292,20 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1691,10 +1313,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1704,10 +1323,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1716,10 +1332,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1728,10 +1341,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1742,10 +1352,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1755,10 +1362,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1769,10 +1373,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1782,10 +1383,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1795,10 +1393,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1808,10 +1403,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1827,10 +1419,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1840,10 +1429,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1853,10 +1439,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1865,10 +1448,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1878,10 +1458,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1891,10 +1468,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1910,57 +1484,39 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr discriminator_type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr discriminator_type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UnionMemberSeq * members (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void members (
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2015,112 +1571,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -2129,38 +1649,26 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::EnumMemberSeq * members (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void members (
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2215,112 +1723,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -2329,38 +1801,26 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2415,112 +1875,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -2529,19 +1953,13 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2596,37 +2014,25 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::PrimitiveKind kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2681,47 +2087,32 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void bound (
         ::CORBA::ULong bound
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2776,47 +2167,32 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void bound (
         ::CORBA::ULong bound
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2871,75 +2247,51 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void bound (
         ::CORBA::ULong bound
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -2994,75 +2346,51 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong length (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void length (
         ::CORBA::ULong length
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -3117,112 +2445,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3231,20 +2523,14 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3252,10 +2538,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3265,10 +2548,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3277,10 +2557,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3289,10 +2566,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3303,10 +2577,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3316,10 +2587,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3330,10 +2598,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3343,10 +2608,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3356,10 +2618,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3369,10 +2628,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3388,10 +2644,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3401,10 +2654,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3414,10 +2664,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3426,10 +2673,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3439,10 +2683,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3452,10 +2693,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3471,38 +2709,26 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void members (
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -3557,112 +2783,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3671,57 +2861,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void mode (
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -3776,112 +2948,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -3890,104 +3026,71 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void mode (
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * get_exceptions (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * set_exceptions (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtAttributeDescription * describe_attribute (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -4042,112 +3145,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4156,114 +3223,78 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr result (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr result_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void result_def (
         ::CORBA::IDLType_ptr result_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ParDescriptionSeq * params (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void params (
         const ::CORBA::ParDescriptionSeq & params
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::OperationMode mode (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void mode (
         ::CORBA::OperationMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ContextIdSeq * contexts (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void contexts (
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExceptionDefSeq * exceptions (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -4318,29 +3349,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4348,10 +3370,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4361,10 +3380,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4373,10 +3389,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4385,10 +3398,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4399,10 +3409,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4412,10 +3419,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4426,10 +3430,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4439,10 +3440,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4452,10 +3450,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4465,10 +3460,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4484,10 +3476,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4497,10 +3486,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4510,10 +3496,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4522,10 +3505,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4535,10 +3515,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4548,10 +3525,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4567,103 +3541,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4672,57 +3613,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4733,10 +3656,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4750,10 +3670,7 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -4808,10 +3725,7 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4824,10 +3738,7 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -4882,29 +3793,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4912,10 +3814,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4925,10 +3824,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4937,10 +3833,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4949,10 +3842,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4963,10 +3853,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4976,10 +3863,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -4990,10 +3874,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5003,10 +3884,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5016,10 +3894,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5029,10 +3904,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5048,10 +3920,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5061,10 +3930,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5074,10 +3940,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5086,10 +3949,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5099,10 +3959,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5112,10 +3969,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5131,103 +3985,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5236,57 +4057,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5297,10 +4100,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5314,19 +4114,13 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5339,10 +4133,7 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -5397,29 +4188,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5427,10 +4209,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5440,10 +4219,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5452,10 +4228,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5464,10 +4237,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5478,10 +4248,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5491,10 +4258,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5505,10 +4269,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5518,10 +4279,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5531,10 +4289,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5544,10 +4299,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5563,10 +4315,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5576,10 +4325,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5589,10 +4335,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5601,10 +4344,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5614,10 +4354,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5627,10 +4364,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5646,103 +4380,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5751,57 +4452,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5812,10 +4495,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5829,10 +4509,7 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -5887,29 +4564,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5917,10 +4585,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5930,10 +4595,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5942,10 +4604,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5954,10 +4613,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5968,10 +4624,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5981,10 +4634,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -5995,10 +4645,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6008,10 +4655,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6021,10 +4665,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6034,10 +4675,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6053,10 +4691,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6066,10 +4701,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6079,10 +4711,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6091,10 +4720,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6104,10 +4730,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6117,10 +4740,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6136,103 +4756,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6241,57 +4828,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6302,10 +4871,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6319,19 +4885,13 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6344,10 +4904,7 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -6402,29 +4959,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6432,10 +4980,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6445,10 +4990,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6457,10 +4999,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6469,10 +5008,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6483,10 +5019,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6496,10 +5029,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6510,10 +5040,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6523,10 +5050,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6536,10 +5060,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6549,10 +5070,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6568,10 +5086,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6581,10 +5096,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6594,10 +5106,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6606,10 +5115,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6619,10 +5125,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6632,10 +5135,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6651,103 +5151,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6756,57 +5223,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6817,10 +5266,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6834,10 +5280,7 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -6892,29 +5335,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6922,10 +5356,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6935,10 +5366,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6947,10 +5375,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6959,10 +5384,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6973,10 +5395,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -6986,10 +5405,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7000,10 +5416,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7013,10 +5426,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7026,10 +5436,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7039,10 +5446,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7058,10 +5462,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7071,10 +5472,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7084,10 +5482,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7096,10 +5491,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7109,10 +5501,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7122,10 +5511,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7141,103 +5527,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7246,57 +5599,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7307,10 +5642,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7324,19 +5656,13 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -7349,10 +5675,7 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index 3e42dc06527..c587b7f3306 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -129,9 +129,6 @@ POA_CORBA::Repository_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -143,9 +140,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::Repository_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -158,9 +152,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -175,9 +166,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -195,9 +183,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -216,9 +201,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -236,9 +218,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -258,9 +237,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -281,9 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -304,9 +277,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -327,9 +297,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -349,9 +316,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -371,9 +335,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -399,9 +360,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -427,9 +385,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -449,9 +404,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -470,9 +422,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -491,9 +440,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -513,9 +459,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -541,9 +484,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -566,9 +506,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id  (
     const char * search_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_id (
     search_id
@@ -582,9 +519,6 @@ template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->get_canonical_typecode (
     tc
@@ -598,9 +532,6 @@ template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->get_primitive (
     kind
@@ -614,9 +545,6 @@ template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_string (
     bound
@@ -630,9 +558,6 @@ template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_wstring (
     bound
@@ -647,9 +572,6 @@ template <class T> ACE_INLINE
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_sequence (
     bound,
@@ -665,9 +587,6 @@ template <class T> ACE_INLINE
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_array (
     length,
@@ -683,9 +602,6 @@ template <class T> ACE_INLINE
     ::CORBA::UShort digits,
     ::CORBA::Short scale
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_fixed (
     digits,
@@ -792,9 +708,6 @@ POA_CORBA::ModuleDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -806,9 +719,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -821,9 +731,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -838,9 +745,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -858,9 +762,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -879,9 +780,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -899,9 +797,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -921,9 +816,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -944,9 +836,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -967,9 +856,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -990,9 +876,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -1012,9 +895,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -1034,9 +914,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -1062,9 +939,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -1090,9 +964,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -1112,9 +983,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -1133,9 +1001,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -1154,9 +1019,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -1176,9 +1038,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -1204,9 +1063,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -1228,9 +1084,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -1243,9 +1096,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -1258,9 +1108,6 @@ void POA_CORBA::ModuleDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -1273,9 +1120,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -1288,9 +1132,6 @@ void POA_CORBA::ModuleDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -1303,9 +1144,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -1318,9 +1156,6 @@ void POA_CORBA::ModuleDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -1332,9 +1167,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -1346,9 +1178,6 @@ char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -1360,9 +1189,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -1377,9 +1203,6 @@ void POA_CORBA::ModuleDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -1487,9 +1310,6 @@ POA_CORBA::ConstantDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1501,9 +1321,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1515,9 +1332,6 @@ void POA_CORBA::ConstantDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -1530,9 +1344,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -1545,9 +1356,6 @@ void POA_CORBA::ConstantDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -1560,9 +1368,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -1575,9 +1380,6 @@ void POA_CORBA::ConstantDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -1590,9 +1392,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -1605,9 +1404,6 @@ void POA_CORBA::ConstantDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -1619,9 +1415,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -1633,9 +1426,6 @@ char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -1647,9 +1437,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -1664,9 +1451,6 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -1681,9 +1465,6 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -1695,9 +1476,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type_def (
   );
@@ -1710,9 +1488,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->type_def (
     type_def
@@ -1725,9 +1500,6 @@ void POA_CORBA::ConstantDef_tie<T>::type_def  (
 template <class T> ACE_INLINE
 ::CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->value (
   );
@@ -1740,9 +1512,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::value  (
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->value (
     value
@@ -1848,9 +1617,6 @@ POA_CORBA::StructDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1862,9 +1628,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1876,9 +1639,6 @@ void POA_CORBA::StructDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -1891,9 +1651,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -1906,9 +1663,6 @@ void POA_CORBA::StructDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -1921,9 +1675,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -1936,9 +1687,6 @@ void POA_CORBA::StructDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -1951,9 +1699,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -1966,9 +1711,6 @@ void POA_CORBA::StructDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -1980,9 +1722,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -1994,9 +1733,6 @@ char * POA_CORBA::StructDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -2008,9 +1744,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -2025,9 +1758,6 @@ void POA_CORBA::StructDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -2042,9 +1772,6 @@ void POA_CORBA::StructDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -2057,9 +1784,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -2074,9 +1798,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -2094,9 +1815,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -2115,9 +1833,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -2135,9 +1850,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -2157,9 +1869,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -2180,9 +1889,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -2203,9 +1909,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -2226,9 +1929,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -2248,9 +1948,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -2270,9 +1967,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -2298,9 +1992,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -2326,9 +2017,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -2348,9 +2036,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -2369,9 +2054,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -2390,9 +2072,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -2412,9 +2091,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -2440,9 +2116,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -2464,9 +2137,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->members (
   );
@@ -2479,9 +2149,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->members (
     members
@@ -2587,9 +2254,6 @@ POA_CORBA::UnionDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -2601,9 +2265,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -2615,9 +2276,6 @@ void POA_CORBA::UnionDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -2630,9 +2288,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -2645,9 +2300,6 @@ void POA_CORBA::UnionDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -2660,9 +2312,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -2675,9 +2324,6 @@ void POA_CORBA::UnionDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -2690,9 +2336,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -2705,9 +2348,6 @@ void POA_CORBA::UnionDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -2719,9 +2359,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -2733,9 +2370,6 @@ char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -2747,9 +2381,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -2764,9 +2395,6 @@ void POA_CORBA::UnionDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -2781,9 +2409,6 @@ void POA_CORBA::UnionDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -2796,9 +2421,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -2813,9 +2435,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -2833,9 +2452,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -2854,9 +2470,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -2874,9 +2487,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -2896,9 +2506,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -2919,9 +2526,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -2942,9 +2546,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -2965,9 +2566,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -2987,9 +2585,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -3009,9 +2604,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -3037,9 +2629,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -3065,9 +2654,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -3087,9 +2673,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -3108,9 +2691,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -3129,9 +2709,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -3151,9 +2728,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -3179,9 +2753,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -3203,9 +2774,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->discriminator_type (
   );
@@ -3217,9 +2785,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->discriminator_type_def (
   );
@@ -3232,9 +2797,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
     ::CORBA::IDLType_ptr discriminator_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->discriminator_type_def (
     discriminator_type_def
@@ -3247,9 +2809,6 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
 template <class T> ACE_INLINE
 ::CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->members (
   );
@@ -3262,9 +2821,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::members  (
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->members (
     members
@@ -3370,9 +2926,6 @@ POA_CORBA::EnumDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -3384,9 +2937,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -3398,9 +2948,6 @@ void POA_CORBA::EnumDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -3413,9 +2960,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -3428,9 +2972,6 @@ void POA_CORBA::EnumDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -3443,9 +2984,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -3458,9 +2996,6 @@ void POA_CORBA::EnumDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -3473,9 +3008,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -3488,9 +3020,6 @@ void POA_CORBA::EnumDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -3502,9 +3031,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -3516,9 +3042,6 @@ char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -3530,9 +3053,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -3547,9 +3067,6 @@ void POA_CORBA::EnumDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -3564,9 +3081,6 @@ void POA_CORBA::EnumDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -3578,9 +3092,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->members (
   );
@@ -3593,9 +3104,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::members  (
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->members (
     members
@@ -3701,9 +3209,6 @@ POA_CORBA::AliasDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -3715,9 +3220,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -3729,9 +3231,6 @@ void POA_CORBA::AliasDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -3744,9 +3243,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -3759,9 +3255,6 @@ void POA_CORBA::AliasDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -3774,9 +3267,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -3789,9 +3279,6 @@ void POA_CORBA::AliasDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -3804,9 +3291,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -3819,9 +3303,6 @@ void POA_CORBA::AliasDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -3833,9 +3314,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -3847,9 +3325,6 @@ char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -3861,9 +3336,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -3878,9 +3350,6 @@ void POA_CORBA::AliasDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -3895,9 +3364,6 @@ void POA_CORBA::AliasDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -3909,9 +3375,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->original_type_def (
   );
@@ -3924,9 +3387,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->original_type_def (
     original_type_def
@@ -4032,9 +3492,6 @@ POA_CORBA::NativeDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4046,9 +3503,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4060,9 +3514,6 @@ void POA_CORBA::NativeDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -4075,9 +3526,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -4090,9 +3538,6 @@ void POA_CORBA::NativeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -4105,9 +3550,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -4120,9 +3562,6 @@ void POA_CORBA::NativeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -4135,9 +3574,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -4150,9 +3586,6 @@ void POA_CORBA::NativeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -4164,9 +3597,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -4178,9 +3608,6 @@ char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -4192,9 +3619,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -4209,9 +3633,6 @@ void POA_CORBA::NativeDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -4226,9 +3647,6 @@ void POA_CORBA::NativeDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -4333,9 +3751,6 @@ POA_CORBA::PrimitiveDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4347,9 +3762,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4361,9 +3773,6 @@ void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -4375,9 +3784,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->kind (
   );
@@ -4482,9 +3888,6 @@ POA_CORBA::StringDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4496,9 +3899,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4510,9 +3910,6 @@ void POA_CORBA::StringDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -4524,9 +3921,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::StringDef_tie<T>::bound  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->bound (
   );
@@ -4539,9 +3933,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::bound  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->bound (
     bound
@@ -4647,9 +4038,6 @@ POA_CORBA::WstringDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4661,9 +4049,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4675,9 +4060,6 @@ void POA_CORBA::WstringDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -4689,9 +4071,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->bound (
   );
@@ -4704,9 +4083,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::bound  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->bound (
     bound
@@ -4812,9 +4188,6 @@ POA_CORBA::SequenceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4826,9 +4199,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4840,9 +4210,6 @@ void POA_CORBA::SequenceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -4854,9 +4221,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->bound (
   );
@@ -4869,9 +4233,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::bound  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->bound (
     bound
@@ -4884,9 +4245,6 @@ void POA_CORBA::SequenceDef_tie<T>::bound  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->element_type (
   );
@@ -4898,9 +4256,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->element_type_def (
   );
@@ -4913,9 +4268,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->element_type_def (
     element_type_def
@@ -5021,9 +4373,6 @@ POA_CORBA::ArrayDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -5035,9 +4384,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -5049,9 +4395,6 @@ void POA_CORBA::ArrayDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -5063,9 +4406,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->length (
   );
@@ -5078,9 +4418,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::length  (
     ::CORBA::ULong length
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->length (
     length
@@ -5093,9 +4430,6 @@ void POA_CORBA::ArrayDef_tie<T>::length  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->element_type (
   );
@@ -5107,9 +4441,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->element_type_def (
   );
@@ -5122,9 +4453,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->element_type_def (
     element_type_def
@@ -5230,9 +4558,6 @@ POA_CORBA::ExceptionDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -5244,9 +4569,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -5258,9 +4580,6 @@ void POA_CORBA::ExceptionDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -5273,9 +4592,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -5288,9 +4604,6 @@ void POA_CORBA::ExceptionDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -5303,9 +4616,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -5318,9 +4628,6 @@ void POA_CORBA::ExceptionDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -5333,9 +4640,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -5348,9 +4652,6 @@ void POA_CORBA::ExceptionDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -5362,9 +4663,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -5376,9 +4674,6 @@ char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -5390,9 +4685,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -5407,9 +4699,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -5425,9 +4714,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -5442,9 +4728,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -5462,9 +4745,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -5483,9 +4763,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -5503,9 +4780,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -5525,9 +4799,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -5548,9 +4819,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -5571,9 +4839,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -5594,9 +4859,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -5616,9 +4878,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -5638,9 +4897,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -5666,9 +4922,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -5694,9 +4947,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -5716,9 +4966,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -5737,9 +4984,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -5758,9 +5002,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -5780,9 +5021,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -5808,9 +5046,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -5832,9 +5067,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -5846,9 +5078,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->members (
   );
@@ -5861,9 +5090,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->members (
     members
@@ -5969,9 +5195,6 @@ POA_CORBA::AttributeDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -5983,9 +5206,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -5997,9 +5217,6 @@ void POA_CORBA::AttributeDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -6012,9 +5229,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -6027,9 +5241,6 @@ void POA_CORBA::AttributeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -6042,9 +5253,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -6057,9 +5265,6 @@ void POA_CORBA::AttributeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -6072,9 +5277,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -6087,9 +5289,6 @@ void POA_CORBA::AttributeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -6101,9 +5300,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -6115,9 +5311,6 @@ char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -6129,9 +5322,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -6146,9 +5336,6 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -6163,9 +5350,6 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -6177,9 +5361,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type_def (
   );
@@ -6192,9 +5373,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->type_def (
     type_def
@@ -6207,9 +5385,6 @@ void POA_CORBA::AttributeDef_tie<T>::type_def  (
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->mode (
   );
@@ -6222,9 +5397,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->mode (
     mode
@@ -6330,9 +5502,6 @@ POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAttributeDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -6344,9 +5513,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -6358,9 +5524,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -6373,9 +5536,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -6388,9 +5548,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -6403,9 +5560,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -6418,9 +5572,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -6433,9 +5584,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -6448,9 +5596,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAttributeDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -6462,9 +5607,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -6476,9 +5618,6 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAttributeDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -6490,9 +5629,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAttributeDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -6507,9 +5643,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -6524,9 +5657,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAttributeDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -6538,9 +5668,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type_def (
   );
@@ -6553,9 +5680,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->type_def (
     type_def
@@ -6568,9 +5692,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::ExtAttributeDef_tie<T>::mode  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->mode (
   );
@@ -6583,9 +5704,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->mode (
     mode
@@ -6598,9 +5716,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->get_exceptions (
   );
@@ -6613,9 +5728,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
     const ::CORBA::ExcDescriptionSeq & get_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->get_exceptions (
     get_exceptions
@@ -6628,9 +5740,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->set_exceptions (
   );
@@ -6643,9 +5752,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
     const ::CORBA::ExcDescriptionSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->set_exceptions (
     set_exceptions
@@ -6658,9 +5764,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
 template <class T> ACE_INLINE
 ::CORBA::ExtAttributeDescription * POA_CORBA::ExtAttributeDef_tie<T>::describe_attribute  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_attribute (
   );
@@ -6765,9 +5868,6 @@ POA_CORBA::OperationDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -6779,9 +5879,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -6793,9 +5890,6 @@ void POA_CORBA::OperationDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -6808,9 +5902,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -6823,9 +5914,6 @@ void POA_CORBA::OperationDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -6838,9 +5926,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -6853,9 +5938,6 @@ void POA_CORBA::OperationDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -6868,9 +5950,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -6883,9 +5962,6 @@ void POA_CORBA::OperationDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -6897,9 +5973,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -6911,9 +5984,6 @@ char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -6925,9 +5995,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -6942,9 +6009,6 @@ void POA_CORBA::OperationDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -6959,9 +6023,6 @@ void POA_CORBA::OperationDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result (
   );
@@ -6973,9 +6034,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result_def (
   );
@@ -6988,9 +6046,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->result_def (
     result_def
@@ -7003,9 +6058,6 @@ void POA_CORBA::OperationDef_tie<T>::result_def  (
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->params (
   );
@@ -7018,9 +6070,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->params (
     params
@@ -7033,9 +6082,6 @@ void POA_CORBA::OperationDef_tie<T>::params  (
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->mode (
   );
@@ -7048,9 +6094,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->mode (
     mode
@@ -7063,9 +6106,6 @@ void POA_CORBA::OperationDef_tie<T>::mode  (
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contexts (
   );
@@ -7078,9 +6118,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->contexts (
     contexts
@@ -7093,9 +6130,6 @@ void POA_CORBA::OperationDef_tie<T>::contexts  (
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->exceptions (
   );
@@ -7108,9 +6142,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->exceptions (
     exceptions
@@ -7216,9 +6247,6 @@ POA_CORBA::InterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -7230,9 +6258,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -7245,9 +6270,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -7262,9 +6284,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -7282,9 +6301,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -7303,9 +6319,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -7323,9 +6336,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -7345,9 +6355,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -7368,9 +6375,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -7391,9 +6395,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -7414,9 +6415,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -7436,9 +6434,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -7458,9 +6453,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -7486,9 +6478,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -7514,9 +6503,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -7536,9 +6522,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -7557,9 +6540,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -7578,9 +6558,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -7600,9 +6577,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -7628,9 +6602,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -7652,9 +6623,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -7667,9 +6635,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -7682,9 +6647,6 @@ void POA_CORBA::InterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -7697,9 +6659,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -7712,9 +6671,6 @@ void POA_CORBA::InterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -7727,9 +6683,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -7742,9 +6695,6 @@ void POA_CORBA::InterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -7756,9 +6706,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -7770,9 +6717,6 @@ char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -7784,9 +6728,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -7801,9 +6742,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -7818,9 +6756,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -7832,9 +6767,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -7847,9 +6779,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -7863,9 +6792,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -7878,9 +6804,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -7897,9 +6820,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -7924,9 +6844,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -8039,9 +6956,6 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::InterfaceAttrExtension_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -8060,9 +6974,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -8174,9 +7085,6 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtInterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -8188,9 +7096,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -8203,9 +7108,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtInterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -8220,9 +7122,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -8240,9 +7139,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -8261,9 +7157,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -8281,9 +7174,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -8303,9 +7193,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -8326,9 +7213,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -8349,9 +7233,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -8372,9 +7253,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -8394,9 +7272,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -8416,9 +7291,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -8444,9 +7316,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -8472,9 +7341,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -8494,9 +7360,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -8515,9 +7378,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -8536,9 +7396,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -8558,9 +7415,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -8586,9 +7440,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -8610,9 +7461,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -8625,9 +7473,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -8640,9 +7485,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -8655,9 +7497,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -8670,9 +7509,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -8685,9 +7521,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -8700,9 +7533,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtInterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -8714,9 +7544,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -8728,9 +7555,6 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtInterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -8742,9 +7566,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtInterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -8759,9 +7580,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -8776,9 +7594,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtInterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -8790,9 +7605,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -8805,9 +7617,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -8821,9 +7630,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -8836,9 +7642,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -8855,9 +7658,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -8882,9 +7682,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -8904,9 +7701,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -8925,9 +7719,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -9039,9 +7830,6 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -9053,9 +7841,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -9068,9 +7853,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -9085,9 +7867,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -9105,9 +7884,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -9126,9 +7902,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -9146,9 +7919,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -9168,9 +7938,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -9191,9 +7958,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -9214,9 +7978,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -9237,9 +7998,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -9259,9 +8017,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -9281,9 +8036,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -9309,9 +8061,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -9337,9 +8086,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -9359,9 +8105,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -9380,9 +8123,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -9401,9 +8141,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -9423,9 +8160,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -9451,9 +8185,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -9475,9 +8206,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -9490,9 +8218,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -9505,9 +8230,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -9520,9 +8242,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -9535,9 +8254,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -9550,9 +8266,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -9565,9 +8278,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -9579,9 +8289,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -9593,9 +8300,6 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -9607,9 +8311,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -9624,9 +8325,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -9641,9 +8339,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -9655,9 +8350,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -9670,9 +8362,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -9686,9 +8375,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -9701,9 +8387,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -9720,9 +8403,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -9747,9 +8427,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -9862,9 +8539,6 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAbstractInterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -9876,9 +8550,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -9891,9 +8562,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -9908,9 +8576,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -9928,9 +8593,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -9949,9 +8611,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -9969,9 +8628,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -9991,9 +8647,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -10014,9 +8667,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -10037,9 +8687,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -10060,9 +8707,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -10082,9 +8726,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -10104,9 +8745,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -10132,9 +8770,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -10160,9 +8795,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -10182,9 +8814,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -10203,9 +8832,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -10224,9 +8850,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -10246,9 +8869,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -10274,9 +8894,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -10298,9 +8915,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -10313,9 +8927,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -10328,9 +8939,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -10343,9 +8951,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -10358,9 +8963,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -10373,9 +8975,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -10388,9 +8987,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -10402,9 +8998,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -10416,9 +9009,6 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -10430,9 +9020,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -10447,9 +9034,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -10464,9 +9048,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -10478,9 +9059,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -10493,9 +9071,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -10509,9 +9084,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -10524,9 +9096,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -10543,9 +9112,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -10570,9 +9136,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -10592,9 +9155,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -10613,9 +9173,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -10727,9 +9284,6 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -10741,9 +9295,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -10756,9 +9307,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -10773,9 +9321,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -10793,9 +9338,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -10814,9 +9356,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -10834,9 +9373,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -10856,9 +9392,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -10879,9 +9412,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -10902,9 +9432,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -10925,9 +9452,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -10947,9 +9471,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -10969,9 +9490,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -10997,9 +9515,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -11025,9 +9540,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -11047,9 +9559,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -11068,9 +9577,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -11089,9 +9595,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -11111,9 +9614,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -11139,9 +9639,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -11163,9 +9660,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -11178,9 +9672,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -11193,9 +9684,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -11208,9 +9696,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -11223,9 +9708,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -11238,9 +9720,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -11253,9 +9732,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -11267,9 +9743,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -11281,9 +9754,6 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -11295,9 +9765,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -11312,9 +9779,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -11329,9 +9793,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -11343,9 +9804,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -11358,9 +9816,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -11374,9 +9829,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -11389,9 +9841,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -11408,9 +9857,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -11435,9 +9881,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -11550,9 +9993,6 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtLocalInterfaceDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -11564,9 +10004,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -11579,9 +10016,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -11596,9 +10030,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -11616,9 +10047,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -11637,9 +10065,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -11657,9 +10082,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -11679,9 +10101,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -11702,9 +10121,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -11725,9 +10141,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -11748,9 +10161,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -11770,9 +10180,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -11792,9 +10199,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -11820,9 +10224,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -11848,9 +10249,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -11870,9 +10268,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -11891,9 +10286,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -11912,9 +10304,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -11934,9 +10323,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -11962,9 +10348,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -11986,9 +10369,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -12001,9 +10381,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -12016,9 +10393,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -12031,9 +10405,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -12046,9 +10417,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -12061,9 +10429,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -12076,9 +10441,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -12090,9 +10452,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -12104,9 +10463,6 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -12118,9 +10474,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -12135,9 +10488,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -12152,9 +10502,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -12166,9 +10513,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -12181,9 +10525,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -12197,9 +10538,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -12212,9 +10550,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -12231,9 +10566,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -12258,9 +10590,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -12280,9 +10609,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -12301,9 +10627,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index a1ad147d576..6b55c6a178b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -674,9 +674,7 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_component_skel (
           TAO_ServerRequest & server_request,
@@ -696,9 +694,7 @@ namespace POA_CORBA
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_home_skel (
           TAO_ServerRequest & server_request,
@@ -721,9 +717,7 @@ namespace POA_CORBA
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_event_skel (
           TAO_ServerRequest & server_request,
@@ -1753,9 +1747,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_interface_type_skel (
           TAO_ServerRequest & server_request,
@@ -1769,9 +1761,7 @@ namespace POA_CORBA
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_interface_type_skel (
           TAO_ServerRequest & server_request,
@@ -1951,9 +1941,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_interface_type_skel (
           TAO_ServerRequest & server_request,
@@ -1967,9 +1955,7 @@ namespace POA_CORBA
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_interface_type_skel (
           TAO_ServerRequest & server_request,
@@ -1982,9 +1968,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean is_multiple (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_is_multiple_skel (
           TAO_ServerRequest & server_request,
@@ -1998,9 +1982,7 @@ namespace POA_CORBA
       virtual void is_multiple (
           ::CORBA::Boolean is_multiple
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_is_multiple_skel (
           TAO_ServerRequest & server_request,
@@ -2180,9 +2162,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::ComponentIR::EventDef_ptr event (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_event_skel (
           TAO_ServerRequest & server_request,
@@ -2196,9 +2176,7 @@ namespace POA_CORBA
       virtual void event (
           ::CORBA::ComponentIR::EventDef_ptr event
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_event_skel (
           TAO_ServerRequest & server_request,
@@ -2212,9 +2190,7 @@ namespace POA_CORBA
       virtual ::CORBA::Boolean is_a (
           const char * event_id
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void is_a_skel (
           TAO_ServerRequest & server_request,
@@ -2967,9 +2943,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_base_component_skel (
           TAO_ServerRequest & server_request,
@@ -2983,9 +2957,7 @@ namespace POA_CORBA
       virtual void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_base_component_skel (
           TAO_ServerRequest & server_request,
@@ -2998,9 +2970,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_supported_interfaces_skel (
           TAO_ServerRequest & server_request,
@@ -3014,9 +2984,7 @@ namespace POA_CORBA
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_supported_interfaces_skel (
           TAO_ServerRequest & server_request,
@@ -3033,9 +3001,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_provides_skel (
           TAO_ServerRequest & server_request,
@@ -3053,9 +3019,7 @@ namespace POA_CORBA
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_uses_skel (
           TAO_ServerRequest & server_request,
@@ -3072,9 +3036,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_emits_skel (
           TAO_ServerRequest & server_request,
@@ -3091,9 +3053,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_publishes_skel (
           TAO_ServerRequest & server_request,
@@ -3110,9 +3070,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_consumes_skel (
           TAO_ServerRequest & server_request,
@@ -4041,9 +3999,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_base_home_skel (
           TAO_ServerRequest & server_request,
@@ -4057,9 +4013,7 @@ namespace POA_CORBA
       virtual void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_base_home_skel (
           TAO_ServerRequest & server_request,
@@ -4072,9 +4026,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_supported_interfaces_skel (
           TAO_ServerRequest & server_request,
@@ -4088,9 +4040,7 @@ namespace POA_CORBA
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_supported_interfaces_skel (
           TAO_ServerRequest & server_request,
@@ -4103,9 +4053,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_managed_component_skel (
           TAO_ServerRequest & server_request,
@@ -4119,9 +4067,7 @@ namespace POA_CORBA
       virtual void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_managed_component_skel (
           TAO_ServerRequest & server_request,
@@ -4134,9 +4080,7 @@ namespace POA_CORBA
 
       virtual ::CORBA::ValueDef_ptr primary_key (
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _get_primary_key_skel (
           TAO_ServerRequest & server_request,
@@ -4150,9 +4094,7 @@ namespace POA_CORBA
       virtual void primary_key (
           ::CORBA::ValueDef_ptr primary_key
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void _set_primary_key_skel (
           TAO_ServerRequest & server_request,
@@ -4170,9 +4112,7 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_factory_skel (
           TAO_ServerRequest & server_request,
@@ -4190,9 +4130,7 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
         )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+        = 0;
 
       static void create_finder_skel (
           TAO_ServerRequest & server_request,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index cabe0a4db2b..9f894f6c912 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -92,29 +92,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -122,10 +113,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -135,10 +123,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -147,10 +132,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -159,10 +141,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -173,10 +152,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -186,10 +162,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -200,10 +173,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -213,10 +183,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -226,10 +193,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -239,10 +203,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -258,10 +219,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -271,10 +229,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -284,10 +239,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -296,10 +248,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -309,10 +258,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -322,10 +268,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -341,103 +284,70 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -446,171 +356,117 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InitializerSeq * initializers (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void initializers (
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr base_value (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void base_value (
           ::CORBA::ValueDef_ptr base_value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDefSeq * abstract_base_values (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void abstract_base_values (
           const ::CORBA::ValueDefSeq & abstract_base_values
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_abstract (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void is_abstract (
           ::CORBA::Boolean is_abstract
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_custom (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void is_custom (
           ::CORBA::Boolean is_custom
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_truncatable (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void is_truncatable (
           ::CORBA::Boolean is_truncatable
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef::FullValueDescription * describe_value (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -621,10 +477,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::Visibility access
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -635,10 +488,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -652,38 +502,26 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtInitializerSeq * ext_initializers (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void ext_initializers (
           const ::CORBA::ExtInitializerSeq & ext_initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -696,10 +534,7 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -754,29 +589,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -784,10 +610,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -797,10 +620,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -809,10 +629,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -821,10 +638,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -835,10 +649,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -848,10 +659,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -862,10 +670,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -875,10 +680,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -888,10 +690,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -901,10 +700,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -920,10 +716,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -933,10 +726,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -946,10 +736,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -958,10 +745,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -971,10 +755,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -984,10 +765,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1003,10 +781,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1017,10 +792,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1033,10 +805,7 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1052,10 +821,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -1110,29 +876,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1140,10 +897,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1153,10 +907,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1165,10 +916,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1177,10 +925,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1191,10 +936,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1204,10 +946,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1218,10 +957,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1231,10 +967,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1244,10 +977,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1257,10 +987,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1276,10 +1003,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1289,10 +1013,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1302,10 +1023,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1314,10 +1032,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1327,10 +1042,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1340,10 +1052,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1359,103 +1068,70 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1464,10 +1140,7 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1478,10 +1151,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1494,10 +1164,7 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1513,10 +1180,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -1571,29 +1235,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1601,10 +1256,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1614,10 +1266,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1626,10 +1275,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1638,10 +1284,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1652,10 +1295,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1665,10 +1305,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1679,10 +1316,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1692,10 +1326,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1705,10 +1336,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1718,10 +1346,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1737,10 +1362,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1750,10 +1372,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1763,10 +1382,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1775,10 +1391,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1788,10 +1401,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1801,10 +1411,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1820,60 +1427,42 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup_id (
           const char * search_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr get_canonical_typecode (
           ::CORBA::TypeCode_ptr tc
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::PrimitiveDef_ptr get_primitive (
           ::CORBA::PrimitiveKind kind
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::StringDef_ptr create_string (
           ::CORBA::ULong bound
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::WstringDef_ptr create_wstring (
           ::CORBA::ULong bound
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1881,10 +1470,7 @@ namespace POA_CORBA
       ::CORBA::SequenceDef_ptr create_sequence (
           ::CORBA::ULong bound,
           ::CORBA::IDLType_ptr element_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1892,10 +1478,7 @@ namespace POA_CORBA
       ::CORBA::ArrayDef_ptr create_array (
           ::CORBA::ULong length,
           ::CORBA::IDLType_ptr element_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1903,10 +1486,7 @@ namespace POA_CORBA
       ::CORBA::FixedDef_ptr create_fixed (
           ::CORBA::UShort digits,
           ::CORBA::Short scale
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1917,10 +1497,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1933,10 +1510,7 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -1952,10 +1526,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -2010,112 +1581,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -2124,29 +1659,20 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -2201,112 +1727,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -2315,48 +1805,33 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_multiple (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void is_multiple (
           ::CORBA::Boolean is_multiple
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -2411,112 +1886,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -2525,39 +1964,27 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * event_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -2612,112 +2039,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -2726,39 +2117,27 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * event_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -2813,112 +2192,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -2927,39 +2270,27 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * event_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -3014,112 +2345,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3128,39 +2423,27 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * event_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -3215,29 +2498,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3245,10 +2519,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3258,10 +2529,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3270,10 +2538,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3282,10 +2547,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3296,10 +2558,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3309,10 +2568,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3323,10 +2579,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3336,10 +2589,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3349,10 +2599,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3362,10 +2609,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3381,10 +2625,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3394,10 +2635,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3407,10 +2645,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3419,10 +2654,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3432,10 +2664,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3445,10 +2674,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3464,103 +2690,70 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3569,57 +2762,39 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3630,10 +2805,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3647,19 +2819,13 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3672,48 +2838,33 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3723,10 +2874,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3737,10 +2885,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3750,10 +2895,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3763,10 +2905,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3776,10 +2915,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -3834,112 +2970,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -3948,114 +3048,78 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void mode (
           ::CORBA::OperationMode mode
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -4110,112 +3174,76 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4224,114 +3252,78 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void mode (
           ::CORBA::OperationMode mode
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
@@ -4386,29 +3378,20 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4416,10 +3399,7 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4429,10 +3409,7 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4441,10 +3418,7 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4453,10 +3427,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4467,10 +3438,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4480,10 +3448,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4494,10 +3459,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4507,10 +3469,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4520,10 +3479,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4533,10 +3489,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4552,10 +3505,7 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4565,10 +3515,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4578,10 +3525,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4590,10 +3534,7 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4603,10 +3544,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4616,10 +3554,7 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4635,103 +3570,70 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void id (
           const char * id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void name (
           const char * name
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void version (
           const char * version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4740,57 +3642,39 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4801,10 +3685,7 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4818,19 +3699,13 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4843,86 +3718,59 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::HomeDef_ptr base_home (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr primary_key (
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void primary_key (
           ::CORBA::ValueDef_ptr primary_key
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4933,10 +3781,7 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
@@ -4947,10 +3792,7 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        );
 
     private:
       T *ptr_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index 677f509e0a4..263aacc5748 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -129,9 +129,6 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -143,9 +140,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -158,9 +152,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -175,9 +166,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -195,9 +183,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -216,9 +201,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -236,9 +218,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -258,9 +237,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -281,9 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -304,9 +277,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -327,9 +297,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -349,9 +316,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -371,9 +335,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -399,9 +360,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -427,9 +385,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -449,9 +404,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -470,9 +422,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -491,9 +440,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -513,9 +459,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -541,9 +484,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -565,9 +505,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -580,9 +517,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -595,9 +529,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -610,9 +541,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -625,9 +553,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -640,9 +565,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -655,9 +577,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -669,9 +588,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -683,9 +599,6 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -697,9 +610,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -714,9 +624,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -731,9 +638,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -745,9 +649,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->supported_interfaces (
   );
@@ -760,9 +661,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
@@ -775,9 +673,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->initializers (
   );
@@ -790,9 +685,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->initializers (
     initializers
@@ -805,9 +697,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_value (
   );
@@ -820,9 +709,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_value (
     base_value
@@ -835,9 +721,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->abstract_base_values (
   );
@@ -850,9 +733,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
@@ -865,9 +745,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_abstract (
   );
@@ -880,9 +757,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_abstract (
     is_abstract
@@ -895,9 +769,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_custom (
   );
@@ -910,9 +781,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_custom (
     is_custom
@@ -925,9 +793,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_truncatable (
   );
@@ -940,9 +805,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_truncatable (
     is_truncatable
@@ -956,9 +818,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_a  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     id
@@ -971,9 +830,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_value (
   );
@@ -990,9 +846,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_member (
     id,
@@ -1014,9 +867,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -1041,9 +891,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -1063,9 +910,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->ext_initializers (
   );
@@ -1078,9 +922,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->ext_initializers (
     ext_initializers
@@ -1093,9 +934,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_ext_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_value (
   );
@@ -1114,9 +952,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -1228,9 +1063,6 @@ POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Container_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1242,9 +1074,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Container_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1257,9 +1086,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Container_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -1274,9 +1100,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -1294,9 +1117,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -1315,9 +1135,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -1335,9 +1152,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -1357,9 +1171,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -1380,9 +1191,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -1403,9 +1211,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -1426,9 +1231,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -1448,9 +1250,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -1470,9 +1269,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -1498,9 +1294,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -1526,9 +1319,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -1548,9 +1338,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -1569,9 +1356,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -1590,9 +1374,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -1612,9 +1393,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -1640,9 +1418,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -1669,9 +1444,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_component (
     id,
@@ -1695,9 +1467,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_home (
     id,
@@ -1726,9 +1495,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_event (
     id,
@@ -1843,9 +1609,6 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ModuleDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1857,9 +1620,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1872,9 +1632,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -1889,9 +1646,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -1909,9 +1663,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -1930,9 +1681,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -1950,9 +1698,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -1972,9 +1717,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -1995,9 +1737,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -2018,9 +1757,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -2041,9 +1777,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -2063,9 +1796,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -2085,9 +1815,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -2113,9 +1840,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -2141,9 +1865,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -2163,9 +1884,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -2184,9 +1902,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -2205,9 +1920,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -2227,9 +1939,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -2255,9 +1964,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -2279,9 +1985,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -2294,9 +1997,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -2309,9 +2009,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -2324,9 +2021,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -2339,9 +2033,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -2354,9 +2045,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -2369,9 +2057,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -2383,9 +2068,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -2397,9 +2079,6 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -2411,9 +2090,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -2428,9 +2104,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -2450,9 +2123,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_component (
     id,
@@ -2476,9 +2146,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_home (
     id,
@@ -2507,9 +2174,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_event (
     id,
@@ -2624,9 +2288,6 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Repository_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -2638,9 +2299,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Repository_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -2653,9 +2311,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -2670,9 +2325,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -2690,9 +2342,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -2711,9 +2360,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -2731,9 +2377,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -2753,9 +2396,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -2776,9 +2416,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -2799,9 +2436,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -2822,9 +2456,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -2844,9 +2475,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -2866,9 +2494,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -2894,9 +2519,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -2922,9 +2544,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -2944,9 +2563,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -2965,9 +2581,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -2986,9 +2599,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -3008,9 +2618,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -3036,9 +2643,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -3061,9 +2665,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup_id  (
     const char * search_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_id (
     search_id
@@ -3077,9 +2678,6 @@ template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->get_canonical_typecode (
     tc
@@ -3093,9 +2691,6 @@ template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->get_primitive (
     kind
@@ -3109,9 +2704,6 @@ template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_string (
     bound
@@ -3125,9 +2717,6 @@ template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_wstring (
     bound
@@ -3142,9 +2731,6 @@ template <class T> ACE_INLINE
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_sequence (
     bound,
@@ -3160,9 +2746,6 @@ template <class T> ACE_INLINE
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_array (
     length,
@@ -3178,9 +2761,6 @@ template <class T> ACE_INLINE
     ::CORBA::UShort digits,
     ::CORBA::Short scale
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_fixed (
     digits,
@@ -3199,9 +2779,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_component (
     id,
@@ -3225,9 +2802,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_home (
     id,
@@ -3256,9 +2830,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_event (
     id,
@@ -3373,9 +2944,6 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ProvidesDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -3387,9 +2955,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -3401,9 +2966,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -3416,9 +2978,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -3431,9 +2990,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -3446,9 +3002,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -3461,9 +3014,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -3476,9 +3026,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -3491,9 +3038,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -3505,9 +3049,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -3519,9 +3060,6 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -3533,9 +3071,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -3550,9 +3085,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -3567,9 +3099,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->interface_type (
   );
@@ -3582,9 +3111,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->interface_type (
     interface_type
@@ -3690,9 +3216,6 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::UsesDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -3704,9 +3227,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -3718,9 +3238,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -3733,9 +3250,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -3748,9 +3262,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -3763,9 +3274,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -3778,9 +3286,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -3793,9 +3298,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -3808,9 +3310,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -3822,9 +3321,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -3836,9 +3332,6 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -3850,9 +3343,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::UsesDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -3867,9 +3357,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -3884,9 +3371,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->interface_type (
   );
@@ -3899,9 +3383,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->interface_type (
     interface_type
@@ -3914,9 +3395,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_multiple (
   );
@@ -3929,9 +3407,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
     ::CORBA::Boolean is_multiple
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_multiple (
     is_multiple
@@ -4037,9 +3512,6 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventPortDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4051,9 +3523,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4065,9 +3534,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -4080,9 +3546,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -4095,9 +3558,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -4110,9 +3570,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -4125,9 +3582,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -4140,9 +3594,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -4155,9 +3606,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -4169,9 +3617,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -4183,9 +3628,6 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -4197,9 +3639,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventPortDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -4214,9 +3653,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -4231,9 +3667,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->event (
   );
@@ -4246,9 +3679,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->event (
     event
@@ -4262,9 +3692,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef_tie<T>::is_a  (
     const char * event_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     event_id
@@ -4370,9 +3797,6 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EmitsDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4384,9 +3808,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4398,9 +3819,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -4413,9 +3831,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -4428,9 +3843,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -4443,9 +3855,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -4458,9 +3867,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -4473,9 +3879,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -4488,9 +3891,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -4502,9 +3902,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -4516,9 +3913,6 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -4530,9 +3924,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EmitsDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -4547,9 +3938,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -4564,9 +3952,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->event (
   );
@@ -4579,9 +3964,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->event (
     event
@@ -4595,9 +3977,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef_tie<T>::is_a  (
     const char * event_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     event_id
@@ -4703,9 +4082,6 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::PublishesDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -4717,9 +4093,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -4731,9 +4104,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -4746,9 +4116,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -4761,9 +4128,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -4776,9 +4140,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -4791,9 +4152,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -4806,9 +4164,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -4821,9 +4176,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -4835,9 +4187,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -4849,9 +4198,6 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -4863,9 +4209,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::PublishesDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -4880,9 +4223,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -4897,9 +4237,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->event (
   );
@@ -4912,9 +4249,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->event (
     event
@@ -4928,9 +4262,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef_tie<T>::is_a  (
     const char * event_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     event_id
@@ -5036,9 +4367,6 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ConsumesDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -5050,9 +4378,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -5064,9 +4389,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -5079,9 +4401,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -5094,9 +4413,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -5109,9 +4425,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -5124,9 +4437,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -5139,9 +4449,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -5154,9 +4461,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -5168,9 +4472,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -5182,9 +4483,6 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -5196,9 +4494,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -5213,9 +4508,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -5230,9 +4522,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->event (
   );
@@ -5245,9 +4534,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->event (
     event
@@ -5261,9 +4547,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef_tie<T>::is_a  (
     const char * event_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     event_id
@@ -5369,9 +4652,6 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ComponentDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -5383,9 +4663,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -5398,9 +4675,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -5415,9 +4689,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -5435,9 +4706,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -5456,9 +4724,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -5476,9 +4741,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -5498,9 +4760,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -5521,9 +4780,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -5544,9 +4800,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -5567,9 +4820,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -5589,9 +4839,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -5611,9 +4858,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -5639,9 +4883,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -5667,9 +4908,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -5689,9 +4927,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -5710,9 +4945,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -5731,9 +4963,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -5753,9 +4982,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -5781,9 +5007,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -5805,9 +5028,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -5820,9 +5040,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -5835,9 +5052,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -5850,9 +5064,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -5865,9 +5076,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -5880,9 +5088,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -5895,9 +5100,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -5909,9 +5111,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -5923,9 +5122,6 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -5937,9 +5133,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -5954,9 +5147,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -5971,9 +5161,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -5985,9 +5172,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -6000,9 +5184,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -6016,9 +5197,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -6031,9 +5209,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -6050,9 +5225,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -6077,9 +5249,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -6099,9 +5268,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -6120,9 +5286,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -6141,9 +5304,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_component (
   );
@@ -6156,9 +5316,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr base_component
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_component (
     base_component
@@ -6171,9 +5328,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->supported_interfaces (
   );
@@ -6186,9 +5340,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
@@ -6205,9 +5356,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_provides (
     id,
@@ -6228,9 +5376,6 @@ template <class T> ACE_INLINE
     ::CORBA::InterfaceDef_ptr interface_type,
     ::CORBA::Boolean is_multiple
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_uses (
     id,
@@ -6251,9 +5396,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_emits (
     id,
@@ -6273,9 +5415,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_publishes (
     id,
@@ -6295,9 +5434,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_consumes (
     id,
@@ -6406,9 +5542,6 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FactoryDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -6420,9 +5553,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -6434,9 +5564,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -6449,9 +5576,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -6464,9 +5588,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -6479,9 +5600,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -6494,9 +5612,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -6509,9 +5624,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -6524,9 +5636,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -6538,9 +5647,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -6552,9 +5658,6 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -6566,9 +5669,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FactoryDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -6583,9 +5683,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -6600,9 +5697,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result (
   );
@@ -6614,9 +5708,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result_def (
   );
@@ -6629,9 +5720,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->result_def (
     result_def
@@ -6644,9 +5732,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->params (
   );
@@ -6659,9 +5744,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->params (
     params
@@ -6674,9 +5756,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->mode (
   );
@@ -6689,9 +5768,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->mode (
     mode
@@ -6704,9 +5780,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contexts (
   );
@@ -6719,9 +5792,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->contexts (
     contexts
@@ -6734,9 +5804,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->exceptions (
   );
@@ -6749,9 +5816,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->exceptions (
     exceptions
@@ -6857,9 +5921,6 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FinderDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -6871,9 +5932,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -6885,9 +5943,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -6900,9 +5955,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -6915,9 +5967,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -6930,9 +5979,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -6945,9 +5991,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -6960,9 +6003,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -6975,9 +6015,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -6989,9 +6026,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -7003,9 +6037,6 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -7017,9 +6048,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FinderDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -7034,9 +6062,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -7051,9 +6076,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result (
   );
@@ -7065,9 +6087,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->result_def (
   );
@@ -7080,9 +6099,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->result_def (
     result_def
@@ -7095,9 +6111,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->params (
   );
@@ -7110,9 +6123,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->params (
     params
@@ -7125,9 +6135,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->mode (
   );
@@ -7140,9 +6147,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->mode (
     mode
@@ -7155,9 +6159,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contexts (
   );
@@ -7170,9 +6171,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->contexts (
     contexts
@@ -7185,9 +6183,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->exceptions (
   );
@@ -7200,9 +6195,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->exceptions (
     exceptions
@@ -7308,9 +6300,6 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::HomeDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -7322,9 +6311,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -7337,9 +6323,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -7354,9 +6337,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -7374,9 +6354,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -7395,9 +6372,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -7415,9 +6389,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -7437,9 +6408,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -7460,9 +6428,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -7483,9 +6448,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -7506,9 +6468,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -7528,9 +6487,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -7550,9 +6506,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -7578,9 +6531,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -7606,9 +6556,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -7628,9 +6575,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -7649,9 +6593,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -7670,9 +6611,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -7692,9 +6630,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -7720,9 +6655,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -7744,9 +6676,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -7759,9 +6688,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -7774,9 +6700,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -7789,9 +6712,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -7804,9 +6724,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -7819,9 +6736,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -7834,9 +6748,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -7848,9 +6759,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -7862,9 +6770,6 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -7876,9 +6781,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -7893,9 +6795,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -7910,9 +6809,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -7924,9 +6820,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_interfaces (
   );
@@ -7939,9 +6832,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_interfaces (
     base_interfaces
@@ -7955,9 +6845,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef_tie<T>::is_a  (
     const char * interface_id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     interface_id
@@ -7970,9 +6857,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_interface (
   );
@@ -7989,9 +6873,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -8016,9 +6897,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -8038,9 +6916,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_ext_interface  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_interface (
   );
@@ -8059,9 +6934,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -8080,9 +6952,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_home (
   );
@@ -8095,9 +6964,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
     ::CORBA::ComponentIR::HomeDef_ptr base_home
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_home (
     base_home
@@ -8110,9 +6976,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->supported_interfaces (
   );
@@ -8125,9 +6988,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
@@ -8140,9 +7000,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->managed_component (
   );
@@ -8155,9 +7012,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->managed_component (
     managed_component
@@ -8170,9 +7024,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->primary_key (
   );
@@ -8185,9 +7036,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
     ::CORBA::ValueDef_ptr primary_key
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->primary_key (
     primary_key
@@ -8205,9 +7053,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_factory (
     id,
@@ -8229,9 +7074,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_finder (
     id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 0178b28a129..915efbc7b60 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -128,9 +128,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::UShort digits (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_digits_skel (
         TAO_ServerRequest & server_request,
@@ -144,9 +142,7 @@ namespace POA_CORBA
     virtual void digits (
         ::CORBA::UShort digits
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_digits_skel (
         TAO_ServerRequest & server_request,
@@ -159,9 +155,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Short scale (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_scale_skel (
         TAO_ServerRequest & server_request,
@@ -175,9 +169,7 @@ namespace POA_CORBA
     virtual void scale (
         ::CORBA::Short scale
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_scale_skel (
         TAO_ServerRequest & server_request,
@@ -281,9 +273,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr type (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_skel (
         TAO_ServerRequest & server_request,
@@ -296,9 +286,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -312,9 +300,7 @@ namespace POA_CORBA
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -327,9 +313,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Visibility access (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_access_skel (
         TAO_ServerRequest & server_request,
@@ -343,9 +327,7 @@ namespace POA_CORBA
     virtual void access (
         ::CORBA::Visibility access
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_access_skel (
         TAO_ServerRequest & server_request,
@@ -527,9 +509,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_supported_interfaces_skel (
         TAO_ServerRequest & server_request,
@@ -543,9 +523,7 @@ namespace POA_CORBA
     virtual void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_supported_interfaces_skel (
         TAO_ServerRequest & server_request,
@@ -558,9 +536,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::InitializerSeq * initializers (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_initializers_skel (
         TAO_ServerRequest & server_request,
@@ -574,9 +550,7 @@ namespace POA_CORBA
     virtual void initializers (
         const ::CORBA::InitializerSeq & initializers
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_initializers_skel (
         TAO_ServerRequest & server_request,
@@ -589,9 +563,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ValueDef_ptr base_value (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_base_value_skel (
         TAO_ServerRequest & server_request,
@@ -605,9 +577,7 @@ namespace POA_CORBA
     virtual void base_value (
         ::CORBA::ValueDef_ptr base_value
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_base_value_skel (
         TAO_ServerRequest & server_request,
@@ -620,9 +590,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_abstract_base_values_skel (
         TAO_ServerRequest & server_request,
@@ -636,9 +604,7 @@ namespace POA_CORBA
     virtual void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_abstract_base_values_skel (
         TAO_ServerRequest & server_request,
@@ -651,9 +617,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_abstract (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_is_abstract_skel (
         TAO_ServerRequest & server_request,
@@ -667,9 +631,7 @@ namespace POA_CORBA
     virtual void is_abstract (
         ::CORBA::Boolean is_abstract
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_is_abstract_skel (
         TAO_ServerRequest & server_request,
@@ -682,9 +644,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_custom (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_is_custom_skel (
         TAO_ServerRequest & server_request,
@@ -698,9 +658,7 @@ namespace POA_CORBA
     virtual void is_custom (
         ::CORBA::Boolean is_custom
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_is_custom_skel (
         TAO_ServerRequest & server_request,
@@ -713,9 +671,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_truncatable (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_is_truncatable_skel (
         TAO_ServerRequest & server_request,
@@ -729,9 +685,7 @@ namespace POA_CORBA
     virtual void is_truncatable (
         ::CORBA::Boolean is_truncatable
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_is_truncatable_skel (
         TAO_ServerRequest & server_request,
@@ -745,9 +699,7 @@ namespace POA_CORBA
     virtual ::CORBA::Boolean is_a (
         const char * id
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void is_a_skel (
         TAO_ServerRequest & server_request,
@@ -760,9 +712,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_value_skel (
         TAO_ServerRequest & server_request,
@@ -780,9 +730,7 @@ namespace POA_CORBA
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_value_member_skel (
         TAO_ServerRequest & server_request,
@@ -800,9 +748,7 @@ namespace POA_CORBA
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_attribute_skel (
         TAO_ServerRequest & server_request,
@@ -823,9 +769,7 @@ namespace POA_CORBA
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_operation_skel (
         TAO_ServerRequest & server_request,
@@ -1192,9 +1136,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExtInitializerSeq * ext_initializers (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_ext_initializers_skel (
         TAO_ServerRequest & server_request,
@@ -1208,9 +1150,7 @@ namespace POA_CORBA
     virtual void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_ext_initializers_skel (
         TAO_ServerRequest & server_request,
@@ -1223,9 +1163,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void describe_ext_value_skel (
         TAO_ServerRequest & server_request,
@@ -1245,9 +1183,7 @@ namespace POA_CORBA
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void create_ext_attribute_skel (
         TAO_ServerRequest & server_request,
@@ -1762,9 +1698,7 @@ namespace POA_CORBA
 
     virtual ::CORBA::IDLType_ptr original_type_def (
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_original_type_def_skel (
         TAO_ServerRequest & server_request,
@@ -1778,9 +1712,7 @@ namespace POA_CORBA
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _set_original_type_def_skel (
         TAO_ServerRequest & server_request,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index 0878ffef071..1990efddc30 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -86,66 +86,45 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UShort digits (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void digits (
         ::CORBA::UShort digits
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Short scale (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void scale (
         ::CORBA::Short scale
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -200,112 +179,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -314,57 +257,39 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Visibility access (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void access (
         ::CORBA::Visibility access
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -419,29 +344,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -449,10 +365,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -462,10 +375,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -474,10 +384,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -486,10 +393,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -500,10 +404,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -513,10 +414,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -527,10 +425,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -540,10 +435,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -553,10 +445,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -566,10 +455,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -585,10 +471,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -598,10 +481,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -611,10 +491,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -623,10 +500,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -636,10 +510,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -649,10 +520,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -668,103 +536,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -773,171 +608,117 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_custom (
         ::CORBA::Boolean is_custom
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -948,10 +729,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -962,10 +740,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -979,10 +754,7 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -1037,29 +809,20 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1067,10 +830,7 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1080,10 +840,7 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1092,10 +849,7 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1104,10 +858,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1118,10 +869,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1131,10 +879,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1145,10 +890,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1158,10 +900,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1171,10 +910,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1184,10 +920,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1203,10 +936,7 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1216,10 +946,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1229,10 +956,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1241,10 +965,7 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1254,10 +975,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1267,10 +985,7 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1286,103 +1001,70 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1391,171 +1073,117 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_custom (
         ::CORBA::Boolean is_custom
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_a (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1566,10 +1194,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1580,10 +1205,7 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1597,38 +1219,26 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtInitializerSeq * ext_initializers (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1641,10 +1251,7 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -1699,112 +1306,76 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void id (
         const char * id
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void name (
         const char * name
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void version (
         const char * version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -1813,38 +1384,26 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index d8aa507ca47..e46bc4d4eaf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -129,9 +129,6 @@ POA_CORBA::FixedDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -143,9 +140,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -157,9 +151,6 @@ void POA_CORBA::FixedDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -171,9 +162,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->digits (
   );
@@ -186,9 +174,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::digits  (
     ::CORBA::UShort digits
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->digits (
     digits
@@ -201,9 +186,6 @@ void POA_CORBA::FixedDef_tie<T>::digits  (
 template <class T> ACE_INLINE
 ::CORBA::Short POA_CORBA::FixedDef_tie<T>::scale  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->scale (
   );
@@ -216,9 +198,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::scale  (
     ::CORBA::Short scale
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->scale (
     scale
@@ -324,9 +303,6 @@ POA_CORBA::ValueMemberDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -338,9 +314,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -352,9 +325,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -367,9 +337,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -382,9 +349,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -397,9 +361,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -412,9 +373,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -427,9 +385,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -442,9 +397,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -456,9 +408,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -470,9 +419,6 @@ char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -484,9 +430,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -501,9 +444,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -518,9 +458,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -532,9 +469,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type_def (
   );
@@ -547,9 +481,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->type_def (
     type_def
@@ -562,9 +493,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
 template <class T> ACE_INLINE
 ::CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->access (
   );
@@ -577,9 +505,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::access  (
     ::CORBA::Visibility access
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->access (
     access
@@ -685,9 +610,6 @@ POA_CORBA::ValueDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -699,9 +621,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -714,9 +633,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -731,9 +647,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -751,9 +664,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -772,9 +682,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -792,9 +699,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -814,9 +718,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -837,9 +738,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -860,9 +758,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -883,9 +778,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -905,9 +797,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -927,9 +816,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -955,9 +841,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -983,9 +866,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -1005,9 +885,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -1026,9 +903,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -1047,9 +921,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -1069,9 +940,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -1097,9 +965,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -1121,9 +986,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -1136,9 +998,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -1151,9 +1010,6 @@ void POA_CORBA::ValueDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -1166,9 +1022,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -1181,9 +1034,6 @@ void POA_CORBA::ValueDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -1196,9 +1046,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -1211,9 +1058,6 @@ void POA_CORBA::ValueDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -1225,9 +1069,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -1239,9 +1080,6 @@ char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -1253,9 +1091,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -1270,9 +1105,6 @@ void POA_CORBA::ValueDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -1287,9 +1119,6 @@ void POA_CORBA::ValueDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -1301,9 +1130,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->supported_interfaces (
   );
@@ -1316,9 +1142,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
@@ -1331,9 +1154,6 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->initializers (
   );
@@ -1346,9 +1166,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->initializers (
     initializers
@@ -1361,9 +1178,6 @@ void POA_CORBA::ValueDef_tie<T>::initializers  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_value (
   );
@@ -1376,9 +1190,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_value (
     base_value
@@ -1391,9 +1202,6 @@ void POA_CORBA::ValueDef_tie<T>::base_value  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->abstract_base_values (
   );
@@ -1406,9 +1214,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
@@ -1421,9 +1226,6 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_abstract (
   );
@@ -1436,9 +1238,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_abstract (
     is_abstract
@@ -1451,9 +1250,6 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_custom (
   );
@@ -1466,9 +1262,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_custom (
     is_custom
@@ -1481,9 +1274,6 @@ void POA_CORBA::ValueDef_tie<T>::is_custom  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_truncatable (
   );
@@ -1496,9 +1286,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_truncatable (
     is_truncatable
@@ -1512,9 +1299,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     id
@@ -1527,9 +1311,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_value (
   );
@@ -1546,9 +1327,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_member (
     id,
@@ -1570,9 +1348,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -1597,9 +1372,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -1712,9 +1484,6 @@ POA_CORBA::ExtValueDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtValueDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -1726,9 +1495,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -1741,9 +1507,6 @@ template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtValueDef_tie<T>::lookup  (
     const char * search_name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup (
     search_name
@@ -1758,9 +1521,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->contents (
     limit_type,
@@ -1778,9 +1538,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->lookup_name (
     search_name,
@@ -1799,9 +1556,6 @@ template <class T> ACE_INLINE
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_contents (
     limit_type,
@@ -1819,9 +1573,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_module (
     id,
@@ -1841,9 +1592,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_constant (
     id,
@@ -1864,9 +1612,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_struct (
     id,
@@ -1887,9 +1632,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_union (
     id,
@@ -1910,9 +1652,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::EnumMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_enum (
     id,
@@ -1932,9 +1671,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_alias (
     id,
@@ -1954,9 +1690,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_interface (
     id,
@@ -1982,9 +1715,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value (
     id,
@@ -2010,9 +1740,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_box (
     id,
@@ -2032,9 +1759,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::StructMemberSeq & members
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_exception (
     id,
@@ -2053,9 +1777,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_native (
     id,
@@ -2074,9 +1795,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_abstract_interface (
     id,
@@ -2096,9 +1814,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_local_interface (
     id,
@@ -2124,9 +1839,6 @@ template <class T> ACE_INLINE
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_value (
     id,
@@ -2148,9 +1860,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -2163,9 +1872,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -2178,9 +1884,6 @@ void POA_CORBA::ExtValueDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -2193,9 +1896,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -2208,9 +1908,6 @@ void POA_CORBA::ExtValueDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -2223,9 +1920,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -2238,9 +1932,6 @@ void POA_CORBA::ExtValueDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtValueDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -2252,9 +1943,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -2266,9 +1954,6 @@ char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtValueDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -2280,9 +1965,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtValueDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -2297,9 +1979,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -2314,9 +1993,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtValueDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -2328,9 +2004,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->supported_interfaces (
   );
@@ -2343,9 +2016,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
@@ -2358,9 +2028,6 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ExtValueDef_tie<T>::initializers  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->initializers (
   );
@@ -2373,9 +2040,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->initializers (
     initializers
@@ -2388,9 +2052,6 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::base_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->base_value (
   );
@@ -2403,9 +2064,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->base_value (
     base_value
@@ -2418,9 +2076,6 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value  (
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->abstract_base_values (
   );
@@ -2433,9 +2088,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
@@ -2448,9 +2100,6 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_abstract (
   );
@@ -2463,9 +2112,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_abstract (
     is_abstract
@@ -2478,9 +2124,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_custom  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_custom (
   );
@@ -2493,9 +2136,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_custom (
     is_custom
@@ -2508,9 +2148,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_truncatable (
   );
@@ -2523,9 +2160,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->is_truncatable (
     is_truncatable
@@ -2539,9 +2173,6 @@ template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_a  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->is_a (
     id
@@ -2554,9 +2185,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_value (
   );
@@ -2573,9 +2201,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_value_member (
     id,
@@ -2597,9 +2222,6 @@ template <class T> ACE_INLINE
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_attribute (
     id,
@@ -2624,9 +2246,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_operation (
     id,
@@ -2646,9 +2265,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->ext_initializers (
   );
@@ -2661,9 +2277,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->ext_initializers (
     ext_initializers
@@ -2676,9 +2289,6 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_ext_value  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe_ext_value (
   );
@@ -2697,9 +2307,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->create_ext_attribute (
     id,
@@ -2811,9 +2418,6 @@ POA_CORBA::ValueBoxDef_tie<T>::_default_POA (void)
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->def_kind (
   );
@@ -2825,9 +2429,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
   );
@@ -2839,9 +2440,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::id  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->id (
   );
@@ -2854,9 +2452,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::id  (
     const char * id
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->id (
     id
@@ -2869,9 +2464,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::id  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->name (
   );
@@ -2884,9 +2476,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::name  (
     const char * name
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->name (
     name
@@ -2899,9 +2488,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::name  (
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::version  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->version (
   );
@@ -2914,9 +2500,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::version  (
     const char * version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->version (
     version
@@ -2929,9 +2512,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::version  (
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->defined_in (
   );
@@ -2943,9 +2523,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->absolute_name (
   );
@@ -2957,9 +2534,6 @@ char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->containing_repository (
   );
@@ -2971,9 +2545,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->describe (
   );
@@ -2988,9 +2559,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
     const char * new_name,
     const char * new_version
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->move (
     new_container,
@@ -3005,9 +2573,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->type (
   );
@@ -3019,9 +2584,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   return this->ptr_->original_type_def (
   );
@@ -3034,9 +2596,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   this->ptr_->original_type_def (
     original_type_def
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index 24a6876cd38..152fd3098d1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -71,7 +71,6 @@ CORBA::Object_ptr
 TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                        int argc,
                                        ACE_TCHAR *argv[])
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initializes the IFR_Service Service. Returns -1
   // on an error.
@@ -80,9 +79,7 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                                 orb);
   if (result != 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (0,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
+      throw CORBA::BAD_PARAM (0, CORBA::COMPLETED_NO);
     }
 
   return CORBA::Object::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 9f5547c0e37..571bb11b518 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -51,8 +51,7 @@ public:
   // ORB and the command line parameters.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
 
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index ab1f5745bc8..113fb2736ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -200,7 +200,7 @@ TAO_IFR_Server::open_config (void)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
       HKEY root =
         ACE_Configuration_Win32Registry::resolve_key (
             HKEY_LOCAL_MACHINE,
@@ -210,7 +210,7 @@ TAO_IFR_Server::open_config (void)
       ACE_NEW_THROW_EX (this->config_,
                         ACE_Configuration_Win32Registry (root),
                         CORBA::NO_MEMORY ());
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
       return 0;
     }
@@ -465,7 +465,6 @@ TAO_IFR_Service_Utils::valid_container (
     CORBA::DefinitionKind container_kind,
     CORBA::DefinitionKind contained_kind
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int error_flag = 0;
 
@@ -550,7 +549,6 @@ TAO_IFR_Service_Utils::pre_exist (
 void
 TAO_IFR_Service_Utils::id_exists (const char *id,
                                   TAO_Repository_i *repo)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
   ACE_TString holder;
@@ -570,7 +568,6 @@ TAO_IFR_Service_Utils::name_exists (
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int status = 0;
   ACE_TString section_name;
@@ -705,7 +702,6 @@ TAO_IFR_Service_Utils::check_subsection (
     ACE_Configuration *config,
     ACE_Configuration_Section_Key &key
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key sub_key;
   int status =
@@ -1315,8 +1311,7 @@ TAO_IFR_Service_Utils::create_objref (CORBA::DefinitionKind def_kind,
       repo_id += "CORBA/ComponentIR/UsesDef:";
       break;
     default:
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::Object::_nil ());
+      throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   repo_id += "1.0";
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 50fd7309417..eb1740a5e85 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -1,24 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    IFR_Service_Utils.h
-//
-// = DESCRIPTION
-//      Implement wrappers useful to IFR Service clients and servers.
-//
-// = AUTHORS
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//    Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
-//    Priyanka Gontla <pgontla@doc.ece.uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    IFR_Service_Utils.h
+ *
+ *  $Id$
+ *
+ *    Implement wrappers useful to IFR Service clients and servers.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu> Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> Priyanka Gontla <pgontla@doc.ece.uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_SERVICE_UTILS_H
 #define TAO_IFR_SERVICE_UTILS_H
@@ -49,18 +44,18 @@ class TAO_IFRService_Export TAO_IFR_Server
 public:
   TAO_IFR_Server (void);
 
+  //// Initialize the IFR Service with the command line arguments and
+  //// the ORB.
   int init_with_orb (int argc,
                      ACE_TCHAR *argv [],
                      CORBA::ORB_ptr orb,
                      int use_multicast_server = 0);
-  /// Initialize the IFR Service with the command line arguments and
-  /// the ORB.
 
+  //// Destroy the child POA created in <init_with_orb>.
   int fini (void);
-  /// Destroy the child POA created in <init_with_orb>.
 
+  //// Destructor.
   ~TAO_IFR_Server (void);
-  /// Destructor.
 
 protected:
 
@@ -114,8 +109,7 @@ public:
 
   /// Checks for illegal member type in given container type.
   static void valid_container (CORBA::DefinitionKind container_kind,
-                               CORBA::DefinitionKind contained_kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                               CORBA::DefinitionKind contained_kind);
 
   /// Wrapper for id_exists() and name_exists().
   static void pre_exist (const char *id,
@@ -126,23 +120,20 @@ public:
 
   /// Checks for a global repository id clash.
   static void id_exists (const char *id,
-                         TAO_Repository_i *repo)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         TAO_Repository_i *repo);
 
   /// Checks for a local name clash.
   static void name_exists (name_clash_checker checker,
                            ACE_Configuration_Section_Key &key,
                            TAO_Repository_i *repo,
-                           CORBA::DefinitionKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::DefinitionKind kind);
 
   /// Used by interfaces and components to check for name clashes
   /// in the attributes, operations, or component ports subsections.
   static void check_subsection (name_clash_checker checker,
                                 const char *sub_section,
                                 ACE_Configuration *config,
-                                ACE_Configuration_Section_Key &key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                ACE_Configuration_Section_Key &key);
 
   /// Top-level method which calls all the above error-checking methods.
   static void valid_creation (CORBA::DefinitionKind container_kind,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index b2691b27c00..4add4020c6f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -30,7 +30,6 @@ TAO_IRObject_i::~TAO_IRObject_i (void)
 CORBA::DefinitionKind
 TAO_IRObject_i::def_kind (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Will always be overridden by concrete classes.
   return CORBA::dk_none;
@@ -44,7 +43,6 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
 
 void
 TAO_IRObject_i::update_key (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::POA_Current_Impl *pc_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
@@ -70,7 +68,7 @@ TAO_IRObject_i::update_key (void)
 
   ACE_TString path (oid_string,
                     0,
-                    0);
+                    false);
 
   status =
     this->repo_->config ()->expand_path (this->repo_->root_key (),
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index fa19fb2d349..5d6b974724c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    IRObject_i.h
-//
-// = DESCRIPTION
-//    IRObject servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    IRObject_i.h
+ *
+ *  $Id$
+ *
+ *  IRObject servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IROBJECT_I_H
 #define TAO_IROBJECT_I_H
@@ -42,49 +39,48 @@ class TAO_IDLType_i;
 class TAO_Contained_i;
 class TAO_Container_i;
 
+/**
+ * @class TAO_IRObject_i
+ *
+ * @brief TAO_IRObject_i
+ *
+ * Abstract base class for all IR object types.
+ */
 class TAO_IFRService_Export TAO_IRObject_i : public POA_CORBA::IRObject
 {
-  // = TITLE
-  //    TAO_IRObject_i
-  //
-  // = DESCRIPTION
-  //    Abstract base class for all IR object types.
-  //
 public:
+  /// Constructor.
   TAO_IRObject_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_IRObject_i (void);
-  // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Pure virtual.
   virtual void destroy (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Pure virtual.
+    = 0;
 
+  /// Pure virtual - the unlocked version called by the destroy() wrapper.
   virtual void destroy_i (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Pure virtual - the unlocked version called by the destroy() wrapper.
+    = 0;
 
+  /// Plug in the section key.
   void section_key (ACE_Configuration_Section_Key &key);
-  // Plug in the section key.
 
 protected:
-  void update_key (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Set our key from the object ID via POACurrent.
+  /// Set our key from the object ID via POACurrent.
+  void update_key (void);
 
 protected:
+  /// Pointer to the repository we were constructed from.
   TAO_Repository_i *repo_;
-  // Pointer to the repository we were constructed from.
 
+  /// Our ACE_Configuration section key.
   ACE_Configuration_Section_Key section_key_;
-  // Our ACE_Configuration section key.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index c5497345cfe..6865c8e0262 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -34,7 +34,6 @@ TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void)
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -46,7 +45,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface (
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *fifd = 0;
   ACE_NEW_RETURN (fifd,
@@ -244,7 +242,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
 
@@ -269,7 +266,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder (name);
   ACE_Configuration_Section_Key new_key;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index 152cabbc59a..33b6dae3315 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    InterfaceAttrExtension_i.h
-//
-// = DESCRIPTION
-//    InterfaceAttrExtension_i servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    InterfaceAttrExtension_i.h
+ *
+ *  $Id$
+ *
+ *  InterfaceAttrExtension_i servant class.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERFACEATTREXTENSION_I_H
 #define TAO_INTERFACEATTREXTENSION_I_H
@@ -44,22 +41,20 @@ class TAO_IFRService_Export TAO_InterfaceAttrExtension_i
   //    IDL3 attribute extension mixin class.
   //
 public:
+  /// Constructor
   TAO_InterfaceAttrExtension_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_InterfaceAttrExtension_i (void);
-  // Destructor
 
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ExtAttributeDef_ptr create_ext_attribute (
       const char *id,
@@ -69,8 +64,7 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ExtAttributeDef_ptr create_ext_attribute_i (
       const char *id,
@@ -80,8 +74,7 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 90e3018c72d..f824d563205 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -32,14 +32,12 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
 
 CORBA::DefinitionKind
 TAO_InterfaceDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Interface;
 }
 
 void
 TAO_InterfaceDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -50,7 +48,6 @@ TAO_InterfaceDef_i::destroy (void)
 
 void
 TAO_InterfaceDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
   this->TAO_Container_i::destroy_i ();
@@ -77,7 +74,6 @@ TAO_InterfaceDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_InterfaceDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -88,7 +84,6 @@ TAO_InterfaceDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_InterfaceDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -152,7 +147,6 @@ TAO_InterfaceDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_InterfaceDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -163,7 +157,6 @@ TAO_InterfaceDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_InterfaceDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -183,7 +176,6 @@ TAO_InterfaceDef_i::type_i (void)
 
 CORBA::InterfaceDefSeq *
 TAO_InterfaceDef_i::base_interfaces (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -194,7 +186,6 @@ TAO_InterfaceDef_i::base_interfaces (void)
 
 CORBA::InterfaceDefSeq *
 TAO_InterfaceDef_i::base_interfaces_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -232,7 +223,6 @@ TAO_InterfaceDef_i::base_interfaces_i (void)
 
 void
 TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -243,7 +233,6 @@ TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfac
 
 void
 TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
   // abstract as well.
@@ -314,7 +303,6 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
 CORBA::Boolean
 TAO_InterfaceDef_i::is_a (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -325,7 +313,6 @@ TAO_InterfaceDef_i::is_a (const char *interface_id)
 
 CORBA::Boolean
 TAO_InterfaceDef_i::is_a_i (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
@@ -378,7 +365,6 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id)
 
 CORBA::InterfaceDef::FullInterfaceDescription *
 TAO_InterfaceDef_i::describe_interface (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -389,7 +375,6 @@ TAO_InterfaceDef_i::describe_interface (void)
 
 CORBA::InterfaceDef::FullInterfaceDescription *
 TAO_InterfaceDef_i::describe_interface_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0;
   ACE_NEW_RETURN (fifd,
@@ -585,7 +570,6 @@ TAO_InterfaceDef_i::create_attribute (
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
 
@@ -606,7 +590,6 @@ TAO_InterfaceDef_i::create_attribute_i (
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
@@ -662,7 +645,6 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       const CORBA::ParDescriptionSeq &params,
                                       const CORBA::ExceptionDefSeq &exceptions,
                                       const CORBA::ContextIdSeq &contexts)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
 
@@ -687,7 +669,6 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         const CORBA::ParDescriptionSeq &params,
                                         const CORBA::ExceptionDefSeq &exceptions,
                                         const CORBA::ContextIdSeq &contexts)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
@@ -724,9 +705,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::OperationDef::_nil ());
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, CORBA::COMPLETED_NO);
     }
 
   this->repo_->config ()->set_string_value (new_key,
@@ -761,9 +740,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
           // Oneway operations cannot have INOUT or OUT parameters.
           if (mode == CORBA::OP_ONEWAY && params[i].mode != CORBA::PARAM_IN)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::OperationDef::_nil ());
+              throw CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO);
             }
 
           ACE_Configuration_Section_Key param_key;
@@ -799,9 +776,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                              CORBA::COMPLETED_NO),
-                            CORBA::OperationDef::_nil ());
+          throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, CORBA::COMPLETED_NO);
         }
 
       ACE_Configuration_Section_Key excepts_key;
@@ -840,7 +815,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (contexts_key,
                                                     stringified,
-                                                    contexts[i]);
+                                                    contexts[i].in ());
         }
     }
 
@@ -863,7 +838,6 @@ TAO_InterfaceDef_i::interface_contents (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -1170,7 +1144,6 @@ TAO_InterfaceDef_i::inherited_operations (
 void
 TAO_InterfaceDef_i::check_inherited (const char *name,
                                      CORBA::DefinitionKind kind)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index e913e3bfed5..1ba33846076 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    InterfaceDef_i.h
-//
-// = DESCRIPTION
-//    InterfaceDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    InterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  InterfaceDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERFACEDEF_I_H
 #define TAO_INTERFACEDEF_I_H
@@ -49,80 +46,65 @@ class TAO_IFRService_Export TAO_InterfaceDef_i
   //    Represents an interface definition.
   //
 public:
+  /// Constructor
   TAO_InterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_InterfaceDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
   virtual CORBA::InterfaceDefSeq *base_interfaces (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDefSeq *base_interfaces_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void base_interfaces (
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void base_interfaces_i (
       const CORBA::InterfaceDefSeq &base_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
@@ -130,8 +112,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AttributeDef_ptr create_attribute_i (
       const char *id,
@@ -139,8 +120,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::OperationDef_ptr create_operation (
       const char *id,
@@ -151,8 +131,7 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::OperationDef_ptr create_operation_i (
       const char *id,
@@ -163,47 +142,44 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Gathers the attributes and operations of all the ancestors.
   void interface_contents (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Gathers the attributes and operations of all the ancestors.
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exists() when we
+  /// are in a list of supported interfaces.
   static int name_clash (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exists() when we
-  // are in a list of supported interfaces.
 
+  /// Depth-first traversal of the inheritance tree to get all the
+  /// attributes.
   void inherited_attributes (
       ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
     );
-  // Depth-first traversal of the inheritance tree to get all the
-  // attributes.
 
+  /// Depth-first traversal of the inheritance tree to get all the
+  /// operations.
   void inherited_operations (
       ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
     );
-  // Depth-first traversal of the inheritance tree to get all the
-  // operations.
 
 private:
+  /// Depth-first traversal of the inheritance tree to get all
+  /// the base interfaces.
   void base_interfaces_recursive (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue
     );
-  // Depth-first traversal of the inheritance tree to get all
-  // the base interfaces.
 
+  /// When creating a new attribute, check for a clash with an inherited
+  /// attribute name.
   void check_inherited (const char *name,
-                        CORBA::DefinitionKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // When creating a new attribute, check for a clash with an inherited
-  // attribute name.
+                        CORBA::DefinitionKind kind);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 6fe1c37dbc9..31eeced9bf2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -26,14 +26,12 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
 
 CORBA::DefinitionKind
 TAO_LocalInterfaceDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_LocalInterface;
 }
 
 CORBA::Boolean
 TAO_LocalInterfaceDef_i::is_a (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -44,7 +42,6 @@ TAO_LocalInterfaceDef_i::is_a (const char *interface_id)
 
 CORBA::Boolean
 TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 1943789c717..79f58fe8849 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    LocalInterfaceDef_i.h
-//
-// = DESCRIPTION
-//    LocalInterfaceDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    LocalInterfaceDef_i.h
+ *
+ *  $Id$
+ *
+ *  LocalInterfaceDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_LOCALINTERFACEDEF_I_H
 #define TAO_LOCALINTERFACEDEF_I_H
@@ -35,35 +32,33 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_LocalInterfaceDef_i
+ *
+ * @brief TAO_LocalInterfaceDef_i
+ *
+ * Represents an local interface definition.
+ */
 class TAO_IFRService_Export TAO_LocalInterfaceDef_i : public virtual TAO_InterfaceDef_i
 {
-  // = TITLE
-  //    TAO_LocalInterfaceDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an local interface definition.
-  //
 public:
+  /// Constructor
   TAO_LocalInterfaceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_LocalInterfaceDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 8a264a124af..2a31620dd97 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -28,14 +28,12 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ModuleDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Module;
 }
 
 void
 TAO_ModuleDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -46,7 +44,6 @@ TAO_ModuleDef_i::destroy (void)
 
 void
 TAO_ModuleDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -57,7 +54,6 @@ TAO_ModuleDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_ModuleDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -68,7 +64,6 @@ TAO_ModuleDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ModuleDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index fd63eee2482..db35074be55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ModuleDef_i.h
-//
-// = DESCRIPTION
-//    ModuleDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ModuleDef_i.h
+ *
+ *  $Id$
+ *
+ *  ModuleDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_MODULEDEF_I_H
 #define TAO_MODULEDEF_I_H
@@ -48,36 +45,31 @@ class TAO_IFRService_Export TAO_ModuleDef_i
   //    Represents a module definition.
   //
 public:
+  /// Constructor
   TAO_ModuleDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ModuleDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
-
+  /// Remove the repository entry.
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index 65d533bf3c9..d8d76b25cce 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -27,14 +27,12 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
 
 CORBA::DefinitionKind
 TAO_NativeDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Native;
 }
 
 CORBA::TypeCode_ptr
 TAO_NativeDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -45,7 +43,6 @@ TAO_NativeDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_NativeDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index 65776722912..c0ddcdecf43 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    NativeDef_i.h
-//
-// = DESCRIPTION
-//    NativeDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    NativeDef_i.h
+ *
+ *  $Id$
+ *
+ *  NativeDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NATIVEDEF_I_H
 #define TAO_NATIVEDEF_I_H
@@ -45,26 +42,23 @@ public:
   //    Represents an OMG IDL native definition.
   //
 public:
+  /// Constructor
   TAO_NativeDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_NativeDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index cac495880e3..fcbbf1032a9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -30,14 +30,12 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
 
 CORBA::DefinitionKind
 TAO_OperationDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Operation;
 }
 
 CORBA::Contained::Description *
 TAO_OperationDef_i::describe ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -48,7 +46,6 @@ TAO_OperationDef_i::describe ( )
 
 CORBA::Contained::Description *
 TAO_OperationDef_i::describe_i ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -69,7 +66,6 @@ TAO_OperationDef_i::describe_i ( )
 
 CORBA::TypeCode_ptr
 TAO_OperationDef_i::result (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -80,7 +76,6 @@ TAO_OperationDef_i::result (void)
 
 CORBA::TypeCode_ptr
 TAO_OperationDef_i::result_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -97,7 +92,6 @@ TAO_OperationDef_i::result_i (void)
 
 CORBA::IDLType_ptr
 TAO_OperationDef_i::result_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -108,7 +102,6 @@ TAO_OperationDef_i::result_def (void)
 
 CORBA::IDLType_ptr
 TAO_OperationDef_i::result_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -124,7 +117,6 @@ TAO_OperationDef_i::result_def_i (void)
 
 void
 TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -135,7 +127,6 @@ TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def)
 
 void
 TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *result_path =
     TAO_IFR_Service_Utils::reference_to_path (result_def);
@@ -147,7 +138,6 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def)
 
 CORBA::ParDescriptionSeq *
 TAO_OperationDef_i::params (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -158,7 +148,6 @@ TAO_OperationDef_i::params (void)
 
 CORBA::ParDescriptionSeq *
 TAO_OperationDef_i::params_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong i = 0;
   ACE_Configuration_Section_Key params_key;
@@ -253,7 +242,6 @@ TAO_OperationDef_i::params_i (void)
 
 void
 TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -264,7 +252,6 @@ TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params)
 
 void
 TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "params",
@@ -315,7 +302,6 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params)
 
 CORBA::OperationMode
 TAO_OperationDef_i::mode (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
@@ -326,7 +312,6 @@ TAO_OperationDef_i::mode (void)
 
 CORBA::OperationMode
 TAO_OperationDef_i::mode_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -338,7 +323,6 @@ TAO_OperationDef_i::mode_i (void)
 
 void
 TAO_OperationDef_i::mode (CORBA::OperationMode mode)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -349,7 +333,6 @@ TAO_OperationDef_i::mode (CORBA::OperationMode mode)
 
 void
 TAO_OperationDef_i::mode_i (CORBA::OperationMode mode)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "mode",
@@ -358,7 +341,6 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode)
 
 CORBA::ContextIdSeq *
 TAO_OperationDef_i::contexts (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -369,7 +351,6 @@ TAO_OperationDef_i::contexts (void)
 
 CORBA::ContextIdSeq *
 TAO_OperationDef_i::contexts_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key contexts_key;
   int status =
@@ -425,7 +406,6 @@ TAO_OperationDef_i::contexts_i (void)
 
 void
 TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -436,7 +416,6 @@ TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts)
 
 void
 TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "contexts",
@@ -458,13 +437,12 @@ TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts)
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (contexts_key,
                                                 stringified,
-                                                contexts[i]);
+                                                contexts[i].in ());
     }
 }
 
 CORBA::ExceptionDefSeq *
 TAO_OperationDef_i::exceptions ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -475,7 +453,6 @@ TAO_OperationDef_i::exceptions ( )
 
 CORBA::ExceptionDefSeq *
 TAO_OperationDef_i::exceptions_i ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
   int status =
@@ -541,7 +518,6 @@ TAO_OperationDef_i::exceptions_i ( )
 
 void
 TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -552,7 +528,6 @@ TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions)
 
 void
 TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "excepts",
@@ -567,7 +542,6 @@ TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions)
 void
 TAO_OperationDef_i::make_description (
     CORBA::OperationDescription &od)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   od.name = this->name_i ();
 
@@ -686,7 +660,6 @@ TAO_OperationDef_i::make_description (
 
 CORBA::TypeCode_ptr
 TAO_OperationDef_i::type_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->result_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index c8b9bbf4a30..1c561642d4d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    OperationDef_i.h
-//
-// = DESCRIPTION
-//    OperationDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    OperationDef_i.h
+ *
+ *  $Id$
+ *
+ *  OperationDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_OPERATIONDEF_I_H
 #define TAO_OPERATIONDEF_I_H
@@ -35,118 +32,92 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_OperationDef_i
+ *
+ * @brief TAO_OperationDef_i
+ *
+ * Represents the information needed to describe an operation
+ * of an interface.
+ */
 class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_OperationDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the information needed to describe an operation
-  //    of an interface.
-  //
 public:
+  /// Constructor
   TAO_OperationDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_OperationDef_i (void);
-  // Destructor
 
-  virtual CORBA::DefinitionKind def_kind ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+  /// Return our definition kind.
+  virtual CORBA::DefinitionKind def_kind ();
 
-  virtual CORBA::Contained::Description *describe ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+  /// From Contained_i's pure virtual function.
+  virtual CORBA::Contained::Description *describe ();
 
-  virtual CORBA::Contained::Description *describe_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+  /// From Contained_i's pure virtual function.
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::TypeCode_ptr result ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::TypeCode_ptr result ();
 
-  CORBA::TypeCode_ptr result_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::TypeCode_ptr result_i ();
 
-  virtual CORBA::IDLType_ptr result_def ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::IDLType_ptr result_def ();
 
-  CORBA::IDLType_ptr result_def_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::IDLType_ptr result_def_i ();
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::IDLType_ptr result_def);
 
   void result_def_i (
-      CORBA::IDLType_ptr result_def)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::IDLType_ptr result_def);
 
-  virtual CORBA::ParDescriptionSeq *params ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ParDescriptionSeq *params ();
 
-  CORBA::ParDescriptionSeq *params_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ParDescriptionSeq *params_i ();
 
   virtual void params (
-      const CORBA::ParDescriptionSeq &params)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ParDescriptionSeq &params);
 
   void params_i (
-      const CORBA::ParDescriptionSeq &params)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ParDescriptionSeq &params);
 
-  virtual CORBA::OperationMode mode ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::OperationMode mode ();
 
-  CORBA::OperationMode mode_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::OperationMode mode_i ();
 
   virtual void mode (
-      CORBA::OperationMode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::OperationMode mode);
 
   void mode_i (
-      CORBA::OperationMode mode)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::OperationMode mode);
 
-  virtual CORBA::ContextIdSeq *contexts ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ContextIdSeq *contexts ();
 
-  CORBA::ContextIdSeq *contexts_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ContextIdSeq *contexts_i ();
 
   virtual void contexts (
-      const CORBA::ContextIdSeq &contexts)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ContextIdSeq &contexts);
 
   void contexts_i (
-      const CORBA::ContextIdSeq &contexts)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ContextIdSeq &contexts);
 
-  virtual CORBA::ExceptionDefSeq *exceptions ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ExceptionDefSeq *exceptions ();
 
-  CORBA::ExceptionDefSeq *exceptions_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ExceptionDefSeq *exceptions_i ();
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq &exceptions)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ExceptionDefSeq &exceptions);
 
   void exceptions_i (
-      const CORBA::ExceptionDefSeq &exceptions)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ExceptionDefSeq &exceptions);
 
   // Common code for containers to call in
   // making descriptions.
 
-  void make_description (CORBA::OperationDescription &desc)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void make_description (CORBA::OperationDescription &desc);
 
-  CORBA::TypeCode_ptr type_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::TypeCode_ptr type_i (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
index f1453559b03..809326348af 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    Options.h
-//
-// = DESCRIPTION
-//    This class implements the Options container for the Interface
-//    Repository.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Options.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Options container for the Interface
+ *  Repository.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
@@ -29,61 +26,63 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class Options
+ *
+ * @brief Maintains the global options.
+ *
+ * This class is converted into a Singleton by the
+ * <ACE_Singleton> template.
+ */
 class TAO_IFRService_Export Options
 {
-  // = TITLE
-  //   Maintains the global options.
-  //
-  // = DESCRIPTION
-  //   This class is converted into a Singleton by the
-  //   <ACE_Singleton> template.
 public:
+  /// Default Constructor
   Options ();
-  // Default Constructor
 
+  /// dtor
   ~Options();
-  // dtor
 
+  /// Parse the command-line arguments and initialize the options.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Parse the command-line arguments and initialize the options.
 
+  /// Return the file where the IOR of the server object is stored.
   const char *ior_output_file (void) const;
-  // Return the file where the IOR of the server object is stored.
 
+  /// Is the Interface Repository persistent?
   int persistent (void) const;
-  // Is the Interface Repository persistent?
 
+  /// Return the default filename for persistent IFR.
   const char *persistent_file (void) const;
-  // Return the default filename for persistent IFR.
 
+  /// Are we using a WIN32 registry as the backing store?
   int using_registry (void) const;
-  // Are we using a WIN32 registry as the backing store?
 
+  /// Should the repository have a real mutex or a null mutex?
   int enable_locking (void) const;
-  // Should the repository have a real mutex or a null mutex?
 
+  /// should the service support discovery via multicast?
   int support_multicast_discovery (void) const;
-  // should the service support discovery via multicast?
 
 private:
+  /// File where the IOR of the server object is stored.
   char *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Is the Interface Repository persistent?
   int persistent_;
-  // Is the Interface Repository persistent?
 
+  /// Default filename for persistent IFR.
   char *persistent_file_;
-  // Default filename for persistent IFR.
 
+  /// Are we using a WIN32 registry as the backing store?
   int using_registry_;
-  // Are we using a WIN32 registry as the backing store?
 
+  /// Should the repository have a real mutex or a null mutex?
   int enable_locking_;
-  // Should the repository have a real mutex or a null mutex?
 
+  /// If not zero multicast is enabled.
   int support_multicast_;
-  // If not zero multicast is enabled.
 };
 
 // Typedef an Options Singleton.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 2443d8c68f9..443ddf4d951 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -23,28 +23,24 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 
 CORBA::DefinitionKind
 TAO_PrimitiveDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void
 TAO_PrimitiveDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_i ();
 }
 
 void
 TAO_PrimitiveDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::TypeCode_ptr
 TAO_PrimitiveDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -55,7 +51,6 @@ TAO_PrimitiveDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_PrimitiveDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -115,7 +110,6 @@ TAO_PrimitiveDef_i::type_i (void)
 
 CORBA::PrimitiveKind
 TAO_PrimitiveDef_i::kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
@@ -126,7 +120,6 @@ TAO_PrimitiveDef_i::kind (void)
 
 CORBA::PrimitiveKind
 TAO_PrimitiveDef_i::kind_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index 8214d91f77c..ce9de3707d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    PrimitiveDef_i.h
-//
-// = DESCRIPTION
-//    PrimitiveDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    PrimitiveDef_i.h
+ *
+ *  $Id$
+ *
+ *  PrimitiveDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_PRIMITIVEDEF_I_H
 #define TAO_PRIMITIVEDEF_I_H
@@ -35,53 +32,47 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_PrimitiveDef_i
+ *
+ * @brief TAO_PrimitiveDef_i
+ *
+ * Represents any of the OMG IDL primitive types
+ */
 class TAO_IFRService_Export TAO_PrimitiveDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_PrimitiveDef_i
-  //
-  // = DESCRIPTION
-  //    Represents any of the OMG IDL primitive types
-  //
 public:
+  /// Constructor.
   TAO_PrimitiveDef_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_PrimitiveDef_i (void);
-  // Destructor.
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// May not be called on a primitive kind - raises BAD_INV_ORDER.
   virtual void destroy ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // May not be called on a primitive kind - raises BAD_INV_ORDER.
-
+  /// Must implement this here because it's pure virtual in the
+  /// base class.
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Must implement this here because it's pure virtual in the
-  // base class.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::PrimitiveKind kind ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::PrimitiveKind kind_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index b4340673544..3db08a3d7f6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -28,14 +28,12 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ProvidesDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Provides;
 }
 
 CORBA::Contained::Description *
 TAO_ProvidesDef_i::describe (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -46,7 +44,6 @@ TAO_ProvidesDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ProvidesDef_i::describe_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::ProvidesDescription pd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription,
@@ -74,7 +71,6 @@ TAO_ProvidesDef_i::describe_i (void)
 
 CORBA::InterfaceDef_ptr
 TAO_ProvidesDef_i::interface_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
@@ -85,7 +81,6 @@ TAO_ProvidesDef_i::interface_type (void)
 
 CORBA::InterfaceDef_ptr
 TAO_ProvidesDef_i::interface_type_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -105,7 +100,6 @@ void
 TAO_ProvidesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -118,7 +112,6 @@ void
 TAO_ProvidesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_value (this->section_key_,
                                         "base_type");
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index 26e284cb89a..aa0c28d07c0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ProvidesDef_i.h
-//
-// = DESCRIPTION
-//    ProvidesDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ProvidesDef_i.h
+ *
+ *  $Id$
+ *
+ *  ProvidesDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_PROVIDESDEF_I_H
 #define TAO_PROVIDESDEF_I_H
@@ -34,53 +31,47 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_ProvidesDef_i
+ *
+ * @brief TAO_ProvidesDef_i
+ *
+ * Represents an interface that is provided by a component.
+ */
 class TAO_IFRService_Export TAO_ProvidesDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_ProvidesDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an interface that is provided by a component.
-  //
 public:
+  /// Constructor
     TAO_ProvidesDef_i (TAO_Repository_i *repoy);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ProvidesDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDef_ptr interface_type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 0ca5b1f2c99..a41a77b49df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -23,7 +23,6 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
 
 CORBA::DefinitionKind
 TAO_PublishesDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Publishes;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index ca8407fb2c4..89f245d6467 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    PublishesDef_i.h
-//
-// = DESCRIPTION
-//    PublishesDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    PublishesDef_i.h
+ *
+ *  $Id$
+ *
+ *  PublishesDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_PUBLISHESDEF_I_H
 #define TAO_PUBLISHESDEF_I_H
@@ -45,16 +42,15 @@ class TAO_IFRService_Export TAO_PublishesDef_i
   //    by a component.
   //
 public:
+  /// Constructor
     TAO_PublishesDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_PublishesDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
index 5fdf5b7e7a0..33efa7d12d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    RecursDef_i.h
-//
-// = DESCRIPTION
-//    StructDef & UnionDef support class.
-//
-// = AUTHOR
-//    Simon Massey <sma@prismtech.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    RecursDef_i.h
+ *
+ *  $Id$
+ *
+ *  StructDef & UnionDef support class.
+ *
+ *
+ *  @author Simon Massey <sma@prismtech.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECURSDEF_I_H
 #define TAO_RECURSDEF_I_H
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 734634884f7..995534cce41 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -40,21 +40,18 @@ TAO_Repository_i::~TAO_Repository_i (void)
 
 CORBA::DefinitionKind
 TAO_Repository_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Repository;
 }
 
 void
 TAO_Repository_i::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::Contained_ptr
 TAO_Repository_i::lookup_id (const char *search_id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Contained::_nil ());
 
@@ -63,7 +60,6 @@ TAO_Repository_i::lookup_id (const char *search_id)
 
 CORBA::Contained_ptr
 TAO_Repository_i::lookup_id_i (const char *search_id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
       || ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -103,7 +99,6 @@ TAO_Repository_i::lookup_id_i (const char *search_id)
 
 CORBA::TypeCode_ptr
 TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -112,7 +107,6 @@ TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc)
 
 CORBA::TypeCode_ptr
 TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TCKind kind = tc->kind ();
 
@@ -122,7 +116,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc)
     default:
       return CORBA::TypeCode::_duplicate (tc);
     case CORBA::tk_fixed:
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+      throw CORBA::NO_IMPLEMENT ();
     case CORBA::tk_array:
     {
       CORBA::ULong length = tc->length ();
@@ -202,7 +196,6 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc)
 
 CORBA::PrimitiveDef_ptr
 TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
 
@@ -218,7 +211,6 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind)
 
 CORBA::StringDef_ptr
 TAO_Repository_i::create_string (CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StringDef::_nil ());
 
@@ -227,7 +219,6 @@ TAO_Repository_i::create_string (CORBA::ULong bound)
 
 CORBA::StringDef_ptr
 TAO_Repository_i::create_string_i (CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
   this->config_->get_integer_value (this->strings_key_,
@@ -272,7 +263,6 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound)
 
 CORBA::WstringDef_ptr
 TAO_Repository_i::create_wstring (CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::WstringDef::_nil ());
 
@@ -281,7 +271,6 @@ TAO_Repository_i::create_wstring (CORBA::ULong bound)
 
 CORBA::WstringDef_ptr
 TAO_Repository_i::create_wstring_i (CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
   this->config_->get_integer_value (this->wstrings_key_,
@@ -327,7 +316,6 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound)
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
                                    CORBA::IDLType_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::SequenceDef::_nil ());
 
@@ -338,7 +326,6 @@ TAO_Repository_i::create_sequence (CORBA::ULong bound,
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
                                      CORBA::IDLType_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
   this->config_->get_integer_value (this->sequences_key_,
@@ -395,7 +382,6 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
                                 CORBA::IDLType_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ArrayDef::_nil ());
 
@@ -406,7 +392,6 @@ TAO_Repository_i::create_array (CORBA::ULong length,
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
                                   CORBA::IDLType_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
   this->config_->get_integer_value (this->arrays_key_,
@@ -463,7 +448,6 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
 CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
                                 CORBA::Short scale)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::FixedDef::_nil ());
 
@@ -475,9 +459,8 @@ CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
                                   CORBA::Short /* scale */
                                   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::FixedDef::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 87cf86d6f10..0e91418870d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    Repository_i.h
-//
-// = DESCRIPTION
-//    Repository servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Repository_i.h
+ *
+ *  $Id$
+ *
+ *  Repository servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef REPOSITORY_I_H
 #define REPOSITORY_I_H
@@ -66,16 +63,17 @@ class TAO_ExtValueDef_i;
 class TAO_ValueMemberDef_i;
 class TAO_WstringDef_i;
 
+/**
+ * @class TAO_Repository_i
+ *
+ * @brief TAO_Repository_i
+ *
+ * Provides global access to the Interface Repository, but
+ * does not support access to information related to
+ * CORBA Components.
+ */
 class TAO_IFRService_Export TAO_Repository_i : public virtual TAO_Container_i
 {
-  // = TITLE
-  //    TAO_Repository_i
-  //
-  // = DESCRIPTION
-  //    Provides global access to the Interface Repository, but
-  //    does not support access to information related to
-  //    CORBA Components.
-  //
 public:
   TAO_Repository_i (CORBA::ORB_ptr orb,
                     PortableServer::POA_ptr poa,
@@ -83,110 +81,94 @@ public:
 
   virtual ~TAO_Repository_i (void);
 
+  /// Accessor for the readonly attribute.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Accessor for the readonly attribute.
+    );
 
+  /// May not be called on a repository - raises BAD_INV_ORDER.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // May not be called on a repository - raises BAD_INV_ORDER.
+    );
 
   virtual CORBA::Contained_ptr lookup_id (
       const char *search_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Contained_ptr lookup_id_i (
       const char *search_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
       CORBA::TypeCode_ptr tc
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// No locking necessary because the database is not
+  /// accessed.
   virtual CORBA::PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // No locking necessary because the database is not
-  // accessed.
+    );
 
   virtual CORBA::StringDef_ptr create_string (
       CORBA::ULong bound
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::StringDef_ptr create_string_i (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::WstringDef_ptr create_wstring (
       CORBA::ULong bound
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::WstringDef_ptr create_wstring_i (
       CORBA::ULong bound
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-    )
-    ACE_THROW_SPEC (( CORBA::SystemException));
+    );
 
   CORBA::SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-    )
-    ACE_THROW_SPEC (( CORBA::SystemException));
+    );
 
   virtual CORBA::ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ArrayDef_ptr create_array_i (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
       CORBA::Short scale
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called at startup to get everything initialized.
   int repo_init (CORBA::Repository_ptr repo_ref,
                  PortableServer::POA_ptr repo_poa);
-  // Called at startup to get everything initialized.
 
+  /// We create a default servant servant for each IR Object
+  /// type and its corresponding POA.
   virtual int create_servants_and_poas (void);
-  // We create a default servant servant for each IR Object
-  // type and its corresponding POA.
 
+  /// Create the top-level ACE_Configuration sections.
   int create_sections (void);
-  // Create the top-level ACE_Configuration sections.
 
+  /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (
       CORBA::DefinitionKind def_kind
     ) const;
@@ -196,113 +178,114 @@ public:
   virtual TAO_Contained_i *select_contained (
       CORBA::DefinitionKind def_kind
     ) const;
-  // Return one of our servants for internal use.
 
+  /// Select the right POA for object creation.
   virtual PortableServer::POA_ptr select_poa (
       CORBA::DefinitionKind def_kind
     ) const;
-  // Select the right POA for object creation.
 
+  /// Accessor for the POA that is dispatching the current call.
   PortableServer::Current_ptr poa_current (void) const;
-  // Accessor for the POA that is dispatching the current call.
 
+  /// Accessor for the ACE_Configuration database.
   ACE_Configuration *config (void) const;
-  // Accessor for the ACE_Configuration database.
 
+  /// Accessor for the Typecode factory.
   CORBA::TypeCodeFactory_ptr tc_factory (void) const;
-  // Accessor for the Typecode factory.
 
+  /// Accessor/mutator for our object reference.
   CORBA::Repository_ptr repo_objref (void) const;
   void repo_objref (CORBA::Repository_ptr objref);
-  // Accessor/mutator for our object reference.
 
+  /// Accessor for the root key for all IR objects.
   ACE_Configuration_Section_Key root_key (void) const;
-  // Accessor for the root key for all IR objects.
 
+  /// Accessor for the repository ids root key.
   ACE_Configuration_Section_Key repo_ids_key (void) const;
-  // Accessor for the repository ids root key.
 
+  /// Accessor for the primitive kinds section.
   ACE_Configuration_Section_Key pkinds_key (void) const;
-  // Accessor for the primitive kinds section.
 
+  /// Accessor for the bounded strings section.
   ACE_Configuration_Section_Key strings_key (void) const;
-  // Accessor for the bounded strings section.
 
+  /// Accessor for the bounded wstrings section.
   ACE_Configuration_Section_Key wstrings_key (void) const;
-  // Accessor for the bounded wstrings section.
 
+  /// Accessor for the fixed types section.
   ACE_Configuration_Section_Key fixeds_key (void) const;
-  // Accessor for the fixed types section.
 
+  /// Accessor for the anonymous arrays section.
   ACE_Configuration_Section_Key arrays_key (void) const;
-  // Accessor for the anonymous arrays section.
 
+  /// Accessor for the anonymous sequences section.
   ACE_Configuration_Section_Key sequences_key (void) const;
-  // Accessor for the anonymous sequences section.
 
+  /// Accessor for the name extension string.
   const char *extension (void) const;
-  // Accessor for the name extension string.
 
+  /// Repo lock.
   ACE_Lock &lock (void) const;
-  // Repo lock.
 
+  /**
+   * Used ONLY with Purify, for memory leak checking.
+   * A call to this can be temporariily appended to the
+   * destroy() method of the last thing to be destroyed
+   * by the test code.
+   */
   void shutdown (void);
-  // Used ONLY with Purify, for memory leak checking.
-  // A call to this can be temporariily appended to the
-  // destroy() method of the last thing to be destroyed
-  // by the test code.
 
 protected:
+  /// Reference to our ORB.
   CORBA::ORB_ptr orb_;
-  // Reference to our ORB.
 
+  /// Reference to the root POA.
   PortableServer::POA_var root_poa_;
-  // Reference to the root POA.
 
+  /// Reference to the POA handling calls to this servant.
   PortableServer::POA_var repo_poa_;
-  // Reference to the POA handling calls to this servant.
 
+  /// Reference to the PortableServer::Current object
   PortableServer::Current_var poa_current_;
-  // Reference to the PortableServer::Current object
 
+  /// Our ACE_Configuration database.
   ACE_Configuration *config_;
-  // Our ACE_Configuration database.
 
+  /// Our Typecode factory.
   CORBA::TypeCodeFactory_var tc_factory_;
-  // Our Typecode factory.
 
+  /// The object reference of this servant.
   CORBA::Repository_var repo_objref_;
-  // The object reference of this servant.
 
+  /// Root of all IR objects.
   ACE_Configuration_Section_Key root_key_;
-  // Root of all IR objects.
 
+  /// Flat section of Interface Repository ids.
   ACE_Configuration_Section_Key repo_ids_key_;
-  // Flat section of Interface Repository ids.
 
+  /// Section holding the primitive kinds.
   ACE_Configuration_Section_Key pkinds_key_;
-  // Section holding the primitive kinds.
 
+  /// Section holding the bounded strings.
   ACE_Configuration_Section_Key strings_key_;
-  // Section holding the bounded strings.
 
+  /// Section holding the bounded wstrings.
   ACE_Configuration_Section_Key wstrings_key_;
-  // Section holding the bounded wstrings.
 
+  /// Section holding the fixed types.
   ACE_Configuration_Section_Key fixeds_key_;
-  // Section holding the fixed types.
 
+  /// Section holding the anonymous arrays.
   ACE_Configuration_Section_Key arrays_key_;
-  // Section holding the anonymous arrays.
 
+  /// Section holding the anonymous sequences.
   ACE_Configuration_Section_Key sequences_key_;
-  // Section holding the anonymous sequences.
 
+  /// Added to names temporarily to avoid name clashes.
   CORBA::String_var extension_;
-  // Added to names temporarily to avoid name clashes.
 
+  /// Lock.
   ACE_Lock *lock_;
-  // Lock.
 
   // Define a POA for each IR Object type, and a corresponding
   // default servant.
@@ -347,15 +330,15 @@ protected:
 #undef GEN_IR_OBJECT
 
 private:
+  /// Set of strings corresponding to the CORBA::PrimitiveKind
+  /// enum values.
   static const char * TAO_IFR_primitive_kinds[];
-  // Set of strings corresponding to the CORBA::PrimitiveKind
-  // enum values.
 
+  /// Convert the enum value to the equivalent string.
   const char *pkind_to_string (CORBA::PrimitiveKind pkind) const;
-  // Convert the enum value to the equivalent string.
 
+  /// Return the number of entries in the CORBA::PrimitiveKind enum.
   u_int num_pkinds (void) const;
-  // Return the number of entries in the CORBA::PrimitiveKind enum.
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 1b96ebf5d1d..d91db54a12d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -28,14 +28,12 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
 
 CORBA::DefinitionKind
 TAO_SequenceDef_i::def_kind (void)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Sequence;
 }
 
 void
 TAO_SequenceDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -46,7 +44,6 @@ TAO_SequenceDef_i::destroy (void)
 
 void
 TAO_SequenceDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
   this->destroy_element_type ();
@@ -63,7 +60,6 @@ TAO_SequenceDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_SequenceDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -74,7 +70,6 @@ TAO_SequenceDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_SequenceDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
     this->element_type_i ();
@@ -89,7 +84,6 @@ TAO_SequenceDef_i::type_i (void)
 
 CORBA::ULong
 TAO_SequenceDef_i::bound (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -100,7 +94,6 @@ TAO_SequenceDef_i::bound (void)
 
 CORBA::ULong
 TAO_SequenceDef_i::bound_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int bound = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -112,7 +105,6 @@ TAO_SequenceDef_i::bound_i (void)
 
 void
 TAO_SequenceDef_i::bound (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -121,7 +113,6 @@ TAO_SequenceDef_i::bound (CORBA::ULong bound)
 
 void
 TAO_SequenceDef_i::bound_i (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "bound",
@@ -130,7 +121,6 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound)
 
 CORBA::TypeCode_ptr
 TAO_SequenceDef_i::element_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -141,7 +131,6 @@ TAO_SequenceDef_i::element_type (void)
 
 CORBA::TypeCode_ptr
 TAO_SequenceDef_i::element_type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -157,7 +146,6 @@ TAO_SequenceDef_i::element_type_i (void)
 
 CORBA::IDLType_ptr
 TAO_SequenceDef_i::element_type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -168,7 +156,6 @@ TAO_SequenceDef_i::element_type_def (void)
 
 CORBA::IDLType_ptr
 TAO_SequenceDef_i::element_type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -184,7 +171,6 @@ TAO_SequenceDef_i::element_type_def_i (void)
 
 void
 TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -195,7 +181,6 @@ TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
 
 void
 TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_element_type ();
 
@@ -209,7 +194,6 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
 
 void
 TAO_SequenceDef_i::destroy_element_type ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index 9189728fcce..36eba0e7780 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    SequenceDef_i.h
-//
-// = DESCRIPTION
-//    SequenceDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    SequenceDef_i.h
+ *
+ *  $Id$
+ *
+ *  SequenceDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SEQUENCEDEF_I_H
 #define SEQUENCEDEF_I_H
@@ -35,94 +32,79 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_SequenceDef_i
+ *
+ * @brief TAO_SequenceDef_i
+ *
+ * Represents an IDL sequence type.
+ */
 class TAO_IFRService_Export TAO_SequenceDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_SequenceDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an IDL sequence type.
-  //
 public:
+  /// Constructor
   TAO_SequenceDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_SequenceDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::ULong bound ()
-
-      ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::ULong bound_i ()
-
-      ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void bound (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void bound_i (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::TypeCode_ptr element_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr element_type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr element_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr element_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void element_type_def (
       CORBA::IDLType_ptr element_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void element_type_def_i (
       CORBA::IDLType_ptr element_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
 private:
+  /// Destroys an anonymous non-primitive element type.
   void destroy_element_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Destroys an anonymous non-primitive element type.
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 28fb4b79870..ff0658e0d68 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -24,14 +24,12 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
 
 CORBA::DefinitionKind
 TAO_StringDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_String;
 }
 
 void
 TAO_StringDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -42,7 +40,6 @@ TAO_StringDef_i::destroy (void)
 
 void
 TAO_StringDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -56,7 +53,6 @@ TAO_StringDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_StringDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -67,7 +63,6 @@ TAO_StringDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_StringDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong bound = this->bound_i ();
 
@@ -78,7 +73,6 @@ TAO_StringDef_i::type_i (void)
 
 CORBA::ULong
 TAO_StringDef_i::bound (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -89,7 +83,6 @@ TAO_StringDef_i::bound (void)
 
 CORBA::ULong
 TAO_StringDef_i::bound_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -101,7 +94,6 @@ TAO_StringDef_i::bound_i (void)
 
 void
 TAO_StringDef_i::bound (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -112,7 +104,6 @@ TAO_StringDef_i::bound (CORBA::ULong bound)
 
 void
 TAO_StringDef_i::bound_i (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "bound",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index f6bb6c00a8a..6a63c9e74c7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    StringDef_i.h
-//
-// = DESCRIPTION
-//    StringDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    StringDef_i.h
+ *
+ *  $Id$
+ *
+ *  StringDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_STRINGDEF_I_H
 #define TAO_STRINGDEF_I_H
@@ -35,63 +32,55 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_StringDef_i
+ *
+ * @brief TAO_StringDef_i
+ *
+ * Represents a bounded string (unbounded strings
+ * are included in PrimitiveDef).
+ */
 class TAO_IFRService_Export TAO_StringDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_StringDef_i
-  //
-  // = DESCRIPTION
-  //    Represents a bounded string (unbounded strings
-  //    are included in PrimitiveDef).
-  //
 public:
+  /// Constructor.
   TAO_StringDef_i (TAO_Repository_i *repoy);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_StringDef_i (void);
-  // Destructor.
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::ULong bound ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::ULong bound_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void bound (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void bound_i (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 3050169c3fa..96499913af6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -30,14 +30,12 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
 
 CORBA::DefinitionKind
 TAO_StructDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Struct;
 }
 
 void
 TAO_StructDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -48,7 +46,6 @@ TAO_StructDef_i::destroy (void)
 
 void
 TAO_StructDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -59,7 +56,6 @@ TAO_StructDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_StructDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -70,7 +66,6 @@ TAO_StructDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_StructDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -110,7 +105,6 @@ TAO_StructDef_i::type_i (void)
 
 CORBA::StructMemberSeq *
 TAO_StructDef_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -121,7 +115,6 @@ TAO_StructDef_i::members (void)
 
 CORBA::StructMemberSeq *
 TAO_StructDef_i::members_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -225,7 +218,7 @@ TAO_StructDef_i::members_i (void)
                                                      this->repo_);
       if (0 == impl)
       {
-        ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), 0);
+        throw CORBA::OBJECT_NOT_EXIST();
       }
 
       retval[k].type = impl->type_i ();
@@ -241,7 +234,6 @@ TAO_StructDef_i::members_i (void)
 
 void
 TAO_StructDef_i::members (const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -252,7 +244,6 @@ TAO_StructDef_i::members (const CORBA::StructMemberSeq &members)
 
 void
 TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
   TAO_Container_i::destroy_i ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index ede4b8371f8..dfb83bd2b6d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    StructDef_i.h
-//
-// = DESCRIPTION
-//    StructDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    StructDef_i.h
+ *
+ *  $Id$
+ *
+ *  StructDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_STRUCTDEF_I_H
 #define TAO_STRUCTDEF_I_H
@@ -46,53 +43,44 @@ class TAO_IFRService_Export TAO_StructDef_i : public virtual TAO_TypedefDef_i,
   //    Represents an OMG IDL structure definition.
   //
 public:
+  /// Constructor
   TAO_StructDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_StructDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry and its contents.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry and its contents.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::StructMemberSeq *members ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::StructMemberSeq *members_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void members (
       const CORBA::StructMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void members_i (
       const CORBA::StructMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index bf8052c6d64..676a6edffc4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -27,7 +27,6 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
 
 CORBA::Contained::Description *
 TAO_TypedefDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -38,7 +37,6 @@ TAO_TypedefDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_TypedefDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index 2bf952d08ca..a3b469fe789 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    TypedefDef_i.h
-//
-// = DESCRIPTION
-//    TypedefDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    TypedefDef_i.h
+ *
+ *  $Id$
+ *
+ *  TypedefDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_TYPEDEFDEF_I_H
 #define TAO_TYPEDEFDEF_I_H
@@ -47,21 +44,19 @@ class TAO_IFRService_Export TAO_TypedefDef_i : public virtual TAO_Contained_i,
   //    struct, union, enum, alias, native, and valuebox.
   //
 public:
+  /// Constructor
   TAO_TypedefDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_TypedefDef_i (void);
-  // Destructor
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 2d1de15f315..eb2a8ecb860 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -33,14 +33,12 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
 
 CORBA::DefinitionKind
 TAO_UnionDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Union;
 }
 
 void
 TAO_UnionDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -51,7 +49,6 @@ TAO_UnionDef_i::destroy (void)
 
 void
 TAO_UnionDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -62,7 +59,6 @@ TAO_UnionDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_UnionDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -73,7 +69,6 @@ TAO_UnionDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_UnionDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -116,7 +111,6 @@ TAO_UnionDef_i::type_i (void)
 
 CORBA::TypeCode_ptr
 TAO_UnionDef_i::discriminator_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -127,7 +121,6 @@ TAO_UnionDef_i::discriminator_type (void)
 
 CORBA::TypeCode_ptr
 TAO_UnionDef_i::discriminator_type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -139,7 +132,7 @@ TAO_UnionDef_i::discriminator_type_i (void)
                                             this->repo_);
   if (0 == impl)
   {
-     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
+     throw CORBA::OBJECT_NOT_EXIST();
   }
 
   return impl->type_i ();
@@ -147,7 +140,6 @@ TAO_UnionDef_i::discriminator_type_i (void)
 
 CORBA::IDLType_ptr
 TAO_UnionDef_i::discriminator_type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -158,7 +150,6 @@ TAO_UnionDef_i::discriminator_type_def (void)
 
 CORBA::IDLType_ptr
 TAO_UnionDef_i::discriminator_type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -176,7 +167,6 @@ void
 TAO_UnionDef_i::discriminator_type_def (
     CORBA::IDLType_ptr discriminator_type_def
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -189,7 +179,6 @@ void
 TAO_UnionDef_i::discriminator_type_def_i (
     CORBA::IDLType_ptr discriminator_type_def
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *disc_path =
     TAO_IFR_Service_Utils::reference_to_path (discriminator_type_def);
@@ -201,7 +190,6 @@ TAO_UnionDef_i::discriminator_type_def_i (
 
 CORBA::UnionMemberSeq *
 TAO_UnionDef_i::members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -212,7 +200,6 @@ TAO_UnionDef_i::members (void)
 
 CORBA::UnionMemberSeq *
 TAO_UnionDef_i::members_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
 
@@ -300,7 +287,7 @@ TAO_UnionDef_i::members_i (void)
                                                      this->repo_);
       if (0 == impl)
       {
-        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), 0 );
+        throw CORBA::OBJECT_NOT_EXIST();
       }
 
       retval[k].type = impl->type_i ();
@@ -316,7 +303,6 @@ TAO_UnionDef_i::members_i (void)
 
 void
 TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -327,7 +313,6 @@ TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members)
 
 void
 TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
   TAO_Container_i::destroy_i ();
@@ -377,7 +362,6 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members)
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                              CORBA::UnionMember &member)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
   this->repo_->config ()->find_value (member_key,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index b29dba18492..23d633c3366 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    UnionDef_i.h
-//
-// = DESCRIPTION
-//    UnionDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UnionDef_i.h
+ *
+ *  $Id$
+ *
+ *  UnionDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UNIONDEF_I_H
 #define TAO_UNIONDEF_I_H
@@ -46,86 +43,70 @@ class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
   //    Represents an OMG IDL union definition.
   //
 public:
+  /// Constructor
   TAO_UnionDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_UnionDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry and its contents.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry and its contents.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr discriminator_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr discriminator_type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr discriminator_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr discriminator_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void discriminator_type_def (
       CORBA::IDLType_ptr discriminator_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void discriminator_type_def_i (
       CORBA::IDLType_ptr discriminator_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::UnionMemberSeq *members ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::UnionMemberSeq *members_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void members (
       const CORBA::UnionMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void members_i (
       const CORBA::UnionMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
 private:
+  /// Used by members() to get each member's label value.
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA::UnionMember &member)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Used by members() to get each member's label value.
+      CORBA::UnionMember &member);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index c9505d4e842..983fc16f60d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -26,14 +26,12 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 
 CORBA::DefinitionKind
 TAO_UsesDef_i::def_kind (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
 CORBA::Contained::Description *
 TAO_UsesDef_i::describe (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -44,7 +42,6 @@ TAO_UsesDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_UsesDef_i::describe_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::UsesDescription ud;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription,
@@ -73,7 +70,6 @@ TAO_UsesDef_i::describe_i (void)
 
 CORBA::InterfaceDef_ptr
 TAO_UsesDef_i::interface_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
@@ -84,7 +80,6 @@ TAO_UsesDef_i::interface_type (void)
 
 CORBA::InterfaceDef_ptr
 TAO_UsesDef_i::interface_type_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -104,7 +99,6 @@ void
 TAO_UsesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -117,7 +111,6 @@ void
 TAO_UsesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_value (this->section_key_,
                                         "base_type");
@@ -150,7 +143,6 @@ TAO_UsesDef_i::interface_type_i (
 
 CORBA::Boolean
 TAO_UsesDef_i::is_multiple (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -161,7 +153,6 @@ TAO_UsesDef_i::is_multiple (void)
 
 CORBA::Boolean
 TAO_UsesDef_i::is_multiple_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -174,7 +165,6 @@ void
 TAO_UsesDef_i::is_multiple (
     CORBA::Boolean is_multiple
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -187,7 +177,6 @@ void
 TAO_UsesDef_i::is_multiple_i (
     CORBA::Boolean is_multiple
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "is_multiple",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index 7041e0200d1..2d09748bbd4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    UsesDef_i.h
-//
-// = DESCRIPTION
-//    UsesDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UsesDef_i.h
+ *
+ *  $Id$
+ *
+ *  UsesDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_USESDEF_I_H
 #define TAO_USESDEF_I_H
@@ -35,71 +32,61 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_UsesDef_i
+ *
+ * @brief TAO_UsesDef_i
+ *
+ * Represents an interface that is used by a component.
+ */
 class TAO_IFRService_Export TAO_UsesDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_UsesDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an interface that is used by a component.
-  //
 public:
+  /// Constructor
     TAO_UsesDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_UsesDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDef_ptr interface_type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_multiple (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_multiple_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_multiple (
       CORBA::Boolean is_multiple
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_multiple_i (
       CORBA::Boolean is_multiple
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index 286aefa3e47..b8d4422d08c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -30,14 +30,12 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ValueBoxDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueBox;
 }
 
 CORBA::TypeCode_ptr
 TAO_ValueBoxDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -48,7 +46,6 @@ TAO_ValueBoxDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ValueBoxDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -78,7 +75,6 @@ TAO_ValueBoxDef_i::type_i (void)
 
 CORBA::IDLType_ptr
 TAO_ValueBoxDef_i::original_type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -89,7 +85,6 @@ TAO_ValueBoxDef_i::original_type_def (void)
 
 CORBA::IDLType_ptr
 TAO_ValueBoxDef_i::original_type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString boxed_type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -105,7 +100,6 @@ TAO_ValueBoxDef_i::original_type_def_i (void)
 
 void
 TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -116,7 +110,6 @@ TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
 
 void
 TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *boxed_type =
     TAO_IFR_Service_Utils::reference_to_path (original_type_def);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index ae7d26a8803..5a9419312bd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ValueBoxDef_i.h
-//
-// = DESCRIPTION
-//    ValueBoxDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ValueBoxDef_i.h
+ *
+ *  $Id$
+ *
+ *  ValueBoxDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_VALUEBOXDEF_I_H
 #define TAO_VALUEBOXDEF_I_H
@@ -45,44 +42,37 @@ public:
   //    Represents an value box definition.
   //
 public:
+  /// Constructor
   TAO_ValueBoxDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ValueBoxDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::IDLType_ptr original_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr original_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void original_type_def (
       CORBA::IDLType_ptr original_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void original_type_def_i (
       CORBA::IDLType_ptr original_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 98c762d0b23..b6816228a5e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -30,14 +30,12 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ValueDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Value;
 }
 
 void
 TAO_ValueDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -48,7 +46,6 @@ TAO_ValueDef_i::destroy (void)
 
 void
 TAO_ValueDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Container_i::destroy_i ();
 
@@ -71,7 +68,6 @@ TAO_ValueDef_i::destroy_i (void)
 
 CORBA::Contained::Description *
 TAO_ValueDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -82,7 +78,6 @@ TAO_ValueDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ValueDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDescription *vd = 0;
   ACE_NEW_RETURN (vd,
@@ -104,7 +99,6 @@ TAO_ValueDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ValueDef_i::type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -115,7 +109,6 @@ TAO_ValueDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ValueDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// Since valuetype type codes may encapsultate the type code of a
   /// base class, this call could be recursive, with the
@@ -128,7 +121,6 @@ TAO_ValueDef_i::type_i (void)
 
 CORBA::InterfaceDefSeq *
 TAO_ValueDef_i::supported_interfaces (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -139,7 +131,6 @@ TAO_ValueDef_i::supported_interfaces (void)
 
 CORBA::InterfaceDefSeq *
 TAO_ValueDef_i::supported_interfaces_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDefSeq *seq = 0;
   ACE_NEW_RETURN (seq,
@@ -191,7 +182,6 @@ void
 TAO_ValueDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -204,7 +194,6 @@ void
 TAO_ValueDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "supported",
@@ -276,7 +265,6 @@ TAO_ValueDef_i::supported_interfaces_i (
 
 CORBA::InitializerSeq *
 TAO_ValueDef_i::initializers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -287,7 +275,6 @@ TAO_ValueDef_i::initializers (void)
 
 CORBA::InitializerSeq *
 TAO_ValueDef_i::initializers_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InitializerSeq *iseq = 0;
   ACE_NEW_RETURN (iseq,
@@ -381,7 +368,6 @@ TAO_ValueDef_i::initializers_i (void)
 
 void
 TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -392,7 +378,6 @@ TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers)
 
 void
 TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "initializers",
@@ -406,7 +391,6 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers)
 
 CORBA::ValueDef_ptr
 TAO_ValueDef_i::base_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
@@ -417,7 +401,6 @@ TAO_ValueDef_i::base_value (void)
 
 CORBA::ValueDef_ptr
 TAO_ValueDef_i::base_value_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   int status =
@@ -442,7 +425,6 @@ TAO_ValueDef_i::base_value_i (void)
 
 void
 TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -453,7 +435,6 @@ TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value)
 
 void
 TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (base_value))
     {
@@ -488,7 +469,6 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value)
 
 CORBA::ValueDefSeq *
 TAO_ValueDef_i::abstract_base_values (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -499,7 +479,6 @@ TAO_ValueDef_i::abstract_base_values (void)
 
 CORBA::ValueDefSeq *
 TAO_ValueDef_i::abstract_base_values_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDefSeq *vd_seq = 0;
   ACE_NEW_RETURN (vd_seq,
@@ -551,7 +530,6 @@ void
 TAO_ValueDef_i::abstract_base_values (
     const CORBA::ValueDefSeq &abstract_base_values
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -564,7 +542,6 @@ void
 TAO_ValueDef_i::abstract_base_values_i (
     const CORBA::ValueDefSeq &abstract_base_values
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
                                           "abstract_bases",
@@ -619,7 +596,6 @@ TAO_ValueDef_i::abstract_base_values_i (
 
 CORBA::Boolean
 TAO_ValueDef_i::is_abstract (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -630,7 +606,6 @@ TAO_ValueDef_i::is_abstract (void)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_abstract_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -641,7 +616,6 @@ TAO_ValueDef_i::is_abstract_i (void)
 
 void
 TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -652,7 +626,6 @@ TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract)
 
 void
 TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
@@ -662,7 +635,6 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_custom (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -673,7 +645,6 @@ TAO_ValueDef_i::is_custom (void)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_custom_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -684,7 +655,6 @@ TAO_ValueDef_i::is_custom_i (void)
 
 void
 TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -695,7 +665,6 @@ TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom)
 
 void
 TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
@@ -705,7 +674,6 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_truncatable (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -716,7 +684,6 @@ TAO_ValueDef_i::is_truncatable (void)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_truncatable_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -727,7 +694,6 @@ TAO_ValueDef_i::is_truncatable_i (void)
 
 void
 TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -738,7 +704,6 @@ TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable)
 
 void
 TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
@@ -748,7 +713,6 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_a (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -759,7 +723,6 @@ TAO_ValueDef_i::is_a (const char *id)
 
 CORBA::Boolean
 TAO_ValueDef_i::is_a_i (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
     {
@@ -835,7 +798,6 @@ TAO_ValueDef_i::is_a_i (const char *id)
 
 CORBA::ValueDef::FullValueDescription *
 TAO_ValueDef_i::describe_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -846,7 +808,6 @@ TAO_ValueDef_i::describe_value (void)
 
 CORBA::ValueDef::FullValueDescription *
 TAO_ValueDef_i::describe_value_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDef::FullValueDescription *fv_desc = 0;
   ACE_NEW_RETURN (fv_desc,
@@ -948,9 +909,9 @@ TAO_ValueDef_i::describe_value_i (void)
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                                  CORBA::COMPLETED_NO),
-                                0);
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 31,
+                CORBA::COMPLETED_NO);
             }
 
           // Operation contexts.
@@ -1317,7 +1278,6 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *version,
                                      CORBA::IDLType_ptr type,
                                      CORBA::Visibility access)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ());
 
@@ -1336,7 +1296,6 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
                                        const char *version,
                                        CORBA::IDLType_ptr type,
                                        CORBA::Visibility access)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1386,7 +1345,6 @@ TAO_ValueDef_i::create_attribute (
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
 
@@ -1407,7 +1365,6 @@ TAO_ValueDef_i::create_attribute_i (
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1460,7 +1417,6 @@ TAO_ValueDef_i::create_operation (
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
 
@@ -1487,7 +1443,6 @@ TAO_ValueDef_i::create_operation_i (
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -1519,9 +1474,7 @@ TAO_ValueDef_i::create_operation_i (
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::OperationDef::_nil ());
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, CORBA::COMPLETED_NO);
     }
 
   this->repo_->config ()->set_string_value (new_key,
@@ -1556,9 +1509,9 @@ TAO_ValueDef_i::create_operation_i (
           // Oneway operations cannot have INOUT or OUT parameters.
           if (mode == CORBA::OP_ONEWAY && params[i].mode != CORBA::PARAM_IN)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::OperationDef::_nil ());
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 31,
+                CORBA::COMPLETED_NO);
             }
 
           ACE_Configuration_Section_Key param_key;
@@ -1594,9 +1547,7 @@ TAO_ValueDef_i::create_operation_i (
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
-                                              CORBA::COMPLETED_NO),
-                            CORBA::OperationDef::_nil ());
+          throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, CORBA::COMPLETED_NO);
         }
 
       ACE_Configuration_Section_Key excepts_key;
@@ -1640,7 +1591,7 @@ TAO_ValueDef_i::create_operation_i (
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (contexts_key,
                                                     stringified,
-                                                    contexts[i]);
+                                                    contexts[i].in ());
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 3d1f3fd3049..4d53d891372 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ValueDef_i.h
-//
-// = DESCRIPTION
-//    ValueDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ValueDef_i.h
+ *
+ *  $Id$
+ *
+ *  ValueDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_VALUEDEF_I_H
 #define TAO_VALUEDEF_I_H
@@ -47,189 +44,150 @@ class TAO_IFRService_Export TAO_ValueDef_i : public virtual TAO_Container_i,
   //    Represents a valuetype definition.
   //
 public:
+  /// Constructor
   TAO_ValueDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ValueDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
+    );
 
+  /// Remove the repository entry.
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+    );
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+    );
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq & supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq & supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::InitializerSeq *initializers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InitializerSeq *initializers_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void initializers (
       const CORBA::InitializerSeq & initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void initializers_i (
       const CORBA::InitializerSeq & initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef_ptr base_value (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef_ptr base_value_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void base_value (
       CORBA::ValueDef_ptr base_value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void base_value_i (
       CORBA::ValueDef_ptr base_value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDefSeq *abstract_base_values (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDefSeq *abstract_base_values_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void abstract_base_values (
       const CORBA::ValueDefSeq & abstract_base_values
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void abstract_base_values_i (
       const CORBA::ValueDefSeq & abstract_base_values
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_abstract (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_abstract_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_abstract_i (
       CORBA::Boolean is_abstract
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_custom (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_custom_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_custom_i (
       CORBA::Boolean is_custom
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_truncatable (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_truncatable_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_truncatable_i (
       CORBA::Boolean is_truncatable
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_a (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef::FullValueDescription *describe_value (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef::FullValueDescription *describe_value_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueMemberDef_ptr create_value_member (
       const char *id,
@@ -237,8 +195,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueMemberDef_ptr create_value_member_i (
       const char *id,
@@ -246,8 +203,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
@@ -255,8 +211,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AttributeDef_ptr create_attribute_i (
       const char *id,
@@ -264,8 +219,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::OperationDef_ptr create_operation (
       const char *id,
@@ -276,8 +230,7 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::OperationDef_ptr create_operation_i (
       const char *id,
@@ -288,12 +241,11 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
+  /// Called from TAO_IFR_Service_Utils::name_exists() when we
+  /// are a base valuetype.
   static int name_clash (const char *name);
-  // Called from TAO_IFR_Service_Utils::name_exists() when we
-  // are a base valuetype.
 
   void fill_value_description (CORBA::ValueDescription &desc);
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 005edee0cd1..3403dbd29f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -29,14 +29,12 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
 
 CORBA::DefinitionKind
 TAO_ValueMemberDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueMember;
 }
 
 CORBA::Contained::Description *
 TAO_ValueMemberDef_i::describe (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -47,7 +45,6 @@ TAO_ValueMemberDef_i::describe (void)
 
 CORBA::Contained::Description *
 TAO_ValueMemberDef_i::describe_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueMember vm;
   TAO_IFR_Desc_Utils<CORBA::ValueMember,
@@ -87,7 +84,6 @@ TAO_ValueMemberDef_i::describe_i (void)
 
 CORBA::TypeCode_ptr
 TAO_ValueMemberDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -98,7 +94,6 @@ TAO_ValueMemberDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_ValueMemberDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -112,7 +107,6 @@ TAO_ValueMemberDef_i::type_i (void)
 
 CORBA::IDLType_ptr
 TAO_ValueMemberDef_i::type_def (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -123,7 +117,6 @@ TAO_ValueMemberDef_i::type_def (void)
 
 CORBA::IDLType_ptr
 TAO_ValueMemberDef_i::type_def_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -138,7 +131,6 @@ TAO_ValueMemberDef_i::type_def_i (void)
 
 void
 TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -149,7 +141,6 @@ TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def)
 
 void
 TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *path = TAO_IFR_Service_Utils::reference_to_path (type_def);
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -159,7 +150,6 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 
 CORBA::Visibility
 TAO_ValueMemberDef_i::access (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -170,7 +160,6 @@ TAO_ValueMemberDef_i::access (void)
 
 CORBA::Visibility
 TAO_ValueMemberDef_i::access_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -181,7 +170,6 @@ TAO_ValueMemberDef_i::access_i (void)
 
 void
 TAO_ValueMemberDef_i::access (CORBA::Visibility access)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -192,7 +180,6 @@ TAO_ValueMemberDef_i::access (CORBA::Visibility access)
 
 void
 TAO_ValueMemberDef_i::access_i (CORBA::Visibility access)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "access",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 45137157c14..00b244b0a97 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    ValueMemberDef_i.h
-//
-// = DESCRIPTION
-//    ValueMemberDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ValueMemberDef_i.h
+ *
+ *  $Id$
+ *
+ *  ValueMemberDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_VALUEMEMBERDEF_I_H
 #define TAO_VALUEMEMBERDEF_I_H
@@ -35,79 +32,67 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_ValueMemberDef_i
+ *
+ * @brief TAO_ValeMemberDef_i
+ *
+ * Represents the definition of a valuemember structure.
+ */
 class TAO_IFRService_Export TAO_ValueMemberDef_i : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_ValeMemberDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of a valuemember structure.
-  //
 public:
+  /// Constructor
   TAO_ValueMemberDef_i (TAO_Repository_i *repoy);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_ValueMemberDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
-
+  /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From Contained_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void type_def (
       CORBA::IDLType_ptr type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void type_def_i (
       CORBA::IDLType_ptr type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::Visibility access ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::Visibility access_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void access (
       CORBA::Visibility access)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void access_i (
       CORBA::Visibility access)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 0e40d0dd1ec..d603e93e435 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -26,14 +26,12 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 
 CORBA::DefinitionKind
 TAO_WstringDef_i::def_kind (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
 void
 TAO_WstringDef_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -44,7 +42,6 @@ TAO_WstringDef_i::destroy (void)
 
 void
 TAO_WstringDef_i::destroy_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -58,7 +55,6 @@ TAO_WstringDef_i::destroy_i (void)
 
 CORBA::TypeCode_ptr
 TAO_WstringDef_i::type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -69,7 +65,6 @@ TAO_WstringDef_i::type (void)
 
 CORBA::TypeCode_ptr
 TAO_WstringDef_i::type_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong bound = this->bound_i ();
 
@@ -77,7 +72,6 @@ TAO_WstringDef_i::type_i (void)
 }
 CORBA::ULong
 TAO_WstringDef_i::bound (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -89,7 +83,6 @@ TAO_WstringDef_i::bound (void)
 
 CORBA::ULong
 TAO_WstringDef_i::bound_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -101,7 +94,6 @@ TAO_WstringDef_i::bound_i (void)
 
 void
 TAO_WstringDef_i::bound (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -112,7 +104,6 @@ TAO_WstringDef_i::bound (CORBA::ULong bound)
 
 void
 TAO_WstringDef_i::bound_i (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "bound",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index 6e41ff96d89..6d633516a41 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    WstringDef_i.h
-//
-// = DESCRIPTION
-//    WstringDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    WstringDef_i.h
+ *
+ *  $Id$
+ *
+ *  WstringDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_WSTRINGDEF_I_H
 #define TAO_WSTRINGDEF_I_H
@@ -35,63 +32,55 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_WstringDef_i
+ *
+ * @brief TAO_WstringDef_i
+ *
+ * Represents a bounded wstring (unbounded wstrings
+ * are included in PrimitiveDef).
+ */
 class TAO_IFRService_Export TAO_WstringDef_i : public virtual TAO_IDLType_i
 {
-  // = TITLE
-  //    TAO_WstringDef_i
-  //
-  // = DESCRIPTION
-  //    Represents a bounded wstring (unbounded wstrings
-  //    are included in PrimitiveDef).
-  //
 public:
+  /// Constructor.
   TAO_WstringDef_i (TAO_Repository_i *repo);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_WstringDef_i (void);
-  // Destructor.
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's virtual function.
-
+  /// From IDLType_i's virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's virtual function.
+;
 
   virtual CORBA::ULong bound ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::ULong bound_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void bound (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void bound_i (
       CORBA::ULong bound)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
index 27407fa581c..4aad3c998ae 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    concrete_classes.h
-//
-// = DESCRIPTION
-//    All the concrete class header files needed by the servant locator.
-//
-// = AUTHORS
-//    Jeff Parsons
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    concrete_classes.h
+ *
+ *  $Id$
+ *
+ *  All the concrete class header files needed by the servant locator.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef CONCRETE_CLASSES_H
 #define CONCRETE_CLASSES_H
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 9963e2fa222..edecec956f6 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs
-//
-// = FILENAME
-//    IOR_Multicast.h
-//
-// = DESCRIPTION
-//    Defines a class that listens to a multicast address for client requests
-//    for ior of a bootstrappable service.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    IOR_Multicast.h
+ *
+ *  $Id$
+ *
+ *  Defines a class that listens to a multicast address for client requests
+ *  for ior of a bootstrappable service.
+ *
+ *
+ *  @author   Sergio Flores-Gaitan
+ */
+//=============================================================================
+
 
 #ifndef TAO_IOR_MULTICAST_H
 #define TAO_IOR_MULTICAST_H
@@ -37,73 +34,75 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class TAO_IOR_Multicast
+ *
+ * @brief Event Handler that services multicast requests for IOR of a
+ * bootstrappable service.
+ *
+ * This class uses the ACE_SOCK_Dgram_Mcast class and should be
+ * registered with a reactor and should be initialized with the
+ * ior of the  service to be multicasted.
+ */
 class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
-  // = TITLE
-  //     Event Handler that services multicast requests for IOR of a
-  //     bootstrappable service.
-  //
-  // = DESCRIPTION
-  //     This class uses the ACE_SOCK_Dgram_Mcast class and should be
-  //     registered with a reactor and should be initialized with the
-  //     ior of the  service to be multicasted.
 public:
+  /// Constructor.
   TAO_IOR_Multicast (void);
-  // Constructor.
 
+  /// Constructor taking the ior of the service.
   TAO_IOR_Multicast (const char *ior,
                      u_short port,
                      const char *mcast_addr,
                      TAO_Service_ID service_id);
-  // Constructor taking the ior of the service.
 
+  /// Initialization method.
   int init (const char *ior,
             u_short port,
             const char *mcast_addr,
             TAO_Service_ID service_id);
-  // Initialization method.
 
+  /// Initialization method. Takes in "address:port" string as a
+  /// parameter.
   int init (const char *ior,
             const char *mcast_addr,
             TAO_Service_ID service_id);
-  // Initialization method. Takes in "address:port" string as a
-  // parameter.
 
+  /// Destructor.
   virtual ~TAO_IOR_Multicast (void);
-  // Destructor.
 
+  /// Callback when input is received on the handle.
   virtual int handle_input (ACE_HANDLE n);
-  // Callback when input is received on the handle.
 
+  /// Callback when a timeout has occurred.
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *arg);
-  // Callback when a timeout has occurred.
 
+  /// Returns the internal handle used to receive multicast.
   virtual ACE_HANDLE get_handle (void) const;
-  // Returns the internal handle used to receive multicast.
 
 private:
+  /// Factor common functionality from the two init functions.
   int common_init (const char *ior,
                    TAO_Service_ID service_id);
-  // Factor common functionality from the two init functions.
 
+  /// Service id that we're waiting for.
   TAO_Service_ID service_id_;
-  // Service id that we're waiting for.
 
+  /// multicast endpoint of communication
   ACE_SOCK_Dgram_Mcast mcast_dgram_;
-  // multicast endpoint of communication
 
+  /// multicast address
   ACE_INET_Addr mcast_addr_;
-  // multicast address
 
+  /// object reference to send in response to the multicast
   ACE_CString ior_;
-  // object reference to send in response to the multicast
 
+  /// address of response.
   ACE_INET_Addr response_addr_;
-  // address of response.
 
+  /// socket for response to the multicast
   ACE_SOCK_Dgram response_;
-  // socket for response to the multicast
 
   ACE_CString mcast_nic_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index f4b283bc00c..94c2b13c87a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -61,7 +61,6 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
 
 CosLoadBalancing::Location *
 TAO_LB_CPU_Load_Average_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -77,7 +76,6 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 TAO_LB_CPU_Load_Average_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
 
@@ -120,12 +118,11 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
   FILE * s = ::fopen ("/proc/loadavg", "r");
 
   if (s == 0)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          errno),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw CORBA::NO_IMPLEMENT (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        errno),
+      CORBA::COMPLETED_NO);
 
   fscanf (s, "%f", &loadavg[0]);
 
@@ -158,10 +155,10 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
       if (num_processors > 0)
         load = loadavg[0] / num_processors;
       else
-        ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+        throw CORBA::TRANSIENT ();  // Correct exception?
     }
   else
-    ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+    throw CORBA::TRANSIENT ();  // Correct exception?
 
 #elif defined (__NetBSD__) || defined (__APPLE__)
 
@@ -185,10 +182,10 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
       if (num_processors > 0)
         load = loadavg[0] / num_processors;
       else
-        ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+        throw CORBA::TRANSIENT ();  // Correct exception?
     }
   else
-    ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+    throw CORBA::TRANSIENT ();  // Correct exception?
 
 #elif defined (__hpux)
 
@@ -203,10 +200,10 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
       if (num_processors > 0)
         load = psd.psd_avg_1_min / num_processors;
       else
-        ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+        throw CORBA::TRANSIENT ();  // Correct exception?
     }
   else
-    ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
+    throw CORBA::TRANSIENT ();  // Correct exception?
 
 #endif
 
@@ -233,7 +230,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
 #else
 
   ACE_UNUSED_ARG (load);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 
 #endif  /* linux || sun || __hpux  || __NetBSD__ || __APPLE__ */
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index 035a41a37dc..7dc97095d66 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -63,8 +63,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -73,8 +72,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index e1627c2b007..6af2f8c23c0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -111,7 +111,6 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
 
 CosLoadBalancing::Location *
 TAO_LB_CPU_Utilization_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -127,7 +126,6 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 TAO_LB_CPU_Utilization_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
 
@@ -159,7 +157,7 @@ TAO_LB_CPU_Utilization_Monitor::loads (void)
 #else
 
   ACE_UNUSED_ARG (load);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 
 #endif  /* linux || sun */
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index ea3431fa897..d7e8e281494 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -60,8 +60,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -70,8 +69,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 3fb67cb6dd4..06ef0a6907c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -12,14 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_LB_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr tmp;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index ae4b5b53b76..5e954707386 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -56,11 +56,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index f66ac874705..97a45fd32fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -11,22 +11,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO_LB_ClientRequestInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ClientRequestInterceptor");
 }
 
 void
 TAO_LB_ClientRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   /*
   CORBA::Object_var t = ri->target ();
@@ -75,30 +71,24 @@ TAO_LB_ClientRequestInterceptor::send_request (
 void
 TAO_LB_ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 900293f53f6..a20986f4f6d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -68,34 +68,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index b426519dec2..fefb7cd4a69 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -31,14 +31,12 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
 
 char *
 TAO_LB_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_IORInterceptor");
 }
 
 void
 TAO_LB_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Force the LoadManager reference to be released since the ORB's
   // lifetime is tied to object reference lifetimes.
@@ -48,14 +46,12 @@ TAO_LB_IORInterceptor::destroy (void)
 void
 TAO_LB_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -89,7 +85,6 @@ void
 TAO_LB_IORInterceptor::adapter_manager_state_changed (
     const char *,
     PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
@@ -101,7 +96,6 @@ void
 TAO_LB_IORInterceptor::adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index b3d2481831d..aa22bfd1059 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -71,37 +71,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-    ));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 1caafd25627..7aa42d2bba7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -54,14 +54,12 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
 
 char *
 TAO_LB_LeastLoaded::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LeastLoaded");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LeastLoaded::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -79,7 +77,6 @@ void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -153,11 +150,9 @@ TAO_LB_LeastLoaded::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location);
@@ -174,20 +169,15 @@ CORBA::Object_ptr
 TAO_LB_LeastLoaded::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      CORBA::Object::_nil ());
+    throw CORBA::TRANSIENT ();
 
   // @@ RACE CONDITION.  OBJECT GROUP MEMBERSHIP MAY CHANGE AFTER
   //    RETRIEVING LOCATIONS!  HOW DO WE HANDLE THAT?
@@ -229,7 +219,6 @@ void
 TAO_LB_LeastLoaded::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -480,7 +469,7 @@ TAO_LB_LeastLoaded::get_location (
         location = locations[location_index];
       }
       else if (this->reject_threshold_ != 0)
-        ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);
+        throw CORBA::TRANSIENT ();
 
 //       ACE_DEBUG ((LM_DEBUG, "LOCATION ID == %s\n", location[0].id.in ()));
     }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 73d3715b1a3..b4f2509debf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -87,34 +87,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 56b62f8a780..75794766a04 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -23,7 +23,6 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
 
 void
 TAO_LB_LoadAlert::enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -32,7 +31,6 @@ TAO_LB_LoadAlert::enable_alert (void)
 
 void
 TAO_LB_LoadAlert::disable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index d4f2ecb6ddc..c84f325033b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -43,12 +43,10 @@ public:
 
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void enable_alert (void);
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disable_alert (void);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 1ce94dba907..dad51762f88 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -15,14 +15,12 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
@@ -32,14 +30,12 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 7168d127bcd..9523f02abc5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -43,19 +43,15 @@ class TAO_LB_LoadAlert_Handler
 {
 public:
 
-  virtual void enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void enable_alert (void);
 
   virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ::Messaging::ExceptionHolder *);
 
-  virtual void disable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disable_alert (void);
 
   virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ::Messaging::ExceptionHolder *);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index ca07c42fbc8..eea89c9641d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -52,14 +52,12 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
 
 char *
 TAO_LB_LoadAverage::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadAverage");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LoadAverage::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -77,7 +75,6 @@ void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -151,11 +148,9 @@ TAO_LB_LoadAverage::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location);
@@ -172,20 +167,15 @@ CORBA::Object_ptr
 TAO_LB_LoadAverage::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      CORBA::Object::_nil ());
+    throw CORBA::TRANSIENT ();
 
   // @note The Random load balancing strategy is used since it is
   //       very lightweight and stateless.
@@ -199,7 +189,6 @@ void
 TAO_LB_LoadAverage::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 74e2b0d4c4c..62e64a28326 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -69,34 +69,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index eff1af2f793..8ead44278b1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -73,7 +73,6 @@ void
 TAO_LB_LoadManager::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (loads.length () == 0)
     throw CORBA::BAD_PARAM ();
@@ -131,8 +130,6 @@ TAO_LB_LoadManager::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   CosLoadBalancing::LoadList * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -153,12 +150,11 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
   if (this->load_map_.find (the_location, *tmp) == 0)
     return loads._retn ();
   else
-    ACE_THROW_RETURN (CosLoadBalancing::LocationNotFound (), 0);
+    throw CosLoadBalancing::LocationNotFound ();
 }
 
 void
 TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -213,7 +209,6 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
 
 void
 TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -269,9 +264,6 @@ void
 TAO_LB_LoadManager::register_load_alert (
     const PortableGroup::Location & the_location,
     CosLoadBalancing::LoadAlert_ptr load_alert)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertAlreadyPresent,
-                   CosLoadBalancing::LoadAlertNotAdded))
 {
   if (CORBA::is_nil (load_alert))
     throw CORBA::BAD_PARAM ();
@@ -297,8 +289,6 @@ TAO_LB_LoadManager::register_load_alert (
 CosLoadBalancing::LoadAlert_ptr
 TAO_LB_LoadManager::get_load_alert (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -315,16 +305,13 @@ TAO_LB_LoadManager::get_load_alert (
     }
   else
     {
-      ACE_THROW_RETURN (CosLoadBalancing::LoadAlertNotFound (),
-                        CosLoadBalancing::LoadAlert::_nil ());
+      throw CosLoadBalancing::LoadAlertNotFound ();
     }
 }
 
 void
 TAO_LB_LoadManager::remove_load_alert (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertNotFound))
 {
   // Disable the "alert" status on the LoadAlert object since it will
   // no longer be associated with the LoadManager.  In particular,
@@ -345,8 +332,6 @@ void
 TAO_LB_LoadManager::register_load_monitor (
     const PortableGroup::Location & the_location,
     CosLoadBalancing::LoadMonitor_ptr load_monitor)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::MonitorAlreadyPresent))
 {
   if (CORBA::is_nil (load_monitor))
     throw CORBA::BAD_PARAM ();
@@ -404,8 +389,6 @@ TAO_LB_LoadManager::register_load_monitor (
 CosLoadBalancing::LoadMonitor_ptr
 TAO_LB_LoadManager::get_load_monitor (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -419,15 +402,12 @@ TAO_LB_LoadManager::get_load_monitor (
         CosLoadBalancing::LoadMonitor::_duplicate (entry->int_id_.in ());
     }
 
-  ACE_THROW_RETURN (CosLoadBalancing::LocationNotFound (),
-                    CosLoadBalancing::LoadMonitor::_nil ());
+  throw CosLoadBalancing::LocationNotFound ();
 }
 
 void
 TAO_LB_LoadManager::remove_load_monitor (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
@@ -458,9 +438,6 @@ TAO_LB_LoadManager::remove_load_monitor (
 void
 TAO_LB_LoadManager::set_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_props (props);
   this->preprocess_properties (new_props);
@@ -470,7 +447,6 @@ TAO_LB_LoadManager::set_default_properties (
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_default_properties ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->property_manager_.get_default_properties ();
@@ -479,9 +455,6 @@ TAO_LB_LoadManager::get_default_properties ()
 void
 TAO_LB_LoadManager::remove_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_default_properties (props);
 }
@@ -490,9 +463,6 @@ void
 TAO_LB_LoadManager::set_type_properties (
     const char *type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides);
@@ -504,7 +474,6 @@ TAO_LB_LoadManager::set_type_properties (
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_type_properties (
     const char *type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->property_manager_.get_type_properties (type_id);
@@ -514,9 +483,6 @@ void
 TAO_LB_LoadManager::remove_type_properties (
     const char *type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
                                                   props);
@@ -526,10 +492,6 @@ void
 TAO_LB_LoadManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides);
@@ -541,8 +503,6 @@ TAO_LB_LoadManager::set_properties_dynamically (
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->property_manager_.get_properties (object_group);
@@ -554,13 +514,6 @@ TAO_LB_LoadManager::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
     const PortableGroup::Criteria & the_criteria)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   return
     this->object_group_manager_.create_member (object_group,
@@ -574,10 +527,6 @@ TAO_LB_LoadManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   return
     this->object_group_manager_.add_member (object_group,
@@ -589,9 +538,6 @@ PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
@@ -601,8 +547,6 @@ TAO_LB_LoadManager::remove_member (
 PortableGroup::Locations *
 TAO_LB_LoadManager::locations_of_members (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.locations_of_members (object_group);
@@ -611,7 +555,6 @@ TAO_LB_LoadManager::locations_of_members (
 PortableGroup::ObjectGroups *
 TAO_LB_LoadManager::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->object_group_manager_.groups_at_location (the_location);
@@ -620,8 +563,6 @@ TAO_LB_LoadManager::groups_at_location (
 PortableGroup::ObjectGroupId
 TAO_LB_LoadManager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_id (object_group);
@@ -630,8 +571,6 @@ TAO_LB_LoadManager::get_object_group_id (
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::get_object_group_ref (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_ref (object_group);
@@ -639,9 +578,6 @@ TAO_LB_LoadManager::get_object_group_ref (
 
 PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref_from_id (
     PortableGroup::ObjectGroupId group_id)
-  ACE_THROW_SPEC((
-    CORBA::SystemException,
-    PortableGroup::ObjectGroupNotFound))
 {
   return this->object_group_manager_.get_object_group_ref_from_id (
     group_id);
@@ -651,9 +587,6 @@ CORBA::Object_ptr
 TAO_LB_LoadManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
@@ -666,12 +599,6 @@ TAO_LB_LoadManager::create_object (
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
 //   this->init ();
 
@@ -744,8 +671,6 @@ void
 TAO_LB_LoadManager::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
   this->generic_factory_.delete_object (factory_creation_id);
 }
@@ -757,8 +682,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid)
     this->object_group_manager_.object_group (oid);
 
   if (CORBA::is_nil (object_group.in ()))
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CORBA::Object::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   PortableGroup::Properties_var properties =
     this->get_properties (object_group.in ());
@@ -780,8 +704,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid)
                                     this->lm_ref_.in ());
     }
 
-  ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                    CORBA::Object::_nil ());
+  throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 22cfeb1d3e3..47fce3ecdf4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -53,65 +53,47 @@ public:
 
   /// For the PUSH load monitoring style.
   virtual void push_loads (const PortableGroup::Location & the_location,
-                           const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           const CosLoadBalancing::LoadList & loads);
 
   /// Return the raw loads at the given location.
   virtual CosLoadBalancing::LoadList * get_loads (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Inform member at given location of load alert condition.
-  virtual void enable_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
+  virtual void enable_alert (const PortableGroup::Location & the_location);
 
   /// Inform member at given location that load alert condition has
   /// passed.
-  virtual void disable_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
+  virtual void disable_alert (const PortableGroup::Location & the_location);
 
   /// Register a LoadAlert object for the member at the given
   /// location.
   virtual void register_load_alert (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadAlert_ptr load_alert)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertAlreadyPresent,
-                     CosLoadBalancing::LoadAlertNotAdded));
+      CosLoadBalancing::LoadAlert_ptr load_alert);
 
   /// Retrieve the LoadAlert object for the member at the given
   /// location.
   virtual CosLoadBalancing::LoadAlert_ptr get_load_alert (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Remove (de-register) the LoadAlert object for the member at the
   /// given location.
-  virtual void remove_load_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertNotFound));
+  virtual void remove_load_alert (const PortableGroup::Location & the_location);
 
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadMonitor_ptr load_monitor)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::MonitorAlreadyPresent));
+      CosLoadBalancing::LoadMonitor_ptr load_monitor);
 
   /// Return a reference to the load monitor at the given location.
   virtual CosLoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   //@}
 
@@ -124,30 +106,20 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableGroup::Properties * get_default_properties ();
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties associated with a give Replica type.  These
@@ -155,16 +127,12 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char * type_id);
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /**
    * Dynamically set the properties associated with a given object
@@ -174,11 +142,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties currently in use by the given object
@@ -188,9 +152,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   //@}
 
@@ -208,24 +170,13 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::CannotMeetCriteria));
+      const PortableGroup::Criteria & the_criteria);
 
   /// Add an existing object to the ObjectGroup.
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::ObjectNotAdded));
+      CORBA::Object_ptr member);
 
   /**
    * Remove an object at a specific location from the given
@@ -236,49 +187,33 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableGroup::Location & the_location);
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// TAO specific method
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
-      PortableGroup::ObjectGroupId group_id)
-    ACE_THROW_SPEC((
-       CORBA::SystemException,
-       PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroupId group_id);
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & loc);
 
   //@}
 
@@ -299,13 +234,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::CannotMeetCriteria));
+        factory_creation_id);
 
   /**
    * Delete the object corresponding to the provided
@@ -315,9 +244,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectNotFound));
+        factory_creation_id);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index ed62d396b8b..39cc9e497e1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -53,14 +53,12 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
 
 char *
 TAO_LB_LoadMinimum::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LoadMinimum::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -78,7 +76,6 @@ void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -152,11 +149,9 @@ TAO_LB_LoadMinimum::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location);
@@ -173,20 +168,15 @@ CORBA::Object_ptr
 TAO_LB_LoadMinimum::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      CORBA::Object::_nil ());
+    throw CORBA::TRANSIENT ();
 
   // @@ RACE CONDITION.  OBJECT GROUP MEMBERSHIP MAY CHANGE AFTER
   //    RETRIEVING LOCATIONS!  HOW DO WE HANDLE THAT?
@@ -234,7 +224,6 @@ void
 TAO_LB_LoadMinimum::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index b2785462279..4874926aec4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -88,34 +88,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index b213c38e90e..f8e89fb7857 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -23,8 +23,6 @@ TAO_LB_MemberLocator::preinvoke (
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie & /* the_cookie */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   try
     {
@@ -51,7 +49,7 @@ TAO_LB_MemberLocator::preinvoke (
         ex._tao_print_exception ("LoadManager::next_member()");
     }
 
-  ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+  throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 void
@@ -61,7 +59,6 @@ TAO_LB_MemberLocator::postinvoke (
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
     PortableServer::Servant /* the_servant */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index bc395ed36f0..d5a570cb318 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -61,9 +61,7 @@ public:
       const PortableServer::ObjectId & oid,
       PortableServer::POA_ptr adapter,
       const char * operation,
-      PortableServer::ServantLocator::Cookie & the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+      PortableServer::ServantLocator::Cookie & the_cookie);
 
   /// This method is no-op in this ServantLocator implementation.
   virtual void postinvoke (
@@ -71,8 +69,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char * operation,
       PortableServer::ServantLocator::Cookie the_cookie,
-      PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableServer::Servant the_servant);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index f82e4f02eb7..81e9373c6e2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -27,14 +27,12 @@ TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
 void
 TAO_LB_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("LoadManager");
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index 83f93618333..c019eebf019 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -68,11 +68,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index d8a7e1a58dc..8ca8ca70b05 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -84,10 +84,9 @@ CORBA::Object_ptr
 TAO_LB_ObjectReferenceFactory::make_object (
     const char * repository_id,
     const PortableInterceptor::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (repository_id == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   CORBA::Object_var obj =
     this->old_orf_->make_object (repository_id,
@@ -121,8 +120,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
                 ex._tao_print_exception (
                   "TAO_LB_ObjectReferenceFactory::""make_object");
 
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                                CORBA::Object::_nil ());
+              throw CORBA::BAD_PARAM ();
             }
           catch (const PortableGroup::MemberAlreadyPresent& ex)
             {
@@ -130,8 +128,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
                 ex._tao_print_exception (
                   "TAO_LB_ObjectReferenceFactory::""make_object");
 
-              ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
-                                CORBA::Object::_nil ());
+              throw CORBA::BAD_INV_ORDER ();
 
             }
           catch (const PortableGroup::ObjectNotAdded& ex)
@@ -140,8 +137,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
                 ex._tao_print_exception (
                   "TAO_LB_ObjectReferenceFactory::""make_object");
 
-              ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                                CORBA::Object::_nil ());
+              throw CORBA::UNKNOWN ();
             }
 
           this->registered_members_[index] = 1;
@@ -210,7 +206,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
                         "find_object_group - "
                         "Couldn't bind object group reference.\n"));
 
-          ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+          throw CORBA::INTERNAL ();
         }
 
       object_group = group._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index a5e119164e3..583e0674000 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -70,8 +70,7 @@ class TAO_LB_ObjectReferenceFactory
   //@{
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableInterceptor::ObjectId & id);
   //@}
 
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index ac8b15a1dcd..2e85283e384 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -29,14 +29,12 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
 
 char *
 TAO_LB_Random::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Random");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_Random::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -54,8 +52,6 @@ void
 TAO_LB_Random::push_loads (
     const PortableGroup::Location & /* the_location */,
     const CosLoadBalancing::LoadList & /* loads */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::StrategyNotAdaptive))
 {
   throw CosLoadBalancing::StrategyNotAdaptive ();
 }
@@ -63,11 +59,9 @@ TAO_LB_Random::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_Random::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                           const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   return load_manager->get_loads (the_location);
 }
@@ -76,12 +70,9 @@ CORBA::Object_ptr
 TAO_LB_Random::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group);
@@ -95,7 +86,6 @@ void
 TAO_LB_Random::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     CosLoadBalancing::LoadManager_ptr /* load_manager */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -110,14 +100,10 @@ TAO_LB_Random::_tao_next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager,
     const PortableGroup::Locations & locations)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   const CORBA::ULong len = locations.length ();
   if (len == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      CORBA::Object::_nil ());
+    throw CORBA::TRANSIENT ();
 
   // Pick a random location in the sequence using the higher order
   // bits (zero based indexing).
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index a1ffe3ee89c..a457e689c46 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -50,35 +50,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::StrategyNotAdaptive));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
@@ -90,10 +80,7 @@ public:
   static CORBA::Object_ptr _tao_next_member (
       PortableGroup::ObjectGroup_ptr object_group,
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Locations & locations)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Locations & locations);
 
   /// Initialize the random load balancing strategy.
   /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 09a69aaaf26..9c56658d726 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -26,14 +26,12 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
 
 char *
 TAO_LB_RoundRobin::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("RoundRobin");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_RoundRobin::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // There are no RoundRobin properties.  Return an empty property
   // list.
@@ -54,8 +52,6 @@ void
 TAO_LB_RoundRobin::push_loads (
     const PortableGroup::Location & /* the_location */,
     const CosLoadBalancing::LoadList & /* loads */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::StrategyNotAdaptive))
 {
   throw CosLoadBalancing::StrategyNotAdaptive ();
 }
@@ -63,11 +59,9 @@ TAO_LB_RoundRobin::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_RoundRobin::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                               const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   return load_manager->get_loads (the_location);
 }
@@ -76,12 +70,9 @@ CORBA::Object_ptr
 TAO_LB_RoundRobin::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   const PortableGroup::ObjectGroupId id =
     load_manager->get_object_group_id (object_group);
@@ -102,8 +93,7 @@ TAO_LB_RoundRobin::next_member (
   const CORBA::ULong len = locations->length ();
 
   if (len == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      CORBA::Object::_nil ());
+    throw CORBA::TRANSIENT ();
 
   TAO_LB_Location_Index_Map::ENTRY * entry;
   if (this->location_index_map_.find (id, entry) == 0)
@@ -135,7 +125,7 @@ TAO_LB_RoundRobin::next_member (
 
   const CORBA::ULong index = 0;
   if (this->location_index_map_.bind (id, index + 1) != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
+    throw CORBA::INTERNAL ();
 
   return load_manager->get_member_ref (object_group,
                                        locations[index]);
@@ -145,7 +135,6 @@ void
 TAO_LB_RoundRobin::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     CosLoadBalancing::LoadManager_ptr /* load_manager */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index aecac8a987b..2f307ed07a0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -51,35 +51,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::StrategyNotAdaptive));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 4feb2474cac..ca239bf7a8d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -24,22 +24,18 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
 
 char *
 TAO_LB_ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
 }
 
 void
 TAO_LB_ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (this->load_alert_.alerted ())
     {
@@ -118,23 +114,18 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 void
 TAO_LB_ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
@@ -150,8 +141,6 @@ TAO_LB_ServerRequestInterceptor::send_exception (
 void
 TAO_LB_ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index 5cd2591ffeb..dfdd7c2f0e6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -63,35 +63,24 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index e05a6f943da..6ff60dd60dd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -42,9 +42,6 @@ DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
                                CORBA::ULongLong max_size,
                                DsLogAdmin::LogId_out id_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidLogFullAction
-                   ))
 {
   this->create_i (full_action,
 		  max_size,
@@ -71,11 +68,6 @@ DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
                                        DsLogAdmin::LogFullActionType full_action,
                                        CORBA::ULongLong max_size)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   DsLogAdmin::LogIdAlreadyExists,
-                   DsLogAdmin::InvalidLogFullAction
-                   ))
 {
   this->create_with_id_i (id,
 			  full_action,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index b7341463161..e0ed34ee129 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -68,21 +68,13 @@ public:
   DsLogAdmin::BasicLog_ptr
     create (DsLogAdmin::LogFullActionType full_action,
             CORBA::ULongLong max_size,
-            DsLogAdmin::LogId_out id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidLogFullAction
-                     ));
+            DsLogAdmin::LogId_out id);
 
   /// Same as create (), but allows clients to specify the id.
   DsLogAdmin::BasicLog_ptr
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullActionType full_action,
-                    CORBA::ULongLong max_size)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     DsLogAdmin::LogIdAlreadyExists,
-                     DsLogAdmin::InvalidLogFullAction
-                     ));
+                    CORBA::ULongLong max_size);
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 8073177c807..493e3031023 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -26,7 +26,6 @@ TAO_BasicLog_i::~TAO_BasicLog_i (void)
 
 DsLogAdmin::Log_ptr
 TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
     DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
@@ -44,7 +43,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
 
 DsLogAdmin::Log_ptr
 TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
     DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
@@ -61,7 +59,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
 
 void
 TAO_BasicLog_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_);
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 59ce4c92c4e..4d95d4cd916 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -62,16 +62,13 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id);
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index feff0864efc..9cfdcc692e5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -28,10 +28,6 @@ TAO_Event_LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 
 void
 TAO_Event_LogConsumer::push (const CORBA::Any& data)
-ACE_THROW_SPEC ((
-                CORBA::SystemException,
-                CosEventComm::Disconnected
-        ))
 {
   // create a record list...
   DsLogAdmin::RecordList recList (1);
@@ -88,9 +84,6 @@ ACE_THROW_SPEC ((
 
 void
 TAO_Event_LogConsumer::disconnect_push_consumer (void)
-        ACE_THROW_SPEC ((
-                CORBA::SystemException
-        ))
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index abc9657d016..cd922828479 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -71,18 +71,11 @@ public:
 private:
 
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((
-            CORBA::SystemException
-    ));
+  void disconnect_push_consumer (void);
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const CORBA::Any& data)
-    ACE_THROW_SPEC ((
-            CORBA::SystemException,
-            CosEventComm::Disconnected
-    ));
+  void push (const CORBA::Any& data);
 
   /// ProxyPushSupplier used to connect to EventLog.
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index f216c345308..e4644b21154 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -101,9 +101,6 @@ TAO_EventLogFactory_i::create (
     CORBA::ULongLong max_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
     DsLogAdmin::LogId_out id_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidLogFullAction,
-                   DsLogAdmin::InvalidThreshold))
 {
   this->create_i (full_action,
 		  max_size,
@@ -135,10 +132,6 @@ TAO_EventLogFactory_i::create_with_id (
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::LogIdAlreadyExists,
-                   DsLogAdmin::InvalidLogFullAction,
-                   DsLogAdmin::InvalidThreshold))
 {
   this->create_with_id_i (id,
 			  full_action,
@@ -196,14 +189,12 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EventLogFactory_i::obtain_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return consumer_admin_->obtain_push_supplier ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_EventLogFactory_i::obtain_pull_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   return consumer_admin_->obtain_pull_supplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index 3d4250a454d..3577180e6a8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -78,12 +78,7 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ));
+      );
 
   /// Same as create (), but allows clients to specify the id.
   DsEventLogAdmin::EventLog_ptr create_with_id (
@@ -91,26 +86,14 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::LogIdAlreadyExists,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ));
+      );
 
   // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods.
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 1941a26221d..8320ca9f170 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -22,7 +22,6 @@ TAO_EventLogNotification::~TAO_EventLogNotification (void)
 
 void
 TAO_EventLogNotification::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_->disconnect_push_consumer ();
 }
@@ -43,7 +42,6 @@ TAO_EventLogNotification::obtain_proxy_consumer()
 
 void
 TAO_EventLogNotification::send_notification (const CORBA::Any& any)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   consumer_->push (any);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index c76eb44ca2c..1bf43eb1d7b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -56,8 +56,7 @@ public:
   ~TAO_EventLogNotification (void);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 protected:
   // = Helper methods
@@ -67,8 +66,7 @@ protected:
   void obtain_proxy_consumer ();
 
   /// Send the event on the event channel.
-  virtual void send_notification (const CORBA::Any& any)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_notification (const CORBA::Any& any);
 
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 09c2e907049..9516d9d165b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -40,7 +40,6 @@ TAO_EventLog_i::~TAO_EventLog_i ()
 
 DsLogAdmin::Log_ptr
 TAO_EventLog_i::copy (DsLogAdmin::LogId &id)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
@@ -57,7 +56,6 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 DsLogAdmin::Log_ptr
 TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log supplying the log id.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
@@ -75,7 +73,6 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 TAO_EventLog_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Send event to indicate the log has been deleted.
   notifier_->object_deletion (logid_);
@@ -104,14 +101,12 @@ TAO_EventLog_i::activate (void)
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_EventLog_i::for_consumers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->event_channel_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_EventLog_i::for_suppliers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->event_channel_->for_suppliers ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 2a9d40090e1..cb6c3cfb4fd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -71,17 +71,14 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id);
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  destroy (void);
 
   /// Activate the EventLog.
   void
@@ -89,16 +86,10 @@ public:
 
   // = The CosEventChannelAdmin::EventChannel interface methods.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void)
-        ACE_THROW_SPEC ((
-                CORBA::SystemException
-        ));
+  for_consumers (void);
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void)
-        ACE_THROW_SPEC ((
-                CORBA::SystemException
-        ));
+  for_suppliers (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index b907563ad65..5fd34c41fe8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -37,8 +37,6 @@ TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void)
 DsLogAdmin::RecordList*
 TAO_Hash_Iterator_i::get (CORBA::ULong position,
                           CORBA::ULong how_many)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidParam))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -47,7 +45,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
 
   if (position < current_position_)
     {
-      ACE_THROW_RETURN (DsLogAdmin::InvalidParam (), 0);
+      throw DsLogAdmin::InvalidParam ();
     }
 
   if (how_many == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 8e95a97d085..789b710d8d5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -61,9 +61,7 @@ public:
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
-                                       CORBA::ULong how_many)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidParam));
+                                       CORBA::ULong how_many);
 
 private:
   /// Pointer to record store
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 1d0e8609fda..7a0e1b67407 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -250,9 +250,6 @@ void
 TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id,
                 const DsLogAdmin::NVList
                 &attr_list)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidRecordId,
-                   DsLogAdmin::InvalidAttribute))
 {
   // TODO: validate attributes here.
 
@@ -276,10 +273,6 @@ TAO_Hash_LogRecordStore::set_records_attribute (
   const char *constraint,
   const DsLogAdmin::NVList
   &attr_list)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar,
-                   DsLogAdmin::InvalidConstraint,
-                   DsLogAdmin::InvalidAttribute))
 {
   this->check_grammar (grammar);
 
@@ -312,8 +305,6 @@ TAO_Hash_LogRecordStore::set_records_attribute (
 
 DsLogAdmin::NVList*
 TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidRecordId))
 {
   DsLogAdmin::LogRecord rec;
 
@@ -321,8 +312,7 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id)
 
   if (retval == -1)
     {
-      ACE_THROW_RETURN (DsLogAdmin::InvalidRecordId (),
-                        0);
+      throw DsLogAdmin::InvalidRecordId ();
     }
 
   DsLogAdmin::NVList* nvlist = 0;
@@ -367,8 +357,6 @@ DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query_i (const char *constraint,
                                   DsLogAdmin::Iterator_out &iter_out,
                                   CORBA::ULong how_many)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
   TAO_Log_Constraint_Interpreter interpreter (constraint);
@@ -453,9 +441,6 @@ DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query (const char *grammar,
                                 const char *constraint,
                                 DsLogAdmin::Iterator_out iter_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar,
-                   DsLogAdmin::InvalidConstraint))
 {
   this->check_grammar (grammar);
 
@@ -468,7 +453,6 @@ DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
                                    CORBA::Long how_many,
                                    DsLogAdmin::Iterator_out iter_out)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Decide between forward vs backward retrieval.
   char constraint[32];
@@ -500,9 +484,6 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
 CORBA::ULong
 TAO_Hash_LogRecordStore::match (const char* grammar,
 				const char *constraint)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar,
-                   DsLogAdmin::InvalidConstraint))
 {
   this->check_grammar (grammar);
 
@@ -533,9 +514,6 @@ TAO_Hash_LogRecordStore::match (const char* grammar,
 CORBA::ULong
 TAO_Hash_LogRecordStore::delete_records (const char *grammar,
 					 const char *constraint)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint))
 {
   this->check_grammar (grammar);
 
@@ -570,7 +548,6 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar,
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count (0);
 
@@ -643,8 +620,6 @@ TAO_Hash_LogRecordStore::lock()
 
 void
 TAO_Hash_LogRecordStore::check_grammar (const char* grammar)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar))
 {
   // Verify grammar
   if (ACE_OS::strcmp (grammar, "TCL") != 0 &&
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index 23711349255..f297a0a2980 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -195,28 +195,19 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Set single record attributes.
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
-			  const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidRecordId,
-                     DsLogAdmin::InvalidAttribute));
+			  const DsLogAdmin::NVList & attr_list);
 
   /// Set the attributes of all records that matches the
   /// constraints with same attr_list.
   virtual CORBA::ULong
     set_records_attribute (const char * grammar,
 			   const char * c,
-			   const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint,
-                     DsLogAdmin::InvalidAttribute));
+			   const DsLogAdmin::NVList & attr_list);
 
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
-    get_record_attribute (DsLogAdmin::RecordId id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     DsLogAdmin::InvalidRecordId));
+    get_record_attribute (DsLogAdmin::RecordId id);
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure.
@@ -228,39 +219,28 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual DsLogAdmin::RecordList*
     query (const char * grammar,
            const char * c,
-           DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+           DsLogAdmin::Iterator_out i);
 
   /// Retrieve <how_many> records from time <from_time> using iterator
   /// <i>.
   virtual DsLogAdmin::RecordList*
     retrieve (DsLogAdmin::TimeT from_time,
               CORBA::Long how_many,
-              DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              DsLogAdmin::Iterator_out i);
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
-           const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+           const char * c);
 
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
-                    const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+                    const char * c);
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
-    delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    delete_records_by_id (const DsLogAdmin::RecordIdList & ids);
 
   virtual CORBA::ULong
     remove_old_records (void);
@@ -296,14 +276,10 @@ protected:
 
   DsLogAdmin::RecordList* query_i (const char *constraint,
                                    DsLogAdmin::Iterator_out &iter_out,
-                                   CORBA::ULong how_many)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidConstraint));
+                                   CORBA::ULong how_many);
 
   /// Throws DsLogAdmin::InvalidGrammar if we don't support this grammar.
-  void check_grammar (const char* grammar)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar));
+  void check_grammar (const char* grammar);
 
 
   /// The size of a LogRecord
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index a947a10e3d0..6f1825b1ee8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -23,9 +23,6 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore()
 
 DsLogAdmin::LogList*
 TAO_Hash_LogStore::list_logs (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -62,9 +59,6 @@ TAO_Hash_LogStore::list_logs (void)
 
 DsLogAdmin::LogIdList*
 TAO_Hash_LogStore::list_logs_by_id (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -102,9 +96,6 @@ TAO_Hash_LogStore::list_logs_by_id (void)
 
 DsLogAdmin::Log_ptr
 TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index b33057fd5a1..bd737354172 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -53,24 +53,15 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    list_logs (void);
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    list_logs_by_id (void);
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    find_log (DsLogAdmin::LogId id);
 
   /// Returns true if log exists, otherwise false
   virtual bool exists (DsLogAdmin::LogId id);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 0fff26d0bbd..155f4ad8088 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -36,7 +36,6 @@ TAO_Iterator_i::~TAO_Iterator_i (void)
 
 void
 TAO_Iterator_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->poa_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index ec4dd4dd8d4..3b2f6e49f12 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -60,12 +60,10 @@ public:
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
 				       CORBA::ULong how_many)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidParam))			= 0;
+    = 0;
 
   /// This destroys the iterator.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 protected:
   /// POA
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index 388450253a2..e3c45ebb720 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -21,16 +21,13 @@ TAO_LogActivator::~TAO_LogActivator ()
 PortableServer::Servant
 TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
 			     PortableServer::POA_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableServer::ForwardRequest
-		   ))
 {
   CORBA::String_var poa_id = PortableServer::ObjectId_to_string (oid);
 
   DsLogAdmin::LogId id = ACE_OS::strtoul(poa_id.in (), 0, 0);
 
   if (!logmgr_i_.exists(id))
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   return logmgr_i_.create_log_servant (id);
 }
@@ -42,7 +39,6 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
 			       PortableServer::Servant servant,
 			       CORBA::Boolean,
 			       CORBA::Boolean remaining_activations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations)
    {
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
index 35bcaca5f22..34c20edd1c5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -49,20 +49,13 @@ public:
   virtual ~TAO_LogActivator();
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId& oid,
-					     PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((
-		     CORBA::SystemException,
-		     PortableServer::ForwardRequest
-		     ));
+					     PortableServer::POA_ptr poa);
 
   virtual void etherealize (const PortableServer::ObjectId& oid,
 			    PortableServer::POA_ptr poa,
 			    PortableServer::Servant servant,
 			    CORBA::Boolean cleanup_in_progress,
-			    CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((
-		     CORBA::SystemException
-		     ));
+			    CORBA::Boolean remaining_activations);
 
 private:
   TAO_LogMgr_i&			logmgr_i_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 182eb38d929..8db55311bd5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -152,9 +152,6 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id)
 
 DsLogAdmin::LogList*
 TAO_LogMgr_i::list_logs (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->logstore_->list_logs ();
 }
@@ -162,9 +159,6 @@ TAO_LogMgr_i::list_logs (void)
 
 DsLogAdmin::LogIdList*
 TAO_LogMgr_i::list_logs_by_id (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->logstore_->list_logs_by_id ();
 }
@@ -172,9 +166,6 @@ TAO_LogMgr_i::list_logs_by_id (void)
 
 DsLogAdmin::Log_ptr
 TAO_LogMgr_i::find_log (DsLogAdmin::LogId id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->logstore_->find_log (id);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index 209d202ac55..a66f7719ea3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -52,24 +52,15 @@ public:
 
   /// Lists all log object references.
   DsLogAdmin::LogList *
-    list_logs (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    list_logs (void);
 
   /// Lists all log ids.
   DsLogAdmin::LogIdList *
-    list_logs_by_id (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    list_logs_by_id (void);
 
   /// Returns a reference to the log with the supplied id.
   DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+    find_log (DsLogAdmin::LogId id);
 
   /// Returns true if log exists, otherwise false
   bool exists (DsLogAdmin::LogId id);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 73b508c0c06..0b0d77944d4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -20,7 +20,6 @@ TAO_LogNotification::~TAO_LogNotification (void)
 
 void
 TAO_LogNotification::object_creation (DsLogAdmin::LogId id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Any any;
@@ -42,7 +41,6 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id)
 
 void
 TAO_LogNotification::object_deletion (DsLogAdmin::LogId id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
   DsLogNotification::ObjectDeletion event;
@@ -64,7 +62,6 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id)
 void
 TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
                                              const char* error_string)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
   DsLogNotification::ProcessingErrorAlarm event;
@@ -83,7 +80,6 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogNotification::AttributeType type,
                                              CORBA::Any oldValue,
                                              CORBA::Any newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
   DsLogNotification::AttributeValueChange event;
@@ -113,7 +109,6 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
     DsLogAdmin::LogId id,
     const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
     const DsLogAdmin::CapacityAlarmThresholdList& newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -131,7 +126,6 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
                                                    CORBA::ULong newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -149,7 +143,6 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
                                                 DsLogAdmin::LogId id,
                                                 CORBA::ULongLong oldValue,
                                                 CORBA::ULongLong newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -167,7 +160,6 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
                                               DsLogAdmin::TimeT oldValue,
                                               DsLogAdmin::TimeT newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -185,7 +177,6 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              DsLogAdmin::TimeT oldValue,
                                              DsLogAdmin::TimeT newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -203,7 +194,6 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              const DsLogAdmin::WeekMask& oldValue,
                                              const DsLogAdmin::WeekMask& newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -221,7 +211,6 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
                                                    CORBA::ULong newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -240,7 +229,6 @@ TAO_LogNotification::quality_of_service_value_change (
     DsLogAdmin::LogId id,
     const DsLogAdmin::QoSList& oldValue,
     const DsLogAdmin::QoSList& newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
   oldV <<= oldValue;
@@ -258,7 +246,6 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
                                    DsLogAdmin::LogId id,
                                    DsLogNotification::StateType type,
                                    CORBA::Any newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
   DsLogNotification::StateChange event;
@@ -286,7 +273,6 @@ TAO_LogNotification::administrative_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     DsLogAdmin::AdministrativeState newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
   newV <<= newValue;
@@ -302,7 +288,6 @@ TAO_LogNotification::operational_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     DsLogAdmin::OperationalState newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
   newV <<= newValue;
@@ -317,7 +302,6 @@ void
 TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
                                               DsLogAdmin::ForwardingState newValue)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
   newV <<= newValue;
@@ -335,7 +319,6 @@ TAO_LogNotification::threshold_alarm (
     DsLogAdmin::Threshold crossedValue,
     DsLogAdmin::Threshold observedValue,
     DsLogNotification::PerceivedSeverityType severity)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
   DsLogNotification::ThresholdAlarm event;
@@ -359,7 +342,6 @@ TAO_LogNotification::threshold_alarm (
 
 void
 TAO_LogNotification::send_notification (const CORBA::Any & /* any */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index c16782d6fe9..b99ca01893a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -49,118 +49,100 @@ public:
   virtual ~TAO_LogNotification (void);
 
   /// Event generated when a new log is created.
-  void object_creation (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void object_creation (DsLogAdmin::LogId id);
 
   /// Event generated when a new log is deleted.
-  void object_deletion (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void object_deletion (DsLogAdmin::LogId id);
 
   /// Event generated.
-  void processing_error_alarm (CORBA::ULong error_num, const char* error_string)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void processing_error_alarm (CORBA::ULong error_num, const char* error_string);
 
   /// AttributeValueChange event generation method.
   void attribute_value_change (DsLogAdmin::Log_ptr log,
                         DsLogAdmin::LogId id,
                         DsLogNotification::AttributeType type,
                         CORBA::Any oldValue,
-                        CORBA::Any newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Any newValue);
 
   /// AttributeValueChange event generation method.
   void capacity_alarm_threshold_value_change (DsLogAdmin::Log_ptr log,
                         DsLogAdmin::LogId id,
                         const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
-                        const DsLogAdmin::CapacityAlarmThresholdList& newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        const DsLogAdmin::CapacityAlarmThresholdList& newValue);
 
   /// AttributeValueChange event generation method.
   void log_full_action_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::ULong newValue);
 
   /// AttributeValueChange event generation method.
   void max_log_size_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULongLong oldValue,
-                              CORBA::ULongLong newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::ULongLong newValue);
 
   /// AttributeValueChange event generation method.
   void start_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              DsLogAdmin::TimeT newValue);
 
   /// AttributeValueChange event generation method.
   void stop_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              DsLogAdmin::TimeT newValue);
 
   /// AttributeValueChange event generation method.
   void week_mask_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::WeekMask& oldValue,
-                              const DsLogAdmin::WeekMask& newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              const DsLogAdmin::WeekMask& newValue);
 
   /// AttributeValueChange event generation method.
   void max_record_life_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::ULong newValue);
 
   /// AttributeValueChange event generation method.
   void quality_of_service_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::QoSList& oldValue,
-                              const DsLogAdmin::QoSList& newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              const DsLogAdmin::QoSList& newValue);
 
   /// StateChange event generation method.
   void state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
                     DsLogNotification::StateType type,
-                    CORBA::Any newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Any newValue);
 
   /// StateChange event generation method.
   void administrative_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::AdministrativeState newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    DsLogAdmin::AdministrativeState newValue);
 
   /// StateChange event generation method.
   void operational_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::OperationalState newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    DsLogAdmin::OperationalState newValue);
 
   /// StateChange event generation method.
   void forwarding_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::ForwardingState newValue)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    DsLogAdmin::ForwardingState newValue);
 
   /// StateChange event generation method.
   void threshold_alarm (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
                     DsLogAdmin::Threshold crossedValue,
                     DsLogAdmin::Threshold observedValue,
-                    DsLogNotification::PerceivedSeverityType severity)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    DsLogNotification::PerceivedSeverityType severity);
 
   /// Method overriden by by event-aware logging services to cause
   /// a notification event to be sent.
-  virtual void send_notification (const CORBA::Any &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_notification (const CORBA::Any &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 785c965d4e6..f66b8c1681f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -164,9 +164,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
                           const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidRecordId,
-                     DsLogAdmin::InvalidAttribute))		= 0;
+    = 0;
 
   /// Set the attributes of all records that matches the
   /// constraints with same attr_list.
@@ -174,17 +172,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     set_records_attribute (const char * grammar,
                            const char * c,
                            const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint,
-                     DsLogAdmin::InvalidAttribute))		= 0;
+    = 0;
 
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
     get_record_attribute (DsLogAdmin::RecordId id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidRecordId))		= 0;
+    = 0;
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure
@@ -198,9 +192,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     query (const char * grammar,
 	   const char * c,
 	   DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint))		= 0;
+    = 0;
 
   /// Retrieve <how_many> records from time <from_time> using iterator
   /// <i>.
@@ -208,28 +200,24 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     retrieve (DsLogAdmin::TimeT from_time,
 	      CORBA::Long how_many,
 	      DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
+    = 0;
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
 	   const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint))		= 0;
+    = 0;
 
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
 		    const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint)) 		= 0;
+    = 0;
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
     delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
-    ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
+    = 0;
 
 
   virtual CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 8fe2fddceb5..66f8ea5888c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -38,23 +38,17 @@ public:
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
     list_logs (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ))					= 0;
+    = 0;
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
     list_logs_by_id (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ))					= 0;
+    = 0;
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
     find_log (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ))					= 0;
+    = 0;
 
   /// Returns true if log exists, otherwise false
   virtual bool
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index b8b51624edf..33870c64cd0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -11,8 +11,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     const char *constraints
   )
-  ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
-                   CORBA::NO_MEMORY))
 {
   if (TAO_ETCL_Interpreter::is_empty_string (constraints))
     {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 709310343f9..8bb542da1be 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -51,9 +51,7 @@ public:
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  TAO_Log_Constraint_Interpreter (const char* constraints)
-    ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
-                     CORBA::NO_MEMORY));
+  TAO_Log_Constraint_Interpreter (const char* constraints);
 
   /// Destructor.
   ~TAO_Log_Constraint_Interpreter (void);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 14722221752..5c1cbb0ed4f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -29,7 +29,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec
 #else
   val_id <<= static_cast<ACE_UINT32> (rec.id);
 #endif
-  this->property_lookup_.bind (ACE_CString("id", 0, 0), val_id);
+  this->property_lookup_.bind (ACE_CString("id", 0, false), val_id);
 
 
   CORBA::Any val_time;
@@ -38,9 +38,9 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec
 #else
   val_time <<= static_cast<ACE_UINT32> (rec.time);
 #endif
-  this->property_lookup_.bind (ACE_CString("time", 0, 0), val_time);
+  this->property_lookup_.bind (ACE_CString("time", 0, false), val_time);
 
-  this->property_lookup_.bind (ACE_CString("info", 0, 0), rec.info);
+  this->property_lookup_.bind (ACE_CString("info", 0, false), rec.info);
 
   // Bind an entry for each item in the record's attribute list.
   CORBA::Long len = rec.attr_list.length();
@@ -48,7 +48,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec
     {
       this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name,
                  0,
-                 0),
+                 false),
            rec.attr_list[i].value);
     }
 }
@@ -89,7 +89,7 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
 {
   int return_value = -1;
   const char *name = ident->value ();
-  ACE_CString key (name, 0, 0);
+  ACE_CString key (name, 0, false);
 
   CORBA::Any any;
 
@@ -371,7 +371,7 @@ TAO_Log_Constraint_Visitor::visit_component_assoc (
   CORBA::Any any;
   ACE_CString key (assoc->identifier ()->value (),
        0,
-       0);
+       false);
 
   if (this->property_lookup_.find (key, any) != 0
       || any.impl () == 0)
@@ -563,8 +563,10 @@ TAO_Log_Constraint_Visitor::visit_component (
       this->queue_.dequeue_head (id);
       CORBA::Any *any_ptr = 0;
       ACE_NEW_RETURN (any_ptr,
-                      CORBA::Any (*(const CORBA::Any *) id),
+                      CORBA::Any (),
                       -1);
+      any_ptr->replace (id);
+      any_ptr->impl ()->_add_ref ();
       this->current_member_ = any_ptr;
       return nested->accept (this);
     }
@@ -642,7 +644,7 @@ TAO_Log_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
       this->queue_.dequeue_head (top);
 
       const char *value = (const char *) top;
-      ACE_CString key (value, 0, 0);
+      ACE_CString key (value, 0, false);
 
       CORBA::Boolean result = (this->property_lookup_.find (key) == 0);
 
@@ -943,7 +945,9 @@ TAO_Log_Constraint_Visitor::visit_in (
 
           if (bag.expr_type () == TAO_ETCL_COMPONENT)
             {
-              const CORBA::Any *component = (const CORBA::Any *) bag;
+              CORBA::Any_var component = new CORBA::Any ();
+              component->replace (bag);
+              component->impl ()->_add_ref ();
               CORBA::TCKind kind = CORBA::tk_null;
 
               try
@@ -961,23 +965,23 @@ TAO_Log_Constraint_Visitor::visit_in (
               switch (kind)
               {
                 case CORBA::tk_sequence:
-                  result = this->sequence_does_contain (component,
+                  result = this->sequence_does_contain (&component.in (),
                                                         left);
                   break;
                 case CORBA::tk_array:
-                  result = this->array_does_contain (component,
+                  result = this->array_does_contain (&component.in (),
                                                      left);
                   break;
                 case CORBA::tk_struct:
-                  result = this->struct_does_contain (component,
+                  result = this->struct_does_contain (&component.in (),
                                                       left);
                   break;
                 case CORBA::tk_union:
-                  result = this->union_does_contain (component,
+                  result = this->union_does_contain (&component.in (),
                                                      left);
                   break;
                 case CORBA::tk_any:
-                  result = this->any_does_contain (component,
+                  result = this->any_does_contain (&component.in (),
                                                    left);
                   break;
                 default:
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 605ca774d7c..c9a12d91002 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -98,21 +98,18 @@ TAO_Log_i::~TAO_Log_i (void)
 
 DsLogAdmin::LogMgr_ptr
 TAO_Log_i::my_factory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ());
 }
 
 DsLogAdmin::LogId
 TAO_Log_i::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return logid_;
 }
 
 DsLogAdmin::QoSList*
 TAO_Log_i::get_log_qos (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -132,8 +129,6 @@ TAO_Log_i::get_log_qos (void)
 
 void
 TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::UnsupportedQoS))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -181,7 +176,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
 
 CORBA::ULong
 TAO_Log_i::get_max_record_life (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -194,7 +188,6 @@ TAO_Log_i::get_max_record_life (void)
 
 void
 TAO_Log_i::set_max_record_life (CORBA::ULong life)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -233,7 +226,6 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life)
 
 CORBA::ULongLong
 TAO_Log_i::get_max_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -245,8 +237,6 @@ TAO_Log_i::get_max_size (void)
 
 void
 TAO_Log_i::set_max_size (CORBA::ULongLong size)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidParam))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -307,7 +297,6 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size)
 
 CORBA::ULongLong
 TAO_Log_i::get_current_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -319,7 +308,6 @@ TAO_Log_i::get_current_size (void)
 
 CORBA::ULongLong
 TAO_Log_i::get_n_records (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -331,7 +319,6 @@ TAO_Log_i::get_n_records (void)
 
 DsLogAdmin::LogFullActionType
 TAO_Log_i::get_log_full_action (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -343,8 +330,6 @@ TAO_Log_i::get_log_full_action (void)
 
 void
 TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   DsLogAdmin::InvalidLogFullAction))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -398,7 +383,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
 
 DsLogAdmin::AdministrativeState
 TAO_Log_i::get_administrative_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -410,7 +394,6 @@ TAO_Log_i::get_administrative_state (void)
 
 void
 TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -443,7 +426,6 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
 
 DsLogAdmin::ForwardingState
 TAO_Log_i::get_forwarding_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -456,7 +438,6 @@ TAO_Log_i::get_forwarding_state (void)
 
 void
 TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -489,7 +470,6 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
 
 DsLogAdmin::OperationalState
 TAO_Log_i::get_operational_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No locks are necessary, since op_state_ is set in ::init() and
   // never changed.
@@ -498,7 +478,6 @@ TAO_Log_i::get_operational_state (void)
 
 DsLogAdmin::TimeInterval
 TAO_Log_i::get_interval (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -510,9 +489,6 @@ TAO_Log_i::get_interval (void)
 
 void
 TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidTime,
-                   DsLogAdmin::InvalidTimeInterval))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -564,7 +540,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
 
 DsLogAdmin::AvailabilityStatus
 TAO_Log_i::get_availability_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -576,7 +551,6 @@ TAO_Log_i::get_availability_status (void)
 
 DsLogAdmin::AvailabilityStatus
 TAO_Log_i::get_availability_status_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The log is considered "on duty" if all the following are true:
   //   * operational state is enabled
@@ -605,7 +579,6 @@ TAO_Log_i::get_availability_status_i (void)
 
 DsLogAdmin::CapacityAlarmThresholdList*
 TAO_Log_i::get_capacity_alarm_thresholds (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -619,8 +592,6 @@ void
 TAO_Log_i::set_capacity_alarm_thresholds (const
                                           DsLogAdmin::CapacityAlarmThresholdList
                                           &threshs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidThreshold))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -678,7 +649,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
 
 DsLogAdmin::WeekMask*
 TAO_Log_i::get_week_mask (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -690,10 +660,6 @@ TAO_Log_i::get_week_mask (void)
 
 void
 TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidTime,
-                   DsLogAdmin::InvalidTimeInterval,
-                   DsLogAdmin::InvalidMask))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -733,9 +699,6 @@ DsLogAdmin::RecordList*
 TAO_Log_i::query (const char *grammar,
                   const char *constraint,
                   DsLogAdmin::Iterator_out iter_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar,
-                   DsLogAdmin::InvalidConstraint))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -751,7 +714,6 @@ DsLogAdmin::RecordList*
 TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
                      CORBA::Long how_many,
                      DsLogAdmin::Iterator_out iter_out)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -766,9 +728,6 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
 CORBA::ULong
 TAO_Log_i::match (const char* grammar,
                   const char *constraint)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidGrammar,
-                   DsLogAdmin::InvalidConstraint))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -785,9 +744,6 @@ TAO_Log_i::match (const char* grammar,
 CORBA::ULong
 TAO_Log_i::delete_records (const char *grammar,
                            const char *constraint)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -822,7 +778,6 @@ TAO_Log_i::delete_records (const char *grammar,
 
 CORBA::ULong
 TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -856,11 +811,6 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
 
 void
 TAO_Log_i::write_records (const DsLogAdmin::Anys &records)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::LogFull,
-                   DsLogAdmin::LogOffDuty,
-                   DsLogAdmin::LogLocked,
-                   DsLogAdmin::LogDisabled))
 {
   // create a record list..
   DsLogAdmin::RecordList reclist (records.length ());
@@ -876,11 +826,6 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records)
 
 void
 TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::LogFull,
-                   DsLogAdmin::LogOffDuty,
-                   DsLogAdmin::LogLocked,
-                   DsLogAdmin::LogDisabled))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -962,9 +907,6 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
 void
 TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
                                  const DsLogAdmin::NVList &attr_list)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidRecordId,
-                   DsLogAdmin::InvalidAttribute))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -979,10 +921,6 @@ TAO_Log_i::set_records_attribute (const char *grammar,
                                   const char *constraint,
                                   const DsLogAdmin::NVList
                                   &attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint,
-                     DsLogAdmin::InvalidAttribute))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
@@ -996,8 +934,6 @@ TAO_Log_i::set_records_attribute (const char *grammar,
 
 DsLogAdmin::NVList*
 TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   DsLogAdmin::InvalidRecordId))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -1010,8 +946,6 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id)
 
 void
 TAO_Log_i::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::UnsupportedQoS))
 {
   /// XXX locks?
   this->recordstore_->flush ();
@@ -1019,7 +953,6 @@ TAO_Log_i::flush (void)
 
 CORBA::Boolean
 TAO_Log_i::scheduled (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::TimeInterval interval =
     this->recordstore_->get_interval ();
@@ -1071,7 +1004,6 @@ TAO_Log_i::scheduled (void)
 
 void
 TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const DsLogAdmin::LogFullActionType log_full_action =
     this->get_log_full_action ();
@@ -1121,7 +1053,6 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log)
 
 void
 TAO_Log_i::remove_old_records (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULong count =
     this->recordstore_->remove_old_records ();
@@ -1148,7 +1079,6 @@ TAO_Log_i::remove_old_records (void)
 
 void
 TAO_Log_i::check_capacity_alarm_threshold (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULongLong max_size =
     this->recordstore_->get_max_size ();
@@ -1210,7 +1140,6 @@ TAO_Log_i::check_capacity_alarm_threshold (void)
 
 void
 TAO_Log_i::reset_capacity_alarm_threshold (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULongLong max_size =
     this->recordstore_->get_max_size ();
@@ -1241,7 +1170,6 @@ TAO_Log_i::reset_capacity_alarm_threshold (void)
 CORBA::Boolean
 TAO_Log_i::validate_capacity_alarm_thresholds (
     const DsLogAdmin::CapacityAlarmThresholdList & threshs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < threshs.length (); i++)
     if (threshs[i] > 100)
@@ -1290,7 +1218,6 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos)
 
 void
 TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos)
-  ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS))
 {
   DsLogAdmin::QoSList denied;
 
@@ -1358,9 +1285,6 @@ TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks)
 
 void
 TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks)
-  ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
-		   DsLogAdmin::InvalidTimeInterval,
-		   DsLogAdmin::InvalidMask))
 {
   for (CORBA::ULong i = 0; i < masks.length (); ++i)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 60caca26dfc..241bbb6d161 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -71,115 +71,89 @@ public:
    */
   //@{
   /// Return the factory of the log.
-  DsLogAdmin::LogMgr_ptr my_factory (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  DsLogAdmin::LogMgr_ptr my_factory (void);
 
   /// Return the id of the log.
-  DsLogAdmin::LogId id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  DsLogAdmin::LogId id (void);
 
   /// Get the list of the QoS properties supported by the log.
   DsLogAdmin::QoSList*
-  get_log_qos (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_log_qos (void);
 
   /// Set the list of the QoS properties supported by the log.
-  void set_log_qos (const DsLogAdmin::QoSList & qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::UnsupportedQoS));
+  void set_log_qos (const DsLogAdmin::QoSList & qos);
 
   /// Get the record life in seconds (0 infinite).
   CORBA::ULong
-  get_max_record_life (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_max_record_life (void);
 
   /// Set the record life in seconds (0 infinite).
   void
-  set_max_record_life (CORBA::ULong life)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  set_max_record_life (CORBA::ULong life);
 
   /// Get the maximum size in octets.
   CORBA::ULongLong
-  get_max_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_max_size (void);
 
   /// Set the maximum size in octets.
   void
-  set_max_size (CORBA::ULongLong size)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidParam));
+  set_max_size (CORBA::ULongLong size);
 
   /// Get the current size of the log in octets.
   CORBA::ULongLong
-  get_current_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_current_size (void);
 
   /// Return the number of records in the log.
   CORBA::ULongLong
-  get_n_records (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_n_records (void);
 
   /// Get the action to be taken when the log reaches its maximum size.
   DsLogAdmin::LogFullActionType
-  get_log_full_action (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_log_full_action (void);
 
   /// Set the action to be taken when the log reaches its maximum size.
   void
-  set_log_full_action (DsLogAdmin::LogFullActionType action)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     DsLogAdmin::InvalidLogFullAction));
+  set_log_full_action (DsLogAdmin::LogFullActionType action);
 
   /// Get the administrative state of the log.
   DsLogAdmin::AdministrativeState
-  get_administrative_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_administrative_state (void);
 
   /// Set the administrative state of the log.
   void
-  set_administrative_state (DsLogAdmin::AdministrativeState state)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  set_administrative_state (DsLogAdmin::AdministrativeState state);
 
   /// Get the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
   /// @@@ Of course!  get_forwarding_state() is virtual in the base
   ///     class dictated by the IDL!  -Ossama
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_forwarding_state (void);
 
   /// Set the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
   void
-    set_forwarding_state (DsLogAdmin::ForwardingState state)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_forwarding_state (DsLogAdmin::ForwardingState state);
 
   /// Get the operational state of the log.
   DsLogAdmin::OperationalState
-  get_operational_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_operational_state (void);
 
   /// Get the log duration
   DsLogAdmin::TimeInterval
-  get_interval (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_interval (void);
 
   /// Set the log duration.
   void
-  set_interval (const DsLogAdmin::TimeInterval & interval)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidTime,
-                     DsLogAdmin::InvalidTimeInterval));
+  set_interval (const DsLogAdmin::TimeInterval & interval);
 
   /// Get the availability status
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_availability_status (void);
 
   /// Get the capacity alarm threshold
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_capacity_alarm_thresholds (void);
 
   /**
    * Set the capacity alarm threshold. Threshold values represent
@@ -191,155 +165,108 @@ public:
    */
   void
   set_capacity_alarm_thresholds
-  (const DsLogAdmin::CapacityAlarmThresholdList & threshs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidThreshold));
+  (const DsLogAdmin::CapacityAlarmThresholdList & threshs);
 
   /// Get the weekly scheduling parameters
   DsLogAdmin::WeekMask*
-  get_week_mask (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_week_mask (void);
 
   /// Set the weekly scheduling parameters.
   void
-  set_week_mask (const DsLogAdmin::WeekMask & masks)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidTime,
-                     DsLogAdmin::InvalidTimeInterval,
-                     DsLogAdmin::InvalidMask));
+  set_week_mask (const DsLogAdmin::WeekMask & masks);
 
   /// Returns all records in the log that match the given constraint
   /// <c>.
   DsLogAdmin::RecordList*
   query (const char * grammar,
          const char * c,
-         DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+         DsLogAdmin::Iterator_out i);
 
   /// Retrieve <how_many> records from time <from_time> using iterator
   /// <i>.
   DsLogAdmin::RecordList*
   retrieve (DsLogAdmin::TimeT from_time,
             CORBA::Long how_many,
-            DsLogAdmin::Iterator_out i)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+            DsLogAdmin::Iterator_out i);
 
   /// Returns the number of records matching constraint <c>.
   CORBA::ULong
   match (const char * grammar,
-         const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+         const char * c);
 
   /// Delete records matching constraint <c>.
   CORBA::ULong
   delete_records (const char * grammar,
-                  const char * c)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint));
+                  const char * c);
 
   /// Delete records matching ids in <ids>
   CORBA::ULong
-  delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  delete_records_by_id (const DsLogAdmin::RecordIdList & ids);
 
 
   /// Write records to the log storage.
   void
-  write_records (const DsLogAdmin::Anys & records)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::LogFull,
-                     DsLogAdmin::LogOffDuty,
-                     DsLogAdmin::LogLocked,
-                     DsLogAdmin::LogDisabled));
+  write_records (const DsLogAdmin::Anys & records);
 
   /// Write a list of record ids to storage. Raises DsLogAdmin::LogFull
   /// and DsLogAdmin::LogLocked
   void
-  write_recordlist (const DsLogAdmin::RecordList & list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::LogFull,
-                     DsLogAdmin::LogOffDuty,
-                     DsLogAdmin::LogLocked,
-                     DsLogAdmin::LogDisabled));
+  write_recordlist (const DsLogAdmin::RecordList & list);
 
   /// Set single record attributes.
   void
   set_record_attribute (DsLogAdmin::RecordId id,
-                        const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidRecordId,
-                     DsLogAdmin::InvalidAttribute));
+                        const DsLogAdmin::NVList & attr_list);
 
   /// Set the attributes of all records that matches the
   /// constraints with same attr_list.
   CORBA::ULong
   set_records_attribute (const char * grammar,
                          const char * c,
-                         const DsLogAdmin::NVList & attr_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidGrammar,
-                     DsLogAdmin::InvalidConstraint,
-                     DsLogAdmin::InvalidAttribute));
+                         const DsLogAdmin::NVList & attr_list);
 
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   DsLogAdmin::NVList*
-  get_record_attribute (DsLogAdmin::RecordId id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::InvalidRecordId));
+  get_record_attribute (DsLogAdmin::RecordId id);
 
   /// Causes all pending events to be written to storage. Raises
   /// DsLogAdmin::UnsupportedQos
   void
-  flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     DsLogAdmin::UnsupportedQoS));
+  flush (void);
   //@}
 
   /// Remove records that have exceeded max_record_life_.
-  void remove_old_records (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void remove_old_records (void);
 
 protected:
   /// Get the availability status
   /// @note must be called with locks held
   DsLogAdmin::AvailabilityStatus
-  get_availability_status_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  get_availability_status_i (void);
 
   /// Tells if the Log is scheduled to run now.
   /// @note must be called with locks held
-  CORBA::Boolean scheduled (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean scheduled (void);
 
   /// Copy the attributes of the log being passed.
-  void copy_attributes (DsLogAdmin::Log_ptr log)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void copy_attributes (DsLogAdmin::Log_ptr log);
 
   /// Check if threshold reached.
-  void check_capacity_alarm_threshold (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void check_capacity_alarm_threshold (void);
 
   /// Reset capacity alarm threshold.
-  void reset_capacity_alarm_threshold (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void reset_capacity_alarm_threshold (void);
 
   /// Check that valid threshold values have been given.
   static CORBA::Boolean validate_capacity_alarm_thresholds (
-    const DsLogAdmin::CapacityAlarmThresholdList & threshs)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    const DsLogAdmin::CapacityAlarmThresholdList & threshs);
 
   /// Reset Log QoS
   void reset_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Validate log QoS
-  void validate_log_qos (const DsLogAdmin::QoSList& qos)
-    ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS));
+  void validate_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Reset Week Mask
   ///
@@ -354,10 +281,7 @@ protected:
   /// Used to check whether week mask is valid.  If not, throws an
   /// InvalidTime, InvalidTimeInterval, or InvalidMask exception.
   ///
-  void validate_week_mask (const DsLogAdmin::WeekMask& masks)
-    ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
-                     DsLogAdmin::InvalidTimeInterval,
-                     DsLogAdmin::InvalidMask));
+  void validate_week_mask (const DsLogAdmin::WeekMask& masks);
 
 protected:
   /// Reference to the LogMgr servant
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 226586b688b..c4bac928a7b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -52,10 +52,6 @@ void
 TAO_Notify_LogConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ))
 {
   // No-Op.
 }
@@ -63,10 +59,6 @@ TAO_Notify_LogConsumer::offer_change
 void
 TAO_Notify_LogConsumer::push
    (const CORBA::Any& event)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   // create a record list...
   DsLogAdmin::RecordList recList (1);
@@ -124,9 +116,6 @@ TAO_Notify_LogConsumer::push
 void
 TAO_Notify_LogConsumer::disconnect_push_consumer
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index 2739da295fb..ae88fcff8aa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -72,26 +72,15 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType
-    ));
+    );
 
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & event
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosEventComm::Disconnected
-     ));
+    );
 
   virtual void disconnect_push_consumer (
-      )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      );
 
   /// ProxyPushSupplier used to connect to NotifyLog.
   CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 102221bc7da..1f2d514406d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -81,13 +81,6 @@ TAO_NotifyLogFactory_i::create (
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id_out
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold,
-        CosNotification::UnsupportedQoS,
-        CosNotification::UnsupportedAdmin
-      ))
 {
   ACE_UNUSED_ARG (initial_qos);
   ACE_UNUSED_ARG (initial_admin);
@@ -125,14 +118,6 @@ TAO_NotifyLogFactory_i::create_with_id (
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::LogIdAlreadyExists,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold,
-        CosNotification::UnsupportedQoS,
-        CosNotification::UnsupportedAdmin
-      ))
 {
   ACE_UNUSED_ARG (initial_qos);
   ACE_UNUSED_ARG (initial_admin);
@@ -192,81 +177,54 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 
 CosNotifyChannelAdmin::AdminID
 TAO_NotifyLogFactory_i::MyID (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->MyID ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_NotifyLogFactory_i::MyChannel (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), 0);
+  throw CORBA::NO_IMPLEMENT();
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
 TAO_NotifyLogFactory_i::MyOperator (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->MyOperator ();
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_NotifyLogFactory_i::priority_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->priority_filter ();
 }
 
 void
 TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   consumer_admin_->priority_filter(filter);
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_NotifyLogFactory_i::lifetime_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->lifetime_filter ();
 }
 
 void
 TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   consumer_admin_->lifetime_filter (filter);
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_NotifyLogFactory_i::pull_suppliers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->pull_suppliers ();
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_NotifyLogFactory_i::push_suppliers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->push_suppliers ();
 }
@@ -274,10 +232,6 @@ TAO_NotifyLogFactory_i::push_suppliers (void)
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::get_proxy_supplier (
   CosNotifyChannelAdmin::ProxyID proxy_id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::ProxyNotFound,
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->get_proxy_supplier (proxy_id);
 }
@@ -286,10 +240,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_pull_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
   CosNotifyChannelAdmin::ProxyID& proxy_id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminLimitExceeded,
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id);
 }
@@ -298,10 +248,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_push_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
   CosNotifyChannelAdmin::ProxyID& proxy_id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminLimitExceeded,
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id);
 }
@@ -309,9 +255,6 @@ TAO_NotifyLogFactory_i::obtain_notification_push_supplier (
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_push_supplier (
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   return consumer_admin_->obtain_push_supplier ();
 }
@@ -321,9 +264,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier (
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_pull_supplier (
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 
 {
   return consumer_admin_->obtain_pull_supplier ();
@@ -331,9 +271,6 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier (
 
 void
 TAO_NotifyLogFactory_i::destroy (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   // No-Op.
 }
@@ -342,29 +279,18 @@ TAO_NotifyLogFactory_i::destroy (void)
 void
 TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq& added,
                           const CosNotification::EventTypeSeq& removed)
-    ACE_THROW_SPEC ((
-      CosNotifyComm::InvalidEventType,
-      CORBA::SystemException
-    ))
 {
   consumer_admin_->subscription_change (added, removed);
 }
 
 CosNotification::QoSProperties*
 TAO_NotifyLogFactory_i::get_qos (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   return consumer_admin_->get_qos ();
 }
 
 void
 TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ))
 {
   consumer_admin_->set_qos (qos);
 }
@@ -372,56 +298,36 @@ TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos)
 void
 TAO_NotifyLogFactory_i::validate_qos (const CosNotification::QoSProperties& required_qos,
                    CosNotification::NamedPropertyRangeSeq_out available_qos)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ))
 {
   consumer_admin_->validate_qos (required_qos, available_qos);
 }
 
 CosNotifyFilter::FilterID
 TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   return consumer_admin_->add_filter (filter);
 }
 
 void
 TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   consumer_admin_->remove_filter (id);
 }
 
 CosNotifyFilter::Filter_ptr
 TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id)
-    ACE_THROW_SPEC ((
-      CosNotifyFilter::FilterNotFound,
-      CORBA::SystemException
-    ))
 {
   return consumer_admin_->get_filter (id);
 }
 
 CosNotifyFilter::FilterIDSeq*
 TAO_NotifyLogFactory_i::get_all_filters (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   return consumer_admin_->get_all_filters ();
 }
 
 void
 TAO_NotifyLogFactory_i::remove_all_filters (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ))
 {
   consumer_admin_->remove_all_filters ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index 89ba2e56282..d883bec416b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -72,14 +72,7 @@ public:
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold,
-        CosNotification::UnsupportedQoS,
-        CosNotification::UnsupportedAdmin
-      ));
+      );
 
   /// Same as create (), but allows clients to specify the id.
   DsNotifyLogAdmin::NotifyLog_ptr create_with_id (
@@ -89,147 +82,60 @@ public:
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::LogIdAlreadyExists,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold,
-        CosNotification::UnsupportedQoS,
-        CosNotification::UnsupportedAdmin
-      ));
+      );
 
 
   // = Methods from CosNotifyChannelAdmin::ConsumerAdmin.
-  CosNotifyChannelAdmin::AdminID MyID (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CosNotifyFilter::MappingFilter_ptr priority_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  void priority_filter (CosNotifyFilter::MappingFilter_ptr)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  CosNotifyChannelAdmin::AdminID MyID (void);
+
+  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+
+  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+
+  CosNotifyFilter::MappingFilter_ptr priority_filter (void);
+  void priority_filter (CosNotifyFilter::MappingFilter_ptr);
+
+  CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr);
+
+  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void);
+  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void);
 
   CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
-    CosNotifyChannelAdmin::ProxyID proxy_id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::ProxyNotFound,
-      CORBA::SystemException
-    ));
+    CosNotifyChannelAdmin::ProxyID proxy_id);
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& proxy_id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminLimitExceeded,
-      CORBA::SystemException
-    ));
+    CosNotifyChannelAdmin::ProxyID& proxy_id);
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminLimitExceeded,
-      CORBA::SystemException
-    ));
+    CosNotifyChannelAdmin::ProxyID& id);
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
+        );
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
+        );
 
-  void destroy (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
+  void destroy (void);
 
   /// CosNotifyComm::NotifySubscribe.
   void subscription_change (const CosNotification::EventTypeSeq& added,
-                            const CosNotification::EventTypeSeq& removed)
-    ACE_THROW_SPEC ((
-      CosNotifyComm::InvalidEventType,
-      CORBA::SystemException
-    ));
+                            const CosNotification::EventTypeSeq& removed);
 
   /// CosNotification::QoSAdmin.
-  CosNotification::QoSProperties* get_qos (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-  void set_qos (const CosNotification::QoSProperties&)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ));
+  CosNotification::QoSProperties* get_qos (void);
+  void set_qos (const CosNotification::QoSProperties&);
   void validate_qos (const CosNotification::QoSProperties&,
-                     CosNotification::NamedPropertyRangeSeq_out)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ));
+                     CosNotification::NamedPropertyRangeSeq_out);
 
   /// CosNotifyFilter::FilterAdmin.
-  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-  void remove_filter (CosNotifyFilter::FilterID)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID)
-    ACE_THROW_SPEC ((
-      CosNotifyFilter::FilterNotFound,
-      CORBA::SystemException
-    ));
-  CosNotifyFilter::FilterIDSeq* get_all_filters (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-  void remove_all_filters (void)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
+  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr);
+  void remove_filter (CosNotifyFilter::FilterID);
+  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID);
+  CosNotifyFilter::FilterIDSeq* get_all_filters (void);
+  void remove_all_filters (void);
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index e3f5117bedf..fb5cf40bf1a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -47,9 +47,6 @@ TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void)
 
 void
 TAO_NotifyLogNotification::send_notification (const CORBA::Any& any)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   this->proxy_consumer_->push (any);
 }
@@ -58,10 +55,6 @@ void
 TAO_NotifyLogNotification::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   //No-Op.
 }
@@ -69,9 +62,6 @@ TAO_NotifyLogNotification::subscription_change
 void
 TAO_NotifyLogNotification::disconnect_push_supplier
    (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 5d39f68220a..cc49f39e868 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -68,24 +68,14 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 
   // = StructuredPushSupplier method
     virtual void disconnect_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   /// Send the event on the event channel.
-  virtual void send_notification (const CORBA::Any& any)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void send_notification (const CORBA::Any& any);
 
 private:
   /// A reference to the ORB.
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 22c4f8e7d8f..a44248f0908 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -44,9 +44,6 @@ TAO_NotifyLog_i::~TAO_NotifyLog_i ()
 
 DsLogAdmin::Log_ptr
 TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
     DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
@@ -66,9 +63,6 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id)
 
 DsLogAdmin::Log_ptr
 TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
     DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
@@ -89,7 +83,6 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
 
 void
 TAO_NotifyLog_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   notifier_->object_deletion (logid_);
 
@@ -156,19 +149,13 @@ TAO_NotifyLog_i::activate (void)
 //IDL to C++
 CosNotifyFilter::Filter_ptr
 TAO_NotifyLog_i::get_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   //TODO: need to add impl
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   throw CORBA::NO_IMPLEMENT ();
 
@@ -177,37 +164,25 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */)
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 TAO_NotifyLog_i::MyFactory (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   //TODO: need to add impl
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::default_consumer_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->default_consumer_admin ();
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::default_supplier_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->default_supplier_admin ();
 }
 
 CosNotifyFilter::FilterFactory_ptr
 TAO_NotifyLog_i::default_filter_factory (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->default_filter_factory ();
 }
@@ -215,9 +190,6 @@ TAO_NotifyLog_i::default_filter_factory (void)
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID& id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->new_for_consumers (op,id);
 }
@@ -225,86 +197,55 @@ TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOpera
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID& id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->new_for_suppliers (op,id);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound,
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->get_consumeradmin (id);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound,
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->get_supplieradmin (id);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
 TAO_NotifyLog_i::get_all_consumeradmins (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->get_all_consumeradmins ();
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
 TAO_NotifyLog_i::get_all_supplieradmins (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->get_all_supplieradmins ();
 }
 
 CosNotification::AdminProperties*
 TAO_NotifyLog_i::get_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->get_admin ();
 }
 
 void
 TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedAdmin,
-      CORBA::SystemException
-    ))
 {
   this->event_channel_->set_admin (admin);
 }
 
 CosNotification::QoSProperties*
 TAO_NotifyLog_i::get_qos (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   //need to add merging of QoS from Log_i and EventChannel_i
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ))
 {
   throw CORBA::NO_IMPLEMENT ();
   //TODO: need to add later
@@ -314,8 +255,6 @@ void
 TAO_NotifyLog_i::validate_qos (
     const CosNotification::QoSProperties& /* required_qos */,
     CosNotification::NamedPropertyRangeSeq_out /* available_qos */)
-  ACE_THROW_SPEC ((CosNotification::UnsupportedQoS,
-                   CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 
@@ -324,9 +263,6 @@ TAO_NotifyLog_i::validate_qos (
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::for_consumers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->for_consumers();
 }
@@ -334,9 +270,6 @@ TAO_NotifyLog_i::for_consumers (void)
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::for_suppliers (
     )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->for_suppliers();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 08e111ff2c9..3b5c70666d8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -70,21 +70,14 @@ public:
   ~TAO_NotifyLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id);
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  destroy (void);
 
   /// Activate the NotifyLog.
   void
@@ -92,123 +85,61 @@ public:
 
   // = Methods from CosNotifyChannelAdmin::EventChannel.
   CosNotifyFilter::Filter_ptr
-  get_filter (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  get_filter (void);
 
-  void set_filter (CosNotifyFilter::Filter_ptr filter)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  void set_filter (CosNotifyFilter::Filter_ptr filter);
 
   CosNotifyChannelAdmin::EventChannelFactory_ptr
-  MyFactory (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  MyFactory (void);
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  default_consumer_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  default_consumer_admin (void);
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  default_supplier_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  default_supplier_admin (void);
 
   CosNotifyFilter::FilterFactory_ptr
-  default_filter_factory (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  default_filter_factory (void);
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    CosNotifyChannelAdmin::AdminID& id);
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
   new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    CosNotifyChannelAdmin::AdminID& id);
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound,
-      CORBA::SystemException
-    ));
+  get_consumeradmin (CosNotifyChannelAdmin::AdminID id);
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound,
-      CORBA::SystemException
-    ));
+  get_supplieradmin (CosNotifyChannelAdmin::AdminID id);
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_consumeradmins (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  get_all_consumeradmins (void);
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_supplieradmins (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  get_all_supplieradmins (void);
 
   CosNotification::AdminProperties*
-  get_admin (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  get_admin (void);
 
-  void set_admin (const CosNotification::AdminProperties& admin)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedAdmin,
-      CORBA::SystemException
-    ));
+  void set_admin (const CosNotification::AdminProperties& admin);
 
   CosNotification::QoSProperties*
-  get_qos (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  get_qos (void);
 
-  void set_qos (const CosNotification::QoSProperties&)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ));
+  void set_qos (const CosNotification::QoSProperties&);
 
   void validate_qos (const CosNotification::QoSProperties&,
-    CosNotification::NamedPropertyRangeSeq_out)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ));
+    CosNotification::NamedPropertyRangeSeq_out);
 
   // = Methods from DsEventLogAdmin::EventLog.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  for_consumers (void);
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  for_suppliers (void);
 
 private:
   /// The PushConsumer that consumes the events and stores them
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 9bc54b2d479..1ad4bf75e82 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -43,7 +43,6 @@ TAO_Rtec_LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
 
 void
 TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // create a record list...
   DsLogAdmin::RecordList recList (1);
@@ -58,7 +57,6 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
 
 void
 TAO_Rtec_LogConsumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 86f0976f833..6d7ae4ae311 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -69,13 +69,11 @@ public:
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void disconnect_push_consumer (void);
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet& events);
 
   /// ProxyPushSupplier used to connect to RTEventLog.
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 69f700e5210..d7a2e535aae 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -99,11 +99,6 @@ TAO_RTEventLogFactory_i::create (
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id_out
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ))
 {
   this->create_i (full_action,
 		  max_size,
@@ -136,12 +131,6 @@ TAO_RTEventLogFactory_i::create_with_id (
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::LogIdAlreadyExists,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ))
 {
   this->create_with_id_i (id,
 			  full_action,
@@ -199,9 +188,6 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_RTEventLogFactory_i::obtain_push_supplier (
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   return consumer_admin_->obtain_push_supplier();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 4b2d5889cb2..75acc1d0b6c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -75,12 +75,7 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ));
+      );
 
   /// Same as create (), but allows clients to specify the id.
   RTEventLogAdmin::EventLog_ptr create_with_id (
@@ -88,20 +83,11 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DsLogAdmin::LogIdAlreadyExists,
-        DsLogAdmin::InvalidLogFullAction,
-        DsLogAdmin::InvalidThreshold
-      ));
+      );
 
    // = Implementation of the RtecEventChannelAdmin::ConsumerAdmin methods.
   RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index ad1a4b1fafa..14a78477a3b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -40,7 +40,6 @@ TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
 
 void
 TAO_RTEventLogNotification::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-Op.
 }
@@ -70,7 +69,6 @@ TAO_RTEventLogNotification::obtainProxyConsumer (void)
 
 void
 TAO_RTEventLogNotification::send_notification (const CORBA::Any& any)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index a2530fe0783..22fa66d06c3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -58,8 +58,7 @@ public:
   ~TAO_RTEventLogNotification (void);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 protected:
   // = Helper methods
@@ -69,8 +68,7 @@ protected:
   void obtainProxyConsumer (void);
 
   // Send the event on the event channel.
-  virtual void send_notification (const CORBA::Any& any)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_notification (const CORBA::Any& any);
 
 private:
   /// The ORB reference.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 3cd28485e62..3b09d9d207b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -49,7 +49,6 @@ TAO_RTEventLog_i::~TAO_RTEventLog_i ()
 
 DsLogAdmin::Log_ptr
 TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
     RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
@@ -65,7 +64,6 @@ TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id)
 
 DsLogAdmin::Log_ptr
 TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
     RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
@@ -81,7 +79,6 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
 
 void
 TAO_RTEventLog_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   notifier_->object_deletion (logid_);
 
@@ -107,7 +104,6 @@ TAO_RTEventLog_i::activate (void)
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 TAO_RTEventLog_i::for_consumers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->event_channel_->for_consumers();
 }
@@ -115,9 +111,6 @@ TAO_RTEventLog_i::for_consumers (void)
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_RTEventLog_i::for_suppliers (
     )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->event_channel_->for_suppliers();
 }
@@ -125,10 +118,6 @@ TAO_RTEventLog_i::for_suppliers (
 RtecEventChannelAdmin::Observer_Handle
 TAO_RTEventLog_i::append_observer (
        RtecEventChannelAdmin::Observer_ptr observer)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->observer_strategy_->append_observer (observer);
 }
@@ -136,10 +125,6 @@ TAO_RTEventLog_i::append_observer (
 void
 TAO_RTEventLog_i::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->observer_strategy_->remove_observer (handle);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 01f965c729a..de0a2a0f37d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -72,17 +72,14 @@ public:
   ~TAO_RTEventLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id);
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
-    ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException));
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  destroy (void);
 
   /// Activate the RTEventLog.
   void
@@ -90,25 +87,15 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel interface methods.
   RtecEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  for_consumers (void);
 
   RtecEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  for_suppliers (void);
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+      append_observer (RtecEventChannelAdmin::Observer_ptr);
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+      remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
  private:
   /// The EventChannel used.
diff --git a/TAO/orbsvcs/orbsvcs/Metrics.idl b/TAO/orbsvcs/orbsvcs/Metrics.idl
deleted file mode 100644
index 00e87c7f87a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics.idl
+++ /dev/null
@@ -1,331 +0,0 @@
-// $Id$
-
-#ifndef METRICS_IDL
-#define METRICS_IDL
-
-#include "TimeBase.idl"
-#include "RtecScheduler.idl"
-#pragma prefix ""
-
-module Metrics
-{
-  // Types
-
-  enum TIMEPROBE_EVENT_TYPE
-  {
-    WORK_START,
-    WORK_STOP,
-    WORK_SUSPEND,
-    WORK_RESUME
-  };
-
-  typedef TIMEPROBE_EVENT_TYPE TIMEPROBE_EVENT_TYPE_t;
-
-  typedef TimeBase::TimeT Time;  // time type
-  typedef sequence<RtecScheduler::handle_t> Handle_Set_t;  // handle sequence
-
-  struct QoSParameter_t
-    // = TITLE
-    //   Describes the monitored QoS for an "RT_Operation".
-    //
-    // = DESCRIPTION
-    //   The deadline success and failure counts for an operation.
-  {
-    RtecScheduler::handle_t handle;
-    // The handle of the operation for which the information is stored
-
-    string entry_point;
-    // The name of the operation for which the information is stored
-
-    unsigned long deadlines_made;
-    // The number of deadlines successfully met.
-
-    unsigned long deadlines_missed;
-    // The number of deadlines missed.
-
-    unsigned long operations_cancelled;
-    // The number of operations cancelled.
-
-    short is_hrt;
-    // Indicates whether or not the operation is hard real-time.
-  };
-
-  typedef sequence<QoSParameter_t> QoSParameter_Set;
-
-
-  struct QoSData
-    // = TITLE
-    //   Describes the monitored QoS for the visualization browser.
-    //
-    // = DESCRIPTION
-    //   Aggregate success, failure, and cancellation counts the operations.
-  {
-    long hrt_deadlines_made;
-    // The number of hard real-time deadlines successfully met.
-
-    long hrt_deadlines_missed;
-    // The number of hard real-time deadlines missed.
-
-    long hrt_operations_cancelled;
-    // The number of hard real-time operations that were cancelled.
-
-    long srt_deadlines_made;
-    // The number of soft real-time deadlines successfully met.
-
-    long srt_deadlines_missed;
-    // The number of soft real-time deadlines missed.
-
-    long srt_operations_cancelled;
-    // The number of soft real-time operations that were cancelled.
-  };
-
-  struct UtilData
-    // = TITLE
-    //   Describes the monitored QoS for the visualization browser.
-    //
-    // = DESCRIPTION
-    //   Aggregate success, failure, and cancellation counts the operations.
-  {
-    double hrt_op_utilization;
-    // The percentage of the time spent in hard real-time operations.
-
-    double srt_op_utilization;
-    // The percentage of the time spent in soft real-time operations.
-
-    double queue_utilization;
-    // The percentage of the time spent managing queues.
-  };
-
-  struct ProbeIdentity_t
-    // = TITLE
-    //   Describes the identity of a timeprobe.
-    //
-    // = DESCRIPTION
-    //   The name and identifier for a timeprobe.
-  {
-    unsigned long probe_id;
-    // The unique identifier for the timeprobe.
-
-    string probe_name;
-    // The name of the timeprobe.
-  };
-
-  typedef sequence<ProbeIdentity_t> ProbeIdentity_Set;
-
-  struct TimeprobeParameter_t
-    // = TITLE
-    //   Describes the monitored data for a timeprobe.
-    //
-    // = DESCRIPTION
-    //   The duration of an interval for a timeprobe.
-  {
-    unsigned long probe_id;
-    // The name of the timeprobe that collected the data.
-
-    short is_operation;
-    // Indicates whether or not the data are for an operation.
-
-    short is_hrt;
-    // Indicates whether or not an operation is hard real-time.
-
-    short is_full_interval;
-    // Indicates whether or not the time reported is for the entire
-    // interval measured by the time probe.
-
-    short cross_thread_probe;
-    // Indicates whether or not the time reported is for the entire
-    // interval measured by the time probe.
-
-    Time start_event_time;
-    // The start of the event for sorting purposes.
-
-    Time stop_event_time;
-    // The start of the event for sorting purposes.
-
-    Time interval;
-    // The elapsed time within the timeprobe.
-  };
-
-  typedef sequence<TimeprobeParameter_t> TimeprobeParameter_Set;
-
-
-  // Exceptions
-
-  exception SYNCHRONIZATION {};
-  // A synchronization error occurred in a method.
-
-  exception INTERNAL {};
-  // An error occurred in an internal data structure.
-
-  exception INTERNAL_0 {};
-  exception INTERNAL_1 {};
-  exception INTERNAL_2 {};
-  exception INTERNAL_3 {};
-  exception INTERNAL_4 {};
-  exception INTERNAL_5 {};
-  exception INTERNAL_6 {};
-  exception INTERNAL_7 {};
-  exception INTERNAL_8 {};
-  // These are to track down an infrequently reproducible
-  // error, and should be removed eventually.
-
-  exception NIL_LOGGER {};
-  // An operation was passed a nil logger pointer.
-
-  // Interfaces
-
-  interface QoSLogger
-    // = TITLE
-    //   This interface provides access to a QoS logger.
-    //
-    // = DESCRIPTION
-    //   This interface allows clients log monitored QoS information.
-  {
-    oneway void send_banner (in string banner);
-    // Sends a banner to the  logger, which is recorded in the
-    // output log and communicated to the visualization browser.
-
-    oneway void log_aggregate_QoS (in Metrics::QoSParameter_Set qos_set,
-                                   in Time interval);
-    // Reports the aggregate QoS information for all operations
-    // to the passed QoS logger.
-
-    oneway void set_identities (in Metrics::ProbeIdentity_Set identity_set);
-    // Binds the names of various timeprobes to their identifiers so 
-    // that ids alone can be used (for efficiency) in passing data.
-
-    oneway void set_identity (in Metrics::ProbeIdentity_t identity);
-    // Binds the names of various timeprobes to their identifiers so 
-    // that ids alone can be used (for efficiency) in passing data.
-
-    oneway void log_timeprobe_data (in Metrics::TimeprobeParameter_Set data_set,
-                                    in Time interval);
-    // Reports timeprobe data collected since last run.
-  };
-
-
-  interface QoSMonitor
-    // = TITLE
-    //   This interface provides access to a QoS data monitor.
-    //
-    // = DESCRIPTION
-    //   This interface allows objects to store and query monitored
-    //   QoS information.
-  {
-    void report_made_deadline (in RtecScheduler::handle_t handle)
-      raises (INTERNAL_0);
-    // Report a successful upcall.
-
-    void report_missed_deadline (in RtecScheduler::handle_t handle)
-      raises (INTERNAL_1);
-    // Report an unsuccessful upcall.
-
-    void reset_statistics (in RtecScheduler::handle_t handle)
-      raises (INTERNAL_7, INTERNAL_8);
-    // Resets the aggregate QoS information for the given
-    // operation handle.
-
-    void get_aggregate_QoS (in RtecScheduler::handle_t handle,
-                            out Metrics::QoSParameter_t qos)
-      raises (INTERNAL_2, INTERNAL_3);
-    // Retrieves the aggregate QoS information for the given
-    // operation handle.
-
-    void get_aggregate_QoS_set (in Metrics::Handle_Set_t handle_set,
-                                out Metrics::QoSParameter_Set qos_set)
-      raises (INTERNAL_4, INTERNAL_5);
-    // Retrieves the aggregate QoS information for all operations
-    // in the passed handle set.
-  };
-
-
-  interface ReportingQoSMonitor : QoSMonitor
-    // = TITLE
-    //   This interface provides access to a QoS data monitor.
-    //
-    // = DESCRIPTION
-    //   This interface allows objects to report monitored
-    //   QoS information to a QoS logger.
-  {
-    void report_aggregate_QoS (in Metrics::QoSLogger logger,
-                               in Metrics::Time interval)
-      raises (NIL_LOGGER, INTERNAL_6);
-    // Reports the aggregate QoS information for all operations
-    // to the passed QoS logger.
-  };
-
-  interface FrameManager
-    // = TITLE
-    //   This interface provides access to a QoS data monitor.
-    //
-    // = DESCRIPTION
-    //   This interface allows objects to query or report monitored
-    //   QoS information that was collected by QoS monitoring adapters.
-  {
-    short register_period (in RtecScheduler::Period_t p)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Binds the period to the internal frame map, with a new frame data
-    // structure.  Returns 0 if a new entry is bound successfully,
-    // returns 1 if an attempt is made to bind an existing entry, and
-    // returns -1 if failures occur.
-
-    short update_all_frames_with_time (in Time tv)
-      raises (SYNCHRONIZATION);
-    // Updates time frames, based on the passed time value.
-
-    short update_all_frames ()
-      raises (SYNCHRONIZATION);
-    // Updates time frames, based on the current time as of the call.
-
-    short update_frame_with_time (in RtecScheduler::Period_t p, in Time tv)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Updates the passed period's time frame, based on the passed time
-    // value.
-
-    short update_frame (in RtecScheduler::Period_t p)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Updates the passed period's time frame, based on the current time
-    // as of the call.
-
-    short reset_all_frames_with_time (in Time tv)
-      raises (SYNCHRONIZATION);
-    // Resets time frames, based on the passed time value.
-
-    short reset_all_frames ()
-      raises (SYNCHRONIZATION);
-    // Resets time frames, based on the current time as of the call.
-
-    short reset_frame_with_time (in RtecScheduler::Period_t p, in Time tv)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Resets the passed period's start-of-frame, based on the passed time
-    // value.
-
-    short reset_frame (in RtecScheduler::Period_t p)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Resets the passed period's start-of-frame, based on the current time
-    // as of the call.
-
-    short get_start_time (in RtecScheduler::Period_t p, out Time start)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Gets the start time for the period's current frame.
-
-    short get_end_time (in RtecScheduler::Period_t p, out Time end)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Gets the end time for the period's current frame.
-
-    short get_frame_id (in RtecScheduler::Period_t p, out unsigned long id)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Gets the locally unique identifier for the period's current frame.
-
-    short get_frame_data (in RtecScheduler::Period_t p, out Time start,
-                          out Time end, out unsigned long id)
-      raises (INTERNAL, SYNCHRONIZATION);
-    // Gets the start time, end time, and id for the period's current frame.
-  };
-
-};
-
-#endif /* METRICS_IDL */
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
deleted file mode 100644
index 2cc74f259e0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_CPP
-#define METRICS_FRAME_MANAGER_CPP
-
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.inl"
-#endif /* __ACE_INLINE__ */
-
-
-#endif /* METRICS_FRAME_MANAGER_CPP */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
deleted file mode 100644
index 18be60d8462..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_H
-#define METRICS_FRAME_MANAGER_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Singleton.h"
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecSchedulerC.h"
-
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX>
-TAO_METRICS_FRAME_MGR_TYPE;
-
-typedef ACE_Singleton<TAO_METRICS_FRAME_MGR_TYPE, ACE_SYNCH_MUTEX>
-TAO_METRICS_FRAME_MGR_SINGLETON;
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_FRAME_MANAGER_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
deleted file mode 100644
index bb47ba99272..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_I
-#define METRICS_FRAME_MANAGER_I
-
-
-
-#endif /* METRICS_FRAME_MANAGER_I */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
deleted file mode 100644
index f1380473006..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_T_CPP
-#define METRICS_FRAME_MANAGER_T_CPP
-
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-#endif /* METRICS_FRAME_MANAGER_T_CPP */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
deleted file mode 100644
index 0335c8bf43c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_T_H
-#define METRICS_FRAME_MANAGER_T_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/High_Res_Timer.h"
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/MetricsS.h"
-
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
-
-
-template <class ACE_LOCK>
-struct TAO_Metrics_Frame_Manager_Data
-{
-  // = TITLE
-  //   Defines a class for time frame management data.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <ACE_Time_Value> class to
-  //   store period and endpoint data for a given time frame.
-
-public:
-
-  TAO_Metrics_Frame_Manager_Data (RtecScheduler::Period_t p)
-    : frame_id_ (0), period_ (0, p / 10) {}
-  // Constructor.  Note that p is in hundreds of nanoseconds so we
-  // divide by ten to get microseconds.  The start_ and end_ data
-  // members are set equal to ACE_Time_Value::zero by their own
-  // default constructors.
-
-  CORBA::ULong frame_id_;
-  // Stores the number of previous frames for that period.  May roll
-  // over, but is intended to provide a locally (for a large range of
-  // locality) unique frame identifier.
-
-  ACE_Time_Value period_;
-  // Relative time to the next frame, from the start of this one.
-
-  ACE_Time_Value start_;
-  // Absolute time of the start of the frame and end of the last.
-
-  ACE_Time_Value end_;
-  // Absolute time to the end of the frame and start of the next.
-
-  ACE_LOCK lock_;
-  // Lock for synchronizing access to the data instance.
-};
-
-
-template <class ACE_LOCK>
-class TAO_Metrics_FrameManager : public POA_Metrics::FrameManager
-
-{
-  // = TITLE
-  //   Defines a class that implements a local metrics cache.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <ACE_Metrics_Cache> class to
-  //   implement a cache for local use.
-public:
-
-  typedef TAO_Metrics_FrameManager<ACE_LOCK> TAO_METRICS_FRAME_MANAGER_TYPE;
-  typedef TAO_Metrics_Frame_Manager_Data<ACE_LOCK> TAO_METRICS_FRAME_MANAGER_DATA_TYPE;
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Period_t,
-	                          TAO_METRICS_FRAME_MANAGER_DATA_TYPE *,
-                                  ACE_Hash<RtecScheduler::Period_t>,
-                                  ACE_Equal_To<RtecScheduler::Period_t>,
-                                  ACE_Null_Mutex> METRICS_FRAME_DATA_MAP;
-  // Type of map used for O(1) lookup of monitored data for operations.
-
-  typedef ACE_Hash_Map_Entry<RtecScheduler::Period_t,
-                             TAO_METRICS_FRAME_MANAGER_DATA_TYPE *>
-    METRICS_FRAME_DATA_MAP_ENTRY;
-  // Type of entry in monitor map.
-
-  typedef ACE_Hash_Map_Iterator_Ex<RtecScheduler::Period_t,
-	                           TAO_METRICS_FRAME_MANAGER_DATA_TYPE *,
-                                   ACE_Hash<RtecScheduler::Period_t>,
-                                   ACE_Equal_To<RtecScheduler::Period_t>,
-                                   ACE_Null_Mutex>
-    METRICS_FRAME_DATA_MAP_ITERATOR;
-  // Type of iterator for monitor map.
-
-  TAO_Metrics_FrameManager ();
-  // Constructor.
-
-  ~TAO_Metrics_FrameManager ();
-  // Destructor.
-
-  CORBA::Short register_period (RtecScheduler::Period_t p,
-                                CORBA::Environment &ACE_TRY_ENV
-                                  = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Binds the period to the internal frame map, with a new frame data
-  // structure.  Returns 0 if a new entry is bound successfully,
-  // returns 1 if an attempt is made to bind an existing entry, and
-  // returns -1 if failures occur.
-
-  CORBA::Short update_all_frames (const ACE_Time_Value& tv);
-  // Updates time frames, based on the passed time value.
-
-  CORBA::Short update_all_frames_with_time (Metrics::Time mt,
-                                            CORBA::Environment &ACE_TRY_ENV
-                                              = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION));
-  // Updates time frames, based on the passed time value.
-
-  CORBA::Short update_all_frames (CORBA::Environment &ACE_TRY_ENV
-                                    = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION));
-  // Updates time frames, based on the current time as of the call.
-
-  CORBA::Short update_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv);
-  // Updates the passed period's time frame, based on the passed time
-  // value.
-
-  CORBA::Short update_frame_with_time (RtecScheduler::Period_t p,
-                                       Metrics::Time mt,
-                                       CORBA::Environment &ACE_TRY_ENV
-                                         = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Updates the passed period's time frame, based on the passed time
-  // value.
-
-  CORBA::Short update_frame (RtecScheduler::Period_t p,
-                             CORBA::Environment &ACE_TRY_ENV
-                               = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Updates the passed period's time frame, based on the current time
-  // as of the call.
-
-  CORBA::Short reset_all_frames (const ACE_Time_Value& tv);
-  // Resets time frames, based on the passed time value.
-
-  CORBA::Short reset_all_frames_with_time (Metrics::Time mt,
-                                           CORBA::Environment &ACE_TRY_ENV
-                                             = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION));
-  // Resets time frames, based on the passed time value.
-
-  CORBA::Short reset_all_frames (CORBA::Environment &ACE_TRY_ENV
-                                   = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION));
-  // Resets time frames, based on the current time as of the call.
-
-  CORBA::Short reset_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv);
-  // Resets the passed period's start-of-frame, based on the passed time
-  // value.
-
-  CORBA::Short reset_frame_with_time (RtecScheduler::Period_t p,
-                                      Metrics::Time mt,
-                                      CORBA::Environment &ACE_TRY_ENV
-                                        = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Resets the passed period's start-of-frame, based on the passed time
-  // value.
-
-  CORBA::Short reset_frame (RtecScheduler::Period_t p,
-                            CORBA::Environment &ACE_TRY_ENV
-                              = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Resets the passed period's start-of-frame, based on the current time
-  // as of the call.
-
-  CORBA::Short get_start_time (RtecScheduler::Period_t p, ACE_Time_Value &start);
-  // Gets the start time for the period's current frame.
-
-  CORBA::Short get_start_time (RtecScheduler::Period_t p,
-                               Metrics::Time &start,
-                               CORBA::Environment &ACE_TRY_ENV
-                                 = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Gets the start time for the period's current frame.
-
-  CORBA::Short get_end_time (RtecScheduler::Period_t p, ACE_Time_Value &end);
-  // Gets the end time for the period's current frame.
-
-  CORBA::Short get_end_time (RtecScheduler::Period_t p,
-                             Metrics::Time &end,
-                             CORBA::Environment &ACE_TRY_ENV
-                               = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Gets the end time for the period's current frame.
-
-  CORBA::Short get_frame_id (RtecScheduler::Period_t p,
-                             CORBA::ULong &id,
-                             CORBA::Environment &ACE_TRY_ENV
-                               = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Gets the locally unique identifier for the period's current frame.
-
-  CORBA::Short get_frame_data (RtecScheduler::Period_t p, ACE_Time_Value &start,
-                      ACE_Time_Value &end, CORBA::ULong &id);
-  // Gets the start time, end time, and id period's current frame.
-
-  CORBA::Short get_frame_data (RtecScheduler::Period_t p,
-                               Metrics::Time &start,
-                               Metrics::Time &end,
-                               CORBA::ULong &id,
-                               CORBA::Environment &ACE_TRY_ENV
-                                 = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION));
-  // Gets the start time, end time, and id period's current frame.
-
-protected:
-
-  CORBA::Short update_data (TAO_Metrics_Frame_Manager_Data<ACE_LOCK> & data,
-                   const ACE_Time_Value& tv);
-  // Updates the passed frame data structure's start and end times,
-  // based on the passed time value.  This is a protected internal
-  // method, and should only be called with locks already held.
-
-
-  CORBA::Short reset_data (TAO_Metrics_Frame_Manager_Data<ACE_LOCK> & data,
-                  const ACE_Time_Value& tv);
-  // Resets the passed frame data structure's start and end times, to
-  // the passed time value and one period later, respectively.  This
-  // is a protected internal method, and should only be called with
-  // locks already held.
-
-  METRICS_FRAME_DATA_MAP frame_data_map_;
-  // Maps periods to frame data.
-
-  // Count of the number of registered periods.
-  u_long period_count_;
-
-  ACE_LOCK lock_;
-  // Lock for synchronizing access to the map.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Metrics_FrameManager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* METRICS_FRAME_MANAGER_T_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
deleted file mode 100644
index a14671b359e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
+++ /dev/null
@@ -1,821 +0,0 @@
-// $Id$
-
-#ifndef METRICS_FRAME_MANAGER_T_I
-#define METRICS_FRAME_MANAGER_T_I
-
-
-////////////////////////////////////
-// Class TAO_Metrics_FrameManager //
-////////////////////////////////////
-
-
-// Default constructor.
-
-template <class ACE_LOCK>
-ACE_INLINE
-TAO_Metrics_FrameManager<ACE_LOCK>::
-TAO_Metrics_FrameManager ()
-  : period_count_ (0)
-{
-	  // Ensure that the high res timer global scale factor
-	  // is set before any of its static methods are used
-	  ACE_High_Res_Timer::global_scale_factor ();
-}
-
-// Destructor.  Note: this is *not* thread safe.  If we're destroying
-// the frame manager then there had better not be any threads in the
-// manager anyway.  If a use case requires thread safety at
-// destruction, then some kind of external reader-writer locking and
-// barrier synchronization scheme will be needed to make this work
-// efficiently.
-
-template <class ACE_LOCK>
-ACE_INLINE
-TAO_Metrics_FrameManager<ACE_LOCK>::
-~TAO_Metrics_FrameManager ()
-{
-  // Iterate through and delete the data structures in the map
-  METRICS_FRAME_DATA_MAP_ITERATOR iter (frame_data_map_);
-  while (iter.done () == 0)
-    {
-      delete (*iter).int_id_;
-      ++iter;
-    }
-}
-
-
-// Binds the period to the internal frame map, with a new frame data
-// structure.  Returns 0 if a new entry is bound successfully, returns
-// 1 if an attempt is made to bind an existing entry, and returns -1
-// if failures occur.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-register_period (RtecScheduler::Period_t p,
-                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case: no need to register, but
-  // no harm if someone tries.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  // Synchronize read/write access to the map while the new period's
-  // frame is being installed.
-  ACE_Write_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  int result = 0;
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data = 0;
-  if (frame_data_map_.find (p) != 0)
-    {
-      ACE_NEW_RETURN (data, TAO_Metrics_Frame_Manager_Data<ACE_LOCK> (p), -1);
-      result = frame_data_map_.trybind (p, data);
-      if (result == 0)
-        {
-          // All is well: count the new period.
-          ++period_count_;
-        }
-      else
-        {
-		  delete data;
-
-          // We failed to bind: throw an exception.
-          ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-        }
-    }
-
-  return result;
-}
-
-// Updates time frames, based on the passed time value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_all_frames (const ACE_Time_Value& tv)
-{
-  // Synchronize read/write access to the map while the new frames are
-  // being computed.
-  ACE_Write_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  METRICS_FRAME_DATA_MAP_ITERATOR iter (frame_data_map_);
-  while (iter.done () == 0)
-    {
-      update_data (*((*iter).int_id_), tv);
-      ++iter;
-    }
-  return 0;
-}
-
-
-// Updates time frames, based on the passed time value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_all_frames_with_time (Metrics::Time mt,
-                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  ORBSVCS_Time::TimeT_to_Time_Value(tv, mt);
-  if (this->update_all_frames (tv) < 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  return 0;
-}
-
-// Updates time frames, based on the current time as of the call.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_all_frames (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Synchronize read/write access to the map while the new frames are
-  // being computed.
-  ACE_Write_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  METRICS_FRAME_DATA_MAP_ITERATOR iter (frame_data_map_);
-
-  // Grab the common time stamp as late as possible, i.e., after all
-  // locks are held.
-  ACE_Time_Value tv;
-  ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
-  ACE_High_Res_Timer::hrtime_to_tv (tv, hrtime_now);
-
-  while (iter.done () == 0)
-    {
-      update_data (*((*iter).int_id_), tv);
-      ++iter;
-    }
-  return 0;
-}
-
-
-// Updates the passed period's time frame, based on the passed time
-// value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv)
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during pointer lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize read/write access to the specific data structure
-      // instance during update
-      ACE_Write_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          return -1;
-        }
-      return update_data (*data, tv);
-    }
-
-  return -2;
-}
-
-// Updates the passed period's time frame, based on the passed time
-// value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt,
-                        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  ORBSVCS_Time::TimeT_to_Time_Value(tv, mt);
-  switch (this->update_frame (p, tv))
-    {
-      case -1: ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-      case -2: ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      default: return 0;      
-    }
-}
-
-
-// Updates the passed period's time frame, based on the current time
-// as of the call.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during pointer lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize read/write access to the specific data structure instance during
-      // update
-      ACE_Write_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-        }
-
-      // Grab the time stamp as late as possible, i.e., after all locks
-      // are held.
-      ACE_Time_Value tv;
-      ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
-      ACE_High_Res_Timer::hrtime_to_tv (tv, hrtime_now);
-
-      return update_data (*data, tv);
-    }
-
-  ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-}
-
-
-// Resets time frames, based on the passed time value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_all_frames (const ACE_Time_Value& tv)
-{
-  // Synchronize read/write access to the map during the reset
-  ACE_Write_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  METRICS_FRAME_DATA_MAP_ITERATOR iter (frame_data_map_);
-  while (iter.done () == 0)
-    {
-      reset_data (*((*iter).int_id_), tv);
-      ++iter;
-    }
-  return 0;
-}
-
-
-// Resets time frames, based on the passed time value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_all_frames_with_time (Metrics::Time mt,
-                            CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  ORBSVCS_Time::TimeT_to_Time_Value(tv, mt);
-  if (this->reset_all_frames (tv) < 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  return 0;
-}
-
-// Resets time frames, based on the current time as of the call.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_all_frames (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Synchronize read/write access to the map during the reset
-  ACE_Write_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  METRICS_FRAME_DATA_MAP_ITERATOR iter (frame_data_map_);
-
-  // Grab the time stamp as late as possible, i.e., after all locks
-  // are held.
-  ACE_Time_Value tv;
-  ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
-  ACE_High_Res_Timer::hrtime_to_tv (tv, hrtime_now);
-
-  while (iter.done () == 0)
-    {
-      reset_data (* ((*iter).int_id_), tv);
-      ++iter;
-    }
-  return 0;
-}
-
-
-// Resets the passed period's start-of-frame, based on the passed time
-// value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv)
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize read/write access to the individual data
-      // structure instance during reset
-      ACE_Write_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          return -1;
-        }
-
-      return reset_data (*data, tv);
-    }
-
-  return -2;
-}
-
-// Resets the passed period's start-of-frame, based on the passed time
-// value.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt,
-                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  ORBSVCS_Time::TimeT_to_Time_Value(tv, mt);
-  switch (this->reset_frame (p, tv))
-    {
-      case -1: ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-      case -2: ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      default: return 0;      
-    }
-}
-
-
-// Resets the passed period's start-of-frame, based on the current
-// time as of the call.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize read/write access to the individual data
-      // structure instance during reset
-      ACE_Write_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-        }
-
-      // Grab the time stamp as late as possible, i.e., after all locks
-      // are held.
-    ACE_Time_Value tv;
-    ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
-    ACE_High_Res_Timer::hrtime_to_tv (tv, hrtime_now);
-
-    if (data == 0)
-      {
-        ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      }
-
-    return reset_data (*data, tv);
-  }
-
-  ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-}
-
-
-// Gets the start time for the period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_start_time (RtecScheduler::Period_t p, ACE_Time_Value &start)
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      start = ACE_Time_Value::zero;
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize write access to the individual data structure instance
-      ACE_Read_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          return -1;
-        }
-
-      start.set (data->start_.sec (), data->start_.usec ());
-      return 0;
-    }
-
-  return -2;
-}
-
-// Gets the start time for the period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_start_time (RtecScheduler::Period_t p, Metrics::Time &start,
-                CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      start = 0;
-      return 0;
-    }
-
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  switch (this->get_start_time (p, tv))
-    {
-      case -1: ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-      case -2: ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      default: ORBSVCS_Time::Time_Value_to_TimeT (start, tv);
-               return 0;      
-    }
-}
-
-
-// Gets the end time for the period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_end_time (RtecScheduler::Period_t p, ACE_Time_Value &end)
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      end = ACE_Time_Value::zero;
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data = 0;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize write access to the individual data structure instance
-      ACE_Read_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          return -1;
-        }
-
-      end.set (data->end_.sec (), data->end_.usec ());
-      return 0;
-    }
-
-  return -2;
-}
-
-
-// Gets the end time for the period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_end_time (RtecScheduler::Period_t p, Metrics::Time &end,
-              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      end = 0;
-      return 0;
-    }
-
-  // Reentrant method that calls locked method.
-  ACE_Time_Value tv;
-  switch (this->get_end_time (p, tv))
-    {
-      case -1: ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-      case -2: ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      default: ORBSVCS_Time::Time_Value_to_TimeT (end, tv);
-               return 0;      
-    }
-}
-
-// Gets the locally unique identifier for the period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_frame_id (RtecScheduler::Period_t p,
-              CORBA::ULong &id,
-              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      id = 0;
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize write access to the individual data structure instance
-      ACE_Read_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-        }
-
-      id = data->frame_id_;
-      return 0;
-    }
-
-  ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-}
-
-
-// Gets the start time, end time, and id period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_frame_data (RtecScheduler::Period_t p, ACE_Time_Value &start,
-                ACE_Time_Value &end, CORBA::ULong &id)
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      start = ACE_Time_Value::zero;
-      end = ACE_Time_Value::zero;
-      id = 0;
-      return 0;
-    }
-
-  TAO_Metrics_Frame_Manager_Data<ACE_LOCK> * data;
-
-  // Synchronize write access to the map during lookup only
-  ACE_Read_Guard<ACE_LOCK> mon (this->lock_);
-  if (mon.locked () == 0)
-    {
-      return -1;
-    }
-
-  if (frame_data_map_.find (p, data) == 0 && data != 0)
-    {
-      mon.release ();
-
-      // Synchronize write access to the individual data structure instance
-      ACE_Read_Guard<ACE_LOCK> data_mon (data->lock_);
-      if (data_mon.locked () == 0)
-        {
-          return -1;
-        }
-
-      start.set (data->start_.sec (), data->start_.usec ());
-      end.set (data->end_.sec (), data->end_.usec ());
-      id = data->frame_id_;
-      return 0;
-    }
-
-  return -2;
-}
-
-
-
-// Gets the start time, end time, and id period's current frame.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-get_frame_data (RtecScheduler::Period_t p, Metrics::Time &start,
-                Metrics::Time &end, CORBA::ULong &id,
-                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL,
-                     Metrics::SYNCHRONIZATION))
-{
-  // Treat a zero period as a special case.
-  if (p == 0)
-    {
-      start = 0;
-      end = 0;
-      id = 0;
-      return 0;
-    }
-
-  // Reentrant method that calls locked method.
-  ACE_Time_Value start_tv, end_tv;
-  switch (this->get_frame_data (p, start_tv, end_tv, id))
-    {
-      case -1: ACE_THROW_RETURN (Metrics::SYNCHRONIZATION (), -1);
-      case -2: ACE_THROW_RETURN (Metrics::INTERNAL (), -1);
-      default: ORBSVCS_Time::Time_Value_to_TimeT (start, start_tv);
-               ORBSVCS_Time::Time_Value_to_TimeT (end, end_tv);
-               return 0;
-    }
-}
-
-
-// Updates the passed frame data structure's start and end times,
-// based on the passed time value.  This is a protected internal
-// method, and should only be called with locks already held.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-update_data (TAO_Metrics_Frame_Manager_Data<ACE_LOCK> & data, const ACE_Time_Value& tv)
-{
-  if (data.end_ == ACE_Time_Value::zero)
-    {
-      return reset_data (data, tv);
-    }
-
-  // Advance to the frame that encloses the passed time value.
-  while (data.end_ < tv)
-    {
-      data.end_ += data.period_;
-      ++data.frame_id_;
-    }
-
-  data.start_.set (data.end_.sec (), data.end_.usec ());
-  data.start_ -= data.period_;
-  return 0;
-}
-
-
-// Resets the passed frame data structure's start and end times, to
-// the passed time value and one period later, respectively.  This is
-// a protected internal method, and should only be called with locks
-// already held.
-
-template <class ACE_LOCK>
-ACE_INLINE CORBA::Short
-TAO_Metrics_FrameManager<ACE_LOCK>::
-reset_data (TAO_Metrics_Frame_Manager_Data<ACE_LOCK> & data, const ACE_Time_Value& tv)
-{
-  data.start_.set (tv.sec (), tv.usec ());
-  data.end_.set (tv.sec () + data.period_.sec (),
-                 tv.usec () + data.period_.usec ());
-  return 0;
-}
-
-
-#endif /* METRICS_FRAME_MANAGER_T_I */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
deleted file mode 100644
index de45d6fb8ca..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef METRICS_LOCAL_CACHE_CPP
-#define METRICS_LOCAL_CACHE_CPP
-
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* METRICS_LOCAL_CACHE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
deleted file mode 100644
index 2546ff7d414..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef METRICS_LOCAL_CACHE_H
-#define METRICS_LOCAL_CACHE_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/Hash_Map_Manager.h"
-#include "ace/Metrics_Cache.h"
-#include "ace/Metrics_Cache_T.h"
-#include "ace/Singleton.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/MetricsC.h"
-
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef TAO_Metrics_LocalCache<ACE_SYNCH_MUTEX, ACE_New_Allocator>
-TAO_METRICS_CACHE_TYPE;
-
-typedef ACE_Singleton<TAO_METRICS_CACHE_TYPE, ACE_SYNCH_MUTEX>
-TAO_METRICS_CACHE_SINGLETON_TYPE;
-
-typedef TAO_Metrics_ReportingLocalCache<ACE_SYNCH_MUTEX, ACE_New_Allocator>
-TAO_METRICS_REPORTING_CACHE_TYPE;
-
-typedef ACE_Singleton<TAO_METRICS_REPORTING_CACHE_TYPE, ACE_SYNCH_MUTEX>
-TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE;
-
-#if defined (TAO_USES_REPORTING_METRICS)
-typedef TAO_METRICS_REPORTING_CACHE_TYPE TAO_METRICS_CACHE;
-typedef TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE TAO_METRICS_CACHE_SINGLETON;
-#else
-typedef TAO_METRICS_CACHE_TYPE TAO_METRICS_CACHE;
-typedef TAO_METRICS_CACHE_SINGLETON_TYPE TAO_METRICS_CACHE_SINGLETON;
-#endif
-
-/**
- * NOTE: This is a simple macro which calls the appropriate registration function with the cache to
- *       store the data from this pointer. At the ACE level there is no need to give a PROBE_TYPE
- *       because there is only one probe type (ACE_Timeprobe).
- *
- * USAGE_LEVEL: TAO
- *
- * Q1: Where is this and the next macro used? One example is on TAO/orbsvcs/orbsvcs/Metrics. No where in the ace code.
- *    So is this a ACE or TAO macro? 
- *
- * Q2: Is the function (register + METRICS_REGION) a ACE or TAO?
- * A2: TAO. Define in Metrics_Local_Cache_T.h. The only METRICS_REGION that exists is 'base_metrics'. Used
- *     in $TAO_ROOT/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
- *
- * @param METRICS_PTR - Initialized pointer to the Metrics_Cache. This pointer is used to register the probe
- *                      with the associated cache.
- * @param METIRCS_REGION - At present there is only one 'base_metrics'.
- * @param PROBE_NAME - String name of the probe
- * @param PROBE_TYPE - Unsigned integer representing the probe type
- * @param METRICS_HANDLE - Variable used to contain the metrics probe handle that is the result of this function
- *                         The type of the handle is a RtecScheduler::handle_t
- */
-#  define REGISTER_METRICS_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_HANDLE) \
-do { if((METRICS_PTR->metrics_enabled())) { \
-METRICS_HANDLE = METRICS_PTR-> \
-register_##METRICS_REGION ( \
-PROBE_NAME, \
-PROBE_TYPE); \
-} } while (0)
-
-/**
- * Same as above but instead of just reporting information to a cache there is also reference to a Metrics_Loger (TAO feature).
- * The logger is used to record the information. The type of probe is register with the logger
- *
- * USAGE_LEVEL: TAO
- */
-#  define REGISTER_METRICS_REPORTING_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_LOGGER_REF,METRICS_HANDLE) \
-do { if((METRICS_PTR->metrics_enabled())) { \
-METRICS_HANDLE = METRICS_PTR-> \
-register_##METRICS_REGION## ( \
-PROBE_NAME, \
-PROBE_TYPE, \
-METRICS_LOGGER_REF); \
-} } while (0)
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-#include /**/ "ace/post.h"
-
-#endif /* METRICS_LOCAL_CACHE_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
deleted file mode 100644
index a9ccf1b5acd..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#ifndef METRICS_LOCAL_CACHE_I
-#define METRICS_LOCAL_CACHE_I
-
-#endif /* METRICS_LOCAL_CACHE_I */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
deleted file mode 100644
index 2478ce10532..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// $Id$
-
-#ifndef METRICS_LOCAL_CACHE_T_CPP
-#define METRICS_LOCAL_CACHE_T_CPP
-
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.h"
-
-#if defined VXWORKS
-#include <cacheLib.h>
-#endif
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-//////////////////////////////////////
-// Class TAO_Metrics_LocalTimeprobe //
-//////////////////////////////////////
-
-// Default constructor.
-
-template <class ACE_LOCK, class ALLOCATOR>
-TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR>::
-TAO_Metrics_LocalTimeprobe (u_int id,
-                            const char *name,
-                            u_long size,
-                            ALLOCATOR * alloc)
-  : ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> (alloc, id, name, size),
-    is_operation_ (0),
-    is_hrt_ (0),
-    data_set_ (0)
-{
-}
-
-template <class ACE_LOCK, class ALLOCATOR>
-void
-TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR>::report_intervals (int report_full_interval_times)
-{
-   u_long data_set_length = 0;
-
-   // Modified by BRM.  This should also work for ACE_Based_Pointer since the conversion
-   // operator should fire.
-   //  Metrics::TimeprobeParameter_Set * data_set = data_set_.addr ();
-   Metrics::TimeprobeParameter_Set * data_set = data_set_;
-
-   //ACE_Time_Value full_start_time (ACE_Time_Value::zero);
-   ACE_hrtime_t full_start_time = 0;
-   //ACE_Time_Value full_stop_time (ACE_Time_Value::zero);
-   ACE_hrtime_t full_stop_time = 0;
-
-   if (!data_set)
-   {
-#if defined (METRICS_CACHE_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_LocalTimeprobe::report_intervals:"
-                  " no data set installed"));
-#endif
-      return;
-   }
-   else
-   {
-      data_set_length = data_set->length ();
-   }
-
-   if (this->current_size_ == 0 && this->report_buffer_full_ == 0)
-      return;
-
-   u_long valid_intervals = 0;
-   int good_interval;
-
-   // Note the case of current_size_ and report_buffer_full_ both being
-   // 0 was checked above, which simplifies this code.
-   // This logic make no sense to me.  What are you going for here, Chris?
-   // If the buffer fills, then report_buffer_full == 1, and current size == 0.
-   // We always needs i to start at 0, though?????
-   //  u_long i;
-   //  i = (report_buffer_full_ == 0) ? 1 : this->current_size_;
-   u_long start_evt_ndx = 0;
-   u_long full_interval_start_evt_ndx = 0;
-   u_long full_interval_start_ndx_set = 0;
-   u_long stop_evt_ndx = 0;
-   short any_cross_thread_event = 0;
-   short is_cross_thread_event = 0;
-   do
-   {
-      // Begin a new interval at each successive start event.
-      if (is_event (this->timeprobes ()[start_evt_ndx],
-                    ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_START))
-      {
-         // If we see the start event, then reset the cross thread indicator
-         is_cross_thread_event = 0;
-
-         if (!full_interval_start_ndx_set)
-         {
-            full_interval_start_ndx_set = 1;
-            full_interval_start_evt_ndx = start_evt_ndx;
-         }
-
-         // Accumulates elapsed time in the measured interval, taking
-         // into account paired suspend and resume markers.
-         ACE_Time_Value elapsed_time (ACE_Time_Value::zero);
-
-         // Stores current start time: either from a start or resume event.
-         ACE_Time_Value start_time (this->timeprobes ()[start_evt_ndx].time_);
-
-         // Check if this start time is less than the full interval for worse
-         // case time.
-         if (full_start_time == 0 ||
-             this->timeprobes ()[start_evt_ndx].time_ < full_start_time)
-         {
-            full_start_time = this->timeprobes ()[start_evt_ndx].time_;
-         }
-         if (full_stop_time == 0 ||
-             this->timeprobes ()[start_evt_ndx].time_ > full_stop_time)
-         {
-            full_stop_time = this->timeprobes ()[start_evt_ndx].time_;
-         }
-
-         good_interval = 1;
-
-         // Increment past the start event and start looking for the stop event
-         u_long stop_or_suspend_evt_ndx = (start_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-         do
-         {
-            // If the index is at the end, skip and exit the loop.
-            if (stop_or_suspend_evt_ndx == this->current_size_)
-            {
-               break;
-            }
-
-            // This needs to be rethought...  Events that occur across threads are a real thing.
-            // So for now, the behavior is to just indicate the events that are cross thread
-//            if (this->timeprobes ()[start_evt_ndx].thread_ != this->timeprobes ()[stop_or_suspend_evt_ndx].thread_)
-//            {
-//               stop_or_suspend_evt_ndx = (stop_or_suspend_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-//               continue;
-//            }
-
-            // Check for the stop event
-            if (is_event (this->timeprobes ()[stop_or_suspend_evt_ndx],
-              ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_STOP))
-            {
-               ++valid_intervals;
-
-              if (this->timeprobes ()[start_evt_ndx].thread_ != this->timeprobes ()[stop_or_suspend_evt_ndx].thread_)
-              {
-                 // If any probe is cross, thread then the interval is cross thread.
-                 any_cross_thread_event = 1;
-
-                 is_cross_thread_event = 1;
-              }
-
-              // done this way for efficiency: no temporaries constructed
-              elapsed_time += this->timeprobes ()[stop_or_suspend_evt_ndx].time_;
-              elapsed_time -= start_time;
-
-               // This doesn't make sense.  Full start time better be the result of
-               // a start event.
-//               if (full_start_time == ACE_Time_Value::zero ||
-//                   this->timeprobes ()[j].time_ < full_start_time)
-//               {
-//                  full_start_time.set (this->timeprobes()[j].time_.sec (),
-//                     this->timeprobes()[j].time_.usec());
-//               }
-
-              if (full_stop_time == 0 ||
-                  this->timeprobes ()[stop_or_suspend_evt_ndx].time_ > full_stop_time)
-              {
-                 full_stop_time = this->timeprobes()[stop_or_suspend_evt_ndx].time_;
-              }
-
-              stop_evt_ndx = stop_or_suspend_evt_ndx;
-              // Increase the length of the data set and record
-              // the interval info.
-              ++data_set_length;
-              data_set->length (data_set_length);
-              (*(data_set))[data_set_length-1].is_full_interval = 0;
-              (*(data_set))[data_set_length-1].probe_id = this->id_;
-              (*(data_set))[data_set_length-1].is_operation = this->is_operation_;
-              (*(data_set))[data_set_length-1].is_hrt = this->is_hrt_;
-              (*(data_set))[data_set_length-1].cross_thread_probe = is_cross_thread_event;
-              ORBSVCS_Time::Time_Value_to_TimeT
-                  ((*(data_set)) [data_set_length-1].start_event_time,
-                   this->timeprobes ()[start_evt_ndx].time_);
-              ORBSVCS_Time::Time_Value_to_TimeT
-                  ((*(data_set)) [data_set_length-1].stop_event_time,
-                   this->timeprobes ()[stop_or_suspend_evt_ndx].time_);
-              ORBSVCS_Time::Time_Value_to_TimeT
-                 ((*(data_set)) [data_set_length-1].interval,
-                 elapsed_time);
-#if defined (METRICS_CACHE_DEBUG_OUTPUT_ENABLED)
-              ACE_OS::printf (" %9lu\n",
-                 (u_long)
-                 ACE_U64_TO_U32((*(data_set))
-                 [data_set_length-1].interval
-                 / 10));
-#endif
-              break;
-           }
-
-            // If it wasn't a stop event, check for a suspend event
-#if defined (ACE_HAS_METRICS_BASE_POINTERS)
-            else if (this->timeprobes ()[stop_or_suspend_evt_ndx].event_ == (u_long)
-                     ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_SUSPEND)
-#else
-            else if (this->timeprobes ()[stop_or_suspend_evt_ndx].event_.event_number_ == (u_long)
-                     ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_SUSPEND)
-#endif
-           {
-               u_long resume_evt_ndx = (stop_or_suspend_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-              do
-              {
-                 // Skip until we reach the next event in the same thread, or if the
-                 // index is at the end, skip and exit the loop.
-//                  if (this->timeprobes ()[j].thread_ != this->timeprobes ()[k].thread_
-//                     || k == this->current_size_)
-//                  {
-//                     continue;
-//                  }
-
-                  // If we saw a suspend event, the next event has to be a resume event
-                  if (is_event (this->timeprobes ()[resume_evt_ndx],
-                    ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_RESUME))
-                 {
-                    // Store the elapsed time between the last
-                    // start and the suspend event.
-                    elapsed_time +=
-                        this->timeprobes ()[stop_or_suspend_evt_ndx].time_ - start_time;
-
-                    // Update the start time to be that of the
-                    // resume event.
-                     start_time = this->timeprobes ()[resume_evt_ndx].time_;
-
-                     // This code doesn't make sense here.  It always has to hit the stop to
-                     // adjust the stop time.  Anything else is a partial and invalid.
-//                     if (full_start_time == ACE_Time_Value::zero ||
-//                         this->timeprobes ()[resume_evt_ndx].time_ < full_start_time)
-//                     {
-//                        full_start_time.
-//                           set (this->timeprobes()[resume_evt_ndx].time_.sec (),
-//                                this->timeprobes()[resume_evt_ndx].time_.usec ());
-//                     }
-//                     if (full_stop_time == ACE_Time_Value::zero ||
-//                         this->timeprobes ()[resume_evt_ndx].time_ > full_stop_time)
-//                     {
-//                        full_stop_time.
-//                           set (this->timeprobes()[resume_evt_ndx].time_.sec (),
-//                               this->timeprobes()[resume_evt_ndx].time_.usec ());
-//                          }
-
-
-                    // Keep looking for the end of the interval
-                    // after the resume event.
-                     stop_or_suspend_evt_ndx = resume_evt_ndx;
-                    break;
-                 }
-                  else if (is_event (this->timeprobes ()[resume_evt_ndx],
-                                     ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_START) ||
-                           is_event (this->timeprobes ()[resume_evt_ndx],
-                                     ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_STOP) ||
-                           is_event (this->timeprobes ()[resume_evt_ndx],
-                                     ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_SUSPEND))
-                 {
-                    // Something went wrong during the current interval:
-                    // just ignore the previous start time stamp.
-                    good_interval = 0;
-                    break;
-                 }
-
-                  resume_evt_ndx = (resume_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-
-               } while (resume_evt_ndx != this->current_size_);
-            }
-
-            // If we got a start event, make sure that we don't see another start or resume
-            // until we see a stop or suspend event
-            else if (is_event (this->timeprobes ()[stop_or_suspend_evt_ndx],
-                               ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_START) ||
-                     is_event (this->timeprobes ()[stop_or_suspend_evt_ndx],
-                               ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_RESUME))
-           {
-              // Something went wrong during the current interval:
-              // just ignore the previous start time stamp.
-              break;
-           }
-
-            stop_or_suspend_evt_ndx = (stop_or_suspend_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-
-            } while (stop_or_suspend_evt_ndx != this->current_size_ && good_interval);
-
-            // If we found the stop of
-            start_evt_ndx = stop_or_suspend_evt_ndx;
-        }
-
-        start_evt_ndx = (start_evt_ndx + 1) % this ->max_size_; // Modulus increment: loops around at the end.
-
-    } while (start_evt_ndx < this->current_size_);
-
-
-    if (report_full_interval_times)
-    {
-       // Increase the length of the data set and record the full interval.
-       ++data_set_length;
-       data_set->length (data_set_length);
-       (*(data_set))[data_set_length-1].is_full_interval = 1;
-       (*(data_set))[data_set_length-1].probe_id = this->id_;
-       (*(data_set))[data_set_length-1].is_operation = this->is_operation_;
-       (*(data_set))[data_set_length-1].is_hrt = this->is_hrt_;
-       (*(data_set))[data_set_length-1].cross_thread_probe = any_cross_thread_event;
-       ORBSVCS_Time::Time_Value_to_TimeT
-          ((*(data_set)) [data_set_length-1].start_event_time,
-          this->timeprobes ()[start_evt_ndx].time_);
-       ORBSVCS_Time::Time_Value_to_TimeT
-          ((*(data_set)) [data_set_length-1].stop_event_time,
-          this->timeprobes ()[stop_evt_ndx].time_);
-       ORBSVCS_Time::Time_Value_to_TimeT(
-          (*(data_set))[data_set_length-1].interval,
-          full_stop_time - full_start_time);
-    }
-}
-
-
-// Flush the TAO metrics local timeprobe into shared memory.
-
-template <class ACE_LOCK, class ALLOCATOR>
-void
-TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR>::flush_TAO_Metrics_LocalTimeprobe ()
-{
-// TBD - 1) replace VXWORKS with a nicer ACE/TAO #define
-//       2) provide a general capability to apply an arbitrary
-//          functor to the whole data structure framework (e.g., flush).
-
-#if defined VXWORKS
-  // TBD - implement this
-#endif
-}
-
-
-//////////////////////////////////
-// Class TAO_Metrics_LocalCache //
-//////////////////////////////////
-
-
-template <class ACE_LOCK, class ALLOCATOR>
-void
-TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR>::reset_statistics ()
-{
-  // Call the base class reset method first.
-  this->reset_base_statistics ();
-
-  // Iterate over consumer side base map,
-  // resetting probes.
-  METRICS_BASE_MONITOR_MAP_ITERATOR
-    base_iter (this->base_monitor_maps_ [this->consumer_index_]);
-
-  for (TAO_Metrics_Cache_Data_Base * data_base = 0;
-       base_iter.done () == 0;
-       ++base_iter)
-    {
-          // Modified by BRM.  This should also work for ACE_Based_Pointer since the conversion
-          // operator should fire.
-//          data_base = (*base_iter).int_id_.addr ();
-          data_base = (*base_iter).int_id_;
-      // Modified by BRM.  This should also work for ACE_Based_Pointer since the conversion
-      // operator should fire.
-//      if (data_base.addr ())
-      if (data_base)
-      {
-         data_base->probe.reset ();
-      }
-    }
-
-
-  // Iterate over consumer side monitor map,
-  // resetting counts and probes.
-  METRICS_MONITOR_MAP_ITERATOR data_iter (this->
-                                            monitor_maps_ [this->
-                                                             consumer_index_]);
-  for (TAO_Metrics_Cache_Data * data = 0;
-       data_iter.done () == 0;
-       ++data_iter)
-    {
-          // Modified by BRM.  This should also work for ACE_Based_Pointer since the conversion
-          // operator should fire.
-//          data = (*data_iter).int_id_.addr ();
-          data = (*data_iter).int_id_;
-      if (data)
-        {
-          data->probe.reset ();
-          data->missed_deadlines = 0;
-          data->made_deadlines = 0;
-          data->cancellations = 0;
-        }
-    }
-}
-
-
-// Flush the TAO local metrics cache into shared memory.
-
-template <class ACE_LOCK, class ALLOCATOR>
-void
-TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR>::
-flush_TAO_Metrics_LocalCache ()
-{
-#if defined VXWORKS
-
-  // TBD - fix this: is it complete?
-
-  // TBD - add base metrics map flush
-
-  // TBD - do probes need their own flush method?
-
-  // flush the class
-  // cacheFlush (
-  //   DATA_CACHE,
-  //   this,
-  //   sizeof (TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR>));
-
-  // flush the monitor data map hash table
-  // cacheFlush (DATA_CACHE,
-  //             &monitor_maps_ [this->consumer_index_],
-  //             sizeof (METRICS_MONITOR_MAP));
-
-  // flush the nodes in the monitor data map hash table
-  // and the data stored in the nodes.
-  // METRICS_MONITOR_MAP_ITERATOR data_iter (this->
-  //        monitor_maps_ [this->
-  //                         consumer_index_]);
-  // for (;
-  //      data_iter.done () == 0;
-  //      ++data_iter)
-  //   {
-  //     METRICS_MONITOR_MAP_ENTRY *entry;
-  //     data_iter.next (entry);
-  //     if (entry)
-  //       {
-  //         cacheFlush (DATA_CACHE,
-  //         entry,
-  //         sizeof (METRICS_MONITOR_MAP_ENTRY));
-  //         if (entry->int_id_.addr ())
-  //           {
-  //           cacheFlush (DATA_CACHE,
-  //                       entry->int_id_.addr (),
-  //                       sizeof (TAO_Metrics_Cache_Data));
-  //           }
-  //       }
-  //   }
-
-  // flush the base class probe counts
-  // cacheFlush (DATA_CACHE,
-  //             this->
-  //               enqueue_count_ [this->consumer_index_].addr (),
-  //             this->probe_set_size_ * sizeof (u_long));
-
-  // cacheFlush (DATA_CACHE,
-  //             this->
-  //               dequeue_count_ [this->consumer_index_].addr (),
-  //             this->probe_set_size_ * sizeof (u_long));
-
-  // flush the base class probe pointer arrays
-  // cacheFlush (
-  //   DATA_CACHE,
-  //   this->enqueue_probes_ [this->consumer_index_],
-  //   this->
-  //     probe_set_size_
-  //   * sizeof (ACE_Metrics_Timeprobe<ACE_LOCK,ALLOCATOR> *));
-  // cacheFlush (
-  //   DATA_CACHE,
-  //   this->dequeue_probes_ [this->consumer_index_],
-  //   this->probe_set_size_
-  //   * sizeof (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> *));
-
-  // flush the base class probes
-  // for (u_int i = 0; i < this->probe_set_size_; ++i)
-  //   {
-  //    cacheFlush (
-  //      DATA_CACHE,
-  //      this->enqueue_probes_ [this->consumer_index_][i],
-  //      sizeof (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>));
-  //    cacheFlush (
-  //      DATA_CACHE,
-  //      this->dequeue_probes_ [this->consumer_index_][i],
-  //      sizeof (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>));
-  //   }
-#endif
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_LOCAL_CACHE_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
deleted file mode 100644
index 97d51de3248..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#ifndef METRICS_LOCAL_CACHE_T_H
-#define METRICS_LOCAL_CACHE_T_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Metrics_Cache.h"
-#include "ace/Metrics_Cache_T.h"
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/MetricsC.h"
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_HAS_METRICS_BASE_POINTERS)
-  typedef ACE_Based_Pointer<char> ACE_METRICS_STRING_TYPE;
-  typedef ACE_Based_Pointer<Metrics::TimeprobeParameter_Set> ACE_METRICS_PARAMETER_SET_TYPE;
-#else
-  typedef char * ACE_METRICS_STRING_TYPE;
-  typedef Metrics::TimeprobeParameter_Set * ACE_METRICS_PARAMETER_SET_TYPE;
-#endif
-
-//DCL:Commented out to remove Linux compile error
-//#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-
-template <typename ACE_LOCK, typename ALLOCATOR>
-class TAO_Metrics_LocalTimeprobe
-  : public ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>
-{
-  // = TITLE
-  //   Defines a class that implements a local timeprobe.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <ACE_Metrics_Timeprobe> class to
-  //   implement a timeprobe for use in a local metrics cache.
-public:
-
-  typedef TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR> TAO_METRICS_TIMEPROBE_TYPE;
-
-  TAO_Metrics_LocalTimeprobe (u_int id = 0,
-                              const char *name = 0,
-                              u_long size
-                                = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE,
-                              ALLOCATOR * alloc = (ALLOCATOR*)ALLOCATOR::instance());
-  // Default constructor.
-
-  void report_intervals (int report_full_interval_times = 0);
-  // Reports valid intervals between start and stop events.
-
-  void install_data_set (Metrics::TimeprobeParameter_Set *data_set = 0);
-  // Installs or unistalls the data set into which probe will report.
-
-  void mark_as_operation (void) {this->is_operation_ = 1;}
-  // Marks the probe as being for an operation.
-
-  void set_hrt (int hrt) {this->is_hrt_ = hrt;}
-  // Marks the probe as being SRT/HRT.
-
-  ACE_Time_Value last_recorded_timestamp (void);
-  // Returns the last timestamp that was recorded in the probe.
-  // If no stamps are recorded, returns zero.
-
-  void flush_TAO_Metrics_LocalTimeprobe ();
-  // Flush the TAO metrics local timeprobe into shared memory.
-
-protected:
-
-  int is_operation_;
-  // Indicates whether or not the probe is for an operation.
-
-  int is_hrt_;
-  // Indicates whether or not the probe is Hard Real-Time.
-
-  ACE_METRICS_PARAMETER_SET_TYPE data_set_;
-  // Points to a probe metrics data set.
-};
-
-template <class ACE_LOCK, class ALLOCATOR>
-class TAO_Metrics_LocalCache
-  : public ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>
-{
-  // = TITLE
-  //   Defines a class that implements a local metrics cache.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <ACE_Metrics_Cache> class to
-  //   implement a cache for local use.
-public:
-
-  typedef ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>
-          ACE_METRICS_TIMEPROBE_TYPE;
-
-#if defined (ACE_HAS_METRICS_BASE_POINTERS)
-  typedef ACE_Based_Pointer<ACE_METRICS_TIMEPROBE_TYPE>
-          ACE_METRICS_TIMEPROBE_BASED_PTR_TYPE;
-#else
-  typedef ACE_METRICS_TIMEPROBE_TYPE * ACE_METRICS_TIMEPROBE_BASED_PTR_TYPE;
-#endif
-
-  typedef TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR> TAO_METRICS_TIMEPROBE_TYPE;
-
-  typedef TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> TAO_METRICS_CACHE_TYPE;
-
-  struct TAO_Metrics_Cache_Data_Base
-  {
-     ACE_METRICS_STRING_TYPE probe_name;
-     TAO_Metrics_LocalTimeprobe<ACE_LOCK, ALLOCATOR> probe;
-  };
-
-  struct TAO_Metrics_Cache_Data : public TAO_Metrics_Cache_Data_Base
-  {
-     int is_hrt;
-     u_long missed_deadlines;
-     u_long made_deadlines;
-     u_long cancellations;
-  };
-
-#if defined (ACE_HAS_METRICS_BASE_POINTERS)
-  typedef ACE_Based_Pointer<TAO_Metrics_Cache_Data_Base> ACE_METRICS_CACHE_DATA_BASE_TYPE;
-  typedef ACE_Based_Pointer<TAO_Metrics_Cache_Data> ACE_METRICS_CACHE_DATA_TYPE;
-#else
-  typedef TAO_Metrics_Cache_Data_Base* ACE_METRICS_CACHE_DATA_BASE_TYPE;
-  typedef TAO_Metrics_Cache_Data* ACE_METRICS_CACHE_DATA_TYPE;
-#endif
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  ACE_METRICS_CACHE_DATA_BASE_TYPE,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_Null_Mutex> METRICS_BASE_MONITOR_MAP;
-  // Type of map used for O(1) lookup of monitored data for operations.
-
-  typedef ACE_Hash_Map_Entry<RtecScheduler::handle_t,
-                             ACE_METRICS_CACHE_DATA_BASE_TYPE >
-    METRICS_BASE_MONITOR_MAP_ENTRY;
-  // Type of entry in monitor map.
-
-  typedef ACE_Hash_Map_Iterator_Ex<RtecScheduler::handle_t,
-                                   ACE_METRICS_CACHE_DATA_BASE_TYPE,
-                                   ACE_Hash<RtecScheduler::handle_t>,
-                                   ACE_Equal_To<RtecScheduler::handle_t>,
-                                   ACE_Null_Mutex>
-    METRICS_BASE_MONITOR_MAP_ITERATOR;
-  // Type of iterator for monitor map.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  ACE_METRICS_CACHE_DATA_TYPE,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_Null_Mutex> METRICS_MONITOR_MAP;
-  // Type of map used for O(1) lookup of monitored data for operations.
-
-  typedef ACE_Hash_Map_Entry<RtecScheduler::handle_t,
-                             ACE_METRICS_CACHE_DATA_TYPE >
-    METRICS_MONITOR_MAP_ENTRY;
-  // Type of entry in monitor map.
-
-  typedef ACE_Hash_Map_Iterator_Ex<RtecScheduler::handle_t,
-                                   ACE_METRICS_CACHE_DATA_TYPE,
-                                   ACE_Hash<RtecScheduler::handle_t>,
-                                   ACE_Equal_To<RtecScheduler::handle_t>,
-                                   ACE_Null_Mutex>
-    METRICS_MONITOR_MAP_ITERATOR;
-  // Type of iterator for monitor map.
-
-  TAO_Metrics_LocalCache (u_long table_size
-                            = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE,
-                          u_long number_of_probes
-                            = METRICS_DEFAULT_TIMEPROBE_COUNT,
-                          ALLOCATOR * alloc = (ALLOCATOR*)ALLOCATOR::instance());
-  // Constructor.
-
-  ~TAO_Metrics_LocalCache () {this->fini ();}
-  // Destructor.
-
-  void reset_statistics ();
-  // Reset the collection of metrics data.
-
-  int init (u_long number_of_probes);
-  // Factory method for constructing probes.
-
-  void fini ();
-  // Method for destroying probes.
-
-  void register_upcall_adapter (RtecScheduler::handle_t handle,
-                                const char *name,
-                                int is_hrt,
-                                unsigned short incr_upcall_id = 1);
-  // Registers an upcall adapter, allocates monitoring data structures
-  // for it in hash maps if not already present.
-
-  RtecScheduler::handle_t register_base_metrics (const char *name,
-                                                 TAO_Metrics_Utils::Base_Metrics_Type bmt,
-                                                 unsigned short incr_base_id = 1);
-  // Registers a base metrics probe, allocates monitoring data structures
-  // for it in hash maps, returns a handle to the metrics segment.
-
-  void report_upcall_start (RtecScheduler::handle_t handle);
-  // Inline: Records start time of an upcall.
-
-  int report_upcall_stop (RtecScheduler::handle_t handle,
-                          const ACE_Time_Value & deadline);
-  // Inline: Records end time of an upcall, returns 0 if the deadline
-  // was made, 1 if the deadline was missed, or -1 if an error occurred.
-  // If the passed deadline is equal to ACE_Time_Value::zero, by definition
-  // the deadline is made, and the method returns 0.
-
-  void report_upcall_cancellation (RtecScheduler::handle_t handle);
-  // Inline: Reports a cancelled upcall.
-
-  void report_base_metrics_start (RtecScheduler::handle_t handle);
-  // Inline: Records start time of a base metrics segment.
-
-  void report_base_metrics_stop (RtecScheduler::handle_t handle);
-  // Inline: Records stop time of a base metrics segment.
-
-  void report_base_metrics_suspend (RtecScheduler::handle_t handle);
-  // Inline: Records start time of a base metrics segment.
-
-  void report_base_metrics_resume (RtecScheduler::handle_t handle);
-  // Inline: Records stop time of a base metrics segment.
-
-  void flush_TAO_Metrics_LocalCache ();
-  // Flush the TAO metrics local cache into shared memory.
-
-protected:
-  void increment_base_handle(TAO_Metrics_Utils::Base_Metrics_Type bmt);
-  // Used to increment the probe id counter for a particular metrics type
-
-  void increment_upcall_handle();
-  // Used to increment the probe id counter for a upcall probe type
-
-  METRICS_BASE_MONITOR_MAP base_monitor_maps_ [2];
-  // These map base metrics ids to base monitor data.
-
-  METRICS_MONITOR_MAP monitor_maps_ [2];
-  // These map operation handles to upcall monitor data.
-
-  // Count of the number of registered sched probes.
-  u_long sched_count_;
-
-  // Count of the number of registered quo probes.
-  u_long quo_count_;
-
-    // Count of the number of registered tns probes.
-  u_long tns_count_;
-
-  // Count of the number of registered teec probes.
-  u_long teec_count_;
-
-  // Count of the number of registered rtarm probes.
-  u_long rtarm_count_;
-
-  // Count of the number of registered upcall adapters.
-  u_long upcall_adapter_count_;
-
-  // Holds the next base metrics probe handle to assign
-  RtecScheduler::handle_t next_base_metrics_handle_;
-
-};
-
-
-
-template <class ACE_LOCK, class ALLOCATOR>
-class TAO_Metrics_ReportingLocalCache
-  : public TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR>
-{
-  // = TITLE
-  //   Defines a class that adds metrics logger reporting to a local cache.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <TAO_Metrics_LocalCache> as its
-  //   a cache for local use, and adds reporting to the logger.
-public:
-
-  TAO_Metrics_ReportingLocalCache (u_long table_size
-                                     = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE,
-                                   u_long number_of_probes
-                                     = METRICS_DEFAULT_TIMEPROBE_COUNT,
-                                   ALLOCATOR * alloc = (ALLOCATOR*)ALLOCATOR::instance());
-  // Constructor.
-
-  ~TAO_Metrics_ReportingLocalCache () {this->fini ();}
-  // Destructor.
-
-  void output_statistics (Metrics::QoSLogger_ptr logger);
-  // Output the statistics to the remote logger servant.
-
-  void register_upcall_adapter (RtecScheduler::handle_t handle,
-                                const char *name,
-                                int is_hrt,
-                                Metrics::QoSLogger_ptr logger);
-  // Registers an upcall adapter, allocates monitoring data structures
-  // for it in hash maps if not already present.
-
-  RtecScheduler::handle_t register_base_metrics (const char *name,
-                                                 TAO_Metrics_Utils::Base_Metrics_Type bmt,
-                                                 Metrics::QoSLogger_ptr logger);
-  // Registers a base metrics probe, allocates monitoring data structures
-  // for it in hash maps, returns a handle to the metrics segment.
-
-  int register_probes (Metrics::QoSLogger_ptr logger);
-  // Registers probes with the logger.
-
-  void flush_TAO_Metrics_ReportingLocalCache ();
-  // Flush the TAO metrics local cache into shared memory.
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Metrics_LocalCache_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* METRICS_LOCAL_CACHE_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
deleted file mode 100644
index fa88db9070a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-// $Id$
-
-#include "orbsvcs/Metrics/Metrics_Logger.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/ace_wchar.h"
-
-ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$")
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-static const int OPEN_CLOSE_BANNER_CYCLE = 4;
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-//////////////////////////////
-// class TAO_Metrics_Logger //
-//////////////////////////////
-
-// Default constructor.
-
-TAO_Metrics_Logger::TAO_Metrics_Logger (int generate_events,
-                                        int generate_log,
-                                        int generate_export_file,
-                                        const char *log_filename)
-  : generate_events_ (generate_events),
-#ifdef VXWORKS
-    generate_log_ (1),
-    log_filename_ ("logger.txt"),
-#else
-    generate_log_ (generate_log),
-    log_filename_ (log_filename),
-#endif
-    generate_totals_(0),
-    generate_export_file_(generate_export_file),
-    log_started_ (0),
-    log_file_ (stdout),
-    export_file_(stdout),
-    saveFileCnt_(0)
-{
-#ifdef VXWORKS
-  taskPrioritySet( taskIdSelf(), 145 );
-#endif
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-  if (this->generate_events_)
-    {
-      // Connect the underlying DOVE event supplier.
-      if (this->dove_supplier_.connect () < 0)
-        {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-          ACE_ERROR ((LM_ERROR, "failed to connect DOVE event supplier\n"));
-#endif
-          this->generate_events_ = 0;
-        }
-    }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-  if (generate_log_)
-    {
-      if (log_filename_)
-        {
-          log_file_ = ACE_OS::fopen (log_filename_, "w+");
-          if (log_file_ == NULL)
-            {
-              generate_log_ = 0;
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-              ACE_ERROR ((LM_ERROR,
-                          "Logger failed to open log file %s\n",
-                          log_filename_));
-#endif
-              return;
-            }
-
-          if (generate_export_file_)
-          {
-             export_file_ = ACE_OS::fopen ("remote_logger_export.excel", "w+");
-             if (export_file_ == NULL)
-             {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-                ACE_ERROR ((LM_ERROR, "Logger failed to open log file %s\n", log_filename_));
-#endif
-                return;
-             }
-          }
-         log_started_ = 1;
-        }
-
-      // Write a start of logging session message.
-      time_t current_time = ACE_OS::time ();
-      ACE_OS::fprintf (log_file_,
-                       "\n\nTAO_Metrics Metrics Logging Session: %s\n\n",
-                       ACE_OS::ctime (& current_time));
-
-      ACE_OS::fprintf (export_file_,
-                       "\n\nTAO_Metrics Metrics Logging Session: %s\n\n",
-                       ACE_OS::ctime (& current_time));
-      if (log_filename_)
-        {
-          ACE_OS::fflush (log_file_);
-          ACE_OS::fflush (export_file_);
-//          ACE_OS::fclose (log_file_);
-        }
-    }
-}
-
-
-// Destructor.
-
-TAO_Metrics_Logger::~TAO_Metrics_Logger ()
-{
-  if (generate_log_)
-    {
-      if (log_filename_)
-        {
-//        log_file_ = ACE_OS::fopen (log_filename_, "a+");
-        }
-
-      ACE_OS::fprintf (log_file_, "\n\n");
-
-      ACE_OS::fflush (log_file_);
-
-      ACE_OS::fprintf (export_file_, "\n\n");
-      ACE_OS::fflush (export_file_);
-
-      if (log_filename_)
-        {
-//        ACE_OS::fclose (log_file_);
-        }
-    }
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-  if (this->generate_events_)
-    {
-      this->dove_supplier_.disconnect ();
-    }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-}
-
-
-// Active object loop for processing logged data.
-
-int
-TAO_Metrics_Logger::svc (void)
-{
-  ACE_Message_Block *mb;
-
-  // Loop forever.
-  while (1)
-    if (this->getq (mb) < 0)
-      {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) getq failed in TAO_Metrics_Logger::svc"));
-#endif
-        return -1;
-      }
-    else if (! mb)
-      {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) null message block pointer in TAO_Metrics_Logger::svc"));
-#endif
-        return -1;
-      }
-    else if (! mb->rd_ptr ())
-      {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) null message block pointer in TAO_Metrics_Logger::svc"));
-#endif
-        return -1;
-      }
-    else
-      {
-        // Process message.
-
-        TAO_Metrics_Logger_Data *data = (TAO_Metrics_Logger_Data *) mb->rd_ptr ();
-        switch (data->data_type_)
-          {
-            case TAO_Metrics_Logger_Data::QOS_TYPE:
-              this->process_aggregate_QoS (*data->qos_params_, data->interval_);
-              delete data;
-              delete mb;
-              break;
-
-            case TAO_Metrics_Logger_Data::TIMEPROBE_TYPE:
-              this->process_timeprobe_data (*data->timeprobe_params_, data->interval_);
-              delete data;
-              delete mb;
-              break;
-
-            case TAO_Metrics_Logger_Data::BANNER_TYPE:
-              this->process_banner (data->banner_);
-              delete data;
-              delete mb;
-              break;
-
-            default:
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) unrecognized data type in TAO_Metrics_Logger::svc"));
-#endif
-              return -1;
-     }
-    }
-
-// Modified by BAP.  Remove unreachable code.
-//  return 0;
-}
-
-
-// Sends a banner to be written to the log file and to the visualization browser.
-
-void
-TAO_Metrics_Logger::send_banner (const char *banner)
-  throw (CORBA::SystemException)
-{
-  // Package up the data and put it on the task queue.
-
-  TAO_Metrics_Logger_Data *data;
-  ACE_NEW (data,
-           TAO_Metrics_Logger_Data (TAO_Metrics_Logger_Data::BANNER_TYPE));
-  ACE_NEW (data->banner_, char [ACE_OS::strlen (banner) + 1]);
-  ACE_OS::strcpy (data->banner_, banner);
-
-  ACE_Message_Block *mb;
-  ACE_NEW (mb,
-           ACE_Message_Block ((char *) data,
-                              sizeof (TAO_Metrics_Logger_Data)));
-
-  if (this->putq (mb) < 0)
-    {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_Logger::send_banner putq failed"));
-#endif
-    }
-}
-
-void
-TAO_Metrics_Logger::process_banner (const char *banner)
-{
-  if (this->generate_log_)
-    {
-      if (log_filename_)
-        {
-//        log_file_ = ACE_OS::fopen (log_filename_, "a+");
-        }
-
-      ACE_OS::fprintf (log_file_,
-                       "%s\n", banner);
-      ACE_OS::fprintf (export_file_,
-                       "%s\n", banner);
-      if (log_filename_)
-        {
-          ACE_OS::fflush (log_file_);
-          ACE_OS::fflush (export_file_);
-
-          // Close and then reopen the file.  We can't afford to open & close all of the time.
-          if (( saveFileCnt_++ % OPEN_CLOSE_BANNER_CYCLE) == 0 )
-            {
-              ACE_OS::fclose (log_file_);
-              log_file_ = ACE_OS::fopen (log_filename_, "a+");
-
-              ACE_OS::fclose (export_file_);
-              export_file_ = ACE_OS::fopen ("remote_logger_export.excel", "a+");
-            }
-        }
-    }
-}
-
-
-// Reports the aggregate QoS information for all operations
-// to the passed QoS logger.
-
-void
-TAO_Metrics_Logger::log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                                       Metrics::Time interval)
-  throw (CORBA::SystemException)
-{
-// This is a temporary patch to eliminate this data from the log.  It was
-// done to bypass a long rebuild that would have been required otherwise.
-// Remove this patch later.  Brian Mendel
-
-  //Added to remove Linux warning (Boeing Extension)
-  ACE_UNUSED_ARG(qos_params);
-  ACE_UNUSED_ARG(interval);
-
-  // Package up the data and put it on the task queue.
-#if 0
-  TAO_Metrics_Logger_Data *data;
-  ACE_NEW (data,
-           TAO_Metrics_Logger_Data (TAO_Metrics_Logger_Data::QOS_TYPE,
-                                    interval));
-  ACE_NEW (data->qos_params_,
-           Metrics::QoSParameter_Set (qos_params));
-
-  ACE_Message_Block *mb;
-  ACE_NEW (mb,
-           ACE_Message_Block ((char *) data,
-                              sizeof (TAO_Metrics_Logger_Data)));
-
-  if (this->putq (mb) < 0)
-    {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_Logger::log_aggregate_QoS putq failed"));
-#endif
-    }
-#endif
-}
-
-
-// Processes the aggregate QoS information for all operations
-// to the passed QoS logger.
-
-void
-TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                                           Metrics::Time interval)
-{
-  //Added to remove Linux warning (Boeing Extension)
-  ACE_UNUSED_ARG(interval);
-
-  if (this->generate_log_)
-    {
-      if (log_filename_)
-        {
-//        log_file_ = ACE_OS::fopen (log_filename_, "a+");
-        }
-
-      ACE_OS::fprintf (log_file_,
-                       "\nName  missed     made cancelled\n");
-
-      ACE_OS::fprintf (export_file_,
-                       "\n\n Name \t missed \t made \t cancelled\n");
-    }
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-  if (this->generate_events_)
-    {
-      this->qos_data_.hrt_deadlines_missed = 0;
-      this->qos_data_.hrt_deadlines_made = 0;
-      this->qos_data_.hrt_operations_cancelled = 0;
-      this->qos_data_.srt_deadlines_missed = 0;
-      this->qos_data_.srt_deadlines_made = 0;
-      this->qos_data_.srt_operations_cancelled = 0;
-    }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-  for (u_long i = 0; i < qos_params.length (); ++i)
-    {
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-      if (this->generate_events_)
-        {
-          if (qos_params [i].is_hrt)
-            {
-              this->qos_data_.hrt_deadlines_missed +=
-                qos_params [i].deadlines_missed;
-              this->qos_data_.hrt_deadlines_made +=
-                qos_params [i].deadlines_made;
-              this->qos_data_.hrt_operations_cancelled +=
-                qos_params [i].operations_cancelled;
-            }
-          else
-            {
-              this->qos_data_.srt_deadlines_missed +=
-                qos_params [i].deadlines_missed;
-              this->qos_data_.srt_deadlines_made +=
-                qos_params [i].deadlines_made;
-              this->qos_data_.srt_operations_cancelled +=
-                qos_params [i].operations_cancelled;
-            }
-        }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-      if (this->generate_log_)
-        {
-          ACE_OS::fprintf (log_file_,
-                           "%-50s %8lu %8lu %8lu\n",
-                           (const char *)qos_params [i].entry_point,
-                           qos_params [i].deadlines_missed,
-                           qos_params [i].deadlines_made,
-                           qos_params [i].operations_cancelled);
-          ACE_OS::fprintf (export_file_,
-                           " %s \t %lu \t %lu \t %lu\n",
-                           (const char *)qos_params [i].entry_point,
-                           qos_params [i].deadlines_missed,
-                           qos_params [i].deadlines_made,
-                           qos_params [i].operations_cancelled);
-        }
-    }
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-  if (this->generate_events_)
-    {
-      // Push an event to the visualization browser.
-      CORBA::Any any;
-
-      try
-        {
-          any.replace (Metrics::_tc_QoSData, &qos_data_, 0, ACE_TRY_ENV);
-        }
-      catch (const CORBA::Exception& ex)
-        {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-          ex._tao_print_exception (
-            "TAO_Metrics_Logger::process_aggregate_QoS");
-#endif
-          return;
-        }
-
-      this->dove_supplier_.notify (any);
-    }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-  if (this->generate_log_)
-    {
-      if (log_filename_)
-        {
-          ACE_OS::fflush (log_file_);
-//          ACE_OS::fclose (log_file_);
-        }
-    }
-}
-
-
-// Binds the names of various timeprobes to their identifiers so
-// that ids alone can be used (for efficiency) in passing data.
-
-void
-TAO_Metrics_Logger::set_identities (const Metrics::ProbeIdentity_Set &
-                                      probe_identities)
-  throw (CORBA::SystemException)
-{
-  for (u_long i = 0; i < probe_identities.length (); ++i)
-    {
-      this->set_identity (probe_identities [i]);
-    }
-}
-
-void
-TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identity)
-  throw (CORBA::SystemException)
-{
-  // Look up the existing name that is bound, creating one if there is
-  // not one there already.
-  CORBA::String_var *name = 0;
-  if (probe_name_map_.find (probe_identity.probe_id, name) != 0
-      || name == 0)
-    {
-      ACE_NEW_THROW_EX (name,
-                        CORBA::String_var (probe_identity.probe_name),
-                        CORBA::NO_MEMORY ());
-
-      // What is this used for?  BRM
-      auto_ptr<CORBA::String_var> name_ptr (name);
-
-      if (probe_name_map_.rebind (probe_identity.probe_id, name) < 0)
-        {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-          ACE_ERROR ((LM_ERROR, "TAO_Metrics_Logger::set_identity bind failed.\n"));
-#endif
-          return;
-        }
-
-      // DEBUG
-      const char * name_cstr = name->in ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "Logger registered name [%s] with id [%u]\n",
-                  name_cstr, probe_identity.probe_id));
-
-      name_ptr.release ();
-    }
-  else
-    {
-      // DEBUG
-      const char * old_name_cstr = name->in ();
-
-      // Unconditionally set the name to the new name.
-      *name = probe_identity.probe_name;
-
-      // DEBUG
-      const char * new_name_cstr = name->in ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "Logger CHANGED name from [%s] to [%s] for id [%u]\n",
-                  old_name_cstr, new_name_cstr, probe_identity.probe_id));
-    }
-}
-
-
-// Reports timeprobe data collected since last run.
-
-void
-TAO_Metrics_Logger::log_timeprobe_data (const Metrics::TimeprobeParameter_Set &
-                                        timeprobe_params,
-                                        Metrics::Time interval)
-  throw (CORBA::SystemException)
-{
-  // Package up the data and put it on the task queue.
-
-  TAO_Metrics_Logger_Data *data;
-  ACE_NEW (data,
-           TAO_Metrics_Logger_Data (TAO_Metrics_Logger_Data::TIMEPROBE_TYPE,
-                                    interval));
-  ACE_NEW (data->timeprobe_params_,
-           Metrics::TimeprobeParameter_Set (timeprobe_params));
-
-  ACE_Message_Block *mb;
-  ACE_NEW (mb,
-           ACE_Message_Block ((char *) data,
-                              sizeof (TAO_Metrics_Logger_Data)));
-
-  if (this->putq (mb) < 0)
-    {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_Logger::log_timeprobe_data putq failed"));
-#endif
-    }
-}
-
-
-// Processes timeprobe data collected since last run.
-void
-TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
-                                            Metrics::Time interval)
-{
-   if (this->generate_log_)
-   {
-      if (log_filename_)
-      {
-         //        log_file_ = ACE_OS::fopen (log_filename_, "a+");
-      }
-
-      ACE_OS::fprintf (log_file_,
-                       "\n\n\n"
-                       "Interval (usec):       %9lu  \n\n"
-                       "Probe                                        elapsed_time(usec)    Start Time (usecs)    Stop Time (usec)\n\n",
-                       // Modified by BAP.  This really should be corrected since we are truncating the interval here.
-                       // We can get away with it here for now since the intervals are small enough to not roll over.
-                       (u_long) ACE_U64_TO_U32(interval)/10 );
-
-      ACE_OS::fprintf (export_file_,
-                       "\n\n\n"
-                       "Interval (usec): \t %9lu \t \n\n"
-                       "Probe \t elapsed_time(usec) \tStart Time (usecs) \t Stop Time (usec)\n\n",
-                       // Modified by BAP.  This really should be corrected since we are truncating the interval here.
-                       // We can get away with it here for now since the intervals are small enough to not roll over.
-                       (u_long) ACE_U64_TO_U32(interval)/10 );
-   }
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-   Metrics::Time queue_time = 0;
-   Metrics::Time hrt_op_time = 0;
-   Metrics::Time srt_op_time = 0;
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-   for (u_long i = 0; i < timeprobe_params.length (); ++i)
-   {
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-      if (! timeprobe_params [i].is_full_interval)
-      {
-         if (timeprobe_params [i].is_operation)
-         {
-            if (timeprobe_params [i].is_hrt)
-            {
-               hrt_op_time += timeprobe_params [i].interval;
-            }
-            else
-            {
-               srt_op_time += timeprobe_params [i].interval;
-            }
-         }
-         else
-         {
-            queue_time += timeprobe_params [i].interval;
-         }
-      }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-      if (this->generate_log_)
-      {
-         // Look up the name of the probe in the hash map.
-         // If successful, use the name, and if not just use the probe id.
-         CORBA::String_var *probe_name = 0;
-         char format_spec[255];
-         char export_spec[255];
-
-         if (probe_name_map_.find (timeprobe_params [i].probe_id, probe_name) == 0
-             && probe_name != 0)
-         {
-            if (timeprobe_params [i].cross_thread_probe &&
-                timeprobe_params [i].is_full_interval)
-            {
-               if (generate_totals_)
-               {
-#if defined (ACE_LACKS_LONGLONG_T)
-                  // This needs to be fixed for platforms that do not have 64 bit support.  This will result
-                  // in overruns as currently written
-                  ACE_OS::fprintf (log_file_,
-                                   "  %-40s  (total)  %20lu   %20lu   %20lu  *** Cross Thread Event ***\n",
-                                   (const char *) *probe_name,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-                  ACE_OS::fprintf (export_file_,
-                                   "  %s (total) \t %lu \t %lu \t %lu \t ***Cross Thread Event***\n",
-                                   (const char *) *probe_name,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-#else
-                  // Build up the format specifiers since the specifier or not portable
-                  ACE_OS::strcpy(format_spec, "  %-40s  (total)  ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " *** Cross Thread Event ***\n");
-
-                  ACE_OS::strcpy(export_spec, "  %-40s  (total)  \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t*** Cross Thread Event ***\n");
-
-                  ACE_OS::fprintf (log_file_,
-                                   format_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-                  ACE_OS::fprintf (export_file_,
-                                   export_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-#endif
-               }
-            }
-            else
-            {
-#if defined (ACE_LACKS_LONGLONG_T)
-                  // This needs to be fixed for platforms that do not have 64 bit support.  This will result
-                  // in overruns as currently written
-               ACE_OS::fprintf (log_file_,
-                                "  %-40s   %20lu   %20lu   %20lu   *** Cross Thread Event ***\n",
-                                (const char *) *probe_name,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-               ACE_OS::fprintf (export_file_,
-                                "  %s \t %lu \t %lu \t %lu \t ***Cross Thread Event***\n",
-                                (const char *) *probe_name,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-#else
-                  // Build up the format specifiers since the specifier or not portable
-                  ACE_OS::strcpy(format_spec, "  %-40s  ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " *** Cross Thread Event ***\n");
-
-                  ACE_OS::strcpy(export_spec, "  %-40s  \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t *** Cross Thread Event ***\n");
-
-                  ACE_OS::fprintf (log_file_,
-                                   format_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-                  ACE_OS::fprintf (export_file_,
-                                   export_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-#endif
-            }
-
-         }
-         else
-         {
-            if (timeprobe_params [i].cross_thread_probe &&
-                timeprobe_params [i].is_full_interval)
-            {
-               if (generate_totals_)
-#if defined (ACE_LACKS_LONGLONG_T)
-                  ACE_OS::fprintf (log_file_,
-                                   "  [id (total): %8lu] %9lu   %9lu   %9lu   *** Cross Thread Event ***\n",
-                                   timeprobe_params [i].probe_id,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-                  ACE_OS::fprintf (export_file_,
-                                   "  [id (total): %lu] \t %lu \t %lu \t %lu \t ***Cross Thread Event***\n",
-                                   timeprobe_params [i].probe_id,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                   (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-#else
-                  // Build up the format specifiers since the specifier or not portable
-                  ACE_OS::strcpy(format_spec, "  [id (total): %8lu] ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " ");
-                  ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(format_spec, " *** Cross Thread Event ***\n");
-
-                  ACE_OS::strcpy(export_spec, "  [id (total): %8lu] \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t ");
-                  ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-                  ACE_OS::strcat(export_spec, " \t*** Cross Thread Event ***\n");
-
-                  if (probe_name == 0)
-                  {
-                     ACE_DEBUG((LM_DEBUG, "Found a probe with id: %d with no name\n", timeprobe_params [i].probe_id));
-                  }
-                  else
-                  {
-                     ACE_OS::fprintf (log_file_,
-                                      format_spec,
-                                      (const char *) *probe_name,
-                                      timeprobe_params [i].interval / 10,
-                                      timeprobe_params [i].start_event_time / 10,
-                                      timeprobe_params [i].stop_event_time / 10);
-                     ACE_OS::fprintf (export_file_,
-                                      export_spec,
-                                      (const char *) *probe_name,
-                                      timeprobe_params [i].interval / 10,
-                                      timeprobe_params [i].start_event_time / 10,
-                                      timeprobe_params [i].stop_event_time / 10);
-                  }
-#endif
-            }
-            else
-#if defined (ACE_LACKS_LONGLONG_T)
-               ACE_OS::fprintf (log_file_,
-                                "  [id: %14lu]   %9lu  %9lu   %9lu   \n",
-                                timeprobe_params [i].probe_id,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-               ACE_OS::fprintf (export_file_,
-                                " [id: %lu] \t %lu \t %lu \t %lu\n",
-                                timeprobe_params [i].probe_id,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].interval)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].start_event_time)/10,
-                                (u_long) ACE_U64_TO_U32(timeprobe_params [i].stop_event_time)/10);
-#else
-               // Build up the format specifiers since the specifier or not portable
-               ACE_OS::strcpy(format_spec, "  [id: %14lu]   ");
-               ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(format_spec, " ");
-               ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(format_spec, " ");
-               ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(format_spec, " *** Cross Thread Event ***\n");
-
-               ACE_OS::strcpy(export_spec, " [id: %lu] \t ");
-               ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(export_spec, " \t ");
-               ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(export_spec, " \t ");
-               ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER);
-               ACE_OS::strcat(export_spec, " *** Cross Thread Event ***\n");
-
-               if (probe_name == 0)
-               {
-                  ACE_DEBUG((LM_DEBUG, "Found a probe with id: %d with no name\n", timeprobe_params [i].probe_id));
-               }
-               else
-               {
-                  ACE_OS::fprintf (log_file_,
-                                   format_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-                  ACE_OS::fprintf (export_file_,
-                                   export_spec,
-                                   (const char *) *probe_name,
-                                   timeprobe_params [i].interval / 10,
-                                   timeprobe_params [i].start_event_time / 10,
-                                   timeprobe_params [i].stop_event_time / 10);
-               }
-#endif
-
-         }
-      }  // End if (this->generate_log_)
-   }
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-   if (this->generate_events_)
-   {
-      CORBA::Any any;
-
-          util_data_.hrt_op_utilization =
-            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time))
-            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
-
-          util_data_.srt_op_utilization =
-            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (srt_op_time))
-            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
-
-          util_data_.queue_utilization =
-            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (queue_time))
-            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
-
-          try
-            {
-              any.replace (Metrics::_tc_UtilData, &util_data_, 0, ACE_TRY_ENV);
-            }
-          catch (const CORBA::Exception& ex)
-            {
-#if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-              ex._tao_print_exception (
-                "TAO_Metrics_Logger::process_aggregate_QoS");
-#endif
-              return;
-            }
-
-          this->dove_supplier_.notify (any);
-        }
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-  if (this->generate_log_)
-    {
-      if (log_filename_)
-        {
-        ACE_OS::fflush (log_file_);
-        ACE_OS::fflush (export_file_);
-//        ACE_OS::fclose (log_file_);
-        }
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
deleted file mode 100644
index 5d24ea4a7c9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ /dev/null
@@ -1,219 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#ifndef METRICS_LOGGER_H
-#define METRICS_LOGGER_H
-
-#if ! defined (VXWORKS)
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-// Comment out both of these to disable output
-#  define METRICS_LOGGER_ERROR_OUTPUT_ENABLED
-#  define METRICS_LOGGER_DEBUG_OUTPUT_ENABLED
-
-#endif /* ! VXWORKS */
-
-// Comment this out to disable event passing
-#define TAO_METRICS_LOGGER_SENDS_EVENTS
-
-#include "ace/OS.h"
-#include "ace/Task.h"
-#include "ace/Singleton.h"
-#include "ace/Functor.h"
-#include "ace/Hash_Map_Manager.h"
-
-//#include "tao/TAO.h"
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/MetricsS.h"
-#include "orbsvcs/RtecEventCommS.h"
-
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-#include "MetricsC.h"
-#include "DOVE_Supplier.h"
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Metrics_Export TAO_Metrics_Logger_Data
-{
-  // = TITLE
-  //   Defines a class for logger data.
-  //
-  // = DESCRIPTION
-  //   This class is used to transfer metrics data to the logger class.
-public:
-
-  enum LOGGER_DATA_TYPE {QOS_TYPE, TIMEPROBE_TYPE, BANNER_TYPE};
-
-  TAO_Metrics_Logger_Data (LOGGER_DATA_TYPE data_type,
-                    Metrics::Time interval = ORBSVCS_Time::zero ())
-    : data_type_ (data_type),
-      interval_ (interval),
-      qos_params_ (0),
-      timeprobe_params_ (0),
-      banner_ (0)
-    {
-    }
-  // Constructor.
-
-  ~TAO_Metrics_Logger_Data ()
-    {
-      delete qos_params_;
-      delete timeprobe_params_;
-      delete banner_;
-    }
-  // Destructor.
-
-  LOGGER_DATA_TYPE data_type_;
-  // Identifies type of data.
-
-  Metrics::Time interval_;
-  // Time interval over which data were collected.
-
-  Metrics::QoSParameter_Set * qos_params_;
-  // Points to a QoS parameter data set.
-
-  Metrics::TimeprobeParameter_Set * timeprobe_params_;
-  // Points to a timeprobe data set.
-
-  char * banner_;
-  // Banner for entry in the log and/or visualization stream.
-};
-
-
-
-class TAO_Metrics_Export TAO_Metrics_Logger
-  : public ACE_Task<ACE_MT_SYNCH>, public POA_Metrics::QoSLogger
-  // = TITLE
-  //   This class implements a Metrics QoS logger.
-  //
-  // = DESCRIPTION
-  //   This class allows clients to log monitored QoS.
-{
-public:
-
-  typedef ACE_Hash_Map_Manager_Ex<CORBA::ULong,
-                                  CORBA::String_var *,
-                                  ACE_Hash<CORBA::ULong>,
-                                  ACE_Equal_To<CORBA::ULong>,
-                                  ACE_Null_Mutex> PROBE_NAME_MAP;
-  // Type of map used for O(1) lookup of probe names.
-
-  typedef ACE_Hash_Map_Entry<CORBA::ULong, CORBA::String_var> PROBE_NAME_MAP_ENTRY;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  TAO_Metrics_Logger (int generate_events = 0, int generate_log = 0, int generate_export_file = 1, const char *log_filename = 0);
-  // Default constructor.
-
-  virtual ~TAO_Metrics_Logger ();
-  // Destructor.
-
-  virtual int svc (void);
-  // Active object loop for processing logged data.
-
-  void send_banner (const char *banner)
-    throw (CORBA::SystemException);
-  // Sends a banner to be written to the log file and to the visualization browser.
-
-  void process_banner (const char *banner);
-  // Writes banner to the log file and/or to the visualization browser.
-
-  void log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                          Metrics::Time interval)
-    throw (CORBA::SystemException);
-  // Reports the aggregate QoS information for all operations
-  // to the passed QoS logger.
-
-  void process_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                              Metrics::Time interval);
-  // Processes the aggregate QoS information for all operations
-  // to the passed QoS logger.
-
-  void set_identities (const Metrics::ProbeIdentity_Set & probe_identities)
-    throw (CORBA::SystemException);
-  // Binds the names of various timeprobes to their identifiers so
-  // that ids alone can be used (for efficiency) in passing data.
-
-  void set_identity (const Metrics::ProbeIdentity_t & probe_identity)
-    throw (CORBA::SystemException);
-  // Binds the names of various timeprobes to their identifiers so
-  // that ids alone can be used (for efficiency) in passing data.
-
-  void log_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
-                           Metrics::Time interval)
-    throw (CORBA::SystemException);
-  // Reports timeprobe data collected since last run.
-
-  void process_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
-                               Metrics::Time interval);
-  // Processes timeprobe data collected since last run.
-
-protected:
-
-  int generate_events_;
-  // Indicates whether or not to generate events for displays.
-
-  int generate_log_;
-  // Indicates whether or not to generate a text log.
-
-  const char *log_filename_;
-  // Name of the text log file (if any)
-
-  int generate_totals_;
-  // Indicates whether information of totals are logged.
-
-  int generate_export_file_;
-  // Indicates whether information of totals are logged.
-
-  int log_started_;
-  // Indicates whether or not the log has been started already.
-
-  FILE *log_file_;
-  // Handle to the text log file (if any).
-
-  FILE *export_file_;
-  // Handle to the excel export log file (if any).
-
-  PROBE_NAME_MAP probe_name_map_;
-  // Maps probe ids to their names.
-
-#if defined (METRICS_LOGGER_SENDS_EVENTS)
-  DOVE_Supplier dove_supplier_;
-  // DOVE Event supplier.
-
-  Metrics::QoSData qos_data_;
-  // QoS data structure.
-
-  Metrics::UtilData util_data_;
-  // Utilization data structure.
-
-#endif /* METRICS_LOGGER_SENDS_EVENTS */
-
-  // Only write the file once every OPEN_CLOSE_BANNER_CYCLE banner
-  // changes
-  int saveFileCnt_;
-};
-
-typedef ACE_Singleton<Metrics::QoSLogger_var, ACE_SYNCH_MUTEX>
-TAO_METRICS_LOGGER_REF_SINGLETON;
-
-typedef ACE_Singleton<TAO_Metrics_Logger, ACE_SYNCH_MUTEX>
-TAO_METRICS_LOGGER_SINGLETON;
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-#endif /* METRICS_LOGGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
deleted file mode 100644
index f749b35eaab..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#ifndef METRICS_UPCALL_MONITOR_CPP
-#define METRICS_UPCALL_MONITOR_CPP
-
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.h"
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.inl"
-#endif /* __ACE_INLINE__ */
-
-#else
-#error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-
-#endif /* METRICS_UPCALL_MONITOR_CPP */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
deleted file mode 100644
index b7bdbb44e29..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#ifndef METRICS_UPCALL_MONITOR_H
-#define METRICS_UPCALL_MONITOR_H
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-#if ! defined (VXWORKS)
-
-// Comment out both of these to disable output
-#  define METRICS_MONITOR_ERROR_OUTPUT_ENABLED
-#  define METRICS_MONITOR_DEBUG_OUTPUT_ENABLED
-
-#endif /* ! VXWORKS */
-
-#include "ace/Singleton.h"
-#include "ace/Hash_Map_Manager.h"
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/MetricsS.h"
-
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Metrics_Export TAO_Metrics_UpcallMonitor
-  : public POA_Metrics::QoSMonitor
-{
-  // = TITLE
-  //   This class implements a Metrics QoS monitor.
-  //
-  // = DESCRIPTION
-  //   This class allows clients to monitor QoS, collected
-  //   by the rest of the metrics framework.
-public:
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  CORBA::ULong,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_SYNCH_MUTEX> MONITOR_MAP;
-  // Type of map used for O(1) lookup of missed/made deadline counts
-  // by operation handles.
-
-  typedef ACE_Hash_Map_Entry<RtecScheduler::handle_t, CORBA::ULong>
-    MONITOR_MAP_ENTRY;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  typedef ACE_Hash_Map_Iterator_Ex<RtecScheduler::handle_t,
-                                  CORBA::ULong,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_SYNCH_MUTEX> MONITOR_MAP_ITERATOR;
-  // Type of map used for O(1) lookup of missed/made deadline counts
-  // by operation handles.
-
-
-  TAO_Metrics_UpcallMonitor ();
-  // Default constructor.
-
-  ~TAO_Metrics_UpcallMonitor ();
-  // Destructor.
-
-  virtual void
-  report_made_deadline (RtecScheduler::handle_t handle
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_0));
-  // Reports a successful upcall.
-
-  virtual void
-  report_missed_deadline (RtecScheduler::handle_t handle
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_1));
-  // Reports an unsuccessful upcall.
-
-  virtual void
-  get_aggregate_QoS (RtecScheduler::handle_t handle,
-                     Metrics::QoSParameter_t_out qos
-                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_2,
-                     Metrics::INTERNAL_3));
-  // Get the aggregate QoS statistics collected for the passed handle.
-
-  virtual void get_aggregate_QoS_set (
-      const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_4,
-                     Metrics::INTERNAL_5));
-  // Get the aggregate QoS statistics collected for each handle in the
-  // passed set.
-
-  virtual void
-  reset_statistics (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_7,
-                     Metrics::INTERNAL_8));
-  // Resets the aggregate QoS information for the given operation.
-
-  MONITOR_MAP &missed_map ();
-  // Accessor for map of operation handle to a count of deadlines missed.
-
-  MONITOR_MAP &made_map ();
-  // Accessor for map of operation handle to a count of deadlines made.
-
-private:
-
-  // = Implementation members.
-
-  MONITOR_MAP missed_map_;
-  // Maps operation handle to a count of deadlines missed.
-
-  MONITOR_MAP made_map_;
-  // Maps operation handle to a count of deadlines made.
-
-};
-
-
-class TAO_Metrics_Export TAO_Metrics_ReportingUpcallMonitor
-  : public POA_Metrics::ReportingQoSMonitor
-{
-  // = TITLE
-  //   This class implements a reporting extension for a Metrics QoS monitor.
-  //
-  // = DESCRIPTION
-  //   This class uses delegation to avoid the ugly consequences of
-  //   multiple inheritance from a common IDL base class along two
-  //   inheritance paths.
-public:
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  CORBA::ULong,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_SYNCH_MUTEX> MONITOR_MAP;
-  // Type of map used for O(1) lookup of missed/made deadline counts
-  // by operation handles.
-
-  typedef ACE_Hash_Map_Entry<RtecScheduler::handle_t, CORBA::ULong>
-    MONITOR_MAP_ENTRY;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  typedef ACE_Hash_Map_Iterator_Ex<RtecScheduler::handle_t,
-                                  CORBA::ULong,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_SYNCH_MUTEX> MONITOR_MAP_ITERATOR;
-  // Type of map used for O(1) lookup of missed/made deadline counts
-  // by operation handles.
-
-
-  TAO_Metrics_ReportingUpcallMonitor ();
-  // Default constructor.
-
-  ~TAO_Metrics_ReportingUpcallMonitor ();
-  // Destructor.
-
-  virtual void
-  report_made_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_0));
-  // Reports a successful upcall.
-
-  virtual void
-  report_missed_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_1));
-  // Reports an unsuccessful upcall.
-
-  virtual void
-  get_aggregate_QoS (RtecScheduler::handle_t handle,
-                     Metrics::QoSParameter_t_out qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_2,
-                     Metrics::INTERNAL_3));
-  // Get the aggregate QoS statistics collected for the passed handle.
-
-  virtual void get_aggregate_QoS_set (
-      const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_4,
-                     Metrics::INTERNAL_5));
-  // Get the aggregate QoS statistics collected for each handle in the
-  // passed set.
-
-  virtual void report_aggregate_QoS (
-      Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::NIL_LOGGER,
-                     Metrics::INTERNAL_6));
-  // Report the aggregate QoS statistics to the logger.
-
-  virtual void
-  reset_statistics (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_7,
-                     Metrics::INTERNAL_8));
-  // Resets the aggregate QoS information for the given operation.
-
-private:
-
-  TAO_Metrics_UpcallMonitor monitor_;
-  // The monitor we're wrapping.
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef TAO_Metrics_UpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator>
-TAO_METRICS_MONITOR_ADAPTER_TYPE;
-
-typedef TAO_Metrics_ReportingUpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator>
-TAO_METRICS_REPORTING_MONITOR_ADAPTER_TYPE;
-
-typedef ACE_Singleton<TAO_Metrics_UpcallMonitor, ACE_SYNCH_MUTEX>
-TAO_METRICS_MONITOR_SINGLETON_TYPE;
-
-typedef ACE_Singleton<TAO_Metrics_ReportingUpcallMonitor, ACE_SYNCH_MUTEX>
-TAO_METRICS_REPORTING_MONITOR_SINGLETON_TYPE;
-
-#if defined (TAO_USES_REPORTING_METRICS)
-typedef TAO_METRICS_REPORTING_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER;
-typedef TAO_METRICS_REPORTING_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON;
-#else
-typedef TAO_METRICS_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER;
-typedef TAO_METRICS_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON;
-#endif
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-#endif /* METRICS_UPCALL_MONITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
deleted file mode 100644
index 2dedbc81e8f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
+++ /dev/null
@@ -1,365 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// @METRICS@
-
-#ifndef METRICS_UPCALL_MONITOR_I
-#define METRICS_UPCALL_MONITOR_I
-
-//# if defined (METRICS_USES_OP_CANCELLATION)
-//# undef METRICS_USES_OP_CANCELLATION
-//# endif /* METRICS_USES_OP_CANCELLATION */
-
-# if ! defined (METRICS_USES_OP_CANCELLATION)
-#   define METRICS_USES_OP_CANCELLATION
-# endif /* ! METRICS_USES_OP_CANCELLATION */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/////////////////////////////////////
-// Class TAO_Metrics_UpcallMonitor //
-/////////////////////////////////////
-
-// Default constructor.
-
-ACE_INLINE
-TAO_Metrics_UpcallMonitor::TAO_Metrics_UpcallMonitor ()
-{
-}
-
-// Destructor.
-
-ACE_INLINE
-TAO_Metrics_UpcallMonitor::~TAO_Metrics_UpcallMonitor ()
-{
-}
-
-// Reports a successful upcall.
-
-ACE_INLINE void
-TAO_Metrics_UpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_0))
-{
-  CORBA::ULong count = 0;
-  MONITOR_MAP_ENTRY *entry;
-
-  if (made_map_.trybind (handle, count, entry) < 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Failed trybind for handle %u in made map\n", handle));
-      throw Metrics::INTERNAL_0 ();
-    }
-
-  ++entry->int_id_;
-}
-
-// Reports an unsuccessful upcall.
-
-ACE_INLINE void
-TAO_Metrics_UpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_1))
-{
-  CORBA::ULong count = 0;
-  MONITOR_MAP_ENTRY *entry;
-
-  if (missed_map_.trybind (handle, count, entry) < 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Failed trybind for handle %u in missed map\n", handle));
-      throw Metrics::INTERNAL_1 ();
-    }
-
-  ++entry->int_id_;
-}
-
-
-// Get the aggregate QoS statistics collected so far by the monitor.
-
-ACE_INLINE void
-TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_2,
-                     Metrics::INTERNAL_3))
-{
-  CORBA::ULong made_count = 0;
-  CORBA::ULong missed_count = 0;
-  MONITOR_MAP_ENTRY *made_entry;
-  MONITOR_MAP_ENTRY *missed_entry;
-
-  if (made_map_.trybind (handle, made_count, made_entry) < 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
-                  "Failed trybind for handle %u in made map\n", handle));
-      throw Metrics::INTERNAL_2 ();
-    }
-
-  if (missed_map_.trybind (handle, missed_count, missed_entry) < 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
-                  "Failed trybind for handle %u in missed map\n", handle));
-      throw Metrics::INTERNAL_3 ();
-    }
-
-  ACE_NEW_THROW_EX (qos,
-                    Metrics::QoSParameter_t,
-                    CORBA::NO_MEMORY ());
-
-  qos->handle = handle;
-  qos->deadlines_made = made_entry->int_id_;
-  qos->deadlines_missed = missed_entry->int_id_;
-  qos->operations_cancelled = 0;
-  qos->is_hrt = 0;
-}
-
-
-// Get the aggregate QoS statistics collected for each handle in the
-// passed set.
-
-ACE_INLINE void
-TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
-      const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_4,
-                     Metrics::INTERNAL_5))
-{
-  CORBA::ULong made_count = 0;
-  CORBA::ULong missed_count = 0;
-  MONITOR_MAP_ENTRY *made_entry = 0;
-  MONITOR_MAP_ENTRY *missed_entry = 0;
-
-  ACE_NEW_THROW_EX (qos_set,
-                    Metrics::QoSParameter_Set (handle_set.length ()),
-                    CORBA::NO_MEMORY ());
-  qos_set->length (handle_set.length ());
-
-
-  for (u_int i = 0; i < handle_set.length (); ++i)
-    {
-      made_count = 0;
-      missed_count = 0;
-      made_entry = 0;
-      missed_entry = 0;
-
-      if (made_map_.trybind (handle_set [i], made_count, made_entry) < 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
-                      "Failed trybind for handle_set [%d] = %u in made map\n",
-                      i, handle_set [i]));
-          throw Metrics::INTERNAL_4 ();
-        }
-
-      if (missed_map_.trybind (handle_set [i], missed_count, missed_entry) < 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
-                      "Failed trybind for handle_set[%d]=%u in missed map\n",
-                      i, handle_set [i]));
-          throw Metrics::INTERNAL_5 ();
-        }
-
-      qos_set [i].handle = handle_set [i];
-      qos_set [i].deadlines_made = made_entry->int_id_;
-      qos_set [i].deadlines_missed = missed_entry->int_id_;
-      qos_set [i].operations_cancelled = 0;
-      qos_set [i].is_hrt = 0;
-    }
-}
-
-
-
-// Resets the aggregate QoS information for the given operation.
-
-ACE_INLINE void
-TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_7,
-                     Metrics::INTERNAL_8))
-{
-  CORBA::ULong count = 0;
-
-  if (made_map_.rebind (handle, count) < 0)
-    {
-      throw Metrics::INTERNAL_7 ();
-    }
-
-  if (missed_map_.rebind (handle, count) < 0)
-    {
-      throw Metrics::INTERNAL_8 ();
-    }
-}
-
-
-// Accessor for map of operation handle to a count of deadlines missed.
-
-ACE_INLINE
-TAO_Metrics_UpcallMonitor::MONITOR_MAP &
-TAO_Metrics_UpcallMonitor::missed_map ()
-{
-  return this->missed_map_;
-}
-
-// Accessor for map of operation handle to a count of deadlines made.
-
-ACE_INLINE
-TAO_Metrics_UpcallMonitor::MONITOR_MAP &
-TAO_Metrics_UpcallMonitor::made_map ()
-{
-  return this->made_map_;
-}
-
-//////////////////////////////////////////////
-// Class TAO_Metrics_ReportingUpcallMonitor //
-//////////////////////////////////////////////
-
-// Default constructor.
-
-ACE_INLINE
-TAO_Metrics_ReportingUpcallMonitor::TAO_Metrics_ReportingUpcallMonitor ()
-{
-}
-
-// Destructor.
-
-ACE_INLINE
-TAO_Metrics_ReportingUpcallMonitor::~TAO_Metrics_ReportingUpcallMonitor ()
-{
-}
-
-// Reports a successful upcall.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_0))
-{
-  monitor_.report_made_deadline (handle);
-}
-
-// Reports an unsuccessful upcall.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_1))
-{
-  monitor_.report_missed_deadline (handle);
-}
-
-
-// Get the aggregate QoS statistics collected so far by the monitor.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_2,
-                     Metrics::INTERNAL_3))
-{
-  monitor_.get_aggregate_QoS (handle,
-                              qos);
-}
-
-
-// Get the aggregate QoS statistics collected for each handle in the
-// passed set.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set (
-      const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_4,
-                     Metrics::INTERNAL_5))
-{
-  monitor_.get_aggregate_QoS_set (handle_set,
-                                  qos_set);
-}
-
-
-
-// Resets the aggregate QoS information for the given operation.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::INTERNAL_7,
-                     Metrics::INTERNAL_8))
-{
-  monitor_.reset_statistics (handle);
-}
-
-
-// Reports the aggregate QoS statistics to the logger.
-
-ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS (
-      Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Metrics::NIL_LOGGER,
-                     Metrics::INTERNAL_6))
-{
-  if (CORBA::is_nil (logger))
-    {
-      throw Metrics::NIL_LOGGER ();
-    }
-
-  Metrics::QoSParameter_Set qos_set;
-  u_int set_length = 1;
-
-  // First, look at made map handles
-  MONITOR_MAP_ITERATOR iter (monitor_.made_map ());
-  for (; iter.done () == 0; ++iter, ++set_length)
-    {
-      CORBA::ULong missed_count;
-      if (monitor_.missed_map ().find ((*iter).ext_id_, missed_count) < 0)
-        {
-          missed_count = 0;
-        }
-
-      qos_set.length (set_length);
-
-      qos_set [set_length - 1].entry_point = (const char *) "MONITOR MADE_MAP_OP";
-      qos_set [set_length - 1].handle = (*iter).ext_id_;
-      qos_set [set_length - 1].deadlines_made = (*iter).int_id_;
-      qos_set [set_length - 1].deadlines_missed = missed_count;
-      qos_set [set_length - 1].operations_cancelled = 0;
-      qos_set [set_length - 1].is_hrt = 0;
-    }
-
-  // Then, find missed map handles with no made map entry.
-  MONITOR_MAP_ITERATOR missed_iter (monitor_.missed_map ());
-  for (; missed_iter.done () == 0; ++missed_iter)
-    {
-      CORBA::ULong made_count;
-      if (monitor_.made_map ().find ((*missed_iter).ext_id_, made_count) < 0)
-        {
-          qos_set.length (set_length);
-
-          qos_set [set_length - 1].entry_point = (const char *) "MONITOR MISS_MAP_OP";
-          qos_set [set_length - 1].handle = (*missed_iter).ext_id_;
-          qos_set [set_length - 1].deadlines_made = 0;
-          qos_set [set_length - 1].deadlines_missed = (*missed_iter).int_id_;
-          qos_set [set_length - 1].operations_cancelled = 0;
-          qos_set [set_length - 1].is_hrt = 0;
-
-          ++set_length;
-        }
-    }
-
-  logger->log_aggregate_QoS (qos_set, interval);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_UPCALL_MONITOR_I */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
deleted file mode 100644
index 6c2a6f85e0c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#ifndef METRICS_UPCALL_MONITOR_T_CPP
-#define METRICS_UPCALL_MONITOR_T_CPP
-
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl"
-#endif /* __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Virtual destructor: destroy actual consumer if we own it.
-template <class ACE_LOCK, class ALLOCATOR>
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-~TAO_Metrics_UpcallMonitorAdapter ()
-{
-  if (adapter_owns_consumer_)
-    {
-      delete (& consumer_);
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_UPCALL_MONITOR_T_CPP */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
deleted file mode 100644
index 679656f0cd0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#ifndef METRICS_UPCALL_MONITOR_T_H
-#define METRICS_UPCALL_MONITOR_T_H
-
-#if ! defined (VXWORKS)
-
-// Comment out both of these to disable output
-#  define METRICS_MONITOR_ERROR_OUTPUT_ENABLED
-#  define METRICS_MONITOR_DEBUG_OUTPUT_ENABLED
-
-#endif /* ! VXWORKS */
-
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
-
-#include "ace/Hash_Map_Manager.h"
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/MetricsS.h"
-
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <class ACE_LOCK, class ALLOCATOR>
-class TAO_Metrics_UpcallMonitorAdapter
-  : public RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //   This class implements an adapter for monitoring QoS received by
-  //   an event push consumer.
-  //
-  // = DESCRIPTION
-  //   This class wraps the consumer event push upcall with time
-  //   probe and monitor reporting calls.
-public:
-
-  TAO_Metrics_UpcallMonitorAdapter (
-    POA_Metrics::QoSMonitor & monitor,
-    TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> & cache,
-    TAO_Metrics_FrameManager<ACE_LOCK> & frame_manager,
-    POA_RtecEventComm::PushConsumer & consumer,
-    TAO::String_Manager entry_point,
-    RtecScheduler::handle_t handle,
-    RtecScheduler::Period_t period,
-    RtecScheduler::Time wcet,
-    RtecScheduler::Criticality_t criticality,
-    int adapter_owns_consumer = 1,
-    int cache_register = 1);
-  // Constructor that takes a reference to the various metrics
-  // objects, the actual push consumer we're monitoring, QoS info
-  // about the consumer, and an int that indicates whether (non-zero)
-  // or not (zero) we need to destroy the consumer in our destructor.
-
-  virtual ~TAO_Metrics_UpcallMonitorAdapter ();
-  // Virtual destructor: destroys actual consumer if it owns it.
-
-  RtecScheduler::Period_t get_period ();
-  // Get the current period for the adapter.
-
-  void set_period (RtecScheduler::Period_t period);
-  // Set the current period for the adapter.
-
-  void push (const RtecEventComm::EventSet & data,
-             CORBA::Environment &ACE_TRY_ENV =
-             CORBA::Environment::default_environment ());
-  // Do a monitored push to the actual PushConsumer for which we're a proxy
-
-  void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV =
-                                 CORBA::Environment::default_environment ());
-  // Delegates to the actual PushConsumer for which we're a proxy
-
-protected:
-
-  // = Implementation members.
-
-  POA_Metrics::QoSMonitor & monitor_;
-  // A reference to the monitor to which we report.
-
-  TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> & cache_;
-  // A reference to the metrics data cache to which we report.
-
-  TAO_Metrics_FrameManager<ACE_LOCK> & frame_manager_;
-  // A reference to the frame manager we use.
-
-  POA_RtecEventComm::PushConsumer & consumer_;
-  // A reference to the actual PushConsumer for which we're a proxy
-
-  RtecScheduler::handle_t handle_;
-  // Handle of the operation we're wrapping.
-
-  RtecScheduler::Period_t period_;
-  // Current period for the adapter.
-
-  ACE_Time_Value  execution_time_;
-  // Current execution time for the adapter.
-
-  int is_critical_;
-  // Whether or not the adapter is critical.
-
-  int adapter_owns_consumer_;
-  // indicates whether (non-zero) or not (zero) we need
-  // to destroy the consumer in our destructor.
-
-};
-
-template <class ACE_LOCK, class ALLOCATOR>
-class TAO_Metrics_ReportingUpcallMonitorAdapter
-  : public TAO_Metrics_UpcallMonitorAdapter <ACE_LOCK, ALLOCATOR>
-{
-  // = TITLE
-  //   This class implements an adapter for monitoring QoS received by
-  //   an event push consumer.
-  //
-  // = DESCRIPTION
-  //   This class wraps the consumer event push upcall with time
-  //   probe and monitor reporting calls.
-public:
-
-  TAO_Metrics_ReportingUpcallMonitorAdapter (
-    POA_Metrics::QoSMonitor & monitor,
-    TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR> & cache,
-    TAO_Metrics_FrameManager<ACE_LOCK> & frame_manager,
-    POA_RtecEventComm::PushConsumer & consumer,
-    TAO::String_Manager entry_point,
-    RtecScheduler::handle_t handle,
-    RtecScheduler::Period_t period,
-    RtecScheduler::Time wcet,
-    RtecScheduler::Criticality_t criticality,
-    int adapter_owns_consumer = 1,
-    Metrics::QoSLogger_ptr logger = 0);
-  // Constructor that takes a reference to a logger object and
-  // info needed to construct or base class.
-
-protected:
-
-  // = Implementation members.
-
-  Metrics::QoSLogger_ptr logger_;
-  // A (possibly null) CORBA pointer to a logging object
-
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Metrics_UpcallMonitor_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* METRICS_UPCALL_MONITOR_T_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
deleted file mode 100644
index d9fcdb2975d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// @METRICS@
-
-#ifndef METRICS_UPCALL_MONITOR_T_I
-#define METRICS_UPCALL_MONITOR_T_I
-
-//# if defined (METRICS_USES_OP_CANCELLATION)
-//# undef METRICS_USES_OP_CANCELLATION
-//# endif /* METRICS_USES_OP_CANCELLATION */
-
-# if ! defined (METRICS_USES_OP_CANCELLATION)
-#   define METRICS_USES_OP_CANCELLATION
-# endif /* ! METRICS_USES_OP_CANCELLATION */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-////////////////////////////////////////////
-// class TAO_Metrics_UpcallMonitorAdapter //
-////////////////////////////////////////////
-
-
-// Constructor that takes a reference to the actual push consumer
-// we're monitoring and an int that indicates whether (non-zero) or
-// not (zero) we need to destroy the consumer in our destructor.
-
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-TAO_Metrics_UpcallMonitorAdapter (
-  POA_Metrics::QoSMonitor & monitor,
-  TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> &cache,
-  TAO_Metrics_FrameManager<ACE_LOCK> &frame_manager,
-  POA_RtecEventComm::PushConsumer & consumer,
-  TAO::String_Manager entry_point,
-  RtecScheduler::handle_t handle,
-  RtecScheduler::Period_t period,
-  RtecScheduler::Time wcet,
-  RtecScheduler::Criticality_t criticality,
-  int adapter_owns_consumer,
-  int cache_register)
-  : monitor_ (monitor),
-    cache_ (cache),
-    frame_manager_ (frame_manager),
-    consumer_ (consumer),
-    handle_ (handle),
-    period_ (period),
-    adapter_owns_consumer_ (adapter_owns_consumer)
-{
-//DCL:Added to remove Linux compile warning
-      ACE_UNUSED_ARG(entry_point);
-
-  // Ensure that the high res timer global scale factor
-  // is set before any of its static methods are used
-  ACE_High_Res_Timer::global_scale_factor ();
-
-  // Store the RT_Info execution time.
-  ORBSVCS_Time::TimeT_to_Time_Value(this->execution_time_,
-                                    wcet);
-  this->is_critical_ =
-    (criticality == RtecScheduler::HIGH_CRITICALITY
-     || criticality == RtecScheduler::VERY_HIGH_CRITICALITY)
-    ? 1 : 0;
-
-  // Use the type-preserving argument rather than the base class
-  // reference which is fine everywhere but here.
-  if (cache_register)
-    {
-          if (cache.metrics_enabled())
-         cache.register_upcall_adapter (this->handle_,
-                                        entry_point,
-                                        this->is_critical_);
-    }
-}
-
-
-// Get the current priod for the adapter.
-
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE RtecScheduler::Period_t
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-get_period ()
-{
-  return this->period_;
-}
-
-
-// Set the current priod for the adapter.
-
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE void
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-set_period (RtecScheduler::Period_t period)
-{
-  this->period_ = period;
-}
-
-
-// Do a monitored push to the actual PushConsumer for which we're a proxy
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE void
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-push (const RtecEventComm::EventSet & data,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Save stamped deadline.
-  ACE_Time_Value deadline_tv;
-
-  // If we get an error, just set the deadline to zero, and possibly
-  // complain.
-  if (this->frame_manager_.get_end_time (this->period_, deadline_tv) < 0)
-    {
-      deadline_tv = ACE_Time_Value::zero;
-# if defined (METRICS_MONITOR_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_UpcallMonitorAdapter::push"
-                  " get_end_time failed .\n"));
-# endif /* METRICS_MONITOR_ERROR_OUTPUT_ENABLED */
-    }
-
-# if defined (METRICS_USES_OP_CANCELLATION)
-
-  // Take current time stamp and add expected execution to get
-  // projected completion.  Done this way for efficiency, to minimize
-  // temporaries and their copies and constructor and destructor calls.
-  ACE_Time_Value projected_tv;
-  ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
-  ACE_High_Res_Timer::hrtime_to_tv (projected_tv,
-                                    hrtime_now);
-  projected_tv += this->execution_time_;
-
-  // Operation cancellation: uses WCET to determine whether or not
-  // deadline will be met. A critical operation (is_critical_) is
-  // dispatched unconditionally.  A zero deadline indicates an
-  // operation is not deadline-bound and thus is not subject to
-  // cancellation.
-  if (this->is_critical_
-      || deadline_tv >= projected_tv
-      || deadline_tv == ACE_Time_Value::zero)
-    {
-# endif /* METRICS_USES_OP_CANCELLATION */
-
-      // Record the start of the upcall in the cache.
-#if 0
-      if ( this->handle_ != TAO_Metrics_Utils::timeoutEvent ())
-#endif /* 0 */
-        if (cache_.metrics_enabled())
-           cache_.report_upcall_start (this->handle_);
-
-      // Push to the actual consumer.
-      consumer_.push (data, ACE_TRY_ENV);
-
-      // Record the end of the upcall in the cache, and report whether
-      // the deadline was made or missed to the monitor.
-
-#if 0
-      if ( this->handle_ != TAO_Metrics_Utils::timeoutEvent ())
-        {
-#else /* 1 */
-      if (1)
-        {
-#endif /* 0 */
-        if (cache_.metrics_enabled())
-        {
-          int result = cache_.report_upcall_stop (this->handle_, deadline_tv);
-          if (result == 0)
-          {
-              monitor_.report_made_deadline (this->handle_, ACE_TRY_ENV);
-          }
-          else if (result == 1)
-          {
-              monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
-          }
-# if defined (METRICS_MONITOR_ERROR_OUTPUT_ENABLED)
-          else
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "TAO_Metrics_UpcallMonitorAdapter::push"
-                          " upcall stop reporting failed .\n"));
-            }
-
-# endif /* METRICS_MONITOR_ERROR_OUTPUT_ENABLED */
-        }
-        }
-# if defined (METRICS_USES_OP_CANCELLATION)
-    }
-  else
-    {
-#  if defined (METRICS_MONITOR_DEBUG_OUTPUT_ENABLED)
-      ACE_DEBUG ((LM_INFO,
-                  "SRT Operation cancelled .\n"));
-#  endif /* METRICS_MONITOR_DEBUG_OUTPUT_ENABLED */
-
-      if (cache_.metrics_enabled())
-      {
-         // The operation push was cancelled: report the cancellation to
-         // the cache and the missed deadline to the monitor.
-         cache_.report_upcall_cancellation (this->handle_);
-         monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
-      }
-    }
-
-# endif /* METRICS_USES_OP_CANCELLATION */
-}
-
-// Delegates to the actual PushConsumer for which we're a proxy.
-
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE void
-TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-{
-  consumer_.disconnect_push_consumer (ACE_TRY_ENV);
-}
-
-
-template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE
-TAO_Metrics_ReportingUpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
-TAO_Metrics_ReportingUpcallMonitorAdapter (
-  POA_Metrics::QoSMonitor & monitor,
-  TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR> &cache,
-  TAO_Metrics_FrameManager<ACE_LOCK> &frame_manager,
-  POA_RtecEventComm::PushConsumer & consumer,
-  TAO::String_Manager entry_point,
-  RtecScheduler::handle_t handle,
-  RtecScheduler::Period_t period,
-  RtecScheduler::Time wcet,
-  RtecScheduler::Criticality_t criticality,
-  int adapter_owns_consumer,
-  Metrics::QoSLogger_ptr logger)
-  : TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>
-      (monitor,
-       cache,
-       frame_manager,
-       consumer,
-       entry_point,
-       handle,
-       period,
-       wcet,
-       criticality,
-       adapter_owns_consumer,
-       0 /* don't register */),
-    logger_ (logger)
-{
-      // Use the type-preserving argument rather than the base class
-      // reference which is fine everywhere but here.
-      cache.register_upcall_adapter (this->handle_,
-                                     entry_point,
-                                     this->is_critical_,
-                                     this->logger_);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_UPCALL_MONITOR_T_I */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
deleted file mode 100644
index 1fe21850a99..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-// $Id$
-
-#ifndef METRICS_UTILS_CPP
-#define METRICS_UTILS_CPP
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-
-#include "ace/Metrics_Cache.h"
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/////////////////////////////
-// Class TAO_Metrics_Utils //
-/////////////////////////////
-
-// Static constants
-
-const u_int WSOA_Metrics_Handles::WSOA_METRICS_MAX_TILING_FACTOR = 64;
-
-const u_int TAO_Metrics_Utils::METRICS_BUFSIZE = 64;
-
-const u_int TAO_Metrics_Utils::METRICS_ENQUEUE_PROBE_ID_BASE = 0;
-const u_int TAO_Metrics_Utils::METRICS_DEQUEUE_PROBE_ID_BASE = 1000;
-const u_int TAO_Metrics_Utils::METRICS_SCHED_PROBE_ID_BASE = 2000;
-const u_int TAO_Metrics_Utils::METRICS_QUO_PROBE_ID_BASE = 3000;
-const u_int TAO_Metrics_Utils::METRICS_RTARM_PROBE_ID_BASE = 4000;
-const u_int TAO_Metrics_Utils::METRICS_TNS_PROBE_ID_BASE = 5000;
-const u_int TAO_Metrics_Utils::METRICS_TEEC_PROBE_ID_BASE = 6000;
-const u_int TAO_Metrics_Utils::METRICS_UPCALL_MONITOR_ADAPTER_ID_BASE = 7000;
-
-// Static variable
-
-RtecScheduler::handle_t TAO_Metrics_Utils::timeoutEvent_ = 72;
-
-
-
-// Static method to set the mission state in the logger.
-
-void
-TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger)
-{
-  if (CORBA::is_nil (logger))
-    {
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_Utils::set_mission_state:\n"
-                          "Logger IOR reference is nil.\n"));
-#endif
-      return;
-    }
-
-  char banner [TAO_Metrics_Utils::METRICS_BUFSIZE];
-  ACE_OS::memset (banner, 0, TAO_Metrics_Utils::METRICS_BUFSIZE);
-  ACE_OS::sprintf (banner, "\n\n*** Mission State %d ***\n\n", i);
-
-  try
-    {
-      logger->send_banner (banner);
-    }
-  catch (const CORBA::Exception& ex)
-    {
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-      ex._tao_print_exception (
-        "TAO_Metrics_LocalCache::set_mission_state:"
-        " logger call failed\n");
-#endif
-    }
-}
-
-// Sets the logger reference.
-
-Metrics::QoSLogger_var
-TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
-                               CORBA::ORB_ptr orb)
-{
-  Metrics::QoSLogger_var logger;
-  if (logger_ior_str && orb)
-    {
-      try
-        {
-          CORBA::Object_var obj =
-            orb->string_to_object (logger_ior_str);
-
-          if (CORBA::is_nil (obj.in ()))
-            {
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-              ACE_ERROR ((LM_ERROR,
-                          "TAO_Metrics_Utils::get_logger:\n"
-                          "Logger IOR string produced a "
-                          "nil reference:\n[%s]",
-                          logger_ior_str));
-#endif
-              return logger;
-            }
-          else
-            {
-              logger = Metrics::QoSLogger::_narrow (obj.in ());
-
-              if (CORBA::is_nil (logger.in ()))
-                {
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-                  ACE_ERROR ((LM_ERROR,
-                             "TAO_Metrics_LocalCache::set_logger:\n"
-                             "Could not narrow IOR to logger:\n[%s]",
-                             logger_ior_str));
-#endif
-                  return logger;
-                }
-            }
-        }
-      catch (const CORBA::Exception& ex)
-        {
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-          ex._tao_print_exception (
-            "TAO_Metrics_LocalCache::set_logger exception");
-#endif
-          return logger;
-        }
-    }
-#if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Metrics_LocalCache::set_logger:\n"
-                  "must pass a non-zero orb and ior pointer\n"));
-    }
-#endif
-  return logger;
-}
-
-
-////////////////////////////////
-// class WSOA_Metrics_Handles //
-////////////////////////////////
-
-// Default constructor - registers all WSOA METRICS INSTRUMENTATION handles.
-
-WSOA_Metrics_Handles::WSOA_Metrics_Handles ()
-  : tiles_requested_ (0)
-  , compute_metrics_handle_(0)
-  , RTARM_triggered_adaptation_metrics_handle_(0)
-  , RTARM_region_transition_metrics_handle_(0)
-  , QuO_contract_eval_metrics_handle_(0)
-  , tile_request_delegate_metrics_handle_(0)
-  , image_received_metrics_handle_(0)
-  , image_processed_metrics_handle_(0)
-  , image_quiescent_metrics_handle_(0)
-  , tile_received_first_metrics_handle_(0)
-  , tile_queuing_first_metrics_handle_(0)
-  , tile_decompression_first_metrics_handle_(0)
-  , tile_decompression_handle_(0)
-  , tile_ipm_first_metrics_handle_(0)
-  , tile_processed_first_metrics_handle_(0)
-  , zlib_compression_handle_(0)
-  , zlib_decompression_handle_(0)
-{
-#ifdef TAO_USES_REPORTING_METRICS
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "TAO_compute_scheduling",
-                                   TAO_Metrics_Utils::SCHED,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->compute_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "RTARM_triggered_adaptation",
-                                   TAO_Metrics_Utils::RTARM,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->RTARM_triggered_adaptation_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "RTARM_region_transition",
-                                   TAO_Metrics_Utils::RTARM,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->RTARM_region_transition_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "QuO_contract_eval",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->QuO_contract_eval_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_request_delegate",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_request_delegate_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_received",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->image_received_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_processed",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->image_processed_metrics_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_quiescent",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->image_quiescent_metrics_handle_);
-
-     char registration_name[64];
-     u_int i;
-
-     // Store the first tile received handle, and make room for the others.
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_received_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_received_first_metrics_handle_);
-
-     RtecScheduler::handle_t temp_metrics_handle = 0;
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_received_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                       temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_processed_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_processed_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_processed_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-        REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                      base_metrics,
-                                      registration_name,
-                                      TAO_Metrics_Utils::QUO,
-                                      *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                      temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_queuing_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_queuing_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_queuing_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                       temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_decompression_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_decompression_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_decompression_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                       temp_metrics_handle);
-     }
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_ipm_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->tile_ipm_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_ipm_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                       temp_metrics_handle);
-     }
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "zlib Compression",
-                                   TAO_Metrics_Utils::SCHED,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->zlib_compression_handle_);
-
-     REGISTER_METRICS_REPORTING_PROBE_RETURN(TAO_METRICS_REPORTING_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "zlib Compression",
-                                   TAO_Metrics_Utils::SCHED,
-                                   *TAO_METRICS_LOGGER_REF_SINGLETON::instance(),
-                                   this->zlib_decompression_handle_);
-#else /* ! TAO_USES_REPORTING_METRICS */
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "TAO_compute_scheduling",
-                                   TAO_Metrics_Utils::SCHED,
-                                   this->compute_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "RTARM_triggered_adaptation",
-                                   TAO_Metrics_Utils::RTARM,
-                                   this->RTARM_triggered_adaptation_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "RTARM_region_transition",
-                                   TAO_Metrics_Utils::RTARM,
-                                   this->RTARM_region_transition_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "QuO_contract_eval",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->QuO_contract_eval_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_request_delegate",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_request_delegate_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_received",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->image_received_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_processed",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->image_processed_metrics_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "image_quiescent",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->image_quiescent_metrics_handle_);
-
-     char registration_name[64];
-     u_int i;
-
-     // Store the first tile received handle, and make room for the others.
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_received_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_received_first_metrics_handle_);
-
-     RtecScheduler::handle_t temp_metrics_handle;
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_received_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_processed_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_processed_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_processed_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-        REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                      base_metrics,
-                                      registration_name,
-                                      TAO_Metrics_Utils::QUO,
-                                      temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_queuing_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_queuing_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_queuing_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       temp_metrics_handle);
-     }
-
-     // Store the first tile processed handle, and make room for the others.
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_decompression_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_decompression_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_decompression_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       temp_metrics_handle);
-     }
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "tile_ipm_0",
-                                   TAO_Metrics_Utils::QUO,
-                                   this->tile_ipm_first_metrics_handle_);
-
-     for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i)
-     {
-             ::sprintf (registration_name, "tile_ipm_%d", i);
-
-         // We just throw the handles away rather than storing them,
-             // as they're always calculated by offset from the first.
-         REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       temp_metrics_handle);
-
-         REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                       base_metrics,
-                                       registration_name,
-                                       TAO_Metrics_Utils::QUO,
-                                       tile_decompression_handle_);
-     }
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "zlib Compression",
-                                   TAO_Metrics_Utils::SCHED,
-                                   this->zlib_compression_handle_);
-
-     REGISTER_METRICS_PROBE_RETURN(TAO_METRICS_CACHE_SINGLETON_TYPE::instance(),
-                                   base_metrics,
-                                   "zlib Compression",
-                                   TAO_Metrics_Utils::SCHED,
-                                   this->zlib_decompression_handle_);
-#endif /* TAO_USES_REPORTING_METRICS */
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.inl"
-#endif /* __ACE_INLINE__ */
-
-#else
-#error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-#endif /* METRICS_UTILS_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
deleted file mode 100644
index 20364885350..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-#ifndef METRICS_UTILS_H
-#define METRICS_UTILS_H
-
-
-#if defined (ACE_METRICS_COLLECTION)
-
-#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
-
-#if ! defined (VXWORKS)
-
-// Comment out both of these to disable output
-#  define METRICS_UTILS_ERROR_OUTPUT_ENABLED
-#  define METRICS_UTILS_DEBUG_OUTPUT_ENABLED
-
-#endif /* ! VXWORKS */
-
-#include "ace/OS.h"
-#include "ace/Singleton.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/MetricsC.h"
-#include "orbsvcs/Metrics/metrics_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Metrics_Export TAO_Metrics_Utils
-{
-  // = TITLE
-  //   Defines a class for various metrics utility functions.
-  //
-  // = DESCRIPTION
-  //   This class provides static methods for various general
-  //   purpose tasks for managing and using the metrics framework.
-
-public:
-
-  // Type declarations
-
-  enum Base_Metrics_Type {SCHED, QUO, RTARM, TNS, TEEC};
-
-  static const u_int METRICS_BUFSIZE;
-  // Constant size for local buffers.
-
-  static const u_int METRICS_ENQUEUE_PROBE_ID_BASE;
-  static const u_int METRICS_DEQUEUE_PROBE_ID_BASE;
-  static const u_int METRICS_SCHED_PROBE_ID_BASE;
-  static const u_int METRICS_QUO_PROBE_ID_BASE;
-  static const u_int METRICS_TNS_PROBE_ID_BASE;
-  static const u_int METRICS_TEEC_PROBE_ID_BASE;
-  static const u_int METRICS_RTARM_PROBE_ID_BASE;
-  static const u_int METRICS_UPCALL_MONITOR_ADAPTER_ID_BASE;
-  // Constants for offsets into ranges of probe ids.
-
-  static void set_mission_state (int i, Metrics::QoSLogger_ptr logger);
-  // Sets the mission state in the logger referenced by the passed pointer.
-
-  static void set_mission_state (int i, const char * logger_ior_str);
-  // Sets the mission state in the logger referenced by the passed ior string.
-
-  static Metrics::QoSLogger_var get_logger (const char * logger_ior_str,
-                                            CORBA::ORB_ptr orb_);
-  // Gets a pointer to a logger from the passed logger ior string,
-  // using the passed ORB.
-
-  static RtecScheduler::handle_t timeoutEvent (void);
-  // Accessor for static timeout event handle.  This handle is ignored
-  // by the QoS monitor, since by definition it will be dispatched
-  // after the end-of-frame.
-
-  static void timeoutEvent (RtecScheduler::handle_t handle);
-  // Mutator for static timeout event handle.  This handle is ignored
-  // by the QoS monitor, since by definition it will be dispatched
-  // after the end-of-frame.
-
-private:
-
-  static RtecScheduler::handle_t timeoutEvent_;
-};
-
-
-struct TAO_Metrics_Export WSOA_Metrics_Handles
-{
-  // = TITLE
-  //   Defines a helper class for WSOA METRICS INSTRUMENTATION.
-  //
-  // = DESCRIPTION
-  //   This class provides a single point of initialization (registration)
-  //   and storage for the handles used in WSOA metrics collection.  It is necessary
-  //   to define this class at this level to cross-cut multiple layers of the
-  //   architecture and provide consistent points of instrumentation across layers.
-
-public:
-
-  WSOA_Metrics_Handles ();
-  // Default constructor - registers all handles.
-
-  // number of tile handles to reserve in each category.
-  static const u_int WSOA_METRICS_MAX_TILING_FACTOR;
-
-  // global attribute to decide when image is downloaded.
-  u_long tiles_requested_;
-
-  // Globally accessible handles for METRICS INSTRUMENTATION
-  RtecScheduler::handle_t compute_metrics_handle_;
-  RtecScheduler::handle_t RTARM_triggered_adaptation_metrics_handle_;
-  RtecScheduler::handle_t RTARM_region_transition_metrics_handle_;
-  RtecScheduler::handle_t QuO_contract_eval_metrics_handle_;
-  RtecScheduler::handle_t tile_request_delegate_metrics_handle_;
-  RtecScheduler::handle_t image_received_metrics_handle_;
-  RtecScheduler::handle_t image_processed_metrics_handle_;
-  RtecScheduler::handle_t image_quiescent_metrics_handle_;
-  RtecScheduler::handle_t tile_received_first_metrics_handle_;
-  RtecScheduler::handle_t tile_queuing_first_metrics_handle_;
-  RtecScheduler::handle_t tile_decompression_first_metrics_handle_;
-  RtecScheduler::handle_t tile_decompression_handle_;
-  RtecScheduler::handle_t tile_ipm_first_metrics_handle_;
-  RtecScheduler::handle_t tile_processed_first_metrics_handle_;
-
-  RtecScheduler::handle_t zlib_compression_handle_;
-  RtecScheduler::handle_t zlib_decompression_handle_;
-};
-
-typedef ACE_Singleton<WSOA_Metrics_Handles, ACE_SYNCH_MUTEX>
-WSOA_METRICS_HANDLES_SINGLETON;
-
-/**
- * NOTE: This is a simple macro which calls the appropriate registration function with the cache to
- *       store the data from this pointer. At the ACE level there is no need to give a PROBE_TYPE
- *       because there is only one probe type (ACE_Timeprobe).
- *
- * USAGE_LEVEL: TAO
- *
- * Q1: Where is this and the next macro used? One example is on TAO/orbsvcs/orbsvcs/Metrics. No where in the ace code.
- *    So is this a ACE or TAO macro? 
- *
- * Q2: Is the function (register + METRICS_REGION) a ACE or TAO?
- * A2: TAO. Define in Metrics_Local_Cache_T.h. The only METRICS_REGION that exists is 'base_metrics'. Used
- *     in $TAO_ROOT/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
- *
- * @param METRICS_PTR - Initialized pointer to the Metrics_Cache. This pointer is used to register the probe
- *                      with the associated cache.
- * @param METIRCS_REGION - At present there is only one 'base_metrics'.
- * @param PROBE_NAME - String name of the probe
- * @param PROBE_TYPE - Unsigned integer representing the probe type
- * @param METRICS_HANDLE - Variable used to contain the metrics probe handle that is the result of this function
- *                         The type of the handle is a RtecScheduler::handle_t
- */
-#  define REGISTER_METRICS_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_HANDLE) \
-do { if((METRICS_PTR->metrics_enabled())) { \
-METRICS_HANDLE = METRICS_PTR-> \
-register_##METRICS_REGION ( \
-PROBE_NAME, \
-PROBE_TYPE); \
-} } while (0)
-
-/**
- * Same as above but instead of just reporting information to a cache there is also reference to a Metrics_Loger (TAO feature).
- * The logger is used to record the information. The type of probe is register with the logger
- *
- * USAGE_LEVEL: TAO
- */
-#  define REGISTER_METRICS_REPORTING_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_LOGGER_REF,METRICS_HANDLE) \
-do { if((METRICS_PTR->metrics_enabled())) { \
-METRICS_HANDLE = METRICS_PTR-> \
-register_##METRICS_REGION## ( \
-PROBE_NAME, \
-PROBE_TYPE, \
-METRICS_LOGGER_REF); \
-} } while (0)
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_METRICS_COLLECTION */
-
-#endif /* METRICS_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
deleted file mode 100644
index 04a77bddb52..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef METRICS_UTILS_I
-#define METRICS_UTILS_I
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/////////////////////////////
-// Class TAO_Metrics_Utils //
-/////////////////////////////
-
-// Accessor for static timeout event handle.  This handle is ignored
-// by the QoS monitor, since by definition it will be dispatched
-// after the end-of-frame.
-
-ACE_INLINE
-RtecScheduler::handle_t
-TAO_Metrics_Utils::timeoutEvent (void)
-{
-  return TAO_Metrics_Utils::timeoutEvent_;
-}
-
-
-// Mutator for static timeout event handle.  This handle is ignored
-// by the QoS monitor, since by definition it will be dispatched
-// after the end-of-frame.
-
-ACE_INLINE
-void
-TAO_Metrics_Utils::timeoutEvent (RtecScheduler::handle_t handle)
-{
-  TAO_Metrics_Utils::timeoutEvent_ = handle;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* METRICS_UTILS_I */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/metrics_export.h b/TAO/orbsvcs/orbsvcs/Metrics/metrics_export.h
deleted file mode 100644
index 846c6c45427..00000000000
--- a/TAO/orbsvcs/orbsvcs/Metrics/metrics_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 TAO_Metrics
-// ------------------------------
-#ifndef TAO_METRICS_EXPORT_H
-#define TAO_METRICS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TAO_METRICS_HAS_DLL)
-#  define TAO_METRICS_HAS_DLL 1
-#endif /* ! TAO_METRICS_HAS_DLL */
-
-#if defined (TAO_METRICS_HAS_DLL) && (TAO_METRICS_HAS_DLL == 1)
-#  if defined (TAO_METRICS_BUILD_DLL)
-#    define TAO_Metrics_Export ACE_Proper_Export_Flag
-#    define TAO_METRICS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_METRICS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_METRICS_BUILD_DLL */
-#    define TAO_Metrics_Export ACE_Proper_Import_Flag
-#    define TAO_METRICS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_METRICS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_METRICS_BUILD_DLL */
-#else /* TAO_METRICS_HAS_DLL == 1 */
-#  define TAO_Metrics_Export
-#  define TAO_METRICS_SINGLETON_DECLARATION(T)
-#  define TAO_METRICS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_METRICS_HAS_DLL == 1 */
-
-// Set TAO_METRICS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_METRICS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_METRICS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_METRICS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_METRICS_NTRACE */
-
-#if (TAO_METRICS_NTRACE == 1)
-#  define TAO_METRICS_TRACE(X)
-#else /* (TAO_METRICS_NTRACE == 1) */
-#  define TAO_METRICS_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (TAO_METRICS_NTRACE == 1) */
-
-#endif /* TAO_METRICS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index deacbd41cf5..13b38644e22 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -17,7 +17,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
   ITERATOR *hash_iter,
   PortableServer::POA_ptr poa,
   TAO_SYNCH_RECURSIVE_MUTEX &lock)
-  : destroyed_ (0),
+  : destroyed_ (false),
     context_ (context),
     hash_iter_ (hash_iter),
     lock_ (lock),
@@ -46,9 +46,8 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA ()
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
     CosNaming::Binding_out b)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CosNaming::Binding *binding;
+  CosNaming::Binding *binding = 0;
 
   // Allocate a binding to be returned (even if there no more
   // bindings, we need to allocate an out parameter.)
@@ -65,7 +64,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If the context we are iterating over has been destroyed,
   // self-destruct.
@@ -73,7 +72,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
     {
       destroy ();
 
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 
   // If there are no more bindings.
@@ -90,7 +89,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
       hash_iter_->next (hash_entry);
 
       if (populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+        throw CORBA::NO_MEMORY ();
 
       hash_iter_->advance ();
       return 1;
@@ -101,7 +100,6 @@ template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
     CORBA::ULong how_many,
     CosNaming::BindingList_out bl)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
   // parameter is allocated in case we fail to obtain the lock.
@@ -116,7 +114,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If the context we are iterating over has been destroyed,
   // self-destruct.
@@ -124,12 +122,12 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
     {
       destroy ();
 
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 
   // Check for illegal parameter values.
   if (how_many == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   // If there are no more bindings...
   if (hash_iter_->done ())
@@ -148,7 +146,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
           hash_iter_->next (hash_entry);
 
           if (populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+            throw CORBA::NO_MEMORY ();
 
           if (hash_iter_->advance () == 0)
             {
@@ -164,7 +162,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
 
 template <class ITERATOR, class TABLE_ENTRY> void
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -176,7 +173,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
     throw CORBA::OBJECT_NOT_EXIST ();
 
   // Mark the object invalid.
-  this->destroyed_ = 1;
+  this->destroyed_ = true;
 
   PortableServer::ObjectId_var id =
     poa_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index d5ad7132c66..7e85834f857 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -73,8 +73,7 @@ public:
 
   /// This operation passes back the next unseen binding.  True is
   /// returned if a binding is passed back, and false is returned otherwise.
-  CORBA::Boolean next_one (CosNaming::Binding_out b)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean next_one (CosNaming::Binding_out b);
 
   /**
    * This operation passes back at most <how_many> unseen bindings.
@@ -82,12 +81,10 @@ public:
    * returned if no bindings were passed back.
    */
   CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         CosNaming::BindingList_out bl);
 
   /// This operation destroys the iterator.
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   // = Helper method.
 
@@ -97,8 +94,7 @@ public:
    * in <hash_entry>.  Return 1 if everything went smoothly, 0 if an
    * allocation failed.
    */
-  static int populate_binding (TABLE_ENTRY *hash_entry,
-                               CosNaming::Binding &b);
+  static int populate_binding (TABLE_ENTRY *hash_entry, CosNaming::Binding &b);
 
 private:
   /**
@@ -109,7 +105,7 @@ private:
    * because immediate destruction of this servant might not be possible
    * due to pending requests in the POA.
    */
-  int destroyed_;
+  bool destroyed_;
 
   /**
    * Pointer to the Naming Context we are iterating over.  We need
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
index 5fddba2a270..aae10d1aa90 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Entries.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Entries.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Entries.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index 6d5ccc82e09..efaa900e534 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -6,6 +6,8 @@
 #include "orbsvcs/Naming/Flat_File_Persistence.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Numeric_Limits.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
@@ -216,11 +218,10 @@ TAO_NS_FlatFileStream::operator <<(
 }
 
 TAO_Storable_Base &
-TAO_NS_FlatFileStream::operator >>(
-                       TAO_NS_Persistence_Record &record)
+TAO_NS_FlatFileStream::operator >>(TAO_NS_Persistence_Record &record)
 {
   ACE_TRACE("TAO_NS_FlatFileStream::operator >>");
-  TAO_NS_Persistence_Record::Record_Type type;
+
   int temp_type_in;
   switch (fscanf(fl_, "%d\n", &temp_type_in))
     {
@@ -231,10 +232,13 @@ TAO_NS_FlatFileStream::operator >>(
       this->setstate (eofbit);
       return *this;
     }
-  type = (TAO_NS_Persistence_Record::Record_Type) temp_type_in;
-  record.type(type);
+  TAO_NS_Persistence_Record::Record_Type type =
+    (TAO_NS_Persistence_Record::Record_Type) temp_type_in;
+  record.type (type);
 
   int bufSize = 0;
+  ACE_CString::size_type const max_buf_len =
+    ACE_Numeric_Limits<ACE_CString::size_type>::max ();
 
   //id
   switch (fscanf(fl_, "%d\n", &bufSize))
@@ -246,18 +250,26 @@ TAO_NS_FlatFileStream::operator >>(
       this->setstate (eofbit);
       return *this;
     }
-  char *id = new char[bufSize+1];
-  //char *id;
-  //ACE_NEW_RETURN (id, char[bufSize+1], 1);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_) == 0 &&
-      bufSize != 0)
+
+  if (bufSize < 0
+      || static_cast<ACE_CString::size_type> (bufSize) >= max_buf_len)
     {
       this->setstate (badbit);
       return *this;
     }
-  ACE_CString newId(id);
-  record.id(newId);
-  delete [] id;
+  {
+    ACE_Auto_Basic_Array_Ptr<char> the_id (new char[bufSize + 1]);
+    the_id[0] = '\0';
+    if (ACE_OS::fgets (ACE_TEXT_CHAR_TO_TCHAR (the_id.get ()),
+                       bufSize + 1,
+                       fl_) == 0
+        && bufSize != 0)
+      {
+        this->setstate (badbit);
+        return *this;
+      }
+    record.id (ACE_CString (the_id.get (), 0, false));
+  }
 
   //kind
   switch (fscanf(fl_, "%d\n", &bufSize))
@@ -269,19 +281,27 @@ TAO_NS_FlatFileStream::operator >>(
       this->setstate (eofbit);
       return *this;
     }
-  char *kind = new char[bufSize+1];
-  //char *kind;
-  //ACE_NEW (kind, char[bufSize+1]);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_) == 0 &&
-      bufSize != 0)
+
+  if (bufSize < 0
+      || static_cast<ACE_CString::size_type> (bufSize) >= max_buf_len)
     {
       this->setstate (badbit);
       return *this;
     }
-  kind[bufSize] = '\0';
-  ACE_CString newKind(kind);
-  record.kind(newKind);
-  delete [] kind;
+
+  {
+    ACE_Auto_Basic_Array_Ptr<char> the_kind (new char[bufSize + 1]);
+    the_kind[0] = '\0';
+    if (ACE_OS::fgets (ACE_TEXT_CHAR_TO_TCHAR (the_kind.get ()),
+                       bufSize + 1,
+                       fl_) == 0
+        && bufSize != 0)
+      {
+        this->setstate (badbit);
+        return *this;
+      }
+    record.kind (ACE_CString (the_kind.get (), 0, false));
+  }
 
    //ref
   switch (fscanf(fl_, "%d\n", &bufSize))
@@ -293,18 +313,27 @@ TAO_NS_FlatFileStream::operator >>(
       this->setstate (eofbit);
       return *this;
     }
-  char *ref = new char[bufSize+1];
-  //char *ref;
-  //ACE_NEW(ref, char[bufSize+1]);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_) == 0 &&
-      bufSize != 0)
+
+  if (bufSize < 0
+      || static_cast<ACE_CString::size_type> (bufSize) >= max_buf_len)
     {
       this->setstate (badbit);
       return *this;
     }
-  ACE_CString newRef(ref);
-  record.ref(newRef);
-  delete [] ref;
+
+  {
+    ACE_Auto_Basic_Array_Ptr<char> the_ref (new char[bufSize + 1]);
+    the_ref[0] = '\0';
+    if (ACE_OS::fgets (ACE_TEXT_CHAR_TO_TCHAR (the_ref.get ()),
+                       bufSize + 1,
+                       fl_) == 0
+        && bufSize != 0)
+      {
+        this->setstate (badbit);
+        return *this;
+      }
+    record.ref (ACE_CString (the_ref.get (), 0, false));
+  }
 
   return *this;
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 9e558e7b8fd..d8923ac5739 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -1,17 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_CosNaming
-//
-// = FILENAME
-//   Hash_Naming_Context.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> and
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Hash_Naming_Context.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> and Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Hash_Naming_Context.h"
 #include "orbsvcs/Naming/nsconf.h"
@@ -98,10 +94,9 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name)
       rest.length (2);
       rest[0] = name[name_len - 2];
       rest[1] = name[name_len - 1];
-      ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                        (CosNaming::NamingContext::not_context,
-                         rest),
-                        CosNaming::NamingContext::_nil ());
+      throw CosNaming::NamingContext::NotFound(
+        CosNaming::NamingContext::not_context,
+        rest);
     }
   // Finally, if everything went smoothly, just return the resolved
   // context.
@@ -109,8 +104,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name)
 }
 
 void
-TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj)
+TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, CORBA::Object_ptr obj)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon, this->lock_,
@@ -122,7 +116,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
     throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
@@ -133,8 +127,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   // target context.
   if (name_len > 1)
     {
-      CosNaming::NamingContext_var context =
-        this->get_context (n);
+      CosNaming::NamingContext_var context = this->get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
@@ -143,12 +136,10 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
         {
           context->bind (simple_name, obj);
         }
-      catch (const CORBA::TIMEOUT&)
+      catch (const CORBA::SystemException&)
         {
           throw CosNaming::NamingContext::CannotProceed(
-            context.in (
-              ),
-            simple_name);
+            context.in (), simple_name);
         }
     }
   // If we received a simple name, we need to bind it in this context.
@@ -182,7 +173,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
     throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
@@ -193,8 +184,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   // on target context.
   if (name_len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n);
+      CosNaming::NamingContext_var context = get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
@@ -203,12 +193,10 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
         {
           context->rebind (simple_name, obj);
         }
-      catch (const CORBA::TIMEOUT&)
+      catch (const CORBA::SystemException&)
         {
           throw CosNaming::NamingContext::CannotProceed(
-            context.in (
-              ),
-            simple_name);
+            context.in (), simple_name);
         }
     }
   else
@@ -225,8 +213,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
 
       else if (result == -2)
         throw CosNaming::NamingContext::NotFound(
-          CosNaming::NamingContext::not_object,
-          n);
+          CosNaming::NamingContext::not_object, n);
     }
 }
 
@@ -248,7 +235,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
     throw CORBA::BAD_PARAM ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
@@ -259,8 +246,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   // target context.
   if (name_len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n);
+      CosNaming::NamingContext_var context = get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
@@ -269,12 +255,10 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
         {
           context->bind_context (simple_name, nc);
         }
-      catch (const CORBA::TIMEOUT&)
+      catch (const CORBA::SystemException&)
         {
           throw CosNaming::NamingContext::CannotProceed(
-            context.in (
-              ),
-            simple_name);
+            context.in (), simple_name);
         }
     }
   // If we received a simple name, we need to bind it in this context.
@@ -308,7 +292,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
     throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
@@ -329,12 +313,10 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
         {
           context->rebind_context (simple_name, nc);
         }
-      catch (const CORBA::TIMEOUT&)
+      catch (const CORBA::SystemException&)
         {
           throw CosNaming::NamingContext::CannotProceed(
-            context.in (
-              ),
-            simple_name);
+            context.in (), simple_name);
         }
     }
   else
@@ -365,16 +347,14 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CORBA::Object::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      CORBA::Object::_nil ());
+    throw CosNaming::NamingContext::InvalidName();
 
   // Resolve the first component of the name.
 
@@ -388,10 +368,9 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
                             n[0].kind,
                             result.out (),
                             type) == -1)
-    ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                      (CosNaming::NamingContext::missing_node,
-                       n),
-                      CORBA::Object::_nil ());
+    throw CosNaming::NamingContext::NotFound(
+      CosNaming::NamingContext::missing_node,
+      n);
 
   // If the name we have to resolve is a compound name, we need to
   // resolve it recursively.
@@ -407,17 +386,15 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
         }
       else
         // The first name component wasn't bound to a NamingContext.
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context,
-                           n),
-                          CORBA::Object::_nil ());
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
 
       // If narrow failed...
       if (CORBA::is_nil (context.in ()))
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context,
-                           n),
-                          CORBA::Object::_nil ());
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
       else
         {
           // Successfully resolved the first name component, need to
@@ -440,12 +417,10 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
               resolved_ref = context->resolve (rest_of_name);
               return resolved_ref;
             }
-          catch (const CORBA::TIMEOUT&)
+          catch (const CORBA::SystemException&)
             {
               throw CosNaming::NamingContext::CannotProceed(
-                context.in (
-                  ),
-                rest_of_name);
+                context.in (), rest_of_name);
             }
         }
     }
@@ -467,7 +442,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n)
     throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong const name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
@@ -488,12 +463,10 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n)
         {
           context->unbind (simple_name);
         }
-      catch (const CORBA::TIMEOUT&)
+      catch (const CORBA::SystemException&)
         {
           throw CosNaming::NamingContext::CannotProceed(
-            context.in (
-              ),
-            simple_name);
+            context.in (), simple_name);
         }
     }
   // If we received a simple name, we need to unbind it in this
@@ -502,8 +475,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n)
     if (this->context_->unbind (n[0].id,
                                 n[0].kind) == -1)
       throw CosNaming::NamingContext::NotFound(
-        CosNaming::NamingContext::missing_node,
-        n);
+        CosNaming::NamingContext::missing_node, n);
 }
 
 CosNaming::NamingContext_ptr
@@ -517,16 +489,14 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      CosNaming::NamingContext::_nil ());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the operation on
@@ -554,8 +524,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n)
   // Bind the new context to the name.
   try
     {
-      bind_context (n,
-                    result.in ());
+      bind_context (n, result.in ());
     }
   catch (const CORBA::Exception&)
     {
@@ -611,7 +580,6 @@ TAO_Hash_Naming_Context::destroy (void)
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
 
-
       poa->deactivate_object (id.in ());
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index 1ebd2d7e6ef..ee5a710de0d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -24,8 +24,7 @@ TAO_Naming_Client::get_context (void) const
 }
 
 int
-TAO_Naming_Client::init (CORBA::ORB_ptr orb,
-                         ACE_Time_Value *timeout)
+TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout)
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
index 56b48d7f37d..139226d0747 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
@@ -47,12 +47,11 @@ public:
   TAO_Naming_Client (void);
 
   /**
-   * Look for a Naming Service for a period of <timeout> using
-   * <resolve_initial_references>.  Return 0 if Naming Service is
+   * Look for a Naming Service for a period of @a timeout using
+   * @c resolve_initial_references.  Return 0 if Naming Service is
    * successfully located, and -1 on failure.
    */
-  int init (CORBA::ORB_ptr orb,
-            ACE_Time_Value *timeout = 0);
+  int init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout = 0);
 
   /// Destructor.
   ~TAO_Naming_Client (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 001c4d51bc5..dde7935e404 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Naming_Context_Interface.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Naming_Context_Interface.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Context_Interface.h"
 #include "ace/ACE.h"
@@ -37,24 +34,13 @@ TAO_Naming_Context::_default_POA (/*env*/)
 }
 
 void
-TAO_Naming_Context::bind (const CosNaming::Name &n,
-                          CORBA::Object_ptr obj)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName,
-                     CosNaming::NamingContext::AlreadyBound))
+TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj)
 {
   impl_->bind (n, obj);
 }
 
 void
-TAO_Naming_Context::rebind (const CosNaming::Name &n,
-                            CORBA::Object_ptr obj)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
+TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj)
 {
   impl_->rebind (n, obj);
 }
@@ -62,11 +48,6 @@ TAO_Naming_Context::rebind (const CosNaming::Name &n,
 void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
                                   CosNaming::NamingContext_ptr nc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName,
-                       CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind_context (n, nc);
 }
@@ -74,56 +55,36 @@ TAO_Naming_Context::bind_context (const CosNaming::Name &n,
 void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
                                     CosNaming::NamingContext_ptr nc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind_context (n, nc);
 }
 
 CORBA::Object_ptr
 TAO_Naming_Context::resolve (const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->resolve (n);
 }
 
 void
 TAO_Naming_Context::unbind (const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->unbind (n);
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::new_context (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return impl_->new_context ();
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::bind_new_context (const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::AlreadyBound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->bind_new_context (n);
 }
 
 void
 TAO_Naming_Context::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotEmpty))
 {
   impl_->destroy ();
 }
@@ -132,7 +93,6 @@ void
 TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
                           CosNaming::BindingIterator_out bi)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->list (how_many, bl, bi);
 }
@@ -170,15 +130,12 @@ to_string_helper_assign (char * &k, const char * &src)
 
 char *
 TAO_Naming_Context::to_string (const CosNaming::Name &n)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNaming::NamingContext::InvalidName))
 {
   // Accepts a Name and returns a stringified name.
 
   // Check for invalid name.
   if (n.length () == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      0);
+    throw CosNaming::NamingContext::InvalidName();
 
   // Length of the return string
   CORBA::ULong len = 0;
@@ -205,7 +162,7 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n)
   //
   if (str_name == 0)
     {
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+      throw CORBA::NO_MEMORY ();
     }
 
   char *k = str_name;
@@ -284,8 +241,6 @@ to_name_helper (char *dest, const char*& src, Hint hint)
 
 CosNaming::Name *
 TAO_Naming_Context::to_name (const char *sn)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNaming::NamingContext::InvalidName))
 {
   // Returns the Name from its stringified form.
   CosNaming::Name n;
@@ -323,8 +278,7 @@ TAO_Naming_Context::to_name (const char *sn)
   // Check for InvalidName i.e. Invalid stringified name
   //
   if (len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      0);
+    throw CosNaming::NamingContext::InvalidName();
 
   // Assign the length of the return unstringified name.
   //
@@ -338,7 +292,7 @@ TAO_Naming_Context::to_name (const char *sn)
     {
       if (count > ncomp)
         {
-          ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(), 0);
+          throw CosNaming::NamingContext::InvalidName();
         }
 
       char *id = CORBA::string_alloc (len);
@@ -407,8 +361,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 
   // Check for invalid address
   if (addr_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContextExt::InvalidAddress (),
-                      0);
+    throw CosNaming::NamingContextExt::InvalidAddress ();
 
   // Make a pass through the in string name to count the number of
   // characters and if the character
@@ -424,7 +377,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
     }
 
   if (sn_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContextExt::InvalidName (), 0);
+    throw CosNaming::NamingContextExt::InvalidName ();
 
   return addr_len + sn_len;
 }
@@ -432,9 +385,6 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 char *
 TAO_Naming_Context::to_url (const char * addr,
                             const char * sn)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNaming::NamingContextExt::InvalidAddress,
-                   CosNaming::NamingContext::InvalidName))
 {
   /// Compute how many characters will be required for the URL
   size_t no_char =
@@ -500,11 +450,6 @@ TAO_Naming_Context::to_url (const char * addr,
 
 CORBA::Object_ptr
 TAO_Naming_Context::resolve_str (const char * n)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNaming::NamingContext::NotFound,
-                   CosNaming::NamingContext::CannotProceed,
-                   CosNaming::NamingContext::InvalidName
-                   ))
 {
   // Similar to <resolve> above. It accepts a strigified name as an
   // argument instead of a Name.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 586c06bea3b..27d907e5f36 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -67,12 +67,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName,
-                     CosNaming::NamingContext::AlreadyBound));
+                     CORBA::Object_ptr obj);
 
   /**
    * This is similar to <bind> operation above, except for when the
@@ -81,11 +76,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+                       CORBA::Object_ptr obj);
 
   /**
    * This is the version of <bind> specifically for binding naming
@@ -93,12 +84,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName,
-                       CosNaming::NamingContext::AlreadyBound));
+                             CosNaming::NamingContext_ptr nc);
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -106,11 +92,7 @@ public:
    * names are passed.
    */
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+                               CosNaming::NamingContext_ptr nc);
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -119,22 +101,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n);
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+  virtual void unbind (const CosNaming::Name &n);
 
 
   /**
@@ -142,8 +116,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * This operation creates a new context and binds it to the name
@@ -152,12 +125,7 @@ public:
    * bound (the name argument excluding the last component).
    */
   virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::AlreadyBound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+      const CosNaming::Name &n);
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -167,9 +135,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotEmpty));
+  virtual void destroy (void);
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -179,8 +145,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CosNaming::BindingIterator_out bi);
 
   /**
    * Stringify the name using '\' as the escape character. The
@@ -188,18 +153,14 @@ public:
    * is invalid i.e. if the number of characters in the name is zero,
    * an InvalidName exception is to be raised.
    */
-  virtual char * to_string (const CosNaming::Name &n)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::InvalidName));
+  virtual char * to_string (const CosNaming::Name &n);
 
   /**
    * The in parameter is an stringified name. This function removes the
    * escape character '\' and destringifies the stringified name and returns
    * it.
    */
-  virtual CosNaming::Name * to_name (const char *sn)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::InvalidName));
+  virtual CosNaming::Name * to_name (const char *sn);
 
   /**
    * The in parameter addr refers to the address of the naming context
@@ -208,24 +169,13 @@ public:
    * iiopname://1.1@myhost.555xyz.com:9999/a/b/c
    */
   virtual char * to_url ( const char * addr,
-                          const char * sn)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNaming::NamingContextExt::InvalidAddress,
-                     CosNaming::NamingContext::InvalidName
-                     ));
+                          const char * sn);
 
   /**
    * Similar to <resolve> as in the CosNaming::NamingContext interface.
    * It accepts a strigified name as an argument instead of a Name.
    */
-  virtual CORBA::Object_ptr resolve_str (const char * n)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName
-                     ));
+  virtual CORBA::Object_ptr resolve_str (const char * n);
 
   /// Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 27bc4e91147..a2b9f923827 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -71,7 +71,6 @@ CORBA::Object_ptr
 TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc,
                                   ACE_TCHAR *argv[])
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initializes the Naming Service. Returns -1
   // on an error.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 967fdc302fc..9e5ba0f03b8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -50,8 +50,7 @@ public:
   /// ORB and the command line parameters.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[])
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv[]);
 
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 1d6ceb7f7eb..62ae2197a01 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -115,8 +115,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
         {
           // Try to find an existing Naming Service.
           CORBA::Object_var naming_obj =
-            orb->resolve_initial_references ("NameService",
-                                             timeout);
+            orb->resolve_initial_references ("NameService", timeout);
 
           if (!CORBA::is_nil (naming_obj.in ()))
             {
@@ -162,7 +161,11 @@ int
 TAO_Naming_Server::parse_args (int argc,
                                ACE_TCHAR *argv[])
 {
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:"));
+#else
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:z:"));
+#endif /* TAO_HAS_MINIMUM_POA */
 
   int c;
   int size, result;
@@ -219,6 +222,7 @@ TAO_Naming_Server::parse_args (int argc,
         this->persistence_file_name_ = get_opts.opt_arg ();
         f_opt_used = 1;
         break;
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
       case 'r':
         this->use_redundancy_ = 1;
         this->use_storable_context_ = 1;
@@ -230,12 +234,20 @@ TAO_Naming_Server::parse_args (int argc,
         this->persistence_file_name_ = get_opts.opt_arg ();
         u_opt_used = 1;
         break;
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
       case 'z':
         this->use_round_trip_timeout_ = 1;
         this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case '?':
       default:
+        const ACE_TCHAR *reqNonMinCorba=
+#if (TAO_HAS_MINIMUM_POA == 0)
+          ACE_TEXT ("  -u <storable_persistence_directory (not used with -f)> ")
+          ACE_TEXT ("  -r <redundant_persistence_directory> ");
+#else
+          ACE_TEXT ("");
+#endif /* TAO_HAS_MINIMUM_POA */
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("usage:  %s ")
                            ACE_TEXT ("-d ")
@@ -244,12 +256,10 @@ TAO_Naming_Server::parse_args (int argc,
                            ACE_TEXT ("-s <context_size> ")
                            ACE_TEXT ("-b <base_address> ")
                            ACE_TEXT ("-m <1=enable multicast, 0=disable multicast(default) ")
-                           ACE_TEXT ("-f <persistence_file_name> ")
-                           ACE_TEXT ("-u <storable_persistence_directory (not used with -f)> ")
-                           ACE_TEXT ("-r <redundant_persistence_directory> ")
+                           ACE_TEXT ("-f <persistence_file_name> %s")
                            ACE_TEXT ("-z <relative round trip timeout> ")
                            ACE_TEXT ("\n"),
-                           argv [0]),
+                           argv [0], reqNonMinCorba),
                           -1);
       }
 
@@ -659,7 +669,6 @@ TAO_Naming_Server::fini (void)
     {
       this->ns_poa_->destroy (1, 1);
 
-
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable");
 
@@ -679,7 +688,6 @@ TAO_Naming_Server::fini (void)
       // Ignore
     }
 
-
   if (this->ior_multicast_ != 0)
     {
       orb_->orb_core()->reactor ()->remove_handler (this->ior_multicast_,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index 5d7c3919fb6..f194f75ea10 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -119,9 +119,7 @@ public:
 
   /// Initialize the Naming Service with the command line arguments and
   /// the ORB.
-  int init_with_orb (int argc,
-                     ACE_TCHAR *argv [],
-                     CORBA::ORB_ptr orb);
+  int init_with_orb (int argc, ACE_TCHAR *argv [], CORBA::ORB_ptr orb);
 
   /// Destroy the child POA created in <init_with_orb>
   int fini (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index a9d8fd2b50b..424bfb6b9b9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Naming_Service_Container.cpp
-//
-// = AUTHOR
-//    Bruce Trask <trask_b@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Naming_Service_Container.cpp
+ *
+ *  $Id$
+ *
+ *  @author Bruce Trask <trask_b@ociweb.com>
+ */
+//=============================================================================
+
 
 
 #ifndef NS_CONTAINER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index 97bd7b76018..fe807eae71b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -99,9 +99,7 @@ public:
    * i.e., a context with <poa_id>, <counter> and <hash_map> has just
    * been created, and is registering with us.
    */
-  int bind (const char *poa_id,
-            ACE_UINT32 *&counter,
-            CONTEXT *hash_map);
+  int bind (const char *poa_id, ACE_UINT32 *&counter, CONTEXT *hash_map);
 
   /// Remove an entry for the Persistent Naming Context with <poa_id>
   /// from <index_> (i.e., this context has just been destroyed).
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
index f5d31b0874c..a1e960642ba 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Persistent_Entries.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Persistent_Entries.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Persistent_Entries.h"
 #include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 1daca1ca553..e7235ed53ff 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -338,7 +338,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
   ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context> temp (context_impl);
 
   if (context_impl->init (context_size) == -1)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), result._retn ());
+    throw CORBA::NO_MEMORY ();
 
   // Insure appropriate cleanup in case of exception conditions ahead.
   context_impl->set_cleanup_level (1);
@@ -347,7 +347,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
   if (ind->bind (context_impl->poa_id_.c_str (),
                  context_impl->counter_,
                  context_impl->persistent_context_->map ()) == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), result._retn ());
+    throw CORBA::INTERNAL ();
 
   // Insure appropriate cleanup in case of exception conditions ahead.
   context_impl->set_cleanup_level (2);
@@ -391,8 +391,7 @@ TAO_Persistent_Naming_Context::new_context (void)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Generate a POA id for the new context.
   char poa_id[BUFSIZ];
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
index b04ee7c389d..4d7cfc700d2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
@@ -1,17 +1,12 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Storable.cpp
-//
-// = AUTHOR
-//    Bruce Trask <trask_b@ociweb.com>
-//    Chanaka Liyanaarachchi <chanaka@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Storable.cpp
+ *
+ *  $Id$
+ *
+ *  @author Bruce Trask <trask_b@ociweb.com> Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ */
+//=============================================================================
 
 #include "orbsvcs/Naming/Storable.h"
 
@@ -19,7 +14,3 @@
 #include "orbsvcs/Naming/Storable.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.h b/TAO/orbsvcs/orbsvcs/Naming/Storable.h
index 1fcb9bf14b2..394a1863447 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h
@@ -77,7 +77,7 @@ class TAO_NS_Persistence_Global
   private:
   unsigned int counter_;
 };
-  
+
 class TAO_Storable_Base
 {
 public:
@@ -122,7 +122,7 @@ public:
   bool fail (void) const;
 
   virtual TAO_Storable_Base& operator << (
-              const TAO_NS_Persistence_Header& header)  = 0;
+              const TAO_NS_Persistence_Header& header) = 0;
 
   virtual TAO_Storable_Base& operator << (
               const TAO_NS_Persistence_Record& record) = 0;
@@ -142,7 +142,7 @@ public:
 private:
   Storable_State state_;
 };
-  
+
 class TAO_Naming_Service_Persistence_Factory
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
index 50a149a9c0c..2df1d497262 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Storable.i
-//
-// = AUTHOR
-//    Bruce Trask <trask_b@ociweb.com>
-//    Chanaka Liyanaarachchi <chanaka@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Storable.inl
+ *
+ *  $Id$
+ *
+ *  @author Bruce Trask <trask_b@ociweb.com>
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ */
+//=============================================================================
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 94a9fa71c74..f3b89675440 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -68,8 +68,7 @@ TAO_Storable_ExtId::TAO_Storable_ExtId (void)
 {
 }
 
-TAO_Storable_ExtId::TAO_Storable_ExtId (const char *id,
-                                            const char *kind)
+TAO_Storable_ExtId::TAO_Storable_ExtId (const char *id, const char *kind)
   : id_ (id)
   , kind_ (kind)
 {
@@ -136,8 +135,7 @@ TAO_Storable_ExtId::kind (void)
 }
 
 int
-TAO_Storable_Bindings_Map::unbind (const char *id,
-                                   const char *kind)
+TAO_Storable_Bindings_Map::unbind (const char *id, const char *kind)
 {
   ACE_TRACE("unbind");
   TAO_Storable_ExtId name (id, kind);
@@ -174,8 +172,7 @@ TAO_Storable_Bindings_Map::find (const char *id,
   TAO_Storable_ExtId name (id, kind);
   TAO_Storable_IntId entry;
 
-  if (this->map_.find (name,
-                       entry) != 0)
+  if (this->map_.find (name, entry) != 0)
     {
       return -1;
     }
@@ -371,7 +368,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck)
   if (!flck->peer ().good ())
     {
       flck->peer ().clear ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (), -1);
+      throw CORBA::INTERNAL ();
     }
 
   // reset the destroyed flag
@@ -384,7 +381,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck)
       if (!flck->peer ().good ())
         {
           flck->peer ().clear ();
-          ACE_THROW_RETURN (CORBA::INTERNAL (), -1);
+          throw CORBA::INTERNAL ();
         }
 
       if (TAO_NS_Persistence_Record::LOCAL_NCONTEXT == record.type ())
@@ -540,8 +537,7 @@ File_Open_Lock_and_Check::~File_Open_Lock_and_Check(void)
 }
 
 TAO_Storable_Base &
-TAO_Storable_Naming_Context::
-File_Open_Lock_and_Check::peer(void)
+TAO_Storable_Naming_Context::File_Open_Lock_and_Check::peer(void)
 {
   ACE_TRACE("peer");
   return *fl_;
@@ -653,13 +649,11 @@ TAO_Storable_Naming_Context::make_new_context (
   // this situation.
   try
     {
-      poa->activate_object_with_id (id.in (),
-                                    context);
+      poa->activate_object_with_id (id.in (), context);
     }
   catch (const PortableServer::POA::ObjectAlreadyActive&)
     {
-      ACE_THROW_RETURN (CosNaming::NamingContext::AlreadyBound(),
-                        CosNaming::NamingContext::_nil ());
+      throw CosNaming::NamingContext::AlreadyBound();
     }
 
 
@@ -687,8 +681,7 @@ TAO_Storable_Naming_Context::new_context (void)
     // Check to make sure this object didn't have <destroy> method
     // invoked on it.
     if (this->destroyed_)
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CosNaming::NamingContext::_nil ());
+      throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   TAO_NS_Persistence_Global global;
@@ -700,19 +693,17 @@ TAO_Storable_Naming_Context::new_context (void)
     if (gfl_->open() != 0)
       {
         delete gfl_.release();
-        ACE_THROW_RETURN(CORBA::PERSIST_STORE(),
-                         CosNaming::NamingContext::_nil ());
+        throw CORBA::PERSIST_STORE();
       }
     if (gfl_ -> flock(0, 0, 0) != 0)
-         ACE_THROW_RETURN (CORBA::INTERNAL(),
-                           CosNaming::NamingContext::_nil ());
+         throw CORBA::INTERNAL();
     // get the counter from disk
     *gfl_.get() >> global;
     if (!gfl_.get ()->good () &&
         gfl_.get ()->rdstate () != TAO_Storable_Base::eofbit)
       {
         gfl_.get ()->clear ();
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+        throw CORBA::INTERNAL ();
       }
     gcounter_ = global.counter();
     // use it to generate a new name
@@ -729,8 +720,7 @@ TAO_Storable_Naming_Context::new_context (void)
   {
     // and release our lock
     if (gfl_ -> flock(0, 0, 0) != 0)
-         ACE_THROW_RETURN(CORBA::INTERNAL(),
-                          CosNaming::NamingContext::_nil ());
+         throw CORBA::INTERNAL();
     gfl_->close();
   }
 
@@ -954,8 +944,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      CORBA::Object::_nil ());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
@@ -967,8 +956,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CORBA::Object::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Resolve the first component of the name.
   flck.release();
@@ -982,9 +970,9 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
                             n[0].kind,
                             obj,
                             type) == -1)
-    ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                      (CosNaming::NamingContext::missing_node, n),
-                      CORBA::Object::_nil ());
+    throw CosNaming::NamingContext::NotFound(
+      CosNaming::NamingContext::missing_node,
+      n);
 
   // Store the value in var to avoid memory leaks.
   CORBA::Object_var result = obj;
@@ -1003,16 +991,15 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
         }
       else
         // The first name component wasn't bound to a NamingContext.
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context,
-                           n),
-                          CORBA::Object::_nil ());
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
 
       // If narrow failed...
       if (CORBA::is_nil (context.in ()))
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context, n),
-                          CORBA::Object::_nil ());
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
       else
         {
           // Successfully resolved the first name component, need to
@@ -1099,8 +1086,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n)
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      CosNaming::NamingContext::_nil ());
+    throw CosNaming::NamingContext::InvalidName();
 
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -1110,8 +1096,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Open the backing file
   File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
@@ -1119,8 +1104,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the operation on
@@ -1470,8 +1454,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   if (gfl_->open() != 0)
     {
       delete gfl_.release();
-      ACE_THROW_RETURN(CORBA::PERSIST_STORE(),
-                       CosNaming::NamingContext::_nil ());
+      throw CORBA::PERSIST_STORE();
     }
 
   // get the counter from disk
@@ -1481,7 +1464,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
       gfl_.get ()->rdstate () != TAO_Storable_Base::eofbit)
     {
       gfl_.get ()->clear ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
   gcounter_ = global.counter();
   if(redundant_) gfl_->close();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 3f9179fcd8f..fe4d33ae149 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -172,8 +172,7 @@ public:
    * Remove a binding containing <id> and <kind> from the table.
    * Return 0 on success and -1 on failure.
    */
-  virtual int unbind (const char * id,
-                      const char * kind);
+  virtual int unbind (const char * id, const char * kind);
 
   /**
    * Find the binding containing <id> and <kind> in the table, and
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 53afd9176ab..2562e0d5e67 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Storable_Naming_Context_Activator.h
-//
-// = AUTHOR
-//    Byron Harris <harris_b@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Storable_Naming_Context_Activator.cpp
+ *
+ *  $Id$
+ *
+ *  @author Byron Harris <harris_b@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
 
@@ -43,8 +40,6 @@ PortableServer::Servant
 TAO_Storable_Naming_Context_Activator::incarnate (
     const PortableServer::ObjectId &oid,
     PortableServer::POA_ptr poa)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
 
   // Make sure complete initialization has been done
@@ -64,8 +59,7 @@ TAO_Storable_Naming_Context_Activator::incarnate (
   file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in());
   TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw"));
   if (!fl->exists()) {
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   // Store the stub we will return here.
@@ -109,11 +103,11 @@ TAO_Storable_Naming_Context_Activator::etherealize (
     PortableServer::Servant servant,
     CORBA::Boolean /*cleanup_in_progress*/,
     CORBA::Boolean remaining_activations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (!remaining_activations) {
-    delete servant;
-  }
+  if (!remaining_activations)
+    {
+      delete servant;
+    }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index 3a7034bbbf2..d4770ed1c60 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Storable_Naming_Context_Activator.h
-//
-// = AUTHOR
-//    Byron Harris <harris_b@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Storable_Naming_Context_Activator.h
+ *
+ *  $Id$
+ *
+ *  @author Byron Harris <harris_b@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_STORABLE_NAMING_CONTEXT_ACTIVATOR_H
 #define TAO_STORABLE_NAMING_CONTEXT_ACTIVATOR_H
@@ -59,9 +56,7 @@ public:
    * and the servant implementing this reference does not yet exist.
    */
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::POA_ptr poa);
 
   /**
    * Used by the POA to delete the servant created from a call to incarnate.
@@ -70,8 +65,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Boolean remaining_activations);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index e4433dec433..c5caf43bc48 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -1,17 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Transient_Naming_Context.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> and
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Transient_Naming_Context.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> and Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ */
+//=============================================================================
+
 #include "ace/Auto_Ptr.h"
 #include "orbsvcs/Naming/Transient_Naming_Context.h"
 #include "orbsvcs/Naming/Bindings_Iterator_T.h"
@@ -22,8 +18,7 @@ ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Transient_Bindings_Map::unbind (const char *id,
-                                    const char *kind)
+TAO_Transient_Bindings_Map::unbind (const char *id, const char *kind)
 {
   TAO_ExtId name (id, kind);
   return this->map_.unbind (name);
@@ -198,8 +193,7 @@ TAO_Transient_Naming_Context::new_context (void)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Generate a POA id for the new context.
   char poa_id[BUFSIZ];
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 75a8fc7f028..0e8748971d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -30,10 +30,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::release (void)
 
 void
 TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventComm::Disconnected
-                   ))
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
@@ -54,10 +50,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any)
 
 void
 TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Convert Supplier to Base Type
   TAO_Notify_PushSupplier *supplier;
@@ -72,9 +64,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
 
 void
 TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this );
   this->destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index e577ce6264e..7a29dff6ff7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -54,22 +54,11 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual void push (const CORBA::Any & data)
-    ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ));
-
-  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected
-                     ));
-
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void push (const CORBA::Any & data);
+
+  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
+
+  virtual void disconnect_push_consumer (void);
 private:
   /// Release
   virtual void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 8ac351b2ebd..ed6577d57fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -27,11 +27,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::release (void)
 
 void
 TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventChannelAdmin::AlreadyConnected,
-                   CosEventChannelAdmin::TypeError
-                   ))
 {
   // Convert Consumer to Base Type
   TAO_Notify_PushConsumer* consumer;
@@ -46,9 +41,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon
 
 void
 TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this );
   this->destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index da3bad8b1d0..0bd5b392df5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -58,18 +58,10 @@ public:
   // = Interface methods
   virtual void connect_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventChannelAdmin::AlreadyConnected,
-    CosEventChannelAdmin::TypeError
-  ));
+  );
 
   virtual void disconnect_push_supplier (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 08045f4d155..c710bc98b03 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -29,19 +29,12 @@ TAO_Notify_ProxyPushConsumer::release (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_ProxyPushConsumer::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_ANY;
 }
 
 void
 TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventComm::Disconnected
-                   ))
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
@@ -59,10 +52,6 @@ TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any)
 
 void
 TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Convert Supplier to Base Type
   TAO_Notify_PushSupplier *supplier;
@@ -77,9 +66,6 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
 }
 
 void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_ProxyPushConsumer::Ptr guard( this );
   this->destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index b4361e2b400..b5b91809589 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -59,27 +59,13 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void push (const CORBA::Any & data)
-    ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ));
-
-  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected
-                     ));
-
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+
+  virtual void push (const CORBA::Any & data);
+
+  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
+
+  virtual void disconnect_push_consumer (void);
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index 93774bb543a..02cb590b026 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -27,11 +27,6 @@ TAO_Notify_ProxyPushSupplier::release (void)
 
 void
 TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventChannelAdmin::AlreadyConnected,
-                   CosEventChannelAdmin::TypeError
-                   ))
 {
   // Convert Consumer to Base Type
   TAO_Notify_PushConsumer* consumer;
@@ -47,9 +42,6 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
 
 void
 TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_ProxyPushSupplier::Ptr guard( this );
   this->destroy ();
@@ -58,9 +50,6 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_ProxyPushSupplier::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_ANY;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 415db2a8d6d..b6eac56762c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -60,25 +60,14 @@ public:
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
 
   // = Interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
 
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventChannelAdmin::AlreadyConnected,
-    CosEventChannelAdmin::TypeError
-  ));
+  );
 
   virtual void disconnect_push_supplier (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 private:
   /// TAO_Notify_Destroy_Callback methods
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 60d125850f9..b1313c1e5d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -370,8 +370,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
       break;
 
     default:
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CosNotifyChannelAdmin::ProxyConsumer::_nil ());
+      throw CORBA::BAD_PARAM ();
                         }
 }
 
@@ -405,8 +404,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
       break;
 
     default:
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CosNotifyChannelAdmin::ProxySupplier::_nil ());
+      throw CORBA::BAD_PARAM ();
     }
 }
 
@@ -439,8 +437,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
       break;
 
     default:
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
+      throw CORBA::BAD_PARAM ();
                         }
 }
 
@@ -473,8 +470,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
       break;
 
     default:
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
+      throw CORBA::BAD_PARAM ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 495aa338b2a..0edf95664e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -86,9 +86,6 @@ TAO_Notify_ConsumerAdmin::release (void)
 
 void
 TAO_Notify_ConsumerAdmin::destroy (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   int result = this->shutdown ();
   if ( result == 1)
@@ -164,10 +161,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                                          CosNotifyChannelAdmin::ProxyID_out proxy_id
                                                          )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminLimitExceeded
-                   ))
 {
   CosNotification::QoSProperties initial_qos;
 
@@ -185,11 +178,6 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
                                                                   )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     , CosNotification::UnsupportedQoS
-                     ))
 {
   CosNotifyChannelAdmin::ProxySupplier_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
@@ -202,9 +190,6 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
@@ -214,36 +199,24 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
 
 CosNotifyChannelAdmin::AdminID
 TAO_Notify_ConsumerAdmin::MyID (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->id ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_ConsumerAdmin::MyChannel (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
 TAO_Notify_ConsumerAdmin::MyOperator (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->filter_operator_;
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_Notify_ConsumerAdmin::push_suppliers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
@@ -252,10 +225,6 @@ TAO_Notify_ConsumerAdmin::push_suppliers (void)
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::ProxyNotFound
-                   ))
 {
   TAO_Notify_ProxySupplier_Find_Worker find_worker;
 
@@ -263,10 +232,6 @@ TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID pro
 }
 
 void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   this->TAO_Notify_Object::set_qos (qos);
 }
@@ -274,9 +239,6 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q
 
 CosNotification::QoSProperties*
 TAO_Notify_ConsumerAdmin::get_qos (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->TAO_Notify_Object::get_qos ();
 }
@@ -285,10 +247,6 @@ void
 TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added,
                                            const CosNotification::EventTypeSeq & removed
                                            )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyComm::InvalidEventType
-                   ))
 {
   TAO_Notify_EventTypeSeq seq_added (added);
   TAO_Notify_EventTypeSeq seq_removed (removed);
@@ -308,9 +266,6 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
 
 CosNotifyFilter::FilterID
 TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotifyFilter::FilterID fid =
     this->filter_admin_.add_filter (new_filter);
@@ -320,38 +275,24 @@ TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
 
 void
 TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyFilter::FilterNotFound
-                   ))
 {
   this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
 TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyFilter::FilterNotFound
-                   ))
 {
   return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
 TAO_Notify_ConsumerAdmin::get_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->filter_admin_.get_all_filters ();
 }
 
 void
 TAO_Notify_ConsumerAdmin::remove_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->filter_admin_.remove_all_filters ();
 }
@@ -360,18 +301,12 @@ TAO_Notify_ConsumerAdmin::remove_all_filters (void)
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ConsumerAdmin::priority_filter (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -379,63 +314,43 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ConsumerAdmin::lifetime_filter (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 ::CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_Notify_ConsumerAdmin::pull_suppliers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/,
                                                          CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminLimitExceeded
-                   ))
 
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyChannelAdmin::ProxySupplier::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
                                     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosEventChannelAdmin::ProxyPullSupplier::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_Notify_ProxySupplier *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 41f573aef56..4befc319e3c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -80,151 +80,66 @@ protected:
   obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                               CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                               const CosNotification::QoSProperties & initial_qos
-                                              )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     , CosNotification::UnsupportedQoS
-                     ));
+                                              );
 
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::AdminID MyID (void);
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
 
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  );
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
 
   virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
 
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::ProxyNotFound
-                     ));
+  );
+
+  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter);
+
+  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+
+  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter);
+
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void);
+
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void);
+
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id);
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     ));
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     ));
-
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotification::QoSProperties * get_qos (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void set_qos (const CosNotification::QoSProperties & qos)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedQoS
-                     ));
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id);
+
+  virtual void destroy (void);
+
+  virtual ::CosNotification::QoSProperties * get_qos (void);
+
+  virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedQoS
-                     ));
+                             CosNotification::NamedPropertyRangeSeq_out available_qos);
 
   virtual void subscription_change (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyComm::InvalidEventType
-                     ));
-
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_filter (CosNotifyFilter::FilterID filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyFilter::FilterNotFound
-                     ));
-
-  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyFilter::FilterNotFound
-                     ));
-
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_all_filters (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                    const CosNotification::EventTypeSeq & removed);
+
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter);
+
+  virtual void remove_filter (CosNotifyFilter::FilterID filter);
+
+  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
+
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+
+  virtual void remove_all_filters (void);
+
+  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+
+  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index c275969d0bd..a6549b1eace 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -37,9 +37,6 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
 
 char*
 TAO_Notify_ETCL_Filter::constraint_grammar (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CORBA::string_dup ("ETCL");
 }
@@ -47,10 +44,6 @@ TAO_Notify_ETCL_Filter::constraint_grammar (void)
 void
 TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
                                        )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidConstraint
-                   ))
 {
   for (CORBA::ULong index = 0; index < constraint_info_seq.length (); ++index)
     {
@@ -84,10 +77,6 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
                                 )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidConstraint
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -131,11 +120,6 @@ void
 TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
                                    )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidConstraint,
-                   CosNotifyFilter::ConstraintNotFound
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -215,8 +199,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::ConstraintNotFound))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -235,8 +217,7 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq
     {
       if (this->constraint_expr_list_.find (id_list[index],
                                             notify_constr_expr) == -1)
-        ACE_THROW_RETURN (CosNotifyFilter::ConstraintNotFound (id_list[index]),
-                          0);
+        throw CosNotifyFilter::ConstraintNotFound (id_list[index]);
 
       infoseq[index].constraint_expression =
         notify_constr_expr->constr_expr;
@@ -250,7 +231,6 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq
 
 CosNotifyFilter::ConstraintInfoSeq *
 TAO_Notify_ETCL_Filter::get_all_constraints (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -290,7 +270,6 @@ TAO_Notify_ETCL_Filter::get_all_constraints (void)
 
 void
 TAO_Notify_ETCL_Filter::remove_all_constraints (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -300,7 +279,6 @@ TAO_Notify_ETCL_Filter::remove_all_constraints (void)
 
 void
 TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
   CONSTRAINT_EXPR_LIST::ENTRY *entry;
@@ -321,7 +299,6 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
 
 void
 TAO_Notify_ETCL_Filter::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -337,18 +314,13 @@ TAO_Notify_ETCL_Filter::destroy (void)
 
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data
                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -383,39 +355,30 @@ CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
                             )
-  ACE_THROW_SPEC (( CORBA::SystemException,
-                    CosNotifyFilter::UnsupportedFilterableData))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackID
 TAO_Notify_ETCL_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_Notify_ETCL_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::CallbackNotFound))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
 TAO_Notify_ETCL_Filter::get_callbacks (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index bbc47b4ec6f..a5014412d7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -50,92 +50,38 @@ public:
   virtual ~TAO_Notify_ETCL_Filter ();
 
 protected:
-  virtual char * constraint_grammar (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual char * constraint_grammar (void);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::CallbackNotFound
-                     ));
-
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                   );
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+
+  virtual void remove_all_constraints (void);
+
+  virtual void destroy (void);
+
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
+
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data);
+
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data);
+
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback);
+
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback);
+
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
 
 private:
-  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
-
-  void remove_all_constraints_i (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq);
+
+  void remove_all_constraints_i (void);
 
   struct TAO_Notify_Constraint_Expr
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 9c69dbad1d6..1475f2b0851 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -28,16 +28,12 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa)
 
 CosNotifyFilter::Filter_ptr
 TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidGrammar
-                   ))
 {
   // @@: change to "ExTCL" later.
   if (ACE_OS::strcmp (constraint_grammar, "TCL") != 0 &&
       ACE_OS::strcmp (constraint_grammar, "ETCL") != 0 &&
       ACE_OS::strcmp (constraint_grammar, "EXTENDED_TCL") != 0)
-    ACE_THROW_RETURN (CosNotifyFilter::InvalidGrammar (), 0);
+    throw CosNotifyFilter::InvalidGrammar ();
 
 
   // Create the RefCounted servant.
@@ -62,12 +58,8 @@ CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
                                                   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidGrammar
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 68da8ccda35..55871ecd0ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -58,20 +58,12 @@ public:
 
   virtual CosNotifyFilter::Filter_ptr create_filter (
       const char * constraint_grammar
-    )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidGrammar
-                     ));
+    );
 
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (
       const char * constraint_grammar,
       const CORBA::Any & default_value
-    )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidGrammar
-                     ));
+    );
 
 protected:
   /// The POA in which to activate the Filters.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 8cbe6377a3f..f47eb75e50a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -206,9 +206,6 @@ TAO_Notify_EventChannel::shutdown (void)
 
 void
 TAO_Notify_EventChannel::destroy (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_EventChannel::Ptr guard( this );
 
@@ -236,37 +233,24 @@ TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin)
 
 void
 TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
 TAO_Notify_EventChannel::get_qos (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->TAO_Notify_Object::get_qos ();
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 TAO_Notify_EventChannel::MyFactory (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->ecf_->_this ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel::default_consumer_admin (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   if (CORBA::is_nil (default_consumer_admin_.in ()))
     {
@@ -292,9 +276,6 @@ TAO_Notify_EventChannel::default_consumer_admin (void)
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel::default_supplier_admin (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   if (CORBA::is_nil (default_supplier_admin_.in ()))
     {
@@ -318,9 +299,6 @@ TAO_Notify_EventChannel::default_supplier_admin (void)
 }
 
 ::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->ecf_->get_default_filter_factory ();
 }
@@ -329,9 +307,6 @@ TAO_Notify_EventChannel::default_supplier_admin (void)
 TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id
                                         )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
   ::CosNotifyChannelAdmin::ConsumerAdmin_var ca =
@@ -344,9 +319,6 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
 TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id
                                         )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ::CosNotifyChannelAdmin::SupplierAdmin_var sa =
     TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id);
@@ -356,10 +328,6 @@ TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGr
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminNotFound
-                   ))
 {
   TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
 
@@ -368,10 +336,6 @@ TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminNotFound
-                   ))
 {
   TAO_Notify_SupplierAdmin_Find_Worker find_worker;
 
@@ -380,9 +344,6 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
 
 CosNotifyChannelAdmin::AdminIDSeq*
 TAO_Notify_EventChannel::get_all_consumeradmins (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker;
 
@@ -391,9 +352,6 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void)
 
 CosNotifyChannelAdmin::AdminIDSeq*
 TAO_Notify_EventChannel::get_all_supplieradmins (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_SupplierAdmin_Seq_Worker seq_worker;
 
@@ -402,19 +360,12 @@ TAO_Notify_EventChannel::get_all_supplieradmins (void)
 
 void
 TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedAdmin
-                   ))
 {
   this->admin_properties().init (admin);
 }
 
 CosNotification::AdminProperties*
 TAO_Notify_EventChannel::get_admin (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotification::AdminProperties_var properties;
 
@@ -429,18 +380,12 @@ TAO_Notify_EventChannel::get_admin (void)
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel::for_consumers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->default_consumer_admin();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel::for_suppliers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->default_supplier_admin ();
 }
@@ -449,10 +394,6 @@ void
 TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
                                    )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index f9abd36b7b1..81529e63ef4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -117,108 +117,49 @@ private:
 
   /// =CosNotifyChannelAdmin::EventChannel methods
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void destroy (void);
 
   virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  );
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
 
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  );
 
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
 
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  );
 
-  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void);
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                                                        CosNotifyChannelAdmin::AdminID_out id);
 
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminNotFound
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminNotFound
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosNotification::QoSProperties * get_qos (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void set_qos (const CosNotification::QoSProperties & qos)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedQoS
-                     ));
+                                                                        CosNotifyChannelAdmin::AdminID_out id);
+
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id);
+
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id);
+
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void);
+
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void);
+
+  virtual ::CosNotification::QoSProperties * get_qos (void);
+
+  virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedQoS
-                     ));
-
-  virtual ::CosNotification::AdminProperties * get_admin (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void set_admin (const CosNotification::AdminProperties & admin)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedAdmin
-                     ));
-
-  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                             CosNotification::NamedPropertyRangeSeq_out available_qos);
+
+  virtual ::CosNotification::AdminProperties * get_admin (void);
+
+  virtual void set_admin (const CosNotification::AdminProperties & admin);
+
+  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+
+  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
 
 private:
   TAO_Notify_ConsumerAdmin_Container& ca_container();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 26812db99ae..c3685075726 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -61,9 +61,6 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
 
 void
 TAO_Notify_EventChannelFactory::destroy (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   int result = this->shutdown ();
   if ( result == 1)
@@ -168,11 +165,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
     const CosNotification::AdminProperties & initial_admin,
     CosNotifyChannelAdmin::ChannelID_out id
   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   , CosNotification::UnsupportedAdmin
-                   ))
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
     TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
@@ -185,9 +177,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
 
 CosNotifyChannelAdmin::ChannelIDSeq*
 TAO_Notify_EventChannelFactory::get_all_channels (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
@@ -196,10 +185,6 @@ TAO_Notify_EventChannelFactory::get_all_channels (void)
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::ChannelNotFound
-                   ))
 {
   TAO_Notify_EventChannel_Find_Worker find_worker;
 
@@ -400,7 +385,6 @@ TAO_Notify_EventChannelFactory::reconnect (void)
 NotifyExt::ReconnectionRegistry::ReconnectionID
 TAO_Notify_EventChannelFactory::register_callback (
     NotifyExt::ReconnectionCallback_ptr reconnection)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reconnect_registry_.register_callback (
     reconnection);
@@ -409,7 +393,6 @@ TAO_Notify_EventChannelFactory::register_callback (
 void
 TAO_Notify_EventChannelFactory::unregister_callback (
     NotifyExt::ReconnectionRegistry::ReconnectionID id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reconnect_registry_.unregister_callback (
     id);
@@ -417,14 +400,12 @@ TAO_Notify_EventChannelFactory::unregister_callback (
 
 CORBA::Boolean
 TAO_Notify_EventChannelFactory::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Boolean (1);
 }
 
 void
 TAO_Notify_EventChannelFactory::save_topology (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->self_change ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 4f87d5f8e18..6557a411a31 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -106,8 +106,7 @@ public:
 
   void load_event_persistence (void);
 
-  virtual void save_topology (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void save_topology (void);
 
   TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
   TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
@@ -123,25 +122,19 @@ public:
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
 
   /// = NotifyExt methods
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void destroy (void);
 
   /// shutdown
   virtual int shutdown (void);
 
   virtual
   NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
-      NotifyExt::ReconnectionCallback_ptr reconnection)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      NotifyExt::ReconnectionCallback_ptr reconnection);
 
   virtual void unregister_callback (
-      NotifyExt::ReconnectionRegistry::ReconnectionID id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-  virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
   /// = CosNotifyChannelAdmin Methods
 
@@ -149,20 +142,14 @@ public:
       const CosNotification::QoSProperties & initial_qos,
       const CosNotification::AdminProperties & initial_admin,
       CosNotifyChannelAdmin::ChannelID_out id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotification::UnsupportedQoS,
-                     CosNotification::UnsupportedAdmin));
+    );
 
   virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
       CosNotifyChannelAdmin::ChannelID id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyChannelAdmin::ChannelNotFound));
+    );
 
 private:
   typedef TAO_Notify_Container_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Container;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index b4306279eb0..462c6469ed0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -36,8 +36,8 @@ TAO_Notify_EventType::init_i (const char* domain_name, const char* type_name)
 
   if (this->is_special () == 1)
     {
-      this->event_type_.domain_name = (const char* )"*";
-      this->event_type_.type_name = (const char* )"%ALL";
+      this->event_type_.domain_name = CORBA::string_dup ("*");
+      this->event_type_.type_name = CORBA::string_dup ("%ALL");
     }
 
   this->recompute_hash ();
@@ -130,9 +130,9 @@ TAO_Notify_EventType::is_special (void) const
              ACE_OS::strcmp (this->event_type_.type_name, "") == 0 ||
              ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 ||
              ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0))
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index a318fcdd198..d309deb5b96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -66,7 +66,7 @@ TAO_Notify_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& eve
 
   inherited::CONST_ITERATOR iter (*this);
 
-  TAO_Notify_EventType* event_type;
+  TAO_Notify_EventType* event_type = 0;
 
   CORBA::ULong i = 0;
   for (iter.first (); iter.next (event_type); iter.advance (), ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 455f6b089a2..9fe224e4481 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -86,7 +86,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
     ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
     if (map_.bind (event_type, entry) == -1)
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (), -1);
+      throw CORBA::NO_MEMORY ();
 
     if (this->event_types_.insert (event_type) == -1)
       return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 618e08e0955..53f080b262f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -26,10 +26,9 @@ TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void)
 
 CosNotifyFilter::FilterID
 TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (new_filter))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -40,18 +39,13 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
     CosNotifyFilter::Filter::_duplicate (new_filter);
 
   if (this->filter_list_.bind (new_id, new_filter_var) == -1)
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw CORBA::INTERNAL ();
   else
     return new_id;
 }
 
 void
 TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::FilterNotFound
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -62,10 +56,6 @@ TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id)
 
 CosNotifyFilter::Filter_ptr
 TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::FilterNotFound
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -74,17 +64,13 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id)
 
   if (this->filter_list_.find (filter_id,
                                filter_var) == -1)
-    ACE_THROW_RETURN (CosNotifyFilter::FilterNotFound (),
-                      0);
+    throw CosNotifyFilter::FilterNotFound ();
 
   return filter_var._retn ();
 }
 
 CosNotifyFilter::FilterIDSeq*
 TAO_Notify_FilterAdmin::get_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -92,7 +78,7 @@ TAO_Notify_FilterAdmin::get_all_filters (void)
   // Figure out the length of the list.
   size_t len = this->filter_list_.current_size ();
 
-  CosNotifyFilter::FilterIDSeq* list_ptr;
+  CosNotifyFilter::FilterIDSeq* list_ptr = 0;
 
   // Allocate the list of <len> length.
   ACE_NEW_THROW_EX (list_ptr,
@@ -118,7 +104,6 @@ TAO_Notify_FilterAdmin::get_all_filters (void)
 
 void
 TAO_Notify_FilterAdmin::remove_all_filters (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -169,15 +154,16 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
     CORBA::ORB_var orb = properties->orb();
     ACE_ASSERT(! CORBA::is_nil(orb.in()));
     ACE_CString ior;
-    attrs.load("IOR", ior);
 
+    (void) attrs.load("IOR", ior);
     CORBA::Object_var obj = orb->string_to_object(ior.c_str());
     CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in());
+
     if (! CORBA::is_nil(filter.in()))
     {
       this->filter_ids_.set_last_used(id);
       if (this->filter_list_.bind (id, filter) != 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+        throw CORBA::INTERNAL ();
     }
   }
   return this;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index d332011a4f4..45114b2879f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -46,44 +46,21 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
+  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event);
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event* event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void remove_filter (CosNotifyFilter::FilterID filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::FilterNotFound
-                     ));
-
-  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::FilterNotFound
-                     ));
-
-  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_all_filters (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  CORBA::Boolean match (const TAO_Notify_Event* event);
+
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter);
+
+  virtual void remove_filter (CosNotifyFilter::FilterID filter);
+
+  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
+
+  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+
+  virtual void remove_all_filters (void);
 
 
   // TAO_Notify::Topology_Object
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 7fd08855554..d036dd2d16b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -6,10 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
 TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index b487a8f01d9..b1fdb3ae7da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -33,8 +33,7 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const
   this->find (id, container);
 
   if (this->result_ == 0)
-    ACE_THROW_RETURN (EXCEPTION ()
-                      , INTERFACE::_nil ());
+    throw EXCEPTION ();
 
   CORBA::Object_var object = this->result_->ref ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 1838c5b6dbf..4ec5559992d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -127,7 +127,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
       {
         id_path.push_back (id);
         char idbuf[20];
-        ACE_OS::snprintf (idbuf, sizeof(idbuf)-1, "/%d", static_cast<int> (id));
+        ACE_OS::snprintf (idbuf, sizeof(idbuf), "/%d", static_cast<int> (id));
         textpath += idbuf;
       }
       else
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 12ca5cabb5a..01a08c99064 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -20,8 +20,6 @@ void
 TAO_Notify_Constraint_Interpreter::build_tree (
     const char *constraints
   )
-  ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
-                   CORBA::NO_MEMORY))
 {
   if (TAO_ETCL_Interpreter::is_empty_string (constraints))
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 3d2414adbf5..632e77f348f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -49,9 +49,7 @@ public:
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  void build_tree (const char* constraints)
-    ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
-                     CORBA::NO_MEMORY));
+  void build_tree (const char* constraints);
 
   /// Returns true if the constraint is evaluated successfully by
   /// the evaluator.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index f95a0b5fd2a..c0f9f4d3427 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -25,39 +25,39 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
 {
   (void) this->implicit_ids_.bind (ACE_CString ("filterable_data",
     0,
-    0),
+    false),
     FILTERABLE_DATA);
   (void) this->implicit_ids_.bind (ACE_CString ("header",
     0,
-    0),
+    false),
     HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("remainder_of_body",
     0,
-    0),
+    false),
     REMAINDER_OF_BODY);
   (void) this->implicit_ids_.bind (ACE_CString ("fixed_header",
     0,
-    0),
+    false),
     FIXED_HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("variable_header",
     0,
-    0),
+    false),
     VARIABLE_HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("event_name",
     0,
-    0),
+    false),
     EVENT_NAME);
   (void) this->implicit_ids_.bind (ACE_CString ("event_type",
     0,
-    0),
+    false),
     EVENT_TYPE);
   (void) this->implicit_ids_.bind (ACE_CString ("domain_name",
     0,
-    0),
+    false),
     DOMAIN_NAME);
   (void) this->implicit_ids_.bind (ACE_CString ("type_name",
     0,
-    0),
+    false),
     TYPE_NAME);
 }
 
@@ -72,7 +72,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str
 
   for (index = 0; index < length; ++index)
   {
-    ACE_CString name_str (s_event.filterable_data[index].name, 0, 0);
+    ACE_CString name_str (s_event.filterable_data[index].name, 0, false);
 
     int status =
       this->filterable_data_.bind (
@@ -88,7 +88,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str
 
   for (index = 0; index < length; ++index)
   {
-    ACE_CString name_str (s_event.header.variable_header[index].name, 0, 0);
+    ACE_CString name_str (s_event.header.variable_header[index].name, 0, false);
 
     int status =
       this->variable_header_.bind (
@@ -152,7 +152,7 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
 {
   int return_value = -1;
   const char *name = ident->value ();
-  ACE_CString key (name, 0, 0);
+  ACE_CString key (name, 0, false);
 
   CORBA::Any any;
 
@@ -414,7 +414,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
   CORBA::Any any;
   ACE_CString name (assoc->identifier ()->value (),
     0,
-    0);
+    false);
 
   switch (this->implicit_id_)
   {
@@ -629,7 +629,7 @@ TAO_Notify_Constraint_Visitor::visit_component (
   TAO_ETCL_Identifier *identifier = component->identifier ();
   ACE_CString component_name (identifier->value (),
     0,
-    0);
+    false);
   CORBA::Any *any_ptr = 0;
 
   if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0)
@@ -666,8 +666,10 @@ TAO_Notify_Constraint_Visitor::visit_component (
       TAO_ETCL_Literal_Constraint id;
       this->queue_.dequeue_head (id);
       ACE_NEW_RETURN (any_ptr,
-        CORBA::Any (*(const CORBA::Any *) id),
+        CORBA::Any (),
         -1);
+      any_ptr->replace (id);
+      any_ptr->impl ()->_add_ref ();
       this->current_value_ = any_ptr;
     }
   }
@@ -792,11 +794,11 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
     {
     case FILTERABLE_DATA:
       result =
-        (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0);
+        (this->filterable_data_.find (ACE_CString (value, 0, false)) == 0);
       break;
     case VARIABLE_HEADER:
       result =
-        (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0);
+        (this->variable_header_.find (ACE_CString (value, 0, false)) == 0);
       break;
     case TYPE_NAME:
       result = (this->type_name_.in () != 0);
@@ -1087,7 +1089,9 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
 
       if (bag.expr_type () == TAO_ETCL_COMPONENT)
       {
-        const CORBA::Any *component = (const CORBA::Any *) bag;
+        CORBA::Any_var component = new CORBA::Any ();
+        component->replace (bag);
+        component->impl ()->_add_ref ();
         CORBA::TCKind kind = CORBA::tk_null;
 
         try
@@ -1105,23 +1109,23 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
         switch (kind)
         {
         case CORBA::tk_sequence:
-          result = this->sequence_does_contain (component,
+          result = this->sequence_does_contain (&component.in (),
             left);
           break;
         case CORBA::tk_array:
-          result = this->array_does_contain (component,
+          result = this->array_does_contain (&component.in (),
             left);
           break;
         case CORBA::tk_struct:
-          result = this->struct_does_contain (component,
+          result = this->struct_does_contain (&component.in (),
             left);
           break;
         case CORBA::tk_union:
-          result = this->union_does_contain (component,
+          result = this->union_does_contain (&component.in (),
             left);
           break;
         case CORBA::tk_any:
-          result = this->any_does_contain (component,
+          result = this->any_does_contain (&component.in (),
             left);
           break;
         default:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index 18cda388126..53110f0f1a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -248,7 +248,8 @@ Persistent_File_Allocator::read(Persistent_Storage_Block* psb)
       {
         // We want to start at the end of the queue and work backwards...
         size_t actual_block = (queue_size - idx) - 1;
-        if (0 == this->block_queue_.get(psbtemp, actual_block))
+        if ((0 == this->block_queue_.get(psbtemp, actual_block))
+            && (psbtemp != 0))
         {
           cached = ((*psbtemp)->block_number() == psb->block_number());
         }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 02632dce402..1e8638a4b15 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -83,9 +83,6 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
 
 CosNotification::EventTypeSeq*
 TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotification::EventTypeSeq_var event_type_seq;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 357c9868ced..ae45e97b14e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -89,8 +89,7 @@ public:
   virtual CosNotification::EventTypeSeq* obtain_types (
       CosNotifyChannelAdmin::ObtainInfoMode mode,
       const TAO_Notify_EventTypeSeq& types
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   /// Notification of subscriptions/offers set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 614157337c1..568a1133aa3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -66,10 +66,6 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent)
 
 void
 TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Adopt the supplier
   ACE_Auto_Ptr< TAO_Notify_Supplier > auto_supplier (supplier);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 7e2f2e4564f..70b27ab1022 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -51,11 +51,7 @@ public:
   virtual void init (TAO_Notify::Topology_Parent * topology_parent);
 
   /// Connect
-  void connect (TAO_Notify_Supplier* supplier)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosEventChannelAdmin::AlreadyConnected
-                     ));
+  void connect (TAO_Notify_Supplier* supplier);
 
   /// Disconnect
   void disconnect (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index bd274580332..7765c5c7ff4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -29,9 +29,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotifyChannelAdmin::SupplierAdmin_var ret;
 
@@ -44,10 +41,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   TAO_Notify_EventTypeSeq seq_added (added);
   TAO_Notify_EventTypeSeq seq_removed (removed);
@@ -67,7 +60,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->obtain_types (mode, this->event_manager().subscription_types ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 0d38ba6b19b..8ef90f4116c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -46,26 +46,16 @@ public:
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed);
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void);
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ));
+  );
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index f65d85abe56..ec8b8f5ea9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -55,10 +55,6 @@ TAO_Notify_ProxySupplier:: peer (void)
 
 void
 TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Adopt the consumer
   ACE_Auto_Ptr< TAO_Notify_Consumer > auto_consumer (consumer);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index f038e2c2c66..f56d8412c8a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -50,11 +50,7 @@ public:
   virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin);
 
   /// Connect
-  void connect (TAO_Notify_Consumer* consumer)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosEventChannelAdmin::AlreadyConnected
-                     ));
+  void connect (TAO_Notify_Consumer* consumer);
   /// Disconnect
   void disconnect (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index f47602374e1..af9dfa473e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -36,9 +36,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_StructuredEvent_No_Copy event (notification);
 
@@ -49,9 +46,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotificat
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_StructuredEvent_No_Copy event(notification);
 
@@ -62,9 +56,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_AnyEvent_No_Copy event (any);
 
@@ -75,9 +66,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ))
 {
   TAO_Notify_AnyEvent_No_Copy event(any);
 
@@ -88,9 +76,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA:
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->obtain_types (mode, this->event_manager().offered_types ());
 }
@@ -98,8 +83,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannel
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added,
                                                            const CosNotification::EventTypeSeq & removed)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType))
 {
   TAO_Notify_EventTypeSeq seq_added (added);
   TAO_Notify_EventTypeSeq seq_removed (removed);
@@ -116,11 +99,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyChannelAdmin::ConnectionAlreadyInactive,
-                   CosNotifyChannelAdmin::NotConnected
-                   ))
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -138,11 +116,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyChannelAdmin::ConnectionAlreadyActive,
-                   CosNotifyChannelAdmin::NotConnected
-                   ))
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -159,9 +132,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ret;
 
@@ -176,42 +146,24 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CosNotifyFilter::MappingFilter::_nil ());
-
-  return CosNotifyFilter::MappingFilter::_nil ();
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CosNotifyFilter::MappingFilter::_nil ());
-
-  return CosNotifyFilter::MappingFilter::_nil ();
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index 75b800ede14..461acbf9461 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -45,96 +45,52 @@ public:
 
   ///= POA_Notify_Internal methods
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured (const CosNotification::StructuredEvent & event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void forward_structured (const CosNotification::StructuredEvent & event);
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event);
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any (const CORBA::Any & event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void forward_any (const CORBA::Any & event);
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any_no_filtering (const CORBA::Any & event)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void forward_any_no_filtering (const CORBA::Any & event);
 protected:
   //= Data Members
   CORBA::Boolean is_suspended_;
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void suspend_connection (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyChannelAdmin::ConnectionAlreadyInactive,
-    CosNotifyChannelAdmin::NotConnected
-  ));
+  );
 
   virtual void resume_connection (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyChannelAdmin::ConnectionAlreadyActive,
-    CosNotifyChannelAdmin::NotConnected
-  ));
+  );
 
   virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void priority_filter (
     CosNotifyFilter::MappingFilter_ptr priority_filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void lifetime_filter (
     CosNotifyFilter::MappingFilter_ptr lifetime_filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual CosNotification::EventTypeSeq * obtain_offered_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ));
+  );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 009a4a9b70a..5896124519f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -39,19 +39,12 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotification::UnsupportedQoS
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
 TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -61,10 +54,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotification::UnsupportedQoS
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -77,19 +66,12 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_qos (
                                             const CosNotification::QoSProperties & /*required_qos*/,
                                             CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotification::UnsupportedQoS
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
 TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -104,10 +86,6 @@ template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
     CosNotifyFilter::FilterID filter
   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::FilterNotFound
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -117,10 +95,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
 TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::FilterNotFound
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -130,9 +104,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
 TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -142,9 +113,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 7e24ca1b8ff..df3b7910444 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -54,69 +54,37 @@ public:
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ));
+  );
 
  virtual CosNotification::QoSProperties * get_qos (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ));
+  );
 
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ));
+  );
 
   virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyFilter::FilterNotFound
-  ));
+  );
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyFilter::FilterNotFound
-  ));
+  );
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual void remove_all_filters (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 };
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 62915a67221..93aa21c5bc5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -616,7 +616,9 @@ Routing_Slip_Persistence_Manager::build_chain(
       // allocator obtains ownership, so write out and delete the header
       // only.
       result &= this->allocator_->write(prevblk);
-      delete prevhdr;
+
+      if (prevhdr != &first_header)
+        delete prevhdr;
     }
     prevblk = curblk;
     prevhdr = hdr;
@@ -625,7 +627,9 @@ Routing_Slip_Persistence_Manager::build_chain(
   {
     prevhdr->put_header(*prevblk);
     result &= this->allocator_->write(prevblk);
-    delete prevhdr;
+
+    if (prevhdr != &first_header)
+      delete prevhdr;
   }
   pos = first_header.put_header(
     *first_block);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index c1bed4b9a60..1aa065a1b62 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -30,19 +30,12 @@ TAO_Notify_SequenceProxyPushConsumer::release (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_SequenceProxyPushConsumer::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_SEQUENCE;
 }
 
 void
 TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Convert Supplier to Base Type
   TAO_Notify_SequencePushSupplier *supplier;
@@ -58,10 +51,6 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC
 
 void
 TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventComm::Disconnected
-                   ))
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1 && this->admin_properties().queue_full ())
@@ -83,9 +72,6 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
 
 void
 TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this );
   this->destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 373a3389297..04e21d518dd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -60,29 +60,15 @@ protected:
   ///= Protected Methods
 
   //= interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
 
   virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier
-                                               )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventChannelAdmin::AlreadyConnected
-                     ));
+                                               );
 
   virtual void push_structured_events (const CosNotification::EventBatch & notifications
-                                      )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventComm::Disconnected
-                     ));
-
-  virtual void disconnect_sequence_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                      );
+
+  virtual void disconnect_sequence_push_consumer (void);
 
 private:
   /// TAO_Notify_Destroy_Callback methods
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 0a258fecdf5..95d19c94875 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -27,11 +27,6 @@ TAO_Notify_SequenceProxyPushSupplier::release (void)
 
 void
 TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   , CosEventChannelAdmin::TypeError
-                   ))
 {
   // Convert Consumer to Base Type
   TAO_Notify_SequencePushConsumer* consumer;
@@ -47,9 +42,6 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
 
 void
 TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
   TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this );
@@ -59,9 +51,6 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_SequenceProxyPushSupplier::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_SEQUENCE;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 3b5e76b8cde..e75aa763791 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -62,25 +62,14 @@ public:
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
 
   /// = Servant methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventChannelAdmin::AlreadyConnected,
-    CosEventChannelAdmin::TypeError
-  ));
+  );
 
   virtual void disconnect_sequence_push_supplier (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index df4b9ac9aca..b45f79230dd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -31,19 +31,12 @@ TAO_Notify_StructuredProxyPushConsumer::release (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_StructuredProxyPushConsumer::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_STRUCTURED;
 }
 
 void
 TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   ))
 {
   // Convert Supplier to Base Type
   TAO_Notify_StructuredPushSupplier * supplier;
@@ -58,10 +51,6 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot
 
 void
 TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventComm::Disconnected
-                   ))
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
@@ -79,9 +68,6 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
 
 void
 TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this );
   this->destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 24c6a667cf1..e8dd900b03f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -56,32 +56,18 @@ public:
 protected:
 
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
 
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventChannelAdmin::AlreadyConnected
-  ));
+  );
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosEventComm::Disconnected
-    ));
+    );
 
   virtual void disconnect_structured_push_consumer (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual const char * get_proxy_type_name (void) const;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 2f7147a5078..ffa1c18c045 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -30,20 +30,12 @@ TAO_Notify_StructuredProxyPushSupplier::release (void)
 
 CosNotifyChannelAdmin::ProxyType
 TAO_Notify_StructuredProxyPushSupplier::MyType (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CosNotifyChannelAdmin::PUSH_STRUCTURED;
 }
 
 void
 TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosEventChannelAdmin::AlreadyConnected
-                   , CosEventChannelAdmin::TypeError
-                   ))
 {
   // Convert Consumer to Base Type
   TAO_Notify_StructuredPushConsumer* consumer;
@@ -59,9 +51,6 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
 
 void
 TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
   TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this );
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 068e3e5a09e..84cd3372f94 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -62,25 +62,14 @@ public:
 
   /// = Servant methods
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventChannelAdmin::AlreadyConnected,
-    CosEventChannelAdmin::TypeError
-  ));
+  );
 
   virtual void disconnect_structured_push_supplier (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
   virtual const char * get_proxy_type_name (void) const;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 344c0294e64..bbbc12149c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -80,9 +80,6 @@ TAO_Notify_SupplierAdmin::release (void)
 
 void
 TAO_Notify_SupplierAdmin::destroy (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   int result = this->shutdown ();
   if ( result == 1)
@@ -146,19 +143,12 @@ TAO_Notify_SupplierAdmin::load_proxy (
 
 void
 TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
 TAO_Notify_SupplierAdmin::get_qos (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->TAO_Notify_Object::get_qos ();
 }
@@ -166,10 +156,6 @@ TAO_Notify_SupplierAdmin::get_qos (void)
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype
                                                          , CosNotifyChannelAdmin::ProxyID_out proxy_id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminLimitExceeded
-                   ))
 
 {
   CosNotification::QoSProperties initial_qos;
@@ -188,11 +174,6 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
                                                                   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminLimitExceeded
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   CosNotifyChannelAdmin::ProxyConsumer_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
@@ -206,9 +187,6 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
@@ -218,36 +196,24 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
 
 CosNotifyChannelAdmin::AdminID
 TAO_Notify_SupplierAdmin::MyID (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->id ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_SupplierAdmin::MyChannel (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
 TAO_Notify_SupplierAdmin::MyOperator (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->filter_operator_;
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_Notify_SupplierAdmin::push_consumers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
@@ -256,10 +222,6 @@ TAO_Notify_SupplierAdmin::push_consumers (void)
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::ProxyNotFound
-                   ))
 {
   TAO_Notify_ProxyConsumer_Find_Worker find_worker;
 
@@ -270,10 +232,6 @@ void
 TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed
                                     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyComm::InvalidEventType
-                   ))
 
 {
   TAO_Notify_EventTypeSeq seq_added (added);
@@ -293,9 +251,6 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
 
 CosNotifyFilter::FilterID
 TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   CosNotifyFilter::FilterID fid =
     this->filter_admin_.add_filter (new_filter);
@@ -305,38 +260,24 @@ TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
 
 void
 TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyFilter::FilterNotFound
-                   ))
 {
   this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
 TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyFilter::FilterNotFound
-                   ))
 {
   return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
 TAO_Notify_SupplierAdmin::get_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return this->filter_admin_.get_all_filters ();
 }
 
 void
 TAO_Notify_SupplierAdmin::remove_all_filters (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   this->filter_admin_.remove_all_filters ();
 }
@@ -345,30 +286,20 @@ TAO_Notify_SupplierAdmin::remove_all_filters (void)
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_pull_consumer (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosEventChannelAdmin::ProxyPullConsumer::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_Notify_SupplierAdmin::pull_consumers (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 
 void
 TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   ))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -376,12 +307,8 @@ TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/,
                                                          CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::AdminLimitExceeded
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyChannelAdmin::ProxyConsumer::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_Notify_ProxyConsumer *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index e8495c124e8..c864babaf33 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -82,108 +82,75 @@ protected:
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id,
       const CosNotification::QoSProperties & initial_qos
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyChannelAdmin::AdminLimitExceeded,
-                     CosNotification::UnsupportedQoS));
+    );
 
   /// = CosNotifyChannelAdmin::SupplierAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosNotifyChannelAdmin::AdminID MyID (void);
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
       CosNotifyChannelAdmin::ProxyID proxy_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyChannelAdmin::ProxyNotFound));
+    );
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_pull_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyChannelAdmin::AdminLimitExceeded));
+    );
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_push_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyChannelAdmin::AdminLimitExceeded));
+    );
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual ::CosNotification::QoSProperties* get_qos (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::CosNotification::QoSProperties* get_qos (void);
 
-  virtual void set_qos (const CosNotification::QoSProperties& qos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotification::UnsupportedQoS));
+  virtual void set_qos (const CosNotification::QoSProperties& qos);
 
   virtual void validate_qos (
       const CosNotification::QoSProperties & required_qos,
       CosNotification::NamedPropertyRangeSeq_out available_qos
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotification::UnsupportedQoS));
+    );
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyComm::InvalidEventType
-                     ));
+                             const CosNotification::EventTypeSeq & removed);
 
   virtual CosNotifyFilter::FilterID add_filter (
       CosNotifyFilter::Filter_ptr new_filter
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void remove_filter (
       CosNotifyFilter::FilterID filter
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyFilter::FilterNotFound));
+    );
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
       CosNotifyFilter::FilterID filter
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyFilter::FilterNotFound));
+    );
 
   virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
-  virtual void remove_all_filters (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void remove_all_filters (void);
 
   virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 336b06d11da..d1e8636e869 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -78,13 +78,14 @@ namespace TAO_Notify
     if (result)
     {
       this->live_ = false;
-      ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream;
+      auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
       // xml input source will take ownership
 
       if (fstm->open (this->file_name_.c_str ()) == 0)
       {
         // InputSource takes ownership
-        ACEXML_InputSource input (fstm);
+        ACEXML_InputSource input (fstm.get ());
+        (void) fstm.release ();
 
         ACEXML_Parser parser;
         parser.setContentHandler (this);
@@ -92,19 +93,17 @@ namespace TAO_Notify
         parser.setErrorHandler (this);
         parser.setEntityResolver (this);
 
-        ACEXML_TRY_NEW_ENV
+        try
         {
-          parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-          ACEXML_TRY_CHECK;
+          parser.parse (&input);
         }
-        ACEXML_CATCH (ACEXML_Exception, ex)
+        catch (const ACEXML_Exception& ex)
         {
           // The only way to find out what it is, it to let it print itself, so...
           ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ()));
           ex.print ();
           result = false;
         }
-        ACEXML_ENDTRY;
       }
       else
       {
@@ -129,13 +128,14 @@ namespace TAO_Notify
     ACE_ASSERT (root != 0);
     this->live_ = true;
 
-    ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream;
+    auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
     // xml input source will take ownership
 
     if (fstm->open (this->file_name_.c_str ()) == 0)
     {
       // InputSource takes ownership
-      ACEXML_InputSource input (fstm);
+      ACEXML_InputSource input (fstm.get ());
+      (void) fstm.release ();
 
       ACEXML_Parser parser;
       parser.setContentHandler (this);
@@ -143,7 +143,7 @@ namespace TAO_Notify
       parser.setErrorHandler (this);
       parser.setEntityResolver (this);
 
-      ACEXML_TRY_NEW_ENV
+      try
       {
         object_stack_.push (root);
         parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
@@ -152,14 +152,13 @@ namespace TAO_Notify
         Topology_Object* cur;
         object_stack_.pop (cur);
       }
-      ACEXML_CATCH (ACEXML_Exception, ex)
+      catch (const ACEXML_Exception& ex)
       {
         // The only way to find out what it is, it to let it print itself, so...
         ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ()));
         ex.print ();
         throw CORBA::INTERNAL();
       }
-      ACEXML_ENDTRY;
     }
     else
     {
@@ -172,8 +171,8 @@ namespace TAO_Notify
   XML_Loader::startElement (const ACEXML_Char*,
     const ACEXML_Char*,
     const ACEXML_Char* name,
-    ACEXML_Attributes* xml_attrs ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ( (ACEXML_SAXException))
+    ACEXML_Attributes* xml_attrs)
+        throw (ACEXML_SAXException)
   {
     ACE_ASSERT (name != 0);
     ACE_ASSERT (xml_attrs != 0);
@@ -194,14 +193,13 @@ namespace TAO_Notify
             ));
 
           ACE_CString cname (name);
-          Topology_Object* next = cur->load_child (
-            cname, id, attrs);
+          Topology_Object* next = cur->load_child (cname, id, attrs);
           ACE_ASSERT(next != 0);
           object_stack_.push (next);
         }
         catch (const CORBA::Exception& ex)
         {
-          ACEXML_THROW (ACEXML_SAXException (ex._info ().c_str ()));
+          throw ACEXML_SAXException (ex._info ().c_str ());
         }
       }
     }
@@ -210,18 +208,20 @@ namespace TAO_Notify
   void
   XML_Loader::endElement (const ACEXML_Char*,
     const ACEXML_Char*,
-    const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ( (ACEXML_SAXException))
+    const ACEXML_Char* name)
+        throw (ACEXML_SAXException)
   {
     ACE_UNUSED_ARG (name);
     if (this->live_)
     {
       ACE_ASSERT (object_stack_.size () > 0);
-      if (DEBUG_LEVEL > 5) ACE_DEBUG ((LM_INFO,
-        ACE_TEXT("(%P|%t) XML_Loader: End Element %s\n"),
-        name
-        ));
-      Topology_Object* cur;
+      if (DEBUG_LEVEL > 5)
+        {
+          ACE_DEBUG ((LM_INFO,
+                      ACE_TEXT("(%P|%t) XML_Loader: End Element %s\n"),
+                      name));
+        }
+      Topology_Object* cur = 0;
       object_stack_.pop (cur);
     }
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index b90799d8f20..e2a1a967128 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -59,13 +59,12 @@ public:
     const ACEXML_Char* localName,
     const ACEXML_Char* qName,
     ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
+      throw (ACEXML_SAXException);
 
   virtual void endElement (const ACEXML_Char*,
     const ACEXML_Char*,
     const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
+      throw (ACEXML_SAXException);
 
 private:
   /// The name of the file from which data is read.
@@ -75,7 +74,7 @@ private:
 
   typedef ACE_Unbounded_Stack<Topology_Object*> TopoStack;
   TopoStack object_stack_;
-  // if false, then we're just checking syntax of topology file.
+  /// if false, then we're just checking syntax of topology file.
   bool live_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
index 310952a767a..97df8e3338f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
@@ -246,8 +246,8 @@ module PortableGroup
     /**
      * Remove the registration of a factory.
      * @param role the role played by the object formerly created by this factory.
-     * @param location where the factory formerly created objects.
-     * @throws MemberNotPresent if no factory is available for the given role at this location.
+     * @param the_location where the factory formerly created objects.
+     * @throws MemberNotFound if no factory is available for the given role at this location.
      */
     void unregister_factory(in RoleName role, in Location the_location)
       raises (MemberNotFound);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 2705c6ae78e..74563633343 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -20,10 +20,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableServer::ObjectId *
 TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ))
 {
   // Get the RepositoryId from the Group reference so
   // we know what kind of reference to make.
@@ -45,10 +41,6 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref)
 
 PortableGroup::IDs *
 TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ))
 {
   ACE_UNUSED_ARG (the_ref);
 
@@ -58,10 +50,6 @@ TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref)
 void
 TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
                                       const PortableServer::ObjectId & oid)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ))
 {
   // Create a reference for the specified ObjectId, since
   // it is much easier to extract the object key from the
@@ -76,10 +64,6 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
 void
 TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
                                          const PortableServer::ObjectId & oid)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ))
 {
   ACE_UNUSED_ARG (ref);
   ACE_UNUSED_ARG (oid);
@@ -140,9 +124,6 @@ PortableServer::POA_ptr
 TAO_GOA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
                         const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
                                                            poa_manager,
@@ -153,8 +134,6 @@ TAO_GOA::create_POA (const char *adapter_name,
 PortableServer::POA_ptr
 TAO_GOA::find_POA (const char *adapter_name,
                       CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
                                                          activate_it);
@@ -164,7 +143,6 @@ TAO_GOA::find_POA (const char *adapter_name,
 void
 TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::destroy (etherealize_objects,
                           wait_for_completion);
@@ -175,7 +153,6 @@ TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
 
 PortableServer::ThreadPolicy_ptr
 TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
     this->TAO_Regular_POA::create_thread_policy (value);
@@ -186,7 +163,6 @@ TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value)
 
 PortableServer::LifespanPolicy_ptr
 TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
     this->TAO_Regular_POA::create_lifespan_policy (value);
@@ -195,7 +171,6 @@ TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
 
 PortableServer::IdUniquenessPolicy_ptr
 TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
     this->TAO_Regular_POA::create_id_uniqueness_policy (value);
@@ -205,7 +180,6 @@ TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va
 
 PortableServer::IdAssignmentPolicy_ptr
 TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
     this->TAO_Regular_POA::create_id_assignment_policy (value);
@@ -217,7 +191,6 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
     this->TAO_Regular_POA::create_implicit_activation_policy (value);
@@ -226,7 +199,6 @@ TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
     this->TAO_Regular_POA::create_servant_retention_policy (value);
@@ -236,7 +208,6 @@ TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
     this->TAO_Regular_POA::create_request_processing_policy (value);
@@ -248,7 +219,6 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 
 char *
 TAO_GOA::the_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
     this->TAO_Regular_POA::the_name ();
@@ -257,7 +227,6 @@ TAO_GOA::the_name (void)
 
 PortableServer::POA_ptr
 TAO_GOA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
     this->TAO_Regular_POA::the_parent ();
@@ -266,7 +235,6 @@ TAO_GOA::the_parent (void)
 
 PortableServer::POAList *
 TAO_GOA::the_children (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
     this->TAO_Regular_POA::the_children ();
@@ -275,7 +243,6 @@ TAO_GOA::the_children (void)
 
 PortableServer::POAManager_ptr
 TAO_GOA::the_POAManager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
     this->TAO_Regular_POA::the_POAManager ();
@@ -287,7 +254,6 @@ TAO_GOA::the_POAManager (void)
 
 PortableServer::AdapterActivator_ptr
 TAO_GOA::the_activator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
     this->TAO_Regular_POA::the_activator ();
@@ -296,15 +262,12 @@ TAO_GOA::the_activator (void)
 
 void
 TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::the_activator (adapter_activator);
 }
 
 PortableServer::ServantManager_ptr
 TAO_GOA::get_servant_manager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
     this->TAO_Regular_POA::get_servant_manager ();
@@ -313,17 +276,12 @@ TAO_GOA::get_servant_manager (void)
 
 void
 TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::set_servant_manager (imgr);
 }
 
 PortableServer::Servant
 TAO_GOA::get_servant (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::get_servant ();
@@ -332,8 +290,6 @@ TAO_GOA::get_servant (void)
 
 void
 TAO_GOA::set_servant (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::set_servant (servant);
 }
@@ -342,9 +298,6 @@ TAO_GOA::set_servant (PortableServer::Servant servant)
 
 PortableServer::ObjectId *
 TAO_GOA::activate_object (PortableServer::Servant p_servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::activate_object (p_servant);
@@ -354,10 +307,6 @@ TAO_GOA::activate_object (PortableServer::Servant p_servant)
 void
 TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
                                      PortableServer::Servant p_servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::activate_object_with_id (id,
                                           p_servant);
@@ -365,17 +314,12 @@ TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
 
 void
 TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::deactivate_object (oid);
 }
 
 CORBA::Object_ptr
 TAO_GOA::create_reference (const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference (intf);
@@ -385,7 +329,6 @@ TAO_GOA::create_reference (const char *intf)
 CORBA::Object_ptr
 TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
                                    const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference_with_id (oid,
@@ -395,9 +338,6 @@ TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
 
 PortableServer::ObjectId *
 TAO_GOA::servant_to_id (PortableServer::Servant p_servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::servant_to_id (p_servant);
@@ -406,9 +346,6 @@ TAO_GOA::servant_to_id (PortableServer::Servant p_servant)
 
 CORBA::Object_ptr
 TAO_GOA::servant_to_reference (PortableServer::Servant p_servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::servant_to_reference (p_servant);
@@ -418,10 +355,6 @@ TAO_GOA::servant_to_reference (PortableServer::Servant p_servant)
 
 PortableServer::Servant
 TAO_GOA::reference_to_servant (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::reference_to_servant (reference);
@@ -430,9 +363,6 @@ TAO_GOA::reference_to_servant (CORBA::Object_ptr reference)
 
 PortableServer::ObjectId *
 TAO_GOA::reference_to_id (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::reference_to_id (reference);
@@ -441,9 +371,6 @@ TAO_GOA::reference_to_id (CORBA::Object_ptr reference)
 
 PortableServer::Servant
 TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::id_to_servant (oid);
@@ -452,9 +379,6 @@ TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid)
 
 CORBA::Object_ptr
 TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::id_to_reference (oid);
@@ -463,7 +387,6 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid)
 
 CORBA::OctetSeq *
 TAO_GOA::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->TAO_Regular_POA::id ();
 }
@@ -558,8 +481,6 @@ void
 TAO_GOA::associate_group_with_ref (
       CORBA::Object_ptr group_ref,
       CORBA::Object_ptr obj_ref)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NotAGroupObject))
 {
   // Find the Group Component so that we can extract the Group ID.
   PortableGroup::TagGroupTaggedComponent *tmp_group_id;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 42a20bdbd8f..9ade43a0f85 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -55,183 +55,106 @@ public:
   //@{
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ));
+    );
 
 
   virtual PortableGroup::IDs * reference_to_ids (
       CORBA::Object_ptr the_ref
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ));
+    );
 
   virtual void associate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ));
+    );
 
   virtual void disassociate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableGroup::NotAGroupObject
-    ));
+    );
   //@}
 
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+                                      const CORBA::PolicyList &policies);
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                                    CORBA::Boolean activate_it);
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                CORBA::Boolean wait_for_completion);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value);
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value);
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value);
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value);
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * the_name (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
-  PortableServer::POAList *the_children (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAList *the_children (void);
 
-  PortableServer::POAManager_ptr the_POAManager (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager_ptr the_POAManager (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::AdapterActivator_ptr the_activator (void);
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::ServantManager_ptr get_servant_manager (void);
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant (void);
 
-  void set_servant (PortableServer::Servant servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  void set_servant (PortableServer::Servant servant);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant);
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                PortableServer::Servant p_servant);
 
-  void deactivate_object (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+  void deactivate_object (const PortableServer::ObjectId &oid);
 
-  CORBA::Object_ptr create_reference (const char *intf)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  CORBA::Object_ptr create_reference (const char *intf);
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::OctetSeq *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              const char *intf);
+
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant);
+
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant);
+
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference);
+
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference);
+
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid);
+
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
+
+  CORBA::OctetSeq *id (void);
 
   // End standard POA interface methods.
 
@@ -279,9 +202,7 @@ protected:
   /// object references.
   void associate_group_with_ref (
         CORBA::Object_ptr group_ref,
-        CORBA::Object_ptr obj_ref)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableGroup::NotAGroupObject));
+        CORBA::Object_ptr obj_ref);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index 3ed2d1869a0..a7f6649c96c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -27,9 +27,6 @@ TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void)
 void
 TAO_PG_Default_Property_Validator::validate_property (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   const CORBA::ULong len = props.length ();
 
@@ -78,9 +75,6 @@ TAO_PG_Default_Property_Validator::validate_property (
 void
 TAO_PG_Default_Property_Validator::validate_criteria (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   const CORBA::ULong len = props.length ();
   PortableGroup::Criteria invalid_criteria;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index 15cf9257f0f..6d536b62078 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -46,18 +46,12 @@ public:
   /// Validate the given properties.  Throw an exception when the
   /// first invalid property is encountered.  The remaining properties
   /// will not be validated.
-  virtual void validate_property (const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+  virtual void validate_property (const PortableGroup::Properties & props);
 
   /// Validate the given properties/criteria.  All criteria
   /// will be validated regardless of whether or not an invalid
   /// property was encountered.
-  virtual void validate_criteria (const PortableGroup::Properties & criteria)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::CannotMeetCriteria));
+  virtual void validate_criteria (const PortableGroup::Properties & criteria);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index eaba8c3012d..d938aa82e6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -285,10 +285,6 @@ void TAO::PG_FactoryRegistry::register_factory (
     const char * type_id,
     const PortableGroup::FactoryInfo & factory_info
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-      , PortableGroup::MemberAlreadyPresent
-      , PortableGroup::TypeConflict))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory);
 
@@ -357,7 +353,6 @@ void TAO::PG_FactoryRegistry::unregister_factory (
     const char * role,
     const PortableGroup::Location & location
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory);
 
@@ -446,7 +441,6 @@ void TAO::PG_FactoryRegistry::unregister_factory (
 void TAO::PG_FactoryRegistry::unregister_factory_by_role (
     const char * role
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_role);
 
@@ -492,7 +486,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
 void TAO::PG_FactoryRegistry::unregister_factory_by_location (
     const PortableGroup::Location & location
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_location);
 
@@ -606,7 +599,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
     const char * role,
     CORBA::String_out type_id
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_role);
 
@@ -637,7 +629,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_location (
     const PortableGroup::Location & location
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_location);
   ::PortableGroup::FactoryInfos_var result;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index dbc93df64f7..bd1bcfe5457 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -132,39 +132,30 @@ namespace TAO
         const char * role,
         const char * type_id,
         const PortableGroup::FactoryInfo & factory_info
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::MemberAlreadyPresent
-        , PortableGroup::TypeConflict));
+      );
 
     virtual void unregister_factory (
         const char * role,
         const PortableGroup::Location & location
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound));
+    );
 
     virtual void unregister_factory_by_role (
         const char * role
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
 
     virtual void unregister_factory_by_location (
       const PortableGroup::Location & location
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_role (
         const char * role,
         CORBA::String_out type_id
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_location (
       const PortableGroup::Location & location
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
     /////////////////////////
     // Implementation methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index b14d68eff4d..0b3fc40b9db 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -58,12 +58,6 @@ TAO_PG_GenericFactory::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
   PortableGroup::Properties_var properties =
     this->property_manager_.get_type_properties (type_id);
@@ -109,8 +103,7 @@ TAO_PG_GenericFactory::create_object (
         // that over 4 billion object groups are being managed by this
         // generic factory!
         if (this->next_fcid_ == fcid)
-          ACE_THROW_RETURN (PortableGroup::ObjectNotCreated (),
-                            CORBA::Object::_nil ());
+          throw PortableGroup::ObjectNotCreated ();
       }
 
     // Just in case this->next_fcid_ was modified in the above search,
@@ -191,8 +184,6 @@ void
 TAO_PG_GenericFactory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
   CORBA::ULong fcid = 0;
 
@@ -655,13 +646,6 @@ TAO_PG_GenericFactory::create_member (
     const PortableGroup::FactoryInfo & factory_info,
     const char * type_id,
     const CORBA::Boolean propagate_member_already_present)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria,
-                   PortableGroup::MemberAlreadyPresent))
 {
   PortableGroup::GenericFactory::FactoryCreationId_var fcid;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 9d01a0cfc25..b5e0df56cb8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -74,13 +74,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::CannotMeetCriteria));
+        factory_creation_id);
 
   /**
    * Delete the object corresponding to the provided
@@ -90,9 +84,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectNotFound));
+        factory_creation_id);
 
   //@}
 
@@ -142,14 +134,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::FactoryInfo & factory_info,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::CannotMeetCriteria,
-		     PortableGroup::MemberAlreadyPresent));
+      const CORBA::Boolean propagate_member_already_present);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 2b6abd2903b..dbcc166adf9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -72,12 +72,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     TAO::PG_Property_Set * typeid_properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
   ///////////////////////////////////
   // Create an empty group reference
@@ -95,7 +89,7 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
   PortableGroup::TagGroupTaggedComponent tagged_component;
   if (! TAO::PG_Utils::get_tagged_component (empty_group, tagged_component))
   {
-    ACE_THROW_RETURN (PortableGroup::ObjectNotCreated(), 0);
+    throw PortableGroup::ObjectNotCreated();
   }
 
   TAO::PG_Object_Group * objectGroup = 0;
@@ -117,14 +111,12 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
   if (this->group_map_.bind (group_id, objectGroup) != 0)
   {
     delete objectGroup;
-    ACE_THROW_RETURN (PortableGroup::ObjectNotCreated(), 0);
+    throw PortableGroup::ObjectNotCreated();
   }
   return objectGroup;
 }
 
 void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (object_group))
   {
@@ -134,8 +126,6 @@ void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_
 
 
 void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (group_id))
   {
@@ -193,7 +183,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_
 PortableGroup::ObjectGroups *
 TAO::PG_Group_Factory::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   size_t upper_limit = this->group_map_.current_size ();
   PortableGroup::ObjectGroups * result = 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index a42ba34d67a..950513257e7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -86,28 +86,17 @@ namespace TAO
     TAO::PG_Object_Group * create_group (
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
-        TAO::PG_Property_Set * typeid_properties)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableGroup::NoFactory,
-                       PortableGroup::ObjectNotCreated,
-                       PortableGroup::InvalidCriteria,
-                       PortableGroup::InvalidProperty,
-                       PortableGroup::CannotMeetCriteria));
+        TAO::PG_Property_Set * typeid_properties);
 
 
-    void delete_group (PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableGroup::ObjectNotFound));
+    void delete_group (PortableGroup::ObjectGroup_ptr object_group);
 
 
-    void delete_group (PortableGroup::ObjectGroupId group_id)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableGroup::ObjectNotFound));
+    void delete_group (PortableGroup::ObjectGroupId group_id);
 
     PortableGroup::ObjectGroups *
     groups_at_location (
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ( (CORBA::SystemException));
+        const PortableGroup::Location & the_location);
 
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index 4fd9fac28f1..ea6a1a9b6ab 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -10,18 +10,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_PG_Null_Property_Validator::validate_property (
     const PortableGroup::Properties &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 }
 
 void
 TAO_PG_Null_Property_Validator::validate_criteria (
     const PortableGroup::Properties &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index b9f6dc18f15..c9922b98409 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -41,20 +41,14 @@ public:
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_property (const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+  void validate_property (const PortableGroup::Properties & props);
 
   /// Validate the given criteria.
   /**
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_criteria (const PortableGroup::Properties & criteria)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::CannotMeetCriteria));
+  void validate_criteria (const PortableGroup::Properties & criteria);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index ff196d2d32c..e0b7e54be74 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -52,16 +52,8 @@ TAO_PG_ObjectGroupManager::create_member (
     const PortableGroup::Location & /* the_location */,
     const char * /* type_id */,
     const PortableGroup::Criteria & /* the_criteria */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    PortableGroup::ObjectGroup::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 PortableGroup::ObjectGroup_ptr
@@ -69,14 +61,9 @@ TAO_PG_ObjectGroupManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   if (CORBA::is_nil (member))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -102,13 +89,9 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
     CORBA::Object_ptr member,
     const char * type_id,
     const CORBA::Boolean propagate_member_already_present)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory))
 {
   if (CORBA::is_nil (member))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -152,10 +135,6 @@ TAO_PG_ObjectGroupManager::add_member_i (
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
     const CORBA::Boolean check_type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
     this->get_group_entry (object_group);
@@ -171,16 +150,14 @@ TAO_PG_ObjectGroupManager::add_member_i (
         {
           // The member's type_id does not match the object group's
           // type_id.
-          ACE_THROW_RETURN (PortableGroup::ObjectNotAdded (),
-                            PortableGroup::ObjectGroup::_nil ());
+          throw PortableGroup::ObjectNotAdded ();
         }
     }
 
   TAO_PG_ObjectGroup_Array * groups = 0;
   if (this->location_map_.find (the_location, groups) == 0
       && this->member_already_present (*groups, group_entry))
-    ACE_THROW_RETURN (PortableGroup::MemberAlreadyPresent (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw PortableGroup::MemberAlreadyPresent ();
 
   TAO_PG_MemberInfo member_info;
   member_info.member   = CORBA::Object::_duplicate (member);
@@ -201,8 +178,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
       // This should not fail!
       if (this->location_map_.bind (the_location, groups) != 0)
         {
-          ACE_THROW_RETURN (PortableGroup::ObjectNotAdded (),
-                            PortableGroup::ObjectGroup::_nil ());
+          throw PortableGroup::ObjectNotAdded ();
         }
 
       (void) safe_groups.release ();
@@ -218,8 +194,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
   // Don't bother checking for duplicates since a check is already
   // performed when binding to the location map above.
   if (group_entry->member_infos.insert_tail (member_info) != 0)
-    ACE_THROW_RETURN (PortableGroup::ObjectNotAdded (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw PortableGroup::ObjectNotAdded ();
 
   return PortableGroup::ObjectGroup::_duplicate (object_group);
 }
@@ -228,9 +203,6 @@ PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
@@ -239,8 +211,7 @@ TAO_PG_ObjectGroupManager::remove_member (
 
   TAO_PG_ObjectGroup_Array * groups = 0;
   if (this->location_map_.find (the_location, groups) != 0)
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw PortableGroup::ObjectGroupNotFound ();
 
   // Multiple members from different object groups may reside at the
   // same location.  Iterate through the list to attempt to find a
@@ -298,15 +269,12 @@ TAO_PG_ObjectGroupManager::remove_member (
         }
     }
 
-  ACE_THROW_RETURN (PortableGroup::MemberNotFound (),
-                    PortableGroup::ObjectGroup::_nil ());
+  throw PortableGroup::MemberNotFound ();
 }
 
 PortableGroup::Locations *
 TAO_PG_ObjectGroupManager::locations_of_members (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
@@ -342,7 +310,6 @@ TAO_PG_ObjectGroupManager::locations_of_members (
 PortableGroup::ObjectGroups *
 TAO_PG_ObjectGroupManager::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableGroup::ObjectGroups * ogs;
   ACE_NEW_THROW_EX (ogs,
@@ -374,8 +341,6 @@ TAO_PG_ObjectGroupManager::groups_at_location (
 PortableGroup::ObjectGroupId
 TAO_PG_ObjectGroupManager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -386,7 +351,7 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
     this->get_group_entry (object_group);
 
   if (entry == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   // Only the lower 32 bits of the 64 bit PortableGroup::ObjectGroupId
   // are ever used.
@@ -396,8 +361,6 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   TAO_PG_ObjectGroup_Map_Entry * entry = 0;
 
@@ -412,8 +375,7 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
   }
 
   if (entry == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      PortableGroup::ObjectGroup::_nil ());
+    throw CORBA::INTERNAL ();
 
   // This implemenation does not change the object group reference.
   return PortableGroup::ObjectGroup::_duplicate (object_group);
@@ -423,9 +385,6 @@ CORBA::Object_ptr
 TAO_PG_ObjectGroupManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & loc)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -460,18 +419,13 @@ TAO_PG_ObjectGroupManager::get_member_ref (
 
   // No member of the given object group is present at the given
   // location.
-  ACE_THROW_RETURN (PortableGroup::MemberNotFound (),
-                    CORBA::Object::_nil ());
+  throw PortableGroup::MemberNotFound ();
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::ObjectGroupNotFound
-      ))
 {
   //@@ If we change the PG's concept of ObjectGroupId from
   // PortableServer::ObjectId to PortableGroup::ObjectGroupId, can
@@ -488,15 +442,13 @@ TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
                                       group_entry)
          != 0)
       {
-        ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
-                          PortableGroup::ObjectGroup::_nil ());
+        throw PortableGroup::ObjectGroupNotFound ();
       }
   }
 
   if (group_entry == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        PortableGroup::ObjectGroup::_nil ());
+      throw CORBA::INTERNAL ();
     }
 
   return
@@ -511,7 +463,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
   const PortableGroup::Criteria & the_criteria)
 {
   if (CORBA::is_nil (this->poa_.in ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
+    throw CORBA::INTERNAL ();
 
   // Create a reference for the ObjectGroup corresponding to the
   // RepositoryId of the object being created.
@@ -550,8 +502,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
                       0);
 
     if (this->object_group_map_.bind (oid, group_entry) != 0)
-      ACE_THROW_RETURN (PortableGroup::ObjectNotCreated (),
-                        PortableGroup::ObjectGroup::_nil ());
+      throw PortableGroup::ObjectNotCreated ();
   }
 
   (void) safe_group_entry.release ();
@@ -606,8 +557,6 @@ TAO_PG_ObjectGroupManager::object_group (const PortableServer::ObjectId & oid)
 CORBA::ULong
 TAO_PG_ObjectGroupManager::member_count (
     PortableGroup::ObjectGroup_ptr group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
 //   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
 //                     guard,
@@ -630,8 +579,6 @@ TAO_PG_ObjectGroupManager::poa (PortableServer::POA_ptr p)
 PortableGroup::Properties *
 TAO_PG_ObjectGroupManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::Properties * properties = 0;
   ACE_NEW_THROW_EX (properties,
@@ -662,11 +609,9 @@ TAO_PG_ObjectGroupManager::get_properties (
 TAO_PG_ObjectGroup_Map_Entry *
 TAO_PG_ObjectGroupManager::get_group_entry (
     CORBA::Object_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   if (CORBA::is_nil (this->poa_.in ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   PortableServer::ObjectId_var oid;
   try
@@ -690,8 +635,7 @@ TAO_PG_ObjectGroupManager::get_group_entry (
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid.in (), group_entry) != 0)
-    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
-                      0);
+    throw PortableGroup::ObjectGroupNotFound ();
 
   return group_entry;
 }
@@ -757,7 +701,7 @@ TAO_PG_ObjectGroupManager::valid_type_id (
   // @todo Strategize this -- e.g. strict type checking.
 
   if (CORBA::is_nil (member))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), false);
+    throw CORBA::BAD_PARAM ();
 
   // Before we can use this code, i.e. the reverse lock, the
   // TAO_PG_ObjectGroup_Entry should be made so that it is reference
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 2b0505f50cc..582fa5cc5d5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -68,24 +68,13 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::CannotMeetCriteria));
+      const PortableGroup::Criteria & the_criteria);
 
   /// Add an existing object to the ObjectGroup.
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::ObjectNotAdded));
+      CORBA::Object_ptr member);
 
   /**
    * Remove an object at a specific location from the given
@@ -96,54 +85,37 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableGroup::Location & the_location);
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the reference corresponding to the member of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & loc);
   /**
    * TAO-specific extension.
    * Return the ObjectGroup reference for the given ObjectGroupId.
    */
    virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::ObjectGroupNotFound
-      ));
+      );
 
   //@}
 
@@ -159,10 +131,7 @@ public:
       const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::NoFactory));
+      const CORBA::Boolean propagate_member_already_present);
 
   /// Create object group hash map entry that represents an actual
   /// ObjectGroup.
@@ -186,9 +155,7 @@ public:
   /// Return the properties set when the object group was created, and
   /// the dynamic properties that may have overridden them.
   PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the type_id for the given object group.
   char * type_id (PortableGroup::ObjectGroup_ptr object_group);
@@ -202,9 +169,7 @@ public:
     const PortableServer::ObjectId & oid);
 
   /// Return the number of members in the given object group.
-  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group);
 
   /// Set the POA to use when converting object group references to
   /// ObjectIds.
@@ -228,18 +193,12 @@ protected:
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
-    const CORBA::Boolean check_type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded));
+    const CORBA::Boolean check_type_id);
 
   /// Obtain the ObjectGroup hash map entry corresponding to the given
   /// ObjectGroup reference.
   TAO_PG_ObjectGroup_Map_Entry * get_group_entry (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
 
   /// Check if a member resides at the location to which the group
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 75649198581..fce1e92db8e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -193,8 +193,6 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member)
 void
 TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
                                   CORBA::Object_ptr member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotAdded))
 
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
@@ -250,8 +248,6 @@ int
 TAO::PG_Object_Group::set_primary_member (
     TAO_IOP::TAO_IOR_Property * prop,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::MemberNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -315,8 +311,7 @@ TAO::PG_Object_Group::set_primary_member (
                       ACE_TEXT ("TAO-PG (%P|%t) - set_primary_location ")
                       ACE_TEXT ("throwing MemberNotFound.\n")));
         }
-      ACE_THROW_RETURN (PortableGroup::MemberNotFound(),
-                        -1);
+      throw PortableGroup::MemberNotFound();
     }
 
   return result;
@@ -326,8 +321,6 @@ TAO::PG_Object_Group::set_primary_member (
 void
 TAO::PG_Object_Group::remove_member (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::MemberNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   MemberInfo * info = 0;
@@ -384,9 +377,6 @@ TAO::PG_Object_Group::get_object_group_id (void) const
 void
 TAO::PG_Object_Group::set_properties_dynamically (
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -398,7 +388,6 @@ TAO::PG_Object_Group::set_properties_dynamically (
 void
 TAO::PG_Object_Group::get_properties (
     PortableGroup::Properties_var & result) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   this->properties_.export_properties(*result);
@@ -507,7 +496,6 @@ TAO::PG_Object_Group::distribute_iogr (void)
 
 PortableGroup::Locations *
 TAO::PG_Object_Group::locations_of_members (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -540,9 +528,6 @@ TAO::PG_Object_Group::locations_of_members (void)
 CORBA::Object_ptr
 TAO::PG_Object_Group::get_member_reference (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableGroup::MemberNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -558,7 +543,7 @@ TAO::PG_Object_Group::get_member_reference (
     }
   else
     {
-      ACE_THROW_RETURN (PortableGroup::MemberNotFound(), result._retn ());
+      throw PortableGroup::MemberNotFound();
     }
   return result._retn ();
 }
@@ -609,12 +594,6 @@ TAO::PG_Object_Group::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
     const PortableGroup::Criteria & the_criteria)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-    PortableGroup::MemberAlreadyPresent,
-    PortableGroup::NoFactory,
-    PortableGroup::ObjectNotCreated,
-    PortableGroup::InvalidCriteria,
-    PortableGroup::CannotMeetCriteria))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -699,8 +678,6 @@ TAO::PG_Object_Group::create_member (
 
 void
 TAO::PG_Object_Group::create_members (size_t count)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory))
 {
   // assume internals is locked
   // @@ what if factories were passed as criteria?
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 18c687e2012..f5b5328b68e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -176,16 +176,12 @@ namespace TAO
      * @@TODO DOC
      */
     void set_properties_dynamically (
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableGroup::InvalidProperty,
-                       PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * @@TODO DOC
      */
-    void get_properties (PortableGroup::Properties_var & result) const
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void get_properties (PortableGroup::Properties_var & result) const;
 
     /**
      * @@TODO DOC
@@ -199,9 +195,7 @@ namespace TAO
      */
     void add_member (
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member)
-      ACE_THROW_SPEC ( (CORBA::SystemException,
-                       PortableGroup::ObjectNotAdded));
+        CORBA::Object_ptr member);
 
     /**
      * set the replica at the given location to be primary.
@@ -212,19 +206,13 @@ namespace TAO
      */
     int set_primary_member (
       TAO_IOP::TAO_IOR_Property * prop,
-      const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::MemberNotFound
-      ));
+      const PortableGroup::Location & the_location);
 
     /**
      * @@TODO DOC
      */
     void remove_member (
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ( (CORBA::SystemException,
-                       PortableGroup::MemberNotFound));
+        const PortableGroup::Location & the_location);
 
 
     /**
@@ -233,28 +221,18 @@ namespace TAO
     void create_member (
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria)
-      ACE_THROW_SPEC ( (CORBA::SystemException,
-        PortableGroup::MemberAlreadyPresent,
-        PortableGroup::NoFactory,
-        PortableGroup::ObjectNotCreated,
-        PortableGroup::InvalidCriteria,
-        PortableGroup::CannotMeetCriteria));
+        const PortableGroup::Criteria & the_criteria);
 
     /**
      * @@TODO DOC
      */
-    PortableGroup::Locations * locations_of_members (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableGroup::Locations * locations_of_members (void);
 
     /**
      * @@TODO DOC
      */
     CORBA::Object_ptr get_member_reference (
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableGroup::MemberNotFound));
+        const PortableGroup::Location & the_location);
 
 
     /**
@@ -284,11 +262,7 @@ namespace TAO
     PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
 
 
-    void create_members (size_t count)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableGroup::NoFactory
-        ));
+    void create_members (size_t count);
 
 
     /////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 71c22906cae..9b6996230c1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -27,23 +27,17 @@ TAO::PG_Properties_Support::~PG_Properties_Support ()
 
 void TAO::PG_Properties_Support::set_default_property (const char * name,
       const PortableGroup::Value & value)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->default_properties_.set_property(name, value);
 }
 
 void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->default_properties_.decode (props);
 }
 
 PortableGroup::Properties *
 TAO::PG_Properties_Support::get_default_properties ()
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableGroup::InvalidProperty,
-    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties_var result;
   ACE_NEW_THROW_EX ( result, PortableGroup::Properties(), CORBA::NO_MEMORY());
@@ -53,7 +47,6 @@ TAO::PG_Properties_Support::get_default_properties ()
 
 void TAO::PG_Properties_Support::remove_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->default_properties_.remove (props);
 }
@@ -62,9 +55,6 @@ void
 TAO::PG_Properties_Support::set_type_properties (
     const char *type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -84,7 +74,6 @@ TAO::PG_Properties_Support::set_type_properties (
 PortableGroup::Properties *
 TAO::PG_Properties_Support::get_type_properties (
     const char *type_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   PortableGroup::Properties_var result;
   ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ());
@@ -103,7 +92,6 @@ void
 TAO::PG_Properties_Support::remove_type_properties (
     const char *type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   // NOTE: do not actually delete the properties for this type.
   // There may be object groups depending on these.
@@ -123,7 +111,6 @@ TAO::PG_Properties_Support::remove_type_properties (
 TAO::PG_Property_Set *
 TAO::PG_Properties_Support::find_typeid_properties (
     const char *type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index f3e6729c6f8..7af594f10f0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -73,8 +73,7 @@ namespace TAO
      * @value an Any containing the value.
      */
     void set_default_property (const char * name,
-          const PortableGroup::Value & value)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          const PortableGroup::Value & value);
 
     /**
      * Update the default property set.
@@ -84,8 +83,7 @@ namespace TAO
      *
      * @param props the set of properties to update the defaults.
      */
-    void set_default_properties (const PortableGroup::Properties & props)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    void set_default_properties (const PortableGroup::Properties & props);
 
     /**
      * Export the default properties in PortableGroup::Properties format.
@@ -96,10 +94,7 @@ namespace TAO
      * resource leaks.
      * @returns a newly allocated PortableGroup::Properties.
      */
-    PortableGroup::Properties * get_default_properties (void)
-      ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty));
+    PortableGroup::Properties * get_default_properties (void);
 
     /**
      * Undefine default properties that appear in props.
@@ -111,8 +106,7 @@ namespace TAO
      * @param props a set of propertys to be removed by name.
      */
     void remove_default_properties (
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const PortableGroup::Properties & props);
 
     /**
      * Override or define properties associated with a type_id.
@@ -128,11 +122,7 @@ namespace TAO
      */
     void set_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableGroup::InvalidProperty,
-        PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * Export the property set in a PortableGroup::Properties format.
@@ -152,8 +142,7 @@ namespace TAO
      * @returns a newly allocated PortableGroup::Properties that must be released by the caller.
      */
     PortableGroup::Properties * get_type_properties (
-        const char *type_id)
-      ACE_THROW_SPEC ( (CORBA::SystemException));
+        const char *type_id);
 
     /**
      * Export the property set in a PortableGroup::Properties format.
@@ -169,8 +158,7 @@ namespace TAO
      * @returns a pointer to a Property_Set owned by this Properties_Support object.
      */
     TAO::PG_Property_Set *  find_typeid_properties (
-        const char *type_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const char *type_id);
 
     /**
      * Undefine default properties that appear in props.
@@ -183,8 +171,7 @@ namespace TAO
      */
     void remove_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ( (CORBA::SystemException));
+        const PortableGroup::Properties & props);
 
     ///////////////
     // Data Members
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index 0ced0341ca0..bda9edab8c9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -28,9 +28,6 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager (
 void
 TAO_PG_PropertyManager::set_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   // First verify that the "Factories" property is not in the
   // Properties sequence.  According to the spec, it is not allowed to
@@ -58,7 +55,6 @@ TAO_PG_PropertyManager::set_default_properties (
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_default_properties ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
@@ -78,9 +74,6 @@ TAO_PG_PropertyManager::get_default_properties ()
 void
 TAO_PG_PropertyManager::remove_default_properties (
     const PortableGroup::Properties &props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   if (props.length () == 0)
     return;  // @@ Throw CORBA::BAD_PARAM instead?
@@ -96,9 +89,6 @@ void
 TAO_PG_PropertyManager::set_type_properties (
     const char * type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->property_validator_.validate_property (overrides);
 
@@ -121,7 +111,6 @@ TAO_PG_PropertyManager::set_type_properties (
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_type_properties (
     const char * type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
@@ -168,9 +157,6 @@ void
 TAO_PG_PropertyManager::remove_type_properties (
     const char * type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   if (props.length () == 0)
     return;  // @@ Throw CORBA::BAD_PARAM instead?
@@ -192,10 +178,6 @@ void
 TAO_PG_PropertyManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     const PortableGroup::Properties & /* overrides */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 #if 0
   // First verify that the "InitialNumberMembers" property is not in
@@ -227,8 +209,6 @@ TAO_PG_PropertyManager::set_properties_dynamically (
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   CORBA::ULong properties_len = 0;
 
@@ -296,9 +276,6 @@ void
 TAO_PG_PropertyManager::remove_properties (
     const PortableGroup::Properties & to_be_removed,
     PortableGroup::Properties &properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   const CORBA::ULong num_removed = to_be_removed.length ();
   if (num_removed == 0)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 21b5837e4c7..33162cb722b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -65,30 +65,20 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableGroup::Properties * get_default_properties ();
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Set properties associated with a given Member type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties associated with a give Replica type.  These
@@ -96,16 +86,12 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char * type_id);
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /**
    * Dynamically set the properties associated with a given object
@@ -115,11 +101,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties currently in use by the given object
@@ -129,9 +111,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   //@}
 
@@ -148,10 +128,7 @@ private:
   /// Remove properties "to_be_removed" from the given list of
   /// properties.
   void remove_properties (const PortableGroup::Properties & to_be_removed,
-                          PortableGroup::Properties &properties)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+                          PortableGroup::Properties &properties);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 90d594d80d5..07739231579 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -28,7 +28,6 @@ TAO::PG_Property_Set::PG_Property_Set()
 
 TAO::PG_Property_Set::PG_Property_Set (
   const PortableGroup::Properties & property_set)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (0)
 {
   this->decode (property_set);
@@ -37,7 +36,6 @@ TAO::PG_Property_Set::PG_Property_Set (
 TAO::PG_Property_Set::PG_Property_Set (
     const PortableGroup::Properties & property_set,
     PG_Property_Set * defaults)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (defaults)
 {
   this->decode (property_set);
@@ -57,7 +55,6 @@ TAO::PG_Property_Set::~PG_Property_Set ()
 
 void
 TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -117,7 +114,6 @@ void TAO::PG_Property_Set::clear ()
 }
 
 void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_set)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   size_t count = property_set.length ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 50a5515baac..18d91812c72 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -70,8 +70,7 @@ namespace TAO
      * constructor
      * @param property_set the properties to be decoded
      */
-    PG_Property_Set (const PortableGroup::Properties & property_set)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    PG_Property_Set (const PortableGroup::Properties & property_set);
 
     /**
      * constructor with defaults
@@ -79,8 +78,7 @@ namespace TAO
      * @param defaults a propert set decoder that supplies default values.
      */
     PG_Property_Set (const PortableGroup::Properties & property_set,
-                     PG_Property_Set * defaults)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     PG_Property_Set * defaults);
 
     /**
      * constructor with defaults, but no properties (yet)
@@ -110,8 +108,7 @@ namespace TAO
      * Duplicate values replace previous values.
      * @param property_set the properties to be decoded
      */
-    void decode (const PortableGroup::Properties & property_set)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void decode (const PortableGroup::Properties & property_set);
 
     /**
      * Clear properties
@@ -119,8 +116,7 @@ namespace TAO
      */
     void clear ();
 
-    void remove (const PortableGroup::Properties & property_set)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void remove (const PortableGroup::Properties & property_set);
 
     /**
      * set or replace a single property
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index ce55617b726..e14b009500d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -9,6 +9,7 @@
 #include "tao/Endpoint.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Leader_Follower.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (PortableGroup,
            PortableGroup_Acceptor_Registry,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index c95ca388c73..a225818abad 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -76,8 +76,7 @@ public:
   ~TAO_PortableGroup_Acceptor_Registry (void);
 
   /// Open an acceptor based on a tagged profile.
-  void open (const TAO_Profile* profile,
-             TAO_ORB_Core &orb_core);
+  void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core);
 
   /// Close all open acceptors.
   int close_all (void);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index 7dac70972c2..c16bd401b95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -47,8 +47,7 @@ public:
   TAO_PortableGroup_Loader (void);
 
   /// Initialize the PortableGroup loader hooks.
-  virtual int init (int argc,
-                    char *[]);
+  virtual int init (int argc, char *[]);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 9ac5f584dd0..5fea4c9686a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
@@ -59,7 +58,6 @@ TAO_PortableGroup_ORBInitializer::pre_init (
 void
 TAO_PortableGroup_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 0729f32766c..78d9db559d8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -40,11 +40,9 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 82f5174c71d..d939ca0a3ae 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -5,7 +5,6 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Protocols_Hooks.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 31ce6b54f00..935d00f88fe 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -3,7 +3,6 @@
 #include "orbsvcs/PortableGroup/UIPMC_Profile.h"
 #include "orbsvcs/PortableGroup/miopconf.h"
 #include "tao/CDR.h"
-#include "tao/Environment.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
@@ -267,7 +266,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
   // The Domain ID is terminated with a '-'.
 
   // Wrap the string in a ACE_CString
-  ACE_CString ace_str (string, 0, 0);
+  ACE_CString ace_str (string, 0, false);
 
   // Look for the group domain delimitor.
   ACE_CString::size_type pos = ace_str.find ('-');
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 9ec7c80a093..5b8bb50d2f0 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -1,17 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   CosPropertyService_i.cpp
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   CosPropertyService_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "ace/ACE.h"
@@ -103,7 +100,6 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_propertyset (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySet.
   TAO_PropertySet *new_set;
@@ -122,8 +118,6 @@ TAO_PropertySetFactory::create_propertyset (void)
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                         const CosPropertyService::Properties &allowed_properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
@@ -168,8 +162,6 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
@@ -232,7 +224,6 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_propertysetdef (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySetDef.
   TAO_PropertySetDef *new_set;
@@ -252,8 +243,6 @@ TAO_PropertySetDefFactory::create_propertysetdef (void)
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                               const CosPropertyService::PropertyDefs &allowed_property_defs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
@@ -298,8 +287,6 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
@@ -425,12 +412,6 @@ TAO_PropertySet::~TAO_PropertySet (void)
 void
 TAO_PropertySet::define_property (const char *property_name,
                                   const CORBA::Any &property_value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::ConflictingProperty,
-                   CosPropertyService::UnsupportedTypeCode,
-                   CosPropertyService::UnsupportedProperty,
-                   CosPropertyService::ReadOnlyProperty))
 {
   // Check the name's validity.
   if (property_name == 0)
@@ -570,8 +551,6 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 void
 TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   // Get the length.
   CORBA::ULong sequence_length = nproperties.length ();
@@ -649,7 +628,6 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 CORBA::ULong
 TAO_PropertySet::get_number_of_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return static_cast<CORBA::ULong> (this->hash_table_.current_size ());
 }
@@ -664,7 +642,6 @@ void
 TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
                                              CosPropertyService::PropertyNamesIterator_out rest)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
   ACE_NEW (property_names,
@@ -745,14 +722,10 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 CORBA::Any *
 TAO_PropertySet::get_property_value (const char *property_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName))
 {
   // Check the name's validity.
   if (property_name == 0)
-    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
-                      0);
+    throw CosPropertyService::InvalidPropertyName();
 
   // Get the value out of the hash table.
 
@@ -760,8 +733,7 @@ TAO_PropertySet::get_property_value (const char *property_name)
   CosProperty_Hash_Value hash_value;
 
   if (this->hash_table_.find (hash_key, hash_value) != 0)
-    ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
-                      0);
+    throw CosPropertyService::PropertyNotFound();
 
   // Return the any value got.
   CORBA::Any *any_ptr =0;
@@ -781,7 +753,6 @@ TAO_PropertySet::get_property_value (const char *property_name)
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
                                  CosPropertyService::Properties_out nproperties)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW_RETURN (nproperties,
@@ -835,7 +806,6 @@ void
 TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                      CosPropertyService::Properties_out nproperties,
                                      CosPropertyService::PropertiesIterator_out rest)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW (nproperties,
@@ -926,10 +896,6 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 void
 TAO_PropertySet::delete_property (const char *property_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::FixedProperty))
 {
   // Check the name's validity.
   if (property_name == 0)
@@ -965,8 +931,6 @@ TAO_PropertySet::delete_property (const char *property_name)
 
 void
 TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   // Get the length.
   CORBA::ULong sequence_length = property_names.length ();
@@ -1031,7 +995,6 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 CORBA::Boolean
 TAO_PropertySet::delete_all_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get all the property names in a names' sequence.
   CosPropertyService::PropertyNames *names_ptr = 0;
@@ -1064,8 +1027,6 @@ TAO_PropertySet::delete_all_properties (void)
 
 CORBA::Boolean
 TAO_PropertySet::is_property_defined (const char *property_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName))
 {
   CosProperty_Hash_Key hash_key (property_name);
 
@@ -1132,7 +1093,6 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void)
 // Return the sequence that is there in side.
 void
 TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Copy contents of the sequence.
   ACE_NEW (property_types,
@@ -1141,7 +1101,6 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType
 
 void
 TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We have all the names, get the values and the modes from the Hash
   // Table and return.
@@ -1164,13 +1123,6 @@ void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
                                                CosPropertyService::PropertyModeType property_mode)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::ConflictingProperty,
-                   CosPropertyService::UnsupportedTypeCode,
-                   CosPropertyService::UnsupportedProperty,
-                   CosPropertyService::UnsupportedMode,
-                   CosPropertyService::ReadOnlyProperty))
 {
   // Check the names validity.
   if (property_name == 0)
@@ -1245,8 +1197,6 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // MultipleExceptions sequence and raise that.
 void
 TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   // Get the length.
   CORBA::ULong sequence_length = property_defs.length ();
@@ -1333,14 +1283,10 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
 TAO_PropertySetDef::get_property_mode (const char *property_name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName))
 {
   // Check for the name's validity.
   if (property_name == 0)
-    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
-                      CosPropertyService::undefined);
+    throw CosPropertyService::InvalidPropertyName();
 
   // Find the property in the hash table.
   CosProperty_Hash_Key hash_key (property_name);
@@ -1355,8 +1301,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name)
       return hash_value.pmode_;
     default:
       // Error or property is not found.
-      ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
-                        CosPropertyService::undefined);
+      throw CosPropertyService::PropertyNotFound();
     }
 }
 
@@ -1370,7 +1315,6 @@ TAO_PropertySetDef::get_property_mode (const char *property_name)
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                         CosPropertyService::PropertyModes_out property_modes)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW_RETURN (property_modes,
@@ -1425,10 +1369,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
                                        CosPropertyService::PropertyModeType property_mode)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::UnsupportedMode))
 {
   // Check the names validity.
   if (property_name == 0)
@@ -1518,8 +1458,6 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 
 void
 TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   // Get the length of the sequence.
   CORBA::ULong sequence_length = property_modes.length ();
@@ -1596,7 +1534,6 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
 
 void
 TAO_PropertyNamesIterator::reset (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
@@ -1608,7 +1545,6 @@ TAO_PropertyNamesIterator::reset (void)
 
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
 
@@ -1626,7 +1562,6 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name)
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
                                    CosPropertyService::PropertyNames_out property_names)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW_RETURN (property_names,
@@ -1659,7 +1594,6 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
 
 void
 TAO_PropertyNamesIterator::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -1685,14 +1619,12 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
 
 void
 TAO_PropertiesIterator::reset (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
 
 CORBA::Boolean
 TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
 
@@ -1714,7 +1646,6 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty)
 CORBA::Boolean
 TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
                                 CosPropertyService::Properties_out nproperties)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW_RETURN (nproperties,
@@ -1755,7 +1686,6 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
 
 void
 TAO_PropertiesIterator::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 92f370c9cf8..199152b5970 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -127,23 +127,18 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_propertyset (void);
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
 
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                  const CosPropertyService::Properties &allowed_properties)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::ConstraintNotSupported));
+                                  const CosPropertyService::Properties &allowed_properties);
     // Allows a client to create a new TAO_PropertySet with specific
     // constraints. "All the properties will have *fixed-normal* modes".
 
   virtual CosPropertyService::PropertySet_ptr
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  create_initial_propertyset (const CosPropertyService::Properties &initial_properties);
   // Allows a client to create a new TAO_PropertySet with specific
   // initial properties."All the properties will have *fixed-normal"
   // modes".
@@ -178,22 +173,17 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_propertysetdef (void);
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::ConstraintNotSupported));
+                                     const CosPropertyService::PropertyDefs &allowed_property_defs);
   // Allows a client to create a new TAO_PropertySetDef with specific
   // constraints.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs);
   // Allows a client to create a new TAO_PropertySetDef with specific
   // initial properties.
 
@@ -237,72 +227,48 @@ public:
   // Destructor function.
 
   virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::ConflictingProperty,
-                     CosPropertyService::UnsupportedTypeCode,
-                     CosPropertyService::UnsupportedProperty,
-                     CosPropertyService::ReadOnlyProperty));
+                                const CORBA::Any &property_value);
 
   // Store the property in the hash after checking for validity of the
   // property name, duplicate name, type code over writing etc.
 
-  virtual void define_properties (const CosPropertyService::Properties &nproperties)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  virtual void define_properties (const CosPropertyService::Properties &nproperties);
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong get_number_of_properties (void);
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CosPropertyService::PropertyNamesIterator_out rest);
   // Get the names of all the properties that are currently defined in
   // the property set.
 
-  virtual CORBA::Any *get_property_value (const char *property_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName));
+  virtual CORBA::Any *get_property_value (const char *property_name);
   // Get the value of the property, given the name.
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CosPropertyService::Properties_out nproperties);
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
-                                   CosPropertyService::PropertiesIterator_out rest)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CosPropertyService::PropertiesIterator_out rest);
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
-  virtual void delete_property (const char *property_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::FixedProperty));
+  virtual void delete_property (const char *property_name);
   // Delete a property given a name.
 
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names);
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean delete_all_properties (void);
   // Delete everything from this property set.
 
-  virtual CORBA::Boolean is_property_defined (const char *property_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName));
+  virtual CORBA::Boolean is_property_defined (const char *property_name);
   // Tell whether this property is defined or no. Forget about the
   // value.
 
@@ -378,16 +344,14 @@ public:
   virtual ~TAO_PropertySetDef (void);
   // Destructor.
 
-  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types);
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
   // restrictions on the any TypeCode portion of the property_value
   // field of a Property in this PropertySet, unless the
   // get_allowed_properties output sequence is not empty.
 
-  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs);
 
   // Indicates which properties are supported by this PropertySet. If
   // the output sequence is empty, then there is no restrictions on
@@ -396,14 +360,7 @@ public:
 
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
-                                          CosPropertyService::PropertyModeType property_mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::ConflictingProperty,
-                     CosPropertyService::UnsupportedTypeCode,
-                     CosPropertyService::UnsupportedProperty,
-                     CosPropertyService::UnsupportedMode,
-                     CosPropertyService::ReadOnlyProperty));
+                                          CosPropertyService::PropertyModeType property_mode);
   // This operation will modify or add a property to the
   // PropertySet. If the property already exists, then the property
   // type is checked before the value is overwritten. The property
@@ -412,22 +369,16 @@ public:
   // PropertySet. If type or mode is violated, ConflictingProperty
   // exception is thrown.
 
-  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs);
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
-  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName));
+  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name);
   // Get the mode of a property. Raises InvalidpropertyName,
   // PropertyNotFound exceptions.
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                             CosPropertyService::PropertyModes_out property_modes)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             CosPropertyService::PropertyModes_out property_modes);
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
   // that properties with *undefined* modes have failed due to
@@ -437,11 +388,7 @@ public:
   // doing something with it.
 
   virtual void set_property_mode (const char *property_name,
-                                  CosPropertyService::PropertyModeType property_mode)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::UnsupportedMode));
+                                  CosPropertyService::PropertyModeType property_mode);
   // Set the mode of a property. Watch the following. The change of
   // mode is allowed introduce more constraints, but it should not
   // relax the constraints. The following decisions have been made, in
@@ -453,9 +400,7 @@ public:
   // all illegal set_mode attempts, UnsupportedMode exception is
   // raised.
 
-  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes);
   // Batch operation for setting the property. Raises
   // MultipleExceptions.
 };
@@ -483,29 +428,25 @@ public:
   virtual ~TAO_PropertyNamesIterator (void);
   // Destructor.
 
-  virtual void reset (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset (void);
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name);
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
   // property name. A return of false signifies no more items in the iterator.
 
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CosPropertyService::PropertyNames_out property_names);
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
   // set greater than zero. The output is a PropertyNames sequence
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroys the iterator.
 private:
   typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
@@ -544,28 +485,24 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset (void);
   // Resets the position in an iterator to the first property, if one exists.
 
-  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty);
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
   // property. A return of false signifies no more items in the
   // iterator.
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::Properties_out nproperties)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CosPropertyService::Properties_out nproperties);
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
   // set greater than zero. The output is a properties sequence with
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   // Destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index b99b792b5dd..3eaf87a6c1f 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -147,9 +147,6 @@ RTCosScheduling_ClientScheduler_i::~RTCosScheduling_ClientScheduler_i (void)
 
 void  RTCosScheduling_ClientScheduler_i::schedule_activity (
   const char * activity_name)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    RTCosScheduling::UnknownName))
 {
   /// Look up the priority using the activity name in the activity map
   COS_SCHEDULER_ACTIVITY_VALUE priority = 0;
@@ -400,22 +397,18 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
 
 char *
 RTCosScheduling_ClientScheduler_Interceptor::name ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return CORBA::string_dup(this->name_);
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::destroy ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   try
     {
@@ -448,30 +441,24 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_poll (
   PortableInterceptor::ClientRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_reply (
   PortableInterceptor::ClientRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_exception (
   PortableInterceptor::ClientRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 8c01a8eb91c..e25907573a6 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -85,34 +85,24 @@ public:
   //@{
   /// Return the name of this ClientRequestInterceptor.
   //
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
@@ -169,10 +159,7 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i :
      *        the desired priority
      */
     virtual void schedule_activity (
-        const char *activity_name)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RTCosScheduling::UnknownName));
+        const char *activity_name);
 //@}
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index 5943a7f0e8a..e67069e5ccd 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -143,9 +143,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
     const char * adapter_name,
     PortableServer::POAManager_ptr a_POAManager,
     const CORBA::PolicyList & policies)
-  ACE_THROW_SPEC (( CORBA::SystemException
-    , PortableServer::POA::AdapterAlreadyExists
-    , PortableServer::POA::InvalidPolicy))
 {
   try
     {
@@ -265,8 +262,6 @@ void
 RTCosScheduling_ServerScheduler_i::schedule_object (
     CORBA::Object_ptr obj,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException
-    , RTCosScheduling::UnknownName))
 {
   /// Check and see if the object name is in the resource map,
   /// if it is, then there is a ceiling for it and we can add it to the
@@ -380,9 +375,6 @@ RTCosScheduling_ServerScheduler_Interceptor::~RTCosScheduling_ServerScheduler_In
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request(
   PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC((
-  CORBA::SystemException,
-  PortableInterceptor::ForwardRequest))
 {
   try
     {
@@ -526,9 +518,6 @@ ACE_THROW_SPEC((
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_reply(
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC((
-    CORBA::SystemException
-  ))
 {
   ACE_UNUSED_ARG(ri);
   finish_execution();
@@ -550,23 +539,18 @@ RTCosScheduling_ServerScheduler_Interceptor::finish_execution()
 
 char*
 RTCosScheduling_ServerScheduler_Interceptor::name(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   return CORBA::string_dup(this->name_);
 }
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::destroy(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC((
-    CORBA::SystemException,
-    PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
 }
@@ -574,8 +558,6 @@ RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_exception(
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC((CORBA::SystemException,
-    PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   finish_execution();
@@ -584,9 +566,6 @@ RTCosScheduling_ServerScheduler_Interceptor::send_exception(
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_other(
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC((
-    CORBA::SystemException,
-    PortableInterceptor::ForwardRequest))
   {
     ACE_UNUSED_ARG(ri);
     finish_execution();
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 3a54fb5d814..f7956d37a19 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -122,40 +122,24 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
 
     virtual ~RTCosScheduling_ServerScheduler_Interceptor();
 
-    virtual char* name(void)
-    ACE_THROW_SPEC((
-      CORBA::SystemException));
+    virtual char* name(void);
 
-    virtual void destroy()
-     ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void destroy();
 
     virtual void receive_request(
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void receive_request_service_contexts(
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_reply(
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC((CORBA::SystemException));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_exception(
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     virtual void send_other(
-        PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr ri);
 
     void finish_execution();
 
@@ -227,11 +211,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
         PortableServer::POA_ptr parent,
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::AdapterAlreadyExists
-        , PortableServer::POA::InvalidPolicy));
+        const CORBA::PolicyList & policies);
 
     /**
      * This maps a CORBA::Object_var with a name.  The names are
@@ -242,9 +222,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
      * @param name name to associate with the CORBA object reference
      */
     virtual void schedule_object (CORBA::Object_ptr obj,
-        const char * name)
-      ACE_THROW_SPEC (( CORBA::SystemException
-        , RTCosScheduling::UnknownName));
+        const char * name);
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index f46920825d3..d331361bfab 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -30,8 +30,6 @@ ACE_Runtime_Scheduler (int config_count,
 
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::create (const char *entry_point)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME))
 {
   // Just make sure it's there and return its handle.
   for (int i = 0; i < entry_count_; ++i)
@@ -48,7 +46,6 @@ ACE_Runtime_Scheduler::create (const char *entry_point)
 
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return create (entry_point);
 }
@@ -58,12 +55,9 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point)
 
 RtecScheduler::RT_Info *
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle)
-     ACE_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (),
-                      0);
+    throw RtecScheduler::UNKNOWN_TASK ();
   // Note: there is no memory leak here, according to the CORBA spec,
   // we are supposed to allocate an structure and return it, the
   // caller owns it from then on.
@@ -107,8 +101,6 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
                             ::RtecScheduler::Quantum_t quantum,
                             ::RtecScheduler::Threads_t threads,
                             ::RtecScheduler::Info_Type_t info_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   // We compare the values with the ones stored and print a message on
   // any differences.
@@ -146,8 +138,6 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle,
                               RtecScheduler::Quantum_t quantum,
                               RtecScheduler::Threads_t threads,
                               RtecScheduler::Info_Type_t info_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   // Just go ahead and call the set method
   this->set (handle, criticality, time, typical_time, cached_time,
@@ -157,10 +147,6 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle,
 
 void
 ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   for (u_int i = 0; i < infos.length (); ++i)
     {
@@ -198,10 +184,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
 
 void
 ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   for (u_int i = 0; i < infos.length (); ++i)
     {
@@ -240,10 +222,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
 
 void
 ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   // Just call the set sequence method
   this->set_seq (infos);
@@ -258,9 +236,6 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
                                  RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
 {
   if (handle <= 0 || handle > entry_count_)
     throw RtecScheduler::UNKNOWN_TASK ();
@@ -280,9 +255,6 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
                                              RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
 {
   RtecScheduler::handle_t handle = lookup (entry_point);
 
@@ -304,8 +276,6 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
                                        RtecScheduler::Dependency_Type_t /* dependency_type */)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
     throw RtecScheduler::UNKNOWN_TASK ();
@@ -337,8 +307,6 @@ ACE_Runtime_Scheduler::remove_dependency (RtecScheduler::handle_t handle,
                                           RtecScheduler::handle_t /* dependency */,
                                           CORBA::Long /* number_of_calls */,
                                           RtecScheduler::Dependency_Type_t /* dependency_type */)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
     throw RtecScheduler::UNKNOWN_TASK ();
@@ -354,8 +322,6 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
                                                     CORBA::Long /* number_of_calls */,
                                                     RtecScheduler::Dependency_Type_t /* dependency_type */,
                                                     RtecScheduler::Dependency_Enabled_Type_t /* enabled */)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
     throw RtecScheduler::UNKNOWN_TASK ();
@@ -368,8 +334,6 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
 void
 ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle,
                                                  RtecScheduler::RT_Info_Enabled_Type_t /* enabled */)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
     throw RtecScheduler::UNKNOWN_TASK ();
@@ -377,9 +341,6 @@ ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle,
 
 
 void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
   // This method sets the enable state of a sequence of dependencies.
 {
   ACE_UNUSED_ARG (dependencies);
@@ -389,9 +350,6 @@ void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler
 
 void ACE_Runtime_Scheduler::set_rt_info_enable_state_seq (
                  const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables a sequence of RT_Infos.
 {
 }
@@ -407,10 +365,6 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::Dependency_Set_out /*dependencies */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
                                            RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH))
 {
   // TODO: Right now just do nothing, later we could validate the
   // priorities (without recomputing).
@@ -425,13 +379,6 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
                                              CORBA::Long maximum_priority,
                                              RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME))
 {
   // TODO: Right now just do nothing.
   ACE_UNUSED_ARG(minimum_priority);
@@ -448,9 +395,6 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
 void
 ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // TODO: Right now just do nothing.
   ACE_UNUSED_ARG(infos);
@@ -464,9 +408,6 @@ ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
 void
 ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // TODO: Right now just do nothing.
   ACE_UNUSED_ARG(dependencies);
@@ -479,9 +420,6 @@ ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dep
 
 void
 ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // TODO: Right now just do nothing.
   ACE_UNUSED_ARG(configs);
@@ -496,9 +434,6 @@ void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
                                                RtecScheduler::Dispatching_Type_t & d_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::NOT_SCHEDULED,
-                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
   // Throw an exception if a valid schedule has not been loaded
   if (config_count_ <= 0
@@ -529,13 +464,10 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 
 RtecScheduler::Preemption_Priority_t
 ACE_Runtime_Scheduler::last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
   if (config_count_ <= 0)
-    ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED(),
-              (RtecScheduler::Preemption_Priority_t) -1);
+    throw RtecScheduler::NOT_SCHEDULED();
   else
     return (RtecScheduler::Preemption_Priority_t) (config_count_ - 1);
 }
@@ -543,8 +475,6 @@ ACE_Runtime_Scheduler::last_scheduled_priority (void)
 
 void
 ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
   if (this->config_count_ <= 0)
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 0bb5f45c2d7..f380b06f0e3 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -1,19 +1,15 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Runtime_Scheduler.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Runtime_Scheduler.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACE_RUNTIME_SCHEDULER_H
 #define ACE_RUNTIME_SCHEDULER_H
@@ -25,40 +21,40 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class ACE_Runtime_Scheduler
+ *
+ * @brief A fast and simple servant for RtecScheduler::Scheduler based on
+ * precomputed schedules.
+ *
+ * This class offers the services of the scheduler, but based on
+ * precomputed and precompiled information. This results in a
+ * highly optimized execution after the configuration runs.
+ */
 class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler
 {
-  // = TITLE
-  //   A fast and simple servant for RtecScheduler::Scheduler based on
-  //   precomputed schedules.
-  //
-  // = DESCRIPTION
-  //   This class offers the services of the scheduler, but based on
-  //   precomputed and precompiled information. This results in a
-  //   highly optimized execution after the configuration runs.
 public:
+  /// Constructor. Initialize the data from the POD_RT_Info array.
   ACE_Runtime_Scheduler (int config_count,
                          ACE_Scheduler_Factory::POD_Config_Info config_info[],
                          int entry_count,
                          ACE_Scheduler_Factory::POD_RT_Info rt_info[]);
-  // Constructor. Initialize the data from the POD_RT_Info array.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Create an RT_Info.  In the config run scheduler this actually constructs
-  // a new RT_Info.  Here, we just return its handle, or an error value if
-  // it's not present.
+  /**
+   * Create an RT_Info.  In the config run scheduler this actually constructs
+   * a new RT_Info.  Here, we just return its handle, or an error value if
+   * it's not present.
+   */
+  virtual RtecScheduler::handle_t create (const char * entry_point);
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  // Lookup a handle for an RT_Info, and return its handle, or an error
-  // value if it's not present.
+  /// Lookup a handle for an RT_Info, and return its handle, or an error
+  /// value if it's not present.
+  virtual RtecScheduler::handle_t lookup (const char * entry_point);
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Return a pointer to the RT_Info corresponding to the passed handle.
+  /// Return a pointer to the RT_Info corresponding to the passed handle.
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle);
 
+  /// Set characteristics of the RT_Info corresponding to the passed handle.
   virtual void set (::RtecScheduler::handle_t handle,
                     ::RtecScheduler::Criticality_t criticality,
                     ::RtecScheduler::Time time,
@@ -68,11 +64,9 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Set characteristics of the RT_Info corresponding to the passed handle.
+                    ::RtecScheduler::Info_Type_t info_type);
 
+  /// Reset characteristics of the RT_Info corresponding to the passed handle.
   virtual void reset (RtecScheduler::handle_t handle,
                       RtecScheduler::Criticality_t criticality,
                       RtecScheduler::Time time,
@@ -82,181 +76,123 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       RtecScheduler::Threads_t threads,
-                      RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Reset characteristics of the RT_Info corresponding to the passed handle.
-
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Set characteristics of the RT_Infos corresponding to the passed handles.
-  // Tuples are added in the case of existing and/or multiple definitions.
-
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Replace characteristics of the RT_Infos corresponding to the
-  // passed handles.
-
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Reset characteristics of the RT_Infos corresponding to the passed handles.
-  // Tuples are replaced in the case of existing and/or multiple definitions.
+                      RtecScheduler::Info_Type_t info_type);
+
+  /// Set characteristics of the RT_Infos corresponding to the passed handles.
+  /// Tuples are added in the case of existing and/or multiple definitions.
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos);
 
+  /// Replace characteristics of the RT_Infos corresponding to the
+  /// passed handles.
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos);
+
+  /// Reset characteristics of the RT_Infos corresponding to the passed handles.
+  /// Tuples are replaced in the case of existing and/or multiple definitions.
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos);
+
+  /// Returns the priority and subpriority values assigned to an RT_Info,
+  /// based on its handle.
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its handle.
+                         RtecScheduler::Preemption_Priority_t& p_priority);
 
+  /// Returns the priority and subpriority values assigned to an RT_Info,
+  /// based on its entry point name.
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its entry point name.
+                                     RtecScheduler::Preemption_Priority_t& p_priority);
 
+  /// In the config run scheduler, this method registers a dependency between
+  /// two RT_Infos.  In the run time scheduler, this is a no-op.
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // In the config run scheduler, this method registers a dependency between
-  // two RT_Infos.  In the run time scheduler, this is a no-op.
+                               RtecScheduler::Dependency_Type_t dependency_type);
 
+  /// In the reconfig scheduler, this method removes a dependency between
+  /// two RT_Infos.  In the run time scheduler, this is a no-op.
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // In the reconfig scheduler, this method removes a dependency between
-  // two RT_Infos.  In the run time scheduler, this is a no-op.
+                                  RtecScheduler::Dependency_Type_t dependency_type);
 
+  /// In the reconfig scheduler, this method (re)enabes a dependency between
+  /// two RT_Infos.  In the run time scheduler, this is a no-op.
   virtual void set_dependency_enable_state (RtecScheduler::handle_t handle,
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // In the reconfig scheduler, this method (re)enabes a dependency between
-  // two RT_Infos.  In the run time scheduler, this is a no-op.
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled);
 
+  /// In the reconfig scheduler, enables or disables an RT_Info.
+  /// In the run time scheduler, this is a no-op.
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // In the reconfig scheduler, enables or disables an RT_Info.
-  // In the run time scheduler, this is a no-op.
-
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method sets the enable state of a sequence of dependencies.
-
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method enables or disables a sequence of RT_Infos.
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled);
+
+  /// This method sets the enable state of a sequence of dependencies.
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies);
 
+  /// This method enables or disables a sequence of RT_Infos.
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set);
+
+  /**
+   * In the config run scheduler, this method causes scheduling information
+   * to be computed for all registered RT_Infos.  In the run time scheduler,
+   * this is a no-op.
+   */
   virtual void compute_scheduling (CORBA::Long minimum_priority,
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out deps,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH));
-  // In the config run scheduler, this method causes scheduling information
-  // to be computed for all registered RT_Infos.  In the run time scheduler,
-  // this is a no-op.
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
 
+  /// Recomputes the scheduling priorities, etc.
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Recomputes the scheduling priorities, etc.
-
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of rt_infos, with their assigned priorities (as
-  // of the last schedule re-computation).
-
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of rt_infos, with their assigned priorities (as
-  // of the last schedule re-computation).
-
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of config_infos, describing the appropriate
-  // number, types, and priority levels for the dispatching lanes.
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
+
+  /// Returns the set of rt_infos, with their assigned priorities (as
+  /// of the last schedule re-computation).
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos);
+
+  /// Returns the set of rt_infos, with their assigned priorities (as
+  /// of the last schedule re-computation).
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies);
 
+  /// Returns the set of config_infos, describing the appropriate
+  /// number, types, and priority levels for the dispatching lanes.
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs);
+
+  /// Provides the thread priority and queue type for the given priority level.
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED,
-                    RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
-  // Provides the thread priority and queue type for the given priority level.
-
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED));
-  // Returns the last priority number assigned to an operation in the
-  // schedule.  The number returned is one less than the total number
-  // of scheduled priorities.  All scheduled priorities range from 0
-  // to the number returned, inclusive.
-
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::NOT_SCHEDULED));
+                                       RtecScheduler::Dispatching_Type_t & d_type);
+
+  /**
+   * Returns the last priority number assigned to an operation in the
+   * schedule.  The number returned is one less than the total number
+   * of scheduled priorities.  All scheduled priorities range from 0
+   * to the number returned, inclusive.
+   */
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
 
 private:
+  /// The number of elements in the config array.
   int config_count_;
-  // The number of elements in the config array.
 
+  /// The array of precomputed queue configuration structures.
   ACE_Scheduler_Factory::POD_Config_Info* config_info_;
-  // The array of precomputed queue configuration structures.
 
+  /// The number of elements in the RT_Info array.
   int entry_count_;
-  // The number of elements in the RT_Info array.
 
+  /// The array of precomputed RT_Info structures.
   ACE_Scheduler_Factory::POD_RT_Info* rt_info_;
-  // The array of precomputed RT_Info structures.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
index 951e2ab73be..c984ccdf151 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -52,7 +52,7 @@ namespace TAO
     typedef TAO_Accept_Strategy<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY;
 
     /// Constructor.
-    IIOP_SSL_Acceptor (CORBA::Boolean flag = 0);
+    IIOP_SSL_Acceptor (CORBA::Boolean flag = false);
 
     /// Destructor.
     ~IIOP_SSL_Acceptor (void);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 3c81122ede9..1bf1e5f50a0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -52,8 +52,7 @@ namespace TAO
 
     /// Constructor.
     IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0);
-    IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core,
-                                 CORBA::Boolean flag);
+    IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag);
 
     /// Destructor.
     ~IIOP_SSL_Connection_Handler (void);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 61ae03facc1..ccb25c30a36 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
 #include "tao/IIOP_Endpoint.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
@@ -83,8 +82,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
   if (iiop_endpoint == 0)
     return -1;
 
-  const ACE_INET_Addr &remote_address =
-    iiop_endpoint->object_addr ();
+  const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr ();
 
   // Verify that the remote ACE_INET_Addr was initialized properly.
   // Failure can occur if hostname lookup failed when initializing the
@@ -94,10 +92,9 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_SSL connection failed.\n")
-                      ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                      ACE_TEXT ("due to a hostname lookup ")
-                      ACE_TEXT ("failure.\n")));
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_SSL connection failed.\n")
+                      ACE_TEXT ("TAO (%P|%t) - This is most likely ")
+                      ACE_TEXT ("due to a hostname lookup failure.\n")));
         }
 
       return -1;
@@ -129,8 +126,7 @@ TAO::IIOP_SSL_Connector::make_connection (
   // Get the right synch options
   ACE_Synch_Options synch_options;
 
-  this->active_connect_strategy_->synch_options (max_wait_time,
-                                                 synch_options);
+  this->active_connect_strategy_->synch_options (max_wait_time, synch_options);
 
   // If we don't need to block for a transport just set the timeout to
   // be zero.
@@ -146,9 +142,7 @@ TAO::IIOP_SSL_Connector::make_connection (
 
   // Connect.
   int result =
-    this->base_connector_.connect (svc_handler,
-                                   remote_address,
-                                   synch_options);
+    this->base_connector_.connect (svc_handler, remote_address, synch_options);
 
   // The connect() method creates the service handler and bumps the
   // #REFCOUNT# up one extra.  There are three possibilities from
@@ -215,7 +209,7 @@ TAO::IIOP_SSL_Connector::make_connection (
       return 0;
     }
 
-  if (transport->connection_handler ()->keep_waiting ()) 
+  if (transport->connection_handler ()->keep_waiting ())
     {
       svc_handler->add_reference ();
     }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 1a5d1724a2e..eceb03b8b86 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -45,10 +45,7 @@ TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh,
   if (result != 0)
     return -1;
 
-  return
-    this->TAO_IIOP_Transport::handle_input (rh,
-                                            max_wait_time,
-                                            block);
+  return this->TAO_IIOP_Transport::handle_input (rh, max_wait_time, block);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index 5de9b828787..89812c36e09 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -41,7 +41,7 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler)
   // created handle. This is because the newly created handle will
   // inherit the properties of the listen handle, including its event
   // associations.
-  const int reset_new_handle = this->reactor_->uses_event_associations ();
+  int const reset_new_handle = this->reactor_->uses_event_associations ();
 
   if (this->peer_acceptor_.accept (svc_handler->peer (), // stream
                                    0,                // remote address
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 28128f3b310..2b974c46852 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -245,9 +245,12 @@ TAO::SSLIOP::Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                             &(this->ssl_component_)),
                       -1);
 
-      TAO_SSLIOP_Endpoint *ssliop_endp =
+      TAO_SSLIOP_Endpoint * const ssliop_endp =
         dynamic_cast<TAO_SSLIOP_Endpoint *> (ssliop_profile->endpoint ());
 
+      if (!ssliop_endp)
+        return -1;
+
       ssliop_endp->priority (priority);
       ssliop_endp->iiop_endpoint ()->priority (priority);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index e8ed218c0b5..caf7948dc48 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -26,63 +26,54 @@ TAO::SSLIOP::ClientCredentials::~ClientCredentials (void)
 
 SecurityLevel3::CredentialsType
 TAO::SSLIOP::ClientCredentials::creds_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_ClientCredentials;
 }
 
 char *
 TAO::SSLIOP::ClientCredentials::context_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::ClientCredentials::client_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::ClientCredentials::client_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::ClientCredentials::client_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::ClientCredentials::target_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::ClientCredentials::target_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::ClientCredentials::target_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::ClientCredentials::parent_credentials (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentials_ptr creds =
     SecurityLevel3::OwnCredentials::_nil ();
@@ -98,7 +89,6 @@ TAO::SSLIOP::ClientCredentials::parent_credentials (void)
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::client_authentication ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client presented no certificate (i.e. cert_.ptr() == 0),
   // the client was not authenticated.  Otherwise, verify the peer's
@@ -111,21 +101,18 @@ TAO::SSLIOP::ClientCredentials::client_authentication ()
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::target_authentication (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::confidentiality (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::integrity (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TAO's SSLIOP pluggable transport always provides integrity.  Note
   // that if we
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index fd688d2dc15..bbe3f585365 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -55,9 +55,7 @@ namespace TAO
     public:
 
       /// Constructor
-      ClientCredentials (::X509 * cert,
-                         ::EVP_PKEY * evp,
-                         ::SSL * ssl);
+      ClientCredentials (::X509 * cert, ::EVP_PKEY * evp, ::SSL * ssl);
 
       /**
        * @name SecurityLevel3::Credentials Methods
@@ -66,8 +64,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsType creds_type ();
       //@}
 
       /**
@@ -77,41 +74,29 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual char * context_id (void);
 
-      virtual SecurityLevel3::Principal * client_principal ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::Principal * client_principal ();
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::StatementList * client_supporting_statements ();
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ();
 
-      virtual SecurityLevel3::Principal * target_principal ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::Principal * target_principal ();
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::StatementList * target_supporting_statements ();
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ();
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean client_authentication (void);
 
-      virtual CORBA::Boolean target_authentication (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean target_authentication (void);
 
-      virtual CORBA::Boolean confidentiality (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean confidentiality (void);
 
-      virtual CORBA::Boolean integrity (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean integrity (void);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 7f1d35f2f07..9de5610dba1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -47,8 +47,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
     TAO_Connection_Handler (orb_core),
     current_ ()
 {
-  this->current_ =
-    TAO::SSLIOP::Util::current (orb_core);
+  this->current_ = TAO::SSLIOP::Util::current (orb_core);
 
   TAO::SSLIOP::Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
@@ -95,30 +94,28 @@ TAO::SSLIOP::Connection_Handler::open (void *)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  int client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
-
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (
+                protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (
+                protocol_properties);
+            }
         }
-      else
+      catch (const CORBA::Exception&)
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties);
+          return -1;
         }
     }
-  catch (const CORBA::Exception& ex)
-    {
-      return -1;
-    }
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -304,8 +301,7 @@ TAO::SSLIOP::Connection_Handler::handle_timeout (const ACE_Time_Value &,
 }
 
 int
-TAO::SSLIOP::Connection_Handler::handle_close (ACE_HANDLE,
-                                             ACE_Reactor_Mask)
+TAO::SSLIOP::Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 {
   ACE_ASSERT (0);
   return 0;
@@ -367,8 +363,7 @@ TAO::SSLIOP::Connection_Handler::add_transport_to_cache (void)
     this->orb_core ()->lane_resources ().transport_cache ();
 
   // Add the handler to Cache
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
+  return cache.cache_idle_transport (&prop, this->transport ());
 }
 
 int
@@ -457,8 +452,7 @@ TAO::SSLIOP::Connection_Handler::teardown_ssl_state (
   TAO::SSLIOP::Current_Impl *previous_current_impl,
   bool &setup_done)
 {
-  this->current_->teardown (previous_current_impl,
-                            setup_done);
+  this->current_->teardown (previous_current_impl, setup_done);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index fae6be7238d..a1bd7d9b1ec 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -8,7 +8,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
@@ -91,7 +90,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Connector::connect, ")
+                  ACE_TEXT ("TAO_SSLIOP (%P|%t) - Connector::connect, ")
                   ACE_TEXT ("looking for SSLIOP connection.\n")));
 
   TAO_Endpoint *endpoint = desc->endpoint ();
@@ -149,8 +148,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                       ACE_TEXT ("found in the IOR.\n")));
         }
 
-      ACE_THROW_RETURN (CORBA::INV_POLICY (),   // @@ Correct exception?
-                        0);
+      throw CORBA::INV_POLICY ();
     }
 
   // Check if the user overrode the default Quality-of-Protection for
@@ -184,16 +182,13 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                       ACE_TEXT ("found in the IOR.\n")));
         }
 
-      ACE_THROW_RETURN (CORBA::INV_POLICY (),   // @@ Correct exception?
-                        0);
+      throw CORBA::INV_POLICY ();
     }
 
   if ((!establish_trust && qop == ::Security::SecQOPNoProtection)
       || ssl_endpoint->ssl_component ().port == 0)
     {
-      return this->iiop_connect (ssl_endpoint,
-                                 resolver,
-                                 timeout);
+      return this->iiop_connect (ssl_endpoint, resolver, timeout);
     }
 
   return this->ssliop_connect (ssl_endpoint,
@@ -213,8 +208,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
                   TAO_SSLIOP_Profile (this->orb_core ()),
                   0);
 
-  const int r = pfile->decode (cdr);
-  if (r == -1)
+  if (pfile->decode (cdr) == -1)
     {
       pfile->_decr_refcnt ();
       pfile = 0;
@@ -269,8 +263,7 @@ TAO::SSLIOP::Connector::make_secure_profile (void)
 
 
 TAO_Profile *
-TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
-                                       size_t &len)
+TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len)
 {
    int ssl_only = 0;
    if (this->check_prefix (endpoint) == 0)
@@ -370,12 +363,11 @@ TAO::SSLIOP::Connector::iiop_connect (
   // connection, and subsequently the request, from completing.
   if (ACE_BIT_DISABLED (ssl_component.target_supports,
                         ::Security::NoProtection))
-    ACE_THROW_RETURN (CORBA::NO_PERMISSION (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          EPERM),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw CORBA::NO_PERMISSION (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EPERM),
+      CORBA::COMPLETED_NO);
 
   TAO_IIOP_Endpoint *iiop_endpoint = ssl_endpoint->iiop_endpoint ();
 
@@ -387,10 +379,7 @@ TAO::SSLIOP::Connector::iiop_connect (
 
   // Note that the IIOP-only transport descriptor is used!
   return
-    this->TAO::IIOP_SSL_Connector::connect (
-      resolver,
-      &iiop_desc,
-      timeout);
+    this->TAO::IIOP_SSL_Connector::connect (resolver, &iiop_desc, timeout);
 }
 
 TAO_Transport *
@@ -415,12 +404,11 @@ TAO::SSLIOP::Connector::ssliop_connect (
   // SSL connection from occuring.
   if (ACE_BIT_ENABLED (ssl_component.target_requires,
                        ::Security::NoProtection))
-    ACE_THROW_RETURN (CORBA::NO_PERMISSION (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          EPERM),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw CORBA::NO_PERMISSION (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EPERM),
+      CORBA::COMPLETED_NO);
 
   // If the invocation wants integrity without confidentiality but the
   // server does not support "no protection," then it won't be
@@ -432,10 +420,9 @@ TAO::SSLIOP::Connector::ssliop_connect (
   if (ACE_BIT_DISABLED (ssl_component.target_supports,
                         ::Security::NoProtection)
       && qop == ::Security::SecQOPIntegrity)
-    ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
+    throw CORBA::INV_POLICY ();
 
-  const ACE_INET_Addr &remote_address =
-    ssl_endpoint->object_addr ();
+  const ACE_INET_Addr &remote_address = ssl_endpoint->object_addr ();
 
   // Verify that the remote ACE_INET_Addr was initialized
   // properly.  Failure can occur if hostname lookup failed when
@@ -578,8 +565,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
       // Trust in neither the client nor the target is explicitly
       // specified.  Use the default setting.
       else
-        verify_mode =
-          ACE_SSL_Context::instance ()->default_verify_mode ();
+        verify_mode = ACE_SSL_Context::instance ()->default_verify_mode ();
 
       ::SSL_set_verify (svc_handler->peer ().ssl (),
                         verify_mode,
@@ -601,7 +587,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
                         ACE_TEXT ("(%P|%t) Unable to set eNULL ")
                         ACE_TEXT ("SSL cipher.\n")));
 
-          ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
+          throw CORBA::INV_POLICY ();
         }
 
       svc_handler = safe_handler.release ();
@@ -623,6 +609,12 @@ TAO::SSLIOP::Connector::ssliop_connect (
                                               remote_address,
                                               synch_options);
 
+      // base_connector_.connect() will increment the handler's
+      // #REFCOUNT# once more. This is not required as we already hold
+      // a reference to the handler, so we discard this second
+      // reference.
+      svc_handler->remove_reference ();
+
       // There are three possibilities from calling connect(): (a)
       // connection succeeds immediately - in this case, the
       // #REFCOUNT# on the handler is two; (b) connection completion
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 8a0ef38e424..368a8dfab51 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -83,36 +83,31 @@ TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void)
 
 char *
 TAO::SSLIOP_Credentials::creds_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 SecurityLevel3::CredentialsUsage
 TAO::SSLIOP_Credentials::creds_usage (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CU_Indefinite;
 }
 
 TimeBase::UtcT
 TAO::SSLIOP_Credentials::expiry_time (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->expiry_time_;
 }
 
 SecurityLevel3::CredentialsState
 TAO::SSLIOP_Credentials::creds_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ::X509 *x = this->x509_.in ();
 
   // The pointer to the underlying X509 structure should only be zero
   // if destroy() was called on this Credentials object.
   if (x == 0)
-    ACE_THROW_RETURN (CORBA::BAD_OPERATION (),
-                      SecurityLevel3::CS_Invalid);
+    throw CORBA::BAD_OPERATION ();
 
   if (this->creds_state_ == SecurityLevel3::CS_Valid)
     {
@@ -124,8 +119,7 @@ TAO::SSLIOP_Credentials::creds_state (void)
       if (after_status == 0)
         {
           // Error in certificate's "not after" field.
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (),  // @@ Correct exception?
-                            SecurityLevel3::CS_Invalid);
+          throw CORBA::BAD_PARAM ();
         }
       else if (after_status > 0)     // Certificate has expired.
         this->creds_state_ = SecurityLevel3::CS_Expired;
@@ -140,8 +134,7 @@ TAO::SSLIOP_Credentials::creds_state (void)
       if (before_status == 0)
         {
           // Error in certificate's "not before" field.
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (),  // @@ Correct exception?
-                            SecurityLevel3::CS_Invalid);
+          throw CORBA::BAD_PARAM ();
         }
       else if (before_status < 0)     // Certificate is now valid.
         this->creds_state_ = SecurityLevel3::CS_Valid;
@@ -153,14 +146,12 @@ TAO::SSLIOP_Credentials::creds_state (void)
 char *
 TAO::SSLIOP_Credentials::add_relinquished_listener (
     SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index c3b94c4bf6d..c9f89d93b10 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -74,28 +74,22 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * creds_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual char * creds_id (void);
 
       virtual
       SecurityLevel3::CredentialsType creds_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        = 0;
 
-      virtual SecurityLevel3::CredentialsUsage creds_usage ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsUsage creds_usage ();
 
-      virtual TimeBase::UtcT expiry_time (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual TimeBase::UtcT expiry_time (void);
 
-      virtual SecurityLevel3::CredentialsState creds_state ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsState creds_state ();
 
       virtual char * add_relinquished_listener (
-          SecurityLevel3::RelinquishedCredentialsListener_ptr listener)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          SecurityLevel3::RelinquishedCredentialsListener_ptr listener);
 
-      virtual void remove_relinquished_listener (const char * id)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void remove_relinquished_listener (const char * id);
       //@}
 
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 3e866342315..8f80d4dfd5f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -91,7 +91,6 @@ TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void)
 
 char *
 TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -100,7 +99,6 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::current_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -109,7 +107,6 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void)
 
 CORBA::ULong
 TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -120,45 +117,38 @@ TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
 
 CORBA::Any *
 TAO::SSLIOP::CredentialsAcquirer::get_continuation_data ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+  throw CORBA::BAD_INV_ORDER ();
 }
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
     const CORBA::Any & /* acquisition_arguments */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
-                    SecurityLevel3::AQST_Failed);
+  throw CORBA::BAD_INV_ORDER ();
 }
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
   ::SSLIOP::AuthData *data;
 
   if (!(this->acquisition_arguments_ >>= data))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   TAO::SSLIOP::X509_var x509 = this->make_X509 (data->certificate);
 
   if (x509.in () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   TAO::SSLIOP::EVP_PKEY_var evp = this->make_EVP_PKEY (data->key);
 
   if (evp.in () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   // Verify that the private key is consistent with the certificate.
   if (::X509_check_private_key (x509.in (), evp.in ()) != 1)
@@ -168,8 +158,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
                     ACE_TEXT ("(%P|%t) ERROR: Private key is not ")
                     ACE_TEXT ("consistent with X.509 certificate")));
 
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        SecurityLevel3::OwnCredentials::_nil ());
+      throw CORBA::BAD_PARAM ();
     }
 
   TAO::SSLIOP::OwnCredentials * creds;
@@ -191,7 +180,6 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
 
 void
 TAO::SSLIOP::CredentialsAcquirer::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 910c4826c90..3cd5ecb3e5f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -75,28 +75,21 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * acquisition_method (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual char * acquisition_method (void);
 
-      virtual SecurityLevel3::AcquisitionStatus current_status ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::AcquisitionStatus current_status ();
 
-      virtual CORBA::ULong nth_iteration (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::ULong nth_iteration (void);
 
-      virtual CORBA::Any * get_continuation_data (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Any * get_continuation_data (void);
 
       virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
-          const CORBA::Any & acquisition_arguments)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          const CORBA::Any & acquisition_arguments);
 
       virtual SecurityLevel3::OwnCredentials_ptr get_credentials (
-          CORBA::Boolean on_list)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          CORBA::Boolean on_list);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 4e6a1a8bab5..ad852d19eff 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -25,8 +25,6 @@ TAO::SSLIOP::Current::~Current (void)
 
 ::SSLIOP::ASN_1_Cert *
 TAO::SSLIOP::Current::get_peer_certificate ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   SSLIOP::Current::NoContext))
 {
   TAO::SSLIOP::Current_Impl *impl = this->implementation ();
 
@@ -34,7 +32,7 @@ TAO::SSLIOP::Current::get_peer_certificate ()
   // we're not in the middle of a request or an upcall.  Throw an
   // exception to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (::SSLIOP::Current::NoContext (), 0);
+    throw ::SSLIOP::Current::NoContext ();
 
   // A valid value must always be returned, so instantiate a sequence
   // regardless of whether or not it is populated with certificates.
@@ -57,8 +55,6 @@ TAO::SSLIOP::Current::get_peer_certificate ()
 
 SSLIOP::SSL_Cert *
 TAO::SSLIOP::Current::get_peer_certificate_chain ()
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   SSLIOP::Current::NoContext))
 {
   TAO::SSLIOP::Current_Impl *impl = this->implementation ();
 
@@ -66,7 +62,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain ()
   // we're not in the middle of a request or an upcall.  Throw an
   // exception to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (SSLIOP::Current::NoContext (), 0);
+    throw SSLIOP::Current::NoContext ();
 
   // A valid value must always be returned, so instantiate a sequence
   // regardless of whether or not it is populated with certificates.
@@ -89,7 +85,6 @@ TAO::SSLIOP::Current::get_peer_certificate_chain ()
 
 CORBA::Boolean
 TAO::SSLIOP::Current::no_context (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (this->implementation () == 0 ? 1 : 0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index e290ca7abd5..9d7cd1cf0e9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -69,9 +69,7 @@ namespace TAO
 
       /// Return the peer certificate associated with the current
       /// request.
-      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate ()
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         ::SSLIOP::Current::NoContext));
+      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate ();
 
       /**
        * Return the certificate chain associated with the current
@@ -81,9 +79,7 @@ namespace TAO
        * certficate.  However, the certificate chain on the server
        * side does NOT contain the peer (client) certificate.
        */
-      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain ()
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         ::SSLIOP::Current::NoContext));
+      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain ();
 
       /**
        * This method is mostly useful as an inexpensive means of
@@ -92,8 +88,7 @@ namespace TAO
        * @return @c true if the current execution context is not
        *         within a SSL session.
        */
-      virtual CORBA::Boolean no_context (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean no_context (void);
 
       /// Set the TSS slot ID assigned to this object.
       void tss_slot (size_t slot);
@@ -104,8 +99,7 @@ namespace TAO
                   bool &setup_done);
 
       /// Teardown the Current for this request.
-      void teardown (Current_Impl *prev_impl,
-                     bool &setup_done);
+      void teardown (Current_Impl *prev_impl, bool &setup_done);
 
       /**
        * @name Downcast and Reference Counting Methods
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index c70172bf4b8..6712f7ac78b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -27,12 +27,10 @@ TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 
 SecurityLevel3::ClientCredentials_ptr
 TAO::SSLIOP::Current_Impl::client_credentials ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
   if (cert.ptr () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_OPERATION (),
-                      SecurityLevel3::ClientCredentials::_nil ());
+    throw CORBA::BAD_OPERATION ();
 
   SecurityLevel3::ClientCredentials_ptr creds;
   ACE_NEW_THROW_EX (creds,
@@ -50,9 +48,8 @@ TAO::SSLIOP::Current_Impl::client_credentials ()
 
 CORBA::Boolean
 TAO::SSLIOP::Current_Impl::request_is_local (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
@@ -67,7 +64,7 @@ TAO::SSLIOP::Current_Impl::get_peer_certificate (
     return;
 
   // Get the size of the ASN.1 encoding.
-  const int cert_length = ::i2d_X509 (cert.in (), 0);
+  int const cert_length = ::i2d_X509 (cert.in (), 0);
   if (cert_length <= 0)
     return;
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 030b28d7d6d..a5d0aa1ca00 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -54,13 +54,11 @@ namespace TAO
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::client_credentials() method.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ();
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::request_is_local() method.
-      virtual CORBA::Boolean request_is_local ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean request_is_local ();
 
       /// Return the SSL peer certificate associated with the
       /// current request as an octet sequence, i.e. a DER encoded
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 3b78d4199ed..f61f5dd2a41 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -488,8 +488,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc,
 
   if (private_key_path != 0)
     {
-      if (ssl_ctx->private_key (private_key_path,
-                                private_key_type) != 0)
+      if (ssl_ctx->private_key (private_key_path, private_key_type) != 0)
         {
           if (TAO_debug_level > 0)
             {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 5ce2d53c82c..f1542176fa3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -6,9 +6,9 @@
 #include "tao/PortableServer/PS_CurrentC.h"
 #include "tao/debug.h"
 
-#if defined(SSLIOP_DEBUG_PEER_CERTIFICATE)
+#if defined (SSLIOP_DEBUG_PEER_CERTIFICATE)
 #include <openssl/x509.h>   // @@ For debugging code below
-#endif /* DEBUG_PEER_CERTIFICATES */
+#endif /* SSLIOP_DEBUG_PEER_CERTIFICATE */
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Invocation_Interceptor,
@@ -32,23 +32,18 @@ TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (
 
 char *
 TAO::SSLIOP::Server_Invocation_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO::SSLIOP::Server_Invocation_Interceptor");
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
                                               PortableInterceptor::ServerRequestInfo_ptr /*ri*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // The current upcall is not being performed through an SSL
   // connection.  If server is configured to disallow insecure
@@ -59,8 +54,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
   //          SecTargetSecureInvocationPolicy so that we can
   //          accept or reject requests on a per-object basis
   //          instead on a per-endpoint basis.
-  CORBA::Boolean const no_ssl =
-    this->ssliop_current_->no_context ();
+  CORBA::Boolean const no_ssl = this->ssliop_current_->no_context ();
 
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl)));
@@ -68,12 +62,12 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
   if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection)
     throw CORBA::NO_PERMISSION ();
 
-#if defined(DEBUG_PEER_CERTIFICATES)
+#if defined(SSLIOP_DEBUG_PEER_CERTIFICATE)
   try
     {
       // If the request was not made through an SSL connection, then
       // this method will throw the SSLIOP::Current::NoContext
-      // exception.  Otherwise, it will return a DER encoded X509
+      // exception. Otherwise, it will return a DER encoded X509
       // certificate.
       ::SSLIOP::ASN_1_Cert_var cert =
         this->ssliop_current_->get_peer_certificate ();
@@ -83,9 +77,9 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
       //    i.e. prints two lines of information per request.
       if (TAO_debug_level > 1)
         {
-          CORBA::Octet *der_cert = cert->get_buffer ();
+          const CORBA::Octet *der_cert = cert->get_buffer ();
 
-          X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ());
+          ::X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ());
           if (peer != 0)
             {
               char buf[BUFSIZ] = { 0 };
@@ -109,6 +103,11 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
 
               ::X509_free (peer);
             }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%P|%t) No certificate info\n"));
+            }
         }
     }
   catch (const ::SSLIOP::Current::NoContext& )
@@ -125,38 +124,31 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
       if (this->qop_ != ::Security::SecQOPNoProtection)
         throw CORBA::NO_PERMISSION ();
     }
-#endif /* DEBUG_PEER_CERTIFICATES */
+#endif /* SSLIOP_DEBUG_PEER_CERTIFICATE */
 }
 
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index e382a2042a2..af09c09b702 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -66,35 +66,24 @@ namespace TAO
        * PortableInterceptor::ServerRequestInterceptor interface.
        */
       //@{
-      virtual char * name (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual char * name (void);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
 
       virtual void receive_request_service_contexts (
-          PortableInterceptor::ServerRequestInfo_ptr ri)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableInterceptor::ForwardRequest));
+          PortableInterceptor::ServerRequestInfo_ptr ri);
 
       virtual void receive_request (
-          PortableInterceptor::ServerRequestInfo_ptr ri)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableInterceptor::ForwardRequest));
+          PortableInterceptor::ServerRequestInfo_ptr ri);
 
       virtual void send_reply (
-          PortableInterceptor::ServerRequestInfo_ptr ri)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          PortableInterceptor::ServerRequestInfo_ptr ri);
 
       virtual void send_exception (
-          PortableInterceptor::ServerRequestInfo_ptr ri)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableInterceptor::ForwardRequest));
+          PortableInterceptor::ServerRequestInfo_ptr ri);
 
       virtual void send_other (
-          PortableInterceptor::ServerRequestInfo_ptr ri)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableInterceptor::ForwardRequest));
+          PortableInterceptor::ServerRequestInfo_ptr ri);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 102fbeb2246..c5d7846cb29 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -39,10 +39,8 @@ TAO::SSLIOP::ORBInitializer::ORBInitializer (
 void
 TAO::SSLIOP::ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info);
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     throw CORBA::INV_OBJREF ();
@@ -69,14 +67,12 @@ TAO::SSLIOP::ORBInitializer::pre_init (
   SSLIOP::Current_var ssliop_current = current;
 
   // Register the SSLIOP::Current object reference with the ORB.
-  info->register_initial_reference ("SSLIOPCurrent",
-                                    ssliop_current.in ());
+  info->register_initial_reference ("SSLIOPCurrent", ssliop_current.in ());
 }
 
 void
 TAO::SSLIOP::ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note we do not store the SSLIOP::Current as a class member since
   // we need to avoid potential problems where the same
@@ -101,8 +97,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
       if (tao_current != 0)
         {
-          const size_t slot =
-            this->get_tss_slot_id (info);
+          size_t const slot = this->get_tss_slot_id (info);
 
           tao_current->tss_slot (slot);
         }
@@ -179,8 +174,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
   auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
 
-  tao_curator->register_acquirer_factory ("SL3TLS",
-                                          factory);
+  tao_curator->register_acquirer_factory ("SL3TLS", factory);
 
   (void) safe_factory.release ();  // CredentialsCurator now owns
                                    // CredentialsAcquirerFactory.
@@ -207,7 +201,7 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id (
                   "Unable to obtain TSS slot ID from "
                   "\"SecurityCurrent\" object.\n"));
 
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   return security_current->tss_slot ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index f589a6a8e18..82c86738a09 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -60,11 +60,9 @@ namespace TAO
                       CSIIOP::AssociationOptions csiv2_target_supports,
                       CSIIOP::AssociationOptions csiv2_target_requires);
 
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 20e20a6bc3c..9aa5424db18 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -44,30 +44,24 @@ TAO::SSLIOP::OwnCredentials::_nil (void)
 
 SecurityLevel3::CredentialsType
 TAO::SSLIOP::OwnCredentials::creds_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_OwnCredentials;
 }
 
 SecurityLevel3::CredsInitiator_ptr
 TAO::SSLIOP::OwnCredentials::creds_initiator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    SecurityLevel3::CredsInitiator::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::CredsAcceptor_ptr
 TAO::SSLIOP::OwnCredentials::creds_acceptor (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    SecurityLevel3::CredsAcceptor::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO::SSLIOP::OwnCredentials::release_credentials ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_state_ = SecurityLevel3::CS_PendingRelease;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 0ac90730636..4387e7d80e9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -72,8 +72,7 @@ namespace TAO
        * interface.
        */
       //@{
-      SecurityLevel3::CredentialsType creds_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      SecurityLevel3::CredentialsType creds_type (void);
       //@}
 
       /**
@@ -83,14 +82,11 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator ();
 
-      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ();
 
-      virtual void release_credentials (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void release_credentials (void);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 3920b4fa110..e69f43820be 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,10 +1,8 @@
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 #include "orbsvcs/SSLIOP/ssl_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Environment.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (SSLIOP,
            SSLIOP_Profile,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 418b6d60600..6e5d711b3a7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -16,113 +16,96 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
 
 SecurityLevel3::CredentialsType
 TAO::SSLIOP::TargetCredentials::creds_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_TargetCredentials;
 }
 
 char *
 TAO::SSLIOP::TargetCredentials::context_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::TargetCredentials::client_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::TargetCredentials::client_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::TargetCredentials::client_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::TargetCredentials::target_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::TargetCredentials::target_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::TargetCredentials::target_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::TargetCredentials::parent_credentials (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    SecurityLevel3::OwnCredentials::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::client_authentication (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_authentication (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::confidentiality (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::integrity (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_embodied (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_endorsed (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO::SSLIOP::TargetCredentials::release (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 0127c1e8a77..08bd969eea4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -53,8 +53,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsType creds_type ();
       //@}
 
       /**
@@ -64,50 +63,35 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual char * context_id (void);
 
-      virtual SecurityLevel3::Principal * client_principal ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::Principal * client_principal ();
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::StatementList * client_supporting_statements ();
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ();
 
-      virtual SecurityLevel3::Principal * target_principal ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::Principal * target_principal ();
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::StatementList * target_supporting_statements ();
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ();
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean client_authentication (void);
 
-      virtual CORBA::Boolean target_authentication (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean target_authentication (void);
 
-      virtual CORBA::Boolean confidentiality (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean confidentiality (void);
 
-      virtual CORBA::Boolean integrity (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean integrity (void);
 
-      virtual CORBA::Boolean target_embodied (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean target_embodied (void);
 
-      virtual CORBA::Boolean target_endorsed (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean target_endorsed (void);
 
-      virtual void release (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void release (void);
       //@}
 
     };
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 3f60b36bcdf..1ad4d0370c3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -138,8 +138,7 @@ TAO::SSLIOP::Transport::send_request (TAO_Stub *stub,
                                       int message_semantics,
                                       ACE_Time_Value *max_wait_time)
 {
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
+  if (this->ws_->sending_request (orb_core, message_semantics) == -1)
     return -1;
 
   if (this->send_message (stream,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 48d87206164..f84609e3eb3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -16,8 +16,7 @@ ACE_RCSID (SSLIOP,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Current_ptr
-TAO::SSLIOP::Util::current (
-  TAO_ORB_Core *orb_core)
+TAO::SSLIOP::Util::current (TAO_ORB_Core *orb_core)
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
index 15e3e5f1545..e58a74666c8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
@@ -48,10 +48,8 @@ namespace TAO
     class Util
     {
     public:
-
       /// Access Current.
-      static TAO::SSLIOP::Current_ptr current (
-        TAO_ORB_Core *orb_core);
+      static TAO::SSLIOP::Current_ptr current (TAO_ORB_Core *orb_core);
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 0910e97a3df..7ec5e1de1a1 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -31,8 +31,6 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 
 RtecScheduler::handle_t
 ACE_Config_Scheduler::create (const char * entry_point)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME))
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
 
@@ -82,7 +80,6 @@ ACE_Config_Scheduler::create (const char * entry_point)
 
 RtecScheduler::handle_t
 ACE_Config_Scheduler::lookup (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->get_rt_info (entry_point, rt_info))
@@ -103,8 +100,6 @@ ACE_Config_Scheduler::lookup (const char * entry_point)
 
 RtecScheduler::RT_Info*
 ACE_Config_Scheduler::get (RtecScheduler::handle_t handle)
-     ACE_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->lookup_rt_info (handle, rt_info))
@@ -138,8 +133,6 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
                                 RtecScheduler::Info_Type_t info_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->lookup_rt_info (handle, rt_info))
@@ -169,9 +162,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
 {
 
   if (impl->priority (handle, priority, p_subpriority, p_priority) == -1)
@@ -186,9 +176,6 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED))
 {
   this->priority (lookup (entry_point),
                   priority, p_subpriority, p_priority);
@@ -199,8 +186,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            CORBA::Long number_of_calls,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 
   RtecScheduler::RT_Info* rt_info = 0;
@@ -236,10 +221,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::Dependency_Set_out dependencies,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH))
 {
 
   // Initialize the scheduler implementation.
@@ -445,9 +426,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED,
-                    RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
 
   if (impl->dispatch_configuration (p_priority, priority, d_type) == -1)
@@ -463,8 +441,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 RtecScheduler::Preemption_Priority_t
 ACE_Config_Scheduler::last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED))
 {
 
   RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue ();
@@ -484,9 +460,6 @@ ACE_Config_Scheduler::last_scheduled_priority (void)
 
 void
 ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::NOT_SCHEDULED))
 {
   ACE_UNUSED_ARG ((configs));
 
@@ -505,19 +478,11 @@ void ACE_Config_Scheduler::reset (RtecScheduler::handle_t,
             RtecScheduler::Quantum_t,
             CORBA::Long,
             RtecScheduler::Info_Type_t)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::UNKNOWN_TASK,
-                   RtecScheduler::INTERNAL,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::UNKNOWN_TASK,
-                   RtecScheduler::INTERNAL,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE))
 // Set characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are added in the case of existing and/or multiple definitions.
 {
@@ -525,10 +490,6 @@ void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&)
 }
 
 void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::UNKNOWN_TASK,
-                   RtecScheduler::INTERNAL,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE))
 // Reset characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are replaced in the case of existing and/or multiple definitions.
 {
@@ -536,10 +497,6 @@ void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&)
 }
 
 void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::UNKNOWN_TASK,
-                   RtecScheduler::INTERNAL,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE))
 // Replace all RT_Infos, resetting characteristics of the RT_Infos
 // corresponding to the passed handles.  All other RT_Infos are
 // reset to their uninitialized values, i.e., the same they have
@@ -552,9 +509,6 @@ void ACE_Config_Scheduler::remove_dependency (RtecScheduler::handle_t,
                                 RtecScheduler::handle_t,
                                 CORBA::Long,
                                 RtecScheduler::Dependency_Type_t)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method removes a dependency between two RT_Infos.
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -565,18 +519,12 @@ void ACE_Config_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t,
                                   CORBA::Long,
                                   RtecScheduler::Dependency_Type_t,
                                   RtecScheduler::Dependency_Enabled_Type_t)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a dependency between two RT_Infos.
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a sequence of dependencies.
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -584,9 +532,6 @@ void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler:
 
 void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t,
                                RtecScheduler::RT_Info_Enabled_Type_t)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables an RT_Info.
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -594,9 +539,6 @@ void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t,
 
 void ACE_Config_Scheduler::set_rt_info_enable_state_seq (
                   const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables a sequence of RT_Infos.
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -605,22 +547,12 @@ void ACE_Config_Scheduler::set_rt_info_enable_state_seq (
 void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long,
                            CORBA::Long,
                            RtecScheduler::Scheduling_Anomaly_Set_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                   RtecScheduler::TASK_COUNT_MISMATCH,
-                   RtecScheduler::INTERNAL,
-                   RtecScheduler::DUPLICATE_NAME))
 // Recomputes the scheduling priorities, etc.
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
@@ -628,9 +560,6 @@ void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out)
 }
 
 void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
@@ -638,9 +567,6 @@ void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out
 }
 
 void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RtecScheduler::SYNCHRONIZATION_FAILURE,
-                   RtecScheduler::INTERNAL))
 // Returns the set of config_infos, describing the appropriate
 // number, types, and priority levels for the dispatching lanes.
 {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index cc872ee8863..32456a27e09 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -41,14 +41,11 @@ public:
   ACE_Config_Scheduler (void);
   virtual ~ACE_Config_Scheduler (void);
 
-  virtual RtecScheduler::handle_t create (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
+  virtual RtecScheduler::handle_t create (const char * entry_point);
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual RtecScheduler::handle_t lookup (const char * entry_point);
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle);
 
   virtual void set (RtecScheduler::handle_t handle,
                     RtecScheduler::Criticality_t criticality,
@@ -59,55 +56,37 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+                    RtecScheduler::Info_Type_t info_type);
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
+                         RtecScheduler::Preemption_Priority_t& p_priority);
 
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
+                                     RtecScheduler::Preemption_Priority_t& p_priority);
 
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
+                               RtecScheduler::Dependency_Type_t dependency_type);
 
   virtual void compute_scheduling (CORBA::Long minimum_priority,
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                    RtecScheduler::TASK_COUNT_MISMATCH));
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED,
-                    RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
+                                       RtecScheduler::Dispatching_Type_t & d_type);
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED));
+      last_scheduled_priority (void);
   // Returns the last priority number assigned to an operation in the
   // schedule.
   // The number returned is one less than the total number of
@@ -115,10 +94,7 @@ public:
   // All scheduled priorities range from 0 to the number returned,
   // inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::SYNCHRONIZATION_FAILURE,
-		     RtecScheduler::NOT_SCHEDULED));
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
   // Provides the set of Config_Infos associated with the current schedule.
 
   virtual void reset (RtecScheduler::handle_t handle,
@@ -130,34 +106,18 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
+                      RtecScheduler::Info_Type_t info_type);
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos);
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos);
   // Reset characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are replaced in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos);
   // Replace all RT_Infos, resetting characteristics of the RT_Infos
   // corresponding to the passed handles.  All other RT_Infos are
   // reset to their uninitialized values, i.e., the same they have
@@ -166,71 +126,40 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
+                                  RtecScheduler::Dependency_Type_t dependency_type);
   // This method removes a dependency between two RT_Infos.
 
   virtual void set_dependency_enable_state (RtecScheduler::handle_t handle,
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled);
   // This method sets the enable state of a dependency between two RT_Infos.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies);
   // This method sets the enable state of a sequence of dependencies.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled);
   // This method enables or disables an RT_Info.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set);
   // This method enables or disables a sequence of RT_Infos.
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos);
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies);
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs);
   // Returns the set of config_infos, describing the appropriate
   // number, types, and priority levels for the dispatching lanes.
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index b565b8a6779..16586d1d7f2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -1,20 +1,15 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    DynSched.cpp
+ *
+ *  $Id$
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Sched/DynSched.h"
 #include "ace/Basic_Types.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index cbb6c142f56..221d8a58dee 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -1,22 +1,17 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    DynSched.h
+ *
+ *  $Id$
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 #ifndef DYNSCHED_H
 #define DYNSCHED_H
@@ -38,14 +33,16 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class ACE_DynScheduler
+ *
+ * @brief Dispatch scheduling interface.
+ *
+ * This abstract base class provides the majority of the
+ * implementation of either an off-line scheduler, or the
+ * necessary on-line component of the Scheduler.
+ */
 class TAO_RTSched_Export ACE_DynScheduler
-  // = TITLE
-  //    Dispatch scheduling interface.
-  //
-  // = DESCRIPTION
-  //    This abstract base class provides the majority of the
-  //    implementation of either an off-line scheduler, or the
-  //    necessary on-line component of the Scheduler.
 {
 public:
 
@@ -74,8 +71,8 @@ public:
   typedef ACE_Map_Iterator <ACE_CString, RT_Info *, ACE_Null_Mutex>
       Thread_Map_Iterator;
 
+  /// Objects are named by unique strings.
   typedef const char *Object_Name;
-  // Objects are named by unique strings.
 
   enum status_t {
     // The following are used both by the runtime Scheduler and during
@@ -119,8 +116,8 @@ public:
   // public member functions //
   /////////////////////////////
 
+    /// public dtor
   virtual ~ACE_DynScheduler ();
-    // public dtor
 
   // = Utility function for outputting the textual
   //   representation of a status_t value.
@@ -136,89 +133,99 @@ public:
 
 
   // = Initialize the scheduler.
+  /**
+   * The minimum and maximum priority are the OS-specific priorities that
+   * are used when creating the schedule (assigning priorities).  The
+   * minimum_priority is the priority value of the lowest priority.
+   * It may be numerically higher than the maximum_priority, on OS's such
+   * as VxWorks that use lower values to indicate higher priorities.
+   *
+   * When Scheduler::schedule is called, the schedule is output to the
+   * file named by "runtime_filename" if it is non-zero.
+   * This file is compilable; it is linked into the runtime executable
+   * to provide priorities to the runtime scheduling component.
+   * If the "rt_info_filename" is non-zero, the RT_Info for
+   * every task is exported to it.  It is not used at runtime.
+   * If the "timeline_filename" is non-zero, the timeline output
+   * file is created.  It is not used at runtime.
+   *
+   * The runtime scheduling component ignores these filenames.  It just
+   * uses the priorities that were linked in to the executable, after
+   * converting them to platform-specific values.
+   */
   void init (const OS_Priority minimum_priority,
              const OS_Priority maximum_priority,
              const char *runtime_filename = 0,
              const char *rt_info_filename = 0,
              const char *timeline_filename = 0);
-  // The minimum and maximum priority are the OS-specific priorities that
-  // are used when creating the schedule (assigning priorities).  The
-  // minimum_priority is the priority value of the lowest priority.
-  // It may be numerically higher than the maximum_priority, on OS's such
-  // as VxWorks that use lower values to indicate higher priorities.
-  //
-  // When Scheduler::schedule is called, the schedule is output to the
-  // file named by "runtime_filename" if it is non-zero.
-  // This file is compilable; it is linked into the runtime executable
-  // to provide priorities to the runtime scheduling component.
-  // If the "rt_info_filename" is non-zero, the RT_Info for
-  // every task is exported to it.  It is not used at runtime.
-  // If the "timeline_filename" is non-zero, the timeline output
-  // file is created.  It is not used at runtime.
-  //
-  // The runtime scheduling component ignores these filenames.  It just
-  // uses the priorities that were linked in to the executable, after
-  // converting them to platform-specific values.
 
+  /**
+   * Prepare for another schedule computation: once a reasonable schedule
+   * has been generated, a new schedule will not be computed unless an
+   * RT_Info is added, or this method is invoked to clear the previous
+   * schedule (allows fault correcting alteration of RT_Infos outside the
+   * scheduler implementation, followed by generation of a new schedule).
+   */
   void reset ();
-  // Prepare for another schedule computation: once a reasonable schedule
-  // has been generated, a new schedule will not be computed unless an
-  // RT_Info is added, or this method is invoked to clear the previous
-  // schedule (allows fault correcting alteration of RT_Infos outside the
-  // scheduler implementation, followed by generation of a new schedule).
 
   // = Registers a task.
+  /**
+   * If the Task registration succeeds, this function returns SUCCEEDED
+   * and sets "handle" to a unique identifier for the task.
+   * Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
+   * TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
+   * only be registered once.)
+   */
   status_t register_task (RT_Info *, handle_t &handle);
-  // If the Task registration succeeds, this function returns SUCCEEDED
-  // and sets "handle" to a unique identifier for the task.
-  // Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
-  // TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
-  // only be registered once.)
 
+  /**
+   * Tries to find the RT_Info corresponding to <name> in the RT_Info
+   * database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
+   * set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
+   * was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
+   * the task must call RT_Info::set to fill in execution properties.
+   * In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
+   * (rtinfo, 0, handle) is called.  Returns FAILED if an error
+   * occurs.
+   *
+   * One motivation for allocating RT_Info's from within the Scheduler
+   * is to allow RT_Infos to persist after the tasks that use them.
+   * For instance, we may want to call this->schedule right before the
+   * application exits a configuration run.  If the tasks have been
+   * deleted (deleting their RT_Infos with them), this->schedule will
+   * fail.
+   */
   status_t get_rt_info (Object_Name name, RT_Info* &rtinfo);
-  // Tries to find the RT_Info corresponding to <name> in the RT_Info
-  // database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
-  // set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
-  // was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
-  // the task must call RT_Info::set to fill in execution properties.
-  // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
-  // (rtinfo, 0, handle) is called.  Returns FAILED if an error
-  // occurs.
-  //
-  // One motivation for allocating RT_Info's from within the Scheduler
-  // is to allow RT_Infos to persist after the tasks that use them.
-  // For instance, we may want to call this->schedule right before the
-  // application exits a configuration run.  If the tasks have been
-  // deleted (deleting their RT_Infos with them), this->schedule will
-  // fail.
 
+  /// Obtains an RT_Info based on its "handle".
   status_t lookup_rt_info (handle_t handle, RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
 
+  /// Obtains a Config_Info based on its priority.
   status_t lookup_config_info (Preemption_Priority priority,
                                Config_Info* &config_info);
-  // Obtains a Config_Info based on its priority.
 
+  /// This sets up the data structures, invokes the internal scheduling method.
   status_t
     schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> &anomaly_set);
-  // This sets up the data structures, invokes the internal scheduling method.
 
+  /// this prints the entire set of timeline outputs to the specified file
   status_t output_timeline (const char *filename, const char *heading);
-  // this prints the entire set of timeline outputs to the specified file
 
 
   // = Access a thread priority.
+  /**
+   * "priority" is the OS thread priority that was assigned to the Task that
+   * was assigned "handle".  "subpriority" combines the dynamic and static
+   * subpriorities of the Task that was assigned handle.  "preemption_prio"
+   * is a platform-independent priority queue number, ranging from a
+   * highest priority value of 0 to the lowest priority value, which is
+   * returned by "minimum_priority_queue ()".  Returns 0 on success,
+   * or -1 if an invalid handle was supplied.
+   */
   virtual int priority (const handle_t handle,
                         OS_Priority &priority,
                         Sub_Priority &subpriority,
                         Preemption_Priority &preemption_prio);
-  // "priority" is the OS thread priority that was assigned to the Task that
-  // was assigned "handle".  "subpriority" combines the dynamic and static
-  // subpriorities of the Task that was assigned handle.  "preemption_prio"
-  // is a platform-independent priority queue number, ranging from a
-  // highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()".  Returns 0 on success,
-  // or -1 if an invalid handle was supplied.
 
   // = Access the platform-independent priority value of the lowest-priority
   //   thread.
@@ -234,13 +241,13 @@ public:
   status_t status () const;
 
   // = Access the current output (debugging) level.
+  /// Default is 0; set to 1 to print out schedule, by task.  Set
+  /// to higher than one for debugging info.
   u_int output_level () const;
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
 
   // = Set the scheduler output (debugging) level.
+  /// the only supported levels are 0 (quiet), 1 (verbose) and 2 (debug)
   void output_level (const u_int level);
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2 (debug)
 
   int add_dependency(RT_Info* rt_info,
                              Dependency_Info& d);
@@ -255,10 +262,10 @@ public:
   u_long min_dispatch_id () const;
   u_long max_dispatch_id () const;
 
+  /// provide the thread priority and queue type for the given priority level
   virtual int dispatch_configuration (const Preemption_Priority &p_priority,
                                       OS_Priority& priority,
                                       Dispatching_Type & d_type);
-  // provide the thread priority and queue type for the given priority level
 
 protected:
 
@@ -268,18 +275,18 @@ protected:
 
   ACE_DynScheduler ();
 
+  /// thread scheduling method: sets up array of pointers to task
+  /// entries that are threads, calls internal thread scheduling method
   status_t schedule_threads (
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
-  // thread scheduling method: sets up array of pointers to task
-  // entries that are threads, calls internal thread scheduling method
 
+  /// dispatch scheduling method: sets up an array of dispatch entries,
+  /// calls internal dispatch scheduling method.
   status_t schedule_dispatches (
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
-  // dispatch scheduling method: sets up an array of dispatch entries,
-  // calls internal dispatch scheduling method.
 
+  /// = store assigned information back into the RT_Infos
   virtual status_t store_assigned_info (void);
-  // = store assigned information back into the RT_Infos
 
   // = Set the minimum priority value.
   void minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number);
@@ -297,82 +304,84 @@ protected:
   // protected pure virtual member functions //
   /////////////////////////////////////////////
 
+  /// = determine the minimum critical priority number
   virtual Preemption_Priority minimum_critical_priority () = 0;
-  // = determine the minimum critical priority number
 
+  /// internal sorting method: this orders the dispatches by
+  /// static priority and dynamic and static subpriority.
   virtual status_t sort_dispatches (Dispatch_Entry **, u_int) = 0;
-  // internal sorting method: this orders the dispatches by
-  // static priority and dynamic and static subpriority.
 
+  /// = assign priorities to the sorted dispatches
   virtual status_t assign_priorities (
     Dispatch_Entry **dispatches,
     u_int count,
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set) = 0;
-  // = assign priorities to the sorted dispatches
 
+  /// = assign dynamic and static sub-priorities to the sorted dispatches
   virtual status_t assign_subpriorities (
     Dispatch_Entry **dispatches,
     u_int count,
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set) = 0;
-  // = assign dynamic and static sub-priorities to the sorted dispatches
 
+  /// = schedule a dispatch entry into the timeline being created
   virtual status_t
     schedule_timeline_entry (Dispatch_Entry &dispatch_entry,
                              ACE_Unbounded_Queue <Dispatch_Entry *>
                                &reschedule_queue) = 0;
-  // = schedule a dispatch entry into the timeline being created
 
   ////////////////////////////
   // protected data members //
   ////////////////////////////
 
+  /// The minimum OS thread priority value that the application specified (in
+  /// its call to init ()).
   OS_Priority minimum_priority_;
-  // The minimum OS thread priority value that the application specified (in
-  // its call to init ()).
 
+  /// The maximum OS thread priority value that the application specified (in
+  /// its call to init ()).
   OS_Priority maximum_priority_;
-  // The maximum OS thread priority value that the application specified (in
-  // its call to init ()).
 
+  /// Collection of known tasks.
   Task_Entry *task_entries_;
-  // Collection of known tasks.
 
+  /**
+   * An array of pointers to task entries which wrap RT_Infos. It is
+   * sorted by the DFS finishing time and then the resulting topological
+   * over the call graph is used both to check for call chain cycles and
+   * to correctly propagate scheduling information away from the threads.
+   */
   Task_Entry **ordered_task_entries_;
-  // An array of pointers to task entries which wrap RT_Infos. It is
-  // sorted by the DFS finishing time and then the resulting topological
-  // over the call graph is used both to check for call chain cycles and
-  // to correctly propagate scheduling information away from the threads.
 
+    /// identifies dispatch entries whose underlying
+    /// Task Entries delineate threads
   ACE_Unbounded_Set <Dispatch_Entry *> *thread_delineators_;
-    // identifies dispatch entries whose underlying
-    // Task Entries delineate threads
 
+  /// An array of pointers to task entries which initiate call chains.
+  /// It is sorted by the schedule_threads method defined in the derived class.
   Dispatch_Entry **ordered_thread_dispatch_entries_;
-  // An array of pointers to task entries which initiate call chains.
-  // It is sorted by the schedule_threads method defined in the derived class.
 
+    /// the set of dispatch entries
   ACE_Unbounded_Set <Dispatch_Entry *> *dispatch_entries_;
-    // the set of dispatch entries
 
+  /// Collection of dispatch configuration entries.
   ACE_Unbounded_Set <Config_Info *> *config_info_entries_;
-  // Collection of dispatch configuration entries.
 
+    /// expanded set of dispatch entries (all dispatch entries produced by
+    /// expanding sub-frames to the total frame size during timeline creation)
   ACE_Unbounded_Set <Dispatch_Entry *> *expanded_dispatches_;
-    // expanded set of dispatch entries (all dispatch entries produced by
-    // expanding sub-frames to the total frame size during timeline creation)
 
+  /// An array of pointers to  dispatch entries. It is
+  /// sorted by the schedule_dispatches method.
   Dispatch_Entry **ordered_dispatch_entries_;
-  // An array of pointers to  dispatch entries. It is
-  // sorted by the schedule_dispatches method.
 
+  /// the number of dispatch entries in the schedule
   u_int dispatch_entry_count_;
-  // the number of dispatch entries in the schedule
 
+  /// the number of dispatch entries in the schedule
   u_int threads_;
-  // the number of dispatch entries in the schedule
 
+  /// Ordered MultiSet of timeline entries.
   ACE_Ordered_MultiSet <TimeLine_Entry_Link> *timeline_;
-  // Ordered MultiSet of timeline entries.
 
 private:
 
@@ -399,24 +408,24 @@ private:
   // private member functions //
   //////////////////////////////
 
+  /// Create a timeline.
   status_t create_timeline ();
-  // Create a timeline.
 
+  /// this prints a dispatch timeline to the specified file
   status_t output_dispatch_timeline (const char *filename);
   status_t output_dispatch_timeline (FILE *file);
-  // this prints a dispatch timeline to the specified file
 
+  /// this prints a preemption timeline to the specified file
   status_t output_preemption_timeline (const char *filename);
   status_t output_preemption_timeline (FILE *file);
-  // this prints a preemption timeline to the specified file
 
+  /// this prints a scheduling viewer timeline to the specified file
   status_t output_viewer_timeline (const char *filename);
   status_t output_viewer_timeline (FILE *file);
-  // this prints a scheduling viewer timeline to the specified file
 
+  /// this prints the scheduling parameters and assigned priorities to the specified file
   status_t output_dispatch_priorities (const char *filename);
   status_t output_dispatch_priorities (FILE *file);
-  // this prints the scheduling parameters and assigned priorities to the specified file
 
   // = Set up the task entry data structures
   status_t setup_task_entries (void);
@@ -452,16 +461,16 @@ private:
   // update the scheduling parameters for the previous priority level
   void update_priority_level_params ();
 
+  /// propagate the dispatch information from the
+  /// threads throughout the call graph
   status_t
     propagate_dispatches (
       ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set,
       ACE_CString & unresolved_locals,
       ACE_CString & unresolved_remotes);
-  // propagate the dispatch information from the
-  // threads throughout the call graph
 
+  /// calculate utilization, frame size, etc.
   status_t calculate_utilization_params ();
-  // calculate utilization, frame size, etc.
 
   // the following functions are not implememented
   ACE_DynScheduler (const ACE_DynScheduler &);
@@ -471,27 +480,27 @@ private:
   // private data members //
   //////////////////////////
 
+  /// This protects access to the scheduler during configuration runs.
   LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
 
+  /// Collection of known tasks.
   ACE_Unbounded_Set <RT_Info *> rt_info_entries_;
-  // Collection of known tasks.
 
+  /// The number of task handles dispensed so far.
   u_int handles_;
-  // The number of task handles dispensed so far.
 
+  /// Destination file of Scheduler output from the configuration run.
   const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
 
+  /// Destination file of all rt_info data from the configuration run.
   const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
 
+  /// The destination of the timeline.
   const char *timeline_filename_;
-  // The destination of the timeline.
 
+  /// A binding of name to rt_info.  This is the mapping for every
+  /// rt_info in the process.
   Info_Collection info_collection_;
-  // A binding of name to rt_info.  This is the mapping for every
-  // rt_info in the process.
 
   u_int tasks_;
 
@@ -499,32 +508,36 @@ private:
 
   u_int output_level_;
 
+    /// minimum frame size for all tasks
   u_long frame_size_; /* 100 nanosec */
-    // minimum frame size for all tasks
 
+    /// minimum frame size for guaranteed schedulable tasks
   u_long critical_set_frame_size_; /* 100 nanosec */
-    // minimum frame size for guaranteed schedulable tasks
 
+    /// total utilization for all tasks
   double utilization_;
-    // total utilization for all tasks
 
+    /// minimum frame size for guaranteed schedulable tasks
   double critical_set_utilization_;
-    // minimum frame size for guaranteed schedulable tasks
 
+    /**
+     * The platform-independent priority value of the Event Channel's
+     * minimum priority dispatch queue.  The value of the maximum priority
+     * dispatch queue is always 0.
+     */
   Preemption_Priority minimum_priority_queue_;
-    // The platform-independent priority value of the Event Channel's
-    // minimum priority dispatch queue.  The value of the maximum priority
-    // dispatch queue is always 0.
 
+    /**
+     * The platform-independent priority value of the minimum priority dispatch
+     * queue whose operations are guaranteed to be schedulable.  The value of
+     * the maximum priority dispatch queue is always 0, -1 indicates none can
+     * be guaranteed.
+     */
   Preemption_Priority minimum_guaranteed_priority_queue_;
-    // The platform-independent priority value of the minimum priority dispatch
-    // queue whose operations are guaranteed to be schedulable.  The value of
-    // the maximum priority dispatch queue is always 0, -1 indicates none can
-    // be guaranteed.
 
+    /// indicates whether the a valid schedule has been generated since the last
+    /// relevant change (addition, alteration or removal of an RT_Info, etc.)
   u_int up_to_date_;
-    // indicates whether the a valid schedule has been generated since the last
-    // relevant change (addition, alteration or removal of an RT_Info, etc.)
 
   u_long min_dispatch_id_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl b/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl
index 8e27d24c28e..1a0bcd0b0d9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl
@@ -1,22 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    DynSched.inl
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f3669c611c5..8ff73d87e6b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -1,19 +1,13 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Reconfig_Sched_Utils.cpp
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_C
 #define TAO_RECONFIG_SCHED_UTILS_C
@@ -492,8 +486,7 @@ actual_rt_info ()
 // Mutator for actual RT_Info pointer.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-actual_rt_info (TAO_RT_Info_Ex *rt_info)
+TAO_Reconfig_Scheduler_Entry::actual_rt_info (TAO_RT_Info_Ex *rt_info)
 {
   this->actual_rt_info_ = rt_info;
 }
@@ -502,8 +495,7 @@ actual_rt_info (TAO_RT_Info_Ex *rt_info)
 // Accessor for when the node was discovered in forward DFS traversal.
 
 long
-TAO_Reconfig_Scheduler_Entry::
-fwd_discovered () const
+TAO_Reconfig_Scheduler_Entry::fwd_discovered () const
 {
   return this->fwd_discovered_;
 }
@@ -512,8 +504,7 @@ fwd_discovered () const
 // Mutator for when the node was discovered in forward DFS traversal.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-fwd_discovered (long l)
+TAO_Reconfig_Scheduler_Entry::fwd_discovered (long l)
 {
   this->fwd_discovered_ = l;
 }
@@ -522,8 +513,7 @@ fwd_discovered (long l)
 // Accessor for when the node was discovered in reverse DFS traversal.
 
 long
-TAO_Reconfig_Scheduler_Entry::
-rev_discovered () const
+TAO_Reconfig_Scheduler_Entry::rev_discovered () const
 {
   return this->rev_discovered_;
 }
@@ -532,8 +522,7 @@ rev_discovered () const
 // Mutator for when the node was discovered in reverse DFS traversal.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-rev_discovered (long l)
+TAO_Reconfig_Scheduler_Entry::rev_discovered (long l)
 {
   this->rev_discovered_ = l;
 }
@@ -542,8 +531,7 @@ rev_discovered (long l)
 // Accessor for when the node was finished in forward DFS traversal.
 
 long
-TAO_Reconfig_Scheduler_Entry::
-fwd_finished () const
+TAO_Reconfig_Scheduler_Entry::fwd_finished () const
 {
   return this->fwd_finished_;
 }
@@ -552,8 +540,7 @@ fwd_finished () const
 // Mutator for when the node was finished in forward DFS traversal.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-fwd_finished (long l)
+TAO_Reconfig_Scheduler_Entry::fwd_finished (long l)
 {
   this->fwd_finished_ = l;
 }
@@ -562,8 +549,7 @@ fwd_finished (long l)
 // Accessor for when the node was finished in reverse DFS traversal.
 
 long
-TAO_Reconfig_Scheduler_Entry::
-rev_finished () const
+TAO_Reconfig_Scheduler_Entry::rev_finished () const
 {
   return this->rev_finished_;
 }
@@ -572,8 +558,7 @@ rev_finished () const
 // Mutator for when the node was finished in reverse DFS traversal.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-rev_finished (long l)
+TAO_Reconfig_Scheduler_Entry::rev_finished (long l)
 {
   this->rev_finished_ = l;
 }
@@ -582,8 +567,7 @@ rev_finished (long l)
 // Accessor for forward DFS traversal status of the node.
 
 TAO_Reconfig_Scheduler_Entry::DFS_Status
-TAO_Reconfig_Scheduler_Entry::
-fwd_dfs_status () const
+TAO_Reconfig_Scheduler_Entry::fwd_dfs_status () const
 {
   return this->fwd_dfs_status_;
 }
@@ -603,8 +587,7 @@ fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds)
 // Accessor for DFS traversal status of the node.
 
 TAO_Reconfig_Scheduler_Entry::DFS_Status
-TAO_Reconfig_Scheduler_Entry::
-rev_dfs_status () const
+TAO_Reconfig_Scheduler_Entry::rev_dfs_status () const
 {
   return this->rev_dfs_status_;
 }
@@ -624,8 +607,7 @@ rev_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds)
 // delineator.
 
 int
-TAO_Reconfig_Scheduler_Entry::
-is_thread_delineator () const
+TAO_Reconfig_Scheduler_Entry::is_thread_delineator () const
 {
   return this->is_thread_delineator_;
 }
@@ -635,8 +617,7 @@ is_thread_delineator () const
 // delineator.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-is_thread_delineator (int i)
+TAO_Reconfig_Scheduler_Entry::is_thread_delineator (int i)
 {
   this->is_thread_delineator_ = i;
 }
@@ -657,8 +638,7 @@ has_unresolved_remote_dependencies () const
 // dependencies.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_remote_dependencies (int i)
+TAO_Reconfig_Scheduler_Entry::has_unresolved_remote_dependencies (int i)
 {
   this->has_unresolved_remote_dependencies_ = i;
 }
@@ -668,8 +648,7 @@ has_unresolved_remote_dependencies (int i)
 // dependencies.
 
 int
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_local_dependencies () const
+TAO_Reconfig_Scheduler_Entry::has_unresolved_local_dependencies () const
 {
   return this->has_unresolved_local_dependencies_;
 }
@@ -679,8 +658,7 @@ has_unresolved_local_dependencies () const
 // dependencies.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_local_dependencies (int i)
+TAO_Reconfig_Scheduler_Entry::has_unresolved_local_dependencies (int i)
 {
   this->has_unresolved_local_dependencies_ = i;
 }
@@ -795,8 +773,7 @@ TAO_RSE_Reset_Visitor::visit (TAO_Reconfig_Scheduler_Entry &rse)
 // Accessor for effective execution time of corresponding RT_Info.
 
 RtecScheduler::Time
-TAO_Reconfig_Scheduler_Entry::
-aggregate_exec_time ()
+TAO_Reconfig_Scheduler_Entry::aggregate_exec_time ()
 {
   return this->aggregate_exec_time_;
 }
@@ -805,8 +782,7 @@ aggregate_exec_time ()
 // Mutator for effective execution time of corresponding RT_Info.
 
 void
-TAO_Reconfig_Scheduler_Entry::
-aggregate_exec_time (RtecScheduler::Time t)
+TAO_Reconfig_Scheduler_Entry::aggregate_exec_time (RtecScheduler::Time t)
 {
   this->aggregate_exec_time_ = t;
 }
@@ -814,8 +790,7 @@ aggregate_exec_time (RtecScheduler::Time t)
 // Accessor for the sum of periods for tuples directly associated
 // with the entry.
 RtecScheduler::Period_t
-TAO_Reconfig_Scheduler_Entry::
-orig_tuple_period_sum ()
+TAO_Reconfig_Scheduler_Entry::orig_tuple_period_sum ()
 {
   return orig_tuple_period_sum_;
 }
@@ -824,8 +799,7 @@ orig_tuple_period_sum ()
 // Mutator for the sum of periods for tuples directly associated
 // with the entry.
 void
-TAO_Reconfig_Scheduler_Entry::
-orig_tuple_period_sum (RtecScheduler::Period_t p)
+TAO_Reconfig_Scheduler_Entry::orig_tuple_period_sum (RtecScheduler::Period_t p)
 {
   orig_tuple_period_sum_ = p;
 }
@@ -834,8 +808,7 @@ orig_tuple_period_sum (RtecScheduler::Period_t p)
 // Accessor for the sum of periods for tuples propagated via
 // dependencies on other entries.
 RtecScheduler::Period_t
-TAO_Reconfig_Scheduler_Entry::
-prop_tuple_period_sum ()
+TAO_Reconfig_Scheduler_Entry::prop_tuple_period_sum ()
 {
   return prop_tuple_period_sum_;
 }
@@ -844,8 +817,7 @@ prop_tuple_period_sum ()
 // Mutator for the sum of periods for tuples propagated via
 // dependencies on other entries.
 void
-TAO_Reconfig_Scheduler_Entry::
-prop_tuple_period_sum (RtecScheduler::Period_t p)
+TAO_Reconfig_Scheduler_Entry::prop_tuple_period_sum (RtecScheduler::Period_t p)
 {
   prop_tuple_period_sum_ = p;
 }
@@ -854,8 +826,7 @@ prop_tuple_period_sum (RtecScheduler::Period_t p)
 //  Accessor for the number of tuples directly associated with the
 //  entry.
 u_int
-TAO_Reconfig_Scheduler_Entry::
-orig_tuple_count ()
+TAO_Reconfig_Scheduler_Entry::orig_tuple_count ()
 {
   return orig_tuple_count_;
 }
@@ -864,8 +835,7 @@ orig_tuple_count ()
 //  Mutator for the number of tuples directly associated with the
 //  entry.
 void
-TAO_Reconfig_Scheduler_Entry::
-orig_tuple_count (u_int c)
+TAO_Reconfig_Scheduler_Entry::orig_tuple_count (u_int c)
 {
   orig_tuple_count_ = c;
 }
@@ -874,8 +844,7 @@ orig_tuple_count (u_int c)
 // Accessor for the number of tuples propagated via dependencies on
 // other entries.
 u_int
-TAO_Reconfig_Scheduler_Entry::
-prop_tuple_count ()
+TAO_Reconfig_Scheduler_Entry::prop_tuple_count ()
 {
   return prop_tuple_count_;
 }
@@ -884,8 +853,7 @@ prop_tuple_count ()
 // Mutator for the number of tuples propagated via dependencies on
 // other entries.
 void
-TAO_Reconfig_Scheduler_Entry::
-prop_tuple_count (u_int c)
+TAO_Reconfig_Scheduler_Entry::prop_tuple_count (u_int c)
 {
   prop_tuple_count_ = c;
 }
@@ -894,8 +862,7 @@ prop_tuple_count (u_int c)
 // Accessor for the set of tuples directly associated with the
 // entry.
 TUPLE_SET &
-TAO_Reconfig_Scheduler_Entry::
-orig_tuple_subset ()
+TAO_Reconfig_Scheduler_Entry::orig_tuple_subset ()
 {
   return orig_tuple_subset_;
 }
@@ -904,24 +871,21 @@ orig_tuple_subset ()
 // Accessor for the set of tuples propagated via dependencies on
 // other entries.
 TUPLE_SET &
-TAO_Reconfig_Scheduler_Entry::
-prop_tuple_subset ()
+TAO_Reconfig_Scheduler_Entry::prop_tuple_subset ()
 {
   return prop_tuple_subset_;
 }
 
 
 TAO_RT_Info_Tuple *
-TAO_Reconfig_Scheduler_Entry::
-current_admitted_tuple ()
+TAO_Reconfig_Scheduler_Entry::current_admitted_tuple ()
 {
   return current_admitted_tuple_;
 }
 
 
 void
-TAO_Reconfig_Scheduler_Entry::
-current_admitted_tuple (TAO_RT_Info_Tuple * t)
+TAO_Reconfig_Scheduler_Entry::current_admitted_tuple (TAO_RT_Info_Tuple * t)
 {
   current_admitted_tuple_ = t;
 }
@@ -929,8 +893,7 @@ current_admitted_tuple (TAO_RT_Info_Tuple * t)
 // Accessor for flag indicating whether or not node is enabled.
 
 RtecScheduler::RT_Info_Enabled_Type_t
-TAO_Reconfig_Scheduler_Entry::
-enabled_state () const
+TAO_Reconfig_Scheduler_Entry::enabled_state () const
 {
   return this->enabled_;
 }
@@ -1454,11 +1417,9 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::compare_criticality(TAO_Reconfig_Scheduler
 // Compares two RT_Info entries by criticality alone.  Returns -1 if the
 // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 int
-TAO_RMS_FAIR_Reconfig_Sched_Strategy::compare_criticality(TAO_RT_Info_Tuple &lhs,
-                                                     TAO_RT_Info_Tuple &rhs)
+TAO_RMS_FAIR_Reconfig_Sched_Strategy::compare_criticality(TAO_RT_Info_Tuple &,
+                                                     TAO_RT_Info_Tuple &)
 {
-  ACE_UNUSED_ARG (lhs);
-  ACE_UNUSED_ARG (rhs);
   // In plain RMS, no consideration of criticalities
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 408d42bb56f..4c98033b05b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_Utils.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Reconfig_Sched_Utils.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_H
 #define TAO_RECONFIG_SCHED_UTILS_H
@@ -102,16 +99,18 @@ struct TAO_RTSched_Export TAO_RT_Info_Tuple
 };
 
 
+/**
+ * @class TAO_Reconfig_Scheduler_Entry
+ *
+ * @brief An implementation class used to decouple the available descriptors
+ * from the admitted descriptors, and to store interim scheduling results
+ * such as DFS finishing order, etc.
+ *
+ * This class improves the performance of the Reconfig Scheduler
+ * by saving information from one computation for use in other
+ * computations, and simplifies the implementation logic.
+ */
 class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry
-  // = TITLE
-  //   An implementation class used to decouple the available descriptors
-  //   from the admitted descriptors, and to store interim scheduling results
-  //   such as DFS finishing order, etc.
-  //
-  // = DESCRIPTION
-  //   This class improves the performance of the Reconfig Scheduler
-  //   by saving information from one computation for use in other
-  //   computations, and simplifies the implementation logic.
 {
 public:
 
@@ -120,281 +119,297 @@ public:
 
   enum Tuple_Type {ORIGINAL = 0x01UL, PROPAGATED = 0x02UL};
 
+  /// Constructor.
   TAO_Reconfig_Scheduler_Entry (TAO_RT_Info_Ex &rt_info);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_Reconfig_Scheduler_Entry ();
-  // Destructor.
 
+  /// Removes all tuples from the entry.
   void remove_tuples (u_long tuple_flags = ORIGINAL | PROPAGATED);
-  // Removes all tuples from the entry.
 
+  /// Inserts a tuple into the appropriate tuple multiset.
   int insert_tuple (TAO_RT_Info_Tuple &tuple,
                     Tuple_Type tuple_type = ORIGINAL,
                     int replace = 0);
-  // Inserts a tuple into the appropriate tuple multiset.
 
+  /// Updates a matching tuple.
   int update_tuple (TAO_RT_Info_Ex &info,
                     Tuple_Type tuple_type = ORIGINAL);
-  // Updates a matching tuple.
 
+  /// Registers tuples into the passed tuple pointer array.
   int register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array,
                        long &tuple_count);
-  // Registers tuples into the passed tuple pointer array.
 
+  /// Accessor for stored original RT_Info data.
   TAO_RT_Info_Ex & orig_rt_info_data (void);
-  // Accessor for stored original RT_Info data.
 
+  /// Mutator for stored original RT_Info data.
   void orig_rt_info_data (TAO_RT_Info_Ex &data);
-  // Mutator for stored original RT_Info data.
 
+  /// Accessor for actual RT_Info.
   TAO_RT_Info_Ex * actual_rt_info ();
-  // Accessor for actual RT_Info.
 
+  /// Mutator for actual RT_Info.
   void actual_rt_info (TAO_RT_Info_Ex *);
-  // Mutator for actual RT_Info.
 
+  /// Accessor for when the node was discovered in forward DFS traversal.
   long fwd_discovered () const;
-  // Accessor for when the node was discovered in forward DFS traversal.
 
+  /// Mutator for when the node was discovered in forward DFS traversal.
   void fwd_discovered (long l);
-  // Mutator for when the node was discovered in forward DFS traversal.
 
+  /// Accessor for when the node was discovered in reverse DFS traversal.
   long rev_discovered () const;
-  // Accessor for when the node was discovered in reverse DFS traversal.
 
+  /// Mutator for when the node was discovered in reverse DFS traversal.
   void rev_discovered (long l);
-  // Mutator for when the node was discovered in reverse DFS traversal.
 
+  /// Accessor for when the node was finished in forward DFS traversal.
   long fwd_finished () const;
-  // Accessor for when the node was finished in forward DFS traversal.
 
+  /// Mutator for when the node was finished in forward DFS traversal.
   void fwd_finished (long l);
-  // Mutator for when the node was finished in forward DFS traversal.
 
+  /// Accessor for when the node was finished in reverse DFS traversal.
   long rev_finished () const;
-  // Accessor for when the node was finished in reverse DFS traversal.
 
+  /// Mutator for when the node was finished in reverse DFS traversal.
   void rev_finished (long l);
-  // Mutator for when the node was finished in reverse DFS traversal.
 
+  /// Accessor for forward DFS traversal status of the node.
   DFS_Status fwd_dfs_status () const;
-  // Accessor for forward DFS traversal status of the node.
 
+  /// Accessor for reverse DFS traversal status of the node.
   DFS_Status rev_dfs_status () const;
-  // Accessor for reverse DFS traversal status of the node.
 
+  /// Mutator for forward DFS traversal status of the node.
   void fwd_dfs_status (DFS_Status ds);
-  // Mutator for forward DFS traversal status of the node.
 
+  /// Mutator for reverse DFS traversal status of the node.
   void rev_dfs_status (DFS_Status ds);
-  // Mutator for reverse DFS traversal status of the node.
 
+  /// Accessor for flag indicating whether node is a thread
+  /// delineator.
   int is_thread_delineator () const;
-  // Accessor for flag indicating whether node is a thread
-  // delineator.
 
+  /// Mutator for flag indicating whether node is a thread
+  /// delineator.
   void is_thread_delineator (int i);
-  // Mutator for flag indicating whether node is a thread
-  // delineator.
 
+  /// Accessor for flag indicating whether node has unresolved remote
+  /// dependencies.
   int has_unresolved_remote_dependencies () const;
-  // Accessor for flag indicating whether node has unresolved remote
-  // dependencies.
 
+  /// Mutator for flag indicating whether node has unresolved remote
+  /// dependencies.
   void has_unresolved_remote_dependencies (int i);
-  // Mutator for flag indicating whether node has unresolved remote
-  // dependencies.
 
+  /// Accessor for flag indicating whether node has unresolved local
+  /// dependencies.
   int has_unresolved_local_dependencies () const;
-  // Accessor for flag indicating whether node has unresolved local
-  // dependencies.
 
+  /// Mutator for flag indicating whether node has unresolved local
+  /// dependencies.
   void has_unresolved_local_dependencies (int i);
-  // Mutator for flag indicating whether node has unresolved local
-  // dependencies.
 
+  /**
+   * Accessor for effective execution time of the corresponding
+   * RT_Info and all of its disjunctively (i.e., dispatching waveforms
+   * are additive) executed dependants.
+   */
   RtecScheduler::Time aggregate_exec_time ();
-  // Accessor for effective execution time of the corresponding
-  // RT_Info and all of its disjunctively (i.e., dispatching waveforms
-  // are additive) executed dependants.
 
+  /// Mutator for effective execution time of the corresponding RT_Info
+  /// and its disjunctively executed dependants.
   void aggregate_exec_time (RtecScheduler::Time t);
-  // Mutator for effective execution time of the corresponding RT_Info
-  // and its disjunctively executed dependants.
 
+  /**
+   * Accessor for the sum of periods for tuples directly associated
+   * with the entry.  It can be used to compute the mean rate for the
+   * entry.
+   */
   RtecScheduler::Period_t orig_tuple_period_sum ();
-  // Accessor for the sum of periods for tuples directly associated
-  // with the entry.  It can be used to compute the mean rate for the
-  // entry.
 
+  /**
+   * Mutator for the sum of periods for tuples directly associated
+   * with the entry.  It can be used to compute the mean rate for the
+   * entry.
+   */
   void orig_tuple_period_sum (RtecScheduler::Period_t p);
-  // Mutator for the sum of periods for tuples directly associated
-  // with the entry.  It can be used to compute the mean rate for the
-  // entry.
 
+  /**
+   * Accessor for the sum of periods for tuples propagated via
+   * dependencies on other entries.  It can be used to compute the
+   * mean rate for the entry.
+   */
   RtecScheduler::Period_t prop_tuple_period_sum ();
-  // Accessor for the sum of periods for tuples propagated via
-  // dependencies on other entries.  It can be used to compute the
-  // mean rate for the entry.
 
+  /**
+   * Mutator for the sum of periods for tuples propagated via
+   * dependencies on other entries.  It can be used to compute the
+   * mean rate for the entry.
+   */
   void prop_tuple_period_sum (RtecScheduler::Period_t p);
-  // Mutator for the sum of periods for tuples propagated via
-  // dependencies on other entries.  It can be used to compute the
-  // mean rate for the entry.
 
+  ///  Accessor for the number of tuples directly associated with the
+  ///  entry.
   u_int orig_tuple_count ();
-  //  Accessor for the number of tuples directly associated with the
-  //  entry.
 
+  ///  Mutator for the number of tuples directly associated with the
+  ///  entry.
   void orig_tuple_count (u_int c);
-  //  Mutator for the number of tuples directly associated with the
-  //  entry.
 
+  /// Accessor for the number of tuples propagated via dependencies on
+  /// other entries.
   u_int prop_tuple_count ();
-  // Accessor for the number of tuples propagated via dependencies on
-  // other entries.
 
+  /// Mutator for the number of tuples propagated via dependencies on
+  /// other entries.
   void prop_tuple_count (u_int c);
-  // Mutator for the number of tuples propagated via dependencies on
-  // other entries.
 
+  /// Accessor for the set of tuples directly associated with the
+  /// entry.
   TUPLE_SET& orig_tuple_subset ();
-  // Accessor for the set of tuples directly associated with the
-  // entry.
 
+  /// Accessor for the set of tuples propagated via dependencies on
+  /// other entries.
   TUPLE_SET& prop_tuple_subset ();
-  // Accessor for the set of tuples propagated via dependencies on
-  // other entries.
 
+  /// Returns a pointer to the entry's most recently admitted tuple.
+  /// The pointer is zero if no tuples have been admitted so far.
   TAO_RT_Info_Tuple * current_admitted_tuple ();
-  // Returns a pointer to the entry's most recently admitted tuple.
-  // The pointer is zero if no tuples have been admitted so far.
 
+  /// Sets a pointer to the entry's most recently admitted tuple.
+  /// The pointer is zero if no tuples have been admitted so far.
   void current_admitted_tuple (TAO_RT_Info_Tuple *);
-  // Sets a pointer to the entry's most recently admitted tuple.
-  // The pointer is zero if no tuples have been admitted so far.
 
+  /// Accessor for flag indicating whether or not node is enabled.
   RtecScheduler::RT_Info_Enabled_Type_t enabled_state () const;
-  // Accessor for flag indicating whether or not node is enabled.
 
+  /// Mutator for flag indicating whether or not node is enabled.
   void enabled_state (RtecScheduler::RT_Info_Enabled_Type_t);
-  // Mutator for flag indicating whether or not node is enabled.
 
+  /// Accessor for effective period of corresponding RT_Info.
 /* WSOA merge - commented out
   RtecScheduler::Period_t effective_period ();
-  // Accessor for effective period of corresponding RT_Info.
 
+  /// Mutator for effective period of corresponding RT_Info.
   void effective_period (RtecScheduler::Period_t p);
-  // Mutator for effective period of corresponding RT_Info.
 
+  /// Accessor for effective execution time multiplier of corresponding
+  /// RT_Info.
   CORBA::Long effective_exec_multiplier ();
-  // Accessor for effective execution time multiplier of corresponding
-  // RT_Info.
 
+  /// Mutator for effective execution time multiplier of corresponding
+  /// RT_Info.
   void effective_exec_multiplier (CORBA::Long l);
-  // Mutator for effective execution time multiplier of corresponding
-  // RT_Info.
 */
 
 private:
 
+  /**
+   * Stores the values of operation characteristics as they were specified
+   * in the most recent call to the Reconfig_Scheduler's set () method.
+   * That way, the scheduler propagation pass can overwrite RT_Info fields
+   * without losing the original values.  This is useful when
+   */
   TAO_RT_Info_Ex orig_rt_info_data_;
-  // Stores the values of operation characteristics as they were specified
-  // in the most recent call to the Reconfig_Scheduler's set () method.
-  // That way, the scheduler propagation pass can overwrite RT_Info fields
-  // without losing the original values.  This is useful when
 
+  /// Points to the actual RT_Info to which the schedling entry corresponds.
   TAO_RT_Info_Ex *actual_rt_info_;
-  // Points to the actual RT_Info to which the schedling entry corresponds.
 
+  /// Forward depth-first-search status of the entry.
   DFS_Status fwd_dfs_status_;
-  // Forward depth-first-search status of the entry.
 
+  /// Reverse depth-first-search status of the entry.
   DFS_Status rev_dfs_status_;
-  // Reverse depth-first-search status of the entry.
 
+  /// Forward depth-first-search discovery order of the entry.
   long fwd_discovered_;
-  // Forward depth-first-search discovery order of the entry.
 
+  /// Reverse depth-first-search discovery order of the entry.
   long rev_discovered_;
-  // Reverse depth-first-search discovery order of the entry.
 
+  /// Forward depth-first-search completion order of the entry.
   long fwd_finished_;
-  // Forward depth-first-search completion order of the entry.
 
+  /// Reverse depth-first-search completion order of the entry.
   long rev_finished_;
-  // Reverse depth-first-search completion order of the entry.
 
+  /// Flag identifying threads in the call graph.
   int is_thread_delineator_;
-  // Flag identifying threads in the call graph.
 
+  /// Flag indicating whether or not there are unresolved remote
+  /// dependencies in the entry's dependency call chain.
   int has_unresolved_remote_dependencies_;
-  // Flag indicating whether or not there are unresolved remote
-  // dependencies in the entry's dependency call chain.
 
+  /// Flag indicating whether or not there are unresolved local
+  /// dependencies in the entry's dependency call chain.
   int has_unresolved_local_dependencies_;
-  // Flag indicating whether or not there are unresolved local
-  // dependencies in the entry's dependency call chain.
 
+  /// Effective execution time for corresponding RT_Info and its
+  /// disjunctively executed dependants.
   RtecScheduler::Time aggregate_exec_time_;
-  // Effective execution time for corresponding RT_Info and its
-  // disjunctively executed dependants.
 
+  /// Sum of periods for tuples directly associated with the entry.  It
+  /// can be used to compute the mean rate for the entry.
   RtecScheduler::Period_t orig_tuple_period_sum_;
-  // Sum of periods for tuples directly associated with the entry.  It
-  // can be used to compute the mean rate for the entry.
 
+  /**
+   * The sum of periods for tuples propagated via dependencies on
+   * other entries.  It can be used to compute the mean rate for the
+   * entry.
+   */
   RtecScheduler::Period_t prop_tuple_period_sum_;
-  // The sum of periods for tuples propagated via dependencies on
-  // other entries.  It can be used to compute the mean rate for the
-  // entry.
 
+  /// The number of tuples directly associated with the entry.
   u_int orig_tuple_count_;
-  // The number of tuples directly associated with the entry.
 
+  /// The number of tuples propagated via dependencies on other
+  /// entries.
   u_int prop_tuple_count_;
-  // The number of tuples propagated via dependencies on other
-  // entries.
 
+  /// The set of tuples directly associated with the entry.
   TUPLE_SET orig_tuple_subset_;
-  // The set of tuples directly associated with the entry.
 
+  /// The set of tuples propagated via dependencies on other entries.
   TUPLE_SET prop_tuple_subset_;
-  // The set of tuples propagated via dependencies on other entries.
 
+  /// A pointer to the entry's most recently admitted tuple.
   TAO_RT_Info_Tuple * current_admitted_tuple_;
-  // A pointer to the entry's most recently admitted tuple.
 
+  /// Flag indicating whether or not node is enabled.
   RtecScheduler::RT_Info_Enabled_Type_t enabled_;
-  // Flag indicating whether or not node is enabled.
 
+  /// Effective execution time multiplier for corresponding RT_Info.
   /* - WSOA merge - commented out
   CORBA::Long effective_exec_multiplier_;
-  // Effective execution time multiplier for corresponding RT_Info.
 
+  /// Effective period of corresponding RT_Info.
   RtecScheduler::Period_t effective_period_;
-  // Effective period of corresponding RT_Info.
   */
 };
 
 
+/**
+ * @class TAO_Reconfig_Sched_Entry_Visitor
+ *
+ * @brief An abstract base class for scheduler entry visitors.
+ *
+ * This class simplifies the reconfig scheduler implementation
+ * by giving a common interface for distinct visitors over the
+ * scheduling entries.
+ */
 class TAO_RTSched_Export TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   An abstract base class for scheduler entry visitors.
-  //
-  // = DESCRIPTION
-  //   This class simplifies the reconfig scheduler implementation
-  //   by giving a common interface for distinct visitors over the
-  //   scheduling entries.
 {
 public:
 
   /// Destructor.
   virtual ~TAO_Reconfig_Sched_Entry_Visitor (void);
 
+  /// Visit a Reconfig Scheduler Entry.
   virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0;
-  // Visit a Reconfig Scheduler Entry.
 
 };
 
@@ -410,67 +425,73 @@ class TAO_RTSched_Export TAO_RSE_Reset_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_Reset_Visitor ();
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_RSE_Reset_Visitor () {}
-  // Destructor.
 
+  /// Resets the fields in the entry to pre-DFS traversal states.
+  /// Returns 0 on success and -1 on error.
   virtual int visit (TAO_Reconfig_Scheduler_Entry &rse);
-  // Resets the fields in the entry to pre-DFS traversal states.
-  // Returns 0 on success and -1 on error.
 };
 
+/**
+ * @class TAO_RT_Info_Tuple_Visitor
+ *
+ * @brief An abstract base class for RT_Info tuple visitors.
+ *
+ * This class simplifies the reconfig scheduler implementation
+ * by giving a common interface for distinct visitors over the
+ * RT_Info tuples.
+ */
 class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor
-  // = TITLE
-  //   An abstract base class for RT_Info tuple visitors.
-  //
-  // = DESCRIPTION
-  //   This class simplifies the reconfig scheduler implementation
-  //   by giving a common interface for distinct visitors over the
-  //   RT_Info tuples.
 {
 public:
 
   /// Destructor.
   virtual ~TAO_RT_Info_Tuple_Visitor (void);
 
+  /// Visit a RT_Info tuple.
   virtual int visit (TAO_RT_Info_Tuple &) = 0;
-  // Visit a RT_Info tuple.
 
 };
 
+/**
+ * @class TAO_Reconfig_Sched_Strategy_Base
+ *
+ * @brief A base class for scheduling strategies
+ *
+ * function, a static subpriority comparison function, and a
+ * criticality evaluation function for all scheduling strategies.
+ */
 class TAO_RTSched_Export TAO_Reconfig_Sched_Strategy_Base
-  // = TITLE
-  //   A base class for scheduling strategies
-  //
-  // = DESCRIPTION This class provides a DFS finish time comparison
-  // function, a static subpriority comparison function, and a
-  // criticality evaluation function for all scheduling strategies.
 {
 public:
 
+  /// Ordering function to compare the DFS finish times of
+  /// two RT_Info_Tuples
   static int comp_tuple_finish_times (const void *first, const void *second);
-  // Ordering function to compare the DFS finish times of
-  // two RT_Info_Tuples
 
+  /**
+   * Ordering function to compare the DFS finish times of
+   * two task entries, so qsort orders these in topological
+   * order, with the higher times *first*.
+   */
   static int comp_entry_finish_times (const void *first, const void *second);
-  // Ordering function to compare the DFS finish times of
-  // two task entries, so qsort orders these in topological
-  // order, with the higher times *first*.
 
+  /// Determines whether or not an entry is critical, based on
+  /// operation characteristics.  returns 1 if critical, 0 if not
   static int is_critical (TAO_Reconfig_Scheduler_Entry &rse);
-  // Determines whether or not an entry is critical, based on
-  // operation characteristics.  returns 1 if critical, 0 if not
 
+  /// Determines whether or not a tuple is critical, based on operation
+  /// characteristics.  returns 1 if critical, 0 if not
   static int is_critical (TAO_RT_Info_Tuple &t);
-  // Determines whether or not a tuple is critical, based on operation
-  // characteristics.  returns 1 if critical, 0 if not
 
+  /// Compares two entries by subpriority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_subpriority (TAO_Reconfig_Scheduler_Entry &,
                                   TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by subpriority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 };
 
 class TAO_RTSched_Export TAO_MUF_FAIR_Reconfig_Sched_Strategy
@@ -491,37 +512,41 @@ class TAO_RTSched_Export TAO_MUF_FAIR_Reconfig_Sched_Strategy
 {
 public:
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total <priority, subpriority> ordering.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_priority_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total <priority, subpriority> ordering.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total ordering for admission control.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_admission_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total ordering for admission control.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /// Compares two entries by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_Reconfig_Scheduler_Entry &,
                                TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two tuples by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_RT_Info_Tuple &,
                                TAO_RT_Info_Tuple &);
-  // Compares two tuples by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two tuples by the given admission ordering.  Returns -1 if the
+  /// first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
   static int compare_admission_order (TAO_RT_Info_Tuple &,
                                       TAO_RT_Info_Tuple &);
-  // Compares two tuples by the given admission ordering.  Returns -1 if the
-  // first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
 
+  /// Fills in a static dispatch configuration for a priority level, based
+  /// on the operation characteristics of a representative scheduling entry.
   static int assign_config (RtecScheduler::Config_Info &,
                             TAO_Reconfig_Scheduler_Entry &);
-  // Fills in a static dispatch configuration for a priority level, based
-  // on the operation characteristics of a representative scheduling entry.
 };
 
 class TAO_RTSched_Export TAO_RMS_FAIR_Reconfig_Sched_Strategy
@@ -544,52 +569,56 @@ class TAO_RTSched_Export TAO_RMS_FAIR_Reconfig_Sched_Strategy
 {
 public:
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total <priority, subpriority> ordering.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_priority_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total <priority, subpriority> ordering.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total ordering for admission control.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_admission_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total ordering for admission control.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /// Compares two entries by criticality alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_criticality(TAO_Reconfig_Scheduler_Entry &lhs,
                                  TAO_Reconfig_Scheduler_Entry &rhs);
-  // Compares two entries by criticality alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by criticality alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_criticality(TAO_RT_Info_Tuple &lhs,
                                  TAO_RT_Info_Tuple &rhs);
-  // Compares two entries by criticality alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_Reconfig_Scheduler_Entry &,
                                TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two tuples by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_RT_Info_Tuple &,
                                TAO_RT_Info_Tuple &);
-  // Compares two tuples by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by admission ordering policy.  Returns -1 if the
+  /// first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
   static int compare_admission_order (TAO_RT_Info_Tuple &,
                                       TAO_RT_Info_Tuple &);
-  // Compares two entries by admission ordering policy.  Returns -1 if the
-  // first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
 
+  /// Compares two entries by subpriority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_subpriority (TAO_Reconfig_Scheduler_Entry &,
                                   TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by subpriority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Fills in a static dispatch configuration for a priority level, based
+  /// on the operation characteristics of a representative scheduling entry.
   static int assign_config (RtecScheduler::Config_Info &,
                             TAO_Reconfig_Scheduler_Entry &);
-  // Fills in a static dispatch configuration for a priority level, based
-  // on the operation characteristics of a representative scheduling entry.
 };
 
 class TAO_RTSched_Export TAO_RMS_MLF_Reconfig_Sched_Strategy
@@ -612,52 +641,56 @@ class TAO_RTSched_Export TAO_RMS_MLF_Reconfig_Sched_Strategy
 {
 public:
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total <priority, subpriority> ordering.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_priority_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total <priority, subpriority> ordering.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /**
+   * Ordering function used to qsort an array of RT_Info_Tuple
+   * pointers into a total ordering for admission control.  Returns
+   * -1 if the first one is higher, 0 if they're the same, and 1 if
+   * the second one is higher.
+   */
   static int total_admission_comp (const void *, const void *);
-  // Ordering function used to qsort an array of RT_Info_Tuple
-  // pointers into a total ordering for admission control.  Returns
-  // -1 if the first one is higher, 0 if they're the same, and 1 if
-  // the second one is higher.
 
+  /// Compares two entries by criticality alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_criticality(TAO_Reconfig_Scheduler_Entry &lhs,
                                  TAO_Reconfig_Scheduler_Entry &rhs);
-  // Compares two entries by criticality alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by criticality alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_criticality(TAO_RT_Info_Tuple &lhs,
                                  TAO_RT_Info_Tuple &rhs);
-  // Compares two entries by criticality alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_Reconfig_Scheduler_Entry &,
                                TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two tuples by priority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_priority (TAO_RT_Info_Tuple &,
                                TAO_RT_Info_Tuple &);
-  // Compares two tuples by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Compares two entries by admission ordering policy.  Returns -1 if the
+  /// first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
   static int compare_admission_order (TAO_RT_Info_Tuple &,
                                       TAO_RT_Info_Tuple &);
-  // Compares two entries by admission ordering policy.  Returns -1 if the
-  // first one is earlier, 0 if they're the same, and 1 if the second one is earlier.
 
+  /// Compares two entries by subpriority alone.  Returns -1 if the
+  /// first one is higher, 0 if they're the same, and 1 if the second one is higher.
   static int compare_subpriority (TAO_Reconfig_Scheduler_Entry &,
                                   TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by subpriority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
+  /// Fills in a static dispatch configuration for a priority level, based
+  /// on the operation characteristics of a representative scheduling entry.
   static int assign_config (RtecScheduler::Config_Info &,
                             TAO_Reconfig_Scheduler_Entry &);
-  // Fills in a static dispatch configuration for a priority level, based
-  // on the operation characteristics of a representative scheduling entry.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 10339b99215..e569fc31923 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -1,19 +1,12 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils_T.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+/**
+ *  @file    Reconfig_Sched_Utils_T.cpp
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP
 #define TAO_RECONFIG_SCHED_UTILS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index c6867cff861..b6f388e2af1 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_Utils_T.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Reconfig_Sched_Utils_T.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHED_UTILS_T_H
 #define TAO_RECONFIG_SCHED_UTILS_T_H
@@ -46,63 +43,67 @@ class TAO_RSE_Dependency_Visitor :
 {
 public:
 
+  /// Type of map used for O(1) lookup of RT_Info
+  /// dependency sets by caller or called handle.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
                                   RtecScheduler::Dependency_Set*,
                                   ACE_Hash<RtecScheduler::handle_t>,
                                   ACE_Equal_To<RtecScheduler::handle_t>,
                                   ACE_LOCK> DEPENDENCY_SET_MAP;
-  // Type of map used for O(1) lookup of RT_Info
-  // dependency sets by caller or called handle.
 
+  /// Type of map used for O(1) lookup of RT_Infos by their handles.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
                                   TAO_RT_Info_Ex*,
                                   ACE_Hash<RtecScheduler::handle_t>,
                                   ACE_Equal_To<RtecScheduler::handle_t>,
                                   ACE_LOCK> RT_INFO_MAP;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
 
+  /// Constructor.
   TAO_RSE_Dependency_Visitor
     (DEPENDENCY_SET_MAP & dependency_map,
      RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
+  /// Visit a Reconfig Scheduler Entry.  This method calls
   virtual int visit (TAO_Reconfig_Scheduler_Entry &);
-  // Visit a Reconfig Scheduler Entry.  This method calls
   // protected hook methods that can be overridden by
   // derived classes, according to the Template Method
   // design pattern.
 
 protected:
+  /**
+   * Performs an unconditional action when the entry is first reached.
+   * Returns 0 for success, and -1 if an error occurred.
+   * Tests whether or not any conditional actions should be taken for
+   * the entry.  Returns 0 if the actions should be applied, 1 if the
+   * entry should be left alone, and -1 if an error occurred.
+   */
   /* WSOA merge - commented out
   virtual int unconditional_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an unconditional action when the entry is first reached.
-  // Returns 0 for success, and -1 if an error occurred.
   */
   virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Tests whether or not any conditional actions should be taken for
-  // the entry.  Returns 0 if the actions should be applied, 1 if the
-  // entry should be left alone, and -1 if an error occurred.
 
+  /// Performs an action on the entry prior to visiting any of
+  /// its successors.  Returns 0 on success and -1 on error.
   virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an action on the entry prior to visiting any of
-  // its successors.  Returns 0 on success and -1 on error.
 
+  /**
+   * Performs an action on a successor entry prior to visiting
+   * it.  Returns 0 if the successor should be visited recursively,
+   * 1 if the successor should not be visited, and -1 on error.
+   */
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Performs an action on a successor entry prior to visiting
-  // it.  Returns 0 if the successor should be visited recursively,
-  // 1 if the successor should not be visited, and -1 on error.
 
+  /// Performs an action on the entry after visiting all of
+  /// its successors.  Returns 0 on success and -1 on error.
   virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an action on the entry after visiting all of
-  // its successors.  Returns 0 on success and -1 on error.
 
+  /// Map of dependencies between RT_Info handles.
   DEPENDENCY_SET_MAP & dependency_map_;
-  // Map of dependencies between RT_Info handles.
 
+  /// Map of handles into RT_Infos.
   RT_INFO_MAP & rt_info_map_;
-  // Map of handles into RT_Infos.
 
 };
 
@@ -121,36 +122,42 @@ class TAO_RSE_DFS_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_DFS_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
 protected:
+  /**
+   * Makes sure the entry has not previously been visited in forward DFS.
+   * Returns 0 if the actions should be applied, 1 if the entry
+   * should be left alone, and -1 if an error occurred.
+   */
   virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Makes sure the entry has not previously been visited in forward DFS.
-  // Returns 0 if the actions should be applied, 1 if the entry
-  // should be left alone, and -1 if an error occurred.
 
+  /**
+   * Marks entry as forward visited and sets its forward DFS start
+   * time, prior to visiting any of its successors.  Returns 0 on
+   * success and -1 on error.
+   */
   virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks entry as forward visited and sets its forward DFS start
-  // time, prior to visiting any of its successors.  Returns 0 on
-  // success and -1 on error.
 
+  /// Marks whether or not successor is a thread delineator prior to
+  /// visiting it.  Returns 0 on success and -1 on error.
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Marks whether or not successor is a thread delineator prior to
-  // visiting it.  Returns 0 on success and -1 on error.
 
+  /**
+   * Marks entry as forward finished and sets its forward DFS finish
+   * time, after all of its successors have been visited.  Returns 0
+   * on success and -1 on error.
+   */
   virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks entry as forward finished and sets its forward DFS finish
-  // time, after all of its successors have been visited.  Returns 0
-  // on success and -1 on error.
 
 private:
+  /// Keeps track of DFS start and finish times.
   int DFS_time_;
-  // Keeps track of DFS start and finish times.
 
 };
 
@@ -168,67 +175,77 @@ class TAO_RSE_SCC_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_SCC_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
+  /// Accessor for number of cycles detected in traversal.
   int number_of_cycles (void);
-  // Accessor for number of cycles detected in traversal.
 
+  /// Accessor for whether or not the recursion is within a previously
+  /// detected cycle.
   int in_a_cycle (void);
-  // Accessor for whether or not the recursion is within a previously
-  // detected cycle.
 
+  /// Mutator for whether or not the recursion is within a previously
+  /// detected cycle.
   void in_a_cycle (int);
-  // Mutator for whether or not the recursion is within a previously
-  // detected cycle.
 
 protected:
+  /**
+   * If the entry is a thread delineator, sets its effective period and
+   * execution multiplier from the values in its corresponding RT_Info.
+   * Returns 0 for success, and -1 if an error occurred.
+   */
   /* WSOA merge - commented out
   virtual int unconditional_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // If the entry is a thread delineator, sets its effective period and
-  // execution multiplier from the values in its corresponding RT_Info.
-  // Returns 0 for success, and -1 if an error occurred.
   */
 
+  /**
+   * Makes sure the entry has not previously been visited in the
+   * reverse DFS (call graph transpose) direction.  Returns 0 if
+   * the actions should be applied, 1 if the entry should be left
+   * alone, and -1 if an error occurred.
+   */
   virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Makes sure the entry has not previously been visited in the
-  // reverse DFS (call graph transpose) direction.  Returns 0 if
-  // the actions should be applied, 1 if the entry should be left
-  // alone, and -1 if an error occurred.
 
+  /**
+   * Marks reverse status as visited and sets reverse start time for
+   * entry, prior to visiting any of its successors.  Returns 0 on
+   * success and -1 on error.
+   */
   virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks reverse status as visited and sets reverse start time for
-  // entry, prior to visiting any of its successors.  Returns 0 on
-  // success and -1 on error.
 
+  /**
+   * Checks reverse status of each successor.  For any that have not
+   * been previously visited, it complains about the entry and
+   * successor being part of a cycle, stores the fact that a cycle was
+   * detected, and maintains a count of the total number of cycles
+   * (strongly connected components).  Returns 0 on success and -1 on
+   * an error (finding a cycle is not considered an error, at least as
+   * far as this method is concerned).
+   */
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Checks reverse status of each successor.  For any that have not
-  // been previously visited, it complains about the entry and
-  // successor being part of a cycle, stores the fact that a cycle was
-  // detected, and maintains a count of the total number of cycles
-  // (strongly connected components).  Returns 0 on success and -1 on
-  // an error (finding a cycle is not considered an error, at least as
-  // far as this method is concerned).
 
+  /**
+   * Sets the entry's reverse finish time and marks it as finished in
+   * the reverse DFS traversal, after visiting all of its successors.
+   * Returns 0 on success and -1 on error.
+   */
   virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Sets the entry's reverse finish time and marks it as finished in
-  // the reverse DFS traversal, after visiting all of its successors.
-  // Returns 0 on success and -1 on error.
 
 private:
+  /// Keeps track of DFS start and finish times.
   int DFS_time_;
-  // Keeps track of DFS start and finish times.
 
+  /// Keeps track of DFS start and finish times.
   int number_of_cycles_;
-  // Keeps track of DFS start and finish times.
 
+  /// Indicates whether or not the recursion is
+  /// currently within a previously discovered cycle.
   int in_a_cycle_;
-  // Indicates whether or not the recursion is
-  // currently within a previously discovered cycle.
 };
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
@@ -245,19 +262,21 @@ class TAO_RSE_Reverse_Propagation_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_Reverse_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
 protected:
 
+  /**
+   * Propagates aggregate execution time from successor to calling
+   * entry.  Returns 1 on success (to prevent recursion on the
+   * successor), and -1 on error.
+   */
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Propagates aggregate execution time from successor to calling
-  // entry.  Returns 1 on success (to prevent recursion on the
-  // successor), and -1 on error.
 
 };
 
@@ -276,54 +295,58 @@ class TAO_RSE_Forward_Propagation_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_Forward_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
+  /// Accessor for number of nodes with unresolved local dependencies.
   int unresolved_locals (void);
-  // Accessor for number of nodes with unresolved local dependencies.
 
+  /// Mutator for numberof nodes with unresolved local dependencies.
   void unresolved_locals (int);
-  // Mutator for numberof nodes with unresolved local dependencies.
 
+  /// Accessor for number of nodes with unresolved remote dependencies.
   int unresolved_remotes (void);
-  // Accessor for number of nodes with unresolved remote dependencies.
 
+  /// Mutator for number of nodes with unresolved remote dependencies.
   void unresolved_remotes (int);
-  // Mutator for number of nodes with unresolved remote dependencies.
 
+  /// Accessor for number of nodes with thread specification errors.
   int thread_specification_errors (void);
-  // Accessor for number of nodes with thread specification errors.
 
+  /// Mutator for number of nodes with thread specification errors.
   void thread_specification_errors (int);
-  // Mutator for number of nodes with thread specification errors.
 
 protected:
+  /**
+   * Tests the entry for possibly having unresolved remote or local
+   * dependencies prior to visiting any of its successors.  Returns 0
+   * on success and -1 on error (having unresolved remote or local
+   * dependencies is not considered an error, at least for this
+   * method).
+   */
   virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Tests the entry for possibly having unresolved remote or local
-  // dependencies prior to visiting any of its successors.  Returns 0
-  // on success and -1 on error (having unresolved remote or local
-  // dependencies is not considered an error, at least for this
-  // method).
 
+  /**
+   * Propagates effective period and execution time multiplier from
+   * entry to successor prior to visiting successor.  Returns 1 on
+   * success (to prevent recursion on the successor), and -1 on error.
+   */
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Propagates effective period and execution time multiplier from
-  // entry to successor prior to visiting successor.  Returns 1 on
-  // success (to prevent recursion on the successor), and -1 on error.
 
 private:
 
+  /// Number of nodes with unresolved local dependencies.
   int unresolved_locals_;
-  // Number of nodes with unresolved local dependencies.
 
+  /// Number of nodes with unresolved remote dependencies.
   int unresolved_remotes_;
-  // Number of nodes with unresolved remote dependencies.
 
+  /// Number of nodes with thread specification errors.
   int thread_specification_errors_;
-  // Number of nodes with thread specification errors.
 };
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
@@ -340,44 +363,48 @@ class TAO_RSE_Priority_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles,
                             TAO_Reconfig_Scheduler_Entry ** entry_ptr_array);
-  // Constructor.
 
+  /**
+   * Visit a RT_Info tuple.  This method assigns a priority and
+   * subpriority value to each tuple.  Priorities are assigned in
+   * increasing value order, with lower numbers corresponding to
+   * higher priorities.  Returns -1 on error, 1 if a new priority was
+   * assigned, or 0 otherwise.
+   */
     virtual int visit (TAO_Reconfig_Scheduler_Entry &);
-  // Visit a RT_Info tuple.  This method assigns a priority and
-  // subpriority value to each tuple.  Priorities are assigned in
-  // increasing value order, with lower numbers corresponding to
-  // higher priorities.  Returns -1 on error, 1 if a new priority was
-  // assigned, or 0 otherwise.
 
+  /**
+   * Finishes tuple priority assignment by iterating over the
+   * remaining tuples in the last subpriority level, and adjusting
+   * their subpriorities.
+   */
   int finish ();
-  // Finishes tuple priority assignment by iterating over the
-  // remaining tuples in the last subpriority level, and adjusting
-  // their subpriorities.
 
 private:
 
+  /// Pointer to previous tuple in the iteration.
   TAO_Reconfig_Scheduler_Entry *previous_entry_;
-  // Pointer to previous tuple in the iteration.
 
+  /// Pointer to first subpriority tuple in the priority level.
   TAO_Reconfig_Scheduler_Entry **first_subpriority_entry_;
-  // Pointer to first subpriority tuple in the priority level.
 
+  /// Current priority value.
   RtecScheduler::Preemption_Priority_t priority_;
-  // Current priority value.
 
+  /// Current subpriority value.
   RtecScheduler::Preemption_Subpriority_t subpriority_;
-  // Current subpriority value.
 
+  /// Current OS (thread) priority value.
   RtecScheduler::OS_Priority os_priority_;
-  // Current OS (thread) priority value.
 
+  /// Number of handles in the entry pointer array.
   RtecScheduler::handle_t handles_;
-  // Number of handles in the entry pointer array.
 
+  /// An array of pointers to entries we will be visiting.
   TAO_Reconfig_Scheduler_Entry ** entry_ptr_array_;
-  // An array of pointers to entries we will be visiting.
 };
 
 template <class RECONFIG_SCHED_STRATEGY>
@@ -397,53 +424,55 @@ class TAO_Tuple_Admission_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshold,
                                const CORBA::Double & noncritical_utilization_threshold);
-  // Constructor.
 
+  /**
+   * Visit an RT_Info tuple.  This method determines the utilization by
+   * the tuple, and if it's admissible, updates its RT_Info and either
+   * the critical or non-critical utilization, depending on whether or
+   * not the strategy says the operation is critical.
+   */
     virtual int visit (TAO_RT_Info_Tuple &);
-  // Visit an RT_Info tuple.  This method determines the utilization by
-  // the tuple, and if it's admissible, updates its RT_Info and either
-  // the critical or non-critical utilization, depending on whether or
-  // not the strategy says the operation is critical.
 
+  /// Accessor for utilization by critical operations.
   CORBA::Double critical_utilization ();
-  // Accessor for utilization by critical operations.
 
+  /// Accessor for utilization by noncritical operations.
   CORBA::Double noncritical_utilization ();
-  // Accessor for utilization by noncritical operations.
 
+  /// Accessor for utilization by critical operations.
   CORBA::Double critical_utilization_threshold ();
-  // Accessor for utilization by critical operations.
 
+  /// Accessor for utilization by noncritical operations.
   CORBA::Double noncritical_utilization_threshold ();
-  // Accessor for utilization by noncritical operations.
 
+  /// Accessor for utilization by critical operations.
   CORBA::Double total_critical_utilization ();
-  // Accessor for utilization by critical operations.
 
+  /// Accessor for utilization by noncritical operations.
   CORBA::Double total_noncritical_utilization ();
-  // Accessor for utilization by noncritical operations.
 
 private:
 
+  /// Utilization by critical operations.
   CORBA::Double critical_utilization_;
-  // Utilization by critical operations.
 
+  /// Utilization by noncritical operations.
   CORBA::Double noncritical_utilization_;
-  // Utilization by noncritical operations.
 
+  /// Utilization by critical operations.
   CORBA::Double total_critical_utilization_;
-  // Utilization by critical operations.
 
+  /// Utilization by noncritical operations.
   CORBA::Double total_noncritical_utilization_;
-  // Utilization by noncritical operations.
 
+  /// Utilization by critical operations.
   CORBA::Double critical_utilization_threshold_;
-  // Utilization by critical operations.
 
+  /// Utilization by noncritical operations.
   CORBA::Double noncritical_utilization_threshold_;
-  // Utilization by noncritical operations.
 };
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
@@ -460,19 +489,21 @@ class TAO_RSE_Criticality_Propagation_Visitor :
 {
 public:
 
+  /// Constructor.
   TAO_RSE_Criticality_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
 
 protected:
 
+  /**
+   * Propagates criticality from successor to calling
+   * entry.  Returns 1 on success (to prevent recursion on the
+   * successor), and -1 on error.
+   */
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-  // Propagates criticality from successor to calling
-  // entry.  Returns 1 on success (to prevent recursion on the
-  // successor), and -1 on error.
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 1734634a104..92f34ca7dba 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Reconfig_Scheduler.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHEDULER_H
 #define TAO_RECONFIG_SCHEDULER_H
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index fead117c9f7..bce9369b554 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -1,19 +1,13 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Reconfig_Scheduler_T.cpp
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHEDULER_T_C
 #define TAO_RECONFIG_SCHEDULER_T_C
@@ -167,11 +161,6 @@ init (int config_count,
       int dependency_count,
       ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
       u_long stability_flags)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -228,11 +217,11 @@ init (int config_count,
         {
           case -1:
             // Something bad but unknown occurred while trying to bind in map.
-            ACE_THROW_RETURN (RtecScheduler::INTERNAL (), -1);
+            throw RtecScheduler::INTERNAL ();
 
           case 1:
             // Tried to bind an operation that was already in the map.
-            ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), -1);
+            throw RtecScheduler::DUPLICATE_NAME ();
 
           default:
             break;
@@ -269,7 +258,7 @@ init (int config_count,
 
       if (new_rt_info == 0)
         {
-          ACE_THROW_RETURN (RtecScheduler::INTERNAL (), -1);
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Set the new info's enabled state
@@ -320,10 +309,6 @@ init (int config_count,
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -439,10 +424,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create (const char *entry_point)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -470,9 +451,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 lookup (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -495,9 +473,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get (RtecScheduler::handle_t handle)
-     ACE_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -511,7 +486,7 @@ get (RtecScheduler::handle_t handle)
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_map_.find (handle, rt_info) != 0)
     {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0);
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   // Allocate a new RT_Info
@@ -541,10 +516,6 @@ set (::RtecScheduler::handle_t handle,
      ::RtecScheduler::Quantum_t quantum,
      ::RtecScheduler::Threads_t threads,
      ::RtecScheduler::Info_Type_t info_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -601,10 +572,6 @@ reset (RtecScheduler::handle_t handle,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
        RtecScheduler::Info_Type_t info_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -664,10 +631,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -742,10 +705,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 reset_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -843,10 +802,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 replace_seq (const RtecScheduler::RT_Info_Set& infos)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -967,10 +922,6 @@ priority (RtecScheduler::handle_t handle,
           RtecScheduler::OS_Priority& o_priority,
           RtecScheduler::Preemption_Subpriority_t& subpriority,
           RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::NOT_SCHEDULED))
 {
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
@@ -1008,10 +959,6 @@ entry_point_priority (const char * entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
                       RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::NOT_SCHEDULED))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1040,9 +987,6 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
                 RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                 CORBA::Long number_of_calls,
                 RtecScheduler::Dependency_Type_t dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1072,9 +1016,6 @@ remove_dependency (RtecScheduler::handle_t handle,
                    RtecScheduler::handle_t dependency,
                    CORBA::Long number_of_calls,
                    RtecScheduler::Dependency_Type_t dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1104,9 +1045,6 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
                              CORBA::Long number_of_calls,
                              RtecScheduler::Dependency_Type_t dependency_type,
                              RtecScheduler::Dependency_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1128,9 +1066,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1159,10 +1094,6 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_rt_info_enable_state (RtecScheduler::handle_t handle,
                           RtecScheduler::RT_Info_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1195,10 +1126,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1242,13 +1169,6 @@ compute_scheduling (CORBA::Long minimum_priority,
                     RtecScheduler::Dependency_Set_out dependencies,
                     RtecScheduler::Config_Info_Set_out configs,
                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::DUPLICATE_NAME))
 {
   // Delegates to recompute_scheduling and the respective accessors.
   this->recompute_scheduling (minimum_priority, maximum_priority,
@@ -1279,13 +1199,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 recompute_scheduling (CORBA::Long /* minimum_priority */,
                       CORBA::Long /* maximum_priority */,
                       RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME))
 {
 #if defined (SCHEDULER_LOGGING)
    ACE_DEBUG ((LM_TRACE,
@@ -1438,9 +1351,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // return the set of scheduled RT_Infos
 
@@ -1473,9 +1383,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // Return the set of dependencies: just need to iterate over one of the maps.
 
@@ -1517,9 +1424,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
 {
   // Return the set of scheduled Config_Infos.
 
@@ -1554,10 +1458,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                         RtecScheduler::OS_Priority& t_priority,
                         RtecScheduler::Dispatching_Type_t & d_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::NOT_SCHEDULED,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1594,9 +1494,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1610,8 +1507,7 @@ last_scheduled_priority (void)
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED (),
-                        (RtecScheduler::Preemption_Priority_t) -1);
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   return last_scheduled_priority_;
@@ -1623,9 +1519,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get_config_infos (RtecScheduler::Config_Info_Set_out configs)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   RtecScheduler::SYNCHRONIZATION_FAILURE,
-		   RtecScheduler::NOT_SCHEDULED))
 {
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
@@ -1669,9 +1562,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create_i (const char *entry_point,
           RtecScheduler::handle_t handle,
           int ignore_duplicates)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1708,19 +1598,19 @@ create_i (const char *entry_point,
     {
       case -1:
         // Something bad but unknown occurred while trying to bind in map.
-        ACE_THROW_RETURN (RtecScheduler::INTERNAL (), 0);
+        throw RtecScheduler::INTERNAL ();
 
       case 1:
         // Tried to bind an operation that was already in the map.
         if (ignore_duplicates)
           {
             // Should never get here unless something is badly awry.
-            ACE_THROW_RETURN (RtecScheduler::INTERNAL (), 0);
+            throw RtecScheduler::INTERNAL ();
           }
         else
           {
             // Already bound, and we're not ignoring duplicates.
-        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), 0);
+        throw RtecScheduler::DUPLICATE_NAME ();
           }
 
       default:
@@ -1734,12 +1624,12 @@ create_i (const char *entry_point,
       case -1:
         // Something bad but unknown occurred while trying to bind in tree.
         rt_info_map_.unbind (handle);
-        ACE_THROW_RETURN (RtecScheduler::INTERNAL (), 0);
+        throw RtecScheduler::INTERNAL ();
 
       case 1:
         // Tried to bind an operation that was already in the tree.
         rt_info_map_.unbind (handle);
-        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), 0);
+        throw RtecScheduler::DUPLICATE_NAME ();
 
       default:
         break;
@@ -1799,8 +1689,6 @@ set_i (TAO_RT_Info_Ex *rt_info,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
        RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1892,8 +1780,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 lookup_i (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -1903,7 +1789,7 @@ lookup_i (const char * entry_point)
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_tree_.find (entry_point, rt_info) != 0)
     {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0);
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   return rt_info->handle;
@@ -1919,9 +1805,6 @@ priority_i (RtecScheduler::handle_t handle,
             RtecScheduler::OS_Priority& o_priority,
             RtecScheduler::Preemption_Subpriority_t& subpriority,
             RtecScheduler::Preemption_Priority_t& p_priority)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
 {
   // Check stability flags.
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1951,9 +1834,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
                   RtecScheduler::Dependency_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2048,10 +1928,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
                      RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                      CORBA::Long number_of_calls,
                      RtecScheduler::Dependency_Type_t dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2123,10 +1999,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                RtecScheduler::Dependency_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2201,9 +2073,6 @@ map_dependency_i (RtecScheduler::handle_t key,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
                   RtecScheduler::Dependency_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2248,9 +2117,6 @@ unmap_dependency_i (RtecScheduler::handle_t key,
                     typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                     CORBA::Long number_of_calls,
                     RtecScheduler::Dependency_Type_t dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2317,9 +2183,6 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2373,8 +2236,6 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dfs_traverse_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2413,9 +2274,6 @@ dfs_traverse_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 detect_cycles_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::CYCLIC_DEPENDENCIES))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2460,9 +2318,6 @@ detect_cycles_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 perform_admission_i (void)
-     ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2523,8 +2378,6 @@ perform_admission_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 crit_dfs_traverse_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2559,8 +2412,6 @@ crit_dfs_traverse_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 propagate_criticalities_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2603,10 +2454,6 @@ propagate_criticalities_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 propagate_characteristics_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
-                      RtecScheduler::THREAD_SPECIFICATION))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2646,9 +2493,6 @@ propagate_characteristics_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 assign_priorities_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::DUPLICATE_NAME))
 {
   int i;
 #if defined (SCHEDULER_LOGGING)
@@ -2793,8 +2637,6 @@ assign_priorities_i (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 refresh_tuple_ptr_array_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -2977,7 +2819,6 @@ template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
                            RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (current_ptr_array_size <= handle)
     {
@@ -3024,8 +2865,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 compute_utilization_i (void)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
 {
   TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY> util_visitor;
   for (int i = 0; i < this->rt_info_count_; ++i)
@@ -3048,7 +2887,6 @@ compute_utilization_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecScheduler::RT_Info &rt_info)
-     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Set some reasonable default values.
   rt_info.criticality = RtecScheduler::VERY_LOW_CRITICALITY;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 4c914f8fe37..e2f403c0eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -1,18 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Reconfig_Scheduler_T.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_RECONFIG_SCHEDULER_T_H
 #define TAO_RECONFIG_SCHEDULER_T_H
@@ -48,43 +45,45 @@ class TAO_Reconfig_Scheduler :
 {
 public:
 
+  /// Type of map used for O(1) lookup of RT_Infos by their handles.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
 	                          TAO_RT_Info_Ex *,
                                   ACE_Hash<RtecScheduler::handle_t>,
                                   ACE_Equal_To<RtecScheduler::handle_t>,
                                   ACE_LOCK> RT_INFO_MAP;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
 
+  /// Type of tree used for O(log n) lookup of RT_Infos by their names.
   typedef ACE_RB_Tree<const char *,
                       TAO_RT_Info_Ex*,
                       ACE_Less_Than<const char *>,
                       ACE_LOCK> RT_INFO_TREE;
-  // Type of tree used for O(log n) lookup of RT_Infos by their names.
 
+  /// Type of map used for O(1) lookup of Config_Infos by their priorities.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Preemption_Priority_t,
                                   RtecScheduler::Config_Info*,
                                   ACE_Hash<RtecScheduler::Preemption_Priority_t>,
                                   ACE_Equal_To<RtecScheduler::Preemption_Priority_t>,
                                   ACE_LOCK> CONFIG_INFO_MAP;
-  // Type of map used for O(1) lookup of Config_Infos by their priorities.
 
+  /// Type of map used for O(1) lookup of RT_Info
+  /// dependency sets by caller or called handle.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
                                   RtecScheduler::Dependency_Set*,
                                   ACE_Hash<RtecScheduler::handle_t>,
                                   ACE_Equal_To<RtecScheduler::handle_t>,
                                   ACE_LOCK> DEPENDENCY_SET_MAP;
-  // Type of map used for O(1) lookup of RT_Info
-  // dependency sets by caller or called handle.
 
+  /// Type of iterator for traversal of RT_Info dependency sets by
+  /// caller or called handle.
   typedef typename DEPENDENCY_SET_MAP::ITERATOR DEPENDENCY_SET_MAP_ITERATOR;
-  // Type of iterator for traversal of RT_Info dependency sets by
-  // caller or called handle.
 
+  /// Default constructor.
   TAO_Reconfig_Scheduler (int enforce_schedule_stability = 0,
                           const CORBA::Double & critical_utilization_threshold = 1.0,
                           const CORBA::Double & noncritical_utilization_threshold = 1.1);
-  // Default constructor.
 
+  /// Constructor. Initialize the scheduler from POD_Config_Info, POD_RT_Info,
+  /// and POD_Dependency arrays, plus schedule stability flags.
   TAO_Reconfig_Scheduler (int config_count,
                           ACE_Scheduler_Factory::POD_Config_Info config_info[],
                           int entry_count,
@@ -95,56 +94,38 @@ public:
                           int enforce_schedule_stability = 0,
                           const CORBA::Double & critical_utilization_threshold = 1.0,
                           const CORBA::Double & noncritical_utilization_threshold = 1.1);
-  // Constructor. Initialize the scheduler from POD_Config_Info, POD_RT_Info,
-  // and POD_Dependency arrays, plus schedule stability flags.
 
+  /// Destructor.
   ~TAO_Reconfig_Scheduler ();
-  // Destructor.
 
+  /// Initializes the scheduler with the passed information.
   int init (int config_count,
             ACE_Scheduler_Factory::POD_Config_Info config_info[],
             int rt_info_count,
             ACE_Scheduler_Factory::POD_RT_Info rt_info[],
             int dependency_count,
             ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            u_long stability_flags)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Initializes the scheduler with the passed information.
-
-  void close (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Closes the scheduler, releasing all current resources.
-
-  virtual RtecScheduler::handle_t create (const char * entry_point)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Create an RT_Info.  If it does not exist, a new RT_Info is
-  // created and inserted into the schedule, and the handle of the new
-  // RT_Info is returned.  If the RT_Info already exists, an exception
-  // is thrown.
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point)
-    ACE_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UNKNOWN_TASK,
-                    RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Lookup a handle for an RT_Info, and return its handle, or an error
-  // value if it's not present.
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Return a pointer to the RT_Info corresponding to the passed handle.
+            u_long stability_flags);
+
+  /// Closes the scheduler, releasing all current resources.
+  void close (void);
+
+  /**
+   * Create an RT_Info.  If it does not exist, a new RT_Info is
+   * created and inserted into the schedule, and the handle of the new
+   * RT_Info is returned.  If the RT_Info already exists, an exception
+   * is thrown.
+   */
+  virtual RtecScheduler::handle_t create (const char * entry_point);
 
+  /// Lookup a handle for an RT_Info, and return its handle, or an error
+  /// value if it's not present.
+  virtual RtecScheduler::handle_t lookup (const char * entry_point);
+
+  /// Return a pointer to the RT_Info corresponding to the passed handle.
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle);
+
+  /// Set characteristics of the RT_Info corresponding to the passed handle.
   virtual void set (::RtecScheduler::handle_t handle,
                     ::RtecScheduler::Criticality_t criticality,
                     ::RtecScheduler::Time time,
@@ -154,13 +135,9 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Set characteristics of the RT_Info corresponding to the passed handle.
+                    ::RtecScheduler::Info_Type_t info_type);
 
+  /// Reset characteristics of the RT_Info corresponding to the passed handle.
   virtual void reset (RtecScheduler::handle_t handle,
                       RtecScheduler::Criticality_t criticality,
                       RtecScheduler::Time time,
@@ -170,239 +147,167 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Reset characteristics of the RT_Info corresponding to the passed handle.
-
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Set characteristics of the RT_Infos corresponding to the passed handles.
-  // Tuples are added in the case of existing and/or multiple definitions.
-
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Reset characteristics of the RT_Infos corresponding to the passed handles.
-  // Tuples are replaced in the case of existing and/or multiple definitions.
-
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Replace all RT_Infos, resetting characteristics of the RT_Infos
-  // corresponding to the passed handles.  All other RT_Infos are
-  // reset to their uninitialized values, i.e., the same they have
-  // just after the create call.
-
+                      RtecScheduler::Info_Type_t info_type);
+
+  /// Set characteristics of the RT_Infos corresponding to the passed handles.
+  /// Tuples are added in the case of existing and/or multiple definitions.
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos);
+
+  /// Reset characteristics of the RT_Infos corresponding to the passed handles.
+  /// Tuples are replaced in the case of existing and/or multiple definitions.
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos);
+
+  /**
+   * Replace all RT_Infos, resetting characteristics of the RT_Infos
+   * corresponding to the passed handles.  All other RT_Infos are
+   * reset to their uninitialized values, i.e., the same they have
+   * just after the create call.
+   */
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos);
+
+  /// Returns the priority and subpriority values assigned to an RT_Info,
+  /// based on its handle.
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its handle.
+                         RtecScheduler::Preemption_Priority_t& p_priority);
 
+  /// Returns the priority and subpriority values assigned to an RT_Info,
+  /// based on its entry point name.
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its entry point name.
+                                     RtecScheduler::Preemption_Priority_t& p_priority);
 
+  /// This method registers a dependency between two RT_Infos.
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method registers a dependency between two RT_Infos.
+                               RtecScheduler::Dependency_Type_t dependency_type);
 
+  /// This method removes a dependency between two RT_Infos.
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method removes a dependency between two RT_Infos.
+                                  RtecScheduler::Dependency_Type_t dependency_type);
 
+  /// This method sets the enable state of a dependency between two RT_Infos.
   virtual void set_dependency_enable_state (RtecScheduler::handle_t handle,
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method sets the enable state of a dependency between two RT_Infos.
-
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method sets the enable state of a sequence of dependencies.
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled);
 
+  /// This method sets the enable state of a sequence of dependencies.
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies);
+
+  /// This method enables or disables an RT_Info.
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method enables or disables an RT_Info.
-
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method enables or disables a sequence of RT_Infos.
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled);
+
+  /// This method enables or disables a sequence of RT_Infos.
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set);
 
+  /**
+   * If information has been added or changed since the last stable
+   * schedule was computed, this method causes scheduling information
+   * to be computed for all registered RT_Infos.  If the schedule is
+   * already stable, this is a no-op.
+   */
   virtual void compute_scheduling (CORBA::Long minimum_priority,
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // If information has been added or changed since the last stable
-  // schedule was computed, this method causes scheduling information
-  // to be computed for all registered RT_Infos.  If the schedule is
-  // already stable, this is a no-op.
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
 
+  /// Recomputes the scheduling priorities, etc.
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Recomputes the scheduling priorities, etc.
-
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of rt_infos, with their assigned priorities (as
-  // of the last schedule re-computation).
-
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of rt_infos, with their assigned priorities (as
-  // of the last schedule re-computation).
-
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Returns the set of config_infos, describing the appropriate
-  // number, types, and priority levels for the dispatching lanes.
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies);
+
+  /// Returns the set of rt_infos, with their assigned priorities (as
+  /// of the last schedule re-computation).
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos);
 
+  /// Returns the set of rt_infos, with their assigned priorities (as
+  /// of the last schedule re-computation).
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies);
 
+  /// Returns the set of config_infos, describing the appropriate
+  /// number, types, and priority levels for the dispatching lanes.
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs);
+
+
+  /// Provides the thread priority and queue type for the given priority level.
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::NOT_SCHEDULED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
-  // Provides the thread priority and queue type for the given priority level.
-
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the last priority number assigned to an operation in the
-  // schedule.  The number returned is one less than the total number
-  // of scheduled priorities.  All scheduled priorities range from 0
-  // to the number returned, inclusive.
-
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::SYNCHRONIZATION_FAILURE,
-		     RtecScheduler::NOT_SCHEDULED));
-  // Provides the set of Config_Infos associated with the current schedule.
+                                       RtecScheduler::Dispatching_Type_t & d_type);
+
+  /**
+   * Returns the last priority number assigned to an operation in the
+   * schedule.  The number returned is one less than the total number
+   * of scheduled priorities.  All scheduled priorities range from 0
+   * to the number returned, inclusive.
+   */
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+
+  /// Provides the set of Config_Infos associated with the current schedule.
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
 
   // = Accessors that allow controlled relaxations of encapsulation.
 
+  /// Accesses scheduling strategy for the reconfig scheduler.
   RECONFIG_SCHED_STRATEGY & sched_strategy ();
-  // Accesses scheduling strategy for the reconfig scheduler.
 
+  /// Accesses map for O(1) lookup of Config_Infos by priority level.
   CONFIG_INFO_MAP & config_info_map ();
-  // Accesses map for O(1) lookup of Config_Infos by priority level.
 
+  /// Returns the number of config infos, which is also the number of
+  /// assigned priority levels.
   long config_info_count ();
-  // Returns the number of config infos, which is also the number of
-  // assigned priority levels.
 
+  /// Accesses map for O(1) lookup of RT_Infos by handle.
   RT_INFO_MAP & rt_info_map ();
-  // Accesses map for O(1) lookup of RT_Infos by handle.
 
+  /// Returns the number of registered RT_Infos.
   long rt_info_count ();
-  // Returns the number of registered RT_Infos.
 
+  /// Returns the number of registered RT_Info tuples.
   long rt_info_tuple_count ();
-  // Returns the number of registered RT_Info tuples.
 
+  /// Accesses tree for O(log n) lookup of RT_Infos by name.
   RT_INFO_TREE & rt_info_tree ();
-  // Accesses tree for O(log n) lookup of RT_Infos by name.
 
+  /// Accesses map for O(1) lookup of RT_Info dependency
+  /// set by the caller operation's handle.
   DEPENDENCY_SET_MAP & calling_dependency_set_map ();
-  // Accesses map for O(1) lookup of RT_Info dependency
-  // set by the caller operation's handle.
 
+  /// Accesses map for O(1) lookup of RT_Info dependency
+  /// set by the called operation's handle.
   DEPENDENCY_SET_MAP & called_dependency_set_map ();
-  // Accesses map for O(1) lookup of RT_Info dependency
-  // set by the called operation's handle.
 
+  /// Returns the number of dependencies in the dependency lists of all RT_Infos.
+  /// This is used when traversing the dependency graph.
   int dependency_count ();
-  // Returns the number of dependencies in the dependency lists of all RT_Infos.
-  // This is used when traversing the dependency graph.
 
+  /// Accessor for utilization by noncritical tasks.
   CORBA::Double noncritical_utilization ();
-  // Accessor for utilization by noncritical tasks.
 
+  /// Accessor for utilization by critical tasks.
   CORBA::Double critical_utilization ();
-  // Accessor for utilization by critical tasks.
 
+  /// Accessor for noncritical task utilization threshold.
   CORBA::Double noncritical_utilization_threshold ();
-  // Accessor for noncritical task utilization threshold.
 
+  /// Mutator for noncritical task utilization threshold.
   void noncritical_utilization_threshold (const CORBA::Double &);
-  // Mutator for noncritical task utilization threshold.
 
+  /// Accessor for critical task utilization threshold.
   CORBA::Double critical_utilization_threshold ();
-  // Accessor for critical task utilization threshold.
 
+  /// Mutator for critical task utilization threshold.
   void critical_utilization_threshold (const CORBA::Double &);
-  // Mutator for critical task utilization threshold.
 
 protected:
 
@@ -439,18 +344,18 @@ protected:
   };
   // Flags indicating stability conditions of schedule.
 
+  /**
+   * Internal method to create an RT_Info.  If it does not exist, a
+   * new RT_Info is created and inserted into the schedule, and the
+   * handle of the new RT_Info is returned.  If the RT_Info already
+   * exists, then if the ignore_duplicates flag is set, the handle
+   * is simply returned; otherwise, an exception is thrown.
+   */
   TAO_RT_Info_Ex * create_i (const char * entry_point,
                              RtecScheduler::handle_t handle,
-                             int ignore_duplicates)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL));
-  // Internal method to create an RT_Info.  If it does not exist, a
-  // new RT_Info is created and inserted into the schedule, and the
-  // handle of the new RT_Info is returned.  If the RT_Info already
-  // exists, then if the ignore_duplicates flag is set, the handle
-  // is simply returned; otherwise, an exception is thrown.
+                             int ignore_duplicates);
 
+  /// Internal method to set characteristics of the passed RT_Info.
   void set_i (TAO_RT_Info_Ex *rt_info,
                       RtecScheduler::Criticality_t criticality,
                       RtecScheduler::Time time,
@@ -460,269 +365,236 @@ protected:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-              RtecScheduler::Info_Type_t info_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Internal method to set characteristics of the passed RT_Info.
+              RtecScheduler::Info_Type_t info_type);
 
-  virtual RtecScheduler::handle_t lookup_i (const char * entry_point)
-    ACE_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UNKNOWN_TASK));
-  // Internal method to look up a handle for an RT_Info, and return
-  // its handle, or an exception if it's not present.
+  /// Internal method to look up a handle for an RT_Info, and return
+  /// its handle, or an exception if it's not present.
+  virtual RtecScheduler::handle_t lookup_i (const char * entry_point);
 
+  /// Internal method to return the priority and subpriority
+  /// values assigned to an RT_Info, based on its handle.
   virtual void priority_i (RtecScheduler::handle_t handle,
                            RtecScheduler::OS_Priority& o_priority,
                            RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                           RtecScheduler::Preemption_Priority_t& p_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Internal method to return the priority and subpriority
-  // values assigned to an RT_Info, based on its handle.
+                           RtecScheduler::Preemption_Priority_t& p_priority);
 
+  /**
+   * Internal method that registers a dependency between two RT_Infos.
+   * Assumes it is being called with all locks held, and does *not*
+   * set any schedule stability flags.
+   */
   virtual void add_dependency_i (RtecScheduler::handle_t handle,
                                  RtecScheduler::handle_t dependency,
                                  CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Internal method that registers a dependency between two RT_Infos.
-  // Assumes it is being called with all locks held, and does *not*
-  // set any schedule stability flags.
+                         RtecScheduler::Dependency_Enabled_Type_t enabled);
 
+  /**
+   * Internal method that removes a dependency between two RT_Infos.
+   * Assumes it is being called with all locks held, and does *not*
+   * set any schedule stability flags.
+   */
   virtual void remove_dependency_i (RtecScheduler::handle_t handle,
                                     RtecScheduler::handle_t dependency,
                                     CORBA::Long number_of_calls,
-                                    RtecScheduler::Dependency_Type_t dependency_type)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Internal method that removes a dependency between two RT_Infos.
-  // Assumes it is being called with all locks held, and does *not*
-  // set any schedule stability flags.
+                                    RtecScheduler::Dependency_Type_t dependency_type);
 
+  /**
+   * Internal method that enables or disables a dependency between two RT_Infos.
+   * Assumes it is being called with all locks held, and does *not*
+   * set any schedule stability flags.
+   */
   virtual void set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                               RtecScheduler::handle_t dependency,
                                               CORBA::Long number_of_calls,
                                               RtecScheduler::Dependency_Type_t dependency_type,
-                                              RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Internal method that enables or disables a dependency between two RT_Infos.
-  // Assumes it is being called with all locks held, and does *not*
-  // set any schedule stability flags.
+                                              RtecScheduler::Dependency_Enabled_Type_t enabled);
 
 
+  /// This method installs a dependency in a dependency set map.
   virtual void map_dependency_i
                  (RtecScheduler::handle_t key,
                   RtecScheduler::handle_t handle,
                          typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK));
-  // This method installs a dependency in a dependency set map.
+                         RtecScheduler::Dependency_Enabled_Type_t enabled);
 
+  /// This method removes a dependency from a dependency set map.
   void unmap_dependency_i (RtecScheduler::handle_t key,
                            RtecScheduler::handle_t handle,
                            typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                            CORBA::Long number_of_calls,
-                           RtecScheduler::Dependency_Type_t dependency_type)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK));
-  // This method removes a dependency from a dependency set map.
+                           RtecScheduler::Dependency_Type_t dependency_type);
 
+  /// This method updates the enable state of a dependency in a dependency set map.
   void map_dependency_enable_state_i (RtecScheduler::handle_t key,
                                       RtecScheduler::handle_t handle,
                                       typename
                                         TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                                       CORBA::Long number_of_calls,
                                       RtecScheduler::Dependency_Type_t dependency_type,
-                                      RtecScheduler::Dependency_Enabled_Type_t enabled)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method updates the enable state of a dependency in a dependency set map.
-
-  virtual void dfs_traverse_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Traverses dependency graph, assigning a topological ordering.
-  // Resets DFS map entries, do DFS traversal, constructs DFS map.
-
-  virtual void detect_cycles_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::CYCLIC_DEPENDENCIES));
-  // Sorts an array of RT_info handles in topological order, then
-  // checks for loops, marks unresolved remote dependencies.
-
-  void perform_admission_i (void)
-    ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Compute aggregate execution times, then performs admission over
-  // rate tuples.
-
-
-  void crit_dfs_traverse_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Traverses criticality dependency graph, assigning a topological
-  // ordering.  Resets DFS map entries, do DFS traversal, constructs
-  // DFS map.
-
-
-  void propagate_criticalities_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Propagates criticalities.
-
-
-  void propagate_characteristics_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
-                      RtecScheduler::THREAD_SPECIFICATION));
-  // Propagates effective execution time and period, sets total frame size.
-
-  virtual void assign_priorities_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Sort operations by urgency (done by strategy), then assign
-  // priorities and subpriorities in one pass.  (Re)computes utilization
-  // and sets last scheduled priority and last feasible priority.
-
-  void refresh_tuple_ptr_array_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Refreshes the array of tuple pointers, corrects the count.
+                                      RtecScheduler::Dependency_Enabled_Type_t enabled);
+
+  /// Traverses dependency graph, assigning a topological ordering.
+  /// Resets DFS map entries, do DFS traversal, constructs DFS map.
+  virtual void dfs_traverse_i (void);
+
+  /// Sorts an array of RT_info handles in topological order, then
+  /// checks for loops, marks unresolved remote dependencies.
+  virtual void detect_cycles_i (void);
+
+  /// Compute aggregate execution times, then performs admission over
+  /// rate tuples.
+  void perform_admission_i (void);
+
+
+  /**
+   * Traverses criticality dependency graph, assigning a topological
+   * ordering.  Resets DFS map entries, do DFS traversal, constructs
+   * DFS map.
+   */
+  void crit_dfs_traverse_i (void);
+
+
+  /// Propagates criticalities.
+  void propagate_criticalities_i (void);
+
+
+  /// Propagates effective execution time and period, sets total frame size.
+  void propagate_characteristics_i (void);
+
+  /**
+   * Sort operations by urgency (done by strategy), then assign
+   * priorities and subpriorities in one pass.  (Re)computes utilization
+   * and sets last scheduled priority and last feasible priority.
+   */
+  virtual void assign_priorities_i (void);
+
+  /// Refreshes the array of tuple pointers, corrects the count.
+  void refresh_tuple_ptr_array_i (void);
 
+  /// Compute utilization, set last feasible priority.
 /* WSOA merge - commented out
-  virtual void compute_utilization_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Compute utilization, set last feasible priority.
+  virtual void compute_utilization_i (void);
 
 
-  static void init_rt_info (RtecScheduler::RT_Info &rt_info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Helper method to give an RT_Info some reasonable default values
+  /// Helper method to give an RT_Info some reasonable default values
+  /// = Protected class members.
+  static void init_rt_info (RtecScheduler::RT_Info &rt_info);
 */
-  // = Protected class members.
 
+  /// Scheduling strategy for the reconfig scheduler.
   RECONFIG_SCHED_STRATEGY sched_strategy_;
-  // Scheduling strategy for the reconfig scheduler.
 
+  /// Map for O(1) lookup of Config_Infos by priority level.
   CONFIG_INFO_MAP config_info_map_;
-  // Map for O(1) lookup of Config_Infos by priority level.
 
+  /// The number of config infos, which is also the number of priority
+  /// levels.
   long config_info_count_;
-  // The number of config infos, which is also the number of priority
-  // levels.
 
+  /// Map for O(1) lookup of RT_Infos by handle.
   RT_INFO_MAP rt_info_map_;
-  // Map for O(1) lookup of RT_Infos by handle.
 
+  /// The number of registered RT_Infos.
   long rt_info_count_;
-  // The number of registered RT_Infos.
 
+  /// The number of registered RT_Info tuples.
   long rt_info_tuple_count_;
-  // The number of registered RT_Info tuples.
 
+  /// Tree for O(log n) lookup of RT_Infos by name.
   RT_INFO_TREE rt_info_tree_;
-  // Tree for O(log n) lookup of RT_Infos by name.
 
+  /// Map for O(1) lookup of RT_Info dependency
+  /// set by the caller operation's handle.
   DEPENDENCY_SET_MAP calling_dependency_set_map_;
-  // Map for O(1) lookup of RT_Info dependency
-  // set by the caller operation's handle.
 
+  /// Map for O(1) lookup of RT_Info dependency
+  /// set by the called operation's handle.
   DEPENDENCY_SET_MAP called_dependency_set_map_;
-  // Map for O(1) lookup of RT_Info dependency
-  // set by the called operation's handle.
 
+  /**
+   * Map for O(1) lookup of RT_Info dependency set. The above two maps
+   * store the calling and called dependencies. This map stores the
+   * true dependencies based on criticality propagation direction. For
+   * two-ways, this is the same as the direction of invocation,
+   * whereas for one-ways, it is in the opposite direction.
+   */
   DEPENDENCY_SET_MAP crit_dependency_set_map_;
-  // Map for O(1) lookup of RT_Info dependency set. The above two maps
-  // store the calling and called dependencies. This map stores the
-  // true dependencies based on criticality propagation direction. For
-  // two-ways, this is the same as the direction of invocation,
-  // whereas for one-ways, it is in the opposite direction.
 
+  /// Next RT_Info descriptor handle to allocate.  The first handle is
+  /// always 1.
   RtecScheduler::handle_t next_handle_;
-  // Next RT_Info descriptor handle to allocate.  The first handle is
-  // always 1.
 
+  /**
+   * Array of pointers to scheduling entries.  This
+   * array is maintained by the methods that create
+   * scheduling entries, and sorted in topological
+   * order and then priority order at various points
+   * during schedule computation.
+   */
   TAO_Reconfig_Scheduler_Entry ** entry_ptr_array_;
-  // Array of pointers to scheduling entries.  This
-  // array is maintained by the methods that create
-  // scheduling entries, and sorted in topological
-  // order and then priority order at various points
-  // during schedule computation.
 
+  /// Size of the array of scheduling entry pointers.
   long entry_ptr_array_size_;
-  // Size of the array of scheduling entry pointers.
 
+  /**
+   * Array of pointers to scheduling entries.  This
+   * array is maintained by the methods that create
+   * scheduling entries, and sorted in topological
+   * order and then priority order at various points
+   * during schedule computation.
+   */
   TAO_RT_Info_Tuple ** tuple_ptr_array_;
-  // Array of pointers to scheduling entries.  This
-  // array is maintained by the methods that create
-  // scheduling entries, and sorted in topological
-  // order and then priority order at various points
-  // during schedule computation.
 
+  /// Size of the array of scheduling entry pointers.
   long tuple_ptr_array_size_;
-  // Size of the array of scheduling entry pointers.
 
+  /**
+   * Flags indicating whether a stable schedule has been computed
+   * since the last addition or modification of information, and which
+   * parts of the schedule are unstable.
+   */
   u_long stability_flags_;
-  // Flags indicating whether a stable schedule has been computed
-  // since the last addition or modification of information, and which
-  // parts of the schedule are unstable.
 
+  /**
+   * Indicates whether the scheduler should enforce stability by
+   * throwing an exception: otherwise for operations where this
+   * matters, it will simply return a default value if nothing
+   * has been generated.
+   */
   int enforce_schedule_stability_;
-  // Indicates whether the scheduler should enforce stability by
-  // throwing an exception: otherwise for operations where this
-  // matters, it will simply return a default value if nothing
-  // has been generated.
 
+  /// The number of dependencies in the dependency lists of all RT_Infos.
+  /// This is used when traversing the dependency graph.
   int dependency_count_;
-  // The number of dependencies in the dependency lists of all RT_Infos.
-  // This is used when traversing the dependency graph.
 
+  /// Stores the last priority for which an operation can be scheduled
   RtecScheduler::Preemption_Priority_t last_scheduled_priority_;
-  // Stores the last priority for which an operation can be scheduled
 
+  /// Utilization by noncritical tasks.
   CORBA::Double noncritical_utilization_;
-  // Utilization by noncritical tasks.
 
+  /// Utilization by critical tasks.
   CORBA::Double critical_utilization_;
-  // Utilization by critical tasks.
 
+  /// Utilization by noncritical tasks.
   CORBA::Double noncritical_utilization_threshold_;
-  // Utilization by noncritical tasks.
 
+  /// Utilization by critical tasks.
   CORBA::Double critical_utilization_threshold_;
-  // Utilization by critical tasks.
 
+  /// Mutual exclusion lock for the scheduler itself.  This is needed to
+  /// synchronize updates and accesses to scheduling information.
   ACE_LOCK mutex_;
-  // Mutual exclusion lock for the scheduler itself.  This is needed to
-  // synchronize updates and accesses to scheduling information.
 };
 
 
 template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
-                           RtecScheduler::handle_t handle)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           RtecScheduler::handle_t handle);
 // Helper function: makes sure there is room in the scheduling pointer
 // arrays.  This function expands the array eagerly, to minimize time
 // overhead for memory allocation (at a cost of some unused space).
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 4b8755180ca..6cb44d2889c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -1,20 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.cpp
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    SchedEntry.cpp
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Sched/SchedEntry.h"
 #include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index ddb57c13896..ad96eee19ef 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -1,22 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.h
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    SchedEntry.h
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SCHEDENTRY_H
 #define SCHEDENTRY_H
@@ -42,13 +35,14 @@ class Dispatch_Entry_Link;
 class Dispatch_Proxy_Iterator;
 
 
+/**
+ * @class Dispatch_Entry_Link
+ *
+ * @brief Dispatch Entry Link
+ *
+ * Light-weight sortable "smart pointer" to a dispatch entry.
+ */
 class TAO_RTSched_Export Dispatch_Entry_Link
-// = TITLE
-//        Dispatch Entry Link
-//
-// = DESCRIPTION
-//    Light-weight sortable "smart pointer" to a dispatch entry.
-//
 {
 public:
 
@@ -63,36 +57,37 @@ public:
   typedef RtecScheduler::Info_Type_t Info_Type;
   typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
+    /// Constructor.
   Dispatch_Entry_Link (Dispatch_Entry &d);
-    // Constructor.
 
+    /// Copy constructor.
   Dispatch_Entry_Link (const Dispatch_Entry_Link &d);
-    // Copy constructor.
 
+    /// Destructor.
   ~Dispatch_Entry_Link ();
-    // Destructor.
 
+    /// Less than comparison operator.
   bool operator < (const Dispatch_Entry_Link &d) const;
-    // Less than comparison operator.
 
+    /// Accessor for reference to the dispatch entry.
   Dispatch_Entry &dispatch_entry () const;
-    // Accessor for reference to the dispatch entry.
 
 private:
 
+    /// Dispatch entry to which the smart pointer refers.
   Dispatch_Entry &dispatch_entry_;
-    // Dispatch entry to which the smart pointer refers.
 };
 
 
 
+/**
+ * @class Task_Entry
+ *
+ * @brief Task Entry.
+ *
+ * Wrapper for the RT_Info, which aggregates all its dispatches.
+ */
 class TAO_RTSched_Export Task_Entry
-// = TITLE
-//    Task Entry.
-//
-// = DESCRIPTION
-//    Wrapper for the RT_Info, which aggregates all its dispatches.
-//
 {
 public:
 
@@ -341,14 +336,15 @@ private:
 };
 
 
+/**
+ * @class Dispatch_Entry
+ *
+ * @brief Dispatch Entry
+ *
+ * Descriptor object for a single dispatch of an operation.
+ */
 class TAO_RTSched_Export Dispatch_Entry
 {
-// = TITLE
-//        Dispatch Entry
-//
-// = DESCRIPTION
-//     Descriptor object for a single dispatch of an operation.
-//
 public:
 
   typedef RtecScheduler::handle_t handle_t;
@@ -449,16 +445,19 @@ private:
 
 };
 
+/**
+ * @class Dispatch_Proxy_Iterator
+ *
+ * @brief This class implements an iterator abstraction over a virtual
+ * frame size and number of calls, using an actual ordered
+ * multiset of dispatch entries over an actual frame size.
+ * It also serves as a proxy for the virtual dispatch to which
+ * it refers.  Rhetorical question: is it possible to separate
+ * the iterator and proxy abstractions here without defeating the
+ * purpose of the design, which is to avoid constructing
+ * superfluous dispatch entries (per the conjunctive merge use case) ?
+ */
 class TAO_RTSched_Export Dispatch_Proxy_Iterator
-// = TITLE
-//   This class implements an iterator abstraction over a virtual
-//   frame size and number of calls, using an actual ordered
-//   multiset of dispatch entries over an actual frame size.
-//   It also serves as a proxy for the virtual dispatch to which
-//   it refers.  Rhetorical question: is it possible to separate
-//   the iterator and proxy abstractions here without defeating the
-//   purpose of the design, which is to avoid constructing
-//   superfluous dispatch entries (per the conjunctive merge use case) ?
 {
 public:
 
@@ -473,74 +472,82 @@ public:
   typedef RtecScheduler::Info_Type_t Info_Type;
   typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
+    /// ctor
   Dispatch_Proxy_Iterator (ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
                            u_long actual_frame_size,
                            u_long virtual_frame_size,
                            u_long number_of_calls_ = 1,
                            u_long starting_sub_frame = 0);
-    // ctor
 
   ////////////////////////
   // iterator interface //
   ////////////////////////
 
+    /// returns 0 if there are more entries to see, 1 if not
   int done () const;
-    // returns 0 if there are more entries to see, 1 if not
 
+    /**
+     * positions the iterator at the first entry of the passed
+     * sub-frame, returns 1 if it could position the iterator
+     * correctly, 0 if not, and -1 if an error occurred.
+     */
   int first (u_int sub_frame = 0);
-    // positions the iterator at the first entry of the passed
-    // sub-frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
 
+    /**
+     * positions the iterator at the last entry of the total
+     * frame, returns 1 if it could position the iterator
+     * correctly, 0 if not, and -1 if an error occurred.
+     */
   int last ();
-    // positions the iterator at the last entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
 
+    /**
+     * positions the iterator at the next entry of the total
+     * frame, returns 1 if it could position the iterator
+     * correctly, 0 if not, and -1 if an error occurred.
+     */
   int advance ();
-    // positions the iterator at the next entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
 
+    /**
+     * positions the iterator at the previous entry of the total
+     * frame, returns 1 if it could position the iterator
+     * correctly, 0 if not, and -1 if an error occurred.
+     */
   int retreat ();
-    // positions the iterator at the previous entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
 
   /////////////////////
   // proxy interface //
   /////////////////////
 
+    /// returns the adjusted arrival time of the virtual entry
   Time arrival () const;
-    // returns the adjusted arrival time of the virtual entry
 
+    /// returns the adjusted deadline time of the virtual entry
   Time deadline () const;
-    // returns the adjusted deadline time of the virtual entry
 
+    /// returns the scheduler priority of the virtual entry
   Preemption_Priority priority () const;
-    // returns the scheduler priority of the virtual entry
 
+    /// returns the OS priority of the virtual entry
   OS_Priority OS_priority () const;
-    // returns the OS priority of the virtual entry
 
 
 private:
 
+    /// the number of calls corresponding to each actual dispatch
   u_long number_of_calls_;
-    // the number of calls corresponding to each actual dispatch
 
+    /// the current call number for this dispatch (zero based)
   u_long current_call_;
-    // the current call number for this dispatch (zero based)
 
+    /// the frame size of the actual dispatches
   u_long actual_frame_size_;
-    // the frame size of the actual dispatches
 
+    /// the virtaul frame size over which to iterate
   u_long virtual_frame_size_;
-    // the virtaul frame size over which to iterate
 
+    /// the current offset into the virtual frame
+    /// (should be a multiple of the actual frame size)
   u_long current_frame_offset_;
-    // the current offset into the virtual frame
-    // (should be a multiple of the actual frame size)
 
   ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> iter_;
 };
@@ -620,19 +627,19 @@ public:
   typedef RtecScheduler::Info_Type_t Info_Type;
   typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
+  /// ctor
   TimeLine_Entry_Link  (TimeLine_Entry &t);
-  // ctor
 
+  /// accessor for the underlying entry
   TimeLine_Entry &entry () const;
-  // accessor for the underlying entry
 
+  /// comparison operator
   bool operator < (const TimeLine_Entry_Link&) const;
-  // comparison operator
 
 private:
 
+  /// the underlying entry
   TimeLine_Entry &entry_;
-  // the underlying entry
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl
index 13f00111d67..4fdbcfb8c96 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl
@@ -1,22 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.i
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    SchedEntry.inl
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 13ecbf74fc0..79234617c6f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -1,20 +1,13 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduler.cpp
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 #include "ace/Sched_Params.h"
 #include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index 8cad8d40736..a9dff874304 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -1,22 +1,14 @@
 /* -*- C++ -*- */
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduler.h
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 #ifndef SCHEDULER_H
 #define SCHEDULER_H
@@ -37,13 +29,15 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Sched/sched_export.h"
 
+/**
+ * @class ACE_Scheduler
+ *
+ * @brief Thread scheduler interface.
+ *
+ * This virtual base class is the interface to either an off-line
+ * scheduler, or to the necessary on-line component of the Scheduler.
+ */
 class TAO_RTSched_Export ACE_Scheduler
-  // = TITLE
-  //    Thread scheduler interface.
-  //
-  // = DESCRIPTION
-  //    This virtual base class is the interface to either an off-line
-  //    scheduler, or to the necessary on-line component of the Scheduler.
 {
 public:
   typedef u_int mode_t;
@@ -61,8 +55,8 @@ public:
 
   // Map some types to simplify re-use.
 
+  /// Objects are named by unique strings.
   typedef const char *Object_Name;
-  // Objects are named by unique strings.
 
   static const mode_t CURRENT_MODE;
 
@@ -104,98 +98,106 @@ public:
   static void output (FILE *, const status_t);
 
   // = Initialize the scheduler.
+  /**
+   * The minimum and maximum priority are the OS-specific priorities that
+   * are used when creating the schedule (assigning priorities).  The
+   * minimum_priority is the priority value of the lowest priority.
+   * It may be numerically higher than the maximum_priority, on OS's such
+   * as VxWorks that use lower values to indicate higher priorities.
+   *
+   * When Scheduler::schedule is called, the schedule is output to the
+   * file named by "runtime_filename" if it is non-zero.
+   * This file is compilable; it is linked into the runtime executable
+   * to provide priorities to the runtime scheduling component.
+   * If the "rt_info_filename" is non-zero, the RT_Info for
+   * every task is exported to it.  It is not used at runtime.
+   * If the "timeline_filename" is non-zero, the timeline output
+   * file is created.  It is not used at runtime.
+   *
+   * The runtime scheduling component ignores these filenames.  It just
+   * uses the priorities that were linked in to the executable, after
+   * converting them to platform-specific values.
+   */
   virtual void init (const int minimum_priority,
                      const int maximum_priority,
                      const char *runtime_filename = 0,
                      const char *rt_info_filename = 0,
                      const char *timeline_filename = 0) = 0;
-  // The minimum and maximum priority are the OS-specific priorities that
-  // are used when creating the schedule (assigning priorities).  The
-  // minimum_priority is the priority value of the lowest priority.
-  // It may be numerically higher than the maximum_priority, on OS's such
-  // as VxWorks that use lower values to indicate higher priorities.
-  //
-  // When Scheduler::schedule is called, the schedule is output to the
-  // file named by "runtime_filename" if it is non-zero.
-  // This file is compilable; it is linked into the runtime executable
-  // to provide priorities to the runtime scheduling component.
-  // If the "rt_info_filename" is non-zero, the RT_Info for
-  // every task is exported to it.  It is not used at runtime.
-  // If the "timeline_filename" is non-zero, the timeline output
-  // file is created.  It is not used at runtime.
-  //
-  // The runtime scheduling component ignores these filenames.  It just
-  // uses the priorities that were linked in to the executable, after
-  // converting them to platform-specific values.
 
   // = Registers a task.
+  /**
+   * If the Task registration succeeds, this function returns SUCCEEDED
+   * and sets "handle" to a unique identifier for the task.
+   * Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
+   * TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
+   * only be registered once.)
+   * The RT_Info * array is indexed by mode; there must be one element for
+   * each mode, as specified by number_of_modes.  If a task does not
+   * run in a mode, then its entry in the array for that mode must
+   * be 0.
+   */
   virtual status_t register_task (RT_Info *[],
                                   const u_int number_of_modes,
                                   handle_t &handle) = 0;
-  // If the Task registration succeeds, this function returns SUCCEEDED
-  // and sets "handle" to a unique identifier for the task.
-  // Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
-  // TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
-  // only be registered once.)
-  // The RT_Info * array is indexed by mode; there must be one element for
-  // each mode, as specified by number_of_modes.  If a task does not
-  // run in a mode, then its entry in the array for that mode must
-  // be 0.
 
+  /**
+   * Tries to find the RT_Info corresponding to <name> in the RT_Info
+   * database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
+   * set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
+   * was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
+   * the task must call RT_Info::set to fill in execution properties.
+   * In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
+   * (rtinfo, 0, handle) is called.  Returns FAILED if an error
+   * occurs.
+   *
+   * One motivation for allocating RT_Info's from within the Scheduler
+   * is to allow RT_Infos to persist after the tasks that use them.
+   * For instance, we may want to call this->schedule right before the
+   * application exits a configuration run.  If the tasks have been
+   * deleted (deleting their RT_Infos with them), this->schedule will
+   * fail.
+   */
   virtual status_t get_rt_info (Object_Name name,
                                 RT_Info* &rtinfo);
-  // Tries to find the RT_Info corresponding to <name> in the RT_Info
-  // database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
-  // set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
-  // was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
-  // the task must call RT_Info::set to fill in execution properties.
-  // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
-  // (rtinfo, 0, handle) is called.  Returns FAILED if an error
-  // occurs.
-  //
-  // One motivation for allocating RT_Info's from within the Scheduler
-  // is to allow RT_Infos to persist after the tasks that use them.
-  // For instance, we may want to call this->schedule right before the
-  // application exits a configuration run.  If the tasks have been
-  // deleted (deleting their RT_Infos with them), this->schedule will
-  // fail.
 
+  /// Obtains an RT_Info based on its "handle".
   virtual status_t lookup_rt_info (handle_t handle,
                                    RT_Info* &rtinfo) = 0;
-  // Obtains an RT_Info based on its "handle".
 
+  /// Obtains a Config_Info based on its priority.
   virtual status_t lookup_config_info (Preemption_Priority priority,
                                        Config_Info* &config_info) = 0;
-  // Obtains a Config_Info based on its priority.
 
 
 
   // = Computes the schedule.
+  /// This actually generates the files.
   virtual status_t
     schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> &anomaly_set) = 0;
-  // This actually generates the files.
 
   // = Access a thread priority.
+  /**
+   * Defines "priority" as the priority that was assigned to the Task that
+   * was assigned "handle", for the specified mode.  Defines "subpriority"
+   * as the relative ordering (due to dependencies) within the priority.
+   * Returns 0 on success, or -1 if an invalid mode or handle are supplied.
+   * Queue numbers are platform-independent priority values, ranging from
+   * a highest priority value of 0 to the lowest priority value, which is
+   * returned by "minimum_priority_queue ()". The current and deadline times
+   * are part of the scheduling service implementation interface, but may be
+   * ignored by some implementations and used by others.
+   */
   virtual int priority (const handle_t handle,
                         OS_Thread_Priority &priority,
                         Sub_Priority &subpriority,
                         Preemption_Priority &preemption_prio,
                         const mode_t = CURRENT_MODE) const = 0;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or -1 if an invalid mode or handle are supplied.
-  // Queue numbers are platform-independent priority values, ranging from
-  // a highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()". The current and deadline times
-  // are part of the scheduling service implementation interface, but may be
-  // ignored by some implementations and used by others.
 
   // = Access the platform-independent priority value of the lowest-priority
   //   thread.
+  /// This is intended for use by the Event Channel, so it can determine the
+  /// number of priority dispatch queues to create.
   u_int minimum_priority_queue () const { return minimum_priority_queue_; }
-  // This is intended for use by the Event Channel, so it can determine the
-  // number of priority dispatch queues to create.
 
   // = Access the number of modes.
   u_int modes () const { return modes_; }
@@ -216,14 +218,14 @@ public:
   status_t status () const { return status_; }
 
   // = Access the current output (debugging) level.
+  /// Default is 0; set to 1 to print out schedule, by task.  Set
+  /// to higher than one for debugging info.
   u_int output_level () const { return output_level_; }
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
 
   // = Set the scheduler output (debugging) level.
+  /// the only supported levels are 0 (quiet), 1 (verbose) and 2
+  /// (debug)
   void output_level (const u_int level) { output_level_ = level; }
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2
-  // (debug)
 
   static int add_dependency(RT_Info* rt_info,
                             const Dependency_Info& d);
@@ -234,10 +236,10 @@ public:
   static void export_to_file (RT_Info*, FILE* file);
   static void export_to_file (RT_Info&, FILE* file);
 
+  /// provide the thread priority and queue type for the given priority level
   virtual int dispatch_configuration (const Preemption_Priority &p_priority,
                                       OS_Thread_Priority& priority,
                                       Dispatching_Type & d_type);
-  // provide the thread priority and queue type for the given priority level
 
 
 protected:
@@ -267,16 +269,18 @@ private:
   typedef ACE_Map_Iterator<EXT, INT, TAO_SYNCH_MUTEX> Info_Collection_Iterator;
   typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry;
 
+  /// A binding of name to rt_info.  This is the mapping for every
+  /// rt_info in the process.
   Info_Collection info_collection_;
-  // A binding of name to rt_info.  This is the mapping for every
-  // rt_info in the process.
 
   static ACE_Scheduler *instance_;
 
+  /**
+   * The platform-independent priority value of the Event Channel's
+   * minimum priority dispatch queue.  The value of the maximum priority
+   * dispatch queue is always 0.
+   */
   u_int minimum_priority_queue_;
-  // The platform-independent priority value of the Event Channel's
-  // minimum priority dispatch queue.  The value of the maximum priority
-  // dispatch queue is always 0.
 
   u_int modes_;
   u_int tasks_;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 69448fa30b6..f7511e7ee4a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -1,20 +1,13 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.cpp
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduler_Generic.cpp
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 #include "ace/Sched_Params.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 1b73b4d1c4b..5c49d314b5f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -1,22 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.h
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduler_Generic.h
+ *
+ *  $Id$
+ *
+ *  @author David Levine
+ */
+//=============================================================================
+
 
 #ifndef SCHEDULER_INTERNAL_H
 #define SCHEDULER_INTERNAL_H
@@ -29,12 +22,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class Scheduler_Generic
+ *
+ * @brief Implementation of an off-line scheduler.
+ *
+ * Schedules tasks, assigning the same priority to all of them.
+ */
 class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler
-  // = TITLE
-  //    Implementation of an off-line scheduler.
-  //
-  // = DESCRIPTION
-  //    Schedules tasks, assigning the same priority to all of them.
 {
 public:
   Scheduler_Generic ();
@@ -52,60 +47,64 @@ public:
                                   const u_int number_of_modes,
                                   handle_t &handle);
 
+  /// Obtains an RT_Info based on its "handle".
   virtual status_t lookup_rt_info (handle_t handle,
                                    RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
 
+  /// Obtains a Config_Info based on its priority.
   virtual status_t lookup_config_info (Preemption_Priority priority,
                                        Config_Info* &config_info);
-  // Obtains a Config_Info based on its priority.
 
   // = Computes the schedule.
   virtual status_t
     schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> &anomaly_set);
 
   // = Access a thread priority.
+  /**
+   * Defines "priority" as the priority that was assigned to the Task that
+   * was assigned "handle", for the specified mode.  Defines "subpriority"
+   * as the relative ordering (due to dependencies) within the priority.
+   * Returns 0 on success, or 1 if an invalid mode or handle are supplied.
+   */
   virtual int priority (const handle_t handle,
                         OS_Thread_Priority &priority,
                         Sub_Priority &subpriority,
                         Preemption_Priority &preemption_prio,
                         const mode_t = CURRENT_MODE) const;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or 1 if an invalid mode or handle are supplied.
 
 private:
+  /// The number of task handles dispensed so far.
   u_int handles_;
-  // The number of task handles dispensed so far.
 
+  /// The minimum priority value that the application specified (in
+  /// its call to init ()).
   int minimum_priority_;
-  // The minimum priority value that the application specified (in
-  // its call to init ()).
 
+  /// The maximum priority value that the application specified (in
+  /// its call to init ()).
   int maximum_priority_;
-  // The maximum priority value that the application specified (in
-  // its call to init ()).
 
+  /// Destination file of Scheduler output from the configuration run.
   const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
 
+  /// Destination file of all rt_info data from the configuration run.
   const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
 
+  /// The destination of the timeline.
   const char *timeline_filename_;
-  // The destination of the timeline.
 
+  /**
+   * Set to 1 if priority values increase with increasing priority,
+   * such as on Solaris and Win32, or 0 if they decrease, such as on
+   * VxWorks.
+   */
   int increasing_priority_;
-  // Set to 1 if priority values increase with increasing priority,
-  // such as on Solaris and Win32, or 0 if they decrease, such as on
-  // VxWorks.
 
+  /// Collection of known tasks.
   ACE_Unbounded_Set <RT_Info **> task_entries_;
-  // Collection of known tasks.
 
+  /// dispatchin configuration info
   Config_Info config_info_;
-  // dispatchin configuration info
 
 #if defined (ACE_HAS_THREADS)
   typedef TAO_SYNCH_RECURSIVE_MUTEX LOCK;
@@ -113,20 +112,20 @@ private:
   typedef ACE_Null_Mutex LOCK;
 #endif /* ACE_HAS_THREADS */
 
+  /// This protects access to the scheduler during configuration runs.
   LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
 
 
   ///////////////////////////////////////
   // member functions for internal use //
   ///////////////////////////////////////
 
+  /// Prepare for another schedule computation, but do not
+  /// disturb the "output" (priorities that have already been assigned).
   void reset ();
-  // Prepare for another schedule computation, but do not
-  // disturb the "output" (priorities that have already been assigned).
 
+  /// Display the schedule, task-by-task.
   void print_schedule ();
-  // Display the schedule, task-by-task.
 
   Scheduler_Generic (const Scheduler_Generic &);
   Scheduler_Generic &operator= (const Scheduler_Generic &);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 8b27fdbd690..51dd6770814 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -1,20 +1,13 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.cpp
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Strategy_Scheduler.cpp
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Sched/Strategy_Scheduler.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index e323855d33e..1dab6d50d71 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -1,22 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.h
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Strategy_Scheduler.h
+ *
+ *  $Id$
+ *
+ *  @author Chris Gill
+ */
+//=============================================================================
+
 
 #ifndef STRATEGY_SCHEDULER_H
 #define STRATEGY_SCHEDULER_H
@@ -33,51 +26,53 @@ class ACE_Scheduler_Strategy;
 // Strategized scheduler class //
 /////////////////////////////////
 
+/**
+ * @class ACE_Strategy_Scheduler
+ *
+ * @brief ACE_Strategy_Scheduler
+ *
+ * Strategized scheduler implementation.  Provides an implementation
+ * of all strategy specific scheduling mechanisms, which relies on the
+ * methods of the associated strategy class.
+ */
 class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler
-  // = TITLE
-  //    ACE_Strategy_Scheduler
-  //
-  // = DESCRIPTION
-  //    Strategized scheduler implementation.  Provides an implementation
-  //    of all strategy specific scheduling mechanisms, which relies on the
-  //    methods of the associated strategy class.
 {
 // public interface
 public:
 
+    /// = Constructor.
   ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy);
-    // = Constructor.
 
+    /// = Virtual destructor.
   virtual ~ACE_Strategy_Scheduler ();
-    // = Virtual destructor.
 
+    /// = Assigns priorities to the sorted dispatch schedule,
+    ///   according to the strategy's priority comparison operator.
   status_t assign_priorities (
     Dispatch_Entry **dispatches, u_int count,
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
-    // = Assigns priorities to the sorted dispatch schedule,
-    //   according to the strategy's priority comparison operator.
 
+    /// = Assigns dynamic and static sub-priorities to the sorted dispatch
+    ///   schedule, according to the strategy's subpriority comparisons.
   status_t assign_subpriorities (
     Dispatch_Entry **dispatches, u_int count,
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
-    // = Assigns dynamic and static sub-priorities to the sorted dispatch
-    //   schedule, according to the strategy's subpriority comparisons.
 
+    /// = Determine the minimum critical priority number.
   virtual Preemption_Priority minimum_critical_priority ();
-    // = Determine the minimum critical priority number.
 
 private:
 
+    /// = Schedules a dispatch entry into the timeline being created.
   virtual status_t schedule_timeline_entry (Dispatch_Entry &dispatch_entry,
                                             ACE_Unbounded_Queue <Dispatch_Entry *>
                                               &reschedule_queue);
-    // = Schedules a dispatch entry into the timeline being created.
 
+    /// = Sets up the schedule in the order generated by the strategy.
   virtual status_t sort_dispatches (Dispatch_Entry **dispatches, u_int count);
-    // = Sets up the schedule in the order generated by the strategy.
 
+    /// = Strategy for comparing and sorting dispatch entries.
   ACE_Scheduler_Strategy &strategy_;
-    // = Strategy for comparing and sorting dispatch entries.
 
   ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &);
   ACE_Strategy_Scheduler &operator= (const ACE_Strategy_Scheduler &);
@@ -89,20 +84,22 @@ private:
 // Factory for strategized schedulers //
 ////////////////////////////////////////
 
+/**
+ * @class ACE_Strategy_Scheduler_Factory
+ *
+ * @brief ACE_Strategy_Scheduler_Factory
+ *
+ * Provides a type parameterized factory method that constructs
+ * and returns a scheduler that uses the given scheduling strategy
+ */
 template <class STRATEGY>
 class ACE_Strategy_Scheduler_Factory
-  // = TITLE
-  //    ACE_Strategy_Scheduler_Factory
-  //
-  // = DESCRIPTION
-  //    Provides a type parameterized factory method that constructs
-  //    and returns a scheduler that uses the given scheduling strategy
 {
 public:
 
+    /// = Constructs and returns a scheduler strategized with
+    ///   an instance of the the parameterized strategy type.
         static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority_t minimum_critical_priority);
-    // = Constructs and returns a scheduler strategized with
-    //   an instance of the the parameterized strategy type.
 };
 
 
@@ -110,133 +107,151 @@ public:
 // Scheduler Strategies //
 //////////////////////////
 
+/**
+ * @class ACE_Scheduler_Strategy
+ *
+ * @brief ACE_Scheduler_Strategy
+ *
+ * Abstract Base Class for scheduling strategies: each derived class
+ * must define an ordering strategy for dispatch entries based on a
+ * specific scheduling algorithm.
+ */
 class TAO_RTSched_Export ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Abstract Base Class for scheduling strategies: each derived class
-  //    must define an ordering strategy for dispatch entries based on a
-  //    specific scheduling algorithm.
 {
 public:
-  
+
+  /// = Constructor.
   ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-  // = Constructor.
 
   /// Destructor.
   virtual ~ACE_Scheduler_Strategy (void);
 
+    /**
+     * = Compares two dispatch entries in strategy specific high to low
+     *   priority ordering: returns -1 if the first Dispatch_Entry is greater
+     *   in the order, 0 if they are equivalent, or 1 if the second
+     *   Dispatch_Entry is greater in the order.
+     */
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry) = 0;
-    // = Compares two dispatch entries in strategy specific high to low
-    //   priority ordering: returns -1 if the first Dispatch_Entry is greater
-    //   in the order, 0 if they are equivalent, or 1 if the second
-    //   Dispatch_Entry is greater in the order.
 
+    /// = Sorts the dispatch entry link pointer array according to
+    ///   the specific sort order defined by the strategy.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count) = 0;
-    // = Sorts the dispatch entry link pointer array according to
-    //   the specific sort order defined by the strategy.
 
+    /// = Determines the minimum critical priority number.
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = Determines the minimum critical priority number.
 
+    /**
+     * = Compares two dispatch entries in strategy specific high to low
+     *   dynamic subpriority ordering: returns -1 if the first Dispatch_Entry
+     *   is greater in the order, 0 if they are equivalent, or 1 if the
+     *   second Dispatch_Entry is greater in the order.
+     */
   virtual int dynamic_subpriority_comp (const Dispatch_Entry &first_entry,
                                         const Dispatch_Entry &second_entry) = 0;
-    // = Compares two dispatch entries in strategy specific high to low
-    //   dynamic subpriority ordering: returns -1 if the first Dispatch_Entry
-    //   is greater in the order, 0 if they are equivalent, or 1 if the
-    //   second Dispatch_Entry is greater in the order.
 
+    /// = Returns a dynamic subpriority value
+    ///   for the given timeline entry at the current time.
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time) = 0;
-    // = Returns a dynamic subpriority value
-    //   for the given timeline entry at the current time.
 
+    /**
+     * = Provides a lowest level ordering based first on importance
+     * (descending), and then on the dependency topological sort finishing
+     * time (ascending).
+     */
   virtual int static_subpriority_comp (const Dispatch_Entry &first_entry,
                                        const Dispatch_Entry &second_entry);
-    // = Provides a lowest level ordering based first on importance
-    // (descending), and then on the dependency topological sort finishing
-    // time (ascending).
 
+    /// = Provide the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry) = 0;
-    // = Provide the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /**
+     * = Compares two dispatch entries using the specific priority, dynamic
+     *   subpriority, and static subpriority method definitions provided by
+     *   the derived strategy class to produce the strategy specific sort
+     *   ordering: returns -1 if the first Dispatch_Entry is greater in the
+     *   order, 0 if they are equivalent, or 1 if the second Dispatch_Entry is
+     *   greater in the order.  This is an example of the Template Method
+     *   pattern (and also of Pree's Unification Metapattern), in which
+     *   derived classes provide  definitions of the methods on which the
+     *   sort_comp Template Method relies.
+     */
   int sort_comp (const Dispatch_Entry &first_entry,
                  const Dispatch_Entry &second_entry);
-    // = Compares two dispatch entries using the specific priority, dynamic
-    //   subpriority, and static subpriority method definitions provided by
-    //   the derived strategy class to produce the strategy specific sort
-    //   ordering: returns -1 if the first Dispatch_Entry is greater in the
-    //   order, 0 if they are equivalent, or 1 if the second Dispatch_Entry is
-    //   greater in the order.  This is an example of the Template Method
-    //   pattern (and also of Pree's Unification Metapattern), in which
-    //   derived classes provide  definitions of the methods on which the
-    //   sort_comp Template Method relies.
 
+    /// = The minimum critical priority number for the strategy.
   ACE_DynScheduler::Preemption_Priority minimum_critical_priority_;
-    // = The minimum critical priority number for the strategy.
 };
 
 
 
+/**
+ * @class ACE_MUF_Scheduler_Strategy
+ *
+ * @brief ACE_MUF_Scheduler_Strategy
+ *
+ * Defines "schedule" method using Maximum Urgency First
+ * scheduling algorithm.
+ */
 class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_MUF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Maximum Urgency First
-  //    scheduling algorithm.
 {
 public:
 
+    /// = Constructor.
   ACE_MUF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = Constructor.
 
+  /// = Virtual destructor.
   virtual ~ACE_MUF_Scheduler_Strategy ();
-  // = Virtual destructor.
 
+    /// = Returns an instance of the strategy.
   static ACE_MUF_Scheduler_Strategy *instance ();
-    // = Returns an instance of the strategy.
 
+    /**
+     * = Compares two dispatch entries by maximum criticality: returns -1 if
+     *   the first Dispatch_Entry is greater in the order, 0 if they're
+     *   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Compares two dispatch entries by maximum criticality: returns -1 if
-    //   the first Dispatch_Entry is greater in the order, 0 if they're
-    //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
 
+    /// = Sorts the dispatch entry link pointer array
+    ///   in descending urgency order.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array
-    //   in descending urgency order.
 
+    /// = Determines the minimum critical priority number.
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = Determines the minimum critical priority number.
 
+    /// = Provides the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
-    // = Provides the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /**
+     * = Returns a dynamic subpriority value at the current time for
+     *   the given timeline entry: if the operation has
+     *   non-negative laxity, then the value is positive, and a lower
+     *   laxity gives a higher dynamic subpriority; if the operation
+     *   has negative laxity, the value is the (negative) laxity value.
+     */
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time);
-    // = Returns a dynamic subpriority value at the current time for
-    //   the given timeline entry: if the operation has
-    //   non-negative laxity, then the value is positive, and a lower
-    //   laxity gives a higher dynamic subpriority; if the operation
-    //   has negative laxity, the value is the (negative) laxity value.
 
+    /**
+     * = Orders two dispatch entries by ascending laxity: returns -1 if the
+     *   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
+     *   1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int dynamic_subpriority_comp (
     const Dispatch_Entry &first_entry,
     const Dispatch_Entry &second_entry);
-    // = Orders two dispatch entries by ascending laxity: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   1 if the second Dispatch_Entry is greater in the order.
 
 private:
 
@@ -247,252 +262,272 @@ private:
   static int sort_function (void *arg1, void *arg2);
 #endif  // ACE_HAS_WINCE
 
+    /// Instance of the strategy.
   static ACE_MUF_Scheduler_Strategy *instance_;
-    // Instance of the strategy.
 };
 
 
+/**
+ * @class ACE_RMS_Scheduler_Strategy
+ *
+ * @brief ACE_RMS_Scheduler_Strategy
+ *
+ * Defines "schedule" method using Rate Monotonic
+ * Scheduling algorithm.
+ */
 class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_RMS_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Rate Monotonic
-  //    Scheduling algorithm.
 {
 public:
 
+    /// = Constructor.
   ACE_RMS_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = Constructor.
 
+    /// = Virtual destructor.
   virtual ~ACE_RMS_Scheduler_Strategy ();
-    // = Virtual destructor.
 
+    /// Returns an instance of the strategy.
   static ACE_RMS_Scheduler_Strategy *instance ();
-    // Returns an instance of the strategy.
 
+    /**
+     * = Compares two dispatch entries by minimum period: returns -1 if the
+     *   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
+     *   or 1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Compares two dispatch entries by minimum period: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
 
+    /// = Sorts the dispatch entry link pointer array in
+    ///   descending RMS (rate) order.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array in
-    //   descending RMS (rate) order.
 
+    /// = Determine the minimum critical priority number.
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = Determine the minimum critical priority number.
 
+    /// = Provide the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
-    // = Provide the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /// = Just returns 0: all operations have
+    ///   the same dynamic subpriority value.
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time);
-    // = Just returns 0: all operations have
-    //   the same dynamic subpriority value.
 
+    /// = All dispatches in a given priority level have the same dynamic
+    ///   subpriority under RMS: just returns 0.
   virtual int dynamic_subpriority_comp
     (const Dispatch_Entry &first_entry,
      const Dispatch_Entry &second_entry);
-    // = All dispatches in a given priority level have the same dynamic
-    //   subpriority under RMS: just returns 0.
 
 private:
 
+    /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
-    // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
 
+    /// = Instance of the strategy.
   static ACE_RMS_Scheduler_Strategy *instance_;
-    // = Instance of the strategy.
 
 };
 
 
 
+/**
+ * @class ACE_MLF_Scheduler_Strategy
+ *
+ * @brief ACE_MLF_Scheduler_Strategy
+ *
+ * Defines "schedule" method using Minimum Laxity First
+ * scheduling algorithm.
+ */
 class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_MLF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Minimum Laxity First
-  //    scheduling algorithm.
 {
 public:
 
+    /// = Constructor.
   ACE_MLF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = Constructor.
 
+    /// = Virtual destructor.
   virtual ~ACE_MLF_Scheduler_Strategy ();
-    // = Virtual destructor.
 
+    /// = Returns an instance of the strategy.
   static ACE_MLF_Scheduler_Strategy *instance ();
-    // = Returns an instance of the strategy.
 
+    /// = Just returns 0, as all dispatch entries are of equivalent
+    ///   static priority under MLF.
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Just returns 0, as all dispatch entries are of equivalent
-    //   static priority under MLF.
 
+    /// = Sorts the dispatch entry link pointer array in ascending laxity order.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array in ascending laxity order.
 
+  /// = Provide the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
-  // = Provide the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /**
+     * = Returns a dynamic subpriority value at the current time for
+     *   the given timeline entry: if the operation has
+     *   non-negative laxity, then the value is positive, and a lower
+     *   laxity gives a higher dynamic subpriority; if the operation
+     *   has negative laxity, the value is the (negative) laxity value.
+     */
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time);
-    // = Returns a dynamic subpriority value at the current time for
-    //   the given timeline entry: if the operation has
-    //   non-negative laxity, then the value is positive, and a lower
-    //   laxity gives a higher dynamic subpriority; if the operation
-    //   has negative laxity, the value is the (negative) laxity value.
 
+    /**
+     * = Orders two dispatch entries by ascending laxity: returns -1 if the
+     *   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
+     *   or 1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int dynamic_subpriority_comp
     (const Dispatch_Entry &first_entry,
      const Dispatch_Entry &second_entry);
-    // = Orders two dispatch entries by ascending laxity: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
 
 private:
 
+    /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
-    // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
 
+    /// = Instance of the strategy
   static ACE_MLF_Scheduler_Strategy *instance_;
-    // = Instance of the strategy
 
 };
 
 
+/**
+ * @class ACE_EDF_Scheduler_Strategy
+ *
+ * @brief ACE_EDF_Scheduler_Strategy
+ *
+ * Defines "schedule" method using Earliest Deadline First
+ * scheduling algorithm.
+ */
 class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_EDF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Earliest Deadline First
-  //    scheduling algorithm.
 {
 public:
 
+    /// = Default constructor.
   ACE_EDF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = Default constructor.
 
+    /// = Virtual destructor.
   virtual ~ACE_EDF_Scheduler_Strategy ();
-    // = Virtual destructor.
 
+    /// = Returns an instance of the strategy.
   static ACE_EDF_Scheduler_Strategy *instance ();
-    // = Returns an instance of the strategy.
 
+    /// = Returns 0, as all dispatch entries are of equivalent
+    ///   priority under EDF.
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Returns 0, as all dispatch entries are of equivalent
-    //   priority under EDF.
 
+    /// = Sorts the dispatch entry link pointer array
+    ///   in ascending deadline (period) order.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sorts the dispatch entry link pointer array
-    //   in ascending deadline (period) order.
 
+  /// = Provide the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
-  // = Provide the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /**
+     * = Returns a dynamic subpriority value at the current time for the
+     *   given timeline entry: if the operation has non-negative
+     *   time to deadline, then value is positive, and a shorter time to
+     *   deadline gives a higher dynamic subpriority; if the operation has a
+     *   negative time to deadline, the value is (negative) time to deadline.
+     */
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time);
-    // = Returns a dynamic subpriority value at the current time for the
-    //   given timeline entry: if the operation has non-negative
-    //   time to deadline, then value is positive, and a shorter time to
-    //   deadline gives a higher dynamic subpriority; if the operation has a
-    //   negative time to deadline, the value is (negative) time to deadline.
 
 
+    /**
+     * = Orders two dispatch entries by ascending time to deadline: returns -1
+     *   if the first Dispatch_Entry is greater in the order, 0 if they're
+     *   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int dynamic_subpriority_comp
     (const Dispatch_Entry &first_entry,
      const Dispatch_Entry &second_entry);
-    // = Orders two dispatch entries by ascending time to deadline: returns -1
-    //   if the first Dispatch_Entry is greater in the order, 0 if they're
-    //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
 
 private:
 
+    /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
-    // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
 
+    /// = Instance of the strategy.
   static ACE_EDF_Scheduler_Strategy *instance_;
-    // = Instance of the strategy.
 
 };
 
 
+/**
+ * @class ACE_Criticality_Scheduler_Strategy
+ *
+ * @brief ACE_Criticality_Scheduler_Strategy
+ *
+ * Defines "schedule" method using a simple mapping directly from
+ * operation criticality to static priority.
+ */
 class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_Criticality_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using a simple mapping directly from
-  //    operation criticality to static priority.
 {
 public:
 
+    /// = Constructor.
   ACE_Criticality_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = Constructor.
 
+    /// = Virtual destructor.
   virtual ~ACE_Criticality_Scheduler_Strategy ();
-    // = Virtual destructor.
 
+    /// = Returns an instance of the strategy.
   static ACE_Criticality_Scheduler_Strategy *instance ();
-    // = Returns an instance of the strategy.
 
+    /**
+     * = Compares two dispatch entries by minimum period: returns -1 if the
+     *   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
+     *   or 1 if the second Dispatch_Entry is greater in the order.
+     */
   virtual int priority_comp (const Dispatch_Entry &first_entry,
                              const Dispatch_Entry &second_entry);
-    // = Compares two dispatch entries by minimum period: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
 
+    /// = Sort the dispatch entry link pointer array in descending
+    ///   criticality order.
   virtual void sort (Dispatch_Entry **dispatch_entries,
                      u_int count);
-    // = Sort the dispatch entry link pointer array in descending
-    //   criticality order.
 
+    /// = Determine the minimum critical priority number.
   virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = Determine the minimum critical priority number.
 
+  /// Provide the dispatching queue type for the given dispatch entry.
   virtual ACE_DynScheduler::Dispatching_Type
     dispatch_type (const Dispatch_Entry &entry);
-  // Provide the dispatching queue type for the given dispatch entry.
 
 protected:
 
+    /// = Just returns 0: all operations have
+    ///   the same dynamic subpriority value.
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
                                       RtecScheduler::Time current_time);
-    // = Just returns 0: all operations have
-    //   the same dynamic subpriority value.
 
+    /// = All dispatches in a given priority level have the same dynamic
+    ///   subpriority under this strategy: just returns 0.
   virtual int dynamic_subpriority_comp
     (const Dispatch_Entry &first_entry,
      const Dispatch_Entry &second_entry);
-    // = All dispatches in a given priority level have the same dynamic
-    //   subpriority under this strategy: just returns 0.
 
 private:
 
+    /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
-    // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
 
+    /// = Instance of the strategy.
   static ACE_Criticality_Scheduler_Strategy *instance_;
-    // = Instance of the strategy.
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 897086c11c3..216a38e3212 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Scheduler_Factory.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Scheduler_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACE_SCHEDULER_FACTORY_H
 #define ACE_SCHEDULER_FACTORY_H
@@ -36,43 +33,42 @@ struct TAO_RT_Info_Tuple;
 typedef ACE_Ordered_MultiSet<TAO_RT_Info_Tuple *> TUPLE_SET;
 typedef ACE_Ordered_MultiSet_Iterator<TAO_RT_Info_Tuple *> TUPLE_SET_ITERATOR;
 
+/**
+ * @class ACE_Scheduler_Factory
+ *
+ * @brief Factory of scheduler services.
+ *
+ * This class acts as a factory for scheduler servers. At config
+ * time it will return a remote server, which will actually
+ * compute the scheduling parameters. At run-time it returns a
+ * local server, which will use the results of the config runs to
+ * actually do the scheduling, without incurring in RPC overheads.
+ */
 class TAO_RTSched_Export ACE_Scheduler_Factory
 {
-  // = TITLE
-  //   Factory of scheduler services.
-  //
-  // = DESCRIPTION
-  //   This class acts as a factory for scheduler servers. At config
-  //   time it will return a remote server, which will actually
-  //   compute the scheduling parameters. At run-time it returns a
-  //   local server, which will use the results of the config runs to
-  //   actually do the scheduling, without incurring in RPC overheads.
 public:
+  /*
+   * This type enumerates the possible states of the factory:
+   * uninitialized, or in a configuration, runtime, or
+   * reconfigurable mode of operation.
+   */
   enum Factory_Status
   {
-    // = TITLE
-    //   Factory Status
-    //
-    // = DESCRIPTION
-    //   This type enumerates the possible states of the factory:
-    //   uninitialized, or in a configuration, runtime, or
-    //   reconfigurable mode of operation.
-
     UNINITIALIZED,
     CONFIG,
     RECONFIG,
     RUNTIME
   };
 
+  /*
+   * @brief Plain Old Data for RT_Infos.
+   *
+   * This class provide us with a plain old data version of
+   * RT_Info, this is useful for implementing arrays of
+   * those.
+   */
   struct POD_RT_Info
   {
-    // = TITLE
-    //   Plain Old Data for RT_Infos.
-    //
-    // = DESCRIPTION
-    //   This class provide us with a plain old data version of
-    //   RT_Info, this is useful for implementing arrays of
-    //   those.
 
     const char *entry_point;
     RtecScheduler::handle_t handle;
@@ -140,31 +136,38 @@ public:
     RtecScheduler::Anomaly_Severity severity;
   };
 
+  /// Setup the variables needed for a config run, using the
+  /// NamingContext to locate a Scheduler.
   static int use_config (CosNaming::NamingContext_ptr naming);
-  // Setup the variables needed for a config run, using the
-  // NamingContext to locate a Scheduler.
 
+  /// Setup the variables needed for a config run, using the
+  /// NamingContext to locate a Scheduler.
   static int use_config (CosNaming::NamingContext_ptr naming,
                          const char* name);
-  // Setup the variables needed for a config run, using the
-  // NamingContext to locate a Scheduler.
 
+  /// Disable config runs in the Factory and sets up the precomputed
+  /// scheduling information.
   static int use_runtime (int cc,
                           POD_Config_Info cfgi[],
                           int ec,
                           POD_RT_Info rti[]);
-  // Disable config runs in the Factory and sets up the precomputed
-  // scheduling information.
 
+  /**
+   * Return the Real-time Scheduling Service used for this run.
+   * Must have been configured either using use_context() or use_data().
+   *
+   * Normally use_data() is called at static elaboration time, so
+   * everything is automatic.  On config runs use_context() is called
+   * from main, after resolve_initial_references.
+   */
   static int server (RtecScheduler::Scheduler_ptr);
   static RtecScheduler::Scheduler_ptr server (void);
-  // Return the Real-time Scheduling Service used for this run.
-  // Must have been configured either using use_context() or use_data().
-  //
-  // Normally use_data() is called at static elaboration time, so
-  // everything is automatic.  On config runs use_context() is called
-  // from main, after resolve_initial_references.
 
+  /**
+   * This helper function will dump the schedule returned by a
+   * RtecScheduler::Scheduler into a file, the file can be compiled to
+   * create an efficient local implementation of the Scheduler.
+   */
   static int dump_schedule (const RtecScheduler::RT_Info_Set& infos,
                             const RtecScheduler::Dependency_Set& dependencies,
                             const RtecScheduler::Config_Info_Set& configs,
@@ -175,64 +178,65 @@ public:
                             const char* config_info_format = 0,
                             int dump_disabled_infos = 0,
                             int dump_disabled_dependencies = 0);
-  // This helper function will dump the schedule returned by a
-  // RtecScheduler::Scheduler into a file, the file can be compiled to
-  // create an efficient local implementation of the Scheduler.
 
   // TODO: How to do cleanup()? Use the ACE_Object_Manager stuff?
 
+  /// This helper function prints out a single scheduling entry contents
   static void log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * entry,
                                    FILE* file);
-  // This helper function prints out a single scheduling entry contents
 
+  /// This helper function prints out the intermediate scheduling entries
   static int log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** entry_ptr_array,
                                      long entry_ptr_array_size,
                                      const char* file_name);
-  // This helper function prints out the intermediate scheduling entries
 
+  /// This helper function prints out the arry used to create scheduling entries
+  /// sorted in topological order then priority order
   static void log_scheduling_tuples(TAO_RT_Info_Tuple ** tuple_ptr_array,
                                     long tuple_ptr_array_size,
                                     const char* file_name);
-  // This helper function prints out the arry used to create scheduling entries
-  // sorted in topological order then priority order
 
   static void log_tuple_subset(TUPLE_SET & tuple_subset,
                                FILE* file);
 
+  /**
+   * This helper function allows the application to determine whether
+   * the factory is uninitialized, or in a config or runtime mode of
+   * operation.
+   */
   static Factory_Status status (void);
-  // This helper function allows the application to determine whether
-  // the factory is uninitialized, or in a config or runtime mode of
-  // operation.
 
   // = Access the (OS independent) preemption priority of the calling thread.
+  /// Returns (u_int) -1 if the preemption priority hadn't been set.
   static RtecScheduler::Preemption_Priority_t preemption_priority ();
-  // Returns (u_int) -1 if the preemption priority hadn't been set.
 
   // = Set the (OS independent) preemption priority of the calling thread.
+  /**
+   * The application or Event Channel is responsible for making sure
+   * that the preemption priority is set before any access of the
+   * preemption priority.
+   */
   static void set_preemption_priority
     (const RtecScheduler::Preemption_Priority_t);
-  // The application or Event Channel is responsible for making sure
-  // that the preemption priority is set before any access of the
-  // preemption priority.
 
   // Accessor for obtaining the default period (Boeing Extension)
+  /// Method for setting the default period (Boeing Extension)
   static RtecScheduler::Period_t period_default();
-  // Method for setting the default period (Boeing Extension)
   static void period_default(RtecScheduler::Period_t period_default);
 
   // Accessor for obtaining the default threads (Boeing Extension)
+  /// Method for setting the default threads (Boeing Extension)
   static RtecScheduler::Threads_t threads_default();
-  // Method for setting the default threads (Boeing Extension)
   static void threads_default(RtecScheduler::Threads_t threads_default);
 
   // Accessor for obtaining the default importance (VERY_LOW_IMPORTANCE to VERY_HIGH_IMPORTANCE).  (Boeing Extension)
+  /// Method for setting the default importance (VERY_LOW_IMPORTANCE to VERY_HIGH_IMPORTANCE).  (Boeing Extension)
   static RtecScheduler::Importance_t importance_default();
-  // Method for setting the default importance (VERY_LOW_IMPORTANCE to VERY_HIGH_IMPORTANCE).  (Boeing Extension)
   static void importance_default(RtecScheduler::Importance_t importance_default);
 
   // Accessor for obtaining the default criticality (VERY_LOW_CRITICALITY to VERY_HIGH_CRITICALITY).  (Boeing Extension)
+  /// Method for setting the default criticality (VERY_LOW_CRITICALITY to VERY_HIGH_CRITICALITY).  (Boeing Extension)
   static RtecScheduler::Criticality_t criticality_default();
-  // Method for setting the default criticality (VERY_LOW_CRITICALITY to VERY_HIGH_CRITICALITY).  (Boeing Extension)
   static void criticality_default(RtecScheduler::Criticality_t criticality_default);
 
   // Accessor for obtaining the default rt_info enabled state.  (RT_INFO_DISABLED, RT_INFO_ENABLED, or RT_INFO_NON_VOLATILE)
@@ -243,29 +247,31 @@ public:
 
 protected:
 
+  /**
+   * By default this factory assumes we are runnning a config
+   * run. Calling this method disables that.  Since the methods
+   * returns an int it can be used to initialize a static variable,
+   * hence calling it before main(); this technique can be used in the
+   * code emitted for the run-time scheduler, automagically disabling
+   * the config_run() when that code is linked in.
+   */
   static int no_config_run (void);
-  // By default this factory assumes we are runnning a config
-  // run. Calling this method disables that.  Since the methods
-  // returns an int it can be used to initialize a static variable,
-  // hence calling it before main(); this technique can be used in the
-  // code emitted for the run-time scheduler, automagically disabling
-  // the config_run() when that code is linked in.
 
 private:
   static RtecScheduler::Scheduler_ptr server_;
 
   static Factory_Status status_;
-  // Default period configuration.  (Boeing Extension)
+  /// Default period configuration.  (Boeing Extension)
   static RtecScheduler::Period_t period_default_;
-  // Default threads configuration.  (Boeing Extension)
+  /// Default threads configuration.  (Boeing Extension)
   static RtecScheduler::Threads_t threads_default_;
 
-  // Default importance configuration.  (Boeing Extension)
+  /// Default importance configuration.  (Boeing Extension)
   static RtecScheduler::Importance_t importance_default_;
-  // Default criticality.  (Boeing Extension)
+  /// Default criticality.  (Boeing Extension)
   static RtecScheduler::Criticality_t criticality_default_;
 
-  // Default rt_info enabled state.  (Boeing Extension)
+  /// Default rt_info enabled state.  (Boeing Extension)
   static RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default_;
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index c6f5d8fe904..e49c21baba5 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Scheduler_Utilities.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduler_Utilities.h
+ *
+ *  $Id$
+ *
+ *  @author  Chris Gill <cdgill@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACE_SCHEDULER_UTILITIES_H
 #define ACE_SCHEDULER_UTILITIES_H
@@ -26,18 +23,20 @@
 
 #include "orbsvcs/Sched/sched_export.h"
 
+/**
+ * @class ACE_RT_Info
+ *
+ * @brief Offers a convenient C++ interface to the IDL RT_Info structure.
+ *
+ * For performance reasons the RT_Info data is represented as an
+ * IDL structure, this permits sending complete RT_Info's from the
+ * client to the server.  Unfortunately this precludes the usage
+ * of member functions and constructors, this class serves as a
+ * helper to implement those without loosing the performance on
+ * IDL.
+ */
 class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info
 {
-  // = TITLE
-  //   Offers a convenient C++ interface to the IDL RT_Info structure.
-  //
-  // = DESCRIPTION
-  //   For performance reasons the RT_Info data is represented as an
-  //   IDL structure, this permits sending complete RT_Info's from the
-  //   client to the server.  Unfortunately this precludes the usage
-  //   of member functions and constructors, this class serves as a
-  //   helper to implement those without loosing the performance on
-  //   IDL.
 public:
 
   /// Construct a helper class instance from values for
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index a943d276918..c4473d5e5fa 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -24,14 +24,12 @@ TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void)
 
 CORBA::PolicyType
 TAO::Security::EstablishTrustPolicy::policy_type ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecEstablishTrustPolicy;
 }
 
 CORBA::Policy_ptr
 TAO::Security::EstablishTrustPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::EstablishTrustPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -47,13 +45,11 @@ TAO::Security::EstablishTrustPolicy::copy (void)
 
 void
 TAO::Security::EstablishTrustPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 ::Security::EstablishTrust
 TAO::Security::EstablishTrustPolicy::trust (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->trust_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index fc9fa6fd086..b53f35a3582 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -64,20 +64,16 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::PolicyType policy_type (void);
 
-      virtual CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Policy_ptr copy (void);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
       //@}
 
       /// Return the "establish trust" value associated with this
       /// policy.
-      virtual ::Security::EstablishTrust trust (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual ::Security::EstablishTrust trust (void);
 
     protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index cf08adc0434..3d025263540 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -23,14 +23,12 @@ TAO::Security::QOPPolicy::~QOPPolicy (void)
 
 CORBA::PolicyType
 TAO::Security::QOPPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
 TAO::Security::QOPPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::QOPPolicy * policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -46,13 +44,11 @@ TAO::Security::QOPPolicy::copy (void)
 
 void
 TAO::Security::QOPPolicy::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::QOP
 TAO::Security::QOPPolicy::qop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->qop_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index 2eb71919ffb..bd5c87416be 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -61,20 +61,16 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::PolicyType policy_type (void);
 
-      virtual CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Policy_ptr copy (void);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
       //@}
 
       /// Return the Quality-of-Protection value associated with this
       /// policy.
-      virtual ::Security::QOP qop (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual ::Security::QOP qop (void);
 
     protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index c3322d69bb3..f37c826cfd1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -31,14 +31,12 @@ TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void)
 
 SecurityLevel3::CredsDirective
 TAO::SL3::ContextEstablishmentPolicy::creds_directive ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->creds_directive_;
 }
 
 SecurityLevel3::OwnCredentialsList *
 TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -51,44 +49,38 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
 
 SecurityLevel3::FeatureDirective
 TAO::SL3::ContextEstablishmentPolicy::use_client_auth ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_client_auth_;
 }
 
 SecurityLevel3::FeatureDirective
 TAO::SL3::ContextEstablishmentPolicy::use_target_auth ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_target_auth_;
 }
 
 SecurityLevel3::FeatureDirective
 TAO::SL3::ContextEstablishmentPolicy::use_confidentiality ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_confidentiality_;
 }
 
 SecurityLevel3::FeatureDirective
 TAO::SL3::ContextEstablishmentPolicy::use_integrity ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_integrity_;
 }
 
 CORBA::PolicyType
 TAO::SL3::ContextEstablishmentPolicy::policy_type ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ContextEstablishmentPolicyType;
 }
 
 CORBA::Policy_ptr
 TAO::SL3::ContextEstablishmentPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Policy_ptr p = CORBA::Policy::_nil ();
+  CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
                     TAO::SL3::ContextEstablishmentPolicy (
                       this->creds_directive_,
@@ -104,7 +96,6 @@ TAO::SL3::ContextEstablishmentPolicy::copy (void)
 
 void
 TAO::SL3::ContextEstablishmentPolicy::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_directive_     = SecurityLevel3::CD_Default;
   this->creds_list_.length (0);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index bd664701111..74065d41b01 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -65,32 +65,23 @@ namespace TAO
        * SecurityLevel3::ContextEstablishmentPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::CredsDirective creds_directive ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredsDirective creds_directive ();
 
-      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ();
 
-      virtual SecurityLevel3::FeatureDirective use_client_auth ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::FeatureDirective use_client_auth ();
 
-      virtual SecurityLevel3::FeatureDirective use_target_auth ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::FeatureDirective use_target_auth ();
 
-      virtual SecurityLevel3::FeatureDirective use_confidentiality ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::FeatureDirective use_confidentiality ();
 
-      virtual SecurityLevel3::FeatureDirective use_integrity ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::FeatureDirective use_integrity ();
 
-      virtual CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::PolicyType policy_type (void);
 
-      virtual CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Policy_ptr copy (void);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 612b818c930..9c89692440f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -76,7 +76,6 @@ TAO::SL3::CredentialsCurator::_nil (void)
 
 SecurityLevel3::AcquisitionMethodList *
 TAO::SL3::CredentialsCurator::supported_methods (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::AcquisitionMethodList * list;
   ACE_NEW_THROW_EX (list,
@@ -108,7 +107,6 @@ SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SL3::CredentialsCurator::acquire_credentials (
     const char * acquisition_method,
     const CORBA::Any & acquisition_arguments)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::CredentialsAcquirerFactory * factory;
 
@@ -119,14 +117,12 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
                             acquisition_arguments);
     }
 
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                    SecurityLevel3::CredentialsAcquirer::_nil ());
+  throw CORBA::BAD_PARAM ();
 
 }
 
 SecurityLevel3::OwnCredentialsList *
 TAO::SL3::CredentialsCurator::default_creds_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * list;
   ACE_NEW_THROW_EX (list,
@@ -158,7 +154,6 @@ TAO::SL3::CredentialsCurator::default_creds_list (void)
 
 SecurityLevel3::CredentialsIdList *
 TAO::SL3::CredentialsCurator::default_creds_ids (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::CredentialsIdList * list;
   ACE_NEW_THROW_EX (list,
@@ -189,7 +184,6 @@ TAO::SL3::CredentialsCurator::default_creds_ids (void)
 SecurityLevel3::OwnCredentials_ptr
 TAO::SL3::CredentialsCurator::get_own_credentials (
     const char * credentials_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
 
@@ -210,7 +204,6 @@ TAO::SL3::CredentialsCurator::get_own_credentials (
 void
 TAO::SL3::CredentialsCurator::release_own_credentials (
     const char * credentials_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index db6523f2948..25c932ef5e9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -96,26 +96,20 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::AcquisitionMethodList * supported_methods ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::AcquisitionMethodList * supported_methods ();
 
       virtual SecurityLevel3::CredentialsAcquirer_ptr acquire_credentials (
           const char * acquisition_method,
-          const CORBA::Any & acquisition_arguments)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          const CORBA::Any & acquisition_arguments);
 
-      virtual SecurityLevel3::OwnCredentialsList * default_creds_list ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::OwnCredentialsList * default_creds_list ();
 
-      virtual SecurityLevel3::CredentialsIdList * default_creds_ids ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsIdList * default_creds_ids ();
 
       virtual SecurityLevel3::OwnCredentials_ptr get_own_credentials (
-          const char * credentials_id)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          const char * credentials_id);
 
-      virtual void release_own_credentials (const char * credentials_id)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void release_own_credentials (const char * credentials_id);
       //@}
 
       /// Register CredentialsAcquirer factory.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 96f517b894a..78ca31f5279 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -22,7 +22,6 @@ TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
 
 SecurityLevel3::OwnCredentialsList *
 TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -35,16 +34,14 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
 
 CORBA::PolicyType
 TAO::SL3::ObjectCredentialsPolicy::policy_type ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ObjectCredentialsPolicyType;
 }
 
 CORBA::Policy_ptr
 TAO::SL3::ObjectCredentialsPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Policy_ptr p = CORBA::Policy::_nil ();
+  CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
                     TAO::SL3::ObjectCredentialsPolicy (this->creds_list_),
                     CORBA::NO_MEMORY ());
@@ -54,7 +51,6 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void)
 
 void
 TAO::SL3::ObjectCredentialsPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_list_.length (0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index 03741cd8e89..f45f789aaaf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -65,17 +65,13 @@ namespace TAO
        * SecurityLevel3::ObjectCredentialsPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ();
 
-      virtual CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::PolicyType policy_type (void);
 
-      virtual CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Policy_ptr copy (void);
 
-      virtual void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void destroy (void);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index ecc4c6b6513..cf05bd9ba75 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -15,17 +15,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
                                         const CORBA::Any & value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
-  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+  CORBA::Policy_ptr policy = CORBA::Policy_ptr ();
 
   if (type == SecurityLevel3::ContextEstablishmentPolicyType)
     {
       SecurityLevel3::ContextEstablishmentPolicyArgument * arg = 0;
       if (!(value >>= arg))
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          policy);
+        throw CORBA::INTERNAL ();
 
       ACE_NEW_THROW_EX (policy,
                         TAO::SL3::ContextEstablishmentPolicy (
@@ -41,8 +38,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
     {
       SecurityLevel3::ObjectCredentialsPolicyArgument * creds = 0;
       if (!(value >>= creds))
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          policy);
+        throw CORBA::INTERNAL ();
 
       ACE_NEW_THROW_EX (policy,
                         TAO::SL3::ObjectCredentialsPolicy (*creds),
@@ -50,8 +46,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
     }
   else
     {
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                        policy);
+      throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
     }
 
   return policy;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index e770e7d697b..9804c3013c5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -61,9 +61,7 @@ namespace TAO
 
         /// Construct a Test::Policy object as a test.
         virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                                 const CORBA::Any & value)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           CORBA::PolicyError));
+                                                 const CORBA::Any & value);
 
         //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index 04ada737774..faec8ac6679 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -28,7 +28,6 @@ TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
 
 SecurityLevel3::ClientCredentials_ptr
 TAO::SL3::SecurityCurrent::client_credentials (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
@@ -36,15 +35,13 @@ TAO::SL3::SecurityCurrent::client_credentials (void)
   // we're not in the middle of a request/upcall.  Throw an exception
   // to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
-                      SecurityLevel3::ClientCredentials::_nil ());
+    throw CORBA::BAD_INV_ORDER ();
 
   return impl->client_credentials ();
 }
 
 CORBA::Boolean
 TAO::SL3::SecurityCurrent::request_is_local (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
@@ -52,7 +49,7 @@ TAO::SL3::SecurityCurrent::request_is_local (void)
   // we're not in the middle of a request/upcall.  Throw an exception
   // to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), false);
+    throw CORBA::BAD_INV_ORDER ();
 
   return impl->request_is_local ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index ee33fdb8452..08bfa48a9d3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -69,11 +69,9 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ();
 
-      virtual CORBA::Boolean request_is_local (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Boolean request_is_local (void);
       //@}
 
       /// Return the TSS slot ID assigned to the "SecurityCurrent"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index ab07794ba60..3ad7d0f6e0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -61,11 +61,11 @@ namespace TAO
       /// Return the Credentials received from the client associate with
       /// the current request.
       virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        = 0;
 
       /// Is the current request local?
       virtual CORBA::Boolean request_is_local ()
-        ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 033908152ec..bb9f8b58bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -24,7 +24,6 @@ TAO::SL3::SecurityManager::~SecurityManager (void)
 
 SecurityLevel3::CredentialsCurator_ptr
 TAO::SL3::SecurityManager::credentials_curator ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     SecurityLevel3::CredentialsCurator::_duplicate (
@@ -33,10 +32,8 @@ TAO::SL3::SecurityManager::credentials_curator ()
 
 SecurityLevel3::TargetCredentials_ptr
 TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    SecurityLevel3::TargetCredentials::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ContextEstablishmentPolicy_ptr
@@ -47,7 +44,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
     SecurityLevel3::FeatureDirective use_target_auth,
     SecurityLevel3::FeatureDirective use_confidentiality,
     SecurityLevel3::FeatureDirective use_integrity)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ContextEstablishmentPolicy_ptr policy;
   ACE_NEW_THROW_EX (policy,
@@ -65,7 +61,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
 SecurityLevel3::ObjectCredentialsPolicy_ptr
 TAO::SL3::SecurityManager::create_object_creds_policy (
     const SecurityLevel3::OwnCredentialsList & creds_list)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ObjectCredentialsPolicy_ptr policy;
   ACE_NEW_THROW_EX (policy,
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 716345d94ed..4bd46f9ea20 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -60,12 +60,10 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator ();
 
       virtual SecurityLevel3::TargetCredentials_ptr get_target_credentials (
-          CORBA::Object_ptr the_object)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          CORBA::Object_ptr the_object);
 
       virtual SecurityLevel3::ContextEstablishmentPolicy_ptr
       create_context_estab_policy (
@@ -74,13 +72,11 @@ namespace TAO
           SecurityLevel3::FeatureDirective use_client_auth,
           SecurityLevel3::FeatureDirective use_target_auth,
           SecurityLevel3::FeatureDirective use_confidentiality,
-          SecurityLevel3::FeatureDirective use_integrity)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          SecurityLevel3::FeatureDirective use_integrity);
 
       virtual SecurityLevel3::ObjectCredentialsPolicy_ptr
       create_object_creds_policy (
-          const SecurityLevel3::OwnCredentialsList & cred_list)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+          const SecurityLevel3::OwnCredentialsList & cred_list);
       //@}
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 657f66b3dec..32cfdbcdd66 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -28,7 +28,6 @@ TAO_Security_Current::~TAO_Security_Current (void)
 Security::AttributeList *
 TAO_Security_Current::get_attributes (
     const Security::AttributeTypeList &attributes)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
 
@@ -36,14 +35,13 @@ TAO_Security_Current::get_attributes (
   // we're not in the middle of a request/upcall.  Throw an exception
   // to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw CORBA::BAD_INV_ORDER ();
 
   return impl->get_attributes (attributes);
 }
 
 SecurityLevel2::ReceivedCredentials_ptr
 TAO_Security_Current::received_credentials ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
 
@@ -51,7 +49,7 @@ TAO_Security_Current::received_credentials ()
   // we're not in the middle of a request/upcall.  Throw an exception
   // to indicate that.
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw CORBA::BAD_INV_ORDER ();
 
   return impl->received_credentials ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index eeed650d20b..847ad9a85fd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -63,8 +63,7 @@ public:
   /// Return the security attributes corresponding to the types in the
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList & attributes)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const Security::AttributeTypeList & attributes);
   //@}
 
   /**
@@ -76,8 +75,7 @@ public:
   //@{
   /// Return the Credentials received from the client associate with
   /// the current request.
-  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ();
   //@}
 
   /// Return the TSS slot ID assigned to the "SecurityCurrent" object.
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index a0cfbaccbee..3c4d5846b56 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -62,7 +62,7 @@ namespace TAO
       /// request.
       virtual ::Security::AttributeList * get_attributes (
           const ::Security::AttributeTypeList & attributes)
-        ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        = 0;
       //@}
 
       /**
@@ -75,7 +75,7 @@ namespace TAO
       /// Return the Credentials received from the client associate with
       /// the current request.
       virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
-        ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index e7830c498cc..970aff6e1dd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO::Security::ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // allocate_tss_slot_id() TAO extension.
@@ -129,7 +128,6 @@ TAO::Security::ORBInitializer::pre_init (
 void
 TAO::Security::ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index 758b02e6227..5fafd3f3928 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -1,19 +1,15 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Security_ORBInitializer.h
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Security_ORBInitializer.h
+ *
+ *  $Id$
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_SECURITY_ORB_INITIALIZER_H
 #define TAO_SECURITY_ORB_INITIALIZER_H
@@ -69,11 +65,9 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
       //@}
 
     private:
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index cb91d9c18ec..4d0ff92fb13 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -23,8 +23,6 @@ CORBA::Policy_ptr
 TAO::Security::PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
   // Not all security policies can be created using the
   // ORB::create_policy() mechanism.  Only those that can be created
@@ -37,12 +35,11 @@ TAO::Security::PolicyFactory::create_policy (
       // Extract the desired Quality-of-Protection value from the
       // given Any.
       if (!(value >>= qop))
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          CORBA::Policy::_nil ());
+        throw CORBA::BAD_PARAM (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
 
       TAO::Security::QOPPolicy * qop_policy = 0;
       ACE_NEW_THROW_EX (qop_policy,
@@ -63,12 +60,11 @@ TAO::Security::PolicyFactory::create_policy (
       // Extract the desired establishing of trust value from the
       // given Any.
       if (!(value >>= trust))
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          CORBA::Policy::_nil ());
+        throw CORBA::BAD_PARAM (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
 
       TAO::Security::EstablishTrustPolicy * trust_policy = 0;
       ACE_NEW_THROW_EX (trust_policy,
@@ -89,12 +85,11 @@ TAO::Security::PolicyFactory::create_policy (
       // Extract the desired establishing of trust value from the
       // given Any.
       if (!(value >>= args))
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          CORBA::Policy::_nil ());
+        throw CORBA::BAD_PARAM (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
 
       TAO::SL3::ContextEstablishmentPolicy * policy = 0;
       ACE_NEW_THROW_EX (policy,
@@ -121,12 +116,11 @@ TAO::Security::PolicyFactory::create_policy (
       // Extract the desired establishing of trust value from the
       // given Any.
       if (!(value >>= creds))
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          CORBA::Policy::_nil ());
+        throw CORBA::BAD_PARAM (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
 
       TAO::SL3::ObjectCredentialsPolicy * policy = 0;
       ACE_NEW_THROW_EX (policy,
@@ -144,11 +138,9 @@ TAO::Security::PolicyFactory::create_policy (
            || type == ::Security::SecMechanismsPolicy
            || type == ::Security::SecFeaturePolicy             // Deprecated.
            || type == ::Security::SecDelegationDirectivePolicy)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY);
   else
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index 9d460b2998b..336d9523d21 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -53,9 +53,7 @@ namespace TAO
     public:
 
       virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                               const CORBA::Any & value)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         CORBA::PolicyError));
+                                               const CORBA::Any & value);
     };
 
   } // End Security namespace
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index e243dfa2530..0215b3ac111 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -87,8 +87,7 @@ Service_Shutdown::~Service_Shutdown ()
 }
 
 int
-Service_Shutdown::handle_signal (int signum,
-                                 siginfo_t*, ucontext_t*)
+Service_Shutdown::handle_signal (int signum, siginfo_t*, ucontext_t*)
 {
   this->functor_(signum);
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 9df87c4087f..94afc1b68c8 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -21,7 +21,6 @@ TAO_TIO::~TAO_TIO (void)
 
 TimeBase::IntervalT
 TAO_TIO::time_interval (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_time_interval;
 }
@@ -35,7 +34,6 @@ TAO_TIO::time_interval (void)
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
                 CosTime::TIO_out overlap)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
@@ -148,7 +146,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                    CosTime::TIO_out overlap)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio_i = 0;
 
@@ -240,7 +237,6 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 
 CosTime::UTO_ptr
 TAO_TIO::time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index fb67c5abc65..6becb566a77 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -46,8 +46,7 @@ public:
   ~TAO_TIO (void);
 
   /// This is the get method for the attribute time interval.
-  virtual TimeBase::IntervalT  time_interval ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::IntervalT  time_interval ();
 
   /**
    * This operation returns a value of type OverlapType depending on
@@ -58,8 +57,7 @@ public:
    * intervals.
    */
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
-                                      CosTime::TIO_out overlap)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      CosTime::TIO_out overlap);
 
   /**
    * This operation returns a value of type OverlapType depending on
@@ -69,16 +67,14 @@ public:
    * out parameter contains the gap between the two intervals.
    */
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
-                                         CosTime::TIO_out overlap)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CosTime::TIO_out overlap);
 
   /**
    * Returns a UTO in which the inaccuracy interval is equal to the
    * time interval in the TIO and time value is the midpoint of the
    * interval.
    */
-  virtual CosTime::UTO_ptr time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTime::UTO_ptr time (void);
 
 private:
   /// This attribute returns an IntervalT structure with the values of
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index d4db0eb7c17..dca1d520b5e 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -41,8 +41,6 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   TAO_UTO *uto = 0;
 
@@ -62,11 +60,8 @@ TAO_Time_Service_Clerk::universal_time (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::secure_universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CosTime::UTO::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 // This creates a new UTO based on the given parameters.
@@ -75,7 +70,6 @@ CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                                             TimeBase::InaccuracyT inaccuracy,
                                             TimeBase::TdfT tdf)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
 
@@ -92,7 +86,6 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
 
@@ -116,7 +109,6 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc)
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
                                       TimeBase::TimeT upper)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index b9938706055..57e2dc4e56f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -60,9 +60,7 @@ public:
 
   /// This operation returns the global time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr universal_time (void);
 
   /**
    * This operation returns the global time in a UTO only if the time
@@ -70,24 +68,19 @@ public:
    * operation is not implemented and throws a CORBA::NO_IMPLEMENT
    * exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr secure_universal_time (void);
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                               TimeBase::TdfT tdf);
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc);
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         TimeBase::TimeT upper);
 
   /// Return the globally synchronized time.
   virtual CORBA::ULongLong get_time (void);
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 78b5861e658..25cca8b0475 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -28,8 +28,6 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   TAO_UTO *uto = 0;
 
@@ -57,11 +55,8 @@ TAO_Time_Service_Server::universal_time (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::secure_universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CosTime::UTO::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 // This creates a new UTO based on the given parameters.
@@ -70,7 +65,6 @@ CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                                              TimeBase::InaccuracyT inaccuracy,
                                              TimeBase::TdfT tdf)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
 
@@ -87,7 +81,6 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
 
@@ -105,7 +98,6 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc)
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
                                        TimeBase::TimeT upper)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 1bc33a07e4f..3fea331bbd9 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -48,33 +48,26 @@ public:
 
   /// This operation returns the current system time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr universal_time (void);
 
   /**
    * This operation returns the current time in a UTO only if the time
    * can be guaranteed to have been obtained securely. Currently this operation
    * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr secure_universal_time (void);
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                               TimeBase::TdfT tdf);
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc);
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         TimeBase::TimeT upper);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 0d4f0eaefe0..1572866de25 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -48,7 +48,6 @@ TAO_UTO::~TAO_UTO (void)
 
 TimeBase::TimeT
 TAO_UTO::time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.time;
 }
@@ -57,7 +56,6 @@ TAO_UTO::time (void)
 
 TimeBase::InaccuracyT
 TAO_UTO::inaccuracy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct the Inaccuracy from the
   // inacchi and inacclo.
@@ -72,7 +70,6 @@ TAO_UTO::inaccuracy (void)
 
 TimeBase::TdfT
 TAO_UTO::tdf (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.tdf;
 }
@@ -81,7 +78,6 @@ TAO_UTO::tdf (void)
 
 TimeBase::UtcT
 TAO_UTO::utc_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_;
 }
@@ -91,7 +87,6 @@ TAO_UTO::utc_time (void)
 
 CosTime::UTO_ptr
 TAO_UTO::absolute_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTime::UTO::_nil ();
 }
@@ -102,7 +97,6 @@ TAO_UTO::absolute_time (void)
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
                        CosTime::UTO_ptr uto)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TimeBase::TimeT uto_time = uto->time ();
 
@@ -161,7 +155,6 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 
 CosTime::TIO_ptr
 TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
@@ -200,7 +193,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
 
 CosTime::TIO_ptr
 TAO_UTO::interval (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index daa20dfffb2..312b5dad5b3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -54,35 +54,29 @@ public:
   ~TAO_UTO (void);
 
   /// For the readonly attribute <time>.
-  virtual TimeBase::TimeT time ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT time ();
 
   /// For the readonly attribute <inaccuracy>.
-  virtual TimeBase::InaccuracyT  inaccuracy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::InaccuracyT  inaccuracy (void);
 
   /// For the readonly attribute <tdf>, which is the "time displacement
   /// factor".
-  virtual TimeBase::TdfT tdf (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TdfT tdf (void);
 
   /// For the readonly attribute <utc_time>.
-  virtual TimeBase::UtcT utc_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::UtcT utc_time (void);
 
   /**
    * Absolute time = Relative time + Base time.
    * ?? Find out more about the Base Time, UTC and
    *    Distributed Time Sync. Algos. [3
    */
-  CosTime::UTO_ptr absolute_time (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CosTime::UTO_ptr absolute_time (void);
 
   /// Compares the time contained in the object with the time in the
   /// supplied uto according to the supplied comparison type.
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
-                                        CosTime::UTO_ptr uto)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        CosTime::UTO_ptr uto);
 
   /**
    * Returns a TIO representing the time interval between the time in
@@ -91,13 +85,11 @@ public:
    * two UTOs. Inaccuracies are ignored.  Note the result of this
    * operation is meaningless if the base times of UTOs are different.
    */
-  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr);
 
   /// Returns a TIO object representing the error interval around the
   /// time value in the UTO.
-  CosTime::TIO_ptr interval (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CosTime::TIO_ptr interval (void);
 
 private:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 5b020f7dcf3..7d5ce89fe6f 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Time_Utilities.h
-//
-// = AUTHOR
-//     David Levine <levine@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Time_Utilities.h
+ *
+ *  $Id$
+ *
+ *  @author  David Levine <levine@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ORBSVCS_TIME_UTILITIES_H
 #define ORBSVCS_TIME_UTILITIES_H
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index b3bf71083c7..c36317d1a59 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -15,8 +15,6 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* constraints
   )
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                   CORBA::NO_MEMORY))
   : TAO_Interpreter ()
 {
   // @@ Throwing Exception from constructor is very nasty situation to
@@ -43,8 +41,6 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
                            const char* constraints)
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                   CORBA::NO_MEMORY))
 {
   if (TAO_Interpreter::is_empty_string (constraints))
     {
@@ -83,8 +79,6 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* preference
   )
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                   CORBA::NO_MEMORY))
     : TAO_Interpreter ()
 {
   TAO_Trader_Constraint_Validator type_checker (ts);
@@ -108,8 +102,6 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter (
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
                            const char* preference)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                   CORBA::NO_MEMORY))
     : TAO_Interpreter ()
 {
   if (TAO_Interpreter::is_empty_string (preference))
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 32e46a62abf..4650d015089 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -48,9 +48,7 @@ class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* constraints)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                     CORBA::NO_MEMORY));
+                              const char* constraints);
 
   /**
    * This constructor builds an expression tree representing the
@@ -59,9 +57,7 @@ public:
    * semantic errors, such as mismatched types.
    */
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* constraints)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                     CORBA::NO_MEMORY));
+                              const char* constraints);
 
   /// Destructor
   ~TAO_Constraint_Interpreter (void);
@@ -93,9 +89,7 @@ class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* preference)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                     CORBA::NO_MEMORY));
+                              const char* preference);
 
   /**
 	* Parse the preference string, determining first if it's
@@ -103,9 +97,7 @@ public:
 	* doesn't conform to the BNF grammar for preferences.
 	*/
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* preference)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                     CORBA::NO_MEMORY));
+                              const char* preference);
 
   /// Destructor
   ~TAO_Preference_Interpreter(void);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 7f3b9c5190d..6dcd797dc16 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -9,7 +9,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
 sequence_type (CORBA::TypeCode* type_code)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Seth, why do you use a comma to separate the two statements?
   CORBA::TCKind return_value = CORBA::tk_void,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index fe86953e15f..7045cbc1840 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -86,8 +86,7 @@ class TAO_Sequence_Extracter_Base
 {
 public:
 
-  static CORBA::TCKind sequence_type (CORBA::TypeCode* code)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  static CORBA::TCKind sequence_type (CORBA::TypeCode* code);
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 54e0f361dea..be521123e22 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -151,8 +151,6 @@ remove_offer (const char* type, CORBA::ULong id)
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const CosTrading::OfferId offer_id)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
 {
   char* stype = 0;
   CORBA::ULong index;
@@ -163,8 +161,7 @@ remove_offer (const CosTrading::OfferId offer_id)
 
   if (this->remove_offer (stype,
                           index) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id),
-                      -1);
+    throw CosTrading::UnknownOfferId (offer_id);
 
   return 0;
 }
@@ -173,15 +170,13 @@ template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
               char*& type_name)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
   this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
+    throw CosTrading::UnknownOfferId (offer_id);
 
   return offer;
 }
@@ -190,8 +185,6 @@ lookup_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
 {
   char* type_name;
   CORBA::ULong index;
@@ -200,7 +193,7 @@ lookup_offer (const CosTrading::OfferId offer_id)
   this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
+    throw CosTrading::UnknownOfferId (offer_id);
 
   return offer;
 }
@@ -270,7 +263,6 @@ TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
                 CORBA::ULong& id)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
   service_type = (char *) offer_id + 16;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 5a8f5d56395..3d5dc93fad2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -66,15 +66,11 @@ public:
   CosTrading::OfferId insert_offer (const char* type,
                                     CosTrading::Offer* offer);
 
-  int remove_offer (const CosTrading::OfferId offer_id)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                    CosTrading::UnknownOfferId));
+  int remove_offer (const CosTrading::OfferId offer_id);
 
   /// Lookup an offer whose offer_id is <offer_id>, and return
   /// it. Otherwise, throw the appropriate exception.
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                    CosTrading::UnknownOfferId));
+  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id);
 
   /**
    * Lookup an offer whose OfferId is <offer_id> and return in
@@ -82,9 +78,7 @@ public:
    * pointer to a location in offer_id, so DON'T DELETE IT.
    */
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   char*& type_name)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
-                    CosTrading::UnknownOfferId));
+                                   char*& type_name);
 
   /// Return an iterator that will traverse and return all the offer
   /// ids in the service type map.
@@ -135,8 +129,7 @@ private:
   /// and id that were used to generate the offer id.
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
-                              CORBA::ULong& id)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
+                              CORBA::ULong& id);
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Offer_Database<LOCK_TYPE> &))
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 074414e3eda..f8a41ab797b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -17,7 +17,6 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 
 void
 TAO_Offer_Iterator::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
@@ -50,8 +49,6 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
 
 CORBA::ULong
 TAO_Query_Only_Offer_Iterator::max_left (void)
-  ACE_THROW_SPEC((CORBA::SystemException,
-                 CosTrading::UnknownMaxLeft))
 {
   return static_cast<CORBA::ULong> (this->offers_.size ());
 }
@@ -59,7 +56,6 @@ TAO_Query_Only_Offer_Iterator::max_left (void)
 CORBA::Boolean
 TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
                                        CosTrading::OfferSeq_out offers)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
 
@@ -115,7 +111,6 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
                                        CosTrading::OfferSeq_out offers)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
   CORBA::Boolean return_value = 1;
@@ -167,7 +162,6 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 
 void
 TAO_Offer_Iterator_Collection::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
   for (Offer_Iters::ITERATOR iters_iter (this->iters_);
@@ -193,11 +187,8 @@ TAO_Offer_Iterator_Collection::destroy (void)
 
 CORBA::ULong
 TAO_Offer_Iterator_Collection::max_left (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::UnknownMaxLeft))
 {
-  ACE_THROW_RETURN (CosTrading::UnknownMaxLeft(),
-                    0);
+  throw CosTrading::UnknownMaxLeft();
 }
 
 TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator (void)
@@ -221,15 +212,12 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
 
 CORBA::ULong
 TAO_Offer_Id_Iterator::max_left (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::UnknownMaxLeft))
 {
   return static_cast<CORBA::ULong> (this->ids_.size ());
 }
 
 void
 TAO_Offer_Id_Iterator::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
@@ -245,7 +233,6 @@ TAO_Offer_Id_Iterator::destroy (void)
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
                                CosTrading::OfferIdSeq_out _ids)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
   CORBA::ULong items_left = static_cast<CORBA::ULong> (this->ids_.size());
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index a9508b81998..6b0ca4fdc7b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -59,8 +59,7 @@ public:
    * destroyed.
    * END SPEC
    */
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add an offer to the collection of offers the iterator will
   /// iterate over.
@@ -68,8 +67,7 @@ public:
                           const CosTrading::Offer* offer) = 0;
 
   virtual CORBA::ULong max_left (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::UnknownMaxLeft)) = 0;
+    = 0;
 
   // BEGIN SPEC
   // The max_left operation returns the number of service offers
@@ -95,7 +93,7 @@ public:
    */
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
  protected:
 
   TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&);
@@ -132,13 +130,10 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CosTrading::OfferSeq_out offers);
 
   /// Return the number of items left in the iterator.
-  virtual CORBA::ULong max_left (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::UnknownMaxLeft));
+  virtual CORBA::ULong max_left (void);
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId offer_id,
@@ -185,17 +180,13 @@ public:
 
   /// Retrieve n offers from the set of iterators.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CosTrading::OfferSeq_out offers);
 
   /// Destroy the collection of iterators.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Determine how many offers are left in the collection.
-  virtual CORBA::ULong max_left (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::UnknownMaxLeft));
+  virtual CORBA::ULong max_left (void);
 
   /// Add an iterator to the collection.
   void add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter);
@@ -245,17 +236,14 @@ class TAO_Offer_Id_Iterator :
    * identifiers (e.g., if the iterator determines its set of offer
    * identifiers through lazy evaluation).
    */
-  virtual CORBA::ULong max_left(void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::UnknownMaxLeft));
+  virtual CORBA::ULong max_left(void);
 
   /**
    * The destroy operation destroys the iterator. No further
    * operations can be invoked on an iterator after it has been
    * destroyed.
    */
-  virtual void destroy(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy(void);
 
   /**
    * The next_n operation returns a set of offer identifiers in the
@@ -270,8 +258,7 @@ class TAO_Offer_Id_Iterator :
    * further offer identifiers to be extracted.
    */
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
-                                CosTrading::OfferIdSeq_out _ids)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                CosTrading::OfferIdSeq_out _ids);
 
   /// Insert a <new_id> into the contents of the iterator.
   void insert_id(CosTrading::OfferId new_id);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index 1deb800e3a0..a1b62b70615 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -40,8 +40,6 @@ add_offer (CosTrading::OfferId id,
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 max_left (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::UnknownMaxLeft))
 {
   return static_cast<CORBA::ULong> (this->offer_ids_.size ());
 }
@@ -50,7 +48,6 @@ template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
         CosTrading::OfferSeq_out offers)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index f988790a61f..69fdcd1403c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -55,8 +55,7 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CosTrading::OfferSeq_out offers);
 
   /**
    * Throws CosTrading::UnknownMaxLeft since with the presence of
@@ -64,9 +63,7 @@ public:
    * the trader will have all the offers it has now when the time
    * to return them comes.
    */
-  virtual CORBA::ULong max_left (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::UnknownMaxLeft));
+  virtual CORBA::ULong max_left (void);
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId id,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 1c83064566d..bdc558cdd52 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -12,8 +12,7 @@ ACE_RCSID (Trader,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Service_Type_Repository::
-TAO_Service_Type_Repository (ACE_Lock* lock)
+TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock)
   : lock_ (lock)
 {
   this->incarnation_.low = 0;
@@ -46,7 +45,6 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
 TAO_Service_Type_Repository::incarnation (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
 
@@ -71,38 +69,20 @@ add_type (const char *name,
           const char *if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
           const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                   CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
 {
   Prop_Map prop_map;
   Service_Type_Map super_map;
-  CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
-
-  inc_num.low = 0;
-  inc_num.high = 0;
-
-  // With exceptions enabled, inc_num isn't used.
-  ACE_UNUSED_ARG (inc_num);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
   // Make sure Type name is valid.
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name),
-                      this->incarnation_);
+    throw CosTrading::IllegalServiceType (name);
 
   // Check if the service type already exists.
   CORBA::String_var type_name (name);
   if (this->type_map_.find (type_name) == 0)
-    ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists (),
-                      this->incarnation_);
+    throw CosTradingRepos::ServiceTypeRepository::ServiceTypeExists ();
 
   // Make sure all property names are valid and appear only once.
   this->validate_properties (prop_map,
@@ -122,8 +102,7 @@ add_type (const char *name,
   // Instead, we do this:
   //
   if (if_name == 0)
-    ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch (),
-                      this->incarnation_);
+    throw CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch ();
 
   // Collect and make sure that properties of all supertypes and this
   // type are compatible.  We can use prop_map and super_types_map for
@@ -155,10 +134,6 @@ add_type (const char *name,
 
 void
 TAO_Service_Type_Repository::remove_type (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
     throw CosTrading::IllegalServiceType (name);
@@ -184,7 +159,6 @@ TAO_Service_Type_Repository::remove_type (const char *name)
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
 TAO_Service_Type_Repository::
 list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -228,14 +202,11 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
 describe_type (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW_RETURN
-      (CosTrading::IllegalServiceType (name),
-       (CosTradingRepos::ServiceTypeRepository::TypeStruct *) 0);
+    {
+      throw CosTrading::IllegalServiceType (name);
+    }
 
   ACE_READ_GUARD_THROW_EX
     (ACE_Lock,
@@ -248,8 +219,7 @@ describe_type (const char * name)
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name),
-                      (CosTradingRepos::ServiceTypeRepository::TypeStruct *) 0);
+    throw CosTrading::UnknownServiceType (name);
 
   // Return appropriate information about the type.
   CosTradingRepos::ServiceTypeRepository::TypeStruct *descr = 0;
@@ -276,13 +246,9 @@ describe_type (const char * name)
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
 fully_describe_type (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name),
-                      0);
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -291,8 +257,7 @@ fully_describe_type (const char *name)
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name),
-                      0);
+    throw CosTrading::UnknownServiceType (name);
 
   // Return appropriate information about the type.
   CosTradingRepos::ServiceTypeRepository::TypeStruct *descr = 0;
@@ -320,10 +285,6 @@ fully_describe_type (const char *name)
 void
 TAO_Service_Type_Repository::
 mask_type (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
     throw CosTrading::IllegalServiceType (name);
@@ -348,12 +309,7 @@ mask_type (const char *name)
 }
 
 void
-TAO_Service_Type_Repository::
-unmask_type (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::IllegalServiceType,
-                  CosTrading::UnknownServiceType,
-                  CosTradingRepos::ServiceTypeRepository::NotMasked))
+TAO_Service_Type_Repository::unmask_type (const char *name)
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
     throw CosTrading::IllegalServiceType (name);
@@ -483,8 +439,6 @@ void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map &prop_map,
                      const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName))
 {
   for (CORBA::ULong i = 0;
        i < props.length ();
@@ -510,9 +464,6 @@ void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map &super_map,
                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-  ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
 {
   for (CORBA::ULong i = 0;
        i < super_types.length ();
@@ -546,7 +497,6 @@ void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map &prop_map,
                       const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-  ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index e2f1ff9de94..4c6add58960 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -43,8 +43,7 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    incarnation (void);
 
   /**
    * BEGIN SPEC
@@ -59,16 +58,7 @@ public:
   add_type (const char *name,
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types);
 
   // If the type creation is successful, an incarnation number is
   // returned as the value of the operation. Incarnation numbers are
@@ -115,15 +105,10 @@ public:
    * "name" has a service type which has been derived from it, then
    * the HasSubTypes exception is raised.  END SPEC
    */
-  virtual void remove_type (const char  *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+  virtual void remove_type (const char  *name);
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
-  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types);
 
   // BEGIN SPEC
   // The list_types operation permits a client to obtain the names of
@@ -146,10 +131,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  describe_type (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType));
+  describe_type (const char *name);
 
   /**
    * BEGIN SPEC
@@ -165,10 +147,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  fully_describe_type (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType));
+  fully_describe_type (const char *name);
 
   /**
    * BEGIN SPEC
@@ -184,11 +163,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void mask_type (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::AlreadyMasked));
+  virtual void mask_type (const char *name);
 
   /**
    * BEGIN SPEC
@@ -202,11 +177,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void unmask_type (const char  *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::NotMasked));
+  virtual void unmask_type (const char  *name);
 
 private:
 
@@ -261,28 +232,16 @@ private:
   /// Confirm that the properties in props have valid names, and aren't
   /// duplicated. Cram those properties into the prop_map.
   void validate_properties (Prop_Map &prop_map,
-                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName));
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props);
 
   /// Confirm that the each super type exists, and cram them into super_map.
   void validate_supertypes (Service_Type_Map &super_map,
-                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-    ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types);
 
   /// Ensure that properties of a super_type aren't having their types
   /// or retstrictions redefined.
   void validate_inheritance (Prop_Map &prop_map,
-                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
-    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
-
-  //  void validate_interface (const char *if_name,
-  //                       Service_Type_Map &super_map,
-  //)
-  //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
-  // Ensure that the interface type derives from its superclasses'.
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types);
 
   /// Update the type map with the information contained in the
   /// TypeStruct, prop_map, and super_map.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 35324eab393..90b09d487da 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -48,17 +48,6 @@ query (const char *type,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
        CosTrading::PolicyNameSeq_out returned_limits_applied)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
   TAO_Policies policies (this->trader_, in_policies);
@@ -333,8 +322,6 @@ fill_receptacles (const char* /* type */,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
                   CosTrading::OfferIterator_ptr& offer_itr)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                  CosTrading::DuplicatePropertyName))
 {
   // BEGIN SPEC
   // The returned offers are passed back in one of two ways (or a
@@ -465,8 +452,6 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
                 CosTrading::LinkNameSeq_out links)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
   CosTrading::FollowOption follow_rule = policies.link_follow_rule ();
@@ -541,17 +526,6 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
                  CosTrading::PolicyNameSeq& limits)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   // The general idea here is this: We've assembled a number of links
   // to follow, and we'll query each of them in turn. On each query we
@@ -700,17 +674,6 @@ forward_query (const char* next_hop,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
                CosTrading::PolicyNameSeq_out limits_applied)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   // Forward this query to the next link in the starting_trader sequence.
   CosTrading::Link_ptr link_interface
@@ -769,8 +732,6 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
                  CosTrading::Admin::OctetSeq*& seq)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
 
@@ -841,20 +802,10 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
              const CosTrading::PropertySeq &properties)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::Register::InvalidObjectRef,
-                  CosTrading::IllegalServiceType,
-                  CosTrading::UnknownServiceType,
-                  CosTrading::Register::InterfaceTypeMismatch,
-                  CosTrading::IllegalPropertyName,
-                  CosTrading::PropertyTypeMismatch,
-                  CosTrading::ReadonlyDynamicProperty,
-                  CosTrading::MissingMandatoryProperty,
-                  CosTrading::DuplicatePropertyName))
 {
   // For robustness purposes --
   if (CORBA::is_nil (reference))
-    ACE_THROW_RETURN (CosTrading::Register::InvalidObjectRef (), 0);
+    throw CosTrading::Register::InvalidObjectRef ();
 
   // Get service type map
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
@@ -873,14 +824,13 @@ _cxx_export (CORBA::Object_ptr reference,
   // Oops the type is masked, we shouldn't let exporters know the type
   // exists.
   if (type_struct->masked)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (type), 0);
+    throw CosTrading::UnknownServiceType (type);
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
   int check = (! reference->_is_a (type_struct->if_name));
   if (check)
-    ACE_THROW_RETURN (CosTrading::Register::
-                      InterfaceTypeMismatch (type, reference), 0);
+    throw CosTrading::Register::InterfaceTypeMismatch (type, reference);
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
@@ -913,10 +863,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalOfferId,
-                   CosTrading::UnknownOfferId,
-                   CosTrading::Register::ProxyOfferId))
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
@@ -927,10 +873,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId,
-                  CosTrading::Register::ProxyOfferId))
 {
   // Get service type map.
   char* type = 0;
@@ -960,18 +902,6 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
         const CosTrading::PropertySeq& modify_list)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::NotImplemented,
-                  CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId,
-                  CosTrading::Register::ProxyOfferId,
-                  CosTrading::IllegalPropertyName,
-                  CosTrading::Register::UnknownPropertyName,
-                  CosTrading::PropertyTypeMismatch,
-                  CosTrading::ReadonlyDynamicProperty,
-                  CosTrading::Register::MandatoryProperty,
-                  CosTrading::Register::ReadonlyProperty,
-                  CosTrading::DuplicatePropertyName))
 {
   // Throw an exception if the trader is not configured
   // to support properties modification.
@@ -1014,11 +944,6 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
                            const char *constr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Register::NoMatchingOffers))
 {
   TAO_Support_Attributes_i&
     support_attrs = this->trader_.support_attributes ();
@@ -1082,15 +1007,10 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 resolve (const CosTrading::TraderName &name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::Register::IllegalTraderName,
-                  CosTrading::Register::UnknownTraderName,
-                  CosTrading::Register::RegisterNotSupported))
 {
   // Determine if the first link is a legal link name.
   if (! TAO_Trader_Base::is_valid_link_name (name[0]))
-    ACE_THROW_RETURN (CosTrading::Register::IllegalTraderName (name),
-                      CosTrading::Register::_nil ());
+    throw CosTrading::Register::IllegalTraderName (name);
 
   // Grab a reference to the link interface, and get a link description.
   CosTrading::Link_ptr link_if =
@@ -1118,8 +1038,7 @@ resolve (const CosTrading::TraderName &name)
 
   // Ensure that the register pointer isn't nil.
   if (! CORBA::is_nil (remote_reg.in ()))
-    ACE_THROW_RETURN (CosTrading::Register::RegisterNotSupported (name),
-                      CosTrading::Register::_nil ());
+    throw CosTrading::Register::RegisterNotSupported (name);
 
   CosTrading::Register_ptr return_value = remote_reg.in ();
 
@@ -1142,11 +1061,6 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                      const CosTrading::PropertySeq& properties)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                  CosTrading::PropertyTypeMismatch,
-                  CosTrading::ReadonlyDynamicProperty,
-                  CosTrading::MissingMandatoryProperty,
-                  CosTrading::DuplicatePropertyName))
 {
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
@@ -1257,7 +1171,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
 
@@ -1280,7 +1193,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_search_card ();
@@ -1294,7 +1206,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_search_card ();
@@ -1308,7 +1219,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_match_card ();
@@ -1322,7 +1232,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_match_card ();
@@ -1336,7 +1245,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_return_card ();
@@ -1350,7 +1258,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_return_card ();
@@ -1364,7 +1271,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_list ();
@@ -1378,7 +1284,6 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_modifiable_properties ();
@@ -1392,7 +1297,6 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_dynamic_properties ();
@@ -1406,7 +1310,6 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_proxy_offers ();
@@ -1420,7 +1323,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_hop_count ();
@@ -1434,7 +1336,6 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_hop_count ();
@@ -1448,7 +1349,6 @@ CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().def_follow_policy ();
@@ -1462,7 +1362,6 @@ CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy
  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().max_follow_policy ();
@@ -1475,7 +1374,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_link_follow_policy (CosTrading::FollowOption policy)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.link_attributes ().max_link_follow_policy ();
@@ -1488,7 +1386,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_type_repos (CosTrading::TypeRepository_ptr repository)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
     this->trader_.support_attributes ().type_repos ();
@@ -1501,7 +1398,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
                     &this->stem_id_);
@@ -1515,7 +1411,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
              CosTrading::OfferIdIterator_out id_itr)
-  ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
   if (CORBA::is_nil (this->trader_.trading_components().register_if()))
@@ -1547,8 +1442,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq_out,
               CosTrading::OfferIdIterator_out)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::NotImplemented))
 {
   throw CosTrading::NotImplemented ();
 }
@@ -1574,12 +1467,6 @@ add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
           CosTrading::FollowOption limiting_follow_rule)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::Link::IllegalLinkName,
-                  CosTrading::Link::DuplicateLinkName,
-                  CosTrading::InvalidLookupRef,
-                  CosTrading::Link::DefaultFollowTooPermissive,
-                  CosTrading::Link::LimitingFollowTooPermissive))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
@@ -1626,9 +1513,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 remove_link (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::Link::IllegalLinkName,
-                  CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
@@ -1646,20 +1530,16 @@ remove_link (const char *name)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Link::IllegalLinkName,
-                   CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   typename Links::ENTRY* link_entry = 0;
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::Link::UnknownLinkName (name),
-                      0);
+    throw CosTrading::Link::UnknownLinkName (name);
 
   // Build a new Link Info structure.
   CosTrading::Link::LinkInfo* new_link_info = 0;
@@ -1687,7 +1567,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
   size_t size = this->links_.current_size ();
@@ -1711,10 +1590,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
              CosTrading::FollowOption limiting_follow_rule)
-  ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
-                   CosTrading::Link::UnknownLinkName,
-                   CosTrading::Link::DefaultFollowTooPermissive,
-                   CosTrading::Link::LimitingFollowTooPermissive))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
@@ -1772,19 +1647,8 @@ export_proxy (CosTrading::Lookup_ptr,
               CORBA::Boolean,
               const char *,
               const CosTrading::PolicySeq&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::IllegalServiceType,
-                  CosTrading::UnknownServiceType,
-                  CosTrading::InvalidLookupRef,
-                  CosTrading::IllegalPropertyName,
-                  CosTrading::PropertyTypeMismatch,
-                  CosTrading::ReadonlyDynamicProperty,
-                  CosTrading::MissingMandatoryProperty,
-                  CosTrading::Proxy::IllegalRecipe,
-                  CosTrading::DuplicatePropertyName,
-                  CosTrading::DuplicatePolicyName))
 {
-  ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  throw CORBA::UNKNOWN ();
 
   ACE_NOTREACHED (return 0;)
 }
@@ -1793,10 +1657,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_proxy (const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId,
-                  CosTrading::Proxy::NotProxyOfferId))
 {
   throw CORBA::UNKNOWN ();
 }
@@ -1805,12 +1665,8 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe_proxy (const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId,
-                  CosTrading::Proxy::NotProxyOfferId))
 {
-  ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  throw CORBA::UNKNOWN ();
 
   ACE_NOTREACHED (return 0;)
 }
@@ -1821,8 +1677,6 @@ TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq*&,
               CosTrading::OfferIdIterator_ptr&)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::NotImplemented))
 {
   throw CORBA::UNKNOWN ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 2c3f0f61288..c9c562d8d3a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -73,18 +73,7 @@ public:
            CORBA::ULong how_many,
            CosTrading::OfferSeq_out offers,
            CosTrading::OfferIterator_out offer_itr,
-           CosTrading::PolicyNameSeq_out limits_applied)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::IllegalServiceType,
-                    CosTrading::UnknownServiceType,
-                    CosTrading::IllegalConstraint,
-                    CosTrading::Lookup::IllegalPreference,
-                    CosTrading::Lookup::IllegalPolicyName,
-                    CosTrading::Lookup::PolicyTypeMismatch,
-                    CosTrading::Lookup::InvalidPolicyValue,
-                    CosTrading::IllegalPropertyName,
-                    CosTrading::DuplicatePropertyName,
-                    CosTrading::DuplicatePolicyName));
+           CosTrading::PolicyNameSeq_out limits_applied);
 
   // BEGIN SPEC
   // The query operation is the means by which an object can obtain
@@ -202,9 +191,7 @@ private:
                         TAO_Policies& policies,
                         TAO_Preference_Interpreter& pref_inter,
                         CosTrading::OfferSeq& offers,
-                        CosTrading::OfferIterator_ptr& offer_itr)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                    CosTrading::DuplicatePropertyName));
+                        CosTrading::OfferIterator_ptr& offer_itr);
 
   /// If a starting_trader policy was specfied, foward the query to the
   /// next link in the sequence.
@@ -217,18 +204,7 @@ private:
                       CORBA::ULong how_many,
                       CosTrading::OfferSeq_out offers,
                       CosTrading::OfferIterator_out offer_itr,
-                      CosTrading::PolicyNameSeq_out limits_applied)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Lookup::IllegalPreference,
-                     CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::DuplicatePolicyName));
+                      CosTrading::PolicyNameSeq_out limits_applied);
 
   /**
    * Assemble a sequence of links that the federate_query method
@@ -238,9 +214,7 @@ private:
    */
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
                                  CORBA::ULong offer_returned,
-                                 CosTrading::LinkNameSeq_out links)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Lookup::PolicyTypeMismatch));
+                                 CosTrading::LinkNameSeq_out links);
 
   /**
    * Perform and pass on a query over a set of links. Merge the
@@ -258,27 +232,14 @@ private:
                         CORBA::ULong how_many,
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
-                        CosTrading::PolicyNameSeq& limits_applied)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Lookup::IllegalPreference,
-                     CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::DuplicatePolicyName));
+                        CosTrading::PolicyNameSeq& limits_applied);
 
   /// Merge the results from a federated query into the collected results.
   void order_merged_sequence (TAO_Preference_Interpreter& pref_inter,
                               CosTrading::OfferSeq& offers);
 
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
-                                  CosTrading::Admin::OctetSeq*& seq)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Lookup::PolicyTypeMismatch));
+                                  CosTrading::Admin::OctetSeq*& seq);
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
@@ -316,17 +277,7 @@ public:
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
-                                           const CosTrading::PropertySeq& properties)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::Register::InvalidObjectRef,
-                    CosTrading::IllegalServiceType,
-                    CosTrading::UnknownServiceType,
-                    CosTrading::Register::InterfaceTypeMismatch,
-                    CosTrading::IllegalPropertyName,
-                    CosTrading::PropertyTypeMismatch,
-                    CosTrading::ReadonlyDynamicProperty,
-                    CosTrading::MissingMandatoryProperty,
-                    CosTrading::DuplicatePropertyName));
+                                           const CosTrading::PropertySeq& properties);
 
   // BEGIN SPEC
   // The export operation is the means by which a service is
@@ -382,11 +333,7 @@ public:
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
 
-  virtual void withdraw (const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId));
+  virtual void withdraw (const char *id);
 
   // BEGIN SPEC
   // The withdraw operation removes the service offer from the trader
@@ -402,11 +349,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register::OfferInfo*
-    describe (const char * id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId));
+    describe (const char * id);
 
   // BEGIN SPEC
   // The describe operation returns the information about an offered
@@ -424,19 +367,7 @@ public:
 
   virtual void modify (const char * id,
                        const CosTrading::PropertyNameSeq& del_list,
-                       const CosTrading::PropertySeq& modify_list)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::NotImplemented,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::Register::UnknownPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::Register::MandatoryProperty,
-                     CosTrading::Register::ReadonlyProperty,
-                     CosTrading::DuplicatePropertyName));
+                       const CosTrading::PropertySeq& modify_list);
 
   // BEGIN SPEC
   // The modify operation is used to change the description of a
@@ -492,12 +423,7 @@ public:
   // END SPEC
 
   virtual void withdraw_using_constraint (const char *type,
-                                          const char *constr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Register::NoMatchingOffers));
+                                          const char *constr);
 
   // BEGIN SPEC
   // The withdraw_using_constraint operation withdraws a set of offers
@@ -523,11 +449,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register_ptr
-    resolve (const CosTrading::TraderName &name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::IllegalTraderName,
-                     CosTrading::Register::UnknownTraderName,
-                     CosTrading::Register::RegisterNotSupported));
+    resolve (const CosTrading::TraderName &name);
 
   // BEGIN SPEC
   // This operation is used to resolve a context relative name for
@@ -556,12 +478,7 @@ public:
 
   void validate_properties (const char* type,
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                            const CosTrading::PropertySeq& properties)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName));
+                            const CosTrading::PropertySeq& properties);
 
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
@@ -610,76 +527,56 @@ public:
 
   /// Search card is the cardinality of the offers searched for
   /// constraint compliance.
-  virtual CORBA::ULong set_def_search_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_search_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong set_def_search_card (CORBA::ULong value);
+  virtual CORBA::ULong set_max_search_card (CORBA::ULong value);
 
 
   /// Match card is the cardinality of offers found compliant with the
   /// constraints.
-  virtual CORBA::ULong set_def_match_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_match_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong set_def_match_card (CORBA::ULong value);
+  virtual CORBA::ULong set_max_match_card (CORBA::ULong value);
 
   /// Return card is the cardinality of the offers returned from
   /// Lookup.
-  virtual CORBA::ULong set_def_return_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_return_card (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong set_def_return_card (CORBA::ULong value);
+  virtual CORBA::ULong set_max_return_card (CORBA::ULong value);
 
   /// Types of offers available for consideration. Ween out those
   /// offers with modifiable properties
-  virtual CORBA::ULong set_max_list (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong set_max_list (CORBA::ULong value);
   virtual CORBA::Boolean
-    set_supports_modifiable_properties (CORBA::Boolean value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_supports_modifiable_properties (CORBA::Boolean value);
   virtual CORBA::Boolean
-    set_supports_dynamic_properties (CORBA::Boolean value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_supports_dynamic_properties (CORBA::Boolean value);
   virtual CORBA::Boolean
-    set_supports_proxy_offers (CORBA::Boolean value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_supports_proxy_offers (CORBA::Boolean value);
 
   // = Link Interface parameters
 
-  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value);
+  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value);
 
   virtual CosTrading::FollowOption
-    set_def_follow_policy (CosTrading::FollowOption policy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_def_follow_policy (CosTrading::FollowOption policy);
   virtual CosTrading::FollowOption
-    set_max_follow_policy (CosTrading::FollowOption policy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_max_follow_policy (CosTrading::FollowOption policy);
   virtual CosTrading::FollowOption
-    set_max_link_follow_policy (CosTrading::FollowOption policy)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_max_link_follow_policy (CosTrading::FollowOption policy);
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
-    set_type_repos (CosTrading::TypeRepository_ptr repository)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_type_repos (CosTrading::TypeRepository_ptr repository);
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    request_id_stem (void);
 
   virtual CosTrading::Admin::OctetSeq*
-    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem);
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
-                            CosTrading::OfferIdIterator_out id_itr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::NotImplemented));
+                            CosTrading::OfferIdIterator_out id_itr);
 
 
   // BEGIN SPEC
@@ -702,9 +599,7 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq_out,
-                             CosTrading::OfferIdIterator_out)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::NotImplemented));
+                             CosTrading::OfferIdIterator_out);
 
 private:
 
@@ -748,13 +643,7 @@ public:
   virtual void add_link (const char *name,
                          CosTrading::Lookup_ptr target,
                          CosTrading::FollowOption def_pass_on_follow_rule,
-                         CosTrading::FollowOption limiting_follow_rule)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::Link::IllegalLinkName,
-                    CosTrading::Link::DuplicateLinkName,
-                    CosTrading::InvalidLookupRef,
-                    CosTrading::Link::DefaultFollowTooPermissive,
-                    CosTrading::Link::LimitingFollowTooPermissive));
+                         CosTrading::FollowOption limiting_follow_rule);
 
   // The "name" parameter is used in subsequent link management
   // operations to identify the intended link. If the parameter is not
@@ -792,10 +681,7 @@ public:
   // creation of the link.
   // END SPEC
 
-  virtual void remove_link (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::Link::IllegalLinkName,
-                    CosTrading::Link::UnknownLinkName));
+  virtual void remove_link (const char *name);
 
   // BEGIN SPEC
   // The remove_link operation removes all knowledge of the target
@@ -808,10 +694,7 @@ public:
   // not in the trader.
   // END SPEC
 
-  virtual CosTrading::Link::LinkInfo* describe_link (const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::Link::IllegalLinkName,
-                    CosTrading::Link::UnknownLinkName));
+  virtual CosTrading::Link::LinkInfo* describe_link (const char *name);
 
   // BEGIN SPEC
   // The describe_link operation returns information on a link held in
@@ -836,8 +719,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::LinkNameSeq* list_links (void);
 
   // BEGIN SPEC
   // The list_links operation returns a list of the names of all
@@ -848,11 +730,7 @@ public:
 
   virtual void modify_link (const char *name,
                             CosTrading::FollowOption def_pass_on_follow_rule,
-                            CosTrading::FollowOption limiting_follow_rule)
-    ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
-                    CosTrading::Link::UnknownLinkName,
-                    CosTrading::Link::DefaultFollowTooPermissive,
-                    CosTrading::Link::LimitingFollowTooPermissive));
+                            CosTrading::FollowOption limiting_follow_rule);
 
   // BEGIN SPEC
   // The modify_link operation is used to change the existing link
@@ -921,39 +799,18 @@ public:
                   const CosTrading::PropertySeq &,
                   CORBA::Boolean if_match_all,
                   const char *,
-                  const CosTrading::PolicySeq &)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::IllegalServiceType,
-                    CosTrading::UnknownServiceType,
-                    CosTrading::InvalidLookupRef,
-                    CosTrading::IllegalPropertyName,
-                    CosTrading::PropertyTypeMismatch,
-                    CosTrading::ReadonlyDynamicProperty,
-                    CosTrading::MissingMandatoryProperty,
-                    CosTrading::Proxy::IllegalRecipe,
-                    CosTrading::DuplicatePropertyName,
-                    CosTrading::DuplicatePolicyName));
-
-  virtual void withdraw_proxy (const char *)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::IllegalOfferId,
-                    CosTrading::UnknownOfferId,
-                    CosTrading::Proxy::NotProxyOfferId));
+                  const CosTrading::PolicySeq &);
+
+  virtual void withdraw_proxy (const char *);
 
   virtual CosTrading::Proxy::ProxyInfo *
-  describe_proxy (const char *)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::IllegalOfferId,
-                    CosTrading::UnknownOfferId,
-                    CosTrading::Proxy::NotProxyOfferId));
+  describe_proxy (const char *);
 
    // = CosTrading::TraderComponents methods.
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq *&,
-                             CosTrading::OfferIdIterator_ptr &)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    CosTrading::NotImplemented));
+                             CosTrading::OfferIdIterator_ptr &);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 8a7f07c85e6..4ca0685114c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -131,35 +131,30 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 
 template <class IF> CosTrading::Lookup_ptr
 TAO_Trader_Components<IF>::lookup_if (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
 TAO_Trader_Components<IF>::register_if (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
 TAO_Trader_Components<IF>::admin_if (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
 TAO_Trader_Components<IF>::proxy_if (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
 TAO_Trader_Components<IF>::link_if (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
 }
@@ -172,28 +167,24 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 
 template <class IF> CORBA::Boolean
 TAO_Support_Attributes<IF>::supports_modifiable_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
 TAO_Support_Attributes<IF>::supports_dynamic_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
 TAO_Support_Attributes<IF>::supports_proxy_offers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
 TAO_Support_Attributes<IF>::type_repos ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
 }
@@ -207,77 +198,66 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::def_search_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_search_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::def_match_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_match_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::def_return_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_return_card (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::def_hop_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_hop_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
 TAO_Import_Attributes<IF>::def_follow_policy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
 TAO_Import_Attributes<IF>::max_follow_policy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
 }
@@ -291,7 +271,6 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 
 template <class IF> CosTrading::FollowOption
 TAO_Link_Attributes<IF>::max_link_follow_policy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 825725ee266..7aa904ffe0e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -115,28 +115,23 @@ public:
   // = CosTrading::TraderComponents methods.
   /// Returns an object reference to the Lookup interface of the trader.
   /// Returns nil if the trader does not support Lookup interface.
-  virtual CosTrading::Lookup_ptr lookup_if (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::Lookup_ptr lookup_if (void);
 
   /// Returns object reference for the Register interface of the trader.
   /// Returns nil if the trader does not support Register interface.
-  virtual CosTrading::Register_ptr register_if (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::Register_ptr register_if (void);
 
   /// Returns object reference for the Link interface of the trader.
   /// Returns nil if the trader does not support Link interface.
-  virtual CosTrading::Link_ptr link_if (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::Link_ptr link_if (void);
 
   /// Returns object reference to the Proxy interface of the trader.
   /// Returns nil if the trader does not support Proxy interface.
-  virtual CosTrading::Proxy_ptr proxy_if (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::Proxy_ptr proxy_if (void);
 
   /// Returns object reference for the Admin interface of the trader.
   /// Returns nil if the trader does not support Admin interface.
-  virtual CosTrading::Admin_ptr admin_if (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::Admin_ptr admin_if (void);
 
 private:
 
@@ -152,17 +147,13 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean supports_modifiable_properties (void);
 
-  virtual CORBA::Boolean supports_dynamic_properties (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean supports_dynamic_properties (void);
 
-  virtual CORBA::Boolean supports_proxy_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean supports_proxy_offers (void);
 
-  virtual CosTrading::TypeRepository_ptr type_repos (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::TypeRepository_ptr type_repos (void);
 
 private:
 
@@ -178,48 +169,37 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong def_search_card (void);
 
-  virtual CORBA::ULong max_search_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong max_search_card (void);
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong def_match_card (void);
 
-  virtual CORBA::ULong max_match_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong max_match_card (void);
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong def_return_card (void);
 
-  virtual CORBA::ULong max_return_card (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong max_return_card (void);
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong max_list (void);
 
-  virtual CORBA::ULong def_hop_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong def_hop_count (void);
 
-  virtual CORBA::ULong max_hop_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong max_hop_count (void);
 
-  virtual CosTrading::FollowOption def_follow_policy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::FollowOption def_follow_policy (void);
 
-  virtual CosTrading::FollowOption max_follow_policy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::FollowOption max_follow_policy (void);
 
 
 private:
@@ -235,8 +215,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTrading::FollowOption max_link_follow_policy (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 4c51123734e..334f1930cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -251,7 +251,6 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 
 CORBA::Any*
 TAO_Property_Evaluator::property_value (int index)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
   CORBA::Boolean in_cache =
@@ -278,11 +277,10 @@ TAO_Property_Evaluator::property_value (int index)
 
       if (CORBA::is_nil (dp_eval.in ()))
         {
-          ACE_THROW_RETURN (CosTradingDynamic::
-                            DPEvalFailure (name,
-                                           CORBA::TypeCode::_nil (),
-                                           CORBA::Any ()),
-                            prop_val);
+          throw CosTradingDynamic::DPEvalFailure (
+            name,
+            CORBA::TypeCode::_nil (),
+            CORBA::Any ());
         }
       else
         {
@@ -335,8 +333,6 @@ TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
 ,
                                 CORBA::Boolean supports_dp)
-  ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
-                   CosTrading::IllegalPropertyName))
     : TAO_Property_Evaluator (properties, supports_dp)
 {
   int length = this->props_.length();
@@ -386,7 +382,6 @@ is_dynamic_property(const char* property_name)
 
 CORBA::Any*
 TAO_Property_Evaluator_By_Name::property_value (const char* property_name)
-  ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
   CORBA::Any* prop_value = 0;
@@ -500,8 +495,6 @@ const char* TAO_Policies::POLICY_NAMES[] =
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
                             const CosTrading::PolicySeq& policies)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
-                  CosTrading::DuplicatePolicyName))
   : trader_ (trader)
 {
   for (int i = 0; i < TAO_NUM_POLICIES; i++)
@@ -568,7 +561,6 @@ TAO_Policies::~TAO_Policies (void)
 
 CORBA::ULong
 TAO_Policies::ulong_prop (POLICY_TYPE pol) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
   const TAO_Import_Attributes_i& import_attrs =
@@ -608,8 +600,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const
       CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong);
 
       if (!equal_ulong)
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          return_value);
+        throw CosTrading::Lookup::PolicyTypeMismatch (*policy);
       else
         value >>= return_value;
 
@@ -622,28 +613,24 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const
 
 CORBA::ULong
 TAO_Policies::search_card (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (SEARCH_CARD);
 }
 
 CORBA::ULong
 TAO_Policies::match_card (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (MATCH_CARD);
 }
 
 CORBA::ULong
 TAO_Policies::return_card (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (RETURN_CARD);
 }
 
 CORBA::Boolean
 TAO_Policies::boolean_prop (POLICY_TYPE pol) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
     return_value = 1;
@@ -678,8 +665,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const
         type->equal (CORBA::_tc_boolean);
 
       if (!equal_boolean)
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          return_value);
+        throw CosTrading::Lookup::PolicyTypeMismatch (*policy);
       else
         value >>= CORBA::Any::to_boolean (return_value);
 
@@ -696,28 +682,24 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const
 
 CORBA::Boolean
 TAO_Policies::use_modifiable_properties (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_MODIFIABLE_PROPERTIES);
 }
 
 CORBA::Boolean
 TAO_Policies::use_dynamic_properties (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_DYNAMIC_PROPERTIES);
 }
 
 CORBA::Boolean
 TAO_Policies::use_proxy_offers (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_PROXY_OFFERS);
 }
 
 CORBA::Boolean
 TAO_Policies::exact_type_match (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (EXACT_TYPE_MATCH);
 }
@@ -725,8 +707,6 @@ TAO_Policies::exact_type_match (void) const
 
 CosTrading::TraderName*
 TAO_Policies::starting_trader (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue))
 {
   CosTrading::TraderName* trader_name = 0;
 
@@ -744,8 +724,7 @@ TAO_Policies::starting_trader (void) const
 
       if (!equal_tradername ||
           !equal_linknameseq)
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          trader_name);
+        throw CosTrading::Lookup::PolicyTypeMismatch (*policy);
       else
         value >>= trader_name;
     }
@@ -755,7 +734,6 @@ TAO_Policies::starting_trader (void) const
 
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().def_follow_policy ();
@@ -774,8 +752,7 @@ TAO_Policies::link_follow_rule (void) const
         type->equal (CosTrading::_tc_FollowOption);
 
       if (!type_equal)
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          return_value);
+        throw CosTrading::Lookup::PolicyTypeMismatch (*policy);
       else
         value >>= return_value;
 
@@ -788,10 +765,6 @@ TAO_Policies::link_follow_rule (void) const
 
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::Link::IllegalLinkName,
-                   CosTrading::Link::UnknownLinkName))
 {
   CosTrading::FollowOption return_value = CosTrading::local_only;
   CosTrading::FollowOption trader_max_follow_policy =
@@ -813,14 +786,12 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) con
 
 CORBA::ULong
 TAO_Policies::hop_count (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (HOP_COUNT);
 }
 
 CosTrading::Admin::OctetSeq*
 TAO_Policies::request_id (void) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
 
@@ -834,8 +805,7 @@ TAO_Policies::request_id (void) const
         type->equal (CosTrading::Admin::_tc_OctetSeq);
 
       if (!equal_octetseq)
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          request_id);
+        throw CosTrading::Lookup::PolicyTypeMismatch (*policy);
       else
         value >>= request_id;
     }
@@ -847,8 +817,6 @@ void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                        const CosTrading::Link::LinkInfo& link_info) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue))
 {
   CosTrading::FollowOption follow_option = CosTrading::local_only;
   CosTrading::FollowOption trader_max_follow_policy =
@@ -1071,10 +1039,6 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 void
 TAO_Offer_Modifier::
 delete_properties (const CosTrading::PropertyNameSeq& deletes)
-  ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
-                  CosTrading::Register::MandatoryProperty,
-                  CosTrading::IllegalPropertyName,
-                  CosTrading::DuplicatePropertyName))
 {
   // Validate that the listed property names can be deleted
   CORBA::ULong i = 0,
@@ -1110,11 +1074,6 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes)
 void
 TAO_Offer_Modifier::
 merge_properties (const CosTrading::PropertySeq& modifies)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::Register::ReadonlyProperty))
 {
   int i = 0, length = 0;
   TAO_String_Set modify_me;
@@ -1398,8 +1357,6 @@ TAO_Offer_Filter::limits_applied (void)
 
 TAO_Property_Filter::
 TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
 {
   if (this->policy_ == CosTrading::Lookup::some)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index ee75b52740c..c4c2437ecbc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -70,8 +70,7 @@ public:
 	* CosTradingDynamic::DPEvalFailure exception on failure. If the
 	* property index is undefined, the method returns a null pointer.
 	*/
-  CORBA::Any* property_value(int index)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+  CORBA::Any* property_value(int index);
 
 
   /**
@@ -129,9 +128,7 @@ public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
  ,
-                                  CORBA::Boolean supports_dp = 1)
-    ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
-                     CosTrading::IllegalPropertyName));
+                                  CORBA::Boolean supports_dp = 1);
 
   /**
    * Construct an instance of TAO_Property_Evaluator that operates on
@@ -153,8 +150,7 @@ public:
 	* TAO_Property_Evaluator, except property_value first discovers the
 	* index through a string matching lookup.
 	*/
-  CORBA::Any* property_value(const char* property_name)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+  CORBA::Any* property_value(const char* property_name);
 
   /**
    * This method is identical to its counterpart in
@@ -195,8 +191,7 @@ public:
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
                              const CORBA::Any& extra_info)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTradingDynamic::DPEvalFailure)) = 0;
+    = 0;
 
   /// Method to construct a dynamic property structure suitable for
   /// exporting in a CosTrading::PropertyStruct to the Trading Service.
@@ -254,9 +249,7 @@ public:
   static const char * POLICY_NAMES[];
 
   TAO_Policies (TAO_Trader_Base& trader,
-                const CosTrading::PolicySeq& policies)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::DuplicatePolicyName));
+                const CosTrading::PolicySeq& policies);
 
   // BEGIN SPEC
   // The "policies" parameter allows the importer to specify how the
@@ -282,8 +275,7 @@ public:
 
   ~TAO_Policies (void);
 
-  CORBA::ULong search_card (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::ULong search_card (void) const;
 
   // BEGIN SPEC
   // The "search_card" policy indicates to the trader the maximum
@@ -294,8 +286,7 @@ public:
   // trader's def_search_card attribute is used.
   // END SPEC
 
-  CORBA::ULong match_card (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::ULong match_card (void) const;
 
   // BEGIN SPEC
   // The "match_card" policy indicates to the trader the maximum
@@ -306,8 +297,7 @@ public:
   // attribute is used.
   // END SPEC
 
-  CORBA::ULong return_card (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::ULong return_card (void) const;
 
   // BEGIN SPEC
   // The "return_card" policy indicates to the trader the maximum
@@ -320,8 +310,7 @@ public:
 
   // = Offer consideration policies
 
-  CORBA::Boolean use_modifiable_properties (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::Boolean use_modifiable_properties (void) const;
 
   // BEGIN SPEC
   // The "use_modifiable_properties" policy indicates whether the
@@ -333,8 +322,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_dynamic_properties (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::Boolean use_dynamic_properties (void) const;
 
   // BEGIN SPEC
   // The "use_dynamic_properties" policy indicates whether the trader
@@ -346,8 +334,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_proxy_offers (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::Boolean use_proxy_offers (void) const;
 
   // BEGIN SPEC
   // The "use_proxy_offers" policy indicates whether the trader should
@@ -358,8 +345,7 @@ public:
   // specified, such offers will be included.
   // END SPEC
 
-  CORBA::Boolean exact_type_match (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::Boolean exact_type_match (void) const;
 
   // BEGIN SPEC
   // The "exact_type_match" policy indicates to the trader whether the
@@ -387,13 +373,10 @@ public:
    * "starting_trader" policy with the first component removed.
    * END SPEC
    */
-  CosTrading::TraderName* starting_trader (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue));
+  CosTrading::TraderName* starting_trader (void) const;
 
   /// Determine the link follow policy for this query overall.
-  CosTrading::FollowOption link_follow_rule (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CosTrading::FollowOption link_follow_rule (void) const;
 
   // BEGIN SPEC
   //The "link_follow_rule" policy indicates how the client wishes
@@ -412,14 +395,9 @@ public:
    * else min(trader.max_follow_policy, link.limiting_follow_rule,
    *          trader.def_follow_policy)
    */
-  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::Link::IllegalLinkName,
-                     CosTrading::Link::UnknownLinkName));
+  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const;
 
-  CORBA::ULong hop_count (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::ULong hop_count (void) const;
 
   // BEGIN SPEC
   // The "hop_count" policy indicates to the trader the maximum number
@@ -435,8 +413,7 @@ public:
 
   /// Return the request_id passed to the query method across a link to
   /// another trader.
-  CosTrading::Admin::OctetSeq* request_id (void) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CosTrading::Admin::OctetSeq* request_id (void) const;
 
   /// Policies to forward to the next trader in a federated query.
   void copy_to_pass (CosTrading::PolicySeq& policy_seq,
@@ -457,19 +434,15 @@ public:
    *                  trader.max_follow_policy)
    */
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                              const CosTrading::Link::LinkInfo& link_info) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue));
+                              const CosTrading::Link::LinkInfo& link_info) const;
 
 private:
 
   /// Reconclile a ULong property with its default.
-  CORBA::ULong ulong_prop (POLICY_TYPE pol) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::ULong ulong_prop (POLICY_TYPE pol) const;
 
   /// Reconcile a Boolean property with its debault.
-  CORBA::Boolean boolean_prop (POLICY_TYPE pol) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+  CORBA::Boolean boolean_prop (POLICY_TYPE pol) const;
 
   TAO_Policies (const TAO_Policies&);
   TAO_Policies& operator= (const TAO_Policies&);
@@ -584,11 +557,7 @@ public:
 
   /// Delete the properties whose names were given to the
   /// constructor. Ensure we don't delete mandatory properties.
-  void delete_properties (const CosTrading::PropertyNameSeq& deletes)
-    ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
-                     CosTrading::Register::MandatoryProperty,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName));
+  void delete_properties (const CosTrading::PropertyNameSeq& deletes);
 
   /**
    * Copy to the destination the union of the source and destination
@@ -596,12 +565,7 @@ public:
    * destination with the source's value. This class claims the memory
    * in the modifies sequence.
    */
-  void merge_properties (const CosTrading::PropertySeq& modifies)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::Register::ReadonlyProperty));
+  void merge_properties (const CosTrading::PropertySeq& modifies);
 
   /// Return a reference to the Offer with the changes affected.
   void affect_change (const CosTrading::PropertySeq& modifies);
@@ -740,9 +704,7 @@ public:
   TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
 
   /// Verify that the specified properties are correct.
-  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName));
+  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props);
 
   TAO_Property_Filter (const TAO_Property_Filter& prop_filter);
   TAO_Property_Filter& operator= (const TAO_Property_Filter& prop_filter);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 2f38753092c..6e3bd4780d3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -184,7 +184,6 @@ CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
                                    int argc,
                                    ACE_TCHAR *argv[])
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index a12b8e2a3f3..53f1082de0e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -54,8 +54,7 @@ public:
 
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc,
-                                   ACE_TCHAR *argv[])
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   ACE_TCHAR *argv[]);
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 5903d6e7ec4..88faddf22e0 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -18,14 +18,12 @@ ORBInitializer::ORBInitializer (void)
 void
 ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
   ACE_NEW_THROW_EX (reject_interceptor,
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
index 5a190fb2006..b081f37b25f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
@@ -58,11 +58,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
   /// Return a reference to the LoadAlert object.
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index 4d770e79ef2..4ac4714e6a4 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -18,7 +18,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
                         Test::number  cl_number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (cl_number % 2 == 0)
   {
@@ -40,7 +39,6 @@ Roundtrip::test_method (Test::Timestamp send_time,
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index 70aec84ecc9..f91c83ac26a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -23,11 +23,9 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+		                       Test::number cl_number);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index 160cf111f80..758a005c634 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 13242530af3..51b1624fed7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -250,7 +250,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index ec190f3298c..5c189e8c0af 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -19,14 +19,12 @@ ORBInitializer::ORBInitializer (void)
 void
 ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->interceptor_,
                     ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index 83734927f65..7ccd73b60f5 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -58,11 +58,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
   /// Return a reference to the LoadAlert object.
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index a9ea95abd62..ac374cc840a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -31,7 +31,6 @@ RPS_Monitor::~RPS_Monitor (void)
 
 CosLoadBalancing::Location *
 RPS_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -47,7 +46,6 @@ RPS_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 RPS_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 821e3964021..7825b5e5e67 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -49,8 +49,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -59,8 +58,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 4c8cf73a5c2..abf3b4db251 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -18,7 +18,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
                         Test::number  cl_number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (cl_number % 2 == 0)
@@ -34,7 +33,6 @@ Roundtrip::test_method (Test::Timestamp send_time,
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index 70aec84ecc9..f91c83ac26a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -23,11 +23,9 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+		                       Test::number cl_number);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index b7d2ca0b5f9..fa7f88a1ce8 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -15,22 +15,18 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
 
 char *
 ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
 ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++this->request_count_;
 }
@@ -38,31 +34,24 @@ ServerRequestInterceptor::receive_request_service_contexts (
 void
 ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 556a67570bf..2e3fe2247a5 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -60,35 +60,24 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Long request_count (void);
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index b362a753c85..c14c0b1ea2d 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index dc7076250bf..a5d5f6b0598 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -250,7 +250,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 8fc6824ff85..0870f02aded 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -55,8 +55,7 @@ public:
    */
   virtual Federated_Test::Experiment_Results *
       run_experiment (CORBA::Long experiment_id,
-                      CORBA::Long iterations)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Long iterations);
   //@}
 
 private:
@@ -186,7 +185,6 @@ int main (int argc, char *argv[])
 Federated_Test::Experiment_Results *
 Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
                                 CORBA::Long iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int thread_count = 1;
 #if 0
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 5e859b50e45..538c0ed5471 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -17,7 +17,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
                         CORBA::Long workload_in_usecs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   CORBA::Long elapsed = 0;
@@ -35,7 +34,6 @@ Roundtrip::test_method (Test::Timestamp send_time,
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index 9a67072a43b..19c09b07e45 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -18,11 +18,9 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Long workload_in_usecs)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CORBA::Long workload_in_usecs);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index dda1ee587a1..8ac7e2263f2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -24,7 +24,6 @@ Callback::sample_history (void)
 
 void
 Callback::sample (Test::Timestamp the_timestamp)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t elapsed = ACE_OS::gethrtime () - the_timestamp;
 
@@ -36,7 +35,6 @@ Callback::sample (Test::Timestamp the_timestamp)
 
 PortableServer::POA_ptr
 Callback::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 93f716e0b51..7c048852fda 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -36,11 +36,9 @@ public:
   //@{
   /** @name The RtecEventComm::PushCallback methods
    */
-  virtual void sample (Test::Timestamp the_timestamp)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sample (Test::Timestamp the_timestamp);
 
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index 30beb42f72b..3bfa987de59 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -17,21 +17,18 @@ Session::Session (Test::Callback_ptr cb,
 
 void
 Session::sample (Test::Timestamp the_timestamp)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->cb_->sample (the_timestamp);
 }
 
 void
 Session::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Implicit_Deactivator deactivator (this);
 }
 
 PortableServer::POA_ptr
 Session::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index 8786b3f89ca..dc425ae9747 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -18,14 +18,11 @@ public:
            PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void sample (Test::Timestamp the_timestamp)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sample (Test::Timestamp the_timestamp);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   Test::Callback_var cb_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index eebb4855cc9..20de05953e5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -18,7 +18,6 @@ Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
 
 Test::Session_ptr
 Session_Factory::create_new_session (Test::Callback_ptr cb)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Session> session_impl (new Session (cb,
                                                   this->poa_.in ()));
@@ -28,14 +27,12 @@ Session_Factory::create_new_session (Test::Callback_ptr cb)
 
 void
 Session_Factory::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
 Session_Factory::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 829afb63323..e91a2a57568 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -18,14 +18,11 @@ public:
                    PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index a89beb5367b..9045c8ee020 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -92,7 +92,6 @@ Consumer::sample_history (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
 
@@ -116,7 +115,6 @@ Consumer::push (const RtecEventComm::EventSet &events)
 
 void
 Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -125,7 +123,6 @@ Consumer::disconnect_push_consumer (void)
 
 PortableServer::POA_ptr
 Consumer::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 4718601a084..c9109cc884c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -49,12 +49,9 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
+  virtual PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index 89c0ed4b450..c8dedde7cff 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -44,7 +44,6 @@ Control::~Control (void)
 
 void
 Control::join (Federated_Test::Peer_ptr peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -164,7 +163,6 @@ Control::join (Federated_Test::Peer_ptr peer)
 
 PortableServer::POA_ptr
 Control::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index e5bc4eb52df..dd923f2e8bd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -38,11 +38,9 @@ public:
   //@{
   /** @name The Federated_Test::Control methods
    */
-  virtual void join (Federated_Test::Peer_ptr peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void join (Federated_Test::Peer_ptr peer);
 
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
index eede6b8f2fe..4fbb48d9cd7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
@@ -9,7 +9,8 @@
 #include "Implicit_Deactivator.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/Environment.h"
-#include "ace/Swap.h"
+
+#include <algorithm>
 
 #if !defined(__ACE_INLINE__)
 #include "Implicit_Deactivator.inl"
@@ -37,8 +38,8 @@ Implicit_Deactivator::operator= (Implicit_Deactivator &rhs)
   Implicit_Deactivator tmp (rhs);
   // @@ This seems bogus, there should be a more efficient way to swap
   //    vars
-  ACE_Swap<PortableServer::POA_var>::swap (this->poa_, tmp.poa_);
-  ACE_Swap<PortableServer::ObjectId_var>::swap (this->id_, tmp.id_);
+  std::swap (this->poa_, tmp.poa_);
+  std::swap (this->id_, tmp.id_);
   return *this;
 }
 
@@ -47,9 +48,12 @@ Implicit_Deactivator::~Implicit_Deactivator ()
   if (this->id_.ptr () == 0)
     return;
 
-  try{
+  try
+  {
     this->poa_->deactivate_object (this->id_.in ());
-  } catch (const CORBA::Exception&) {
+  }
+  catch (const CORBA::Exception&)
+  {
     // @@ TODO This event should be logged. Cannot throw because that
     //    would make it impossible to use this class effectively.
     //    Read Servant_var.cpp for more details.
@@ -62,7 +66,7 @@ Implicit_Deactivator::operator= (PortableServer::Servant servant)
   Implicit_Deactivator tmp (servant);
   // @@ This seems bogus, there should be a more efficient way to swap
   //    vars
-  ACE_Swap<PortableServer::POA_var>::swap (this->poa_, tmp.poa_);
-  ACE_Swap<PortableServer::ObjectId_var>::swap (this->id_, tmp.id_);
+  std::swap (this->poa_, tmp.poa_);
+  std::swap (this->id_, tmp.id_);
   return *this;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 3039480f1f8..c97cc03f939 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -30,7 +30,6 @@ Loopback::Loopback (CORBA::Long experiment_id,
 
 void
 Loopback::disconnect (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 5b21092466f..4507a1a5a88 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -35,8 +35,7 @@ public:
   //@{
   /** @name The Federated_Test::Loopback methods
    */
-  virtual void disconnect (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 14ca03140b0..2fd3d0911e3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -83,7 +83,6 @@ Loopback_Consumer::disconnect (void)
 
 void
 Loopback_Consumer::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
   this->supplier_->push (events);
@@ -91,7 +90,6 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events)
 
 void
 Loopback_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -100,7 +98,6 @@ Loopback_Consumer::disconnect_push_consumer (void)
 
 PortableServer::POA_ptr
 Loopback_Consumer::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index 00295b762b7..4d7f1fd1ec9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -43,12 +43,9 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
+  virtual PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index a1750d26f21..02a00e848fa 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -74,7 +74,6 @@ Loopback_Supplier::disconnect (void)
 
 void
 Loopback_Supplier::push (const RtecEventComm::EventSet &source)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n"));
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -109,7 +108,6 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source)
 
 void
 Loopback_Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -118,7 +116,6 @@ Loopback_Supplier::disconnect_push_supplier (void)
 
 PortableServer::POA_ptr
 Loopback_Supplier::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 6c58a9d55f7..e89dc9a5007 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -42,16 +42,13 @@ public:
   /// Disconnect from the event channel
   void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
+  virtual PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index c4bb55f0347..4ca0fac10f4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -50,7 +50,6 @@ Peer_Base::~Peer_Base (void)
 
 void
 Peer_Base::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     EC_Destroyer ec_destroyer (this->event_channel_.in ());
@@ -63,14 +62,12 @@ Peer_Base::shutdown (void)
 
 CORBA::Object_ptr
 Peer_Base::channel (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->event_channel_.in ());
 }
 
 void
 Peer_Base::connect (Federated_Test::Peer_ptr remote_peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   CORBA::Object_var remote_ec_object =
@@ -95,7 +92,6 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer)
 Federated_Test::Loopback_ptr
 Peer_Base::setup_loopback (CORBA::Long experiment_id,
                            CORBA::Long base_event_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Loopback> loopback (
       new Loopback (experiment_id,
@@ -116,7 +112,6 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
 
 PortableServer::POA_ptr
 Peer_Base::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index caecbbfefa9..cea199e28c0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -40,22 +40,17 @@ public:
   //@{
   /** @name The Federated_Test::Peer methods
    */
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   virtual CORBA::Object_ptr
-      channel (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      channel (void);
 
-  virtual void connect (Federated_Test::Peer_ptr remote_peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void connect (Federated_Test::Peer_ptr remote_peer);
 
   Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
-                                               CORBA::Long base_event_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                               CORBA::Long base_event_type);
 
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
index 4d035f8b43c..ac781235599 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
@@ -9,7 +9,6 @@
 #ifndef TAO_PERF_RTEC_SERVANT_VAR_H
 #define TAO_PERF_RTEC_SERVANT_VAR_H
 
-#include "ace/Swap.h"
 #include "tao/corba.h"
 
 /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.inl
index bc65b994d0d..18e869d9bcb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.inl
@@ -7,6 +7,8 @@
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
 
+#include <algorithm>
+
 template<class SERVANT> ACE_INLINE SERVANT *
 Servant_var<SERVANT>::duplicate (SERVANT *servant)
 {
@@ -31,7 +33,7 @@ template<class SERVANT> ACE_INLINE Servant_var<SERVANT>&
 Servant_var<SERVANT>::operator= (const Servant_var<SERVANT> &rhs)
 {
   Servant_var<SERVANT> tmp (rhs);
-  ACE_Swap<SERVANT*>::swap (this->ptr_, tmp.ptr_);
+  std::swap (this->ptr_, tmp.ptr_);
   return *this;
 }
 
@@ -39,7 +41,7 @@ template<class SERVANT> ACE_INLINE Servant_var<SERVANT>&
 Servant_var<SERVANT>::operator= (SERVANT *rhs)
 {
   Servant_var<SERVANT> tmp (rhs);
-  ACE_Swap<SERVANT*>::swap (this->ptr_, tmp.ptr_);
+  std::swap (this->ptr_, tmp.ptr_);
   return *this;
 }
 
@@ -77,7 +79,7 @@ template<class SERVANT> ACE_INLINE SERVANT *&
 Servant_var<SERVANT>::out ()
 {
   Servant_var<SERVANT> tmp;
-  ACE_Swap<SERVANT*>::swap (tmp.ptr_, this->ptr_);
+  std::swap (tmp.ptr_, this->ptr_);
 
   return this->ptr_;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 014ad19a0cc..4763b3abcd1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -79,7 +79,6 @@ Supplier::disconnect (void)
 
 void
 Supplier::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n",
   // events[0].header.type, events[0].header.source));
@@ -96,7 +95,6 @@ Supplier::push (const RtecEventComm::EventSet &events)
 
 void
 Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -105,7 +103,6 @@ Supplier::disconnect_push_supplier (void)
 
 PortableServer::POA_ptr
 Supplier::_default_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index b164fd51e46..ebb88581e01 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -43,16 +43,13 @@ public:
   /// Disconnect from the event channel
   void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
+  virtual PortableServer::POA_ptr _default_POA (void);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 7244d8dcdf0..9761d9ef279 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -39,9 +39,6 @@ CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &/* the_flows */
                                    )
-                            ACE_THROW_SPEC((CORBA::SystemException,
-                                            AVStreams::noSuchFlow,
-                                            AVStreams::QoSRequestFailed ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 78ca9dc022f..9faeb16e931 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -30,10 +30,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
   /// chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                             const AVStreams::flowSpec &flow_spec)
-                            ACE_THROW_SPEC((CORBA::SystemException,
-                                            AVStreams::noSuchFlow,
-                                            AVStreams::QoSRequestFailed ));
+                             const AVStreams::flowSpec &flow_spec);
 
   /// The over-ridden modify_qos method to change the qos of the
   /// flows specified in the flow spec to that in the new_qos.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 07d6f6b2294..dde7cf28790 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -16,9 +16,6 @@ ACE_Time_Value inter_frame_time;
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &the_flows)
-                                   ACE_THROW_SPEC (( CORBA::SystemException,
-                                                     AVStreams::noSuchFlow,
-                                                     AVStreams::QoSRequestFailed ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index 46676fd5579..c72a69c2925 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -40,10 +40,7 @@ public:
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
-                             )
-                            ACE_THROW_SPEC(( CORBA::SystemException,
-                                             AVStreams::noSuchFlow,
-                                             AVStreams::QoSRequestFailed ));
+                             );
 protected:
   TAO_AV_Callback callback_;
   // Application callback.
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 8551e20c058..641920ea2f1 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -11,16 +11,13 @@ class Time_impl :
 {
 public:
   virtual TimeModule::TimeOfDay
-    get_gmt (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_gmt (void);
 
-  void Shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void Shutdown (void);
 };
 
 
 TimeModule::TimeOfDay Time_impl::get_gmt (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   time_t time_now   = time(0);
@@ -37,7 +34,6 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void)
 
 void
 Time_impl::Shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   exit(0);
 }
@@ -102,7 +98,8 @@ main(int argc, char * argv[])
                                     time_servant);
 
       // Get a reference after activating the object
-      TimeModule::Time_var tm = time_servant->_this();
+      CORBA::Object_var object = poa->id_to_reference (ServerId.in ());
+      TimeModule::Time_var tm = TimeModule::Time::_narrow (object.in ());
 
       // Get reference to initial naming context
       CORBA::Object_var name_obj =
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index 3aa7dcf576f..fdb817b8892 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -9,7 +9,7 @@ int main(int argc, char** argv)
 {
   try
     {
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb_->resolve_initial_references ("InterfaceRepository");
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 6aa1ec88f69..9f0afee75c3 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -37,7 +37,6 @@ Test_i::~Test_i (void)
 
 int
 Test_i::try_and_create_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -66,7 +65,6 @@ Test_i::try_and_create_POA (void)
 
 void
 Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
    orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 59e2f65f292..03952a5d946 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -18,11 +18,9 @@ public:
    ~Test_i (void);
 
    /// Try and create a persistant POA
-   int try_and_create_POA (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+   int try_and_create_POA (void);
 
-   void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+   void shutdown (void);
 
 protected:
    CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 6c96143e2e6..62835ad88b3 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index e7984b80ea0..6d6e525ff63 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index 2344a2f0dfb..c7443b34692 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -17,12 +17,13 @@ int main (int argc, char* argv[])
       ACE_DEBUG((LM_DEBUG, "Start of Client\n"));
       // Initialise ORB.
       //
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       // Find the Interface Repository.
       //
       ACE_DEBUG((LM_DEBUG, ". Find IFR\n"));
-      CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository");
+      CORBA::Object_var ifr_obj =
+        orb->resolve_initial_references( "InterfaceRepository");
 
       ACE_DEBUG((LM_DEBUG, ". Narrow IFR\n"));
       CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in());
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index eab4bc5f74b..5f9c0275df2 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -2,9 +2,10 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "tao/corba.h"
+// Ensure that the PI library is linked in when building statically
 #include "tao/PI/PI.h"
+#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 CORBA::ORB_var orb = CORBA::ORB::_nil ();
 
@@ -75,7 +76,7 @@ main (int argc, char *argv[])
   try
     {
       orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 3102647f113..318032819af 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -8,6 +8,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index bfac29d6031..b2763bdcbd1 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index b1331a60f77..054b84275a5 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -19,7 +19,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 char*
 Simple_Server_i::remote_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
 
@@ -33,7 +32,6 @@ Simple_Server_i::remote_call (void)
 
 char*
 Simple_Server_i::shutdown (const char* key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
 
@@ -53,7 +51,6 @@ Simple_Server_i::shutdown (const char* key)
 
 char*
 Simple_Server_i::abort (const char* key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
   int still_alive = 1;
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index be5b3ba7a95..12f537ff77f 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -21,14 +21,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* remote_call (void);
 
-  char* shutdown (const char* key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* shutdown (const char* key);
 
-  char* abort (const char* key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* abort (const char* key);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index 604643f3f4a..fe9454b050f 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -16,14 +16,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   // Install the server request interceptor.
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 4400e6235cb..9d6ac8cca22 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -45,11 +45,9 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
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 8ae869dc2d0..c18328ab77e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -20,21 +20,18 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 void
 Server_Request_Interceptor::forward_reference (
   const char* iorstr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iorstr_ = CORBA::string_dup (iorstr);
 }
 
 char *
 Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
 Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -42,8 +39,6 @@ void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr //
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
 }
@@ -51,8 +46,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext_var svc =
     ri->get_request_service_context (IOP::FT_GROUP_VERSION);
@@ -106,22 +99,17 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
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 1c7e62a26d4..cf3f4ff782e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -46,8 +46,7 @@ public:
   ~Server_Request_Interceptor (void);
 
   /// Set the references to which requests will be forwarded.
-  virtual void forward_reference (const char* iorstr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void forward_reference (const char* iorstr);
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -59,35 +58,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 993aaeef8ca..39c3b0709b1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -6,6 +6,8 @@
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 634a5abd597..49f14c60cdd 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index a83f72c028a..f76b17f2b1d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -19,7 +19,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 char*
 Simple_Server_i::remote_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
 
@@ -33,7 +32,6 @@ Simple_Server_i::remote_call (void)
 
 char*
 Simple_Server_i::shutdown (const char* key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
 
@@ -53,7 +51,6 @@ Simple_Server_i::shutdown (const char* key)
 
 char*
 Simple_Server_i::abort (const char* key)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
   int still_alive = 1;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 29009ba799e..f4873fc8871 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -21,14 +21,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* remote_call (void);
 
-  char* shutdown (const char* key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* shutdown (const char* key);
 
-  char* abort (const char* key)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* abort (const char* key);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
index 349374bb355..b13fc2104be 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
@@ -13,10 +13,10 @@ project(*Client): taoserver, ftclientorb {
 
   exename = client 
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     client.cpp
     Hello.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
@@ -27,12 +27,12 @@ project (*Server) : taoserver, ftclientorb, pi_server {
 
   exename = server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     Hello.cpp
     ServerORBInitializer.cpp
     ServerRequest_Interceptor.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
@@ -43,8 +43,8 @@ project(*Client2): taoclient, ftclientorb, iormanip {
 
   exename = client2 
   Source_Files {
-    client2.cpp
     TestC.cpp
+    client2.cpp
   }
   IDL_Files {
   }
@@ -55,12 +55,12 @@ project (*Server2) : taoserver, pi_server, ftclientorb {
 
   exename = server2
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server2.cpp
     Hello.cpp
     ServerORBInitializer2.cpp
     ServerRequest_Interceptor2.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index e0b003a58bb..ce5558c04f2 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -17,21 +17,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 void
 Hello::throw_exception (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
 {
   throw Test::MyException ();
 }
@@ -39,7 +36,6 @@ Hello::throw_exception (void)
 // Nested sequence step 1 - This op called by the client on the server
 CORBA::Boolean
 Hello::call_me_back (Test::Hello_ptr me)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean result = me->call_back ();
   return result;
@@ -48,7 +44,6 @@ Hello::call_me_back (Test::Hello_ptr me)
 // Nested sequence step 2 - This op called by the server on the client
 CORBA::Boolean
 Hello::call_back (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean result = server_->check_request_id ();
   return result;
@@ -57,7 +52,6 @@ Hello::call_back (void)
 // Nested sequence step 3 - This op called by the client on the server
 CORBA::Boolean
 Hello::check_request_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The server request interceptor will have set this public static member
   // false if the same retention id has been used twice
@@ -66,7 +60,6 @@ Hello::check_request_id (void)
 
 CORBA::ULong
 Hello::drop_down_dead (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return server_id_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index a4cd341189b..b4d9a3cca92 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -22,26 +22,19 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void throw_exception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException));
+  virtual void throw_exception (void);
 
-  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me);
 
-  virtual CORBA::Boolean call_back (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean call_back (void);
 
-  virtual CORBA::Boolean check_request_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean check_request_id (void);
 
-  virtual CORBA::ULong drop_down_dead (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong drop_down_dead (void);
 
   static CORBA::Boolean ids_differ_;
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index 3f59631356a..c6d4c104dcc 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -11,7 +11,6 @@
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -19,7 +18,6 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_server_request_interceptors (info);
 }
@@ -27,7 +25,6 @@ Server_ORBInitializer::post_init (
 void
 Server_ORBInitializer::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index a512252892d..b80f8a306dc 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -27,18 +27,15 @@ class Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index 5d11612ae90..7aff46ebb9d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -11,7 +11,6 @@
 void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init (
 void
 Server_ORBInitializer2::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_server_request_interceptors (info);
 }
@@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init (
 void
 Server_ORBInitializer2::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index f2608319bee..58a08867a06 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -27,18 +27,15 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index f088e5984ff..67cee269b35 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -28,30 +28,24 @@ TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
 
 char *
 TAO249_ServerRequest_Interceptor::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
 }
 
 void
 TAO249_ServerRequest_Interceptor::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
   try
@@ -109,23 +103,18 @@ catch (const CORBA::Exception& ex)
 void
 TAO249_ServerRequest_Interceptor::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_other (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index ec1f1eadf75..0b5eb02ab6c 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -45,35 +45,24 @@ TAO249_ServerRequest_Interceptor (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual char * name (void);
 
-virtual void destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual void destroy (void);
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 private:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index 89f07d67686..3736fc94f3e 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -31,30 +31,24 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
 
 char *
 TAO249_ServerRequest_Interceptor2::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
 TAO249_ServerRequest_Interceptor2::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -204,23 +198,18 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 546d4c52d3d..209e1ecd17c 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -46,35 +46,24 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual char * name (void);
 
-virtual void destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual void destroy (void);
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 
 protected:
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index e8c10b9ec27..52f88f1f19a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -2,6 +2,8 @@
 
 #include "TestS.h"
 #include "ace/Get_Opt.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
@@ -42,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 55d5b3d7b4d..e5bbb615bcf 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -2,8 +2,10 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
+#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
 ACE_RCSID(Hello, client, "$Id$")
@@ -96,7 +98,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 47b626b7723..9b94989ebe8 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index c7d677d6035..aa0bd15fa12 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index e6b390c5f2b..c20b692c4af 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -12,21 +12,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 void
 Hello::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
 Hello::throw_location_forward (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 7f8559b39ee..28bb6597705 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -22,14 +22,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void throw_location_forward (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void throw_location_forward (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index 5d11612ae90..7aff46ebb9d 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -11,7 +11,6 @@
 void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init (
 void
 Server_ORBInitializer2::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_server_request_interceptors (info);
 }
@@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init (
 void
 Server_ORBInitializer2::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index f2608319bee..58a08867a06 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -27,18 +27,15 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index e18c2e67d9f..dc9d6b1f7e7 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -34,30 +34,24 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
 
 char *
 TAO249_ServerRequest_Interceptor2::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
 TAO249_ServerRequest_Interceptor2::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -143,23 +137,18 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 5f537001b96..536d3782173 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -46,35 +46,24 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual char * name (void);
 
-virtual void destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual void destroy (void);
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 
 static CORBA::Object_var server_iogr_;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index f5ca16cd2dd..de2f62c533a 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -2,6 +2,8 @@
 
 #include "TestS.h"
 #include "ace/Get_Opt.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
@@ -42,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index bb339d83c73..96fa57a24ce 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
index 2b4960fc5cd..15de5d453a6 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
@@ -13,10 +13,10 @@ project(*Server): orbsvcsexe, portablegroup, portableserver {
   after += *IDL
 
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Test_impl.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
@@ -27,8 +27,8 @@ project(*Client): orbsvcsexe, portablegroup {
   after += *IDL
 
   Source_Files {
-    client.cpp
     TestC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
index d84909ff31f..4275aecbd97 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
@@ -13,8 +13,8 @@ project(*Client): taoserver, ftclientorb {
 
   exename = client
   Source_Files {
-    client.cpp
     TestC.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -25,12 +25,12 @@ project (*Server) : taoserver, ftclientorb, pi_server {
 
   exename = server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     Hello.cpp
     ServerORBInitializer2.cpp
     ServerRequest_Interceptor2.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index d7bd3093cb2..81115492175 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -14,21 +14,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 void
 Hello::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 CORBA::Boolean
 Hello::has_ft_request_service_context (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ServerRequest_Interceptor2::has_ft_request_sc_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index bfe3791b6c8..c2257a266f1 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -22,14 +22,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual CORBA::Boolean has_ft_request_service_context (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean has_ft_request_service_context (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index 2f25ad62893..28c65bdca2b 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -11,7 +11,6 @@
 void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init (
 void
 Server_ORBInitializer2::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_server_request_interceptors (info);
 }
@@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init (
 void
 Server_ORBInitializer2::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index f2608319bee..58a08867a06 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -27,18 +27,15 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index afd584a6b3b..2ccd153fb10 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -33,30 +33,24 @@ ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void)
 
 char *
 ServerRequest_Interceptor2::name (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequest_Interceptor2");
 }
 
 void
 ServerRequest_Interceptor2::destroy (void)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequest_Interceptor2::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequest_Interceptor2::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -90,23 +84,18 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 void
 ServerRequest_Interceptor2::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequest_Interceptor2::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequest_Interceptor2::send_other (
   PortableInterceptor::ServerRequestInfo_ptr)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index ac8917d5d8b..7b978a5702a 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -45,35 +45,24 @@ ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual char * name (void);
 
-virtual void destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual void destroy (void);
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 
 static CORBA::Boolean has_ft_request_sc_;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 3416740c407..6a1be109246 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -2,6 +2,8 @@
 
 #include "TestS.h"
 #include "ace/Get_Opt.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
@@ -45,7 +47,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index b7f52de4793..b7e9c7b9c81 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
index 8c73a352758..c283222d560 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
@@ -12,8 +12,8 @@ project(*Client): taoserver, iortable, ftclientorb, fault_tolerance {
   after += *idl
   exename = client
   Source_Files {
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
     client.cpp
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index 2f7fb7e268b..08916607cda 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -10,7 +10,6 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 
 // virtual
 void TestImpl::myMethod (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
 }
@@ -18,7 +17,6 @@ void TestImpl::myMethod (void)
 
 // virtual
 void TestImpl::shutdown (void)
-  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
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index caf61465a18..0573e057c49 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -10,11 +10,9 @@ public:
   TestImpl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void myMethod (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void myMethod (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 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
index 10f560a64b6..0a5d0e5defb 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -7,6 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "Server_Task.h"
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
new file mode 100644
index 00000000000..daff3971c8e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
@@ -0,0 +1,48 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(*NsMain): namingexe, naming_serv {
+  exename = nsmain
+  after += *idl
+  Source_Files {
+    Hello.cpp
+    NamingTask.cpp
+    nsmain.cpp
+    NsShutdown.cpp
+  }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+}
+
+project(*Client): namingexe {
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    TestC.cpp
+  }
+}
+
+project(*Server): namingexe, portableserver {
+  exename = server
+  after += *idl
+  Source_Files {
+    server.cpp
+    Hello.cpp
+  }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
new file mode 100644
index 00000000000..df5dc90d3d9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -0,0 +1,23 @@
+//
+// $Id$
+//
+#include "Hello.h"
+
+ACE_RCSID(Hello, Hello, "$Id$")
+
+Hello::Hello (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+char *
+Hello::get_string (void)
+{
+  return CORBA::string_dup ("Hello there!");
+}
+
+void
+Hello::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
new file mode 100644
index 00000000000..f87205c3011
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -0,0 +1,31 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual char * get_string (void);
+
+  virtual void shutdown (void);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
new file mode 100644
index 00000000000..325d3f7b9c7
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
@@ -0,0 +1,86 @@
+// $Id$
+
+#include "NamingTask.h"
+#include "orbsvcs/Naming/Naming_Server.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
+
+NamingTask::NamingTask (const char* orbname, int argc, char** argv, unsigned short port)
+ : initialized_(false)
+{
+  char** my_argv = new char*[argc + 2];
+  char buf[128];
+  int my_argc = 0;
+  for(; my_argc<argc ;++my_argc)
+    my_argv[my_argc] = argv[my_argc];
+  ACE_OS::sprintf (buf, "iiop://localhost:%d", port);
+  const char* epopt = "-ORBEndpoint";
+  my_argv[my_argc++] = const_cast<char*> (epopt);
+  my_argv[my_argc++] = buf;
+
+  ACE_Argv_Type_Converter satc (my_argc, my_argv);
+  orb_ = CORBA::ORB_init(satc.get_argc (), satc.get_TCHAR_argv (), orbname);
+}
+
+void NamingTask::waitInit ()
+{
+  // Wait for Naming Service initialized.
+  while (! initialized_) {
+    ACE_OS::sleep(ACE_Time_Value(0, 100 * 1000));
+  }
+}
+
+void NamingTask::end()
+{
+  orb_->shutdown(0);
+  wait();
+}
+
+const char* NamingTask::ior()
+{
+  return ior_.in ();
+}
+
+int NamingTask::svc()
+{
+  try {
+    // Get reference to Root POA
+    CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+
+    // Activate POA Manager
+    PortableServer::POAManager_var poaManager = poa->the_POAManager();
+    poaManager->activate();
+
+    // Initialize the naming service
+    // We are not going to look for other naming servers
+    TAO_Naming_Server naming;
+    if (naming.init(orb_.in(),
+                    poa.in(),
+                    ACE_DEFAULT_MAP_SIZE,
+                    0,
+                    0,
+                    0,
+                    TAO_NAMING_BASE_ADDR,
+                    0) == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "The Naming Service Task is ready.\n"));
+      ior_ = CORBA::string_dup (naming.naming_service_ior ());
+      initialized_ = true;
+      // Accept requests
+      orb_->run();
+      return 0;
+    }
+    else
+    {
+      ACE_ERROR ((LM_ERROR, "Unable to initialize the Naming Service.\n"));
+    }
+  }
+  catch (const CORBA::Exception& ex)
+  {
+      ex._tao_print_exception ("NamingTask::svc() CORBA::Exception: ");
+  }
+
+  return -1;
+}
+
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
new file mode 100644
index 00000000000..d909fcc97db
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
@@ -0,0 +1,27 @@
+// $Id$
+
+#ifndef NAMINGTASK_H
+#define NAMINGTASK_H
+
+#include "tao/CORBA_String.h"
+#include "tao/ORB.h"
+#include "ace/Task.h"
+#include "ace/Synch_Traits.h"
+
+class NamingTask : public ACE_Task_Base
+{
+public:
+  NamingTask (const char* orbname, int argc, char** argv, unsigned short port);
+  virtual int svc();
+  void waitInit ();
+  void end();
+
+  const char* ior ();
+
+private:
+  CORBA::ORB_var orb_;
+  bool initialized_;
+  CORBA::String_var ior_;
+};
+
+#endif
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
new file mode 100644
index 00000000000..ae73a73eefd
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -0,0 +1,19 @@
+//
+// $Id$
+//
+#include "NsShutdown.h"
+
+ACE_RCSID(Hello,
+          NsShutdown,
+          "$Id$")
+
+NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+void
+NsShutdown::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
new file mode 100644
index 00000000000..c6cf90e02be
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -0,0 +1,28 @@
+//
+// $Id$
+//
+
+#ifndef SHUTDOWN_H
+#define SHUTDOWN_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class NsShutdown
+  : public virtual POA_Test::NsShutdown
+{
+public:
+  /// Constructor
+  NsShutdown (CORBA::ORB_ptr orb);
+
+  virtual void shutdown (void);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
new file mode 100644
index 00000000000..98ed1b2e3a3
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
@@ -0,0 +1,26 @@
+//
+// $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 ();
+  };
+
+  /// A very simple interface
+  interface NsShutdown
+  {
+    oneway void shutdown ();
+  };
+};
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
new file mode 100644
index 00000000000..cfaedd2ea24
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -0,0 +1,113 @@
+// $Id$
+
+#include "TestC.h"
+#include "orbsvcs/CosNamingC.h"
+#include "ace/Get_Opt.h"
+
+ACE_RCSID(Hello, client, "$Id$")
+
+const char *ior = "file://shutdown.ior";
+bool shutdown_nsmain = false;
+
+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':
+        shutdown_nsmain = true;
+        break;
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp =
+        orb->string_to_object("corbaloc:iiop:1.2@localhost:9931/NameService");
+
+      CosNaming::NamingContext_var root =
+        CosNaming::NamingContext::_narrow(tmp.in());
+
+      if (CORBA::is_nil (root.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil NamingService reference\n"),
+                            1);
+        }
+
+      ACE_DEBUG ((LM_INFO, "**** Narrowed root NamingContext\n"));
+
+      CosNaming::Name name;
+      name.length(2);
+      name[0].id = CORBA::string_dup("example");
+      name[1].id = CORBA::string_dup("Hello");
+
+      try
+        {
+          tmp = root->resolve (name);
+          ACE_DEBUG ((LM_INFO, "**** Resolved #example/Hello\n"));
+
+          Test::Hello_var hello =
+            Test::Hello::_narrow(tmp.in ());
+
+          if (CORBA::is_nil (hello.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_DEBUG,
+                                 "Nil Test::Hello reference\n"),
+                                1);
+            }
+
+          CORBA::String_var the_string = hello->get_string ();
+
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+                      the_string.in ()));
+
+          hello->shutdown ();
+        }
+      catch (const CosNaming::NamingContext::CannotProceed&)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Caught correct exception\n"));
+        }
+
+      if (shutdown_nsmain)
+        {
+          CORBA::Object_var shutdowntmp = orb->string_to_object(ior);
+
+          Test::NsShutdown_var shutdown =
+            Test::NsShutdown::_narrow(shutdowntmp.in ());
+
+          ACE_DEBUG ((LM_DEBUG, "Shutdown nsmain\n"));
+          shutdown->shutdown ();
+        }
+
+      orb->shutdown ();
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
new file mode 100644
index 00000000000..fae15a4ee43
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -0,0 +1,190 @@
+// $Id$
+
+#include "NamingTask.h"
+#include "Hello.h"
+#include "NsShutdown.h"
+#include "orbsvcs/CosNamingC.h"
+#include "ace/OS.h"
+#include "ace/Get_Opt.h"
+
+const char *ior_output_file = "shutdown.ior";
+
+class TestTask : public ACE_Task_Base
+{
+public:
+  TestTask(int argc, char **argv);
+  virtual int svc();
+
+  int parse_args (int argc, char **argv);
+
+  void end();
+private:
+  NamingTask namingServiceA_;
+  NamingTask namingServiceB_;
+  CORBA::ORB_var orb_;
+  CORBA::Boolean shutdown_ns_;
+};
+
+TestTask::TestTask(int argc, char **argv)
+ : namingServiceA_("NamingORBA", argc, argv, 9931),
+   namingServiceB_("NamingORBB", argc, argv, 9932)
+{
+  orb_ = CORBA::ORB_init(argc, argv, "ServerORB");
+  shutdown_ns_ = false;
+  parse_args(argc, argv);
+}
+
+void TestTask::end()
+{
+  orb_->shutdown(0);
+  wait();
+}
+
+int
+TestTask::parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "s");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 's':
+        shutdown_ns_ = true;
+        break;
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int TestTask::svc()
+{
+
+  try {
+    // Start the Naming Service tasks
+    namingServiceA_.activate();
+    // Wait for the Naming Service initialized.
+    namingServiceA_.waitInit();
+
+    namingServiceB_.activate();
+    // Wait for the Naming Service initialized.
+    namingServiceB_.waitInit();
+
+    FILE *output_file= ACE_OS::fopen ("ns.ior", "w");
+    if (output_file == 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Cannot open output file for writing IOR: ns.ior\n"),
+                          1);
+    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
+    ACE_OS::fclose (output_file);
+
+    // Get reference to Root POA
+    CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+
+    // Activate POA Manager
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
+    mgr->activate();
+
+    // Find the Naming Service
+    obj = orb_->string_to_object (namingServiceB_.ior ());
+    CosNaming::NamingContext_var root =
+      CosNaming::NamingContext::_narrow(obj.in());
+
+    if (CORBA::is_nil(root.in())) {
+      ACE_ERROR ((LM_ERROR, "Error, Nil Naming Context reference\n"));
+      return 1;
+    }
+    // Bind the example Naming Context, if necessary
+    CosNaming::NamingContext_var example_nc;
+    CosNaming::Name name;
+    name.length(1);
+    name[0].id = CORBA::string_dup("example");
+    try
+    {
+      obj = root->resolve(name);
+      example_nc = CosNaming::NamingContext::_narrow(obj.in());
+    }
+    catch (const CosNaming::NamingContext::NotFound&)
+    {
+      example_nc = root->bind_new_context(name);
+    }
+
+    // Bind the Test object
+    name.length(2);
+    name[1].id = CORBA::string_dup("Hello");
+
+    // Create an object
+    Hello servant(orb_.in ());
+    PortableServer::ObjectId_var oid = poa->activate_object(&servant);
+    obj = poa->id_to_reference(oid.in());
+    root->rebind(name, obj.in());
+
+    ACE_DEBUG ((LM_INFO, "Hello object bound in Naming Service B\n"));
+
+    name.length(1);
+    obj = orb_->string_to_object (namingServiceA_.ior ());
+    root = CosNaming::NamingContext::_narrow(obj.in());
+    root->bind_context (name, example_nc.in ());
+
+    ACE_DEBUG ((LM_INFO, "'example' context of NS B bound in Naming Service A\n"));
+
+    if (shutdown_ns_)
+    {
+      namingServiceB_.end();
+
+      ACE_DEBUG ((LM_INFO, "Naming Service B shut down\n"));
+    }
+
+    // Create shutdown server
+    NsShutdown shutdown_servant(orb_.in ());
+    PortableServer::ObjectId_var shutdown_oid = poa->activate_object(&shutdown_servant);
+    obj = poa->id_to_reference(shutdown_oid.in());
+    CORBA::String_var ior = orb_->object_to_string (obj.in ());
+
+    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);
+
+    // Normally we run the orb and the orb is shutdown by
+    // calling TestTask::end().
+    // Accept requests
+    orb_->run();
+    orb_->destroy();
+
+    // Shutdown the Naming Services.
+    namingServiceA_.end();
+    if (!shutdown_ns_)
+      {
+        namingServiceB_.end();
+      }
+
+    return 0;
+  }
+  catch (CORBA::Exception& ex)
+  {
+    ex._tao_print_exception ("CORBA exception: ");
+  }
+
+  return -1;
+}
+
+int main(int argc, char* argv[])
+{
+  // Start the Test task
+  TestTask test_(argc, argv);
+  if (test_.activate() == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Unable to start test task.\n"), -1);
+    }
+
+  // Wait tasks finish.
+  test_.thr_mgr ()->wait();
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
new file mode 100755
index 00000000000..24365ae6d84
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
@@ -0,0 +1,59 @@
+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 ("ns.ior");
+$shutdownior = PerlACE::LocalFile ("shutdown.ior");
+unlink $iorfile;
+unlink $shutdownior;
+
+$SV = new PerlACE::Process ("nsmain", "-s -ORBDebuglevel $debug_level");
+$CL = new PerlACE::Process ("client", "-k");
+
+$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 (60);
+
+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 $shutdownior;
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
new file mode 100755
index 00000000000..c73c1bf63d5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
@@ -0,0 +1,119 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+# This is a Perl script that runs a Naming Service test.  It starts
+# all the servers and clients as necessary.
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::Run_Test;
+use Cwd;
+
+# Amount of delay (in seconds) between starting a server and a client
+# to allow proper server initialization.
+$sleeptime = 10;
+
+$quiet = 0;
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+    if ($ARGV[0] eq '-q') {
+        $quiet = 1;
+    }
+}
+
+
+# Variables for command-line arguments to client and server
+# executables.
+$ns_orb_port1 = 9931;
+$ns_orb_port2 = 9932;
+$ns_endpoint1 = "iiop://localhost:$ns_orb_port1";
+$ns_endpoint2 = "iiop://localhost:$ns_orb_port2";
+$nsiorfile1 = PerlACE::LocalFile ("ns1.ior");
+$nsiorfile2 = PerlACE::LocalFile ("ns2.ior");
+$iorfile = PerlACE::LocalFile ("test.ior");
+
+$status = 0;
+
+# Run two Naming Servers
+
+my $args = "-ORBEndPoint $ns_endpoint1 -o $nsiorfile1 -m 0";
+my $prog = "../../Naming_Service/Naming_Service";
+$NS1 = new PerlACE::Process ($prog, $args);
+
+unlink $nsiorfile1;
+unlink $iorfile;
+
+$NS1->Spawn ();
+
+if (PerlACE::waitforfile_timed ($nsiorfile1, $PerlACE::wait_interval_for_process_creation) == -1) {
+  print STDERR "ERROR: cannot find IOR file <$nsiorfile1>\n";
+  $NS1->Kill ();
+  exit 1;
+}
+
+my $args = "-ORBEndPoint $ns_endpoint2 -o $nsiorfile2 -m 0";
+my $prog = "../../Naming_Service/Naming_Service";
+$NS2 = new PerlACE::Process ($prog, $args);
+
+unlink $nsiorfile2;
+
+$NS2->Spawn ();
+
+if (PerlACE::waitforfile_timed ($nsiorfile2, $PerlACE::wait_interval_for_process_creation) == -1) {
+  print STDERR "ERROR: cannot find IOR file <$nsiorfile2>\n";
+  $NS2->Kill ();
+  exit 1;
+}
+
+$SV = new PerlACE::Process ("server", "-ORBDebuglevel $debug_level");
+$CL = new PerlACE::Process ("client", "");
+
+$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;
+}
+
+# Kill naming service 2
+print STDERR "Killing second naming server\n";
+$NS2->Kill ();
+
+print STDERR "Starting client\n";
+$client = $CL->Spawn ();
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+sleep (15);
+
+$server = $SV->TerminateWaitKill (10);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+$NS1->Kill ();
+$CL->TerminateWaitKill (2);
+
+unlink $iorfile1;
+unlink $iorfile2;
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
new file mode 100644
index 00000000000..28d959ce4a1
--- /dev/null
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -0,0 +1,157 @@
+// $Id$
+
+#include "Hello.h"
+#include "orbsvcs/CosNamingC.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+const char *ior_output_file = "test.ior";
+
+class TestTask : public ACE_Task_Base
+{
+public:
+  TestTask(int argc, char **argv);
+  virtual int svc();
+
+  int parse_args (int argc, char **argv);
+
+  void end();
+private:
+  CORBA::ORB_var orb_;
+  CORBA::Boolean shutdown_ns_;
+};
+
+TestTask::TestTask(int argc, char **argv)
+{
+  orb_ = CORBA::ORB_init(argc, argv, "ServerORB");
+  shutdown_ns_ = false;
+  parse_args(argc, argv);
+}
+
+void TestTask::end()
+{
+  orb_->shutdown(0);
+  wait();
+}
+
+int
+TestTask::parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:s");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 's':
+        shutdown_ns_ = true;
+        break;
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int TestTask::svc()
+{
+
+  try {
+    // Get reference to Root POA
+    CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+
+    // Activate POA Manager
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
+    mgr->activate();
+
+    // Find the Naming Service
+    obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9932/NameService");
+    CosNaming::NamingContext_var root =
+      CosNaming::NamingContext::_narrow(obj.in());
+
+    if (CORBA::is_nil(root.in())) {
+      ACE_ERROR ((LM_ERROR, "Error, Nil Naming Context reference\n"));
+      return 1;
+    }
+    // Bind the example Naming Context, if necessary
+    CosNaming::NamingContext_var example_nc;
+    CosNaming::Name name;
+    name.length(1);
+    name[0].id = CORBA::string_dup("example");
+    try
+    {
+      obj = root->resolve(name);
+      example_nc =
+        CosNaming::NamingContext::_narrow(obj.in());
+    }
+    catch (const CosNaming::NamingContext::NotFound&)
+    {
+      example_nc = root->bind_new_context(name);
+    }
+
+    // Bind the Test object
+    name.length(2);
+    name[1].id = CORBA::string_dup("Hello");
+
+    // Create an object
+    Hello servant(orb_.in ());
+    PortableServer::ObjectId_var oid = poa->activate_object(&servant);
+    obj = poa->id_to_reference(oid.in());
+    root->rebind(name, obj.in());
+
+    ACE_DEBUG ((LM_INFO, "Hello object bound in Naming Service B\n"));
+
+    name.length(1);
+    obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9931/NameService");
+    root = CosNaming::NamingContext::_narrow(obj.in());
+    root->bind_context (name, example_nc.in ());
+
+    ACE_DEBUG ((LM_INFO, "'example' context of NS B bound in Naming Service A\n"));
+
+    CORBA::String_var ior =
+      orb_->object_to_string (obj.in ());
+
+    // 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);
+
+    ACE_DEBUG ((LM_INFO, "Wrote IOR file\n"));
+
+    // Normally we run the orb and the orb is shutdown by
+    // calling TestTask::end().
+    // Accept requests
+    orb_->run();
+    orb_->destroy();
+
+    return 0;
+  }
+  catch (CORBA::Exception& ex)
+  {
+    ex._tao_print_exception ("CORBA exception: ");
+  }
+
+  return -1;
+}
+
+int main(int argc, char* argv[])
+{
+  // Start the Test task
+  TestTask test_(argc, argv);
+  if (test_.activate() == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Unable to start test task.\n"), -1);
+    }
+
+  // Wait the tasks to finish.
+  test_.thr_mgr ()->wait();
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
new file mode 100644
index 00000000000..c89940b5559
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
@@ -0,0 +1,26 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(COIOP_Naming_Test): taoserver, strategies, naming, naming_serv {
+  exename = COIOP_Naming_Test
+  after += *idl
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+    COIOP_Test.cpp
+    Client_Task.cpp
+    Server_Task.cpp
+    NamingTask.cpp
+    Hello.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
new file mode 100644
index 00000000000..b895c972726
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
@@ -0,0 +1,110 @@
+//$Id$
+#include "Server_Task.h"
+#include "Client_Task.h"
+#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
+#include "ace/SString.h"
+#include "ace/Manual_Event.h"
+#include "tao/Strategies/advanced_resource.h"
+#include "NamingTask.h"
+
+ACE_CString server_orb;
+ACE_CString client_orb;
+CORBA::Boolean result = false;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "sk:o:n");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 's' :
+        result = true;
+        break;
+      case 'n':
+        server_orb.set ("server_orb");
+        client_orb.set ("client_orb");
+        break;
+      case '?':
+      default:
+        // This is a hack but that is okay!
+        return 0;
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  if (parse_args (argc,
+                  argv) == -1)
+    return -1;
+
+  try
+    {
+      // Start the Naming Service tasks
+      NamingTask name_service ("NamingORBA", argc, argv);
+      name_service.activate();
+      // Wait for the Naming Service initialized.
+      name_service.waitInit();
+
+      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_Manual_Event me;
+      Server_Task server_task (name_service.root (),
+                               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_Argv_Type_Converter catc (argc, argv);
+      CORBA::ORB_var corb =
+        CORBA::ORB_init (catc.get_argc (),
+                         catc.get_TCHAR_argv (),
+                         client_orb.c_str ());
+
+      Client_Task client_task (name_service.root (),
+                               corb.in (),
+                               ACE_Thread_Manager::instance (),
+                               result);
+
+      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
+                                1,
+                                1) == -1)
+        {
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
+        }
+
+      // Wait for the client and server to finish
+      ACE_Thread_Manager::instance ()->wait ();
+
+      // Now that all threads have completed we can destroy the ORB
+      sorb->destroy ();
+      if (server_orb != client_orb)
+        {
+          corb->destroy ();
+        }
+    }
+  catch (const CORBA::Exception&)
+    {
+      // Ignore exceptions..
+    }
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
new file mode 100644
index 00000000000..df927dc4b1d
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -0,0 +1,78 @@
+//
+// $Id$
+//
+
+#include "Client_Task.h"
+#include "tao/ORB_Core.h"
+#include "TestC.h"
+
+ACE_RCSID(Muxing, Client_Task, "$Id$")
+
+Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
+                          CORBA::ORB_ptr corb,
+                          ACE_Thread_Manager *thr_mgr,
+                          CORBA::Boolean result)
+  : ACE_Task_Base (thr_mgr)
+    , root_context_ (CosNaming::NamingContext::_duplicate (root_context))
+    , corb_ (CORBA::ORB::_duplicate (corb))
+    , result_ (result)
+{
+}
+
+int
+Client_Task::svc (void)
+{
+  try
+    {
+      CosNaming::Name name;
+      name.length(1);
+      name[0].id = CORBA::string_dup("Hello");
+
+      CORBA::Object_var tmp = root_context_->resolve (name);
+
+      Test::Hello_var hello =
+        Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference\n"),
+                             1);
+        }
+
+      CORBA::String_var the_string =
+        hello->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+		  the_string.in ()));
+
+      if (!this->result_)
+        {
+          // We would expect the call to fail, so we have an error now
+          ACE_ERROR ((LM_ERROR, "(%P|%t) - ERROR: get_string should have failed\n"));
+        }
+
+      hello->shutdown ();
+    }
+  catch (const CORBA::TRANSIENT& ex)
+    {
+      if (!this->result_)
+        {
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - caught expected exception\n"));
+          // When collocation has been disabled we expect a transient
+          // with minor code 2
+          return 0;
+        }
+
+      ex._tao_print_exception ("Caught exception:");
+      return 1;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+
+}
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
new file mode 100644
index 00000000000..38be7e2df24
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
@@ -0,0 +1,41 @@
+//
+// $Id$
+//
+
+#ifndef COLLOCATED_TEST_CLIENT_TASK_H
+#define COLLOCATED_TEST_CLIENT_TASK_H
+#include /**/ "ace/pre.h"
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+#include "orbsvcs/CosNamingC.h"
+
+/// Implement a Task to run the client as a thread
+class Client_Task : public ACE_Task_Base
+{
+public:
+
+  /// Constructor
+  Client_Task (CosNaming::NamingContext_ptr root_context,
+               CORBA::ORB_ptr corb,
+               ACE_Thread_Manager *thr_mgr,
+               CORBA::Boolean result);
+
+  /// Thread entry point
+  int svc (void);
+
+private:
+  CosNaming::NamingContext_var root_context_;
+
+  CORBA::ORB_var corb_;
+
+  // Boolean to indicate whether the invocation should work or not.
+  CORBA::Boolean result_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* COLLOCATED_TEST_CLIENT_TASK_H */
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
new file mode 100644
index 00000000000..9cfd6c265c9
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -0,0 +1,68 @@
+//
+// $Id$
+//
+#include "Hello.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB_Table.h"
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Hello, Hello, "$Id$")
+
+  Hello::Hello (CORBA::ORB_ptr orb,
+              ACE_thread_t thrid)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+    , thr_id_ (thrid)
+{
+}
+
+char *
+Hello::get_string (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) Upcall in process ..\n"));
+
+  // Use portable thread IDs
+  ACE_Thread_ID self_ID;
+  ACE_Thread_ID this_ID;
+  this_ID.id(this->thr_id_);
+
+  if (self_ID == this_ID)
+    {
+      if (this->orb_->orb_core ()->optimize_collocation_objects () &&
+          this->orb_->orb_core ()->use_global_collocation ())
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) ERROR: A remote call has been made "
+                      " exiting ..\n"));
+          ACE_OS::abort ();
+        }
+      else if (this->orb_->orb_core ()->optimize_collocation_objects () &&
+               this->orb_->orb_core ()->use_global_collocation () == 0)
+        {
+          TAO::ORB_Table * const orb_table =
+            TAO::ORB_Table::instance ();
+
+          if (orb_table->find ("server_orb") == 0)
+            {
+              // We are running on a single ORB and this is an error.
+              ACE_ERROR ((LM_ERROR,
+                          "(%P|%t) ERROR: A remote call has been made "
+                          " with a single ORB "
+                          " exiting ..\n"));
+              ACE_OS::abort ();
+            }
+        }
+    }
+
+  return CORBA::string_dup ("Hello there!");
+}
+
+void
+Hello::shutdown (void)
+{
+  // 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 (0);
+}
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
new file mode 100644
index 00000000000..556409e5d00
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -0,0 +1,36 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+#include "ace/OS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello (CORBA::ORB_ptr orb,
+         ACE_thread_t thr_id);
+
+  // = The skeleton methods
+  virtual char * get_string (void);
+
+  virtual void shutdown (void);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+
+  ACE_thread_t thr_id_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
new file mode 100644
index 00000000000..38c35d8cf8f
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
@@ -0,0 +1,77 @@
+// $Id$
+
+#include "NamingTask.h"
+#include "tao/Version.h"
+#include "orbsvcs/Naming/Naming_Server.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
+
+NamingTask::NamingTask (const char* orbname, int argc, char** argv)
+ : initialized_(false)
+{
+  ACE_Argv_Type_Converter satc (argc, argv);
+  orb_ = CORBA::ORB_init(satc.get_argc (), satc.get_TCHAR_argv (), orbname);
+}
+
+void NamingTask::waitInit ()
+{
+  // Wait for Naming Service initialized.
+  while (! initialized_) {
+    ACE_OS::sleep(ACE_Time_Value(0, 100 * 1000));
+  }
+}
+
+void NamingTask::end()
+{
+  orb_->shutdown(0);
+  wait();
+}
+
+CosNaming::NamingContext_ptr
+NamingTask::root (void) const
+{
+  return CosNaming::NamingContext::_duplicate (root_);
+}
+
+int NamingTask::svc()
+{
+  try {
+    // Get reference to Root POA
+    CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+
+    // Activate POA Manager
+    PortableServer::POAManager_var poaManager = poa->the_POAManager();
+    poaManager->activate();
+
+    // Initialize the naming service
+    // We are not going to look for other naming servers
+    TAO_Naming_Server naming;
+    if (naming.init(orb_.in(),
+                    poa.in(),
+                    ACE_DEFAULT_MAP_SIZE,
+                    0,
+                    0,
+                    0,
+                    TAO_NAMING_BASE_ADDR,
+                    0) == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "The Naming Service Task is ready.\n"));
+      root_ = CosNaming::NamingContext::_duplicate (naming.operator->());
+      initialized_ = true;
+      // Accept requests
+      orb_->run();
+      orb_->destroy();
+      return 0;
+    }
+    else {
+      ACE_ERROR ((LM_ERROR, "Error, Unable to initialize the Naming Service.\n"));
+    }
+  }
+  catch (CORBA::Exception& ex) {
+    ex._tao_print_exception ("CORBA exception: NamingTask::svc() ");
+  }
+
+  return -1;
+}
+
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
new file mode 100644
index 00000000000..3c3fa058722
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
@@ -0,0 +1,27 @@
+// $Id$
+
+#ifndef NAMINGTASK_H
+#define NAMINGTASK_H
+
+#include "tao/corba.h"
+#include "ace/Task.h"
+#include "orbsvcs/CosNamingC.h"
+#include "ace/Synch_Traits.h"
+
+class NamingTask : public ACE_Task_Base
+{
+public:
+  NamingTask (const char* orbname, int argc, char** argv);
+  virtual int svc();
+  void waitInit ();
+  void end();
+
+  CosNaming::NamingContext_ptr root (void) const;
+
+private:
+  CORBA::ORB_var orb_;
+  bool initialized_;
+  CosNaming::NamingContext_var root_;
+};
+
+#endif
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
new file mode 100644
index 00000000000..768850a5536
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -0,0 +1,79 @@
+//
+// $Id$
+//
+#include "Server_Task.h"
+#include "TestS.h"
+#include "Hello.h"
+
+#include "ace/Manual_Event.h"
+
+ACE_RCSID(Collocated_Test,
+          Server_Task,
+          "$Id$")
+
+
+Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context,
+                          CORBA::ORB_ptr sorb,
+                          ACE_Manual_Event &me,
+                          ACE_Thread_Manager *thr_mgr)
+  : ACE_Task_Base (thr_mgr)
+    , root_context_ (CosNaming::NamingContext::_duplicate (root_context))
+    , me_ (me)
+    , sorb_ (CORBA::ORB::_duplicate (sorb))
+{
+}
+
+int
+Server_Task::svc (void)
+{
+ try
+   {
+     CORBA::Object_var poa_object =
+       this->sorb_->resolve_initial_references("RootPOA");
+
+     PortableServer::POA_var root_poa =
+       PortableServer::POA::_narrow (poa_object.in ());
+
+     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 ();
+
+     Hello *hello_impl = 0;
+     ACE_NEW_RETURN (hello_impl,
+                     Hello (this->sorb_.in (),
+                            ACE_Thread::self ()),
+                     1);
+
+     PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+     Test::Hello_var hello =
+       hello_impl->_this ();
+
+     CosNaming::NamingContext_var example_nc;
+     CosNaming::Name name;
+     name.length(1);
+     name[0].id = CORBA::string_dup("Hello");
+     root_context_->rebind(name, hello.in());
+
+     poa_manager->activate ();
+
+     // Signal the main thread before we call orb->run ();
+     this->me_.signal ();
+
+     ACE_Time_Value runtime (10);
+     this->sorb_->run (runtime);
+
+     ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+   }
+ catch (const CORBA::Exception& ex)
+   {
+     ex._tao_print_exception ("Exception caught:");
+     return 1;
+   }
+
+ return 0;
+}
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
new file mode 100644
index 00000000000..4d7be111da0
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#ifndef COLLOCATED_SERVER_TASK_H
+#define COLLOCATED_SERVER_TASK_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+#include "orbsvcs/CosNamingC.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+/// Implement a Task to run the server in a single thread
+class Server_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Server_Task (CosNaming::NamingContext_ptr root_context,
+               CORBA::ORB_ptr sorb,
+               ACE_Manual_Event &me,
+               ACE_Thread_Manager *thr_mgr);
+
+  /// Thread entry point
+  int svc (void);
+
+private:
+  CosNaming::NamingContext_var root_context_;
+
+  /// Manual event to wake up the main thread to create a client
+  /// thread.
+  ACE_Manual_Event &me_;
+
+  CORBA::ORB_var sorb_;
+};
+
+#include /**/ "ace/post.h"
+
+#endif  /* COLLOCATED_SERVER_TASK_H */
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
new file mode 100644
index 00000000000..3c0976e106d
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
@@ -0,0 +1,20 @@
+//
+// $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/orbsvcs/tests/COIOP_Naming_Test/run_test.pl b/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl
new file mode 100755
index 00000000000..7c45f9d5df0
--- /dev/null
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl
@@ -0,0 +1,82 @@
+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 ("test.ior");
+unlink $iorfile;
+$status = 0;
+
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("COIOP_Naming_Test");
+}
+else {
+    $SV = new PerlACE::Process ("COIOP_Naming_Test");
+}
+
+print STDERR "======== Running in Default Mode \n";
+$SV->Arguments ("-s -o $iorfile -k file://$iorfile -ORBDebugLevel 10");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+print STDERR "======== Running with per-orb \n";
+$SV->Arguments ("-s -o $iorfile -k file://$iorfile -ORBCollocation per-orb");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+print STDERR "======== Running with no collocation \n";
+$SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation no");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+print STDERR "======== Running in default mode and two ORBS \n";
+$SV->Arguments ("-s -o $iorfile -k file://$iorfile -n");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+print STDERR "======== Running in per-orb mode and two ORBS \n";
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+print STDERR "======== Running in no collocation mode and two ORBS \n";
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation no");
+$sv = $SV->SpawnWaitKill (60);
+
+if ($sv != 0) {
+    print STDERR "ERROR in Collocated_Test\n";
+    $status = 1;
+}
+unlink $iorfile;
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 7072b482fc6..f9a2f695b3f 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -66,7 +66,7 @@ CC_Command::GetLockSet (const char *lock_set_name)
           // No lock set name was given. Use the global lock set.
           if(cc_lockset_.in()==0)
             {
-              ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+              throw CORBA::UNKNOWN ();
             }
           else
             ccls_ret = cc_lockset_.in ();
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 657405b4ae7..17bb52a3988 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -23,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 69e9401a06e..6a8d0eca3a4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -23,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 990d9da478e..7c606142cba 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -19,7 +19,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index a424f4e6c6e..bd60a437867 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -19,7 +19,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 01df584fecc..c4b1c0400bb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -45,7 +45,7 @@ RND_Driver::run (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // ****************************************************************
 
@@ -345,14 +345,12 @@ RND_Consumer::disconnect (void)
 
 void
 RND_Consumer::push (const CORBA::Any &event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->event (event);
 }
 
 void
 RND_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -424,7 +422,6 @@ RND_Supplier::push (CORBA::Any &event)
 
 void
 RND_Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 20dd4130a11..9287f5bc7f1 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -44,10 +44,8 @@ public:
   RND_Consumer (RND_Driver *driver);
   // Constructor
 
-  void push (const CORBA::Any &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const CORBA::Any &event);
+  void disconnect_push_consumer (void);
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin);
   void disconnect (void);
@@ -76,8 +74,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const CORBA::Any &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const CORBA::Any &event);
 };
 
 inline
@@ -108,8 +105,7 @@ public:
   void push (CORBA::Any &event);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
   virtual int svc (void);
   // Active method
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index dbd64fada44..b46682495bf 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -21,7 +21,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 3a60fabd759..d51f9d3e32b 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -69,7 +69,6 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 
 void
 CEC_Counting_Consumer::push (const CORBA::Any&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
 #if 0
@@ -85,7 +84,6 @@ CEC_Counting_Consumer::push (const CORBA::Any&)
 
 void
 CEC_Counting_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -187,7 +185,6 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 
 void
 CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 7b30ad07f53..e3d0304fc2e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -49,10 +49,8 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const CORBA::Any& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
   CORBA::ULong event_count;
@@ -95,8 +93,7 @@ public:
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
-  virtual void disconnect_pull_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_pull_consumer (void);
   // The skeleton methods.
 
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index dce9ffb7e2e..1fcfae99a24 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -47,7 +47,6 @@ CEC_Counting_Supplier::disconnect (void)
 
 void
 CEC_Counting_Supplier::push (const CORBA::Any&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -61,7 +60,6 @@ CEC_Counting_Supplier::push (const CORBA::Any&)
 
 void
 CEC_Counting_Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -180,10 +178,9 @@ CEC_Pull_Counting_Supplier::disconnect (void)
 
 CORBA::Any*
 CEC_Pull_Counting_Supplier::pull (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
-    ACE_THROW_RETURN (CosEventComm::Disconnected (), 0);
+    throw CosEventComm::Disconnected ();
 
   if (this->event_count % 2)
     {
@@ -200,10 +197,9 @@ CEC_Pull_Counting_Supplier::pull (void)
 
 CORBA::Any*
 CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
-    ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
-    ACE_THROW_RETURN (CosEventComm::Disconnected (), 0);
+    throw CosEventComm::Disconnected ();
 
   if (this->event_count % 2)
     {
@@ -225,7 +221,6 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
 
 void
 CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index b8505bdb9c8..2ff59be1e18 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -45,12 +45,10 @@ public:
   void disconnect (void);
   // Simple connect/disconnect methods..
 
-  void push (const CORBA::Any& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const CORBA::Any& events);
   // Push an event.
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
   CORBA::ULong event_count;
@@ -118,12 +116,9 @@ public:
   // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
-  CORBA::Any* pull (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  CORBA::Any* try_pull (CORBA::Boolean_out has_event)
-    ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Any* pull (void);
+  CORBA::Any* try_pull (CORBA::Boolean_out has_event);
+  virtual void disconnect_pull_supplier (void);
 
   CORBA::ULong event_count;
   // Count the number of events sent
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 93e22a5ab75..13b532c93bd 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -49,7 +49,7 @@ Driver::run (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -402,7 +402,6 @@ Test_Consumer::disconnect (void)
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->driver_->push_consumer (this->cookie_, arrival, events);
@@ -410,7 +409,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Test_Consumer::disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 3aea5b9c7d3..c354a41c798 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -41,10 +41,8 @@ public:
   void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 24b73a7dca1..936fdd5195c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -37,7 +37,7 @@ ECMS_Driver::run (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -206,7 +206,7 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
       // The typecode name standard, the encode method is not (in
       // general the CDR interface is not specified).
       if (!(cdr << info))
-        ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+        throw CORBA::MARSHAL ();
 
       // Here we marshall a non-IDL type.
       cdr << other;
@@ -474,7 +474,6 @@ Test_Supplier::svc ()
 
 void
 Test_Supplier::disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index eff3dc62727..718846597cb 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -45,8 +45,7 @@ public:
   void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index a7f4dc64cef..dbaff8c8d25 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -15,7 +15,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
                       RtecUDPAdmin::UDP_Addr_out addr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
 }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 7fcc819f905..0f7a7931366 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -27,8 +27,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
 private:
   RtecUDPAdmin::UDP_Addr addr_;
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 40df46d3aec..2d48ae0266f 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -68,7 +68,6 @@ Consumer::disconnect (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -88,7 +87,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index b09bde069d3..00001f37d6c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -32,10 +32,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 306419936da..c4cb41d0a6a 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -76,7 +76,7 @@ main (int argc, char* argv[])
       // **************** HERE IS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
-      orb = CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index c07e5d2a770..ff590115fb7 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -77,7 +77,6 @@ Supplier::perform_push (void)
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 432359e4202..dca5f9b3d8b 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -36,8 +36,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 94604b1bb1f..e89ab07ba61 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -43,7 +43,7 @@ ECM_Driver::run (int argc, char* argv[])
   try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
@@ -129,8 +129,13 @@ ECM_Driver::run (int argc, char* argv[])
       TAO_EC_Event_Channel ec_impl (attr);
 
       // Register Event_Service with the Naming Service.
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&ec_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this ();
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       CORBA::String_var str =
         this->orb_->object_to_string (ec.in ());
@@ -704,7 +709,6 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events)
 
 void
 ECM_Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // this->supplier_proxy_->disconnect_push_supplier ();
 }
@@ -811,7 +815,6 @@ ECM_Consumer::close (void)
 
 void
 ECM_Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->federation_->consumer_push (arrival, events);
@@ -819,7 +822,6 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 ECM_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 05c79b18523..96f43929d34 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -186,8 +186,7 @@ public:
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 private:
   ECM_Local_Federation* federation_;
@@ -234,10 +233,8 @@ public:
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
 
 private:
   ECM_Local_Federation* federation_;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index cbc8de728be..3d90eadbbe0 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -130,7 +130,7 @@ Test_ECG::run (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -1386,7 +1386,6 @@ Test_Supplier::push (const RtecEventComm::EventSet& events)
 
 void
 Test_Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1469,7 +1468,6 @@ Test_Consumer::close (void)
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->test_->push_consumer (this->cookie_, arrival, events);
@@ -1477,7 +1475,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Test_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 5307080c435..7a1cce73f24 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -65,8 +65,7 @@ public:
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
@@ -123,10 +122,8 @@ public:
   void close (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 8ce4695e239..29385f74690 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -12,6 +12,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (EC_Throughput,
            ECT_Consumer,
@@ -19,12 +20,14 @@ ACE_RCSID (EC_Throughput,
 
 Test_Consumer::Test_Consumer (ECT_Driver *driver,
                               void *cookie,
-                              int n_suppliers)
+                              int n_suppliers,
+                              int stall_length)
   : driver_ (driver),
     cookie_ (cookie),
     n_suppliers_ (n_suppliers),
     recv_count_ (0),
-    shutdown_count_ (0)
+    shutdown_count_ (0),
+    stall_length_(stall_length)
 {
 }
 
@@ -107,7 +110,6 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -120,7 +122,14 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 
   // We start the timer as soon as we receive the first event...
   if (this->recv_count_ == 0)
-    this->first_event_ = ACE_OS::gethrtime ();
+    {
+      this->first_event_ = ACE_OS::gethrtime ();
+      ACE_DEBUG ((LM_DEBUG,
+                "ECT_Consumer (%P|%t) stalling for %d seconds\n", this->stall_length_));
+      ACE_OS::sleep(this->stall_length_);
+      ACE_DEBUG ((LM_DEBUG, "ECT_Consumer (%P|%t) finished stalling\n"));
+    }
+
 
   this->recv_count_ += events.length ();
 
@@ -163,6 +172,5 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Test_Consumer::disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 5621cc3d99a..5bf5d68d28a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -39,7 +39,8 @@ class Test_Consumer : public POA_RtecEventComm::PushConsumer
 public:
   Test_Consumer (ECT_Driver* driver,
                  void* cookie,
-                 int n_suppliers);
+                 int n_suppliers,
+                 int stall_length = 0);
 
   void connect (RtecScheduler::Scheduler_ptr scheduler,
                 const char* name,
@@ -58,10 +59,8 @@ public:
   void accumulate (ACE_Throughput_Stats& stats) const;
   // Add our throughput and latency statistics to <stats>
 
-  virtual void push (const RtecEventComm::EventSet& events)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
 private:
@@ -89,6 +88,10 @@ private:
 
   int shutdown_count_;
   // How many shutdown events we have received.
+
+  int stall_length_;
+  // How long (in seconds) we wait to continue processing
+  // after receiving the first push.
 };
 
 #endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 5ca4305b28f..f4c813592dc 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -34,6 +34,7 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void)
     n_suppliers_ (1),
     type_start_ (ACE_ES_EVENT_UNDEFINED),
     type_count_ (1),
+    stall_length_(0),
     shutdown_event_channel_ (1),
     pid_file_name_ (0),
     active_count_ (0)
@@ -50,7 +51,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
   try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
@@ -227,7 +228,8 @@ ECT_Consumer_Driver::connect_consumers
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this,
                               this->consumers_ + i,
-                              this->n_suppliers_));
+                              this->n_suppliers_,
+                              this->stall_length_));
 
       this->consumers_[i]->connect (scheduler,
                                     buf,
@@ -269,7 +271,7 @@ ECT_Consumer_Driver::disconnect_consumers (void)
 int
 ECT_Consumer_Driver::parse_args (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:");
+  ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:o:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -303,6 +305,10 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
           this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
+        case 'o':
+          this->stall_length_ = ACE_OS::atoi (get_opt.opt_arg ());
+          break;
+
         case '?':
         default:
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 198c4160cc5..5075bf4d3d4 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -78,6 +78,9 @@ private:
   // We receive the events whose type is in the range
   // [type_start,type_start+type_count)
 
+  int stall_length_;
+  // How long (in seconds) the consumer will wait after receiving the first event.
+
   int shutdown_event_channel_;
   // If not zero it will shutdown the event channel upon exit.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 8a052c303a1..c566141b74c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -56,7 +56,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 490fe9dd72f..55d0377c39e 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -70,7 +70,7 @@ ECT_Throughput::run (int argc, char* argv[])
       ACE_High_Res_Timer::calibrate ();
 
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf
new file mode 100644
index 00000000000..d507abaeb6f
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf
@@ -0,0 +1,8 @@
+#
+# $Id$
+#
+
+static EC_QueueFullSimpleActions "discard"
+static EC_Factory "-ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"
+static Client_Strategy_Factory "-ORBConnectStrategy blocked -ORBClientConnectionHandler RW -ORBTransportMuxStrategy exclusive"
+
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml
new file mode 100644
index 00000000000..c41467e01df
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!-- Converted from ec_mt_overflow.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  $Id$ -->
+ <static id="EC_QueueFullSimpleActions" params="discard"/>
+ <static id="EC_Factory" params="-ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/>
+  <static id="Client_Strategy_Factory" params="-ORBConnectStrategy blocked -ORBClientConnectionHandler RW -ORBTransportMuxStrategy exclusive" />
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
new file mode 100755
index 00000000000..762a25ba8b2
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
@@ -0,0 +1,93 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+$status = 0;
+
+$ec_mt_conf = PerlACE::LocalFile ("ec_mt_overflow$PerlACE::svcconf_ext");
+
+
+print STDERR "================ Overflow test\n";
+
+$ns_ior = PerlACE::LocalFile ("NameService.ior");
+
+unlink $ns_ior;
+
+$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service",
+                           "-o $ns_ior");
+
+$ES = new PerlACE::Process ("../../Event_Service/Event_Service",
+                            "-ORBInitRef NameService=file://$ns_ior "
+                            . " -ORBSvcConf $ec_mt_conf "
+                            . " -s local");
+
+$C = new PerlACE::Process ("ECT_Consumer",
+                           "-ORBInitRef NameService=file://$ns_ior "
+                           . " -x -c 1 -s 3 -o 30");
+
+$S = new PerlACE::Process ("ECT_Supplier",
+                           "-ORBInitRef NameService=file://$ns_ior "
+                           . " -s 3 -u 10000 -n 1 -t 0 -b 8");
+$S2 = new PerlACE::Process ("ECT_Supplier",
+                           "-ORBInitRef NameService=file://$ns_ior "
+                           . " -s 1 -u 10 -n 1 -t 0");
+
+$NS->Spawn ();
+
+if (PerlACE::waitforfile_timed ($ns_ior, 10) == -1) {
+    print STDERR "ERROR: cannot find file <$ns_ior>\n";
+    $NS->Kill ();
+    exit 1;
+}
+
+
+$ES->Spawn ();
+
+sleep 10;
+
+$C->Spawn ();
+$S->Spawn ();
+
+$supplier = $S->WaitKill (300);
+
+if ($supplier != 0) {
+    print STDERR "ERROR: supplier returned $supplier\n";
+    $status = 1;
+}
+
+$consumer = $C->WaitKill (300);
+
+# The consumer will probably fail to get all the messages due to the
+#  EC dropping them.  We dont care if the Consumer fails.
+
+$supplier2 = $S2->SpawnWaitKill (60);
+
+if ($supplier2 != 0) {
+    print STDERR "ERROR: second supplier returned $supplier2\n";
+    $status = 1;
+}
+
+
+$eserver = $ES->TerminateWaitKill (10);
+
+if ($eserver != 0) {
+    print STDERR "ERROR: event server returned $eserver\n";
+    $status = 1;
+}
+
+$nserver = $NS->TerminateWaitKill (5);
+
+if ($nserver != 0) {
+    print STDERR "ERROR: name server returned $nserver\n";
+    $status = 1;
+}
+
+unlink $ns_ior;
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 85e43d7675f..f5b5e192edb 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -26,7 +26,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
@@ -259,7 +259,6 @@ Consumer::dump_results (int base_count,
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 15356ef9f95..3fb3f235148 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
 
   /// Number of events of type <event_base_type_> received.
   CORBA::ULong event_base_count;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 59c00b65055..345bcd20d64 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -146,7 +146,6 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
                                  RtecUDPAdmin::UDP_Addr& address)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 99048d0c9ab..de5000e101e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -73,8 +73,7 @@ public:
   Simple_Address_Server (const ACE_INET_Addr& address);
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr& address);
 
 private:
   /// The UDP addres...
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index c95577609b9..e974116ed6a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -21,7 +21,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 52950b5c3aa..817ccb741a0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -20,7 +20,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 04ba3be9f2d..d6af8fe7a5e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -26,7 +26,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
@@ -159,7 +159,6 @@ Consumer::Consumer (const char* name,
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index dbf5944fcab..11e82c8fd7e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -34,8 +34,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
 
 private:
   /// After this number of events the consumer disconnects from the
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 389845e2d77..bfb0f352c59 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -24,7 +24,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index ffe5ab0ee09..78388681d77 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -21,7 +21,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index de9e8f53bab..cd169f3f22d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -25,7 +25,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 5e2a7583dd0..c9ece50b101 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -21,7 +21,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 42e6d25d91c..ddbc80dab05 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -152,7 +152,7 @@ void
 EC_Master::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 67056cae531..cd8641c38f6 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -52,7 +52,7 @@ RND_Driver::run (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // ****************************************************************
 
@@ -358,7 +358,6 @@ RND_Driver::event (const RtecEventComm::Event &e)
 
 void
 RND_Timer::push (const RtecEventComm::EventSet &event)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -406,14 +405,12 @@ RND_Consumer::disconnect (void)
 
 void
 RND_Consumer::push (const RtecEventComm::EventSet &event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->event (event[0]);
 }
 
 void
 RND_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -483,7 +480,6 @@ RND_Supplier::push (RtecEventComm::EventSet &event)
 
 void
 RND_Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index b18d4a3e44d..5ef4c3b5652 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -35,10 +35,8 @@ public:
   /// Constructor
   RND_Consumer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet &event);
+  void disconnect_push_consumer (void);
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
@@ -68,8 +66,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet &event);
 };
 
 inline
@@ -101,8 +98,7 @@ public:
   void push_new_event (void);
   void push (RtecEventComm::EventSet &event);
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
   /// Active method
   virtual int svc (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 267c97c53e2..6333d68d629 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -23,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 8025a446b2b..7304f459304 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -20,7 +20,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index ef5097c6c7a..ce760d23290 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -74,27 +74,24 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 EC_Wrapper::for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_consumers ();
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::ConsumerAdmin::_nil());
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 EC_Wrapper::for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_suppliers ();
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::SupplierAdmin::_nil());
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 void
 EC_Wrapper::destroy_ec (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   auto_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_);
   this->ec_impl_ = 0;
@@ -107,7 +104,6 @@ EC_Wrapper::destroy_ec (void)
 
 void
 EC_Wrapper::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister from POA.
   this->deactivator_.deactivate ();
@@ -127,23 +123,15 @@ EC_Wrapper::destroy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   if (this->ec_impl_)
     return this->ec_impl_->append_observer (observer);
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
 
 void
 EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   if (this->ec_impl_)
     this->ec_impl_->remove_observer (handle);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index adc71f8e9b5..83874c32241 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -44,28 +44,17 @@ public:
   /// RtecEventChannelAdmin::Event_Channel methods.
   //@{
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (void);
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (void);
 
   /// Destroy the Event Channel, deactivate from POA, and shut down
   /// the ORB.
-  virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer);
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
   //@}
 
 protected:
@@ -78,8 +67,7 @@ private:
 
   /// Helper - destroys Event Channel and deactivate from POA, if
   /// necessary.
-  void destroy_ec (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy_ec (void);
 
   /// Event Channel implementation.
   /*
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 23c8c23cbff..4cbc551f59b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -88,7 +88,7 @@ Gateway_EC::run (int argc, char ** argv)
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
       orb_destroyer.init (orb);
 
       if (parse_args (argc, argv) == -1)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 365939b8c4d..b2d3faef8f6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -19,19 +19,16 @@ public:
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events
   /// of each type.
-  virtual void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet &events);
 
   /// No-op.
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
 
 private:
 
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void disconnect (void);
 
   /// Number of events of different types pushed to us by EC.
   //@{
@@ -57,7 +54,6 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 
 void
 EC_Consumer::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
@@ -91,13 +87,11 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 
 void
 EC_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 EC_Consumer::disconnect (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->a_events_ == 100
       && this->b_events_ == 100
@@ -140,7 +134,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index 2945e468ffc..2407f91d5f9 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 473802c28d6..42f4cff3add 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -18,11 +18,9 @@ public:
   /// PushConsumer methods.
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events.
-  virtual void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet &events);
   /// No-op.
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   //@}
 
 private:
@@ -49,7 +47,6 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 
 void
 EC_Consumer::push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
@@ -63,7 +60,6 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 
 void
 EC_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -107,7 +103,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index dddfe6c6d60..fa7076fc438 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index d93f5402332..42b615358aa 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -71,12 +71,10 @@ public:
   /// PushConsumer methods.
   //@{
   /// Update our <heartbeats_> database to reflect newly received heartbeats.
-  virtual void push (const RtecEventComm::EventSet &events)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet &events);
 
   /// Initiate shutdown().
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void disconnect_push_consumer (void);
   //@}
 
 private:
@@ -401,7 +399,6 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
 
 void
 Heartbeat_Application::push (const RtecEventComm::EventSet &events)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
@@ -447,7 +444,6 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events)
 
 void
 Heartbeat_Application::disconnect_push_consumer (void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->shutdown ();
 }
@@ -579,7 +575,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 39d220bae76..104af8dffe2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -50,7 +50,7 @@ main (int argc, char *argv [])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
@@ -290,7 +290,6 @@ EC_Latency_Consumer::done (void)
 
 void
 EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
   ORBSVCS_Time::TimeT_to_hrtime (creation,
@@ -310,7 +309,6 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 EC_Latency_Consumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -322,7 +320,6 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
 
 void
 EC_Latency_Supplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index b88d5855ba1..f09e9ad531e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -41,10 +41,8 @@ public:
   /// Return 1 when all the messages have been received
   int done (void);
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
 
 private:
   /// Roundtrip delays are recorded here
@@ -65,8 +63,7 @@ public:
   /// Constructor
   EC_Latency_Supplier (void);
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 668480f86b2..d1904cb385c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -49,7 +49,7 @@ main (int argc, char *argv [])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index c7ba18ae47b..79c0d07e1bf 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -12,7 +12,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
                       RtecUDPAdmin::UDP_Addr_out addr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
 }
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
index deeced433db..de7aeb6d590 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr_out addr);
 
 private:
   RtecUDPAdmin::UDP_Addr addr_;
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 05968cd88b8..7335f2aa543 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -76,7 +76,6 @@ Consumer::disconnect (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -132,7 +131,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index 0442a5ff6e2..e805bbb8236 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -45,10 +45,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
   // The skeleton methods.
 
   CORBA::ULong event_count (void) const;
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index b06c957738f..72c83e70cdc 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -96,7 +96,6 @@ Supplier::perform_push (void)
 
 void
 Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index f8de21817f6..52c17eb22f9 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -50,8 +50,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index b00d2680fce..ebf2a1e055a 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -48,7 +48,7 @@ main (int argc, char* argv[])
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index d8b7ee230a2..6c710e7fc21 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -47,7 +47,7 @@ main (int argc, char* argv[])
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index f94031f8750..b4c324ca6e0 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -101,7 +101,6 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
 
 void
 EC_Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_push (this->cookie_, events);
 
@@ -145,7 +144,6 @@ EC_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 EC_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_disconnect (this->cookie_);
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index e7e0eb758de..a4fbff85dea 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -77,10 +77,8 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
 
 private:
   /// The main driver for the test.
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index e3fa9afacbb..ad1d409fb6b 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -75,7 +75,6 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 
 void
 EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -98,7 +97,6 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
 
 void
 EC_Counting_Consumer::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 5c63615d8f5..5627999653d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -48,10 +48,8 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void push (const RtecEventComm::EventSet& events);
+  virtual void disconnect_push_consumer (void);
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index da31b33f29d..0ce3c6e4be9 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -112,7 +112,6 @@ EC_Counting_Supplier::disconnect (void)
 
 void
 EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -129,13 +128,11 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
 
 void
 EC_Counting_Supplier::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 EC_Counting_Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 54702a32de9..702df0b6743 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -59,14 +59,11 @@ public:
   void disconnect (void);
 
   /// The Consumer side methods.
-  void push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push (const RtecEventComm::EventSet& events);
+  void disconnect_push_consumer (void);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
   /// Count the number of events sent
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 624e05b0c3a..a61718061bf 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -155,7 +155,7 @@ void
 EC_Driver::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index e1c135d0398..95613a79b39 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -164,7 +164,6 @@ EC_Supplier::shutdown (void)
 
 void
 EC_Supplier::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->supplier_disconnect (this->cookie_);
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index a5bd9d2fb1e..4db8b23cdf5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -94,8 +94,7 @@ public:
                    RtecEventComm::Event& event);
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (void);
 
 private:
   /// Class we forward to.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index e2bd22e9d1c..e46dd521bb3 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -191,7 +191,7 @@ int FTAPP::FT_Creator::run (void)
       CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
-      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename)-1, "%s%s_%d.iogr",
+      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename), "%s%s_%d.iogr",
         this->prefix_,
         role,
         this->iogr_seq_);
@@ -212,7 +212,7 @@ int FTAPP::FT_Creator::run (void)
     if(this->ns_register_)
     {
       char iogr_name[1000];
-      ACE_OS::snprintf (iogr_name, sizeof(iogr_name)-1, "%s_%s_%d",
+      ACE_OS::snprintf (iogr_name, sizeof(iogr_name), "%s_%s_%d",
         this->prefix_,
         role,
         this->iogr_seq_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index bdccea37752..66dcf920711 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -590,14 +590,6 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::NoFactory
-    , PortableGroup::ObjectNotCreated
-    , PortableGroup::InvalidCriteria
-    , PortableGroup::InvalidProperty
-    , PortableGroup::CannotMeetCriteria
-  ))
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::create_object);
   ACE_UNUSED_ARG (type_id);
@@ -634,7 +626,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
       "Throwing 'InvalidCriteria' due to missing %s\n",
       missingParameterName
       ));
-    ACE_THROW_RETURN ( PortableGroup::InvalidCriteria(), 0);
+    throw PortableGroup::InvalidCriteria();
   }
 
   FT_TestReplica_i * replica = create_replica(role);
@@ -643,7 +635,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     ACE_ERROR ((LM_ERROR,
       "New Replica_i returned NULL.  Throwing ObjectNotCreated.\n"
       ));
-    ACE_THROW_RETURN ( PortableGroup::ObjectNotCreated(), 0);
+    throw PortableGroup::ObjectNotCreated();
   }
 
   ACE_NEW_THROW_EX ( factory_creation_id,
@@ -685,10 +677,6 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 void FT_ReplicaFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::ObjectNotFound
-  ))
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::delete_object);
 
@@ -715,16 +703,12 @@ void FT_ReplicaFactory_i::delete_object (
 }
 
 CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
     1;
 }
 
 void FT_ReplicaFactory_i::shutdown (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown);
   InternalGuard guard (this->internals_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index ca8eec537e8..4d04baba07e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -105,10 +105,7 @@ public:
   // CORBA interface
   // See IDL for documentation
 
-  virtual void shutdown (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual void shutdown (void);
 
   /////////////////////////////////////////
   // CORBA interface GenericFactory methods
@@ -116,29 +113,16 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::NoFactory
-    , PortableGroup::ObjectNotCreated
-    , PortableGroup::InvalidCriteria
-    , PortableGroup::InvalidProperty
-    , PortableGroup::CannotMeetCriteria
-  ));
+  );
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::ObjectNotFound
-  ));
+  );
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
 
-  virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
   /////////////////////////
   // Implementation methods
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 153eefeb0c6..376831c7539 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -63,7 +63,7 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
   try
   {
     // Initialize the ORB.
-    this->orb_ = CORBA::ORB_init (argc, argv, "");
+    this->orb_ = CORBA::ORB_init (argc, argv);
 
     // Parse arguments.
     result = this->parse_args (argc, argv);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 6d6d18de21a..7fe89a379d5 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -95,23 +95,21 @@ namespace
 #define KEVORKIAN_RETURN(value, method, result)                    \
   if (this->death_pending_ == (FT_TEST::TestReplica::value)){      \
     suicide (#value " in method " #method);                        \
-    ACE_THROW_RETURN (FAULT_CODE (                                 \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                            \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO),                                  \
-      result);                                                     \
+    throw FAULT_CODE (                                             \
+        CORBA::SystemException::_tao_minor_code (                  \
+              TAO::VMCID,                                          \
+              EFAULT),                                             \
+              CORBA::COMPLETED_NO);                                \
     } else ;
 
 #define KEVORKIAN_DURING_RETURN(method, result)                    \
   if (this->death_pending_ == FT_TEST::TestReplica::BEFORE_REPLY ){\
     suicide ("read-only method " #method);                         \
-    ACE_THROW_RETURN (FAULT_CODE (                                 \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                            \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO),                                  \
-            result);                                               \
+    throw FAULT_CODE (                                             \
+        CORBA::SystemException::_tao_minor_code (                  \
+             TAO::VMCID,                                           \
+             EFAULT),                                              \
+     CORBA::COMPLETED_NO);                                         \
     } else ;
 
 
@@ -252,7 +250,6 @@ int FT_TestReplica_i::fini (void)
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  PullMonitorable interface
 CORBA::Boolean FT_TestReplica_i::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0)
   ACE_ERROR ((LM_ERROR,
@@ -269,7 +266,6 @@ CORBA::Boolean FT_TestReplica_i::is_alive (void)
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Updateable interface
 FT::State * FT_TestReplica_i::get_update (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable))
 {
   KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0)
   long counter = load();
@@ -280,7 +276,6 @@ FT::State * FT_TestReplica_i::get_update (void)
 }
 
 void FT_TestReplica_i::set_update (const FT::State & s)
-  ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate))
 {
 #if defined(FT_TEST_LACKS_UPDATE)
   throw FT::InvalidUpdate ();
@@ -295,7 +290,6 @@ void FT_TestReplica_i::set_update (const FT::State & s)
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Checkpointable interface
 ::FT::State * FT_TestReplica_i::get_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable))
 {
 #if defined(FT_TEST_LACKS_STATE)
   throw FT::NoStateAvailable ();
@@ -310,7 +304,6 @@ void FT_TestReplica_i::set_update (const FT::State & s)
 }
 
 void FT_TestReplica_i::set_state (const FT::State & s)
-  ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState))
 {
 #if defined(FT_TEST_LACKS_STATE)
   throw FT::InvalidState ();
@@ -327,7 +320,6 @@ void FT_TestReplica_i::tao_update_object_group (
     PortableGroup::ObjectGroupRefVersion version,
     CORBA::Boolean is_primary
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (iogr);
   ACE_UNUSED_ARG (version);
@@ -340,7 +332,6 @@ void FT_TestReplica_i::tao_update_object_group (
 // implement FT_TEST::Replica
 
 void FT_TestReplica_i::set (CORBA::Long value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, set)
   long counter = value;
@@ -349,7 +340,6 @@ void FT_TestReplica_i::set (CORBA::Long value)
 }
 
 CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_RETURN(BEFORE_STATE_CHANGE, increment, 0)
   long counter = load ();
@@ -360,7 +350,6 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
 }
 
 CORBA::Long FT_TestReplica_i::get (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_DURING_RETURN(get, 0)
   long counter = load ();
@@ -368,7 +357,6 @@ CORBA::Long FT_TestReplica_i::get (void)
 }
 
 CORBA::Long FT_TestReplica_i::counter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_DURING_RETURN([get]counter, 0)
   long counter = load ();
@@ -376,7 +364,6 @@ CORBA::Long FT_TestReplica_i::counter (void)
 }
 
 void FT_TestReplica_i::counter (CORBA::Long counter)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, [set]counter)
   store (counter);
@@ -384,7 +371,6 @@ void FT_TestReplica_i::counter (CORBA::Long counter)
 }
 
 void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n",
                    name_.c_str(), this->factory_->location(), this->factory_id_, when);
@@ -394,7 +380,6 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
 }
 
 void FT_TestReplica_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
                    name_.c_str(), this->factory_->location(), this->factory_id_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index b7b99dc33f0..7e3e5147af9 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -96,47 +96,35 @@ public:
 private:
   ///////////////////////////
   // override Replica methods
-  virtual void set (CORBA::Long value)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void set (CORBA::Long value);
 
-  virtual CORBA::Long increment (CORBA::Long delta)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long increment (CORBA::Long delta);
 
-  virtual CORBA::Long get (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get (void);
 
-  virtual CORBA::Long counter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long counter (void);
 
-  virtual void counter (CORBA::Long counter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void counter (CORBA::Long counter);
 
-  virtual void die (FT_TEST::TestReplica::Bane when)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void die (FT_TEST::TestReplica::Bane when);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   ///////////////////////////
   // override PullMonitorable
 
-  virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
   ///////////////////////////
   // override Updatable
 
-  virtual ::FT::State * get_update (void)
-    ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable));
+  virtual ::FT::State * get_update (void);
 
-  virtual void set_update (const FT::State & s)
-    ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate));
+  virtual void set_update (const FT::State & s);
 
-  virtual ::FT::State * get_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable));
+  virtual ::FT::State * get_state (void);
 
-  virtual void set_state (const FT::State & s)
-    ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState));
+  virtual void set_state (const FT::State & s);
 
   ////////////////
   // Implement TAO_UpdateObjectGroup
@@ -145,8 +133,7 @@ private:
       const char * iogr,
       PortableGroup::ObjectGroupRefVersion version,
       CORBA::Boolean is_primary
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   /////////////////
   // implementation
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index e57d6787089..34065840e40 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -123,10 +123,6 @@ int StubBatchConsumer::idle(int & result)
 void StubBatchConsumer::push_structured_events (
     const CosNotification::EventBatch & notifications
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosEventComm::Disconnected
-  ))
 {
   ACE_UNUSED_ARG (notifications);
   //@@ sequence of structured event handling not written yet
@@ -136,7 +132,6 @@ void StubBatchConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -149,9 +144,6 @@ void StubBatchConsumer::offer_change (
 //virtual
 void StubBatchConsumer::disconnect_sequence_push_consumer (
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ACE_ERROR ((LM_ERROR,
     "StubBatchConsumer:disconnect_sequence_push_consumer interpreted as quit request.\n"
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 24f067a4fd2..2712f5bbdf3 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -76,25 +76,15 @@ public:
 
     virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CosEventComm::Disconnected
-      ));
+      );
 
     virtual void disconnect_sequence_push_consumer (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException, CosNotifyComm::InvalidEventType
-     ));
+      );
 
   ////////////////////
   // Forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 3dfc0f4bdb5..b5f8aea762b 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -236,7 +236,6 @@ int StubFaultConsumer::idle(int & result)
 void StubFaultConsumer::push_structured_event(
   const CosNotification::StructuredEvent &notification
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
   ////////////////////////////////////////
   // keep track of how many we've received
@@ -280,7 +279,6 @@ void StubFaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -290,7 +288,6 @@ void StubFaultConsumer::offer_change (
 }
 
 void StubFaultConsumer::disconnect_structured_push_consumer(void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ERROR ((LM_ERROR,
     "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 111d44eac95..89a59f19b28 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -79,17 +79,14 @@ public:
     // CORBA methods
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
+      );
 
-   virtual void disconnect_structured_push_consumer(void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+   virtual void disconnect_structured_push_consumer(void);
 
   ////////////////////
   // Forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 49f629c8040..6ed5f3e9c0e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -334,7 +334,6 @@ void StubFaultNotifier::shutdown_i (void)
 void StubFaultNotifier::push_structured_fault (
     const CosNotification::StructuredEvent & event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ERROR ((LM_ERROR,
     "FaultNotifier: Received Fault notification:\n"
@@ -363,9 +362,6 @@ void StubFaultNotifier::push_structured_fault (
 void StubFaultNotifier::push_sequence_fault (
     const CosNotification::EventBatch & events
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ACE_UNUSED_ARG (events);
   throw CORBA::NO_IMPLEMENT();
@@ -374,13 +370,9 @@ void StubFaultNotifier::push_sequence_fault (
 ::CosNotifyFilter::Filter_ptr StubFaultNotifier::create_subscription_filter (
     const char * constraint_grammar
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyFilter::InvalidGrammar
-  ))
 {
   ACE_UNUSED_ARG (constraint_grammar);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), 0);
+  throw CORBA::NO_IMPLEMENT();
   return 0;
 }
 
@@ -389,14 +381,11 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consum
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ACE_UNUSED_ARG(push_consumer);
   ACE_UNUSED_ARG(filter);
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), 0);
+  throw CORBA::NO_IMPLEMENT();
   return 0;
 }
 
@@ -405,24 +394,17 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ACE_UNUSED_ARG(push_consumer);
   ACE_UNUSED_ARG(filter);
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), 0);
+  throw CORBA::NO_IMPLEMENT();
   return 0;
 }
 
 void StubFaultNotifier::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosEventComm::Disconnected
-  ))
 {
   ACE_UNUSED_ARG(connection);
 
@@ -430,7 +412,6 @@ void StubFaultNotifier::disconnect_consumer (
 }
 
 CORBA::Boolean StubFaultNotifier::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 7197c9a72fa..5b336720dd1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -84,40 +84,33 @@ public:
 
   virtual void push_structured_fault (
       const CosNotification::StructuredEvent & event
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void push_sequence_fault (
     const CosNotification::EventBatch & events
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
     const char * constraint_grammar
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
+  );
 
   virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   virtual void disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
+  );
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
-  virtual CORBA::Boolean is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
   /////////////////
   // Implementation
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 4f193a80688..97851500b22 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -191,7 +191,6 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
 
 CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group (
     const char * type_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
 
@@ -244,7 +243,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
 CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
     const char * role,
     int write_iors)
-  ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
 
@@ -366,11 +364,10 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
 
           char replica_ior_filename[200]; // "${role}_$ (location)_${factory_id}.ior"
 
-          ACE_OS::snprintf (replica_ior_filename, sizeof (replica_ior_filename)-1, "%s_%s_%lu.ior",
+          ACE_OS::snprintf (replica_ior_filename, sizeof (replica_ior_filename), "%s_%s_%lu.ior",
             role,
             loc_name,
             static_cast<unsigned long> (ulong_id));
-          replica_ior_filename[sizeof (replica_ior_filename)-1] = '\0';
 
           ACE_ERROR ( (LM_INFO,
             "%T %n (%P|%t) Object_Group_Creator: Writing ior for created object to %s\n",
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 7cbd507c530..87adda9aeaf 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -50,14 +50,12 @@ namespace TAO
     // functionality
     CORBA::Object_ptr create_group(
         const char * role,
-        int write_iors)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        int write_iors);
 
     /////////////////
     // functionality
     CORBA::Object_ptr create_infrastructure_managed_group(
-        const char * type_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const char * type_id);
 
     int unregister_role(const char * role);
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index e81d1e0ddfc..9dea6f91d01 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -19,14 +19,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   // Install the server request interceptor.
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index a4a8999d72a..fa650dc5676 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -48,11 +48,9 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index dc02d137738..dde606cbff8 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -25,7 +25,6 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 
 void
 Server_Request_Interceptor::reset ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_ = 0;
   this->forward_request_thrown_ = false;
@@ -35,7 +34,6 @@ void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
   CORBA::Object_ptr obj2)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
     throw CORBA::INV_OBJREF (
@@ -61,14 +59,12 @@ Server_Request_Interceptor::forward_references (
 
 char *
 Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
 Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
@@ -77,8 +73,6 @@ Server_Request_Interceptor::destroy (void)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   this->request_count_++;
 
@@ -124,8 +118,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (this->request_count_ == 8)
     {
@@ -180,22 +172,17 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index 0f1ea6e848d..5dc35aa4be1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -51,12 +51,10 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Object_ptr obj2);
 
   /// Reset to initial state, like counter etc, keeps the object-references
-  virtual void reset ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset ();
 
 
   /**
@@ -69,35 +67,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 82a81c531bb..91a2c2d10d4 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -2,6 +2,8 @@
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
 ACE_RCSID (Group_Ref_Manip,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index 283aae38b3c..b25a7d02ce9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -19,14 +19,12 @@ test_i::~test_i (void)
 
 CORBA::Short
 test_i::number (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
index d22fba97d4c..5b9bb5ed552 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
@@ -33,12 +33,10 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short number (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 29c2c8676ce..962f437bb9f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -6,6 +6,8 @@
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
+// Ensure that the PI library is linked in when building statically
+#include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 9dfac7c264f..9ee4a863c89 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index bbe23477614..8754b8bacb0 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -21,7 +21,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 void
 Simple_Server_i::remote_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Print out from process id (%P) hosting the servant \n")));
@@ -32,7 +31,6 @@ Simple_Server_i::remote_call (void)
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index d9cdfe56754..47adea6b740 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -34,11 +34,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void remote_call (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 32392aefe58..09440fb3def 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -18,9 +18,6 @@ PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 void
 PushConsumer_impl::push (const RtecEventComm::EventSet & event
              )
-             ACE_THROW_SPEC ((
-             CORBA::SystemException
-             ))
 {
   CORBA::ULong x;
   ACE_Time_Value time_val = ACE_OS::gettimeofday ();
@@ -36,9 +33,6 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event
 
 void
 PushConsumer_impl::disconnect_push_consumer (void)
-                       ACE_THROW_SPEC ((
-                       CORBA::SystemException
-                       ))
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 950766fe295..c1af32ca71f 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -22,16 +22,10 @@ public:
 
     virtual void push (
         const RtecEventComm::EventSet & data
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void disconnect_push_consumer (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 private:
   CORBA::ORB_var orb_;
   PushConsumer_impl(const PushConsumer_impl&);
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 28deb58d382..693fe30f472 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -89,9 +89,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
 
 void  PushSupplier_impl::disconnect_push_supplier (
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
 
   reactor_task_.reactor_->end_reactor_event_loop();
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index 28f36099c86..fbd6601a062 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -30,10 +30,7 @@ public:
   int init(RtecEventChannelAdmin::EventChannel_ptr);
 
     virtual void  disconnect_push_supplier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 private:
 
   class ReactorTask : public ACE_Task_Base
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
index 4dde0b749eb..4a50f2e1f38 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
@@ -13,10 +13,10 @@ project(*Server): messaging, taoexe, portableserver, ami {
   after += *idl
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
-    Test_Output.cpp
-    ami_test_i.cpp
     ami_testS.cpp
     ami_testC.cpp
+    Test_Output.cpp
+    ami_test_i.cpp
     server.cpp
   }
   IDL_Files {
@@ -27,10 +27,10 @@ project(*Client): messaging, taoexe, portableserver, ami {
   after += *idl
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
-    Test_Output.cpp
-    client.cpp
     ami_testS.cpp
     ami_testC.cpp
+    Test_Output.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -40,10 +40,10 @@ project(*Simple Client): messaging, taoexe, portableserver, ami {
   after += *idl
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
-    Test_Output.cpp
-    simple_client.cpp
     ami_testS.cpp
     ami_testC.cpp
+    Test_Output.cpp
+    simple_client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index 4732914e80b..83ca917173f 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -33,8 +33,6 @@ CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
                  const char* in_str)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   A::DidTheRightThing))
 {
   out_l = 931233;
 
@@ -48,7 +46,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Throwing Exception: A::DidTheRightThing\n"));
-      ACE_THROW_RETURN (A::DidTheRightThing(), 0);
+      throw A::DidTheRightThing();
     }
 
   return 931234;
@@ -58,7 +56,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 void
 AMI_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -66,7 +63,6 @@ AMI_Test_i::shutdown (void)
 
 CORBA::Long
 AMI_Test_i::yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
@@ -76,7 +72,6 @@ AMI_Test_i::yadda (void)
 
 void
 AMI_Test_i::yadda (CORBA::Long yadda)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(set_)yadda\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 9788a022b3b..edc62b03212 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -33,18 +33,13 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     A::DidTheRightThing));
+                   const char* in_str);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
-  CORBA::Long yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long yadda (void);
 
-  void yadda (CORBA::Long yadda)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void yadda (CORBA::Long yadda);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 51a2e8454ca..2d50b5a9de6 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -102,7 +102,6 @@ public:
 
   void foo (CORBA::Long result,
             CORBA::Long out_l)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
         {
@@ -116,7 +115,6 @@ public:
     };
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
@@ -132,7 +130,6 @@ public:
     };
 
   void get_yadda (CORBA::Long result)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
@@ -140,21 +137,18 @@ public:
     };
 
   void get_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
   void set_yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
@@ -172,7 +166,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index 05bfe8816c1..4ecfd5bb289 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 7a5e182fbaa..89fa19c457a 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -80,7 +80,6 @@ public:
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
         {
@@ -92,7 +91,6 @@ public:
     };
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
@@ -116,7 +114,6 @@ public:
 
 
   void get_yadda (CORBA::Long result)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
@@ -124,21 +121,18 @@ public:
     };
 
   void get_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
   void set_yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
@@ -155,7 +149,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object_var =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 4b27b3a0722..eb8e375ed24 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
 
   try
     {
-      orb = CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index d0f7a2ef9ae..1abe27e0b83 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index dc7f9f97136..f8878cd9957 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
 Callback_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (0);
@@ -23,7 +22,6 @@ Callback_i::shutdown (void)
 
 void
 Callback_i::callback_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -35,7 +33,6 @@ Callback_i::callback_method (void)
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 void
 Simple_Server_i::callback_object (Callback_ptr callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
   this->callback_ = Callback::_duplicate (callback);
@@ -86,7 +82,6 @@ Simple_Server_i::call_client (void)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index 33333f74968..cc4725dc141 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -31,12 +31,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Safe way to shutdown
 
-  void callback_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_method (void);
   // The callback method
 
 private:
@@ -58,14 +56,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Boolean do_callback);
 
-  void callback_object (Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_object (Callback_ptr callback);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   int call_client (void);
 
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
index a6fec141c7e..b09077d66c7 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
@@ -16,9 +16,9 @@ project(*Server): taoserver, naming, iortable {
   after += *idl
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
-    Test_Output.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    Test_Output.cpp
     Hello.cpp
     server.cpp
   }
@@ -33,8 +33,8 @@ project(*Client): taoclient {
   after += *idl
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
-    Test_Output.cpp
     TestC.cpp
+    Test_Output.cpp
     client.cpp
   }
   Header_Files {
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index 2b00e7b4331..dd1638af6b2 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "in get_string\n"));
   return CORBA::string_dup ("Hello there!");
@@ -20,7 +19,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
   ACE_DEBUG ((LM_DEBUG,"in shutdown\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index ea78ac96072..0afa1750f24 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -22,11 +22,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index 3d935510fa1..91fd2361500 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
     {
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index ebdf3be3ad7..53379830481 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       //------ Get Root POA & POA Manager references
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index e178808d455..cc99975fe44 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -9,7 +9,6 @@ MCast_Server_i::MCast_Server_i (void)
 
 CORBA::Boolean
 MCast_Server_i::connect_server (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 693419395cb..f325761243f 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,8 +11,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean connect_server (void);
 };
 
 #endif /* MCAST_SERVER_I_H */
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..e660b75e889 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
@@ -15,10 +15,10 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
   after += *idl
   exename = MessengerServer
   Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
     Messenger_i.cpp
     MessengerServer.cpp
-    MessengerS.cpp
-    MessengerC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
index c54fdfffb31..769eadd5a2d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
@@ -4,7 +4,6 @@
 CORBA::Boolean
 Messenger_i::send_message (const char *user_name, const char *subject,
                            char *& message)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Message from: %s\nSubject: %s\nMessage: %s"
                                   "\n"), user_name, subject, message));
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
index 2c5a471b433..0fadc985960 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
@@ -14,8 +14,7 @@ public:
   {}
 
   virtual CORBA::Boolean
-  send_message (const char *user_name, const char *subject, char *&message)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  send_message (const char *user_name, const char *subject, char *&message);
 
 private:
   int count_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index 9fbfff745b2..1488168e854 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -10,7 +10,7 @@ int main (int argc, char *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var ns_obj =
         orb->resolve_initial_references ("NameService");
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 3276aac194c..725220e589e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -30,7 +30,6 @@ Airplane_i::~Airplane_i (void)
 
 char *
 Airplane_i::get_plane (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index da4beedac2f..2f2962f1d5a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -48,8 +48,7 @@ public:
   ~Airplane_i (void);
 
   /// Returns a random plane.
-  virtual char *get_plane (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *get_plane (void);
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index cad3a9ab157..ee335dfe6f2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -70,7 +70,7 @@ Airplane_Server_i::init (int argc, char** argv)
   try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 654899816c0..562e5da3485 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -35,7 +35,6 @@ Nestea_i::~Nestea_i (void)
 
 void
 Nestea_i::drink (CORBA::Long cans)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::drink %d cans\n", cans));
@@ -50,7 +49,6 @@ Nestea_i::drink (CORBA::Long cans)
 
 void
 Nestea_i::crush (CORBA::Long cans)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::crush %d cans\n", cans));
@@ -68,7 +66,6 @@ Nestea_i::crush (CORBA::Long cans)
 
 CORBA::Long
 Nestea_i::bookshelf_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
@@ -80,7 +77,6 @@ Nestea_i::bookshelf_size (void)
 
 char *
 Nestea_i::get_praise (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
@@ -99,7 +95,6 @@ Nestea_i::get_praise (void)
 
 void
 Nestea_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 5a7ea6eb25d..6d09301bc10 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -45,23 +45,18 @@ public:
   virtual ~Nestea_i (void);
 
   /// Add <cans> number of cans to the bookshelf.
-  virtual void drink (CORBA::Long cans)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void drink (CORBA::Long cans);
 
   /// Removes <cans> number of cans from the bookshelf.
-  virtual void crush (CORBA::Long cans)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void crush (CORBA::Long cans);
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long bookshelf_size (void);
 
   /// Returns comments about your collection.
-  virtual char *get_praise (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char *get_praise (void);
 
-  virtual void shutdown(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown(void);
 private:
   /// Saves bookshelf data to a file.
   int save_data (void);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 89a8efd1587..8f83c89e0c6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -96,7 +96,7 @@ Nestea_Server_i::init (int argc, char** argv)
   try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 8994cabe3ed..55c240db56a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -23,7 +23,8 @@ public:
   }
   virtual ~test_i () {
   }
-  virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
+  virtual CORBA::Long get (void)
+  {
     ++n_;
     CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
     PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in());
@@ -95,7 +96,7 @@ Server_i::init (int argc, char** argv)
 {
   try
   {
-    this->orb_ = CORBA::ORB_init (argc, argv, 0);
+    this->orb_ = CORBA::ORB_init (argc, argv);
 
     int retval = this->parse_args (argc, argv);
     if (retval != 0)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 86bd5e8b464..c1fdcb889ee 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -15,7 +15,6 @@ CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
                         CORBA::Float_out price)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean in_stock = 0;
   price = 0.0f;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 35a178c0d4b..1554203f924 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -12,7 +12,6 @@ class inventory_i : public POA_warehouse::inventory
 public:
   CORBA::Boolean getCDinfo (const char * artist,
                             char *& title,
-                            CORBA::Float_out price)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Float_out price);
 };
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 422a144f817..e37fe89b531 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -64,7 +64,7 @@ class NContextExt_Client_i
   char * get_name (void);
   // Generates a random name
 
-    int argc_;
+  int argc_;
   // # of arguments on the command line.
 
   char **argv_;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
index 91756218ae9..e9ee1a7648c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
   after += *idl
   Source_Files {
+	TestC.cpp
+	TestS.cpp
 	server.cpp
 	LB_server.cpp
 	Basic.cpp
-	TestS.cpp
-	TestC.cpp
   }
   IDL_Files {
   }
@@ -24,8 +24,8 @@ project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
 project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
   after += *idl
   Source_Files {
-	client.cpp
 	TestC.cpp
+	client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 47a13d574c1..13b86e01d0f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -20,14 +20,12 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 char *
 Basic::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
 Basic::remove_member (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -60,7 +58,6 @@ Basic::remove_member (void)
 
 void
 Basic::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 9cfeea8e6ca..fcc5ee719c0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -27,14 +27,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void remove_member (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void remove_member (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 212ed2b2c70..501cb30955c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 988512a3743..8b33a533185 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -17,12 +17,6 @@ Factory::create_object (
     const char * /*type_id*/,
     const PortableGroup::Criteria & /*the_criteria*/,
     PortableGroup::GenericFactory::FactoryCreationId_out fcid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
   Simple *servant;
 
@@ -40,8 +34,7 @@ Factory::create_object (
     {
       this->fcid_++;
       if (this->fcid_ == tmp_fcid)
-        ACE_THROW_RETURN (PortableGroup::ObjectNotCreated (),
-			  CORBA::Object::_nil ());
+        throw PortableGroup::ObjectNotCreated ();
     }
 
   tmp_fcid = this->fcid_;
@@ -69,8 +62,6 @@ void
 Factory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
       fcid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableGroup::ObjectNotFound))
 {
   CORBA::ULong my_fcid = 0;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 925b241a31e..7ad15cded9f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -31,13 +31,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::CannotMeetCriteria));
+        factory_creation_id);
 
   /// The LoadManager is passed the FactoryCreationId, it received
   /// from the create_object () call.
@@ -45,9 +39,7 @@ public:
 
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectNotFound));
+        factory_creation_id);
 private:
   /// The factory creation id.
   CORBA::ULong fcid_;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
index af901a174ec..91abb22789d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
@@ -9,14 +9,14 @@ project(*idl): taoidldefaults {
 project(*Server): loadbalancing {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     LB_server.cpp
     Simple.cpp
     Factory.cpp
     Factory_Map.cpp
     Factory_Struct.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index cd173291fe0..1b3a9a3a99a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -12,7 +12,6 @@ Simple::Simple (void)
 
 char *
 Simple::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO Load Balancing Works!");
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index d8767be2696..12eccd1512d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -20,8 +20,7 @@ public:
   Simple (void);
   /// Constructor
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 };
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 6d9c534531c..b3f48542c0d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index b776dcc513a..dee11993c13 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -22,21 +22,18 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 CORBA::Short
 Basic::number (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 char *
 Basic::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
 Basic::remove_member (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -69,7 +66,6 @@ Basic::remove_member (void)
 
 void
 Basic::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index 5f8a5eb3465..b53ae03f1a7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -26,17 +26,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void remove_member (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void remove_member (void);
 
-  virtual CORBA::Short number (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short number (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index ca076d4782c..323bbfa3662 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -22,21 +22,18 @@ Simple::Simple (CORBA::Object_ptr object_group,
 
 CORBA::Short
 Simple::number (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 char *
 Simple::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
 Simple::remove_member (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -69,7 +66,6 @@ Simple::remove_member (void)
 
 void
 Simple::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index 5a274f26153..c21ff402b60 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -28,17 +28,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void remove_member (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void remove_member (void);
 
-  virtual CORBA::Short number (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short number (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 1043b523d26..10dd672650c 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -16,7 +16,6 @@ McastHello::McastHello (CORBA::ORB_ptr orb,
 
 void
 McastHello::send_forty_two (CORBA::Long forty_two)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->small_request_status_ == 0 &&
       forty_two == 42)
@@ -29,7 +28,6 @@ McastHello::send_forty_two (CORBA::Long forty_two)
 
 void
 McastHello::send_large_octet_array (const Test::Octets &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_payload = 1;
   for (CORBA::ULong i = 0; i < payload.length (); ++i)
@@ -56,7 +54,6 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 
 void
 McastHello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index 09a94708ee8..c6a85237a95 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -18,18 +18,15 @@ public:
               int instance);
 
   // = The skeleton methods
-  virtual void send_forty_two (CORBA::Long forty_two)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
 
   // Silence the builds
-  void send_large_octet_array (const Test::Octets &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_large_octet_array (const Test::Octets &);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index e707d2165ad..aa9ca41f651 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -51,7 +51,6 @@ main (int argc, char *argv[])
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
 
-
       /* Do an unchecked narrow since there's no way to do an is_a on
        * a multicast reference (yet...).
        */
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index ab309c7fb80..e5a0086e3ca 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index d18ea21d273..13be4bf52ae 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -108,7 +108,6 @@ AdminProperties_StructuredPushConsumer::AdminProperties_StructuredPushConsumer (
 void
 AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
                                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   ++events_received_;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 91f171853f5..5ce59f56701 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -32,11 +32,7 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventComm::Disconnected
-                     ));
+                                      );
 
 protected:
   AdminProperties* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 788c8e2e44d..3980a578d17 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -18,8 +18,6 @@ void
 Event_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   int event_num;
   notification.filterable_data[0].value >>= event_num;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index f4e6c2b8217..fe3e038ba46 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -37,9 +37,7 @@ public:
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+    );
 
 protected:
   Events * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 3497a62013f..d5177fa07b7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -17,10 +17,6 @@ MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
 void
 MultiTypes_PushConsumer::push (const CORBA::Any & /*data*/
                                )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   client_->on_received_event (this);
 }
@@ -35,10 +31,6 @@ MultiTypes_StructuredPushConsumer::MultiTypes_StructuredPushConsumer (MultiTypes
 void
 MultiTypes_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
                                       )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventComm::Disconnected
-                     ))
 {
   client_->on_received_event (this);
 }
@@ -55,10 +47,6 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl
 void
 MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/
                                                          )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   client_->on_received_event (this);
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 4b8fa5ed939..1d8e3af7ddf 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -40,11 +40,7 @@ public:
 
   void push (
              const CORBA::Any & data
-             )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventComm::Disconnected
-                     ));
+             );
 
 protected:
   MultiTypes* client_;
@@ -59,11 +55,7 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosEventComm::Disconnected
-                     ));
+                                      );
 
 protected:
   MultiTypes* client_;
@@ -77,11 +69,7 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
 protected:
   MultiTypes* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 67ada03200b..a47a9314e37 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -19,8 +19,6 @@ void
 SequencePushConsumer::push_structured_events (
     const CosNotification::EventBatch &batch
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   this->test_client_->events_received_ += batch.length ();
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index f54484b6de3..08e499df957 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -36,11 +36,7 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
 protected:
   Sequence* test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index faa27ba5776..79690c36c2c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -16,8 +16,6 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
 
 void
 Event_AnyPushConsumer::push (const CORBA::Any & data)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   int event_num;
   data >>= event_num;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index ed80e117075..ef89670dfe7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -38,9 +38,7 @@ public:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & data
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+    );
 
 protected:
   Simple_Test * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 6725fe62063..293f27e2899 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -17,10 +17,6 @@ Updates_StructuredPushConsumer::offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
       )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer::offer_change invoked:\n"));
@@ -43,8 +39,6 @@ Updates_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "StructuredPushSupplier::subscription_change invoked:\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index e5a222c600a..91a2421db19 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -35,9 +35,7 @@ public:
   // Contructor.
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType));
+                             const CosNotification::EventTypeSeq & removed);
   // Offer change is conveyed here.
 
 protected:
@@ -58,9 +56,7 @@ public:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyComm::InvalidEventType));
+    );
   // Subscription change is conveyed here.
 
 protected:
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index da30915c6a8..9db620c8143 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -27,7 +27,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::_connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
@@ -76,7 +75,6 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
   ACE_UNUSED_ARG(event);
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 9b9e143af85..afc3eff9095 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -32,12 +32,10 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 
   ACE_CString name_;
   TimeBase::TimeT blocking_timeout_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 4a3896ba229..c70e0a4dd81 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -41,13 +41,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index f8e99b34ec2..ef176697b7e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Structured_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Structured_Supplier.cpp
   }
   IDL_Files {
   }
@@ -39,9 +39,9 @@ project(*Ntf Seq Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Sequence_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Sequence_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 67bfc2552e9..dd9c654fe21 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -42,7 +42,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::_connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var consumer =
     this->_this ();
@@ -81,7 +80,6 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
                           const CosNotification::EventBatch& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++count_;
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index 4c60891d68c..e19763cb7e5 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -30,12 +30,10 @@ public:
                                  Notify_Test_Client& client,
                                  int sent);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_events (const CosNotification::EventBatch&);
 
   ACE_CString name_;
   CORBA::Short discard_policy_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index 3cb7e10ff34..f079b0053e2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -26,7 +26,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
@@ -58,7 +57,6 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index 347d20ba278..bd58ab5e9f8 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,10 @@ public:
                         CORBA::Long max_events_per_consumer,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 
   ACE_CString name_;
   CORBA::Short discard_policy_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index af6a7107fc7..e26e788f839 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -54,13 +54,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 12a7edb0518..6ac0beea5c7 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -45,13 +45,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index d576fd2920e..a01418fc4e5 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -15,9 +15,9 @@ project(*Ntf Struct Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Structured_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Structured_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 856843f7660..8969889d264 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -19,7 +19,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& /*event*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
 
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index 99c00e0bb5c..0e5ff0b2fea 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -30,8 +30,7 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 
   ACE_CString name_;
   unsigned int expected_;
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index c70f1d160cf..d42e0c93188 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -42,13 +42,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index 5fb18be9cff..d07ecd3689c 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -30,7 +30,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
     this->_this ();
@@ -71,7 +70,6 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
   const CosNotification::EventBatch& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (count_ == 0)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index 5d22ffdc2a2..8468813f787 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -31,12 +31,10 @@ public:
                                  int expected_count,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_events (const CosNotification::EventBatch&);
 
   ACE_CString name_;
   CORBA::Short order_policy_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 4ed908f305e..60719e71117 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -31,7 +31,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::_connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
@@ -65,7 +64,6 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
   if (count_ == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index fb764f049cf..0d948b295a2 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -32,12 +32,10 @@ public:
                         int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 
   ACE_CString name_;
   CORBA::Short order_policy_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
index c57d14c1ddc..686a92add20 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Structured_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Structured_Supplier.cpp
   }
   IDL_Files {
   }
@@ -39,9 +39,9 @@ project(*Ntf Seq Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Sequence_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Sequence_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 5403daa0e41..9eaad1e7967 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -31,13 +31,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index ceafea4d1a5..da297e04130 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -30,13 +30,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 0212a144027..28e30ac982b 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -69,9 +69,6 @@ StructuredPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -135,8 +132,6 @@ StructuredPushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 StructuredPushConsumer_i::push_structured_event (
         const CosNotification::StructuredEvent & notification)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected))
 {
   this->received_ += 1;
   if (this->received_ == this->expect_ + 1)
@@ -227,7 +222,6 @@ StructuredPushConsumer_i::push_structured_event (
 void
 StructuredPushConsumer_i::disconnect_structured_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) StructuredPushConsumer received disconnect\n")
@@ -288,9 +282,6 @@ SequencePushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -354,8 +345,6 @@ void
 SequencePushConsumer_i::push_structured_events (
       const CosNotification::EventBatch & notifications
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-      CosEventComm::Disconnected))
 {
   size_t batch_size = notifications.length();
   if (this->verbose_)
@@ -446,7 +435,6 @@ SequencePushConsumer_i::push_structured_events (
 void
 SequencePushConsumer_i::disconnect_sequence_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) SequencePushConsumer received disconnect\n")
@@ -507,9 +495,6 @@ AnyPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -573,8 +558,6 @@ void
 AnyPushConsumer_i::push (
         const CORBA::Any & data
       )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected))
 {
   this->received_ += 1;
   if (this->received_ == this->expect_ + 1)
@@ -656,7 +639,6 @@ AnyPushConsumer_i::push (
 void
 AnyPushConsumer_i::disconnect_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) AnyPushConsumer received disconnect\n")
@@ -680,9 +662,7 @@ ReconnectionCallback_i::reconnect_count () const
 }
 
 void
-ReconnectionCallback_i::reconnect (
-    CORBA::Object_ptr reconnection
-  ) ACE_THROW_SPEC ((CORBA::SystemException))
+ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
@@ -703,9 +683,8 @@ ReconnectionCallback_i::reconnect (
 
 CORBA::Boolean
 ReconnectionCallback_i::is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return CORBA::Boolean (1);
+  return true;
 }
 
 
@@ -1087,7 +1066,6 @@ Consumer_Main::load_ids()
 void
 Consumer_Main::reconnect (
     CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->verbose_)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index c3bda2e0b63..68bb86c9588 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -30,20 +30,14 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
+    );
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected));
+      );
 
   virtual void disconnect_structured_push_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -73,20 +67,14 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
+    );
 
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected));
+      );
 
   virtual void disconnect_sequence_push_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -117,20 +105,14 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
+    );
 
   virtual void push (
         const CORBA::Any & data
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected));
+      );
 
   virtual void disconnect_push_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -168,12 +150,9 @@ public:
 
   size_t reconnect_count () const;
 
-  virtual void reconnect (
-      CORBA::Object_ptr reconnection
-    ) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
 private:
   Consumer_Main & consumer_main_;
@@ -198,8 +177,7 @@ class Consumer_Main
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
  private:
   /// Find naming service.
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index f2b91f8de26..094db654538 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -21,9 +21,6 @@ StructuredPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -36,7 +33,6 @@ StructuredPushSupplier_i::subscription_change (
 void
 StructuredPushSupplier_i::disconnect_structured_push_supplier (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Supplier StructuredPushSupplier received disconnect\n")
@@ -51,9 +47,6 @@ SequencePushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -66,7 +59,6 @@ SequencePushSupplier_i::subscription_change (
 void
 SequencePushSupplier_i::disconnect_sequence_push_supplier (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Supplier SequencePushSupplier received disconnect\n")
@@ -81,9 +73,6 @@ AnyPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -96,7 +85,6 @@ AnyPushSupplier_i::subscription_change (
 void
 AnyPushSupplier_i::disconnect_push_supplier (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Suppleir AnyPushSupplier received disconnect\n")
@@ -120,9 +108,7 @@ ReconnectionCallback_i::reconnect_count () const
 }
 
 void
-ReconnectionCallback_i::reconnect (
-    CORBA::Object_ptr reconnection
-  ) ACE_THROW_SPEC ((CORBA::SystemException))
+ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Supplier received reconnection request\n")
@@ -143,9 +129,8 @@ ReconnectionCallback_i::reconnect (
 
 CORBA::Boolean
 ReconnectionCallback_i::is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return CORBA::Boolean (1);
+  return true;
 }
 
 ReconnectionCallback_i::~ReconnectionCallback_i ()
@@ -497,7 +482,6 @@ Supplier_Main::load_ids()
 void
 Supplier_Main::reconnect (
     CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
   this->reconnecting_ = true;
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index a5abbd355d7..e1efe3c25a8 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -27,45 +27,27 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus
 {
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
-
-  virtual void disconnect_structured_push_supplier (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosNotification::EventTypeSeq & removed);
+
+  virtual void disconnect_structured_push_supplier (void);
 };
 
 class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSupplier
 {
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
-
-  virtual void disconnect_sequence_push_supplier (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosNotification::EventTypeSeq & removed);
+
+  virtual void disconnect_sequence_push_supplier (void);
 };
 
 class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
 {
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      CosNotifyComm::InvalidEventType));
-
-  virtual void disconnect_push_supplier (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosNotification::EventTypeSeq & removed);
+
+  virtual void disconnect_push_supplier (void);
 };
 
 class ReconnectionCallback_i : public virtual POA_NotifyExt::ReconnectionCallback
@@ -83,12 +65,9 @@ public:
 
   size_t reconnect_count () const;
 
-  virtual void reconnect (
-     CORBA::Object_ptr reconnection
-    ) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean is_alive (void);
 
 private:
   Supplier_Main & supplier_main_;
@@ -113,8 +92,7 @@ class Supplier_Main
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
  private:
   /// Find naming service.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 4d75d55a852..93c9ce3ed8c 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -25,7 +25,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
     this->_this ();
@@ -57,7 +56,6 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
   const CosNotification::EventBatch& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index b73f3c2a9e7..cdb1c927dc9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -30,12 +30,10 @@ public:
                                  unsigned int high,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_events (const CosNotification::EventBatch&);
 
   ACE_CString name_;
   unsigned int low_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index 5b4145b586f..5d5a9e17f90 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
@@ -15,9 +15,9 @@ project(*Ntf Seq Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Sequence_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Sequence_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index d752690b91a..99e64b8d641 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -41,13 +41,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index 7da1dca4809..19e325d9f7d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -30,7 +30,6 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 void
 Notify_Sequence_Push_Consumer::_connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
     this->_this ();
@@ -62,7 +61,6 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
                           const CosNotification::EventBatch& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index 66e93b2f84d..d6fc3520099 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -32,12 +32,10 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_events(const CosNotification::EventBatch&);
 
   ACE_CString name_;
   unsigned int low_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
index 47c8459df2a..3513a3251b9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
@@ -13,9 +13,9 @@ project(*Ntf Seq Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Sequence_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Sequence_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index aa75ef1b151..204c211622a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -43,13 +43,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index dba87df34f5..20cad2ec4ed 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -31,7 +31,6 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
-                                ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(notify_channel);
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -65,7 +64,6 @@ static void validate_expression(bool expr, const char* msg)
 void
 Notify_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
   received_++;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index d577b7f5002..3649d2d46a9 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -28,12 +28,10 @@ public:
   Notify_Push_Consumer (const char* name, int sent, bool useFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                CosNotifyChannelAdmin::EventChannel_ptr ec);
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 private:
   ACE_CString name_;
   CORBA::Long sent_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index 76ff20df96e..bee0bed91cb 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest {
 
   after += *idl
   Source_Files {
-    Structured_Supplier.cpp
-    goS.cpp
     goC.cpp
+    goS.cpp
+    Structured_Supplier.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 86542c868f2..a9ca558ee4a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -32,13 +32,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index 32aa61440c0..65dbd223d8a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -78,7 +78,6 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
-                                ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
@@ -133,7 +132,6 @@ static void validate_expression(bool expr, const char* msg)
 void
 Notify_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
   received_++;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 9113d215823..2d17ace210b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -31,12 +31,10 @@ public:
     NS_FilterType supplierFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                CosNotifyChannelAdmin::EventChannel_ptr ec);
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event (const CosNotification::StructuredEvent&);
 private:
   ACE_CString name_;
   CORBA::Long sent_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 963ddda3627..6a98b5c6eee 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -6,7 +6,6 @@ Notify_Push_Supplier::_connect (
                 CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
                 bool useFilter)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
     this->_this ();
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index 254ae0b88b4..da41e3a9064 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -10,8 +10,7 @@ class Notify_Push_Supplier: public TAO_Notify_Tests_StructuredPushSupplier
 public:
   void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                bool useFilter);
 };
 
 #endif /* NOTIFY_PUSH_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 1fa4997d470..1dd0218557e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -33,13 +33,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 640f8cfd8c6..6db332ceea9 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -22,9 +22,6 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
 
 char*
 TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   return CORBA::string_dup ("ETCL");
 }
@@ -33,10 +30,6 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
                                 )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidConstraint
-                   ))
 {
   const char* PoolId_prefix = "PoolId = ";
   size_t poolId_index = ACE_OS::strlen (PoolId_prefix);
@@ -86,11 +79,6 @@ void
 TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/,
                                    const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/
                                    )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidConstraint,
-                   CosNotifyFilter::ConstraintNotFound
-                   ))
 {
 
 }
@@ -98,29 +86,24 @@ TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::Cons
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::ConstraintNotFound))
 {
   return 0;
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
 TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
 
 void
 TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
 TAO_Notify_Tests_RT_Test_Filter::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -135,18 +118,13 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (void)
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
                            )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification
                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -242,37 +220,28 @@ CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
                             )
-  ACE_THROW_SPEC (( CORBA::SystemException,
-                    CosNotifyFilter::UnsupportedFilterableData))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackID
 TAO_Notify_Tests_RT_Test_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_Notify_Tests_RT_Test_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyFilter::CallbackNotFound))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
 TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
+  throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 70814b3c6f6..8745a307fa2 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -43,80 +43,33 @@ public:
   ~TAO_Notify_Tests_RT_Test_Filter ();
 
 protected:
-  virtual char * constraint_grammar (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual char * constraint_grammar (void);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::CallbackNotFound
-                     ));
-
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                   );
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+
+  virtual void remove_all_constraints (void);
+
+  virtual void destroy (void);
+
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
+
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data);
+
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data);
+
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback);
+
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback);
+
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index f3afd4cf533..0e492c999bb 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -28,10 +28,6 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_
 
 CosNotifyFilter::Filter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidGrammar
-                   ))
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "(%P, %t)In TAO_Notify_Tests_RT_Test_FilterFactory::create_filter\n"));
@@ -40,7 +36,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_gr
   if (ACE_OS::strcmp (constraint_grammar, "TCL") != 0 &&
       ACE_OS::strcmp (constraint_grammar, "ETCL") != 0 &&
       ACE_OS::strcmp (constraint_grammar, "EXTENDED_TCL") != 0)
-    ACE_THROW_RETURN (CosNotifyFilter::InvalidGrammar (), 0);
+    throw CosNotifyFilter::InvalidGrammar ();
 
 
   // Create the RefCounted servant.
@@ -65,12 +61,8 @@ CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
                                                   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::InvalidGrammar
-                   ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_FACTORY_DEFINE (TAO_RT_Test_Filter, TAO_Notify_Tests_RT_Test_FilterFactory)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index a660b54c952..bcb35f1f89c 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -51,19 +51,11 @@ public:
   ///= CosNotifyFilter::FilterFactory methods
 
   virtual CosNotifyFilter::Filter_ptr create_filter (const char * constraint_grammar
-                                                     )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidGrammar
-                     ));
+                                                     );
 
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (const char * constraint_grammar,
                                                                     const CORBA::Any & default_value
-                                                                    )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidGrammar
-                     ));
+                                                                    );
 
 protected:
   /// The POA in which to activate the Filters.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 3bc1ad86a3b..efabcadd2e4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -259,9 +259,6 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
 
 void
 TAO_Notify_Tests_Activation_Manager::start (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 3e50b89342a..2c38032e172 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -55,10 +55,7 @@ public:
   virtual ~TAO_Notify_Tests_Activation_Manager ();
 
   /// Interface impl.
-  virtual void start (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void start (void);
 
   /// Register Supplier
   void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 2f9f8fadb29..7647879b111 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -90,8 +90,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
     )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNotifyComm::InvalidEventType))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 5bb80446e24..3c81fa9772d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -77,11 +77,7 @@ protected:
   // = NotifyPublish method
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 77c60f9f1cf..a4cf175e466 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -171,10 +171,6 @@ TAO_Notify_Tests_Periodic_Consumer::check_priority (const CosNotification::Prope
 
 void
 TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index a3e84ea25fd..a722bacbc6b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -57,11 +57,7 @@ protected:
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   void handle_start_event (const CosNotification::PropertySeq& prop_seq);
   void check_priority (const CosNotification::PropertySeq& prop_seq);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index d7a94d18abe..27cb0748b62 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -38,7 +38,6 @@ TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
@@ -47,10 +46,6 @@ TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
 
 void
 TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosEventComm::Disconnected
-                   ))
 {
   // NOP
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index aab6ae3635b..6a880b72ba6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -80,19 +80,12 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = PushConsumer methods
-  virtual void disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_push_consumer (void);
 
  /// Default does nothing.
     void push (
         const CORBA::Any & data
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ));
+      );
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index 2125a574fbf..335efc1ec7e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -46,7 +46,6 @@ TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index 82a27d6dcb3..5301aa7c3a2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -83,10 +83,7 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = PushSupplier method
-  virtual void disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_push_supplier (void);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 0f8c26001f1..252d400bd7b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -26,8 +26,6 @@ TAO_Notify_Tests_Relay_Consumer::connect (void)
 
 void
 TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   // The Periodic Consumer will record the run statistics.
   //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 1dd0739b4e8..5fcbb013102 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -40,9 +40,7 @@ public:
   virtual void connect (void);
 
   void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
-                              )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+                              );
 
 protected:
   /// Destination object.
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 1cf382bd71c..169b179a4aa 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -38,7 +38,6 @@ TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
@@ -49,8 +48,6 @@ void
 TAO_Notify_Tests_SequencePushConsumer::push_structured_events
    (const CosNotification::EventBatch &/*notifications*/
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   // NOP
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index d17da42daa4..43e8becdda3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -80,19 +80,12 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = SequencePushConsumer methods
-  virtual void disconnect_sequence_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_sequence_push_consumer (void);
 
  /// Default does nothing.
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index dce9988b74a..36537a16048 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -47,7 +47,6 @@ TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index 35615eb5c1c..7794f59d00c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -83,10 +83,7 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = SequencePushSupplier method
-  virtual void disconnect_sequence_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_sequence_push_supplier (void);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index cc58c87c8ea..eb7973ba0e6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -38,7 +38,6 @@ TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
@@ -49,8 +48,6 @@ void
 TAO_Notify_Tests_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent &/*notification*/
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   // NOP
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 68d24401d7c..841785f955f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -80,19 +80,12 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = StructuredPushConsumer methods
-  virtual void disconnect_structured_push_consumer (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_structured_push_consumer (void);
 
  /// Default does nothing.
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index fb9e76fc469..d5cc66c07d0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -48,7 +48,6 @@ TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void)
 
 void
 TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 5a70d452e8e..3b9a9983aeb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -83,10 +83,7 @@ protected:
   virtual void disconnect_from_proxy (void);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void disconnect_structured_push_supplier (void);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 96aa030b188..30582741d3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -85,10 +85,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change (
                                                          const CosNotification::EventTypeSeq & /*added*/,
                                                          const CosNotification::EventTypeSeq & /*removed*/
         )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType
-                   ))
 {
   // No op.
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index a00a7f33fdc..7a3d12f7c78 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -78,11 +78,7 @@ protected:
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
+      );
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index cc6a64df10a..e1654e3fead 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -26,7 +26,6 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 void
 Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
     this->_this ();
@@ -56,7 +55,6 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
   const CosNotification::EventBatch& events)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
   {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index 89094dcf08a..ac3e9d44568 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -31,12 +31,10 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_events(const CosNotification::EventBatch&);
 
   ACE_CString name_;
   unsigned int expected_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 31b8c3b6e0a..a04c78eea3f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -27,7 +27,6 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer ()
 void
 Notify_Structured_Push_Consumer::_connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
@@ -50,7 +49,6 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event(
                           const CosNotification::StructuredEvent& /*event*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
   {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index a342bd45cb2..9d7d0cdd158 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,10 @@ public:
                         Notify_Test_Client& client);
   ~Notify_Structured_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
-  void push_structured_event(const CosNotification::StructuredEvent&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void push_structured_event(const CosNotification::StructuredEvent&);
 
   ACE_CString name_;
   unsigned int expected_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index a2c6cdd8b32..77219aa1a54 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -41,13 +41,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 9d7ec6fac29..85921ac91c4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -40,13 +40,11 @@ public:
   }
 
   void go (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
   void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 7a37115c4b3..44fe363c9af 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -455,8 +455,6 @@ RedGreen_Test_StructuredPushConsumer::offer_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType))
 {
   // No-Op.
 }
@@ -465,8 +463,6 @@ void
 RedGreen_Test_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              ace_mon,
@@ -511,7 +507,6 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (
 void
 RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-Op.
 }
@@ -533,8 +528,6 @@ void
 SlowConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   // Slow it down ...
   ACE_OS::sleep (1);
@@ -615,8 +608,6 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNotifyComm::InvalidEventType))
 {
   //No-Op.
 }
@@ -648,7 +639,6 @@ RedGreen_Test_StructuredPushSupplier::send_event (
 void
 RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 5cebcd037f7..b50fcfa64d0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -218,20 +218,15 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyComm::InvalidEventType));
+    );
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+    );
 
   virtual void disconnect_structured_push_consumer (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 /*****************************************************************/
@@ -243,9 +238,7 @@ public:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosEventComm::Disconnected));
+    );
 };
 
 
@@ -299,14 +292,11 @@ protected:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNotifyComm::InvalidEventType));
+    );
 
   // = StructuredPushSupplier method
   virtual void disconnect_structured_push_supplier (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 };
 
 /*****************************************************************/
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index b7002dd7bf2..f8c45095160 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -45,8 +45,6 @@ void
 Throughput_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosEventComm::Disconnected))
 {
   // Extract payload.
   const char* msg;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index a6e5fb04aec..2798f0d5cbe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -66,11 +66,7 @@ public:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
+      );
 
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
   // Accumulate the throughput statistics into <throughput>
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 5b261f0842d..de9850a6acd 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -664,8 +664,7 @@ main (int argc, char **argv)
     {
       Client client;
 
-      if (client.init (argc,
-                       argv) == -1)
+      if (client.init (argc, argv) == -1)
         return 1;
 
       //  client.run ();
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
index f226d42dba3..0f139779223 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
@@ -41,7 +41,6 @@ Object1_impl::~Object1_impl()
 void Object1_impl::method1(const char* activity,
     CORBA::Long seconds,
     char* &output)
-  ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException))
 {
   const int scale_factor = 2000;
   int work;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
index ef99d1209a8..80e16f06dbe 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
@@ -35,8 +35,7 @@ class Object1_impl : public POA_testSched::Object1
     virtual void method1(const char *activity,
                          CORBA::Long seconds,
                          char *&output
-                         )
-      ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException));
+                         );
 };
 
 #endif /* Object1_I_H  */
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 1e79d4e3d55..edaf7ed145d 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -271,7 +271,7 @@ int svc(void) {
                       "%s",
                       buf));
           ACE_OS::strcat(client_output_, buf);
-      serv_output_ = ACE_OS::strdup("");
+          serv_output_ = ACE_OS::strdup("");
           object1->method1 (activity_, remote_, serv_output_.inout());
 
           ACE_OS::strcat(client_output_, serv_output_.in());
@@ -370,17 +370,8 @@ ACE_TMAIN (int argc, char * argv[])
     // recommended by irfan@oomworks.com
     long flags = THR_NEW_LWP | THR_JOINABLE |
 
-#if  TAO_MAJOR_VERSION > 1 \
-|| (TAO_MAJOR_VERSION==1 && TAO_MINOR_VERSION > 3 ) \
-|| (TAO_MAJOR_VERSION==1 && TAO_MAJOR_VERSION==3 && TAO_MINOR_VERSION > 1)
-
     orb->orb_core ()->orb_params ()->thread_creation_flags ();
 
-#else /* TAO version is 1.3.1 or lower */
-    orb->orb_core ()->orb_params ()->scope_policy () |
-    orb->orb_core ()->orb_params ()->sched_policy ();
-#endif
-
     ot.activate(flags);
     return ot.wait();
     }
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index 236c0275b5e..f4b6a475d5e 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -120,21 +120,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
           return 1;
         }
 
-      CORBA::ORB_var orb=
-        CORBA::ORB_init (argc,
-                         argv,
-                         "testORB");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "testORB");
 
       /// get the root poa
-      CORBA::Object_var object=
-        orb->resolve_initial_references ("RootPOA");
+      CORBA::Object_var object= orb->resolve_initial_references ("RootPOA");
 
-      PortableServer::POA_var rootPOA=
+      PortableServer::POA_var rootPOA =
         PortableServer::POA::_narrow (object.in ());
 
       /// Create a manager for the POA
-      PortableServer::POAManager_var poa_manager =
-        rootPOA->the_POAManager ();
+      PortableServer::POAManager_var poa_manager = rootPOA->the_POAManager ();
 
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
@@ -171,11 +166,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       CORBA::Object_var testObject =
         RTPOA->id_to_reference(id.in());
 
-
       CORBA::String_var testObject_IORString =
         orb->object_to_string (testObject.in ());
 
-
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -209,25 +202,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       // recommended by irfan@oomworks.com
       long flags = THR_NEW_LWP | THR_JOINABLE |
 
-#if TAO_MAJOR_VERSION > 1 \
-  || (TAO_MAJOR_VERSION==1 && TAO_MINOR_VERSION > 3 ) \
-  || (TAO_MAJOR_VERSION==1 && TAO_MAJOR_VERSION==3 && TAO_MINOR_VERSION > 1)
-
       orb->orb_core ()->orb_params ()->thread_creation_flags ();
 
-#else /* TAO version is 1.3.1 or lower */
-      orb->orb_core ()->orb_params ()->scope_policy () |
-      orb->orb_core ()->orb_params ()->sched_policy ();
-#endif
       ORB_Thread ot(orb);
       ot.activate(flags);
       ot.wait();
 
-
       ACE_DEBUG((LM_DEBUG,
                  "Server is shutting down\n\n"));
 
-
       delete server_sched;
 
       /// clean up
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 84e37b0995a..142dc77809f 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -44,12 +44,10 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short id (void);
   // Gets id.
 
 private:
@@ -67,14 +65,12 @@ My_Test_Object::~My_Test_Object (void)
 
 CORBA::Short
 My_Test_Object::id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
 My_Test_Object::id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
 }
@@ -152,7 +148,7 @@ main (int argc, ACE_TCHAR **argv)
   try
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0);
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     // ior's are specified for the name servers through a commandline
     // option or a file.
@@ -169,7 +165,6 @@ main (int argc, ACE_TCHAR **argv)
                               -1);
     root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in ());
 
-
     // Resolve the second name server
 
     CORBA::Object_var ns2obj = orb->string_to_object (
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 41c5ec1bd6d..22fcb203cc9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 2014504133c..d3bc3dba7d2 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index cac6e66f604..02da1a0652c 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
 Callback_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (0);
@@ -23,7 +22,6 @@ Callback_i::shutdown (void)
 
 void
 Callback_i::callback_method ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -35,7 +33,6 @@ Callback_i::callback_method ()
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 void
 Simple_Server_i::callback_object (Callback_ptr callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
   this->callback_ = Callback::_duplicate (callback);
@@ -94,7 +90,6 @@ Simple_Server_i::call_client (void)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 33333f74968..cc4725dc141 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -31,12 +31,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Safe way to shutdown
 
-  void callback_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_method (void);
   // The callback method
 
 private:
@@ -58,14 +56,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Boolean do_callback);
 
-  void callback_object (Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_object (Callback_ptr callback);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   int call_client (void);
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 4e93ab3c7d3..d0500b4c774 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -20,7 +20,6 @@ TX_Object_i::~TX_Object_i (void)
 
 void
 TX_Object_i::send (const DataSeq & data)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->data_ = data;
 
@@ -31,7 +30,6 @@ TX_Object_i::send (const DataSeq & data)
 
 void
 TX_Object_i::recv (DataSeq_out data)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (data,
                     DataSeq,
@@ -46,7 +44,6 @@ TX_Object_i::recv (DataSeq_out data)
 
 void
 TX_Object_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index 0a5a0608374..9b4c59bde58 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -33,14 +33,11 @@ public:
   // Destructor
   virtual ~TX_Object_i (void);
 
-  virtual void send (const DataSeq & data)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send (const DataSeq & data);
 
-  virtual void recv (DataSeq_out data)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void recv (DataSeq_out data);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 5e3953c6868..461b5b0fed4 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -48,7 +48,7 @@ main (int argc, char * argv[])
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poaObj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 3e5862fe0ed..eb9df0f1516 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -22,7 +22,7 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       //
       // Get the Root POA.
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index 30af277ad32..e91058cf879 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -16,7 +16,6 @@ client_i::~client_i (void)
 
 void
 client_i::test_reply (const char *msg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_INFO,
              ACE_TEXT("(%N) message received was ")
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index 593fac1e9a2..ae1d1405e9b 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -30,8 +30,7 @@ public:
   client_i (server_ptr s);
   virtual ~client_i (void);
 
-  virtual void test_reply (const char *msg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_reply (const char *msg);
 
 private:
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index f3b2e230f87..ab355c2317f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -22,7 +22,7 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       //
       // Get the Root POA.
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index b16ab2f3f1f..873cf521f55 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -16,21 +16,18 @@ server_i::~server_i (void)
 
 void
 server_i::set_client (client_ptr c)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
 }
 
 void
 server_i::test_request (const char *msg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_->test_reply (msg);
 }
 
 void
 server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index fe6d4278022..ca6edbbada5 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -30,14 +30,11 @@ public:
   server_i (CORBA::ORB_ptr orb);
   virtual ~server_i (void);
 
-  virtual void set_client (client_ptr c)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_client (client_ptr c);
 
-  virtual void test_request (const char *msg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_request (const char *msg);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index 1a71e6962d8..5dbab44a707 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index dea2f849101..f30ec4062b9 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index f278cf08e3a..225c91d9abd 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -12,7 +12,6 @@ ACE_RCSID (Send_File,
 
 void
 Simple_Server_i::send_line (const char *)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   /*
@@ -33,7 +32,6 @@ Simple_Server_i::send_line (const char *)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index dce0675446b..729b1d933f8 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_line (const char *line);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 066154a3f59..97a07eb9c74 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -13,7 +13,7 @@ Server_Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 901cc538d48..f825883856c 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index 5614a78a8e7..7007f79e956 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index b688de2b03a..ba8e1b90c52 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -18,15 +18,12 @@ ACE_RCSID (MT_IIOP_SSL,
 
 void
 Simple_Server_i::ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
 Simple_Server_i::validate_protocol (void)
-  ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
-                   CORBA::SystemException))
 {
   if (this->validated_ == NOT_VALIDATED)
     {
@@ -74,7 +71,6 @@ Simple_Server_i::validate_protocol (void)
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Request in thread [%t]\n"));
@@ -85,7 +81,6 @@ Simple_Server_i::test_method (CORBA::Long x)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 0894e704594..61eb06ce0b5 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -31,18 +31,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void ping (void);
 
-  void validate_protocol (void)
-    ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
-                     CORBA::SystemException));
+  void validate_protocol (void);
 
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 95ff3134ba4..102792a0f94 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -29,7 +29,7 @@ Client_Worker::validate_connection (void)
             ACE_DEBUG (( LM_DEBUG,
                          "******** VALIDATED ******* \n"));
         }
-      catch (const CORBA::Exception& ex)
+      catch (const CORBA::Exception&)
         {
         }
    }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 066154a3f59..97a07eb9c74 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -13,7 +13,7 @@ Server_Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 0197fd6615e..c226ffb5fc6 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index f6b1490fcda..c9d5ca31f95 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index dbe79cedd55..634b0fd9e27 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -13,7 +13,6 @@ ACE_RCSID (MT_Server,
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Simple_Server: Request in thread %t\n"));
@@ -24,7 +23,6 @@ Simple_Server_i::test_method (CORBA::Long x)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -33,7 +31,6 @@ Simple_Server_i::shutdown (void)
 
 CORBA::Long
 Another_One_i::test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Another_One: Request in thread %t\n"));
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index b9277d89035..28dafc13474 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -56,8 +54,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 3c682f2d2df..e40e0f69e13 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -19,14 +19,11 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 
 void
 Foo_i::baz (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Foo::Bar::NoSecurityAttributes))
 {
   SecurityLevel3::ClientCredentials_var credentials =
     this->current_->client_credentials ();
 
-  CORBA::String_var id =
-    credentials->creds_id ();
+  CORBA::String_var id = credentials->creds_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
@@ -38,7 +35,6 @@ Foo_i::baz (void)
 
 void
 Foo_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 4fc3d00a03d..dce00836ab5 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -27,12 +27,9 @@ public:
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Foo::Bar::NoSecurityAttributes));
+  virtual void baz (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 2cab2208413..19e25025201 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults {
   custom_only = 1
 }
 
-project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
+project(*security server): taoserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
   after += *idl
   Source_Files {
     Foo_i.cpp
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 27a7b0b511c..b573bed536b 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 4856df76c19..5315ff14771 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index ee365c81d78..28864874d31 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -41,12 +41,10 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short id (void);
   // Gets id.
 
 private:
@@ -64,14 +62,12 @@ My_Test_Object::~My_Test_Object (void)
 
 CORBA::Short
 My_Test_Object::id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
 My_Test_Object::id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index ee365c81d78..63fbf631f3f 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -41,12 +41,10 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short id (void);
   // Gets id.
 
 private:
@@ -64,14 +62,12 @@ My_Test_Object::~My_Test_Object (void)
 
 CORBA::Short
 My_Test_Object::id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
 My_Test_Object::id (CORBA::Short id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
 }
@@ -102,7 +98,7 @@ CosNaming_Client::parse_args (void)
       case 's':
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
-                          Simple_Test,
+                          Simple_Test (this->orbmgr_.root_poa ()),
                           -1);
         break;
       case 'm':
@@ -113,7 +109,9 @@ CosNaming_Client::parse_args (void)
               size = 10;
 
             ACE_NEW_RETURN (this->test_,
-                            MT_Test (this->orbmgr_.orb (), size),
+                            MT_Test (this->orbmgr_.orb (),
+                                     this->orbmgr_.root_poa (),
+                                     size),
                             -1);
           }
 
@@ -121,25 +119,25 @@ CosNaming_Client::parse_args (void)
       case 't':
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
-                          Tree_Test,
+                          Tree_Test (this->orbmgr_.root_poa ()),
                           -1);
         break;
       case 'i':
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
-                          Iterator_Test,
+                          Iterator_Test (this->orbmgr_.root_poa ()),
                           -1);
         break;
       case 'e':
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
-                          Exceptions_Test,
+                          Exceptions_Test (this->orbmgr_.root_poa ()),
                           -1);
         break;
       case 'y':
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
-                          Destroy_Test,
+                          Destroy_Test (this->orbmgr_.root_poa ()),
                           -1);
         break;
       case 'p':
@@ -155,6 +153,7 @@ CosNaming_Client::parse_args (void)
 
             ACE_NEW_RETURN (this->test_,
                             Persistent_Test_Begin (this->orbmgr_.orb (),
+                                                   this->orbmgr_.root_poa (),
                                                    ior_output_file),
                             -1);
           }
@@ -163,6 +162,7 @@ CosNaming_Client::parse_args (void)
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
                           Persistent_Test_End (this->orbmgr_.orb (),
+                                               this->orbmgr_.root_poa (),
                                                get_opts.opt_arg ()),
                           -1);
         break;
@@ -179,7 +179,7 @@ CosNaming_Client::parse_args (void)
 
   if (this->test_ == 0)
     ACE_NEW_RETURN (this->test_,
-                    Simple_Test,
+                    Simple_Test (this->orbmgr_.root_poa ()),
                     -1);
 
   // Indicates successful parsing of command line.
@@ -229,9 +229,20 @@ CosNaming_Client::init (int argc, char **argv)
   return -1;
 }
 
+Naming_Test::Naming_Test (PortableServer::POA_ptr poa)
+ : poa_ (poa)
+{
+}
+
+Naming_Test::~Naming_Test (void)
+{
+}
+
 MT_Test::MT_Test (CORBA::ORB_ptr orb,
+                  PortableServer::POA_ptr poa,
                   int size)
-   :size_ (size),
+  : Naming_Test (poa),
+    size_ (size),
     orb_ (orb),
     name_service_ior_ (0)
 {
@@ -353,8 +364,13 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
   try
     {
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (test_obj_impl);
+      
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+      
       test_ref_ =
-        test_obj_impl->_this ();
+        Test_Object::_narrow (object_act.in ());
 
       test_obj_impl->_remove_ref ();
 
@@ -393,6 +409,11 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   return status;
 }
 
+Simple_Test::Simple_Test(PortableServer::POA_ptr poa)
+ : Naming_Test (poa)
+{
+}
+
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
@@ -400,8 +421,13 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (test_obj_impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this ();
+        Test_Object::_narrow (object_act.in ());
 
       // Give ownership of this object to POA.
       test_obj_impl->_remove_ref ();
@@ -442,6 +468,11 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
   return 0;
 }
 
+Tree_Test::Tree_Test(PortableServer::POA_ptr poa)
+ : Naming_Test (poa)
+{
+}
+
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
@@ -464,7 +495,12 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 =
         new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl1);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj1 = Test_Object::_narrow (object_act.in ());
       impl1->_remove_ref ();
 
       CosNaming::Name obj_name;
@@ -529,7 +565,11 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       My_Test_Object *impl2 =
         new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this ();
+      id_act = this->poa_->activate_object (impl2);
+
+      object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj2 = Test_Object::_narrow (object_act.in ());
 
       impl2->_remove_ref ();
 
@@ -560,6 +600,11 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
   return 0;
 }
 
+Exceptions_Test::Exceptions_Test(PortableServer::POA_ptr poa)
+ : Naming_Test (poa)
+{
+}
+
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
@@ -579,7 +624,12 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj = Test_Object::_narrow (object_act.in ());
       impl->_remove_ref ();
 
       CosNaming::Name object_name;
@@ -642,7 +692,12 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context)
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj = Test_Object::_narrow (object_act.in ());
       impl->_remove_ref ();
 
       root_context->bind (test_name,
@@ -672,7 +727,12 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj = Test_Object::_narrow (object_act.in ());
       impl->_remove_ref ();
 
       root_context->bind (test_name,
@@ -798,6 +858,11 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context)
     }
 }
 
+Iterator_Test::Iterator_Test(PortableServer::POA_ptr poa)
+ : Naming_Test (poa)
+{
+}
+
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
@@ -805,7 +870,12 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj = Test_Object::_narrow (object_act.in ());
       impl->_remove_ref ();
 
       // Bind objects to the naming context.
@@ -889,6 +959,11 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
   return 0;
 }
 
+Destroy_Test::Destroy_Test(PortableServer::POA_ptr poa)
+ : Naming_Test (poa)
+{
+}
+
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
@@ -901,7 +976,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 
       // Bind a dummy object foo under my_context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this ();
+      PortableServer::ObjectId_var id_act =
+        this->poa_->activate_object (impl);
+
+      CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ());
+
+      Test_Object_var obj = Test_Object::_narrow (object_act.in ());
       impl->_remove_ref ();
 
       CosNaming::Name object_name;
@@ -960,8 +1040,10 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref)
 }
 
 Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
+                                              PortableServer::POA_ptr poa,
                                               FILE * ior_output_file)
-  : orb_ (orb),
+  : Naming_Test (poa),
+    orb_ (orb),
     file_ (ior_output_file)
 {
 }
@@ -1011,8 +1093,10 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 }
 
 Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
+                                          PortableServer::POA_ptr poa,
                                           const char *ior)
-  : orb_ (orb),
+  : Naming_Test (poa),
+    orb_ (orb),
     ior_ (ior)
 {
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 2850fe0e090..a911305470b 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -36,10 +36,15 @@ class Naming_Test
   //    chosen at runtime.
 
 public:
-  virtual ~Naming_Test (void) {}
+  virtual ~Naming_Test (void);
   virtual int execute (TAO_Naming_Client &root_context) = 0;
   // Execute the test code.  <root_context> is the context to assume
   // as the root for all tests operations.
+
+protected:
+  Naming_Test (PortableServer::POA_ptr poa);
+
+  PortableServer::POA_var poa_;
 };
 
 class Simple_Test : public Naming_Test
@@ -51,6 +56,8 @@ class Simple_Test : public Naming_Test
   //    The test binds(), resolves(), and unbinds() an object
   //    reference from the given Naming Context.
 public:
+  Simple_Test (PortableServer::POA_ptr poa);
+
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the simple test code.
 };
@@ -68,6 +75,7 @@ public:
   // = Initialization and termination methods.
 
   MT_Test (CORBA::ORB_ptr orb,
+           PortableServer::POA_ptr poa,
            int size = 10);
   // Constructor.  Takes in an orb pointer and number of threads to spawn.
 
@@ -123,6 +131,7 @@ class Tree_Test : public Naming_Test
   //    Rebind() to have a different object under the name bar.
   //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
 public:
+  Tree_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the tree test code.
 };
@@ -140,6 +149,7 @@ class Iterator_Test : public Naming_Test
   //    then invokes next_one(), next_n(2), next_one(), and destroy()
   //    on the iterator.
 public:
+  Iterator_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the iterator test code.
 };
@@ -164,6 +174,7 @@ class Exceptions_Test : public Naming_Test
   //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
   //    with why = not_context, rest_of_name = foo/foo.
 public:
+  Exceptions_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the exceptions test code.
 
@@ -194,6 +205,7 @@ class Destroy_Test : public Naming_Test
   //    exception should be raised.
   //
 public:
+  Destroy_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
   // Execute the destroy test code.
 
@@ -217,6 +229,7 @@ public:
   // = Initialization and termination methods.
 
   Persistent_Test_Begin (CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa,
                          FILE * ior_output_file);
   // Constructor.  Takes in an orb pointer.
 
@@ -251,6 +264,7 @@ public:
   // = Initialization and termination methods.
 
   Persistent_Test_End (CORBA::ORB_ptr orb,
+                       PortableServer::POA_ptr poa,
                        const char * ior);
   // Constructor.  Takes in an orb pointer and the ior received from
   // <Persistent_Test_Begin>.
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index e2a7d1997bf..148ae9c5a37 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -9,7 +9,6 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                     CORBA::Boolean verbose)
-  ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
@@ -32,16 +31,6 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 
 void
 TAO_Offer_Exporter::export_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::InvalidObjectRef,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::Register::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n"));
 
@@ -57,16 +46,6 @@ TAO_Offer_Exporter::export_offers (void)
 
 void
 TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Register::InvalidObjectRef,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::Register::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::MissingMandatoryProperty,
-                   CosTrading::DuplicatePropertyName))
 {
   try
     {
@@ -117,16 +96,6 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
 
 void
 TAO_Offer_Exporter::export_offers_to_all (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Register::InvalidObjectRef,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::Register::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::MissingMandatoryProperty,
-                   CosTrading::DuplicatePropertyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting to all.\n"));
 
@@ -189,10 +158,6 @@ TAO_Offer_Exporter::export_offers_to_all (void)
 
 void
 TAO_Offer_Exporter::withdraw_offers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalOfferId,
-                   CosTrading::UnknownOfferId,
-                   CosTrading::Register::ProxyOfferId))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
@@ -221,10 +186,6 @@ TAO_Offer_Exporter::withdraw_offers (void)
 
 void
 TAO_Offer_Exporter::describe_offers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalOfferId,
-                   CosTrading::UnknownOfferId,
-                   CosTrading::Register::ProxyOfferId))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
@@ -265,18 +226,6 @@ TAO_Offer_Exporter::describe_offers (void)
 
 void
 TAO_Offer_Exporter::modify_offers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::NotImplemented,
-                   CosTrading::IllegalOfferId,
-                   CosTrading::UnknownOfferId,
-                   CosTrading::Register::ProxyOfferId,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::Register::UnknownPropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::Register::MandatoryProperty,
-                   CosTrading::Register::ReadonlyProperty,
-                   CosTrading::DuplicatePropertyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
@@ -317,11 +266,6 @@ TAO_Offer_Exporter::modify_offers (void)
 void
 TAO_Offer_Exporter::
 withdraw_offers_using_constraints (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Register::NoMatchingOffers))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing with constraint.\n"));
 
@@ -355,8 +299,6 @@ withdraw_offers_using_constraints (void)
 
 CosTrading::OfferIdSeq*
 TAO_Offer_Exporter::grab_offerids (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::NotImplemented))
 {
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index f31142f193b..0280714f872 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -25,95 +25,37 @@ class TAO_TTest_Export TAO_Offer_Exporter
 public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                      CORBA::Boolean verbose)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Boolean verbose);
 
   ~TAO_Offer_Exporter (void);
 
-  void export_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::InvalidObjectRef,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::Register::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName));
+  void export_offers (void);
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::InvalidObjectRef,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::Register::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName));
+  void export_offers_to_all (void);
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId));
+  void withdraw_offers (void);
   // Withdraw all exported offers.
 
-  void describe_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId));
+  void describe_offers (void);
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::NotImplemented,
-                     CosTrading::IllegalOfferId,
-                     CosTrading::UnknownOfferId,
-                     CosTrading::Register::ProxyOfferId,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::Register::UnknownPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::Register::MandatoryProperty,
-                     CosTrading::Register::ReadonlyProperty,
-                     CosTrading::DuplicatePropertyName));
+  void modify_offers (void);
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Register::NoMatchingOffers));
+  void withdraw_offers_using_constraints (void);
   // Withdraw a number of offers based on a constraint string.
 
 private:
 
-  CosTrading::OfferIdSeq* grab_offerids (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::NotImplemented));
+  CosTrading::OfferIdSeq* grab_offerids (void);
 
   void create_offers (void);
   // Fill in each of the offer structures.
 
-  void export_to (CosTrading::Register_ptr reg)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::InvalidObjectRef,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::Register::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName));
+  void export_to (CosTrading::Register_ptr reg);
   // Export the offers to the give Register interface.
 
   typedef ACE_Unbounded_Queue<TAO_Dynamic_Property*> DP_Queue;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index c2f2049c714..ec3d6f11da4 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -13,17 +13,6 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 
 void
 TAO_Offer_Importer::perform_queries (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n"));
 
@@ -39,17 +28,6 @@ TAO_Offer_Importer::perform_queries (void)
 
 void
 TAO_Offer_Importer::perform_directed_queries (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n"));
 
@@ -132,17 +110,6 @@ void
 TAO_Offer_Importer::perform_queries_with_policies (
     const TAO_Policy_Creator& policies
   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::IllegalConstraint,
-                   CosTrading::Lookup::IllegalPreference,
-                   CosTrading::Lookup::IllegalPolicyName,
-                   CosTrading::Lookup::PolicyTypeMismatch,
-                   CosTrading::Lookup::InvalidPolicyValue,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTrading::DuplicatePolicyName))
 {
   try
     {
@@ -216,7 +183,6 @@ TAO_Offer_Importer::perform_queries_with_policies (
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                                      CosTrading::OfferIterator_ptr offer_iterator) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 74b47228d6a..b0355182cfe 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -33,55 +33,21 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Lookup::IllegalPreference,
-                     CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::DuplicatePolicyName));
+  void perform_queries (void);
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Lookup::IllegalPreference,
-                     CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::DuplicatePolicyName));
+  void perform_directed_queries (void);
   // Direct a query to a trader two graph edges distant from the
   // bootstrapped-to trader.
 
 private:
 
-  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::IllegalConstraint,
-                     CosTrading::Lookup::IllegalPreference,
-                     CosTrading::Lookup::IllegalPolicyName,
-                     CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTrading::DuplicatePolicyName));
+  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager);
   // Perform a query on the bootstrapped-to trader given the policies
   // pass in <policy_manager>.
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
-                        CosTrading::OfferIterator_ptr offer_iterator) const
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CosTrading::OfferIterator_ptr offer_iterator) const;
   // Display the results of the query to the screen.
 
   CORBA::Boolean verbose_;
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index ad62f462b2e..14e938eee4d 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -7,7 +7,6 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                            CORBA::Boolean verbose)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
@@ -23,10 +22,6 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
 
 void
 TAO_Service_Type_Exporter::remove_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all"
               " types from the Repository.\n"));
@@ -56,15 +51,6 @@ TAO_Service_Type_Exporter::remove_all_types (void)
 
 void
 TAO_Service_Type_Exporter::add_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                   CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
 
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -74,15 +60,6 @@ TAO_Service_Type_Exporter::add_all_types (void)
 
 void
 TAO_Service_Type_Exporter::add_all_types_to_all (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                   CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "add all types to all repositories.\n"));
@@ -129,15 +106,6 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void)
 void
 TAO_Service_Type_Exporter::
 add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                   CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
 {
   for (int i = 0; i < NUM_TYPES; i++)
     {
@@ -187,7 +155,6 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
 
 void
 TAO_Service_Type_Exporter::list_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -219,9 +186,6 @@ TAO_Service_Type_Exporter::list_all_types (void)
 
 void
 TAO_Service_Type_Exporter::describe_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType))
 {
   try
     {
@@ -250,9 +214,6 @@ TAO_Service_Type_Exporter::describe_all_types (void)
 
 void
 TAO_Service_Type_Exporter::fully_describe_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType))
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index c11ae36f505..0553c65b621 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -24,57 +24,27 @@ class TAO_TTest_Export TAO_Service_Type_Exporter
 public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                             CORBA::Boolean verbose)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void remove_all_types (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+                             CORBA::Boolean verbose);
+
+  void remove_all_types (void);
   // Remove all service types from the trading service instance.
 
-  void add_all_types (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+  void add_all_types (void);
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+  void add_all_types_to_all (void);
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void list_all_types (void);
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType));
+  void describe_all_types (void);
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType));
+  void fully_describe_all_types (void);
   // Same as describe_all_types, but fully describe lists the
   // properties of all service types the described service type
   // inherits from.
@@ -84,16 +54,7 @@ private:
   void create_types (void);
   // Generate the service type description structures.
 
-  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos);
   // Add all types to a sepcified service type repository reference.
 
   void
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index b907db37a75..a7731f8777b 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -17,7 +17,6 @@ template <class T> CORBA::Any*
 TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
                                         const CORBA::Any&)
-  ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
   ACE_NEW_RETURN (return_value, CORBA::Any, 0);
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index d9b455df004..2836545113f 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -33,8 +33,7 @@ public:
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
-                              )
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+                              );
 
 private:
   T dp_;
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 76fdc207e07..391e066b747 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -38,7 +38,7 @@ public:
     Remote_Output (void) {}
 
     virtual void confirm (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -51,7 +51,7 @@ public:
     Printer (void) {}
 
     virtual void confirm (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -63,7 +63,7 @@ public:
     Plotter (void) {}
 
     virtual void confirm (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -75,7 +75,7 @@ public:
     File_System (void) {}
 
     virtual void confirm (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -87,7 +87,7 @@ public:
     PostScript_Printer (void) {}
 
     virtual void confirm (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 421c80f8d30..03f1cfa61d4 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -81,7 +81,7 @@ IOR_corbaname_Client_i::run (void)
       CORBA::Boolean ret_value =
         factory->print_status ();
 
-      if (ret_value == 0)
+      if (!ret_value)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "The server has been successfully contacted.\n",
@@ -114,13 +114,8 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
 
   try
     {
-
       // First initialize the ORB, that will remove some arguments...
-      this->orb_ =
-        CORBA::ORB_init (this->argc_,
-                         this->argv_,
-                         "" /* the ORB name, it can be anything! */
-                         );
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // There must be at least one argument, the file that has to be
       // retrieved
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 08e4b556666..8a54f83270c 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -35,7 +35,7 @@ class IOR_corbaname_Client_i
   //
 
  public:
-  // = COnstructor and destructor.
+  // = Constructor and destructor.
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_Client_i (void);
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 8106ca49e23..277ca8336b4 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -7,12 +7,8 @@ int main (int argc, char* argv[])
 {
   try
     {
-
       // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv,
-                         "" /* the ORB name, it can be anything! */
-                         );
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
@@ -23,8 +19,7 @@ int main (int argc, char* argv[])
         PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager ();
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager ();
 
       // Activate the POA Manager
       poa_manager->activate ();
@@ -33,8 +28,7 @@ int main (int argc, char* argv[])
       corbaname_Status_i status_i;
 
       // Activate it to obtain the reference
-      corbaname::Status_var status =
-        status_i._this ();
+      corbaname::Status_var status = status_i._this ();
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
@@ -49,8 +43,7 @@ int main (int argc, char* argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("STATUS");
 
-      naming_context->bind (name,
-                            status.in ());
+      naming_context->bind (name, status.in ());
 
       // Run the orb
       orb->run ();
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 10ee6f6d41b..4d588fdfd60 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -11,7 +11,6 @@ corbaname_Status_i::corbaname_Status_i (void)
 
 CORBA::Boolean
 corbaname_Status_i::print_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client makes a succesful request, return a true value
   // indicating that it has successfully reached the server.
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index be0aa750b56..853351b58cd 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -11,8 +11,7 @@ class corbaname_Status_i : public POA_corbaname::Status {
 public:
   corbaname_Status_i (void);
 
-  CORBA::Boolean print_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean print_status (void);
 
 };
 
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 295242e9569..a9060fa3009 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -43,7 +43,7 @@ int main (int argc, char *argv [])
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0);
+        CORBA::ORB_init (argc, argv);
 
       // There must be at least one argument, the file that has to be
       // retrieved
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
index a8839f31939..485aea870d1 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
@@ -37,7 +37,7 @@ AppHelper::create_poa(const char*                    name,
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to create child POA: %s.\n", name));
-      ACE_THROW_RETURN (TestAppException(), PortableServer::POA::_nil ());
+      throw TestAppException();
     }
 
   return child_poa._retn();
@@ -59,7 +59,7 @@ AppHelper::activate_servant(PortableServer::POA_ptr poa,
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert servant_to_ref.\n"));
-      ACE_THROW_RETURN (TestAppException(), CORBA::Object::_nil ());
+      throw TestAppException();
     }
 
   return obj._retn();
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index e170ddf75e2..c3b16fabdfa 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -25,7 +25,7 @@ struct RefHelper
       {
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     T_var t_obj = T::_narrow(obj.in());
@@ -34,7 +34,7 @@ struct RefHelper
       {
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to narrow obj ref to T interface.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     return t_obj._retn();
@@ -51,7 +51,7 @@ struct RefHelper
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to resolve initial ref for '%s'.\n",
                    name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     T_var t_obj = T::_narrow(obj.in());
@@ -62,7 +62,7 @@ struct RefHelper
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to narrow resolved initial ref '%s'.\n",
                    name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     return t_obj._retn();
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index a7e4878ef11..195be3b7c02 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -23,7 +23,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0]++;
 }
@@ -31,7 +30,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(value);
   this->op_count_[1]++;
@@ -40,7 +38,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[2]++;
   return value;
@@ -49,7 +46,6 @@ Foo_i::op3(CORBA::Long value)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(value);
   this->op_count_[3]++;
@@ -58,7 +54,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4]++;
   throw FooException();
@@ -67,7 +62,6 @@ Foo_i::op5(void)
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 9b3e4307646..9799603425c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -14,24 +14,17 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
     Foo_i();
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(CORBA::Long value);
 
-    virtual void op4(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException,
-                                                 FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
     void gather_stats(Foo_Statistics& stats);
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 55764d4ae3a..2d9fbe40121 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -12,10 +12,10 @@ project(*server): taoserver, messaging, strategies {
   after += *Perf_IDL
   avoids += ace_for_tao
   Source_Files {
+    callbackC.cpp
+    callbackS.cpp
     Server_i.cpp
     server.cpp
-    callbackS.cpp
-    callbackC.cpp
   }
   IDL_Files {
   }
@@ -25,10 +25,10 @@ project(*client): taoexe, messaging, portableserver, strategies {
   after += *Perf_IDL
   avoids += ace_for_tao
   Source_Files {
+    callbackC.cpp
+    callbackS.cpp
     Callback_i.cpp
     client.cpp
-    callbackS.cpp
-    callbackC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index fc17d3ba8b9..74416a50d0b 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -20,7 +20,6 @@ Callback_i::done (void)
 void
 Callback_i::response (Test::TimeStamp time_stamp,
                       const Test::Payload &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 455ea532600..11a5655f7a2 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -22,8 +22,7 @@ public:
   /// Implement the CORBA methods
   //@{
   void response (Test::TimeStamp,
-                 const Test::Payload &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                 const Test::Payload &);
   //@}
 
 private:
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index a45f095f8e3..354be854fb7 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -10,7 +10,6 @@ ACE_RCSID(Callback, Server_i, "$Id$")
 
 void
 Server_i::set_callback (Test::Callback_ptr callback)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_ = Test::Callback::_duplicate (callback);
 }
@@ -18,7 +17,6 @@ Server_i::set_callback (Test::Callback_ptr callback)
 void
 Server_i::request (Test::TimeStamp time_stamp,
                    const Test::Payload &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     return;
@@ -28,7 +26,6 @@ Server_i::request (Test::TimeStamp time_stamp,
 
 void
 Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->done_ = 1;
 }
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 1f2218083f2..87f5e0640ac 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -17,15 +17,12 @@ public:
 
   /// Implement the CORBA methods
   //@{
-  void set_callback (Test::Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void set_callback (Test::Callback_ptr callback);
 
   void request (Test::TimeStamp,
-                const Test::Payload &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                const Test::Payload &);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   //@}
 
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index c9eed07155a..a91980168cf 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -75,7 +75,7 @@ main (int argc, char *argv [])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager");
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index 4ca5bc60c1e..ab4594c9347 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv [])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager");
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 23de6e20cb8..4c70aa6fc4b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -129,7 +129,6 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 
 Cubit_ptr
 Cubit_Factory_i::make_cubit (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return my_cubit_._this ();
 }
@@ -167,14 +166,12 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 
 void
 Cubit_i::cube_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
 Cubit_i::cube_void (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
 }
@@ -183,7 +180,6 @@ Cubit_i::cube_void (void)
 
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
 
@@ -194,7 +190,6 @@ Cubit_i::cube_octet (CORBA::Octet o)
 
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
 
@@ -205,7 +200,6 @@ Cubit_i::cube_short (CORBA::Short s)
 
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
 
@@ -216,7 +210,6 @@ Cubit_i::cube_long (CORBA::Long l)
 
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
 
@@ -233,7 +226,6 @@ Cubit_i::cube_struct (const Cubit::Many &values)
 
 Cubit::oneof
 Cubit_i::cube_union (const Cubit::oneof &values)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
 
@@ -266,7 +258,6 @@ Cubit_i::cube_union (const Cubit::oneof &values)
 void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
                              Cubit::long_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
 
@@ -292,7 +283,6 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
                               Cubit::octet_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
 
@@ -332,7 +322,6 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
                              Cubit::many_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
 
@@ -365,7 +354,6 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
                         Cubit::RtiPacket_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
 
@@ -396,7 +384,6 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 
 CORBA::Any *
 Cubit_i::cube_any (const CORBA::Any & any)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START);
 
@@ -412,7 +399,6 @@ Cubit_i::cube_any (const CORBA::Any & any)
 
 CORBA::Any *
 Cubit_i::cube_any_struct (const CORBA::Any & any)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
   Cubit::Many * arg_struct;
@@ -431,7 +417,6 @@ Cubit_i::cube_any_struct (const CORBA::Any & any)
 // Shutdown.
 
 void Cubit_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
@@ -443,7 +428,6 @@ void Cubit_i::shutdown (void)
 
 void
 Cubit_i::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // do nothing
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index aa03d0ccb47..4de76ae2b4d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -40,70 +40,55 @@ public:
   virtual PortableServer::POA_ptr _default_POA (void);
   // Returns the default POA for this servant.
 
-  virtual void cube_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cube_oneway (void);
   // Test a oneway call.
 
-  virtual void cube_void (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cube_void (void);
   // Test a twoway call.
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Octet cube_octet (CORBA::Octet o);
   // Cube an octet
 
-  virtual CORBA::Short cube_short (CORBA::Short s)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short cube_short (CORBA::Short s);
   // Cube a short
 
-  virtual CORBA::Long cube_long (CORBA::Long l)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long cube_long (CORBA::Long l);
   // Cube a long
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Cubit::Many cube_struct (const Cubit::Many &values);
   // Cube a struct.
 
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Cubit::oneof cube_union (const Cubit::oneof &values);
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-                                   Cubit::long_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   Cubit::long_seq_out output);
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-                                    Cubit::octet_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Cubit::octet_seq_out output);
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
-                                   Cubit::many_seq_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   Cubit::many_seq_out output);
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-                              Cubit::RtiPacket_out output)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              Cubit::RtiPacket_out output);
   // Cube a sequence.
 
-  virtual CORBA::Any * cube_any (const CORBA::Any & any)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any * cube_any (const CORBA::Any & any);
   // Cube a long in an any
 
-  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any);
   // Cube a struct in an any
 
   /// Shutdown routine.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 
   /// A ping. Please see the idl file for details.
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
 
   void set_default_poa (PortableServer::POA_ptr poa);
@@ -130,8 +115,7 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Cubit_ptr make_cubit (void);
   // Make a cubit object.
 
   void set_default_poa (PortableServer::POA_ptr poa);
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..0795cb6b8ec 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -13,13 +13,13 @@ project(*IDL): taoidldefaults, strategies {
 project(*Server): taoexe, utils, portableserver, strategies, avoids_corba_e_micro, avoids_ace_for_tao {
   after += *IDL
   Source_Files {
+    cubitC.cpp
+    cubitS.cpp
     RTI_IO.cpp
     Cubit_i.cpp
     Cubit_Client.cpp
     Cubit_Server.cpp
     server.cpp
-    cubitS.cpp
-    cubitC.cpp
   }
 
   IDL_Files {
@@ -30,10 +30,10 @@ project(*client): taoexe, portableserver, strategies {
   after += *IDL
   avoids += ace_for_tao
   Source_Files {
+    cubitC.cpp
     RTI_IO.cpp
     Cubit_Client.cpp
     client.cpp
-    cubitC.cpp
   }
 
   IDL_Files {
@@ -48,13 +48,13 @@ project(*collocation): taoserver, utils, strategies, avoids_corba_e_micro, avoid
   exename   = collocation_test
 
   Source_Files {
+    cubitC.cpp
+    cubitS.cpp
     RTI_IO.cpp
     collocation_test.cpp
     Cubit_i.cpp
     Cubit_Client.cpp
     Cubit_Server.cpp
-    cubitS.cpp
-    cubitC.cpp
   }
 
   IDL_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 5cd76fa46b3..0a13e813d60 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -217,8 +217,13 @@ Cubit_Task::create_servants (void)
           // to stdout.  Someone will take that string and give it to
           // some client.  Then release the object.
 
+          PortableServer::ObjectId_var id_act =
+            poa->activate_object (this->servants_[i]);
+
+          CORBA::Object_var object_act = poa->id_to_reference (id_act.in ());
+
           Cubit_var cubit =
-            this->servants_[i]->_this ();
+            Cubit::_narrow (object_act.in ());
 
 
           CORBA::String_var str =
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 5e5cf7f7b1a..40cb819b5a0 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -19,28 +19,24 @@ Cubit_i::~Cubit_i (void)
 
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
 }
 
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
 }
 
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
 }
 
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
 
@@ -53,13 +49,11 @@ Cubit_i::cube_struct (const Cubit::Many &values)
 
 void
 Cubit_i::noop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
 void Cubit_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Calling orb ()->shutdown ()\n"));
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index f6ccfbac37f..2eb4f2fb17c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -29,23 +29,17 @@ public:
            PortableServer::POA_ptr poa);
   ~Cubit_i (void);
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Octet cube_octet (CORBA::Octet o);
 
-  virtual CORBA::Short cube_short (CORBA::Short s)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short cube_short (CORBA::Short s);
 
-  virtual CORBA::Long cube_long (CORBA::Long l)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long cube_long (CORBA::Long l);
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Cubit::Many cube_struct (const Cubit::Many &values);
 
-  virtual void noop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void noop (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   virtual PortableServer::POA_ptr
       _default_POA (void);
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
index c06f2da81c8..2a1accfb4f9 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -14,7 +14,6 @@ void
 Roundtrip::test_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Method called\n"));
   _tao_rh->test_method (send_time);
@@ -24,7 +23,6 @@ Roundtrip::test_method (
 void
 Roundtrip::shutdown (
        Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->shutdown ();
   this->orb_->shutdown (0);
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
index f78986c76d2..eb3e98763fb 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
@@ -23,11 +23,9 @@ class Roundtrip
 
     // = The skeleton methods
     void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                      Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                      Test::Timestamp send_time);
 
-    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
  private:
     /// Use an ORB reference to conver strings to objects and shutdown
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..939cd18912a 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -11,9 +11,9 @@ project(*AMH_latency_idl): taoidldefaults, amh {
 project(*AMH latency server): taoserver, strategies, valuetype, amh {
   after += *AMH_latency_idl
   Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    Roundtrip.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index c4b3259bbb0..2c6c24e0357 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index 6f8dc163913..1e5b9bb067f 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index cc38547a7cc..070942c4482 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index dbbbe96c14d..67ba9df78cd 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -25,7 +25,6 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 
 void
 Roundtrip_Handler::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -35,7 +34,6 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -50,13 +48,11 @@ Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
 
 void
 Roundtrip_Handler::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index ee1670353d8..c2cb080d899 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -29,15 +29,11 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_method (Test::Timestamp send_time);
+  virtual void test_method_excep (::Messaging::ExceptionHolder *holder);
+
+  virtual void shutdown (void);
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
   /// The number of callbacks not received yet
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index 6e0abf22d68..759e96d39c1 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index f92e231ed00..1a15eea0763 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
index 403e7ef30b8..b781db146a9 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (argc, argv, 0);
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc,argv) == -1)
         return -1;
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 324775f0c51..25ce659a86d 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -11,14 +11,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 3d5ec120dcf..77c1483e4a8 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -11,9 +11,9 @@ project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_
 project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *latency_idl
   Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    Roundtrip.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index 3df9ac2e593..5c907de19ba 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 2df664cc4c8..01162882b4c 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index 6f8dc163913..1e5b9bb067f 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index 3c321546dfa..42e10117205 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index 506f78b7293..4371de1befd 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index 6f42247d210..0d65f210bbe 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index 01193a9f47f..935701c139b 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -99,7 +99,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index 6f8dc163913..1e5b9bb067f 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index 6f42247d210..0d65f210bbe 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index c4b3259bbb0..2c6c24e0357 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index 6f8dc163913..d779b7f755a 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -90,8 +90,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index 97a05de4635..9e4b7659718 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index fef8648500d..def4d0068a9 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index f91bf1958a2..c159645d6ab 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -90,8 +90,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index 1f8939bedfe..308d4d7afcd 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -12,14 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index c18e2f831b4..9ea3a22bc1c 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -22,11 +22,9 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index 87de7522626..39e9c054dc6 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 3c2945e1cb5..7219b6d4736 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -91,8 +91,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index f988231fea5..9dadc696535 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -16,7 +16,6 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 void
 Memory_Growth::send_objref (const Test::PayLoad & /*p*/
                             )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Manual_Event me;
 
@@ -32,7 +31,6 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
 
 void
 Memory_Growth::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index 276540fc0da..b6443ab2536 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -22,11 +22,9 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void send_objref (const Test::PayLoad &p)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_objref (const Test::PayLoad &p);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp
index 7bcf50a3245..6e9f484bd33 100644
--- a/TAO/performance-tests/Memory/IORsize/client.cpp
+++ b/TAO/performance-tests/Memory/IORsize/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp
index 9d347d698b9..a7b365d5a67 100644
--- a/TAO/performance-tests/Memory/IORsize/server.cpp
+++ b/TAO/performance-tests/Memory/IORsize/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index 1822fd7f190..f8ef0317e3e 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -12,14 +12,12 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 
 void
 Memory_Growth::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
 Memory_Growth::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 446c1786b99..acb1b388c89 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -22,11 +22,9 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index fb5823d809e..2acd1ce5e05 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -12,10 +12,10 @@ project(*idl): taoidldefaults {
 project(*server): taoserver {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Memory_Growth.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
index 24fc9ca067d..14a9b6cc6a1 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
index 9d347d698b9..a7b365d5a67 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 535ce35b6df..41252e695f7 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 76ca11aaff5..9992b8cfabc 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -57,7 +57,7 @@ Demux_Test_Client::init (int argc, char *argv [])
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index 0d0a304bf28..5f95b402308 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -13,12 +13,10 @@ Demux_Test_i::~Demux_Test_i (void)
 {}
 
 void Demux_Test_i::M302 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void Demux_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index b5aead8fb81..b4dd1e68888 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -29,11 +29,9 @@ public:
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void M302 (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 8fd3c721113..58401a00e81 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -59,7 +59,7 @@ Demux_Test_Server::init (int argc, char *argv [])
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 7054fb957cf..fd1d73211ef 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -13,7 +13,6 @@ Factory::Factory (CORBA::ORB_ptr orb)
 
 Test::Simple_ptr
 Factory::create_simple_object (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple *simple_impl;
   ACE_NEW_THROW_EX (simple_impl,
@@ -27,7 +26,6 @@ Factory::create_simple_object (void)
 
 void
 Factory::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 9d9432a65f2..7f87cb0c033 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -23,11 +23,9 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Simple_ptr create_simple_object (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Keep a reference to the ORB
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index b95d547dc66..7e6e57c1719 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -15,11 +15,11 @@ project(*server): taoserver {
   after += *idl
 
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Factory.cpp
     Simple.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
 
   IDL_Files {
@@ -44,10 +44,10 @@ project(*collocated): taoserver {
   after  += *idl
   exename = collocated
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Simple.cpp
     collocated.cpp
-    TestS.cpp
-    TestC.cpp
   }
 
   IDL_Files {
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index 6fabe5ff9e2..f0b417fa442 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -11,7 +11,6 @@ Simple::Simple (void)
 
 void
 Simple::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 5aa5063f182..ef182bae2f4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -23,8 +23,7 @@ public:
 
   // = The skeleton methods
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index b950e933eab..4132592002e 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 7f56f5ae556..f84754a5f0f 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9135f1a72fe..d78c94518d4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index f3945c14ae4..15875f51c2b 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -377,7 +377,10 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            objects[i] = servants[i]._this ();
+            PortableServer::ObjectId_var id =
+              root_poa->activate_object (&servants[i]);
+            CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+            objects[i] = test::_narrow (object.in ());
           }
       }
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 780b8bb00ef..41862c2dd6f 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -73,7 +73,6 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
 
 Pluggable_Test_ptr
 Pluggable_Test_Factory_i::make_pluggable_test (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
   return my_pluggable_test_._this ();
@@ -96,7 +95,6 @@ PP_Test_i::~PP_Test_i (void)
 
 void
 PP_Test_i::send_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
 }
@@ -105,7 +103,6 @@ PP_Test_i::send_oneway (void)
 
 void
 PP_Test_i::send_void (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
 }
@@ -113,7 +110,6 @@ PP_Test_i::send_void (void)
 // Shutdown.
 
 void PP_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index 237d7276948..51e7c8b4b4a 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -34,16 +34,13 @@ public:
   ~PP_Test_i (void);
   // Destructor
 
-  virtual void send_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_oneway (void);
   // Test a oneway call.
 
-  virtual void send_void (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_void (void);
   // Test a twoway call.
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
   // Shutdown routine.
 
 protected:
@@ -65,8 +62,7 @@ public:
   ~Pluggable_Test_Factory_i (void);
   // Destructor.
 
-  virtual Pluggable_Test_ptr make_pluggable_test (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Pluggable_Test_ptr make_pluggable_test (void);
   // Make a Pluggable Test object.
 
 private:
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index 2981dd161a6..75e85bf24df 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*server): taoserver, utils, avoids_corba_e_micro {
   after += *idl
   Source_Files {
+    PP_TestC.cpp
+    PP_TestS.cpp
     PP_Test_Server.cpp
     PP_Test_i.cpp
     server.cpp
-    PP_TestS.cpp
-    PP_TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index f5a235aa7de..841b85ed259 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -13,9 +13,9 @@ project(*Receiver): taoserver {
   after  += *IDL
   exename = receiver
   Source_Files {
-    receiver.cpp
-    testS.cpp
     testC.cpp
+    testS.cpp
+    receiver.cpp
   }
   IDL_Files {
   }
@@ -25,9 +25,9 @@ project(*Distributor): rt_server {
   after += *IDL
   exename = distributor
   Source_Files {
-    distributor.cpp
-    testS.cpp
     testC.cpp
+    testS.cpp
+    distributor.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index c355e16a94d..6ab760b2ace 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -61,30 +61,23 @@ public:
                    const char *protocol,
                    CORBA::ULong invocation_rate,
                    CORBA::ULong message_size,
-                   CORBA::ULong iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   CORBA::ULong iterations);
 
-  void end_test (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void end_test (void);
 
-  void oneway_sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_sync (void);
 
-  void twoway_sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void twoway_sync (void);
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
-                      const ::test::octets &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      const ::test::octets &payload);
 
   void twoway_method (CORBA::Long &session_id,
                       CORBA::ULong &iteration,
-                      ::test::octets &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      ::test::octets &payload);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -141,7 +134,6 @@ test_i::start_test (CORBA::Long session_id,
                     CORBA::ULong invocation_rate,
                     CORBA::ULong message_size,
                     CORBA::ULong iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList protocols;
   protocols.length (1);
@@ -256,7 +248,6 @@ test_i::start_test (CORBA::Long session_id,
 
 void
 test_i::end_test (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use IIOP to indicate end of test to server.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
@@ -267,14 +258,12 @@ test_i::end_test (void)
 
 void
 test_i::oneway_sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->oneway_sync ();
 }
 
 void
 test_i::twoway_sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->twoway_sync ();
 }
@@ -283,7 +272,6 @@ void
 test_i::oneway_method (CORBA::Long session_id,
                        CORBA::ULong iteration,
                        const ::test::octets &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->oneway_method (session_id,
                                   iteration,
@@ -294,7 +282,6 @@ void
 test_i::twoway_method (CORBA::Long &session_id,
                        CORBA::ULong &iteration,
                        ::test::octets &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->twoway_method (session_id,
                                   iteration,
@@ -309,7 +296,6 @@ test_i::_default_POA (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->shutdown ();
 
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index f728f1ccf4d..b6e579d7994 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -65,30 +65,23 @@ public:
 		   const char *protocol,
 		   CORBA::ULong invocation_rate,
 		   CORBA::ULong message_size,
-		   CORBA::ULong iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+		   CORBA::ULong iterations);
 
-  void end_test (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void end_test (void);
 
-  void oneway_sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_sync (void);
 
-  void twoway_sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void twoway_sync (void);
 
   void oneway_method (CORBA::Long session_id,
 		      CORBA::ULong iteration,
-		      const ::test::octets &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+		      const ::test::octets &payload);
 
   void twoway_method (CORBA::Long &session_id,
 		      CORBA::ULong &iteration,
-		      ::test::octets &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+		      ::test::octets &payload);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -127,7 +120,6 @@ test_i::start_test (CORBA::Long session_id,
 		    CORBA::ULong invocation_rate,
 		    CORBA::ULong message_size,
 		    CORBA::ULong iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     {
@@ -170,7 +162,6 @@ test_i::start_test (CORBA::Long session_id,
 
 void
 test_i::end_test (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Record end time.
   this->test_end_ =
@@ -234,13 +225,11 @@ test_i::end_test (void)
 
 void
 test_i::oneway_sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 test_i::twoway_sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -248,7 +237,6 @@ void
 test_i::oneway_method (CORBA::Long session_id,
 		       CORBA::ULong iteration,
 		       const ::test::octets &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->session_id_ != session_id)
     {
@@ -285,7 +273,6 @@ void
 test_i::twoway_method (CORBA::Long &session_id,
 		       CORBA::ULong &iteration,
 		       ::test::octets &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->session_id_ != session_id)
     {
@@ -326,7 +313,6 @@ test_i::_default_POA (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -361,7 +347,7 @@ main (int argc, char **argv)
         root_poa->the_POAManager ();
 
       test_i *servant =
-	new test_i (orb.in (),
+        new test_i (orb.in (),
 		    root_poa.in ());
 
       PortableServer::ServantBase_var safe_servant (servant);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index 4c994050c98..1ef9bd731eb 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -12,7 +12,6 @@ ACE_RCSID(Latency, test_i, "$Id$")
 
 void
 Test_i::test_method (CORBA::Long id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -22,7 +21,6 @@ Test_i::test_method (CORBA::Long id)
 
 void
 Test_i::shutdown (const char *orb_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index f90df5fce18..e4cecd82b54 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (CORBA::Long id);
 
-  void shutdown (const char *orb_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (const char *orb_id);
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index c1a3c116dda..2968e4c07a9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 4a5be30dfe1..df526d7b06e 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index 629a42191e8..0a4a8acb1b8 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 361f6e0e653..68c610f8497 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -11,7 +11,6 @@ ACE_RCSID(Reliable, test_i, "$Id$")
 
 void
 Test_i::oneway_work_test (CORBA::ULong work)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
     {
@@ -24,13 +23,11 @@ Test_i::oneway_work_test (CORBA::ULong work)
 
 void
 Test_i::oneway_payload_test (const Test::data &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Test_i::twoway_work_test (CORBA::ULong work)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
     {
@@ -43,7 +40,6 @@ Test_i::twoway_work_test (CORBA::ULong work)
 
 void
 Test_i::shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 861256661ca..2c9998d16c4 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -31,17 +31,13 @@ public:
   // ctor
 
   // = The Test methods.
-  void oneway_payload_test (const Test::data &d)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_payload_test (const Test::data &d);
 
-  void oneway_work_test (CORBA::ULong work)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_work_test (CORBA::ULong work);
 
-  void twoway_work_test (CORBA::ULong work)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void twoway_work_test (CORBA::ULong work);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 13a81a456f5..65a9cc6beac 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -11,9 +11,9 @@ project(*RTCorba idl): taoidldefaults {
 project(*RTCorba server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *RTCorba_idl
   Source_Files {
-    server.cpp
-    testS.cpp
     testC.cpp
+    testS.cpp
+    server.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index a9388562968..740e22adeda 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -1125,7 +1125,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index b88e1ad34fc..9bcde814d7e 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -21,11 +21,9 @@ public:
           PortableServer::POA_ptr poa);
 
   void method (CORBA::ULong work,
-               CORBA::ULong prime_number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               CORBA::ULong prime_number);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -44,7 +42,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 void
 test_i::method (CORBA::ULong work,
                 CORBA::ULong prime_number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -65,7 +62,6 @@ test_i::_default_POA (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
index 5c13f7380ae..aa7bdcd9c85 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -15,7 +15,6 @@ Roundtrip::test_octet_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::octet_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Octet_Method called\n"));
   _tao_rh->test_octet_method (send_time);
@@ -27,7 +26,6 @@ Roundtrip::test_long_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::long_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Long_Method called\n"));
   _tao_rh->test_long_method (send_time);
@@ -39,7 +37,6 @@ Roundtrip::test_short_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::short_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Short_Method called\n"));
   _tao_rh->test_short_method (send_time);
@@ -51,7 +48,6 @@ Roundtrip::test_char_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::char_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Char_Method called\n"));
   _tao_rh->test_char_method (send_time);
@@ -64,7 +60,6 @@ Roundtrip::test_longlong_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::longlong_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Longlong_Method called\n"));
   _tao_rh->test_longlong_method (send_time);
@@ -76,7 +71,6 @@ Roundtrip::test_double_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::double_load &,
                 Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Double_Method called\n"));
   _tao_rh->test_double_method (send_time);
@@ -86,7 +80,6 @@ Roundtrip::test_double_method (
 void
 Roundtrip::shutdown (
        Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->shutdown ();
   this->orb_->shutdown (0);
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index 8ae186869cd..4010187dc77 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -24,41 +24,34 @@ class Roundtrip
     // = The skeleton methods
     void test_octet_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::octet_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
 
     void test_long_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::long_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
     void test_short_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::short_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
 
     void test_char_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::char_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
     void test_longlong_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::longlong_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
 
     void test_double_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::double_load& ol,
-                            Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                            Test::Timestamp send_time);
 
 
 
-    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
  private:
     /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index e5837148380..af01dafe769 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -359,7 +359,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index 6f8dc163913..1e5b9bb067f 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 9f324fa8e86..32638155971 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -54,14 +49,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index e9ed02ba785..d640b884d81 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -24,31 +24,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 97a6222f8f0..2c761b67137 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -27,7 +27,6 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 
 void
 Roundtrip_Handler::test_octet_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -37,7 +36,6 @@ Roundtrip_Handler::test_octet_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -54,7 +52,6 @@ Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder
 
 void
 Roundtrip_Handler::test_char_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -64,7 +61,6 @@ Roundtrip_Handler::test_char_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -81,7 +77,6 @@ Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder)
 
 void
 Roundtrip_Handler::test_long_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -91,7 +86,6 @@ Roundtrip_Handler::test_long_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -108,7 +102,6 @@ Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder)
 
 void
 Roundtrip_Handler::test_short_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -118,7 +111,6 @@ Roundtrip_Handler::test_short_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -135,7 +127,6 @@ Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder
 
 void
 Roundtrip_Handler::test_double_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -145,7 +136,6 @@ Roundtrip_Handler::test_double_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -162,7 +152,6 @@ Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holde
 
 void
 Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
 
@@ -172,7 +161,6 @@ Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time)
 
 void
 Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -190,13 +178,11 @@ Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *hol
 
 void
 Roundtrip_Handler::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index dd57789957a..fb0a1e593f8 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -29,48 +29,34 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods for test octet load
-  virtual void test_octet_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_octet_method (Test::Timestamp send_time);
 
-  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = The skeleton methods for test char load
-  virtual void test_char_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_char_method (Test::Timestamp send_time);
+  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = The skeleton methods for test long load
-  virtual void test_long_method  (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_long_method  (Test::Timestamp send_time);
+  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = The skeleton methods for test short load
-  virtual void test_short_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_short_method (Test::Timestamp send_time);
+  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = The skeleton methods for test longlong load
-  virtual void test_longlong_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_longlong_method (Test::Timestamp send_time);
+  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = The skeleton methods for test double load
-  virtual void test_double_method (Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_double_method (Test::Timestamp send_time);
+  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder);
 
   // = Other methods
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
   /// The number of callbacks not received yet
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 89303ea3f11..6915d091b77 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -374,7 +374,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
index f92e231ed00..1a15eea0763 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index b5adcb751a1..d4f879d4a6f 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -13,10 +13,10 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c
 
   exename = server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Roundtrip.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index dad3b3d2ffb..3af55faf3a8 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -54,14 +49,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index e9ed02ba785..d640b884d81 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -24,31 +24,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index b37083fb488..feaf07d47e0 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -404,7 +404,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
index 12be41c1cdd..617dca0571d 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index d3be007ed67..90a1e090de8 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -362,7 +362,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
index 506f78b7293..4371de1befd 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 375e7e0cc3b..54def5f5f87 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -13,10 +13,10 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c
 
   exename = server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Roundtrip.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index c5156625fa4..55185c7c4ba 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -54,14 +49,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index e9ed02ba785..d640b884d81 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -24,31 +24,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index f1b31f293b2..059462f9ca5 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -538,7 +538,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
index 24964c04bf1..a1164750785 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 4f212246188..b143d959c45 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -54,14 +49,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index e9ed02ba785..d640b884d81 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -24,31 +24,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index 985a3445ff0..44b78a1811b 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -357,7 +357,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index bf31e4009df..f6b95c7bada 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -90,8 +90,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index e05abeefaad..340b6d43819 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -53,14 +48,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index b6281d3324a..1d93a5f9f4e 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -23,31 +23,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
index 160d90fec3f..9e690719c57 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
@@ -11,9 +11,9 @@ project(*sequence_idl): taoidldefaults, strategies {
 project(*sequence server): taoserver, strategies {
   after += *sequence_idl
   Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    Roundtrip.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index f1db268f97e..28c149f47e5 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -99,7 +99,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index f91bf1958a2..c159645d6ab 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -90,8 +90,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index 0c20a36b87c..c8e7c26e294 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -13,7 +13,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -21,7 +20,6 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -29,7 +27,6 @@ Roundtrip::test_long_method (const Test::long_load &,
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -37,7 +34,6 @@ Roundtrip::test_char_method (const Test::char_load &,
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
                                  Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -45,7 +41,6 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
                                Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
@@ -53,14 +48,12 @@ Roundtrip::test_double_method (const Test::double_load &,
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
                               Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
 Roundtrip::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index b6281d3324a..1d93a5f9f4e 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -23,31 +23,24 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    Test::Timestamp send_time);
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     Test::Timestamp send_time);
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        Test::Timestamp send_time);
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      Test::Timestamp send_time);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
index df4e8aa4ae6..433de27a1d4 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
@@ -11,9 +11,9 @@ project(*sequence_idl): taoidldefaults, strategies {
 project(*sequence server): taoserver, strategies {
   after += *sequence_idl
   Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    Roundtrip.cpp
     Worker_Thread.cpp
     server.cpp
   }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index 1e3c055b2df..2b1286fafdf 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -99,7 +99,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 20d51c45845..6e48e7f464f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -91,8 +91,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (roundtrip.in ());
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 71850aaee22..a30a09ae62a 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -18,7 +18,6 @@ Receiver::Receiver (void)
 
 void
 Receiver::receive_data (const Test::Message &the_message)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   if (this->message_count_ == 0)
@@ -45,7 +44,6 @@ Receiver::receive_data (const Test::Message &the_message)
 
 void
 Receiver::done (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->message_count_ == 0)
     {
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index 322f3e39eb5..10b4b65544b 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -23,11 +23,9 @@ public:
   Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Message &message)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (const Test::Message &message);
 
-  virtual void done (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void done (void);
 
 private:
   /// The timestamp for the first message
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index f4dc0d95a4f..67d83c75843 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -13,7 +13,6 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 
 Test::Receiver_ptr
 Receiver_Factory::create_receiver (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Receiver *receiver_impl = 0;
   ACE_NEW_THROW_EX (receiver_impl,
@@ -21,12 +20,22 @@ Receiver_Factory::create_receiver (void)
                     CORBA::NO_MEMORY ());
   PortableServer::ServantBase_var transfer_ownership(receiver_impl);
 
-  return receiver_impl->_this ();
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (receiver_impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+  return Test::Receiver::_narrow (object.in ());
 }
 
 void
 Receiver_Factory::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index c49d4c2f902..ea8ec3ff2a9 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -22,11 +22,9 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Receiver_ptr create_receiver (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Keep a reference to the ORB in order to shutdown the app
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index ca5e5b74cac..e0baa06c094 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*server): taoserver, strategies {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Receiver_Factory.cpp
     Receiver.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 6a904e446f2..e55cbd3ba27 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 7876dc8e1ca..87ca6634d03 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (receiver_factory_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Receiver_Factory_var receiver_factory =
-        receiver_factory_impl->_this ();
+        Test::Receiver_Factory::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (receiver_factory.in ());
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 717f8092786..f134c20a9b3 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -11,18 +11,7 @@
 ####
 #### Required macros for TAO.
 ####
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-ifndef TAO_IDL
-  TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
-  TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT)
-else
-ifndef TAO_IDL_DEP
-  TAO_IDL_DEP = $(TAO_IDL)
-endif
-endif
+TAO_ROOT ?= $(ACE_ROOT)/TAO
 
 ifeq (,$(findstring -L$(TAO_ROOT)/tao,$(LDFLAGS)))
   LDFLAGS += -L$(TAO_ROOT)/tao
@@ -143,79 +132,6 @@ ifeq (1,$(CROSS-COMPILE))
 else
 endif # ! CROSS-COMPILE
 
-####
-#### Event Channel customization.
-####
-# Uncomment out the following line (or invoke make with
-# TAO_LACKS_EVENT_CHANNEL_ANY=1)
-# if you don't want support for anys in the Event Channel.
-# TAO_LACKS_EVENT_CHANNEL_ANY = 1
-ifneq ($(TAO_LACKS_EVENT_CHANNEL_ANY),)
-  override TAO_LACKS_EVENT_CHANNEL_ANY = -DTAO_LACKS_EVENT_CHANNEL_ANY
-endif
-
-# TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE = 1
-ifneq ($(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE),)
-  override TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE := \
- -DTAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE
-endif
-
-# TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS = 1
-ifneq ($(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS),)
-  override TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS := \
- -DTAO_LACKS_EVENT_CHANNEL_TIMESTAMPS
-endif
-
-# TAO_IDLFLAGS should include $TAO_ROOT by default
-VTAO_IDLFLAGS += $(TAO_IDLFLAGS) -I$(TAO_ROOT)
-VTAO_IDLFLAGS += \
-	$(TAO_LACKS_EVENT_CHANNEL_ANY) \
-	$(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \
-	$(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS)
-
-CPPFLAGS += \
-	$(TAO_LACKS_EVENT_CHANNEL_ANY) \
-	$(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \
-	$(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS)
-
-# MPC currently defines IDL_SRC in each generated Makefile, so don't redefine it in that case.
-ifndef IDL_SRC
-  IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext)))
-endif
-IDL_OBJS = $(IDL_SRC:%.cpp=%.$(OBJEXT))
-
-####
-#### Build rules.
-####
-IDL_EXT_MINUS=$(IDL_CLIENT_INL_EXT) $(IDL_CLIENT_SRC_EXT) \
-	$(IDL_SERVER_HDR_EXT) $(IDL_SERVER_INL_EXT) \
-	$(IDL_SERVER_SRC_EXT) $(IDL_SERVER_THDR_EXT) \
-	$(IDL_SERVER_TINL_EXT) $(IDL_SERVER_TSRC_EXT)
-IDL_EXT=$(IDL_CLIENT_HDR_EXT) $(IDL_EXT_MINUS)
-IDL_EXT2_MINUS=Cli.inl Cli.cpp Ser.h Ser.inl Ser.cpp Ser_T.h Ser_T.inl Ser_T.cpp
-IDL_EXT2=Cli.h $(IDL_EXT2_MINUS)
-
-# Don't remove the IDL stubs if make is interupted.
-.PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
-
-# This rule makes all the IDL stub files dependent on the client header
-# which has it's own rule below that invokes the idl compiler.
-$(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT)
-	@
-# Invoke the idl compiler to create the client header
-ifneq ($(tao_dont_use_idl_make_rule),1)
-%C.h: %.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(VTAO_IDLFLAGS) $<
-endif
-
-$(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h
-	@
-
-ifneq ($(tao_dont_use_idl_make_rule),1)
-%Cli.h: %.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(VTAO_IDLFLAGS) $<
-endif
-
 # Turn on symbol versioning. The scheme that we follow is to allow
 # applications dependent on libraries, with same version numbers (major,
 # minor and beta) to run, but applications with dependencies on libraries
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index f1b5d150049..a4791740fd4 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -1,20 +1,15 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Acceptor_Impl.cpp
-//
-// = AUTHOR
-//     Carlos O'Ryan <coryan@uci.edu>
-//     Ossama Othman <ossama@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Acceptor_Impl.cpp
+ *
+ *  $Id$
+ *
+ *  @author  Carlos O'Ryan <coryan@uci.edu>  Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ACCEPTOR_IMPL_CPP
 #define TAO_ACCEPTOR_IMPL_CPP
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index a813676ba0d..1b3480e4505 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -19,6 +19,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined(__ACE_INLINE__)
 #include "tao/Acceptor_Registry.inl"
@@ -132,12 +133,11 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
       // to create a default endpoint.
       && this->open_default (orb_core, reactor, 0) == -1)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INTERNAL (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   // Count the maximum number of endpoints in the set.  This will be
@@ -165,12 +165,11 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                           ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
             }
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       ++acceptor_count;  // We've got at least one acceptor so far.
@@ -253,12 +252,11 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                           ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
             }
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       const ACE_CString prefix (iop.substring (0, slot));
@@ -312,12 +310,11 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                       ACE_TEXT ("no usable transport protocol ")
                       ACE_TEXT ("was found.\n")));
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
 
@@ -400,6 +397,10 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                   ACE_INET_Addr addr(static_cast<unsigned short> (0)); // IPv4 ANY
 
                   TAO_IIOP_Acceptor* iiop_acceptor = dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
+
+                  if (!iiop_acceptor)
+                    return -1;
+
                   iiop_acceptor->set_default_address (addr);
 
                   if (this->open_default_i (orb_core,
@@ -438,6 +439,10 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                   addr.set (port, ACE_IPV6_ANY, AF_INET6); // IPv6 ANY on specified port
 
                   iiop_acceptor = dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
+ 
+                  if (!iiop_acceptor)
+                    return -1;
+
                   iiop_acceptor->set_default_address (addr);
 
                   if (this->open_default_i (orb_core,
@@ -733,6 +738,10 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                   ACE_INET_Addr addr(static_cast<unsigned short> (0)); // IPv4 ANY
 
                   TAO_IIOP_Acceptor* iiop_acceptor = dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
+
+                  if (!iiop_acceptor)
+                    return -1;
+
                   iiop_acceptor->set_default_address (addr);
 
                   if (this->open_default_i (orb_core,
@@ -762,17 +771,19 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                 ));
                             }
 
-                          ACE_THROW_RETURN (CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO),
-                            -1);
+                          throw ::CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO);
                         }
 
                       addr.set (port, ACE_IPV6_ANY, AF_INET6); // IPv6 ANY on specified port
 
                       iiop_acceptor = dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
+                      if (!iiop_acceptor)
+                        return -1;
+
                       iiop_acceptor->set_default_address (addr);
 
                       if (this->open_default_i (orb_core,
@@ -804,12 +815,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
 
               // Could not open a default endpoint, nor an explicit
               // one.
-              ACE_THROW_RETURN (CORBA::INTERNAL (
-                  CORBA::SystemException::_tao_minor_code (
-                    TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                    0),
-                  CORBA::COMPLETED_NO),
-                -1);
+              throw ::CORBA::INTERNAL (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+                  0),
+                CORBA::COMPLETED_NO);
 #else /* ACE_WIN32 && ACE_HAS_IPV6 */
               if (this->open_default_i (orb_core,
                                         reactor,
@@ -824,12 +834,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
               // one.
               else
                 {
-                  ACE_THROW_RETURN (CORBA::INTERNAL (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                        0),
-                      CORBA::COMPLETED_NO),
-                    -1);
+                  throw ::CORBA::INTERNAL (
+                    CORBA::SystemException::_tao_minor_code (
+                      TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+                      0),
+                    CORBA::COMPLETED_NO);
                 }
 #endif /* !ACE_WIN32 || !ACE_HAS_IPV6 */
             }
@@ -856,12 +865,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                               ACE_TEXT ("")));
                 }
 
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                  CORBA::SystemException::_tao_minor_code (
-                    TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                    errno_value),
-                  CORBA::COMPLETED_NO),
-                -1);
+              throw ::CORBA::BAD_PARAM (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+                  errno_value),
+                CORBA::COMPLETED_NO);
             }
 
           // add acceptor to list
@@ -877,12 +885,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                           ACE_TEXT_CHAR_TO_TCHAR (address.c_str ())));
             }
 
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                ENOMEM),
-              CORBA::COMPLETED_NO),
-            -1);
+          throw ::CORBA::NO_MEMORY (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              ENOMEM),
+            CORBA::COMPLETED_NO);
         }
     }
   while (astr != 0 && (astr = ACE_OS::strtok_r (0, ",", &last_addr)) != 0);
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 25eb2828608..7f610091e1b 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -15,13 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "tao/CORBA_methods.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 34fb70d6e0e..b927960ae3c 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            Adapter_Registry,
@@ -44,7 +45,7 @@ TAO_Adapter_Registry::close (int wait_for_completion)
           this->adapters_[i]->close (wait_for_completion);
         }
     }
-  catch (::CORBA::Exception&ex)
+  catch (const::CORBA::Exception &ex)
     {
       if (TAO_debug_level > 3)
         {
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index 8dde72b3288..d6d35bbabf1 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -19,14 +19,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/CORBA_methods.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index ee9de863444..52fecbd4e45 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -11,6 +11,7 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/TypeCode_Traits.h"
 
 #include "ace/Dynamic_Service.h"
@@ -82,20 +83,17 @@ template<typename StringType,
 CORBA::Boolean
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ) const
+                     RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc) const
 {
   // The CORBA::TypeCode base class already verified equality of the
   // base attributes (id and name).  Perform an equality comparison of
   // the content.
 
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type ();
+  CORBA::TypeCode_var rhs_content_type = tc->content_type ();
 
   return
     Traits<StringType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-     );
+      rhs_content_type.in ());
 }
 
 template<typename StringType,
@@ -104,9 +102,7 @@ template<typename StringType,
 CORBA::Boolean
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ) const
+                     RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -129,28 +125,24 @@ TAO::TypeCode::Alias<StringType,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INITIALIZE ();
     }
 
   CORBA::TypeCode_var compact_content_type =
     Traits<StringType>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        );
+      this->content_type_)->get_compact_typecode ();
 
   if (this->kind_ == CORBA::tk_alias)
     {
       return adapter->create_alias_tc (this->attributes_.id (),
                                        "",  /* empty name */
-                                       compact_content_type.in ()
-                                      );
+                                       compact_content_type.in ());
     }
   else
     {
       return adapter->create_value_box_tc (this->attributes_.id (),
                                            "",  /* empty name */
-                                           compact_content_type.in ()
-                                          );
+                                           compact_content_type.in ());
     }
 }
 
@@ -160,8 +152,7 @@ template<typename StringType,
 char const *
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::id_i (
-  void) const
+                     RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -174,8 +165,7 @@ template<typename StringType,
 char const *
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::name_i (
-  void) const
+                     RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -188,8 +178,7 @@ template<typename StringType,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::content_type_i (
-  void) const
+                     RefCountPolicy>::content_type_i (void) const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index a2db7f4602c..8c80bcb81d3 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -11,10 +11,10 @@
 #include "tao/ORB_Core.h"
 #include "tao/CDR.h"
 #include "tao/TypeCodeFactory_Adapter.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 
-
 ACE_RCSID (AnyTypeCode,
            Alias_TypeCode_Static,
            "$Id$")
@@ -80,8 +80,7 @@ TAO::TypeCode::Alias<char const *,
   // base attributes (id and name).  Perform an equality comparison of
   // the content.
 
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type ();
+  CORBA::TypeCode_var rhs_content_type = tc->content_type ();
 
   return
     Traits<char const *>::get_typecode (this->content_type_)->equal (
@@ -113,21 +112,18 @@ TAO::TypeCode::Alias<char const *,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INITIALIZE ();
     }
 
   CORBA::TypeCode_var compact_content_type =
     Traits<char const *>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        );
+      this->content_type_)->get_compact_typecode ();
 
   if (this->kind_ == CORBA::tk_alias)
     {
       return adapter->create_alias_tc (this->attributes_.id (),
                                        "",  /* empty name */
-                                       compact_content_type.in ()
-                                      );
+                                       compact_content_type.in ());
     }
   else
     {
@@ -160,8 +156,7 @@ TAO::TypeCode::Alias<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (
-  void) const
+                     TAO::Null_RefCount_Policy>::content_type_i (void) const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index 709c11039d8..141c34a743b 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -70,8 +70,7 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
+      virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
       virtual void tao_duplicate (void);
       virtual void tao_release (void);
       //@}
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 0b4aad913f8..70fd98483ee 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -8,8 +8,8 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
@@ -139,9 +139,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc
 
   if (this->impl_ != 0)
     {
-      equiv =
-        this->impl_->_tao_get_typecode ()->equivalent (tc
-                                                      );
+      equiv = this->impl_->_tao_get_typecode ()->equivalent (tc);
     }
 
   if (equiv)
@@ -199,9 +197,7 @@ CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
 }
 
 CORBA::Boolean
-CORBA::Any::checked_to_abstract_base (
-    CORBA::AbstractBase_ptr &_tao_elem
-  ) const
+CORBA::Any::checked_to_abstract_base (CORBA::AbstractBase_ptr &_tao_elem) const
 {
   if (this->impl_ == 0)
     {
@@ -287,7 +283,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
       impl->_tao_decode (cdr
                         );
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       return false;
     }
@@ -302,33 +298,25 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
 void
 CORBA::Any::operator<<= (CORBA::Any::from_boolean b)
 {
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_boolean,
-                               &b.val_);
+  TAO::Any_Basic_Impl::insert (*this, CORBA::_tc_boolean, &b.val_);
 }
 
 void
 CORBA::Any::operator<<= (CORBA::Any::from_octet o)
 {
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_octet,
-                               &o.val_);
+  TAO::Any_Basic_Impl::insert (*this, CORBA::_tc_octet, &o.val_);
 }
 
 void
 CORBA::Any::operator<<= (CORBA::Any::from_char c)
 {
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_char,
-                               &c.val_);
+  TAO::Any_Basic_Impl::insert (*this, CORBA::_tc_char, &c.val_);
 }
 
 void
 CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
 {
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_wchar,
-                               &wc.val_);
+  TAO::Any_Basic_Impl::insert (*this, CORBA::_tc_wchar, &wc.val_);
 }
 
 void
@@ -374,73 +362,55 @@ CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
 void
 operator<<= (CORBA::Any &any, CORBA::Short s)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_short,
-                               &s);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_short, &s);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::UShort us)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ushort,
-                               &us);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_ushort, &us);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::Long l)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_long,
-                               &l);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_long, &l);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::ULong ul)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulong,
-                               &ul);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_ulong, &ul);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::LongLong ll)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longlong,
-                               &ll);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_longlong, &ll);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::ULongLong ull)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulonglong,
-                               &ull);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_ulonglong, &ull);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::Float f)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_float,
-                               &f);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_float, &f);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::Double d)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_double,
-                               &d);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_double, &d);
 }
 
 void
 operator<<= (CORBA::Any &any, CORBA::LongDouble ld)
 {
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longdouble,
-                               &ld);
+  TAO::Any_Basic_Impl::insert (any, CORBA::_tc_longdouble, &ld);
 }
 
 // Insertion of Any - copying.
@@ -507,7 +477,7 @@ operator<<= (CORBA::Any &any, CORBA::Object_ptr *objptr)
 }
 
 // These are copying versions for unbounded (w)strings. They are not inlined,
-// to avoid use in Any.i before definition in ORB.i.
+// to avoid use in Any.inl before definition in ORB.inl.
 
 void
 operator<<= (CORBA::Any &any, const char *s)
@@ -546,33 +516,25 @@ operator<<= (CORBA::Any &any, const CORBA::WChar *ws)
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_boolean b) const
 {
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_boolean,
-                                       &b.ref_);
+  return TAO::Any_Basic_Impl::extract (*this, CORBA::_tc_boolean, &b.ref_);
 }
 
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
 {
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_octet,
-                                       &o.ref_);
+  return TAO::Any_Basic_Impl::extract (*this, CORBA::_tc_octet, &o.ref_);
 }
 
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_char c) const
 {
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_char,
-                                       &c.ref_);
+  return TAO::Any_Basic_Impl::extract (*this, CORBA::_tc_char, &c.ref_);
 }
 
 CORBA::Boolean
 CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
 {
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_wchar,
-                                       &wc.ref_);
+  return TAO::Any_Basic_Impl::extract (*this, CORBA::_tc_wchar, &wc.ref_);
 }
 
 CORBA::Boolean
@@ -628,9 +590,7 @@ CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::Short &s)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_short,
-                                       &s);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_short, &s);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 27ff8682aa1..1b745ab3c2e 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -28,7 +28,6 @@
 #include "tao/Object.h"
 
 #include "ace/CDR_Stream.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 4a8c57146cf..d4974745cca 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -11,7 +11,6 @@
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
@@ -121,7 +120,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 35e375ce4df..2084f935aa1 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -101,7 +101,7 @@ namespace TAO
     try
       {
         CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-        CORBA::Boolean _tao_equiv =
+        CORBA::Boolean const _tao_equiv =
           any_tc->equivalent (tc);
 
         if (!_tao_equiv)
@@ -109,11 +109,11 @@ namespace TAO
             return false;
           }
 
-        TAO::Any_Impl *impl = any.impl ();
+        TAO::Any_Impl * const impl = any.impl ();
 
-        if (!impl->encoded ())
+        if (impl && !impl->encoded ())
           {
-            TAO::Any_Basic_Impl *narrow_impl =
+            TAO::Any_Basic_Impl * const narrow_impl =
               dynamic_cast<TAO::Any_Basic_Impl *> (impl);
 
             if (narrow_impl == 0)
@@ -131,9 +131,12 @@ namespace TAO
         auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
 
         // We know this will work since the unencoded case is covered above.
-        TAO::Unknown_IDL_Type *unk =
+        TAO::Unknown_IDL_Type * const unk =
           dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+        if (!unk)
+          return false;
+
         // Get the kind of the type where we are extracting in ie. the
         // aliased  type if there are any. Passing the aliased kind
         // will not help.
@@ -160,7 +163,7 @@ namespace TAO
         // Duplicated by Any_Impl base class constructor.
         ::CORBA::release (any_tc);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
       }
 
@@ -170,7 +173,7 @@ namespace TAO
   CORBA::Boolean
   Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr)
   {
-    CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_);
+    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (this->kind_);
 
     switch (tckind)
     {
@@ -203,7 +206,7 @@ namespace TAO
       case CORBA::tk_wchar:
         return cdr << CORBA::Any::from_wchar (this->u_.wc);
       default:
-        return 0;
+        return false;
     }
   }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index ca85a402171..185d8915034 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -7,11 +7,9 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/Marshal.h"
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/CDR.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
@@ -57,18 +55,17 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
       CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
-
       if (_tao_equiv == false)
         {
           return false;
         }
 
-      TAO::Any_Impl *impl = any.impl ();
+      TAO::Any_Impl * const impl = any.impl ();
 
-      if (!impl->encoded ())
+      if (impl && !impl->encoded ())
         {
-          TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
+          TAO::Any_Basic_Impl_T<T> * const narrow_impl =
+            dynamic_cast<TAO::Any_Basic_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
             {
@@ -79,15 +76,18 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
           return true;
         }
 
-      TAO::Any_Basic_Impl_T<T> *replacement =
+      TAO::Any_Basic_Impl_T<T> * const replacement =
         TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
 
       auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        return false;
+
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -106,7 +106,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 4fe6c209652..e43cfaffc26 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -8,12 +8,10 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/CORBA_String.h"
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_Memory.h"
 
@@ -104,18 +102,18 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
   try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc);
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == false)
         {
           return false;
         }
 
-      TAO::Any_Impl *impl = any.impl ();
+      TAO::Any_Impl * const impl = any.impl ();
 
-      if (!impl->encoded ())
+      if (impl && !impl->encoded ())
         {
-          TAO::Any_Dual_Impl_T<T> *narrow_impl =
+          TAO::Any_Dual_Impl_T<T> * const narrow_impl =
             dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
@@ -141,9 +139,12 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
       auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        return false;
+
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -162,7 +163,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h
index 71c8824e7d0..8ff7ec17394 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl.h
@@ -15,16 +15,15 @@
 #define TAO_ANY_IMPL_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
-
 #include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
 
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index b42955f5e91..b6ac3bd2724 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -7,11 +7,9 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/SystemException.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_Memory.h"
 
@@ -63,18 +61,18 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
   try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc);
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == 0)
         {
           return false;
         }
 
-      TAO::Any_Impl *impl = any.impl ();
+      TAO::Any_Impl * const impl = any.impl ();
 
-      if (!impl->encoded ())
+      if (impl && !impl->encoded ())
         {
-          TAO::Any_Impl_T<T> *narrow_impl =
+          TAO::Any_Impl_T<T> * const narrow_impl =
             dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
@@ -96,9 +94,12 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
       auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        return false;
+
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -117,25 +118,25 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
-  return 0;
+  return false;
 }
 
 template<typename T>
 CORBA::Boolean
 TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
 {
-  return 0;
+  return false;
 }
 
 template<typename T>
 CORBA::Boolean
 TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
 {
-  return 0;
+  return false;
 }
 
 template<typename T>
@@ -143,7 +144,7 @@ template<typename T>
 CORBA::Boolean
 TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
 {
-  return 0;
+  return false;
 }
 
 template<typename T>
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index e901e61fe3f..05dbc43b377 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -6,11 +6,9 @@
 #include "tao/AnyTypeCode/Any_Special_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/Marshal.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/String_TypeCode_Traits.h"
 
-#include "ace/CORBA_macros.h"
-
 #if !defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Special_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -90,31 +88,31 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
         TAO::unaliased_typecode (any_type
                                 );
 
-      CORBA::TCKind any_kind =
+      CORBA::TCKind const any_kind =
         unaliased_any_type->kind ();
 
-      CORBA::TCKind try_kind = tc->kind ();
+      CORBA::TCKind const try_kind = tc->kind ();
 
       if (any_kind != try_kind)
         {
           return false;
         }
 
-      CORBA::ULong length = unaliased_any_type->length ();
+      CORBA::ULong const length = unaliased_any_type->length ();
 
       if (length != bound)
         {
           return false;
         }
 
-      TAO::Any_Impl *impl = any.impl ();
+      TAO::Any_Impl * const impl = any.impl ();
 
       typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
         BOUNDED_TSTRING_ANY_IMPL;
 
-      if (!impl->encoded ())
+      if (impl && !impl->encoded ())
         {
-          TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
+          TAO::Any_Special_Impl_T<T, from_T, to_T> * const narrow_impl =
             dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
 
           if (narrow_impl == 0)
@@ -139,9 +137,12 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
         );
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        return false;
+
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -160,11 +161,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (tc);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
-  return 0;
+  return false;
 }
 
 template<typename T, typename from_T, typename to_T>
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index 820e411234e..ef44c4ff664 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -8,13 +8,10 @@
 
 #include "tao/CDR.h"
 #include "tao/Exception.h"
-#include "tao/Environment.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
 
 #include "ace/Auto_Ptr.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
 
 ACE_RCSID (AnyTypeCode,
            Any_SystemException,
@@ -127,9 +124,12 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
       auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        return false;
+
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -145,11 +145,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
           return true;
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
-  return 0;
+  return false;
 }
 
 void
@@ -161,6 +161,7 @@ TAO::Any_SystemException::free_value (void)
       this->value_destructor_ = 0;
     }
 
+  ::CORBA::release (this->type_);
   this->value_ = 0;
 }
 
@@ -178,7 +179,7 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
       this->value_->_tao_encode (cdr);
       return true;
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
   return false;
@@ -192,7 +193,7 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
       this->value_->_tao_decode (cdr);
       return true;
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
   return false;
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index fbf786b3232..6bfbe5b71ad 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -35,7 +35,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (
     {
       this->_tao_decode (cdr);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 }
@@ -61,7 +61,7 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (this->cdr_);
 
-      TAO::traverse_status status =
+      TAO::traverse_status const status =
         TAO_Marshal_Object::perform_append (this->type_,
                                             &for_reading,
                                             &cdr);
@@ -71,7 +71,7 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
           return false;
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       return false;
     }
@@ -145,9 +145,7 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr)
   new_mb.rd_ptr (offset);
   new_mb.wr_ptr (offset + size);
 
-  ACE_OS::memcpy (new_mb.rd_ptr (),
-                  begin,
-                  size);
+  ACE_OS::memcpy (new_mb.rd_ptr (), begin, size);
 
   this->cdr_.reset (&new_mb, cdr.byte_order ());
   this->cdr_.char_translator (cdr.char_translator ());
@@ -166,11 +164,9 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
 {
   try
     {
-      CORBA::ULong kind =
-        this->type_->kind ();
+      CORBA::ULong kind = this->type_->kind ();
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
+      CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_);
 
       while (kind == CORBA::tk_alias)
         {
@@ -190,7 +186,7 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
 
       return for_reading >> obj;
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
@@ -218,7 +214,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
           return false;
         }
 
-    TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
       if (orb_core == 0)
         {
           orb_core = TAO_ORB_Core_instance ();
@@ -234,7 +230,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
       TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_value (this->cdr_, val);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
@@ -278,7 +274,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
       TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_abstract_base (this->cdr_, obj);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 4660b359253..85ef4a595f1 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -15,8 +15,7 @@ ACE_RCSID (AnyTypeCode,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
-TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
-                                         CORBA::ULong) const
+TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const
 {
   // Empty parameter list.  Nothing to marshal.
 
@@ -40,8 +39,7 @@ TAO::TypeCode::Empty_Param::tao_release (void)
 }
 
 CORBA::Boolean
-TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
-                                     ) const
+TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -50,8 +48,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
 }
 
 CORBA::Boolean
-TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
-                                          ) const
+TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const
 {
   // We could refactor this code to the CORBA::TypeCode::equivalent()
   // method but doing so would force us to determine the unaliased
@@ -59,9 +56,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
   // of this TypeCode, choose to optimize away the additional kind
   // unaliasing operation rather than save space.
 
-  CORBA::TCKind const tc_kind =
-    TAO::unaliased_kind (tc
-                        );
+  CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc);
 
   if (tc_kind != this->kind_)
     return false;
@@ -70,8 +65,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (
-  void) const
+TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const
 {
   // Already compact since parameter list is empty.
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index a1030c33e3c..00bbd2c3474 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -158,8 +158,7 @@ TAO::TypeCode::Enum<StringType,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -211,7 +210,7 @@ TAO::TypeCode::Enum<StringType,
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<StringType>::get_string (this->enumerators_[index]);
 }
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index e4879dad9cc..005de662c30 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -5,6 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/CDR.h"
 #include "tao/TypeCodeFactory_Adapter.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -153,8 +154,7 @@ TAO::TypeCode::Enum<char const *,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -206,7 +206,7 @@ TAO::TypeCode::Enum<char const *,
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<char const *>::get_string (this->enumerators_[index]);
 }
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index 1b1f7645411..c2401c10a9b 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -3,7 +3,6 @@
 #include "tao/AnyTypeCode/ExceptionA.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_String.h"
 #include "tao/CDR.h"
@@ -40,12 +39,11 @@ namespace TAO
   {
     try
       {
-        this->value_->_tao_encode (cdr
-                                  );
+        this->value_->_tao_encode (cdr);
 
         return true;
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
       }
 
@@ -63,7 +61,7 @@ namespace TAO
 
         return true;
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
       }
 
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h
index 2b735a03bd7..61156287d71 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.h
+++ b/TAO/tao/AnyTypeCode/ExceptionA.h
@@ -25,9 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is used in the implementation of the _raise methods
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Exception.h"
 
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index 04880329ccf..54f67e17f9c 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -42,16 +42,13 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
 
 template <class RefCountPolicy>
 CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ) const
+TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc) const
 {
   // The following call won't throw since CORBA::TypeCode::equal() has
   // already established the kind of tc is the same as our kind.
-  CORBA::UShort const tc_digits =
-    tc->fixed_digits ();
+  CORBA::UShort const tc_digits = tc->fixed_digits ();
 
-  CORBA::UShort const tc_scale =
-    tc->fixed_scale ();
+  CORBA::UShort const tc_scale = tc->fixed_scale ();
 
   return (this->digits_ == tc_digits
           && this->scale_ == tc_scale);
@@ -59,20 +56,17 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
 
 template <class RefCountPolicy>
 CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                    ) const
+TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) const
 {
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_fixed TypeCodes.
-  return this->equal_i (tc
-                       );
+  return this->equal_i (tc);
 }
 
 template <class RefCountPolicy>
 CORBA::TypeCode_ptr
-TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
-  void) const
+TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const
 {
   // Already compact since tk_fixed TypeCodes have no name or member
   // names, meaning that we can simply call _duplicate() on this
@@ -92,16 +86,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
 
 template <class RefCountPolicy>
 CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (
-  void) const
+TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (void) const
 {
   return this->digits_;
 }
 
 template <class RefCountPolicy>
 CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
-  void) const
+TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (void) const
 {
   return this->scale_;
 }
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index c70c5ff0ed5..8572d7b42fd 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -58,8 +58,7 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
+      virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
       virtual void tao_duplicate (void);
       virtual void tao_release (void);
       //@}
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index 2f777c06be7..ca5c7b2dfc1 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -32,9 +32,7 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void)
 }
 
 TAO::traverse_status
-TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
-                                  TAO_InputCDR *stream
-                                  )
+TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream)
 {
   CORBA::ULong const kind = tc->kind ();
 
@@ -143,8 +141,7 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
 TAO::traverse_status
 TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
                                     TAO_InputCDR *src,
-                                    TAO_OutputCDR *dest
-                                    )
+                                    TAO_OutputCDR *dest)
 {
   CORBA::ULong kind = tc->kind ();
 
diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h
index 74de6bf2185..0e098b07199 100644
--- a/TAO/tao/AnyTypeCode/Marshal.h
+++ b/TAO/tao/AnyTypeCode/Marshal.h
@@ -18,14 +18,14 @@
 #define TAO_MARSHAL_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
-#include "tao/Basic_Types.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -149,7 +149,7 @@ public:
 };
 
 /**
- * @class TAO_Marshal_TypeCode:
+ * @class TAO_Marshal_TypeCode
  *
  * @brief TAO_Marshal_TypeCode
  *
@@ -162,18 +162,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Principal:
+ * @class TAO_Marshal_Principal
  *
  * @brief TAO_Marshal_Principal
  *
@@ -186,18 +184,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_ObjRef:
+ * @class TAO_Marshal_ObjRef
  *
  * @brief TAO_Marshal_ObjRef
  *
@@ -210,42 +206,38 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Struct:
+ * @class TAO_Marshal_Struct
  *
  * @brief TAO_Marshal_Struct
  *
  * marshal a struct
  */
-class TAO_AnyTypeCode_Export TAO_Marshal_Struct: public TAO_Marshal_Object
+class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object
 {
 public:
   TAO_Marshal_Struct (void);
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Union:
+ * @class TAO_Marshal_Union
  *
  * @brief TAO_Marshal_Union
  *
@@ -258,18 +250,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_String:
+ * @class TAO_Marshal_String
  *
  * @brief TAO_Marshal_String
  *
@@ -282,18 +272,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Sequence:
+ * @class TAO_Marshal_Sequence
  *
  * @brief TAO_Marshal_Sequence
  *
@@ -306,18 +294,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Array:
+ * @class TAO_Marshal_Array
  *
  * @brief TAO_Marshal_Array
  *
@@ -330,18 +316,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Alias:
+ * @class TAO_Marshal_Alias
  *
  * @brief TAO_Marshal_Alias
  *
@@ -354,18 +338,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Except:
+ * @class TAO_Marshal_Except
  *
  * @brief TAO_Marshal_Except
  *
@@ -378,14 +360,12 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
@@ -402,18 +382,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Value:
+ * @class TAO_Marshal_Value
  *
  * @brief TAO_Marshal_Value
  *
@@ -426,14 +404,12 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                    );
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                      );
+                                       TAO_OutputCDR *dest);
 
 private:
   CORBA::Boolean nested_processing_;
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 90c42779410..5067c9fe907 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -9,13 +9,14 @@
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 
-#include "tao/SystemException.h"
 #include "tao/CORBA_String.h"
 #include "tao/CDR.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/NVList.inl"
@@ -95,23 +96,18 @@ CORBA::NVList::~NVList (void)
 
 // add an element and just initialize its flags
 CORBA::NamedValue_ptr
-CORBA::NVList::add (CORBA::Flags flags
-                    )
+CORBA::NVList::add (CORBA::Flags flags)
 {
   // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags
-                           );
+  return this->add_element (flags);
 }
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
-CORBA::NVList::add_item (const char *name,
-                         CORBA::Flags flags
-                         )
+CORBA::NVList::add_item (const char *name, CORBA::Flags flags)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                               );
+  CORBA::NamedValue_ptr nv = this->add_element (flags);
 
   if (nv)
     {
@@ -129,12 +125,10 @@ CORBA::NVList::add_item (const char *name,
 CORBA::NamedValue_ptr
 CORBA::NVList::add_value (const char *name,
                           const CORBA::Any &value,
-                          CORBA::Flags flags
-                          )
+                          CORBA::Flags flags)
 {
   // Call the helper to allocate a NamedValue element.
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                               );
+  CORBA::NamedValue_ptr nv = this->add_element (flags);
 
   if (nv)
     {
@@ -157,9 +151,7 @@ CORBA::NVList::add_value (const char *name,
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
-CORBA::NVList::add_item_consume (char *name,
-                                 CORBA::Flags flags
-                                 )
+CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags)
 {
 
   // call the helper to allocate a NamedValue element
@@ -228,8 +220,7 @@ CORBA::NVList::add_element (CORBA::Flags flags
   if (ACE_BIT_DISABLED (flags,
                         CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::NamedValue::_nil ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   CORBA::NamedValue_ptr nv;
@@ -261,8 +252,7 @@ CORBA::NVList::item (CORBA::ULong n
 
   if (n >= this->max_)
     {
-      ACE_THROW_RETURN (CORBA::Bounds (),
-                        CORBA::NamedValue::_nil ());
+      throw ::CORBA::Bounds ();
     }
 
   CORBA::NamedValue_ptr *nv = 0;
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index 9b6e212c11f..f5cc31072ba 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -16,7 +16,8 @@
 #define TAO_NVLIST_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "ace/Unbounded_Queue.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +27,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/NVList_Adapter_Impl.h"
 
-#include "tao/Environment.h"
-
 #include "ace/Unbounded_Queue.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 094c4c43d94..76ad1e75852 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -8,14 +8,14 @@ ACE_RCSID (AnyTypeCode,
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_NVList_Adapter_Impl::create_list (
       CORBA::Long count,
-      CORBA::NVList_ptr &new_list
-      )
+      CORBA::NVList_ptr &new_list)
 {
   ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
   // Create an empty list
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index 33ff55b2fff..d0b35721fe7 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -55,8 +55,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
 template <typename StringType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ) const
+  CORBA::TypeCode_ptr /* tc */) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -67,8 +66,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
 template <typename StringType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ) const
+  CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -79,8 +77,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
 template <typename StringType, class RefCountPolicy>
 CORBA::TypeCode_ptr
 TAO::TypeCode::Objref<StringType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  void) const
+                      RefCountPolicy>::get_compact_typecode_i (void) const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -89,53 +86,45 @@ TAO::TypeCode::Objref<StringType,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   if (this->kind_ == CORBA::tk_abstract_interface)
     {
       return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                   );
+                                                    ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_component)
     {
       return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                          );
+                                           ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_home)
     {
       return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                     );
+                                      ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_local_interface)
     {
       return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                );
+                                                 ""  /* empty name */);
 
     }
   else if (this->kind_ == CORBA::tk_native)
     {
       return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                       );
+                                        ""  /* empty name */);
     }
   else // CORBA::tk_objref
     {
       return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                          );
+                                           ""  /* empty name */);
     }
 }
 
 template <typename StringType, class RefCountPolicy>
 char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
-  void) const
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -144,8 +133,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
 
 template <typename StringType, class RefCountPolicy>
 char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
-  void) const
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index e202799ce7a..179d6a684a9 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -9,6 +9,7 @@
 #include "tao/CDR.h"
 #include "tao/TypeCodeFactory_Adapter.h"
 #include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -55,8 +56,7 @@ TAO::TypeCode::Objref<char const *,
 
 CORBA::Boolean
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ) const
+  CORBA::TypeCode_ptr /* tc */) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -66,8 +66,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
 
 CORBA::Boolean
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ) const
+  CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -87,46 +86,39 @@ TAO::TypeCode::Objref<char const *,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   if (this->kind_ == CORBA::tk_abstract_interface)
     {
       return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                   );
+                                                    ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_component)
     {
       return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                          );
+                                           ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_home)
     {
       return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                     );
+                                      ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_local_interface)
     {
       return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                );
+                                                 ""  /* empty name */);
 
     }
   else if (this->kind_ == CORBA::tk_native)
     {
       return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                       );
+                                        ""  /* empty name */);
     }
   else // CORBA::tk_objref
     {
       return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                          );
+                                           ""  /* empty name */);
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp
index 9b177c88bca..8e157d6aeba 100644
--- a/TAO/tao/AnyTypeCode/PolicyA.cpp
+++ b/TAO/tao/AnyTypeCode/PolicyA.cpp
@@ -196,7 +196,7 @@ namespace TAO
       {
         this->value_->_tao_decode (cdr);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
@@ -282,7 +282,7 @@ namespace TAO
       {
         this->value_->_tao_decode (cdr);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index e35d3bad781..d7df0270792 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -57,8 +57,7 @@ CORBA::Boolean
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -76,8 +75,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       // Only reset the recursion flag at the top-level.
       Reset flag (this->in_recursion_);
 
-      return this->TypeCodeBase::equal_i (tc
-                                         );
+      return this->TypeCodeBase::equal_i (tc);
     }
 
   // Nothing else to do.
@@ -89,8 +87,7 @@ CORBA::Boolean
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -108,8 +105,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       // Only reset the recursion flag at the top-level.
       Reset flag (this->in_recursion_);
 
-      return this->TypeCodeBase::equivalent_i (tc
-                                              );
+      return this->TypeCodeBase::equivalent_i (tc);
     }
 
   // Nothing else to do.
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index a1ad3a2f0db..3ce4d621e8c 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -121,13 +121,10 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
       //@}
 
-
     public:
 
       /// Set @c struct @c TypeCode parameters.
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index ab5af126c49..ff2b2db4bac 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -71,7 +71,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
   CORBA::ULong const tc_length = tc->length ();
 
   if (this->length_ != tc_length)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var rhs_content_type =
     tc->content_type ();
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 1fdaf50c6d8..0ce4bfdf600 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -2,6 +2,7 @@
 
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/String_TypeCode_Static.inl"
@@ -41,8 +42,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
 
 CORBA::Boolean
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // The following call won't throw since CORBA::TypeCode::equal() has
   // already established the kind of tc is the same as our kind.
@@ -59,8 +59,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                       );
+  return this->equal_i (tc);
 }
 
 CORBA::TypeCode_ptr
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
index 670e6a835ba..2b921ddc93a 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
@@ -45,7 +45,7 @@ namespace TAO
       {
         typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
 
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+        CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
         ACE_NEW_RETURN (tc,
                         typecode_type (kind, bound),
                         tc);
@@ -62,7 +62,7 @@ namespace TAO
       {
         typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
 
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+        CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
         ACE_NEW_RETURN (tc,
                         typecode_type (kind, bound),
                         tc);
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index ba7d3ad20a4..b299ab6947b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -111,9 +111,7 @@ CORBA::Boolean
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+                      RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
@@ -132,8 +130,7 @@ TAO::TypeCode::Struct<StringType,
 
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                    );
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -141,12 +138,10 @@ TAO::TypeCode::Struct<StringType,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                      );
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -164,8 +159,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
@@ -181,12 +175,10 @@ TAO::TypeCode::Struct<StringType,
       CORBA::TypeCode_ptr const lhs =
         Traits<StringType>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                        );
+        lhs->equivalent (rhs.in ());
 
       if (!equiv_members)
         return false;
@@ -225,8 +217,7 @@ TAO::TypeCode::Struct<StringType,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
         }
     }
 
@@ -236,8 +227,7 @@ TAO::TypeCode::Struct<StringType,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -245,8 +235,7 @@ TAO::TypeCode::Struct<StringType,
                                       this->base_attributes_.id (),
                                       ""  /* empty name */,
                                       tc_fields,
-                                      this->nfields_
-                                     );
+                                      this->nfields_);
 }
 
 template <typename StringType,
@@ -257,8 +246,7 @@ char const *
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::id_i (
-  void) const
+                      RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -273,8 +261,7 @@ char const *
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::name_i (
-  void) const
+                      RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -289,8 +276,7 @@ CORBA::ULong
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::member_count_i (
-  void) const
+                      RefCountPolicy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -304,13 +290,12 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<StringType>::get_string (this->fields_[index].name);
 }
@@ -324,12 +309,10 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 3881586b117..16405c3747b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -62,8 +62,7 @@ namespace TAO
               CORBA::ULong nfields);
 
       /// Constructor used for recursive TypeCodes.
-      Struct (CORBA::TCKind kind,
-              char const * id);
+      Struct (CORBA::TCKind kind, char const * id);
 
       /**
        * @name TAO-specific @c CORBA::TypeCode Methods
@@ -91,19 +90,14 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        void) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
       virtual char const * id_i (void) const;
       virtual char const * name_i (void) const;
       virtual CORBA::ULong member_count_i (void) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ) const;
+      virtual char const * member_name_i (CORBA::ULong index) const;
+      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 2b899defcbd..028e5f5571b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -6,7 +6,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/TypeCodeFactory_Adapter.h"
 #include "tao/CDR.h"
-
+#include "tao/SystemException.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl"
@@ -106,8 +106,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
@@ -135,12 +134,10 @@ TAO::TypeCode::Struct<char const *,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<char const *>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                      );
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -155,8 +152,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
@@ -172,12 +168,10 @@ TAO::TypeCode::Struct<char const *,
       CORBA::TypeCode_ptr const lhs =
         Traits<char const *>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                        );
+        lhs->equivalent (rhs.in ());
 
       if (!equiv_members)
         return false;
@@ -213,8 +207,7 @@ TAO::TypeCode::Struct<char const *,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
         }
     }
 
@@ -224,8 +217,7 @@ TAO::TypeCode::Struct<char const *,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -233,8 +225,7 @@ TAO::TypeCode::Struct<char const *,
                                       this->base_attributes_.id (),
                                       ""  /* empty name */,
                                       tc_fields,
-                                      this->nfields_
-                                     );
+                                      this->nfields_);
 }
 
 char const *
@@ -255,8 +246,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (
-  void) const
+                      TAO::Null_RefCount_Policy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -268,8 +258,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (
-  void) const
+                      TAO::Null_RefCount_Policy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -280,13 +269,12 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<char const *>::get_string (this->fields_[index].name);
 }
@@ -297,12 +285,10 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index b2b4f0d92ec..aa968acc6bb 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -11,10 +11,10 @@ ACE_RCSID (AnyTypeCode,
 # include "tao/AnyTypeCode/TypeCode.inl"
 #endif /* ! __ACE_INLINE__ */
 
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -31,8 +31,7 @@ CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const
 }
 
 CORBA::Boolean
-CORBA::TypeCode::equal (TypeCode_ptr tc
-                        ) const
+CORBA::TypeCode::equal (TypeCode_ptr tc) const
 {
   if (this == tc)
     {
@@ -40,15 +39,13 @@ CORBA::TypeCode::equal (TypeCode_ptr tc
     }
   else if (CORBA::is_nil (tc))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, CORBA::COMPLETED_NO);
     }
 
   CORBA::TCKind const tc_kind = tc->kind ();
 
   if (tc_kind != this->kind_)
-    return 0;
+    return false;
 
   try
     {
@@ -57,16 +54,16 @@ CORBA::TypeCode::equal (TypeCode_ptr tc
       char const * const this_id = this->id ();
 
       if (ACE_OS::strcmp (this_id, tc_id) != 0)
-        return 0;
+        return false;
 
       char const * const tc_name = tc->name ();
 
       char const * const this_name = this->name ();
 
       if (ACE_OS::strcmp (this_name, tc_name) != 0)
-        return 0;
+        return false;
     }
-  catch ( ::CORBA::TypeCode::BadKind&)
+  catch (const ::CORBA::TypeCode::BadKind&)
     {
       // Some TypeCodes do not support the id() and name()
       // operations.  Ignore the failure, and continue equality
@@ -74,13 +71,11 @@ CORBA::TypeCode::equal (TypeCode_ptr tc
       // below.
     }
 
-  return this->equal_i (tc
-                       );
+  return this->equal_i (tc);
 }
 
 CORBA::Boolean
-CORBA::TypeCode::equivalent (TypeCode_ptr tc
-                             ) const
+CORBA::TypeCode::equivalent (TypeCode_ptr tc) const
 {
   if (this == tc)
     {
@@ -88,58 +83,45 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc
     }
   else if (CORBA::is_nil (tc))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, CORBA::COMPLETED_NO);
     }
 
   CORBA::TypeCode_ptr const mutable_this =
     const_cast<CORBA::TypeCode_ptr> (this);
 
-  CORBA::TypeCode_var unaliased_this =
-    TAO::unaliased_typecode (mutable_this
-                            );
-
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                            );
+  CORBA::TypeCode_var unaliased_this = TAO::unaliased_typecode (mutable_this);
 
+  CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc);
 
-  CORBA::TCKind const this_kind =
-    unaliased_this->kind ();
+  CORBA::TCKind const this_kind = unaliased_this->kind ();
 
-  CORBA::TCKind const tc_kind =
-    unaliased_tc->kind ();
+  CORBA::TCKind const tc_kind = unaliased_tc->kind ();
 
   if (tc_kind != this_kind)
     return false;
 
   try
     {
-      char const * const this_id =
-        unaliased_this->id ();
+      char const * const this_id = unaliased_this->id ();
 
-      char const * const tc_id =
-        unaliased_tc->id ();
+      char const * const tc_id = unaliased_tc->id ();
 
       if (ACE_OS::strlen (this_id) == 0
           || ACE_OS::strlen (tc_id) == 0)
         {
-          return unaliased_this->equivalent_i (unaliased_tc.in ()
-                                              );
+          return unaliased_this->equivalent_i (unaliased_tc.in ());
         }
       else if (ACE_OS::strcmp (this_id, tc_id) != 0)
         {
           return false;
         }
     }
-  catch ( ::CORBA::TypeCode::BadKind&)
+  catch (const ::CORBA::TypeCode::BadKind&)
     {
       // Some TypeCodes do not support the id() operation.  Ignore the
       // failure, and continue equivalence verification using TypeCode
       // subclass-specific techniques.
-      return unaliased_this->equivalent_i (unaliased_tc.in ()
-                                          );
+      return unaliased_this->equivalent_i (unaliased_tc.in ());
     }
 
   return true;
@@ -148,101 +130,91 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc
 char const *
 CORBA::TypeCode::id_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 char const *
 CORBA::TypeCode::name_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
 CORBA::TypeCode::member_count_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 char const *
-CORBA::TypeCode::member_name_i (CORBA::ULong /* index */
-                                ) const
+CORBA::TypeCode::member_name_i (CORBA::ULong /* index */) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type_i (CORBA::ULong /* index */
-                                ) const
+CORBA::TypeCode::member_type_i (CORBA::ULong /* index */) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::Any *
-CORBA::TypeCode::member_label_i (CORBA::ULong /* index */
-                                 ) const
+CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::discriminator_type_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::Long
 CORBA::TypeCode::default_index_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
 CORBA::TypeCode::length_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::content_type_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
 CORBA::TypeCode::fixed_digits_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
 CORBA::TypeCode::fixed_scale_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::Visibility
-CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */
-                                      ) const
+CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::PRIVATE_MEMBER);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ValueModifier
 CORBA::TypeCode::type_modifier_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::VM_NONE);
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::concrete_base_type_i (void) const
 {
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
+  throw ::CORBA::TypeCode::BadKind ();
 }
 
 // ---------------------------------------------------------------
@@ -280,12 +252,11 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const
 void
 CORBA::TypeCode::Bounds::_raise (void) const
 {
-  TAO_RAISE(*this);
+  throw *this;
 }
 
 void
-CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
-                                      ) const
+CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr) const
 {
   if (cdr << this->_rep_id ())
     {
@@ -296,8 +267,7 @@ CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void
-CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &
-                                      )
+CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &)
 {
 }
 
@@ -328,12 +298,11 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const
 void
 CORBA::TypeCode::BadKind::_raise (void) const
 {
-  TAO_RAISE(*this);
+  throw *this;
 }
 
 void
-CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
-                                       ) const
+CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr) const
 {
   if (cdr << this->_rep_id ())
     {
@@ -344,8 +313,7 @@ CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void
-CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &
-                                       )
+CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &)
 {
 }
 
@@ -390,28 +358,23 @@ operator<< (TAO_OutputCDR & cdr,
 // ---------------------------------------------------------------
 
 CORBA::TypeCode_ptr
-TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
-                         )
+TAO::unaliased_typecode (CORBA::TypeCode_ptr tc)
 {
   if (CORBA::is_nil (tc))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, CORBA::COMPLETED_NO);
     }
 
   CORBA::TCKind tc_kind = tc->kind ();
 
   if (tc_kind == CORBA::tk_alias)
     {
-      CORBA::TypeCode_var tc_content =
-        CORBA::TypeCode::_duplicate (tc);
+      CORBA::TypeCode_var tc_content = CORBA::TypeCode::_duplicate (tc);
 
       // Iterate until we get to the actual unaliased type.
       do
         {
-          tc_content =
-            tc_content->content_type ();
+          tc_content = tc_content->content_type ();
 
           tc_kind = tc_content->kind ();
         }
@@ -471,12 +434,9 @@ namespace TAO
 // =========================================================
 
 CORBA::TCKind
-TAO::unaliased_kind (CORBA::TypeCode_ptr tc
-                     )
+TAO::unaliased_kind (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                            );
+  CORBA::TypeCode_var unaliased_tc = TAO::unaliased_typecode (tc);
 
   return unaliased_tc->kind ();
 }
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index 1539fa9fed7..25a563409ea 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -86,11 +86,8 @@ namespace CORBA
 
       virtual void _raise (void) const;
 
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                               );
-
+      virtual void _tao_encode (TAO_OutputCDR & cdr) const;
+      virtual void _tao_decode (TAO_InputCDR & cdr);
     };
 
     /**
@@ -115,11 +112,8 @@ namespace CORBA
 
       virtual void _raise (void) const;
 
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                               );
-
+      virtual void _tao_encode (TAO_OutputCDR & cdr) const;
+      virtual void _tao_decode (TAO_InputCDR & cdr);
     };
 
     static CORBA::TypeCode_ptr const _tc_Bounds;
@@ -159,8 +153,7 @@ namespace CORBA
      *         the same and invoking any operation on the this
      *         @c TypeCode and @a tc returns identical results.
      */
-    Boolean equal (TypeCode_ptr tc
-                   ) const;
+    Boolean equal (TypeCode_ptr tc) const;
 
     /// Equivalence of two @c TypeCodes.
     /**
@@ -169,8 +162,7 @@ namespace CORBA
      *
      * @see equal
      */
-    Boolean equivalent (TypeCode_ptr tc
-                        ) const;
+    Boolean equivalent (TypeCode_ptr tc) const;
 
     /// The kind of @c TypeCode.
     TCKind kind (void) const;
@@ -279,8 +271,7 @@ namespace CORBA
      *       behavior is required by the C++ mapping.  In particular,
      *       ownership is maintained by the @c TypeCode.
      */
-    char const * member_name (ULong index
-                              ) const;
+    char const * member_name (ULong index) const;
 
     /// The type member @c TypeCode.
     /**
@@ -292,8 +283,7 @@ namespace CORBA
      * @li @c tk_except
      * @li @c tk_event
      */
-    TypeCode_ptr member_type (ULong index
-                              ) const;
+    TypeCode_ptr member_type (ULong index) const;
 
     /// The union member label.
     /**
@@ -301,8 +291,7 @@ namespace CORBA
      *
      * @li @c tk_union
      */
-    Any * member_label (ULong index
-                        ) const;
+    Any * member_label (ULong index) const;
 
     /// The type of all non-default union member labels.
     /**
@@ -366,8 +355,7 @@ namespace CORBA
      * @li @c tk_value
      * @li @c tk_event
      */
-    Visibility member_visibility (ULong index
-                                  ) const;
+    Visibility member_visibility (ULong index) const;
 
     /// The @c ValueModifier of the @c valuetype of @c eventtype
     /// represented by this @c TypeCode.
@@ -471,34 +459,25 @@ namespace CORBA
      * counterparts are pure virtual.
      */
     //@{
-    virtual Boolean equal_i (TypeCode_ptr tc
-                             ) const = 0;
-    virtual Boolean equivalent_i (TypeCode_ptr tc
-                                  ) const = 0;
-    virtual TypeCode_ptr get_compact_typecode_i (
-      void) const = 0;
+    virtual Boolean equal_i (TypeCode_ptr tc) const = 0;
+    virtual Boolean equivalent_i (TypeCode_ptr tc) const = 0;
+    virtual TypeCode_ptr get_compact_typecode_i (void) const = 0;
 
     virtual char const * id_i (void) const;
     virtual char const * name_i (void) const;
     virtual ULong member_count_i (void) const;
-    virtual char const * member_name_i (ULong index
-                                        ) const;
-    virtual TypeCode_ptr member_type_i (ULong index
-                                        ) const;
-    virtual Any * member_label_i (ULong index
-                                  ) const;
-    virtual TypeCode_ptr discriminator_type_i (
-      void) const;
+    virtual char const * member_name_i (ULong index) const;
+    virtual TypeCode_ptr member_type_i (ULong index) const;
+    virtual Any * member_label_i (ULong index) const;
+    virtual TypeCode_ptr discriminator_type_i (void) const;
     virtual Long default_index_i (void) const;
     virtual ULong length_i (void) const;
     virtual TypeCode_ptr content_type_i (void) const;
     virtual UShort fixed_digits_i (void) const;
     virtual UShort fixed_scale_i (void) const;
-    virtual Visibility member_visibility_i (ULong index
-                                            ) const;
+    virtual Visibility member_visibility_i (ULong index) const;
     virtual ValueModifier type_modifier_i (void) const;
-    virtual TypeCode_ptr concrete_base_type_i (
-      void) const;
+    virtual TypeCode_ptr concrete_base_type_i (void) const;
     //@}
 
   private:
@@ -517,12 +496,10 @@ namespace CORBA
 
 
 TAO_AnyTypeCode_Export
-CORBA::Boolean operator<< (TAO_OutputCDR & cdr,
-                           const CORBA::TypeCode_ptr tc);
+CORBA::Boolean operator<< (TAO_OutputCDR & cdr, const CORBA::TypeCode_ptr tc);
 
 TAO_AnyTypeCode_Export
-CORBA::Boolean operator>> (TAO_InputCDR & cdr,
-                           CORBA::TypeCode_ptr & tc);
+CORBA::Boolean operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc);
 
 namespace TAO
 {
@@ -544,9 +521,8 @@ namespace TAO
 
   /// Return the unaliased content @c TypeCode of the given
   /// @c TypeCode.
-  TAO_AnyTypeCode_Export CORBA::TypeCode_ptr unaliased_typecode (
-    CORBA::TypeCode_ptr tc
-   );
+  TAO_AnyTypeCode_Export
+  CORBA::TypeCode_ptr unaliased_typecode (CORBA::TypeCode_ptr tc);
 
   /// Return the unaliased @c TCKind of the given @c TypeCode.
   /**
@@ -555,8 +531,7 @@ namespace TAO
    *       @c unaliased_typecode().
    */
   TAO_AnyTypeCode_Export
-  CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
-                               );
+  CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc);
 
   // ---------------------------------------------------------------
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl
index 8baaeebea97..ea1465a83a7 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-#include "tao/Environment.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
@@ -73,27 +71,21 @@ CORBA::TypeCode::member_count (void) const
 }
 
 ACE_INLINE char const *
-CORBA::TypeCode::member_name (ULong index
-                              ) const
+CORBA::TypeCode::member_name (ULong index) const
 {
-  return this->member_name_i (index
-                             );
+  return this->member_name_i (index);
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type (ULong index
-                              ) const
+CORBA::TypeCode::member_type (ULong index) const
 {
-  return this->member_type_i (index
-                             );
+  return this->member_type_i (index);
 }
 
 ACE_INLINE CORBA::Any *
-CORBA::TypeCode::member_label (ULong index
-                               ) const
+CORBA::TypeCode::member_label (ULong index) const
 {
-  return this->member_label_i (index
-                              );
+  return this->member_label_i (index);
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
@@ -133,11 +125,9 @@ CORBA::TypeCode::fixed_scale (void) const
 }
 
 ACE_INLINE CORBA::Visibility
-CORBA::TypeCode::member_visibility (ULong index
-                                    ) const
+CORBA::TypeCode::member_visibility (ULong index) const
 {
-  return this->member_visibility_i (index
-                                   );
+  return this->member_visibility_i (index);
 }
 
 ACE_INLINE CORBA::ValueModifier
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index bd489f01c77..cd6a5735295 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -84,7 +84,7 @@ namespace
 
   // ---------------------------------------------------------
 
-  CORBA::ULong const TYPECODE_INDIRECTION = 0xffffffff;
+  CORBA::ULong const TYPECODE_INDIRECTION = 0xffffffffU;
 
   // ---------------------------------------------------------
 
@@ -120,8 +120,8 @@ namespace
 
         if (ACE_OS::strcmp (info.id, id) == 0)
           {
-            // We have a mathing id, so store the typecode in the out array
-            // and then compare the others.
+            // We have a matching id, so store the TypeCode in the out
+            // array and then compare the others.
             size_t const old_size = tcs.size ();
             if (tcs.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
               return false;
@@ -414,13 +414,11 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
     member_array_type,
     TAO::True_RefCount_Policy> typecode_type;
 
-
   // Check if struct TypeCode is recursive.
   TAO::TypeCodeFactory::TC_Info_List recursive_tc;
   if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos))
     {
       // Set remaining parameters.
-
       typedef TAO::TypeCode::Recursive_Type<typecode_type,
                                             CORBA::TypeCode_var,
                                             member_array_type>
@@ -435,11 +433,10 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
           recursive_typecode_type * const rtc =
             dynamic_cast<recursive_typecode_type *> (info.type);
 
-          ACE_ASSERT (rtc);
+          if (!rtc)
+            return false;  // Should never occur.
 
-          rtc->struct_parameters (name.in (),
-                                  fields,
-                                  nfields);
+          rtc->struct_parameters (name.in (), fields, nfields);
         }
 
       tc = recursive_tc[0].type;
@@ -675,7 +672,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
                                case_array_type,
                                TAO::True_RefCount_Policy> typecode_type;
 
-  // Check if we have recursive members, this could be multiple
+  // Check if we have recursive members.  There could be multiple.
   TAO::TypeCodeFactory::TC_Info_List recursive_tc;
   if (find_recursive_tc (id.in (), recursive_tc, infos))
     {
@@ -695,7 +692,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
           recursive_typecode_type * const rtc =
             dynamic_cast<recursive_typecode_type *> (info.type);
 
-          ACE_ASSERT (rtc);
+          if (!rtc)
+            return false;  // Should never occur.
 
           rtc->union_parameters (name.in (),
                                  discriminant_type,
@@ -1050,7 +1048,8 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
           recursive_typecode_type * const rtc =
             dynamic_cast<recursive_typecode_type *> (info.type);
 
-          ACE_ASSERT (rtc);
+          if (!rtc)
+            return false;  // Should never occur.
 
           rtc->valuetype_parameters (name.in (),
                                      type_modifier,
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 9cb9957d07e..b7fa0471d41 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -29,7 +29,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
                                                 );
 
   if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-    return 0;
+    return false;
 
   // Check case TypeCodes.
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
@@ -42,7 +42,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
                   );
 
   if (!equal_members)
-    return 0;
+    return false;
 
   // Check case label.
   return this->equal_label (index,
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
index ecf86e30c38..3d8de6f4b43 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
@@ -8,7 +8,6 @@
 
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/SystemException.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Case_Enum_T.inl"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index 56915ed0bf5..bf2ab77277b 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -6,8 +6,9 @@
 #include "tao/AnyTypeCode/TypeCode_Case_T.h"
 
 #include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
 #include "tao/SystemException.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "ace/CORBA_macros.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Case_T.inl"
@@ -116,8 +117,7 @@ TAO::TypeCode::Case_T<DiscriminatorType,
                                                   CORBA::TypeCode_ptr tc
                                                   ) const
 {
-  CORBA::Any_var const any = tc->member_label (index
-                                              );
+  CORBA::Any_var const any = tc->member_label (index);
 
   // The equality operator == below is guaranteed to be defined for
   // the discriminator type since an IDL union discriminator type must
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index c57a1eb8307..80e8ea927e6 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -10,7 +10,6 @@
 # include "tao/AnyTypeCode/Union_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Value_Ptr.h"
@@ -133,8 +132,7 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::Boolean const equal_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-     );
+      tc_discriminator.in ());
 
   if (!equal_discriminators)
     return false;
@@ -152,10 +150,7 @@ TAO::TypeCode::Union<StringType,
 
       case_type const & lhs_case = *this->cases_[i];
 
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                       );
+      bool const equal_case = lhs_case.equal (i, tc);
 
       if (!equal_case)
         return false;
@@ -193,8 +188,7 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::Boolean const equiv_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-     );
+      tc_discriminator.in ());
 
   if (!equiv_discriminators)
     return false;
@@ -213,9 +207,7 @@ TAO::TypeCode::Union<StringType,
       case_type const & lhs_case = *this->cases_[i];
 
       bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                            );
+        lhs_case.equivalent (i, tc);
 
       if (!equivalent_case)
         return false;
@@ -265,8 +257,7 @@ TAO::TypeCode::Union<StringType,
 
 //   if (adapter == 0)
 //     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
+//       throw ::CORBA::INTERNAL ();
 //     }
 
 //   return
@@ -281,7 +272,7 @@ TAO::TypeCode::Union<StringType,
 //       Traits<StringType>::get_typecode (this->default_case_.type)
 //      );
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 
   ACE_NOTREACHED (return CORBA::TypeCode::_nil ());
 }
@@ -294,8 +285,7 @@ char const *
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::id_i (
-  void) const
+                     RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -310,8 +300,7 @@ char const *
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::name_i (
-  void) const
+                     RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -340,13 +329,12 @@ char const *
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::member_name_i (CORBA::ULong index
-                                                     ) const
+                     RefCountPolicy>::member_name_i (CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return this->cases_[index]->name ();
 }
@@ -359,12 +347,10 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::member_type_i (CORBA::ULong index
-                                                     ) const
+                     RefCountPolicy>::member_type_i (CORBA::ULong index) const
 {
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
 }
@@ -381,8 +367,7 @@ TAO::TypeCode::Union<StringType,
                                                       ) const
 {
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   // Default case.
   if (this->default_index_ > -1
@@ -416,8 +401,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::discriminator_type_i (
-  void) const
+                     RefCountPolicy>::discriminator_type_i (void) const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -432,8 +416,7 @@ CORBA::Long
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::default_index_i (
-  void) const
+                     RefCountPolicy>::default_index_i (void) const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 689a05fb2cd..005506f34fe 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -3,15 +3,14 @@
 #include "tao/AnyTypeCode/Union_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/SystemException.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Union_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-#include "tao/SystemException.h"
-
 #include "ace/Value_Ptr.h"
-
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (AnyTypeCode,
            Union_TypeCode_Static,
@@ -234,8 +233,7 @@ TAO::TypeCode::Union<char const *,
 
 //   if (adapter == 0)
 //     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
+//       throw ::CORBA::INTERNAL ();
 //     }
 
 //   return
@@ -250,7 +248,7 @@ TAO::TypeCode::Union<char const *,
 //       Traits<char const *>::get_typecode (this->default_case_.type)
 //      );
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 char const *
@@ -271,8 +269,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  void) const
+                     TAO::Null_RefCount_Policy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -284,8 +281,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  void) const
+                     TAO::Null_RefCount_Policy>::member_count_i (void) const
 {
   return this->ncases_;
 }
@@ -296,13 +292,12 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return this->cases_[index]->name ();
 }
@@ -316,8 +311,7 @@ TAO::TypeCode::Union<char const *,
   CORBA::ULong index) const
 {
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
 }
@@ -331,8 +325,7 @@ TAO::TypeCode::Union<char const *,
   CORBA::ULong index) const
 {
   if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   // Default case.
   if (this->default_index_ > -1
@@ -363,8 +356,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (
-  void) const
+                     TAO::Null_RefCount_Policy>::discriminator_type_i (void) const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -376,8 +368,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (
-  void) const
+                     TAO::Null_RefCount_Policy>::default_index_i (void) const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index df14b999403..dc6aa73d6f7 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -6,6 +6,7 @@
 #include "tao/AnyTypeCode/Value_TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/TypeCodeFactory_Adapter.h"
@@ -188,9 +189,7 @@ CORBA::Boolean
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+                     RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) const
 {
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier ();
@@ -285,8 +284,7 @@ TAO::TypeCode::Value<StringType,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -357,7 +355,7 @@ TAO::TypeCode::Value<StringType,
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<StringType>::get_string (this->fields_[index].name);
 }
@@ -373,8 +371,7 @@ TAO::TypeCode::Value<StringType,
                      RefCountPolicy>::member_type_i (CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return
     CORBA::TypeCode::_duplicate (
@@ -392,8 +389,7 @@ TAO::TypeCode::Value<StringType,
                      RefCountPolicy>::member_visibility_i (CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return this->fields_[index].visibility;
 }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 2a5faf9ef37..84536062264 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/TypeCodeFactory_Adapter.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -171,21 +172,17 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier ();
+  CORBA::ValueModifier const tc_type_modifier = tc->type_modifier ();
 
   if (tc_type_modifier != this->type_modifier_)
     return false;
 
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type ();
+  CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type ();
 
   CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                     );
+    this->equivalent (rhs_concrete_base_type.in ());
 
   if (!equivalent_concrete_base_types)
     return false;
@@ -193,8 +190,7 @@ TAO::TypeCode::Value<char const *,
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
-  CORBA::ULong const tc_nfields =
-    tc->member_count ();
+  CORBA::ULong const tc_nfields = tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -205,21 +201,17 @@ TAO::TypeCode::Value<char const *,
                   CORBA::TypeCode_ptr const *> const & lhs_field =
         this->fields_[i];
 
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i);
+      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
+      CORBA::Visibility const rhs_visibility = tc->member_visibility (i);
 
       if (lhs_visibility != rhs_visibility)
         return false;
 
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i);
+      CORBA::TypeCode_var const rhs_tc = tc->member_type (i);
 
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ());
+      CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in ());
 
       if (!equiv_types)
         return false;
@@ -266,8 +258,7 @@ TAO::TypeCode::Value<char const *,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   return
@@ -327,7 +318,7 @@ TAO::TypeCode::Value<char const *,
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return Traits<char const *>::get_string (this->fields_[index].name);
 }
@@ -341,8 +332,7 @@ TAO::TypeCode::Value<char const *,
   CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
+    throw ::CORBA::TypeCode::Bounds ();
 
   return
     CORBA::TypeCode::_duplicate (
@@ -358,8 +348,7 @@ TAO::TypeCode::Value<char const *,
   CORBA::ULong index) const
 {
   if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
+    throw ::CORBA::TypeCode::Bounds ();
 
   return this->fields_[index].visibility;
 }
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
index 0fb04dbc451..1eb4a217261 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
@@ -82,7 +82,7 @@ namespace TAO
       {
         this->value_->_tao_decode (cdr);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 0bfbd0adb7d..af885729ecb 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1,23 +1,19 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     append.cpp
-//
-// = DESCRIPTION
-//     Appends a CDR stream to another CDR stream. Due to the
-//     stringent alignment requirements, it is not possible to simply
-//     append or memcpy. Instead we go thru the same CDR encoding rules
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     append.cpp
+ *
+ *  $Id$
+ *
+ *   Appends a CDR stream to another CDR stream. Due to the
+ *   stringent alignment requirements, it is not possible to simply
+ *   append or memcpy. Instead we go thru the same CDR encoding rules
+ *
+ *
+ *  @author  Copyright 1994-1995 by Sun Microsystems Inc.  and Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/Marshal.h"
@@ -25,7 +21,6 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/Environment.h"
 #include "tao/debug.h"
 #include "tao/Valuetype_Adapter.h"
 #include "tao/ORB_Core.h"
@@ -49,10 +44,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO::traverse_status
 TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
                                TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               )
+                               TAO_OutputCDR *dest)
 {
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE; // status of encode operation
 
@@ -106,36 +100,26 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
         ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n")
       ));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
 TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
                          TAO_InputCDR *src,
-                         TAO_OutputCDR *dest
-                         )
+                         TAO_OutputCDR *dest)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
 
   if (!(*src >> elem_tc.inout ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
+    throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 
   if (!(*dest << elem_tc.in ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
+    throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 
   // append the data
   TAO::traverse_status retval =
-    TAO_Marshal_Object::perform_append (elem_tc.in (),
-                                        src,
-                                        dest
-                                       );
+    TAO_Marshal_Object::perform_append (elem_tc.in (), src, dest);
 
   if (retval != TAO::TRAVERSE_CONTINUE)
     {
@@ -143,9 +127,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_Marshal_Any::append detected error\n")));
 
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 
   return retval;
@@ -154,10 +136,9 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                               TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              )
+                              TAO_OutputCDR *dest)
 {
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
   CORBA::ULong kind;
@@ -166,9 +147,9 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
   // use. However, also write it back into the destination
   continue_append = (CORBA::Boolean) (src->read_ulong (kind)
                                       ? dest->write_ulong (kind)
-                                      : 0);
+                                      : false);
 
-  if (continue_append == 1)
+  if (continue_append == true)
     {
       // Typecodes with empty parameter lists all have preallocated
       // constants.  We use those to reduce memory consumption and
@@ -191,8 +172,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
-                                                      dest
-                                                     );
+                                                      dest);
               }
             break;
 
@@ -203,8 +183,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
-                                                      dest
-                                                     );
+                                                      dest);
               }
             break;
 
@@ -231,8 +210,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
                                                       src,
-                                                      dest
-                                                     );
+                                                      dest);
               }
             } // end of switch
         }
@@ -245,8 +223,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                           ACE_TEXT ("Bad kind_ value in CDR stream\n")));
             }
 
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
+          throw ::CORBA::BAD_TYPECODE ();
         }
     }
 
@@ -261,31 +238,24 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
 TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               )
+                               TAO_OutputCDR *dest)
 {
   // write the octet sequence representing the Principal
-  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                             src,
-                                             dest
-                                            );
+  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq, src, dest);
 }
 
 TAO::traverse_status
 TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            )
+                            TAO_OutputCDR *dest)
 {
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
 
   // First, append the type hint. This will be the type_id encoded in an
   // object reference.
@@ -347,16 +317,13 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
         ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n")
       ));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
 TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            )
+                            TAO_OutputCDR *dest)
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -373,11 +340,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
       // get member type
       param = tc->member_type (i);
 
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                           );
+      retval = TAO_Marshal_Object::perform_append (param.in (), src, dest);
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
@@ -387,22 +350,17 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Struct::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
 TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           )
+                           TAO_OutputCDR *dest)
 {
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type ();
+  CORBA::TypeCode_var discrim_tc = tc->discriminator_type ();
 
-  CORBA::ULong kind =
-    discrim_tc->kind ();
+  CORBA::ULong kind = discrim_tc->kind ();
 
   // Save the discriminator value in a temporary variable...
   CORBA::Short short_v = CORBA::Short();
@@ -496,8 +454,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
        i < member_count && current_member == null_member;
        ++i)
     {
-      CORBA::Any_var any = tc->member_label (i
-                                            );
+      CORBA::Any_var any = tc->member_label (i);
 
       CORBA::Octet o;
 
@@ -507,8 +464,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
             tc->default_index ();
 
           if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
+            throw ::CORBA::BAD_TYPECODE ();
           // Found the default branch, save its position and continue
           // trying to find the current value...
           default_member = i;
@@ -556,9 +512,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
             if (impl->encoded ())
               {
-                TAO::Unknown_IDL_Type *unk =
+                TAO::Unknown_IDL_Type * const unk =
                   dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+                if (!unk)
+                  throw ::CORBA::INTERNAL ();
+
                 // We don't want unk's rd_ptr to move, in case
                 // we are shared by another Any, so we use this
                 // to copy the state, not the buffer.
@@ -621,8 +580,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
             tc->member_type (default_member);
           return TAO_Marshal_Object::perform_append (member_tc.in (),
                                                      src,
-                                                     dest
-                                                    );
+                                                     dest);
         }
 
       // If we're here, we have an implicit default case, and we
@@ -643,10 +601,9 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 TAO::traverse_status
 TAO_Marshal_String::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            )
+                            TAO_OutputCDR *dest)
 {
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
 
   // On decode, omit the check against specified string bounds, and
   // cope with illegal "zero length" strings (all lengths on the wire
@@ -664,16 +621,13 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
 TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
                               TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              )
+                              TAO_OutputCDR *dest)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -693,8 +647,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
           LM_DEBUG,
           ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")
         ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL ();
     }
 
   if (bounds == 0)
@@ -880,15 +833,13 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
         ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n")
       ));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL ();
 }
 
 TAO::traverse_status
 TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           )
+                           TAO_OutputCDR *dest)
 {
   // retrieve the bounds of the array
   CORBA::ULong bounds = tc->length ();
@@ -1067,19 +1018,17 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL ();
 }
 
 TAO::traverse_status
 TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           )
+                           TAO_OutputCDR *dest)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
 
   // Status of decode operation.
   TAO::traverse_status retval =
@@ -1087,21 +1036,16 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
 
   tc2 = tc->content_type ();
 
-  retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                               src,
-                                               dest
-                                              );
+  retval = TAO_Marshal_Object::perform_append (tc2.in (), src, dest);
 
   if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
+      && continue_append == true)
     return TAO::TRAVERSE_CONTINUE;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Alias::append detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 // Decode exception For exceptions, the "hidden" type ID near the
@@ -1119,7 +1063,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
   CORBA::TypeCode_var param;
 
   // first append the RepositoryID
@@ -1139,8 +1083,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
 
       retval = TAO_Marshal_Object::perform_append (param.in (),
                                                    src,
-                                                   dest
-                                                  );
+                                                   dest);
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE
@@ -1151,9 +1094,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Except::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
@@ -1162,7 +1103,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_OutputCDR *dest
                              )
 {
-  CORBA::Boolean continue_append = 1;
+  CORBA::Boolean continue_append = true;
 
   // On decode, omit the check against specified wstring bounds, and
   // cope with illegal "zero length" strings (all lengths on the wire
@@ -1181,9 +1122,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_WString::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
@@ -1288,9 +1227,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Value::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index 6e73a6851bb..f6efd973716 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     skip.cpp
-//
-// = DESCRIPTION
-//     Code for skipping different data types
-//
-//     Data types encoded as CDR streams need to be skipped when they
-//     are part of an Any.
-//
-// = AUTHOR
-//     Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     skip.cpp
+ *
+ *  $Id$
+ *
+ *   Code for skipping different data types
+ *
+ *   Data types encoded as CDR streams need to be skipped when they
+ *   are part of an Any.
+ *
+ *
+ *  @author  Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -39,9 +36,7 @@ ACE_RCSID (AnyTypeCode,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::traverse_status
-TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             TAO_InputCDR *stream
-                             )
+TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc, TAO_InputCDR *stream)
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -96,16 +91,12 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 }
 
 TAO::traverse_status
-TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                       TAO_InputCDR *stream
-                       )
+TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -114,15 +105,11 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
   if (!(*stream >> elem_tc.inout ()))
     return TAO::TRAVERSE_STOP;
 
-  return TAO_Marshal_Object::perform_skip (elem_tc.in (),
-                                           stream
-                                          );
+  return TAO_Marshal_Object::perform_skip (elem_tc.in (), stream);
 }
 
 TAO::traverse_status
-TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *stream
-                            )
+TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream)
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -200,8 +187,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("TAO_Marshal_TypeCode::skip: ")
                         ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
+          throw ::CORBA::BAD_TYPECODE ();
         }
     }
 
@@ -214,16 +200,12 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 }
 
 TAO::traverse_status
-TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *stream
-                             )
+TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream)
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -245,22 +227,17 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 }
 
 TAO::traverse_status
-TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          )
+TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream)
 {
   CORBA::Boolean continue_skipping = true;
 
   // return status
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
+  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
 
   // First, skip the type hint. This will be the type_id encoded in an
   // object reference.
@@ -307,16 +284,12 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 }
 
 TAO::traverse_status
-TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          )
+TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc, TAO_InputCDR *stream)
 {
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
@@ -331,9 +304,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
     {
       param = tc->member_type (i);
 
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                );
+      retval = TAO_Marshal_Object::perform_skip (param.in (), stream);
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
@@ -343,15 +314,11 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
-TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *src
-                         )
+TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc, TAO_InputCDR *src)
 {
   CORBA::TypeCode_var discrim_tc =
     tc->discriminator_type ();
@@ -452,8 +419,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
             tc->default_index ();
 
           if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
+            throw ::CORBA::BAD_TYPECODE ();
           // Found the default branch, save its position and continue
           // trying to find the current value...
           default_member = i;
@@ -501,9 +467,12 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
             if (impl->encoded ())
               {
-                TAO::Unknown_IDL_Type *unk =
+                TAO::Unknown_IDL_Type * const unk =
                   dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+                if (!unk)
+                  throw ::CORBA::INTERNAL ();
+
                 // We don't want unk's rd_ptr to move, in case
                 // we are shared by another Any, so we use this
                 // to copy the state, not the buffer.
@@ -585,9 +554,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 }
 
 TAO::traverse_status
-TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          )
+TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream)
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -607,16 +574,12 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_Marshal_String::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
     }
 }
 
 TAO::traverse_status
-TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream
-                            )
+TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -632,8 +595,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
+      throw ::CORBA::MARSHAL ();
     }
 
   // No point decoding an empty sequence.
@@ -713,8 +675,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL ();
 }
 
 TAO::traverse_status
@@ -802,8 +763,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL ();
 }
 
 TAO::traverse_status
@@ -834,9 +794,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 // Decode exception For exceptions, the "hidden" type ID near the
@@ -881,9 +839,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Except::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 // decode wstring
@@ -912,9 +868,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_WString::skip detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO::traverse_status
@@ -1041,9 +995,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Value::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
+  throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index 55aa49e5bf1..3db42215ea0 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -22,7 +22,7 @@ TAO::Argument::demarshal (TAO_InputCDR &)
   return true;
 }
 
-TAO::Argument*
+TAO::Argument *
 TAO::Argument::clone ()
 {
   return 0;
@@ -61,10 +61,10 @@ TAO::RetArgument::mode (void) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO::Argument*
+TAO::Argument *
 TAO::Void_Return_Argument::clone (void)
 {
-  TAO::Argument* clone_arg = 0;
+  TAO::Argument *clone_arg = 0;
   ACE_NEW_RETURN (clone_arg,
                   Void_Return_Argument (),
                   0);
diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h
index 3e3178af511..76f9c5d5ea7 100644
--- a/TAO/tao/Array_Traits_T.h
+++ b/TAO/tao/Array_Traits_T.h
@@ -63,7 +63,18 @@ struct array_traits
     std::for_each(
         begin, end, &TAO::Array_Traits<forany_type>::zero);
   }
-
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
+  // Allow MSVC++ >= 8 checked iterators to be used.
+  template <typename iter>
+  inline static void copy_range(
+      value_type * begin, value_type * end, iter dst)
+  {
+    for(value_type * i = begin; i != end; ++i, ++dst)
+    {
+      TAO::Array_Traits<forany_type>::copy(*dst, *i);
+    }
+  }
+#else
   inline static void copy_range(
       value_type * begin, value_type * end, value_type *dst)
   {
@@ -72,6 +83,7 @@ struct array_traits
       TAO::Array_Traits<forany_type>::copy(*dst, *i);
     }
   }
+# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 };
 
 } // namespace details
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index ed6a6fcb2a1..ae6ea86cfca 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -70,8 +70,7 @@ TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
 // Must override pure virtual method in TAO_Reply_Dispatcher.
 int
 TAO_Asynch_Reply_Dispatcher_Base::dispatch_reply (
-    TAO_Pluggable_Reply_Params & /*params*/
-  )
+    TAO_Pluggable_Reply_Params & /*params*/)
 {
   return 0;
 }
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index ef6c5bc5fed..b1c90db0337 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -64,9 +64,7 @@ public:
   virtual void reply_timed_out (void) = 0;
 
   /// Install the timeout handler
-  virtual long schedule_timer (CORBA::ULong ,
-                               const ACE_Time_Value &
-                               ) = 0;
+  virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &) = 0;
 
   /// @name Mutators for refcount
   //@{
@@ -155,8 +153,7 @@ namespace TAO
   class TAO_Export ARDB_Refcount_Functor
   {
   public:
-    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb)
-      ACE_THROW_SPEC (());
+    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ();
   };
 
 }
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
index c63371d74a4..77f9bbd831d 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
@@ -8,8 +8,7 @@ namespace TAO
 {
   ACE_INLINE void
   ARDB_Refcount_Functor::operator () (
-      TAO_Asynch_Reply_Dispatcher_Base *ardb)
-    ACE_THROW_SPEC (())
+      TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ()
   {
     (void) ardb->decr_refcount ();
   }
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index 623eb7e4a55..f339326f161 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -64,7 +64,6 @@ public:
 
   /// Generate hash value for our class
   virtual u_long hash (void) const;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index 23128844c2a..61e428234ea 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -19,7 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -41,7 +42,7 @@ public:
   virtual ~TAO_BiDir_Adapter (void);
 
   virtual void load_policy_validators (TAO_Policy_Validator &validator)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 8b2da6f3919..44de918543b 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -4,6 +4,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (BiDir_GIOP,
            BiDirGIOP,
@@ -23,8 +24,7 @@ TAO_BiDirGIOP_Loader::~TAO_BiDirGIOP_Loader (void)
 }
 
 int
-TAO_BiDirGIOP_Loader::init (int,
-                            ACE_TCHAR* [])
+TAO_BiDirGIOP_Loader::init (int, ACE_TCHAR* [])
 {
   if (TAO_BiDirGIOP_Loader::is_activated_ == false && TAO_DEF_GIOP_MINOR >= 2)
     {
@@ -46,12 +46,11 @@ TAO_BiDirGIOP_Loader::init (int,
           bidir_orb_initializer = tmp_orb_initializer;
 
           PortableInterceptor::register_orb_initializer (
-            bidir_orb_initializer.in ()
-           );
+            bidir_orb_initializer.in ());
 
           TAO_BiDirGIOP_Loader::is_activated_ = true;
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level > 0)
             {
@@ -67,7 +66,6 @@ TAO_BiDirGIOP_Loader::init (int,
 void
 TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
                                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Is this true? Does the GIOP protocol version matter here?
   if (TAO_DEF_GIOP_MINOR < 2)
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 00cd082a9fa..b2487dfa1da 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -52,8 +52,7 @@ public:
   virtual int init (int argc,
                     ACE_TCHAR* []);
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void load_policy_validators (TAO_Policy_Validator &validator);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 3b062cd28ad..da17b18d452 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -6,6 +6,8 @@
 
 #include "tao/ORB_Constants.h"
 
+#include "ace/CORBA_macros.h"
+
 ACE_RCSID (BiDir_GIOP,
            BiDir_ORBInitializer,
            "$Id$")
@@ -14,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
 }
 
 void
 TAO_BiDir_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index 7c8c673ce4b..8a6ca7ecb98 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -39,11 +39,9 @@ class TAO_BiDir_ORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 397be5ee664..03559f68670 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -5,6 +5,8 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
 
+#include "ace/CORBA_macros.h"
+
 ACE_RCSID (BiDir_GIOP,
            BiDir_PolicyFactory,
            "$Id$")
@@ -15,10 +17,8 @@ CORBA::Policy_ptr
 TAO_BiDir_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
-  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+  CORBA::Policy_ptr policy = CORBA::Policy_ptr ();
 
   if (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE)
     {
@@ -27,8 +27,7 @@ TAO_BiDir_PolicyFactory::create_policy (
       // Extract the value from the any.
       if ((value >>= val) == 0)
         {
-          ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                            CORBA::Policy::_nil ());
+          throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
         }
 
       ACE_NEW_THROW_EX (policy,
@@ -42,8 +41,7 @@ TAO_BiDir_PolicyFactory::create_policy (
       return policy;
     }
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index 357c59a85c1..251b618ee23 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -41,9 +41,7 @@ class TAO_BiDir_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any & value);
 
 };
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index d3b548a9347..08a37784b0e 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -6,6 +6,8 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
+#include "ace/CORBA_macros.h"
+
 ACE_RCSID (BiDir_GIOP,
            BiDir_Policy_i,
            "$Id$")
@@ -35,7 +37,6 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy
 
 CORBA::PolicyType
 TAO_BidirectionalPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -55,7 +56,6 @@ TAO_BidirectionalPolicy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_BidirectionalPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -70,16 +70,12 @@ TAO_BidirectionalPolicy::copy (void)
 
 void
 TAO_BidirectionalPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 BiDirPolicy::BidirectionalPolicyValue
 TAO_BidirectionalPolicy::value (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException))
-{
-  return this->value_;
+  {return this->value_;
 }
 
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index 718016fc381..3ff11bd42a9 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -55,17 +55,13 @@ public:
   virtual TAO_BidirectionalPolicy *clone (void) const;
 
   /// = The BiDir::BidirectionalPolicy methods
-  virtual BiDirPolicy::BidirectionalPolicyValue value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual BiDirPolicy::BidirectionalPolicyValue value (void);
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
index 2cb6869c87d..29ada03e89b 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -13,20 +13,18 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (
-                                         CORBA::ULong request_id,
-                                         TAO_Reply_Dispatcher* rd,
-                                         TAO_Transport_Mux_Strategy* tms)
- : status_(TAO_Bind_Dispatcher_Guard::UNBIND),
-   request_id_(request_id),
-   rd_(rd),
-   tms_(tms)
+TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id,
+                                                      TAO_Reply_Dispatcher *rd,
+                                                      TAO_Transport_Mux_Strategy *tms)
+  : status_(TAO_Bind_Dispatcher_Guard::UNBIND),
+    request_id_(request_id),
+    rd_(rd),
+    tms_(tms)
 {
   int const retval =
-    this->tms_->bind_dispatcher (this->request_id_,
-                                 this->rd_);
+    this->tms_->bind_dispatcher (this->request_id_, this->rd_);
 
-  if (retval == -1 )
+  if (retval == -1)
     this->status_ =
       TAO_Bind_Dispatcher_Guard::NO_UNBIND;
 }
@@ -36,7 +34,7 @@ TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void)
   // We try unbinding. If it works it works, else cant do much about
   // it..
   if (this->status_ == TAO_Bind_Dispatcher_Guard::UNBIND)
-    (void) this->tms_->unbind_dispatcher (this->request_id_);
+    (void)this->tms_->unbind_dispatcher (this->request_id_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Array_Sequence_T.h b/TAO/tao/Bounded_Array_Sequence_T.h
index 88020bc725a..d5ebeddca26 100644
--- a/TAO/tao/Bounded_Array_Sequence_T.h
+++ b/TAO/tao/Bounded_Array_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "tao/Bounded_Array_Allocation_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "tao/Array_Traits_T.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -124,8 +123,6 @@ namespace TAO
 
   template <typename stream, typename T_array, typename T_slice, typename T_tag, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_array_sequence<T_array, T_slice, T_tag, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     typedef TAO_Array_Forany_T<T_array, T_slice, T_tag> forany;
     typedef TAO_FixedArray_Var_T <T_array, T_slice, T_tag> fixed_array;
     typedef TAO::Array_Traits<forany> array_traits;
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index 4865865998f..729a86ef3af 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -13,6 +13,7 @@
 #include "tao/String_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "tao/String_Sequence_Element_T.h"
+#include "tao/String_Const_Sequence_Element_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -30,6 +31,7 @@ public:
   typedef details::bounded_reference_allocation_traits<value_type,element_traits,MAX,true> allocation_traits;
 
   typedef details::string_sequence_element<element_traits> element_type;
+  typedef details::string_const_sequence_element<element_traits> const_element_type;
   typedef element_type subscript_type;
   typedef const_value_type const_subscript_type;
 
@@ -65,8 +67,8 @@ public:
     impl_.length(length);
   }
   /// @copydoc details::generic_sequence::operator[]
-  inline const_value_type operator[](CORBA::ULong i) const {
-    return impl_[i];
+  inline const_element_type operator[](CORBA::ULong i) const {
+    return const_element_type (impl_[i], release());
   }
   /// @copydoc details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
index 9754820576c..0fed30cc4ab 100644
--- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
@@ -13,6 +13,7 @@
 #include "Object_Reference_Traits_T.h"
 #include "Generic_Sequence_T.h"
 #include "Object_Reference_Sequence_Element_T.h"
+#include "Object_Reference_Const_Sequence_Element_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -32,6 +33,7 @@ public:
   typedef details::bounded_reference_allocation_traits<value_type,element_traits,MAX,true> allocation_traits;
 
   typedef details::object_reference_sequence_element<element_traits> element_type;
+  typedef details::object_reference_const_sequence_element<element_traits> const_element_type;
   typedef element_type subscript_type;
   typedef value_type const & const_subscript_type;
 
@@ -62,8 +64,8 @@ public:
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  inline value_type const & operator[](CORBA::ULong i) const {
-    return impl_[i];
+  inline value_type const &  operator[](CORBA::ULong i) const {
+    return impl_[i];;
   }
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index 5c5f1f78e9e..043f26659d6 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/TAOC.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            Buffering_Constraint_Policy,
@@ -40,7 +41,6 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 
 CORBA::PolicyType
 TAO_Buffering_Constraint_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
 }
@@ -57,14 +57,12 @@ TAO_Buffering_Constraint_Policy::clone (void) const
 
 TAO::BufferingConstraint
 TAO_Buffering_Constraint_Policy::buffering_constraint (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->buffering_constraint_;
 }
 
 CORBA::Policy_ptr
 TAO_Buffering_Constraint_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Buffering_Constraint_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -76,7 +74,6 @@ TAO_Buffering_Constraint_Policy::copy (void)
 
 void
 TAO_Buffering_Constraint_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index c03987881ea..77f45a63438 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -56,19 +56,15 @@ public:
 
   // = The TAO::Buffering_Constraint_Policy methods
 
-  virtual TAO::BufferingConstraint buffering_constraint (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TAO::BufferingConstraint buffering_constraint (void);
 
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 1dd62593f70..c796957da6c 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -53,7 +53,6 @@
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/CDR_Stream.h"
 
 
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 5bc19c97e5c..c7052f37fc7 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -6,6 +6,7 @@
 #include "tao/Transport_Connector.h"
 #include "tao/Protocol_Factory.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 #include "ace/Vector_T.h"
 #include "ace/INET_Addr.h"
 #include "ace/OS_NS_string.h"
@@ -46,7 +47,6 @@ CORBA::Object_ptr
 TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                               TAO_MProfile &mprofile
                                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a TAO_Stub.
   TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
@@ -75,7 +75,6 @@ CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
                                               CORBA::ORB_ptr orb
                                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Pass the key string as an argument to resolve_initial_references.
   // NameService is the default if an empty key string is supplied.
@@ -96,7 +95,6 @@ CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string (const char * ior,
                                    CORBA::ORB_ptr orb
                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The decomposition of a corbaloc string is in Section 13.6.10.
   //
@@ -176,9 +174,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
                       ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
                       ACE_TEXT("could not parse from %s"),
                       ACE_TEXT_CHAR_TO_TCHAR(ior)));
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                            CORBA::COMPLETED_NO),
-                          CORBA::Object::_nil ());
+        throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
       }
     if (*ior == ',') // more endpoints follow
       {
@@ -208,9 +204,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
                   ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
                   ACE_TEXT("could not parse from %s"),
                   ACE_TEXT_CHAR_TO_TCHAR(ior)));
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                        CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
+    throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
   } // end of while
 
   // At this point, ior points at the start of the object key
@@ -242,9 +236,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
                         ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
                         ACE_TEXT("mprofile.give_profile failed for i = %d\n"),
                         i));
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                              CORBA::COMPLETED_NO),
-                            CORBA::Object::_nil ());
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
         }
     }
 
@@ -262,7 +254,6 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
                                      size_t prot_addr_len,
                                      ACE_CString &canonical_endpoint
                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *separator = ACE_OS::strchr (ior, ':');
 
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 737d0c4c51e..f65cc3fc8fb 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -57,8 +57,7 @@ public:
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          );
 
 private:
 
@@ -69,20 +68,17 @@ private:
    */
   CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                              TAO_MProfile &mprofile
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             );
 
   /// Gets the pointer to the key_string when the protocol used is RIR
   CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
                                              CORBA::ORB_ptr orb
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             );
 
   void make_canonical (const char *ior,
                        size_t ior_len,
                        ACE_CString &canonical_endpoint
-                       )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       );
 
   struct parsed_endpoint {
     parsed_endpoint ();
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 691903ae19a..f8970f65f53 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -37,7 +37,6 @@ CORBA::Object_ptr
 TAO_CORBANAME_Parser::
 parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                      ACE_CString &key_string)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval;
   TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_id (key_string.c_str ());
@@ -64,7 +63,6 @@ CORBA::Object_ptr
 TAO_CORBANAME_Parser::parse_string (const char *ior,
                                     CORBA::ORB_ptr orb
                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Skip the prefix, we know it is there because this method in only
@@ -137,7 +135,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
           obj = name_context._retn ();
         }
     }
-  catch ( ::CORBA::SystemException& ex)
+  catch (const ::CORBA::SystemException& ex)
     {
       if (TAO_debug_level >= 4)
         {
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 72da515ac70..696239a07b3 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -47,15 +47,13 @@ public:
   //   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_THROW_SPEC ((CORBA::SystemException));
+                                          CORBA::ORB_ptr orb);
 
  private:
    virtual CORBA::Object_ptr
    parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                         ACE_CString &key_string
-                                        )
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                        );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h
index 23dea30b172..c03f9cd8c0e 100644
--- a/TAO/tao/CORBA_methods.h
+++ b/TAO/tao/CORBA_methods.h
@@ -50,22 +50,12 @@ namespace CORBA
   typedef OperationDef *OperationDef_ptr;
 
   /**
-   * @name ORB Initialization
-   *
-   * These could be combined into a single version using an environment macro.
-   *
+   * ORB Initialization
    */
-  //@{
   extern TAO_Export ORB_ptr ORB_init (int & argc,
                                       char * argv[],
                                       const char * orb_name = 0);
 
-  extern TAO_Export ORB_ptr ORB_init (int & argc,
-                                      char * argv[],
-                                      const char * orb_name,
-                                      Environment & ACE_TRY_ENV);
-  //@}
-
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
 
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index b569936fffc..c4e6085140f 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -73,15 +73,14 @@ TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper()
 // Assumes that the servant argument is not a NULL pointer.
 void
 TAO::CSD::FW_Server_Request_Wrapper::dispatch
-                                            (PortableServer::Servant servant
-                                             )
+                                            (PortableServer::Servant servant)
 {
   try
     {
       servant->_dispatch(*this->request_, 0);
     }
   // Only CORBA exceptions are caught here.
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (this->request_->collocated())
         {
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
index 13d78a1664c..24498085725 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+#include "tao/SystemException.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index 35dde4c21ea..b9c56ea4445 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -25,8 +25,7 @@ TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter ()
 void
 TAO_CSD_Object_Adapter::do_dispatch (
   TAO_ServerRequest& req,
-  TAO::Portable_Server::Servant_Upcall& upcall
-  )
+  TAO::Portable_Server::Servant_Upcall& upcall)
 {
   TAO_Root_POA& poa = upcall.poa ();
   TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa);
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index c9d3a08c683..3dae3d33cf3 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -41,8 +41,7 @@ TAO_CSD_Object_Adapter_Factory::create (TAO_ORB_Core *oc)
 }
 
 int
-TAO_CSD_Object_Adapter_Factory::init (int /* argc */,
-                                  ACE_TCHAR* /* argv */ [])
+TAO_CSD_Object_Adapter_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   TAO_CSD_Strategy_Repository *repo =
     ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index aa35f6d9995..d2f8656b11b 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -19,13 +19,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Implementation skeleton constructor
 TAO_CSD_POA::TAO_CSD_POA (const String &name,
                           PortableServer::POAManager_ptr poa_manager,
-                   const TAO_POA_Policy_Set &policies,
-                   TAO_Root_POA *parent,
-                   ACE_Lock &lock,
-                   TAO_SYNCH_MUTEX &thread_lock,
-                   TAO_ORB_Core &orb_core,
-                   TAO_Object_Adapter *object_adapter
-                   )
+                          const TAO_POA_Policy_Set &policies,
+                          TAO_Root_POA *parent,
+                          ACE_Lock &lock,
+                          TAO_SYNCH_MUTEX &thread_lock,
+                          TAO_ORB_Core &orb_core,
+                          TAO_Object_Adapter *object_adapter)
 : TAO_Regular_POA (name,
                    poa_manager,
                    policies,
@@ -33,8 +32,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name,
                    lock,
                    thread_lock,
                    orb_core,
-                   object_adapter
-                  )
+                   object_adapter)
 {
   ACE_NEW_THROW_EX (this->sds_proxy_,
                     TAO::CSD::Strategy_Proxy (),
@@ -48,13 +46,7 @@ TAO_CSD_POA::~TAO_CSD_POA (void)
   delete this->sds_proxy_;
 }
 
-void TAO_CSD_POA::set_csd_strategy (
-    ::CSD_Framework::Strategy_ptr strategy
-
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+void TAO_CSD_POA::set_csd_strategy (::CSD_Framework::Strategy_ptr strategy)
 {
   if (CORBA::is_nil (strategy))
     {
@@ -71,8 +63,7 @@ TAO_CSD_POA::new_POA (const String &name,
                       ACE_Lock &lock,
                       TAO_SYNCH_MUTEX &thread_lock,
                       TAO_ORB_Core &orb_core,
-                      TAO_Object_Adapter *object_adapter
-                      )
+                      TAO_Object_Adapter *object_adapter)
 {
   TAO_CSD_POA *poa = 0;
 
@@ -91,7 +82,6 @@ TAO_CSD_POA::new_POA (const String &name,
   TAO_CSD_Strategy_Repository *repo =
     ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
 
-
   CSD_Framework::Strategy_var strategy = repo->find (name);
 
   if (! ::CORBA::is_nil (strategy.in ()))
@@ -113,15 +103,13 @@ void TAO_CSD_POA::poa_deactivated_hook ()
 }
 
 void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant,
-                               const PortableServer::ObjectId& oid
-                               )
+                               const PortableServer::ObjectId& oid)
 {
   this->sds_proxy_->servant_activated_event (servant, oid);
 }
 
 void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 )
+                                 const PortableServer::ObjectId& oid)
 {
   this->sds_proxy_->servant_deactivated_event (servant, oid);
 }
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 6ad06f92dde..e6ddec124cc 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -41,26 +41,19 @@ public:
   //Constructor
   TAO_CSD_POA (const String &name,
                PortableServer::POAManager_ptr poa_manager,
-              const TAO_POA_Policy_Set &policies,
-              TAO_Root_POA *parent,
-              ACE_Lock &lock,
-              TAO_SYNCH_MUTEX &thread_lock,
-              TAO_ORB_Core &orb_core,
-              TAO_Object_Adapter *object_adapter
-             );
+               const TAO_POA_Policy_Set &policies,
+               TAO_Root_POA *parent,
+               ACE_Lock &lock,
+               TAO_SYNCH_MUTEX &thread_lock,
+               TAO_ORB_Core &orb_core,
+               TAO_Object_Adapter *object_adapter);
 
   //Destructor
   virtual ~TAO_CSD_POA (void);
 
   /// Pass the Strategy object reference to the CSD poa.
   virtual
-  void set_csd_strategy (
-      ::CSD_Framework::Strategy_ptr s
-
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  void set_csd_strategy (::CSD_Framework::Strategy_ptr s);
 
   /// Hook - The POA has been (or is being) activated.
   virtual void poa_activated_hook ();
@@ -70,13 +63,11 @@ public:
 
   /// Hook - A servant has been activated.
   virtual void servant_activated_hook (PortableServer::Servant servant,
-                              const PortableServer::ObjectId& oid
-                             );
+                              const PortableServer::ObjectId& oid);
 
   /// Hook - A servant has been deactivated.
   virtual void servant_deactivated_hook (PortableServer::Servant servant,
-                                const PortableServer::ObjectId& oid
-                               );
+                                const PortableServer::ObjectId& oid);
 
   ///Method for creating new CSD POA.
   TAO_Root_POA * new_POA (const String &name,
@@ -86,8 +77,7 @@ public:
                           ACE_Lock &lock,
                           TAO_SYNCH_MUTEX &thread_lock,
                           TAO_ORB_Core &orb_core,
-                          TAO_Object_Adapter *object_adapter
-                         );
+                          TAO_Object_Adapter *object_adapter);
 
   /// Servant Dispatching Strategy proxy accessor.
   TAO::CSD::Strategy_Proxy&
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index 2e0a1bbc2e3..09a00e16ddd 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -23,9 +23,7 @@ TAO::CSD::Strategy_Base::~Strategy_Base()
 }
 
 CORBA::Boolean
-TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
-                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa)
 {
   if (CORBA::is_nil(poa))
     {
@@ -84,7 +82,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
       poa_impl->set_csd_strategy (this);
       strategy_set = true;
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
@@ -111,8 +109,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
 void
 TAO::CSD::Strategy_Base::servant_activated_event_i
                                 (PortableServer::Servant ,
-                                 const PortableServer::ObjectId&
-                                 )
+                                 const PortableServer::ObjectId&)
 {
   // do nothing.
 }
@@ -121,8 +118,7 @@ TAO::CSD::Strategy_Base::servant_activated_event_i
 void
 TAO::CSD::Strategy_Base::servant_deactivated_event_i
                                 (PortableServer::Servant,
-                                 const PortableServer::ObjectId&
-                                 )
+                                 const PortableServer::ObjectId&)
 {
   // do nothing.
 }
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index 81576348520..2be8ab259fa 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -77,8 +77,7 @@ namespace TAO
 
       /// This method is invoked to "attach" this strategy object to
       /// the supplied POA.  Returns true for success, and false for failure.
-      CORBA::Boolean apply_to(PortableServer::POA_ptr poa )
-        ACE_THROW_SPEC((CORBA::SystemException));
+      CORBA::Boolean apply_to(PortableServer::POA_ptr poa );
 
     protected:
       /// Default Constructor.
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
index d3b40bfcef9..b68910e87ab 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
@@ -16,8 +16,7 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Base::dispatch_request
                          (TAO_ServerRequest& server_request,
-                          TAO::Portable_Server::Servant_Upcall& upcall
-                          )
+                          TAO::Portable_Server::Servant_Upcall& upcall)
 {
   DispatchResult result;
 
@@ -27,8 +26,7 @@ TAO::CSD::Strategy_Base::dispatch_request
                                                    upcall.user_id(),
                                                    this->poa_.in(),
                                                    server_request.operation(),
-                                                   upcall.servant()
-                                                  );
+                                                   upcall.servant());
     }
   else
     {
@@ -36,8 +34,7 @@ TAO::CSD::Strategy_Base::dispatch_request
                                                upcall.user_id(),
                                                this->poa_.in(),
                                                server_request.operation(),
-                                               upcall.servant()
-                                              );
+                                               upcall.servant());
     }
 
   switch (result)
@@ -69,9 +66,7 @@ TAO::CSD::Strategy_Base::dispatch_request
       case DISPATCH_DEFERRED:
         // Perform the "default" dispatching strategy logic for this request
         // right now, using the current thread.
-        upcall.servant()->_dispatch(server_request,
-                                    (void*)&upcall
-                                   );
+        upcall.servant()->_dispatch(server_request, (void*)&upcall);
         break;
 
       default:
@@ -120,8 +115,7 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Base::servant_activated_event
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 )
+                                 const PortableServer::ObjectId& oid)
 {
   this->servant_activated_event_i(servant, oid);
 }
@@ -130,8 +124,7 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Base::servant_deactivated_event
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 )
+                                 const PortableServer::ObjectId& oid)
 {
   this->servant_deactivated_event_i(servant, oid);
 }
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
index 68bd0b7ee6a..102122f33de 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
@@ -20,23 +20,18 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Proxy::dispatch_request
                                 (TAO_ServerRequest& server_request,
-                                 TAO::Portable_Server::Servant_Upcall& upcall
-                                 )
+                                 TAO::Portable_Server::Servant_Upcall& upcall)
 {
 
   if (this->strategy_impl_ == 0)
     {
       // This is the "default" strategy implementation.
-      upcall.servant()->_dispatch(server_request,
-                                  (void*)&upcall
-                                 );
+      upcall.servant()->_dispatch(server_request, (void*)&upcall);
     }
   else
     {
       // Delegate to the custom strategy object.
-      this->strategy_impl_->dispatch_request(server_request,
-                                             upcall
-                                            );
+      this->strategy_impl_->dispatch_request(server_request, upcall);
     }
 }
 
@@ -67,16 +62,13 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Proxy::servant_activated_event
                                   (PortableServer::Servant servant,
-                                   const PortableServer::ObjectId& oid
-                                   )
+                                   const PortableServer::ObjectId& oid)
 {
   // We only need to do something if this proxy holds a custom strategy.
   if (this->strategy_impl_)
     {
       // Delegate to the custom strategy object.
-      this->strategy_impl_->servant_activated_event(servant,
-                                               oid
-                                              );
+      this->strategy_impl_->servant_activated_event(servant, oid);
     }
 }
 
@@ -84,16 +76,13 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Proxy::servant_deactivated_event
                                   (PortableServer::Servant servant,
-                                   const PortableServer::ObjectId& oid
-                                   )
+                                   const PortableServer::ObjectId& oid)
 {
   // We only need to do something if this proxy holds a custom strategy.
   if (this->strategy_impl_)
     {
       // Delegate to the custom strategy object.
-      this->strategy_impl_->servant_deactivated_event(servant,
-                                                 oid
-                                                );
+      this->strategy_impl_->servant_deactivated_event(servant, oid);
     }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
index 3cc1e6c5a38..57854bd9aa8 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
@@ -14,17 +14,7 @@ ACE_INLINE
 TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant)
   : servant_(servant)
 {
-  // This try-catch block is not really necessary for current implementation
-  // since the _add_ref does not throw exception, but we have to add it to
-  // satisfy the non-exception builds. If _add_ref really throws an exception
-  // then this constructor needs deal with the exception.
-  try
-  {
-    this->servant_->_add_ref ();
-  }
-  catch (...)
-  {
-  }
+  this->servant_->_add_ref ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
index 929eef12517..ff94e678bb3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
@@ -32,7 +32,7 @@ TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i()
     {
       this->do_dispatch();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index 4afb762975f..aff5665bd2b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -26,7 +26,7 @@ TAO::CSD::TP_Collocated_Synch_Request::dispatch_i()
     {
       this->do_dispatch();
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       // We need to save off a copy of the exception.
       this->exception_ = ex._tao_duplicate();
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
index 64d74dd7e53..1da58c328c0 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
@@ -44,7 +44,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i()
     {
       this->do_dispatch();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
index 56637eeb6ac..603f8eae77a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
@@ -24,7 +24,7 @@ TAO::CSD::TP_Custom_Asynch_Request::dispatch_i()
     {
       this->execute_op();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
index 52bca678d8c..7c266f21c6b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
@@ -9,23 +9,13 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation
                                           (PortableServer::Servant servant)
 : servant_ (servant)
 {
-  // This try-catch block is not really necessary for current implementation
-  // since the _add_ref does not throw exception, but we have to add it to
-  // satisfy the non-exception builds. If _add_ref really throws an exception
-  // then this constructor needs deal with the exception.
-  try
-  {
-    this->servant_->_add_ref ();
-  }
-  catch (...)
-  {
-  }
+  this->servant_->_add_ref ();
 }
 
 
 ACE_INLINE
 void
-TAO::CSD::TP_Custom_Request_Operation::execute()
+TAO::CSD::TP_Custom_Request_Operation::execute (void)
 {
   this->execute_i();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
index 44d405d7fc3..036a804beac 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
@@ -31,7 +31,7 @@ TAO::CSD::TP_Remote_Request::dispatch_i()
     {
       this->do_dispatch();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
index 0d7335ae9a0..2661a54453c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
@@ -12,17 +12,7 @@ TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant,
     servant_ (servant),
     servant_state_(servant_state, false)
 {
-  // This try-catch block is not really necessary for current implementation
-  // since the _add_ref does not throw exception, but we have to add it to
-  // satisfy the non-exception builds. If _add_ref really throws an exception
-  // then this constructor needs deal with the exception.
-  try
-  {
-    this->servant_->_add_ref ();
-  }
-  catch (...)
-  {
-  }
+  this->servant_->_add_ref ();
 }
 
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
index 1b1e35aba91..ed238fdc25f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
@@ -26,7 +26,7 @@ TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant)
 
   if (this->map_.find(key, value) != 0)
     {
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (), 0);
+      throw PortableServer::POA::ServantNotActive ();
     }
 
   return value._retn();
@@ -41,7 +41,7 @@ TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant)
 
   TP_Servant_State::HandleType value = new TP_Servant_State ();
 
-  int result = this->map_.bind(key, value);
+  int const result = this->map_.bind(key, value);
 
   if (result == 1)
     {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 4ac811786ac..b931e2d7727 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -26,12 +26,10 @@ TAO::CSD::TP_Strategy::~TP_Strategy()
 
 
 TAO::CSD::TP_Strategy::CustomRequestOutcome
-TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op
-                                            )
+TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op)
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant()
-                                               );
+                        this->get_servant_state(op->servant());
 
   TP_Custom_Synch_Request_Handle request = new
                           TP_Custom_Synch_Request(op, servant_state.in());
@@ -48,12 +46,10 @@ TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op
 
 
 TAO::CSD::TP_Strategy::CustomRequestOutcome
-TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op
-                                             )
+TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op)
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant()
-                                               );
+                        this->get_servant_state(op->servant());
 
   TP_Custom_Asynch_Request_Handle request = new
                           TP_Custom_Asynch_Request(op, servant_state.in());
@@ -89,12 +85,10 @@ TAO::CSD::TP_Strategy::dispatch_remote_request_i
                               const PortableServer::ObjectId& object_id,
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
-                              PortableServer::Servant         servant
-                              )
+                              PortableServer::Servant         servant)
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(servant
-                                               );
+                        this->get_servant_state(servant);
 
   // Now we can create the TP_Remote_Request object, and then add it to our
   // task_'s "request queue".
@@ -129,12 +123,10 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
                               const PortableServer::ObjectId& object_id,
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
-                              PortableServer::Servant         servant
-                              )
+                              PortableServer::Servant         servant)
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(servant
-                                               );
+                        this->get_servant_state(servant);
 
   bool is_sync_with_server = server_request.sync_with_server();
   bool is_synchronous      = server_request.response_expected();
@@ -201,7 +193,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
       if (srw == false)
         {
           // Raise exception when request was cancelled.
-          ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED);
+          throw ::CORBA::NO_IMPLEMENT();
         }
     }
   else if (!synch_with_server_request.is_nil())
@@ -210,7 +202,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
       if (swsr == false)
         {
           // Raise exception when request was cancelled.
-          ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED);
+          throw ::CORBA::NO_IMPLEMENT();
         }
     }
 
@@ -221,11 +213,8 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
 void
 TAO::CSD::TP_Strategy::servant_activated_event_i
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 )
+                                 const PortableServer::ObjectId&)
 {
-  ACE_UNUSED_ARG(oid);
-
   if (this->serialize_servants_)
     {
       // Add the servant to the servant state map.
@@ -237,11 +226,8 @@ TAO::CSD::TP_Strategy::servant_activated_event_i
 void
 TAO::CSD::TP_Strategy::servant_deactivated_event_i
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 )
+                                 const PortableServer::ObjectId&)
 {
-  ACE_UNUSED_ARG(oid);
-
   // Cancel all requests stuck in the queue for the specified servant.
   this->task_.cancel_servant(servant);
 
@@ -254,8 +240,7 @@ TAO::CSD::TP_Strategy::servant_deactivated_event_i
 
 
 void
-TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant
-                                       )
+TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant)
 {
   // Cancel all requests stuck in the queue for the specified servant.
   this->task_.cancel_servant(servant);
@@ -263,15 +248,13 @@ TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant
 
 
 TAO::CSD::TP_Servant_State::HandleType
-TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant
-                                         )
+TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant)
 {
   TP_Servant_State::HandleType servant_state;
 
   if (this->serialize_servants_)
     {
-      servant_state = this->servant_state_map_.find(servant
-                                                   );
+      servant_state = this->servant_state_map_.find(servant);
     }
 
   return servant_state;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index b38514d6ce7..5ce745c230e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -228,9 +228,6 @@ TAO::CSD::TP_Task::svc()
       // handle falls out of scope and its destructor performs the
       // _remove_ref() call on the underlying TP_Request object.
     }
-
-  // This will never get executed.
-  return 0;
 }
 
 
@@ -299,8 +296,7 @@ TAO::CSD::TP_Task::close(u_long flag)
 
 
 void
-TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant
-                                   )
+TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant)
 {
   GuardType guard(this->lock_);
 
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index 9b89b0f32d8..72d4e72d7e7 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -13,9 +13,8 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Cleanup_Func_Registry::register_cleanup_function (
-  ACE_CLEANUP_FUNC func,
-  size_t &slot_id)
+TAO_Cleanup_Func_Registry::register_cleanup_function (ACE_CLEANUP_FUNC func,
+                                                      size_t &slot_id)
 {
   size_t const slot = this->cleanup_funcs_.size ();
 
@@ -29,7 +28,7 @@ TAO_Cleanup_Func_Registry::register_cleanup_function (
 }
 
 void
-TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects)
+TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base <void *> &ts_objects)
 {
   size_t const len = ts_objects.size ();
 
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index c3b86edf0a2..95a383058f0 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -26,9 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-#include "tao/SystemException.h"
 #include "tao/Invocation_Utils.h"
+#include "tao/Basic_Types.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -77,34 +76,28 @@ namespace TAO
     //@{
     /// This method implements one of the "starting" client side
     /// interception points.
-    virtual void send_request (Invocation_Base &invocation
-                               ) = 0;
+    virtual void send_request (Invocation_Base &invocation) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_reply (Invocation_Base &invocation
-                                ) = 0;
+    virtual void receive_reply (Invocation_Base &invocation) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_exception (Invocation_Base &invocation
-                                    ) = 0;
+    virtual void receive_exception (Invocation_Base &invocation) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_other (Invocation_Base &invocation
-                                ) = 0;
+    virtual void receive_other (Invocation_Base &invocation) = 0;
 
     /// Register an interceptor.
     virtual void add_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ) = 0;
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor) = 0;
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      ) = 0;
+      const CORBA::PolicyList& policies) = 0;
 
     virtual void destroy_interceptors (void) = 0;
 
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index f9d9f5512d7..da5a118fbbd 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -19,8 +19,7 @@ TAO_Client_Strategy_Factory::create_profile_lock (void)
 TAO_Configurable_Refcount
 TAO_Client_Strategy_Factory::create_profile_refcount (void)
 {
-  return TAO_Configurable_Refcount (
-                  TAO_Configurable_Refcount::TAO_NULL_LOCK);
+  return TAO_Configurable_Refcount (TAO_Configurable_Refcount::TAO_NULL_LOCK);
 }
 
 TAO_Transport_Mux_Strategy *
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index e1913041383..6caf233bb55 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
 
 
 ACE_RCSID (CodecFactory,
@@ -43,13 +44,9 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
 }
 
 CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
-                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::InvalidTypeForEncoding))
+TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data)
 {
-  this->check_type_for_encoding (data
-                                );
+  this->check_type_for_encoding (data);
 
   // ----------------------------------------------------------------
 
@@ -101,14 +98,11 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
       return safe_octet_seq._retn ();
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+  throw ::CORBA::MARSHAL ();
 }
 
 CORBA::Any *
-TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
-                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::FormatMismatch))
+TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data)
 {
   // @todo How do we check for a format mismatch so that we can throw
   //       a IOP::Codec::FormatMismatch exception?
@@ -164,18 +158,13 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
         return safe_any._retn ();
     }
 
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
-                    0);
+  throw IOP::Codec::FormatMismatch ();
 }
 
 CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
-                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::InvalidTypeForEncoding))
+TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data)
 {
-  this->check_type_for_encoding (data
-                                );
+  this->check_type_for_encoding (data);
 
   // ----------------------------------------------------------------
   TAO_OutputCDR cdr ((size_t) 0,            // size
@@ -202,17 +191,19 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
 
       if (impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *unk =
+          TAO::Unknown_IDL_Type * const unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+          if (!unk)
+            throw ::CORBA::INTERNAL ();
+
           // We don't want unk's rd_ptr to move, in case we are shared by
           // another Any, so we use this to copy the state, not the buffer.
           TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
           TAO_Marshal_Object::perform_append (data._tao_get_typecode (),
                                               &for_reading,
-                                              &cdr
-                                             );
+                                              &cdr);
         }
       else
         {
@@ -252,17 +243,12 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
       return safe_octet_seq._retn ();
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    0);
+  throw ::CORBA::MARSHAL ();
 }
 
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
-                                    CORBA::TypeCode_ptr tc
-                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::FormatMismatch,
-                   IOP::Codec::TypeMismatch))
+                                    CORBA::TypeCode_ptr tc)
 {
   // The ACE_CDR::mb_align() call can shift the rd_ptr by up
   // to ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset
@@ -339,15 +325,11 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
       return safe_any._retn ();
     }
 
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
-                    0);
+  throw IOP::Codec::FormatMismatch ();
 }
 
 void
-TAO_CDR_Encaps_Codec::check_type_for_encoding (
-    const CORBA::Any & data
-
-  )
+TAO_CDR_Encaps_Codec::check_type_for_encoding (const CORBA::Any & data)
 {
   // @@ TODO: Are there any other conditions we need to check?
 
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 5d051df1f75..d65cebb3340 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -58,33 +58,20 @@ public:
 
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
-  virtual CORBA::OctetSeq * encode (const CORBA::Any & data
-                                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::InvalidTypeForEncoding));
+  virtual CORBA::OctetSeq * encode (const CORBA::Any & data);
 
   /// Extract the TypeCode and the value from the octet sequence and
   /// place them into an Any.
-  virtual CORBA::Any * decode (const CORBA::OctetSeq & data
-                               )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::FormatMismatch));
+  virtual CORBA::Any * decode (const CORBA::OctetSeq & data);
 
   /// Encode the given data, excluding the TypeCode, into an octet
   /// sequence.
-  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::InvalidTypeForEncoding));
+  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data);
 
   /// Extract the value from the octet sequence, based on the given
   /// TypeCode,  and place it into an Any.
   virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
-                                     CORBA::TypeCode_ptr tc
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::FormatMismatch,
-                     IOP::Codec::TypeMismatch));
+                                     CORBA::TypeCode_ptr tc);
 
 protected:
 
@@ -102,8 +89,7 @@ protected:
    * that isn't supported for the version of GIOP associated with this
    * Codec.
    */
-  void check_type_for_encoding (const CORBA::Any & data
-                               );
+  void check_type_for_encoding (const CORBA::Any & data);
 
 private:
 
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index 454a4e11df0..21e34543ebc 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -21,14 +21,9 @@ ACE_RCSID (CodecFactory,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
-TAO_CodecFactory_Loader::create_object (
-  CORBA::ORB_ptr orb,
-  int,
-  ACE_TCHAR *[]
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_CodecFactory_Loader::create_object (CORBA::ORB_ptr orb,  int, ACE_TCHAR *[])
 {
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+  CORBA::Object_ptr obj = CORBA::Object_ptr ();
   ACE_NEW_RETURN (obj,
                   TAO_CodecFactory (orb->orb_core ()),
                   CORBA::Object::_nil ());
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 2c49a66f1ea..19c641fa948 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -38,9 +38,7 @@ public:
   /// Creates a Codec factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index f771c9f2d2c..1e27c3affe9 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Codeset_Manager.h"
 #include "ace/Codeset_Symbols.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (CodecFactory_impl,
            CodecFactory,
@@ -22,11 +23,7 @@ TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
 }
 
 IOP::Codec_ptr
-TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
-                                              )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::CodecFactory::UnknownEncoding,
-                     IOP::CodecFactory::UnsupportedCodeset))
+TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc)
 {
   TAO_Codeset_Translator_Base *char_trans = 0;
   TAO_Codeset_Translator_Base *wchar_trans = 0;
@@ -44,48 +41,37 @@ TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
   else
     {
       // No codeset manager, so also raise an unsupported codeset
-      ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset (
-                          enc.wchar_codeset),
-                        IOP::Codec::_nil ());
+      throw IOP::CodecFactory::UnsupportedCodeset (enc.wchar_codeset);
     }
 
   if (wchar_trans == 0 &&
       enc.wchar_codeset != ACE_CODESET_ID_ISO_UTF_16 &&
       enc.wchar_codeset != ncsw)
     {
-      ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset (
-                          enc.wchar_codeset),
-                        IOP::Codec::_nil ());
+      throw IOP::CodecFactory::UnsupportedCodeset (enc.wchar_codeset);
     }
 
   if (char_trans == 0 &&
       enc.char_codeset != ncsc)
     {
-      ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset (
-                          enc.char_codeset),
-                        IOP::Codec::_nil ());
+      throw IOP::CodecFactory::UnsupportedCodeset (enc.char_codeset);
     }
 
   return this->create_codec_i (enc.major_version,
                                enc.minor_version,
                                enc.format,
                                char_trans,
-                               wchar_trans
-                              );
+                               wchar_trans);
 }
 
 IOP::Codec_ptr
-TAO_CodecFactory::create_codec (const IOP::Encoding & enc
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::CodecFactory::UnknownEncoding))
+TAO_CodecFactory::create_codec (const IOP::Encoding & enc)
 {
   return this->create_codec_i (enc.major_version,
                                enc.minor_version,
                                enc.format,
                                0,
-                               0
-                              );
+                               0);
 }
 
 IOP::Codec_ptr
@@ -93,10 +79,7 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
                                   CORBA::Octet minor,
                                   IOP::EncodingFormat encoding_format,
                                   TAO_Codeset_Translator_Base * char_trans,
-                                  TAO_Codeset_Translator_Base * wchar_trans
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::CodecFactory::UnknownEncoding))
+                                  TAO_Codeset_Translator_Base * wchar_trans)
 {
   // @todo: Ideally we should have some sort of CodecFactory
   //        registry to make it possible to add factories
@@ -117,12 +100,11 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
       if (major < 1)
         {
           // There is no such thing as a "0.x" CDR encapsulation.
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            IOP::Codec::_nil ());
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              0,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       ACE_NEW_THROW_EX (codec,
@@ -139,8 +121,7 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
       break;
 
     default:
-      ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (),
-                        IOP::Codec::_nil ());
+      throw IOP::CodecFactory::UnknownEncoding ();
 
     }
 
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 1aa638deb0f..28096592063 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -52,17 +52,10 @@ public:
   TAO_CodecFactory (TAO_ORB_Core * orb_core);
 
   /// Create a Coder/Decoder for the given type of encoding.
-  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::CodecFactory::UnknownEncoding));
+  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc);
 
   /// Create a Coder/Decoder for the given type of encoding and codesets.
-  virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc
-                                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::CodecFactory::UnknownEncoding,
-                     IOP::CodecFactory::UnsupportedCodeset));
+  virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc);
 
 private:
   /// Prevent copying through the copy constructor and the assignment
@@ -74,10 +67,7 @@ private:
                                  CORBA::Octet minor,
                                  IOP::EncodingFormat encoding_format,
                                  TAO_Codeset_Translator_Base * char_trans,
-                                 TAO_Codeset_Translator_Base * wchar_trans
-                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::CodecFactory::UnknownEncoding));
+                                 TAO_Codeset_Translator_Base * wchar_trans);
 private:
 
   /// Pointer to the ORB Core.
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index cede07a2aa3..703bad8af7c 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao/Codeset
-//
-// = FILENAME
-//    Codeset_Translator_Factory.cpp
-//
-// = DESCRIPTION
-//    The base for all the translator factories. Translator factories are
-//    responsible for supplying the proper translator on demand.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Codeset_Descriptor.cpp
+ *
+ *  $Id$
+ *
+ *  The base for all the translator factories. Translator factories are
+ *  responsible for supplying the proper translator on demand.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "tao/Codeset/Codeset_Descriptor.h"
 #include "tao/Codeset/Codeset_Translator_Factory.h"
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
index 7f89626dc47..fc476c15e4c 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -19,19 +19,19 @@ ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
+TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void)
 {
 }
 
 bool
-TAO_Codeset_Manager_Factory::is_default() const
+TAO_Codeset_Manager_Factory::is_default (void) const
 {
   return false;
 }
 
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory::create ()
+TAO_Codeset_Manager_Factory::create (void)
 {
   TAO_Codeset_Manager_i *csm = 0;
   ACE_NEW_RETURN (csm, TAO_Codeset_Manager_i, 0);
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 01363024a40..43df345a0e7 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -327,7 +327,7 @@ TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote,
         }
       else
         {
-          ACE_THROW_RETURN(CORBA::CODESET_INCOMPATIBLE (), 0);
+          throw ::CORBA::CODESET_INCOMPATIBLE ();
         }
     }
 
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
index bd3a915c51d..a85b08a7a47 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -1,21 +1,20 @@
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao/Codeset
-//
-// = FILENAME
-//    Codeset_Translator_Factory.cpp
-//
-// = DESCRIPTION
-//    The base for all the translator factories. Translator factories are
-//    responsible for supplying the proper translator on demand.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Codeset_Translator_Factory.cpp
+ *
+ *  $Id$
+
+ *
+ *  The base for all the translator factories. Translator factories are
+ *  responsible for supplying the proper translator on demand.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "tao/Codeset/Codeset_Translator_Factory.h"
 #include "tao/CDR.h"
@@ -45,8 +44,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_InputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
+    ACE_Char_Codeset_Translator *trans) const
 {
   cdr->char_translator(trans);
 }
@@ -54,8 +52,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_OutputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
+    ACE_Char_Codeset_Translator *trans) const
 {
   cdr->char_translator(trans);
 }
@@ -63,8 +60,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_InputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
+    ACE_WChar_Codeset_Translator *trans) const
 {
   cdr->wchar_translator(trans);
 }
@@ -72,8 +68,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_OutputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
+    ACE_WChar_Codeset_Translator *trans) const
 {
   cdr->wchar_translator(trans);
 }
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
index 734417e9934..69f842bf574 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao
-//
-// = FILENAME
-//    Codeset_Translator_Factory_T.cpp
-//
-// = DESCRIPTION
-//    The template for creating a particular instance of a codeset translator
-//
-// = AUTHORS
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Codeset_Translator_Factory_T.cpp
+ *
+ *  $Id$
+ *
+ *  The template for creating a particular instance of a codeset translator
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
index 1140d84a6bb..4798a1f84d4 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = FILENAME
-//    UTF16_BOM_Factory.cpp
-//
-// = DESCRIPTION
-//    Loader for an instance of the UTF16_BOM_Translator.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UTF16_BOM_Factory.cpp
+ *
+ *  $Id$
+ *
+ *  Loader for an instance of the UTF16_BOM_Translator.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "tao/debug.h"
 #include "tao/Codeset/UTF16_BOM_Factory.h"
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h
index a72652a7458..d499744e9f6 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UTF16_BOM_Factory.h
-//
-// = DESCRIPTION
-//    Loader for an instance of the UTF16_BOM_Translator.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    UTF16_BOM_Factory.h
+ *
+ *  $Id$
+ *
+ *  Loader for an instance of the UTF16_BOM_Translator.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef UTF16_BOM_FACTORY_H
 #define UTF16_BOM_FACTORY_H
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
index 204a1dc0bd6..f3ee379e598 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    UTF8_Latin1_Translator.cpp
-//
-// = DESCRIPTION
-//    Defines the methods required to convert UTF-8 based unicode strings
-//    to the Latin-1 codeset.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UTF8_Latin1_Translator.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the methods required to convert UTF-8 based unicode strings
+ *  to the Latin-1 codeset.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 #include "tao/Codeset/UTF8_Latin1_Translator.h"
 #include "tao/debug.h"
 #include "ace/OS_Memory.h"
diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp
index e72a02359f3..b6a863d3829 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -1,21 +1,20 @@
 // -*- C++ -*-
 
-// =====================================================================
-//
-// = LIBRARY
-//    TAO/tao
-//
-// = FILENAME
-//    Codeset_Translator_Base.cpp
-//
-// = DESCRIPTION The base for all the translator factories. Translator
-// factories are responsible for supplying the proper translator on
-// demand.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// =====================================================================
+//=============================================================================
+/**
+ *  @file    Codeset_Translator_Base.cpp
+ *
+ *  $Id$
+
+ *
+ * factories are responsible for supplying the proper translator on
+ * demand.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "tao/Codeset_Translator_Base.h"
 
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index ee4d5e23f80..e0fb30328f5 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -5,6 +5,8 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/Stub.h"
 #include "tao/operation_details.h"
+#include "tao/PortableInterceptor.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/PortableInterceptorC.h"
@@ -35,15 +37,13 @@ namespace TAO
 
   Invocation_Status
   Collocated_Invocation::invoke (Collocation_Proxy_Broker *cpb,
-                                 Collocation_Strategy strat
-                                 )
+                                 Collocation_Strategy strat)
   {
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
     /// Start the interception point
 #if TAO_HAS_INTERCEPTORS == 1
-    s =
-      this->send_request_interception ();
+    s = this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -74,8 +74,7 @@ namespace TAO
 
             dispatcher->dispatch (orb_core,
                                   request,
-                                  this->forwarded_to_.out ()
-                                 );
+                                  this->forwarded_to_.out ());
           }
         else
           {
@@ -85,8 +84,7 @@ namespace TAO
                            this->details_.args_num (),
                            this->details_.opname (),
                            this->details_.opname_len (),
-                           strat
-                          );
+                           strat);
           }
 
         // Invocation completed succesfully
@@ -99,24 +97,51 @@ namespace TAO
             if (this->forwarded_to_.in ())
               this->reply_received (TAO_INVOKE_RESTART);
 
-            s =
-              this->receive_other_interception ();
+            s = this->receive_other_interception ();
           }
         // NOTE: Any other condition that needs handling?
         else if (this->response_expected ())
           {
             this->reply_received (TAO_INVOKE_SUCCESS);
 
-            s =
-              this->receive_reply_interception ();
+            s = this->receive_reply_interception ();
           }
         if (s != TAO_INVOKE_SUCCESS)
           return s;
 #endif /*TAO_HAS_INTERCEPTORS */
       }
-    catch ( ::CORBA::Exception& ex)
+    catch ( ::CORBA::UserException& ex)
       {
-        // Ignore exceptions for oneways
+        // Ignore CORBA exceptions for oneways
+        if (this->response_expected_ == false)
+          return TAO_INVOKE_SUCCESS;
+
+#if TAO_HAS_INTERCEPTORS == 1
+        PortableInterceptor::ReplyStatus const status =
+          this->handle_any_exception (&ex);
+
+        if (status == PortableInterceptor::LOCATION_FORWARD ||
+          status == PortableInterceptor::TRANSPORT_RETRY)
+          s = TAO_INVOKE_RESTART;
+        else
+#endif /* TAO_HAS_INTERCEPTORS */
+          {
+            // Check whether the user exception thrown matches the signature
+            // list, if not, then throw an Unknown exception
+            if (!this->details_.has_exception (ex))
+              {
+                throw ::CORBA::UNKNOWN (CORBA::OMGVMCID | 1,
+                                        CORBA::COMPLETED_MAYBE);
+              }
+            else
+             {
+               throw;
+             }
+          }
+      }
+    catch ( ::CORBA::SystemException& TAO_INTERCEPTOR (ex))
+      {
+        // Ignore CORBA exceptions for oneways
         if (this->response_expected_ == false)
           return TAO_INVOKE_SUCCESS;
 
@@ -128,11 +153,24 @@ namespace TAO
             status == PortableInterceptor::TRANSPORT_RETRY)
           s = TAO_INVOKE_RESTART;
         else
-#else
-        ACE_UNUSED_ARG (ex);
-#endif /*TAO_HAS_INTERCEPTORS*/
+#endif /* TAO_HAS_INTERCEPTORS */
+          throw;
+      }
+#if TAO_HAS_INTERCEPTORS == 1
+    catch (...)
+      {
+        // Notify interceptors of non-CORBA exception, and propagate
+        // that exception to the caller.
+        PortableInterceptor::ReplyStatus const st =
+          this->handle_all_exception ();
+
+        if (st == PortableInterceptor::LOCATION_FORWARD ||
+            st == PortableInterceptor::TRANSPORT_RETRY)
+          s = TAO_INVOKE_RESTART;
+        else
           throw;
       }
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
     if (this->forwarded_to_.in () != 0)
       s =  TAO_INVOKE_RESTART;
diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h
index 3a058663906..65f5baba850 100644
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ b/TAO/tao/Collocation_Proxy_Broker.h
@@ -25,7 +25,6 @@
 #include "tao/Collocation_Strategy.h"
 #include /**/ "tao/Versioned_Namespace.h"
 
-#include "ace/CORBA_macros.h"
 #include "ace/os_include/os_stddef.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index 129cfd8f7f1..30aa76ca0f5 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -24,7 +24,6 @@
 #include "tao/Basic_Types.h"
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
index f6b0200bd44..3edbb95de96 100644
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ b/TAO/tao/Compression/Base_Compressor.cpp
@@ -8,31 +8,28 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-BaseCompressor::BaseCompressor (
-  ::Compression::CompressionLevel compression_level,
-  ::Compression::CompressorFactory_ptr compressor_factory) :
+  BaseCompressor::BaseCompressor (::Compression::CompressionLevel
+                                  compression_level,
+                                  ::Compression::CompressorFactory_ptr
+                                  compressor_factory) :
     compression_level_ (compression_level),
-    compressor_factory_ (::Compression::CompressorFactory::_duplicate (compressor_factory))
-{
-}
+    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::CompressorFactory_ptr
+  BaseCompressor::compressor_factory (void)
+  {
+    return ::Compression::CompressorFactory::_duplicate (
+      compressor_factory_.in ());
+  }
 
-::Compression::CompressionLevel
-BaseCompressor::compression_level (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ))
-{
-  return compression_level_;
-}
+  ::Compression::CompressionLevel
+  BaseCompressor::compression_level (void)
+  {
+    return compression_level_;
+  }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h
index a7fb2ad5820..11b4a59c680 100644
--- a/TAO/tao/Compression/Base_Compressor.h
+++ b/TAO/tao/Compression/Base_Compressor.h
@@ -35,41 +35,23 @@ namespace TAO
     public virtual ::Compression::Compressor,
     public virtual TAO_Local_RefCounted_Object
   {
-    public:
+  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_;
+    virtual void compress (const ::CORBA::OctetSeq &source,
+                           ::CORBA::OctetSeq &target) = 0;
+
+    virtual void decompress (const ::CORBA::OctetSeq &source,
+                             ::CORBA::OctetSeq &target) = 0;
+
+    virtual ::Compression::CompressorFactory_ptr compressor_factory (void);
+
+    virtual ::Compression::CompressionLevel compression_level (void);
+
+  protected:
+    ::Compression::CompressionLevel compression_level_;
+    ::Compression::CompressorFactory_var compressor_factory_;
   };
 }
 
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index b5ead7ee850..a70e27186da 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -9,16 +9,12 @@ ACE_RCSID (Compression,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
-TAO_Compression_Loader::create_object (
-  CORBA::ORB_ptr,
-  int,
-  ACE_TCHAR *[])
-    ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Compression_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
   ACE_NEW_RETURN (obj,
-                  TAO::CompressionManager (),
-                  CORBA::Object::_nil ());
+                    TAO::CompressionManager (),
+                    CORBA::Object::_nil ());
   return obj;
 }
 
@@ -26,7 +22,8 @@ TAO_Compression_Loader::create_object (
 int
 TAO_Compression_Loader::Initializer (void)
 {
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Compression_Loader);
+  return ACE_Service_Config::process_directive (
+    ace_svc_desc_TAO_Compression_Loader);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h
index 1e6036571aa..13de9a6d881 100644
--- a/TAO/tao/Compression/Compression.h
+++ b/TAO/tao/Compression/Compression.h
@@ -39,17 +39,16 @@ class TAO_Compression_Export TAO_Compression_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_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc,
+                                           ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
 };
 
 static int
-TAO_Requires_Compression_Initializer = TAO_Compression_Loader::Initializer ();
+  TAO_Requires_Compression_Initializer = TAO_Compression_Loader::Initializer
+  ();
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index 4b84cd53ddd..1d39880f451 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -11,125 +11,108 @@ 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)
-            {
-              throw ::Compression::FactoryAlreadyRegistered ();
-            }
-        }
-      factories_.length (length + 1);
-      factories_[length] = ::Compression::CompressorFactory::_duplicate (compressor_factory);
-    }
-  else
-    {
-      // @todo Standardize this minor code
-      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, CORBA::COMPLETED_NO);
-    }
-}
-
-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
-  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 ();
-
-      if (current != compressor_id)
-        {
-          continue;
-        }
-
-      return ::Compression::CompressorFactory::_duplicate (this->factories_[i]);
-    }
-
-  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;
-}
+  void
+  CompressionManager::register_factory (::Compression::CompressorFactory_ptr
+                                        compressor_factory)
+  {
+    if (!::CORBA::is_nil (compressor_factory))
+      {
+        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->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)
+              {
+                throw ::Compression::FactoryAlreadyRegistered ();
+              }
+          }
+        factories_.length (length + 1);
+        factories_[length] = ::Compression::CompressorFactory::_duplicate (
+          compressor_factory);
+      }
+    else
+      {
+        // @todo Standardize this minor code
+        throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, CORBA::COMPLETED_NO);
+      }
+  }
+
+  void
+  CompressionManager::unregister_factory (::Compression::CompressorId
+                                          compressor_id)
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->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
+    throw ::Compression::UnknownCompressorId ();
+  }
+
+  ::Compression::CompressorFactory_ptr
+  CompressionManager::get_factory (::Compression::CompressorId compressor_id)
+  {
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_,
+        ::Compression::CompressorFactory::_nil ());
+
+    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;
+          }
+
+        return ::Compression::CompressorFactory::_duplicate (
+          this->factories_[i]);
+      }
+
+    throw ::Compression::UnknownCompressorId ();
+  }
+
+  ::Compression::Compressor_ptr
+  CompressionManager::get_compressor (::Compression::CompressorId
+                                      compressor_id,
+                                      ::Compression::CompressionLevel
+                                      compression_level)
+  {
+    ::Compression::CompressorFactory_var factory = this->get_factory (
+      compressor_id);
+
+    return factory->get_compressor (compression_level);
+  }
+
+  ::Compression::CompressorFactorySeq *
+  CompressionManager::get_factories (void)
+  {
+    // todo
+    return 0;
+  }
 
 }
 
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
index 0d56910d5e8..0bd7071a362 100644
--- a/TAO/tao/Compression/Compression_Manager.h
+++ b/TAO/tao/Compression/Compression_Manager.h
@@ -23,7 +23,6 @@
 
 #include "tao/Compression/Compression.h"
 #include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -33,48 +32,24 @@ namespace TAO
     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_;
+    virtual void register_factory (::Compression::CompressorFactory_ptr
+                                   compressor_factory);
+
+    virtual void unregister_factory (::Compression::CompressorId
+                                     compressor_id);
+
+    virtual ::Compression::CompressorFactory_ptr get_factory
+      (::Compression::CompressorId compressor_id);
+
+    virtual ::Compression::Compressor_ptr get_compressor
+      (::Compression::CompressorId compressor_id,
+       ::Compression::CompressionLevel compression_level);
+
+    virtual ::Compression::CompressorFactorySeq *get_factories (void);
+
+  private:
+    TAO_SYNCH_MUTEX mutex_;
+    ::Compression::CompressorFactorySeq factories_;
   };
 }
 
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index 89db794c56f..b7742be3c32 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -8,80 +8,66 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-CompressorFactory::CompressorFactory (::Compression::CompressorId compressor_id) :
-  compressor_id_ (compressor_id),
-  compressed_bytes_ (0),
-  uncompressed_bytes_ (0)
-{
-}
+  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_;
-}
+  ::Compression::CompressorId
+  CompressorFactory::compressor_id (void)
+  {
+    return compressor_id_;
+  }
 
-::CORBA::ULongLong
-CompressorFactory::compressed_bytes (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::ULongLong return_value;
+  ::CORBA::ULongLong
+  CompressorFactory::compressed_bytes (void)
   {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-    return_value = compressed_bytes_;
+    ::CORBA::ULongLong return_value;
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+      return_value = compressed_bytes_;
+    }
+    return return_value;
   }
-  return return_value;
-}
 
-::CORBA::ULongLong
-CompressorFactory::uncompressed_bytes (
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::ULongLong return_value;
+  ::CORBA::ULongLong
+  CompressorFactory::uncompressed_bytes (void)
   {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
-    return_value = uncompressed_bytes_;
+    ::CORBA::ULongLong return_value;
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+      return_value = uncompressed_bytes_;
+    }
+    return return_value;
   }
-  return return_value;
-}
 
-::CORBA::Double
-CompressorFactory::average_compression (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
-{
-  ::CORBA::Double return_value = 0.0;
+  ::CORBA::Double
+  CompressorFactory::average_compression (void)
   {
-    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_);
-      }
+    ::CORBA::Double return_value = 0.0;
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+      if (this->uncompressed_bytes_ > 0)
+        {
+          return_value = static_cast < ::CORBA::Double>(
+            (this->uncompressed_bytes_ - this->compressed_bytes_) /
+            this->uncompressed_bytes_);
+        }
+    }
+    return return_value;
   }
-  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;
-}
+  void
+  CompressorFactory::add_sample (::CORBA::ULongLong compressed_bytes,
+                                 ::CORBA::ULongLong uncompressed_bytes)
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->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
index fa81e71d0dd..99bfdb7c034 100644
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ b/TAO/tao/Compression/Compressor_Factory.h
@@ -23,7 +23,6 @@
 
 #include "tao/Compression/Compression.h"
 #include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -33,48 +32,30 @@ namespace TAO
     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_;
-    };
+  public:
+    CompressorFactory (::Compression::CompressorId compressor_id);
+
+    virtual ::Compression::CompressorId compressor_id (void);
+
+    virtual ::CORBA::ULongLong compressed_bytes (void);
+
+    virtual ::CORBA::ULongLong uncompressed_bytes (void);
+
+    virtual ::CORBA::Double average_compression (void);
+
+    virtual ::Compression::Compressor_ptr get_compressor
+      (::Compression::CompressionLevel compression_level)
+      = 0;
+
+    virtual void add_sample (::CORBA::ULongLong compressed_bytes,
+                             ::CORBA::ULongLong uncompressed_bytes);
+
+  private:
+    TAO_SYNCH_MUTEX mutex_;
+    ::Compression::CompressorId const compressor_id_;
+    ::CORBA::ULongLong compressed_bytes_;
+    ::CORBA::ULongLong uncompressed_bytes_;
+  };
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
index 39c83777f7f..1f2ba5b5080 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
@@ -22,10 +22,6 @@ 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);
@@ -50,10 +46,6 @@ 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 ()),
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.h b/TAO/tao/Compression/zlib/ZlibCompressor.h
index 3ed01b483e6..d1fe33a54f9 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.h
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.h
@@ -39,20 +39,12 @@ namespace TAO
       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
-        ));
+        );
   };
 }
 
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index 40a8119a1d6..0bf8bea4120 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -20,9 +20,6 @@ Zlib_CompressorFactory::Zlib_CompressorFactory (void) :
 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 ()))
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
index e20251af378..ddea95f742b 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
@@ -35,10 +35,7 @@ namespace TAO
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ));
+          );
        private:
          ::Compression::Compressor_var compressor_;
     };
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index 9a79bece571..e382a627ffd 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -26,12 +26,11 @@ TAO_Connect_Strategy::wait (TAO_Connection_Handler *ch,
   if (ch == 0)
     return -1;
 
-  return this->wait_i (ch, ch->transport (),max_wait_time);
+  return this->wait_i (ch, ch->transport (), max_wait_time);
 }
 
 int
-TAO_Connect_Strategy::wait (TAO_Transport *t,
-                            ACE_Time_Value *max_wait_time)
+TAO_Connect_Strategy::wait (TAO_Transport *t, ACE_Time_Value *max_wait_time)
 {
   // Basically the connection was EINPROGRESS, but before we could
   // wait for it some other thread detected a failure and cleaned up
@@ -39,21 +38,21 @@ TAO_Connect_Strategy::wait (TAO_Transport *t,
   if (t == 0)
     return -1;
 
-  return this->wait_i (t->connection_handler(),t,max_wait_time);
+  return this->wait_i (t->connection_handler (), t, max_wait_time);
 }
 
 int
 TAO_Connect_Strategy::wait (TAO_LF_Multi_Event *mev,
                             ACE_Time_Value *max_wait_time)
 {
-  return this->wait_i (mev, mev->base_transport(), max_wait_time);
+  return this->wait_i (mev, mev->base_transport (), max_wait_time);
 }
 
 int
 TAO_Connect_Strategy::poll (TAO_LF_Multi_Event *mev)
 {
-  ACE_Time_Value zero(ACE_Time_Value::zero);
-  return this->wait_i (mev, mev->base_transport(), &zero);
+  ACE_Time_Value zero (ACE_Time_Value::zero);
+  return this->wait_i (mev, mev->base_transport (), &zero);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 70b23c82fa9..0a8337553a5 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -406,6 +406,12 @@ TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
 }
 
 int
+TAO_Connection_Handler::set_dscp_codepoint (CORBA::Long)
+{
+  return 0;
+}
+
+int
 TAO_Connection_Handler::release_os_resources (void)
 {
   return 0;
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 6cc2a558dac..58d50afdf79 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -131,6 +131,7 @@ public:
   /// protocols (UIOP).  Default implementation is for local
   /// protocols.  Remote protocols must overwrite implementation.
   virtual int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+  virtual int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
   /// Release the OS resources related to this handler.
   virtual int release_os_resources (void);
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 835f64d9264..e913da69b29 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -125,12 +125,11 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
 {
   if (!ior)
     // Failure: Null IOR string pointer
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
+    throw ::CORBA::INV_OBJREF (
       CORBA::SystemException::_tao_minor_code (
         0,
         EINVAL),
-      CORBA::COMPLETED_NO),
-      -1);
+      CORBA::COMPLETED_NO);
 
   const TAO_ConnectorSetIterator first_connector = this->begin ();
   const TAO_ConnectorSetIterator last_connector = this->end ();
@@ -151,22 +150,20 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
         }
       else
         // Failure: Null pointer to connector in connector registry.
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (
+        throw ::CORBA::INV_OBJREF (
           CORBA::SystemException::_tao_minor_code (
             0,
             EINVAL),
-          CORBA::COMPLETED_NO),
-          -1);
+          CORBA::COMPLETED_NO);
     }
 
   // Failure: None of the connectors were able to parse the URL style
   // IOR into an MProfile.
-  ACE_THROW_RETURN (CORBA::INV_OBJREF (
-   CORBA::SystemException::_tao_minor_code (
+  throw ::CORBA::INV_OBJREF (
+    CORBA::SystemException::_tao_minor_code (
       TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL,
       0),
-   CORBA::COMPLETED_NO),
-   -1);
+    CORBA::COMPLETED_NO);
 }
 
 TAO_Profile *
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index cc333df6749..3f99720c662 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -22,7 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
 #include "tao/Basic_Types.h"
 #include "ace/Global_Macros.h"
 
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 66d2564c879..f24fecdb592 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -11,7 +11,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            DLL_Parser,
            "$Id$")
@@ -36,7 +35,6 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_DLL_Parser::parse_string (const char *ior,
                               CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
   // called if <match_prefix> returns 1.
@@ -51,13 +49,12 @@ TAO_DLL_Parser::parse_string (const char *ior,
 
   if (loader == 0)
     {
-      ACE_THROW_RETURN
-        (CORBA::INV_OBJREF
+      throw
+         CORBA::INV_OBJREF
          (CORBA::SystemException::_tao_minor_code (
             0,
             EINVAL),
-          CORBA::COMPLETED_NO),
-         CORBA::Object::_nil ());
+          CORBA::COMPLETED_NO);
     }
 
   return loader->create_object (orb, 0, 0);
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 1598bf85a6a..fef6541c7e5 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -86,8 +86,7 @@ public:
   //   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_THROW_SPEC ((CORBA::SystemException));
+                                          CORBA::ORB_ptr orb);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index ec5a993d8d7..05209f896a0 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -12,8 +12,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
-TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                                 ) const
+TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const
 {
   return object->_is_collocated ();
 }
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
deleted file mode 100644
index 570dfd379ec..00000000000
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// $Id$
-
-#include "tao/Default_Protocols_Hooks.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           Default_Protocols_Hooks,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
-                                                          CORBA::Policy *,
-                                                          CORBA::Short &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::get_selector_hook (CORBA::Policy *,
-                                                CORBA::Boolean &,
-                                                CORBA::Short &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *,
-                                                             CORBA::Short,
-                                                             CORBA::Short &,
-                                                             CORBA::Short &,
-                                                             bool &)
-{
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                                   CORBA::Short &
-                                                                   )
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short)
-{
-  return 0;
-}
-
-void
-TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
-                                                 TAO_Service_Context &,
-                                                 CORBA::Boolean)
-{
-}
-
-CORBA::Boolean
-TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId,
-                                                          TAO_Stub *)
-{
-  return false;
-}
-
-CORBA::Boolean
-TAO_Default_Protocols_Hooks::set_server_network_priority (IOP::ProfileId,
-                                                          CORBA::Policy *)
-{
-  return false;
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
-  TAO_IIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
-  TAO_IIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
-  TAO_UIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
-  TAO_UIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
-  TAO_SHMIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
-  TAO_SHMIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
-  TAO_DIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
-  TAO_DIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
-  TAO_SCIOP_Protocol_Properties &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
-  TAO_SCIOP_Protocol_Properties &)
-{
-}
-
-CORBA::Long
-TAO_Default_Protocols_Hooks::get_dscp_codepoint (void)
-{
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Protocols_Hooks,
-                       ACE_TEXT ("Protocols_Hooks"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Protocols_Hooks),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Protocols_Hooks)
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
deleted file mode 100644
index b1194d46ebe..00000000000
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Default_Protocols_Hooks.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_DEFAULT_PROTOCOLS_HOOKS_H
-#define TAO_DEFAULT_PROTOCOLS_HOOKS_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/Protocols_Hooks.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_POA;
-
-class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
-{
-public:
-
-  /// destructor
-  virtual ~TAO_Default_Protocols_Hooks (void);
-
-  void init_hooks (TAO_ORB_Core *orb_core);
-
-  CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                              TAO_Stub *stub
-                                             );
-
-  CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                              CORBA::Policy *policy
-                                             );
-
-  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                               );
-
-  CORBA::Long get_dscp_codepoint (void);
-
-  void rt_service_context (TAO_Stub *stub,
-                           TAO_Service_Context &service_context,
-                           CORBA::Boolean restart
-                          );
-
-  void add_rt_service_context_hook (TAO_Service_Context &service_context,
-                                    CORBA::Policy *model_policy,
-                                    CORBA::Short &client_priority
-                                   );
-
-  void get_selector_hook (CORBA::Policy *model_policy,
-                          CORBA::Boolean
-                          &is_client_propagated,
-                          CORBA::Short &server_priority);
-
-  void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                       CORBA::Short p,
-                                       CORBA::Short &min_priority,
-                                       CORBA::Short &max_priority,
-                                       bool &in_range);
-
-  int get_thread_CORBA_priority (CORBA::Short &);
-
-  int get_thread_native_priority (CORBA::Short &);
-
-  int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                            CORBA::Short &);
-
-  int set_thread_CORBA_priority (CORBA::Short);
-
-  int set_thread_native_priority (CORBA::Short);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 66d4ecf653f..d7b609db5b4 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -4,10 +4,9 @@
 #include "tao/Stub.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
-
+#include "ace/CORBA_macros.h"
 #include "ace/Log_Msg.h"
 
-
 ACE_RCSID (tao,
            TAO_Default_Stub_Factory,
            "$Id$")
@@ -21,8 +20,7 @@ TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 TAO_Stub *
 TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                                        const TAO_MProfile &profiles,
-                                       TAO_ORB_Core *orb_core
-                                       )
+                                       TAO_ORB_Core *orb_core)
 {
   TAO_Stub *retval = 0;
 
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index 710f5c41c8b..a4e26ccf0a5 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -10,7 +10,6 @@
  *   This class creates the default stub, that is used in
  *   plain CORBA.
  *
- *
  *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
  */
 //=============================================================================
@@ -43,16 +42,13 @@ class TAO_Export TAO_Default_Stub_Factory
   : public TAO_Stub_Factory
 {
 public:
-
   /// Destructor.
   virtual ~TAO_Default_Stub_Factory (void);
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                );
-
+                                 TAO_ORB_Core *orb_core);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy.mpc
new file mode 100644
index 00000000000..29095430dba
--- /dev/null
+++ b/TAO/tao/DiffServPolicy.mpc
@@ -0,0 +1,41 @@
+//$Id$
+project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  sharedname   = TAO_DiffServPolicy
+  dynamicflags = TAO_DIFFSERVPOLICY_BUILD_DLL
+
+  Source_Files {
+    DiffServPolicy
+  }
+
+  Header_Files {
+    DiffServPolicy
+  }
+
+  Inline_Files {
+    DiffServPolicy
+  }
+
+  Template_Files {
+    DiffServPolicy
+  }
+
+  Resource_Files {
+    DiffServPolicy
+  }
+
+  PIDL_Files {
+  }
+
+  IDL_Files {
+    idlflags += -GA -SS -Sci -Sorb \
+                -Wb,export_macro=TAO_DiffServPolicy_Export \
+                -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h \
+                -o DiffServPolicy
+    idlflags -= -St
+    DiffServPolicy/DiffServPolicy.pidl
+  }
+
+  Pkgconfig_Files {
+    DiffServPolicy/TAO_DiffServPolicy.pc.in
+  }
+}
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
new file mode 100644
index 00000000000..49c324115cb
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
+
+ACE_RCSID (DiffServPolicy,
+           Client_Network_Priority_Policy,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (0)
+  , reply_diffserv_codepoint_ (0)
+  , network_priority_model_ (TAO::NO_NETWORK_PRIORITY)
+{
+}
+
+TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (
+  const TAO::DiffservCodepoint request_diffserv_codepoint,
+  const TAO::DiffservCodepoint reply_diffserv_codepoint,
+  TAO::NetworkPriorityModel network_priority_model)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (request_diffserv_codepoint)
+  , reply_diffserv_codepoint_ (reply_diffserv_codepoint)
+  , network_priority_model_ (network_priority_model)
+{
+}
+
+TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (
+   const TAO_Client_Network_Priority_Policy &rhs)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (rhs.request_diffserv_codepoint_)
+  , reply_diffserv_codepoint_ (rhs.reply_diffserv_codepoint_)
+  , network_priority_model_ (rhs.network_priority_model_)
+{
+}
+
+CORBA::Policy_ptr
+TAO_Client_Network_Priority_Policy::create (const CORBA::Any &)
+{
+  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+
+  ACE_NEW_THROW_EX (policy,
+                    TAO_Client_Network_Priority_Policy (),
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO::VMCID,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+
+  return policy;
+}
+
+CORBA::PolicyType
+TAO_Client_Network_Priority_Policy::policy_type (void)
+{
+  return TAO::CLIENT_NETWORK_PRIORITY_TYPE;
+}
+
+TAO_Client_Network_Priority_Policy *
+TAO_Client_Network_Priority_Policy::clone (void) const
+{
+  TAO_Client_Network_Priority_Policy *copy = 0;
+  ACE_NEW_RETURN (copy,
+                  TAO_Client_Network_Priority_Policy (*this),
+                  0);
+  return copy;
+}
+
+TAO::DiffservCodepoint
+TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (void)
+{
+  return this->request_diffserv_codepoint_;
+}
+
+void
+TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
+   TAO::DiffservCodepoint req_dscp)
+{
+  this->request_diffserv_codepoint_ = req_dscp;
+}
+
+TAO::DiffservCodepoint
+TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (void)
+{
+  return this->reply_diffserv_codepoint_;
+}
+
+void
+TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
+   TAO::DiffservCodepoint reply_dscp)
+{
+  this->reply_diffserv_codepoint_ = reply_dscp;
+}
+
+TAO::NetworkPriorityModel
+TAO_Client_Network_Priority_Policy::network_priority_model (void)
+{
+  return this->network_priority_model_;
+}
+
+void
+TAO_Client_Network_Priority_Policy::network_priority_model (
+  TAO::NetworkPriorityModel npm)
+{
+  this->network_priority_model_ = npm;
+}
+
+CORBA::Policy_ptr
+TAO_Client_Network_Priority_Policy::copy (void)
+{
+  TAO_Client_Network_Priority_Policy* servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    TAO_Client_Network_Priority_Policy (*this),
+                    CORBA::NO_MEMORY ());
+
+  return servant;
+}
+
+void
+TAO_Client_Network_Priority_Policy::destroy (void)
+{
+}
+
+TAO_Cached_Policy_Type
+TAO_Client_Network_Priority_Policy::_tao_cached_type (void) const
+{
+  return TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY;
+}
+
+TAO_Policy_Scope
+TAO_Client_Network_Priority_Policy::_tao_scope (void) const
+{
+  return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE |
+                                        TAO_POLICY_CLIENT_EXPOSED);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
new file mode 100644
index 00000000000..56e2d41a162
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -0,0 +1,107 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   Client_Network_Priority_Policy.h
+ *
+ *  $Id$
+ *
+ *
+ */
+//=============================================================================
+
+
+#ifndef TAO_CLIENT_NETWORK_PRIORITY_POLICY_H
+#define TAO_CLIENT_NETWORK_PRIORITY_POLICY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "tao/Basic_Types.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class TAO_Client_Network_Priority_Policy
+ *
+ * @brief Implementation class for TAO-specific Network Priority Policy.
+ *
+ * This policy is defined by a client application to specify the
+ * network priority model that it would like to follow, as well as
+ * the request DiffServ codepoint and reply DiffServ codepoint
+ * corresponding to the network priority model.
+ */
+class TAO_DiffServPolicy_Export TAO_Client_Network_Priority_Policy
+  : public TAO::NetworkPriorityPolicy,
+    public TAO_Local_RefCounted_Object
+{
+public:
+  /// Constructor.
+  TAO_Client_Network_Priority_Policy (void);
+
+  /// Constructor.
+  TAO_Client_Network_Priority_Policy (
+     const TAO::DiffservCodepoint request_diffserv_codepoint,
+     const TAO::DiffservCodepoint reply_diffserv_codepoint,
+     TAO::NetworkPriorityModel network_priority_model);
+
+  /// Copy constructor.
+  TAO_Client_Network_Priority_Policy (
+     const TAO_Client_Network_Priority_Policy &rhs);
+
+  /// Returns a copy of <this>.
+  TAO_Client_Network_Priority_Policy *clone (void) const;
+
+  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+
+  void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
+
+  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+
+  void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
+
+  TAO::NetworkPriorityModel network_priority_model (void);
+
+  void network_priority_model (TAO::NetworkPriorityModel npm);
+
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
+
+  CORBA::PolicyType policy_type (void);
+
+  CORBA::Policy_ptr copy (void);
+
+  void destroy (void);
+
+  // Return the cached policy type for this policy.
+  TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+  // Returns the scope at which this policy can be applied. See orbconf.h.
+  TAO_Policy_Scope _tao_scope (void) const;
+
+private:
+  /// The attribute
+  TAO::DiffservCodepoint request_diffserv_codepoint_;
+  TAO::DiffservCodepoint reply_diffserv_codepoint_;
+  TAO::NetworkPriorityModel network_priority_model_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_CLIENT_NETWORK_PRIORITY_POLICY_H */
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
new file mode 100644
index 00000000000..2a155c88d83
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -0,0 +1,53 @@
+// @(#) $Id$
+
+#include "tao/DiffServPolicy/DiffServPolicy.h"
+#include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
+#include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORBInitializer_Registry.h"
+#include "tao/PI/PI.h"
+
+ACE_RCSID (DiffServPolicy, DiffServPolicy, "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+int
+TAO_DiffServPolicy_Initializer::init (void)
+{
+  TAO_ORB_Core::set_network_priority_protocols_hooks (
+    "DS_Network_Priority_Protocols_Hooks");
+  ACE_Service_Config::process_directive (
+    ace_svc_desc_TAO_DS_Network_Priority_Protocols_Hooks);
+
+  PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
+  PortableInterceptor::ORBInitializer::_nil ();
+  PortableInterceptor::ORBInitializer_var orb_initializer;
+
+  try
+    {
+      /// Register the EndpointPolicy ORBInitializer.
+      ACE_NEW_THROW_EX (temp_orb_initializer,
+                        TAO_DiffServPolicy_ORBInitializer,
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO::VMCID,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
+
+      orb_initializer = temp_orb_initializer;
+
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+    }
+  catch (const ::CORBA::Exception& ex)
+    {
+      if (TAO_debug_level > 0)
+        {
+          ex._tao_print_exception ("Caught exception:");
+        }
+      return -1;
+    }
+
+  return 0;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h
new file mode 100644
index 00000000000..788e567e1ad
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h
@@ -0,0 +1,50 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   DiffServPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *           Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_DIFFSERVPOLICY_H
+#define TAO_DIFFSERVPOLICY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PI/PI.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_DiffServPolicy_Export TAO_DiffServPolicy_Initializer
+{
+public:
+  /// Used to force the initialization of the ORB code.
+  static int init (void);
+};
+
+static int
+TAO_Requires_DiffServPolicy_Initializer = 
+  TAO_DiffServPolicy_Initializer::init ();
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#define TAO_DIFFSERVPOLICY_SAFE_INCLUDE
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#undef TAO_DIFFSERVPOLICY_SAFE_INCLUDE
+
+#endif /* TAO_DIFFSERVPOLICY_H */
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.pidl b/TAO/tao/DiffServPolicy/DiffServPolicy.pidl
new file mode 100644
index 00000000000..3f8021018a2
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.pidl
@@ -0,0 +1,61 @@
+// -*- IDL -*-
+
+// ================================================================
+/**
+ *  @file DiffServPolicy.pidl
+ *
+ *  $Id$
+ *
+ *  This file contains TAO-specific idl interfaces for adding
+ *  network priority or DiffServ support (not part of CORBA
+ *  2.6).
+ *
+ *  The steps to regenerate the code are as follows:
+ *
+ * 1. Run the tao_idl compiler on the pidl file.  The command used for
+ *   this is:
+ *
+ *   tao_idl
+ *       -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"
+ *       TAO_Network_Priority_Policy.pidl
+ *
+ * 2. The files are ready to use
+ */
+// ================================================================
+
+#ifndef TAO_DIFFSERV_POLICY_IDL
+#define TAO_DIFFSERV_POLICY_IDL
+
+#include "tao/Policy.pidl"
+
+#pragma prefix "tao"
+
+module TAO
+{
+  typedef long DiffservCodepoint;
+
+  enum NetworkPriorityModel
+  {
+    CLIENT_PROPAGATED_NETWORK_PRIORITY,
+    SERVER_DECLARED_NETWORK_PRIORITY,
+    NO_NETWORK_PRIORITY
+  };
+
+  const CORBA::PolicyType SERVER_NETWORK_PRIORITY_TYPE = 0x54410002;
+  const CORBA::PolicyType CLIENT_NETWORK_PRIORITY_TYPE = 0x54410003;
+  const CORBA::PolicyType NETWORK_PRIORITY_TYPE = 0x54410004;
+
+  local interface NetworkPriorityPolicy : CORBA::Policy
+    {
+      attribute NetworkPriorityModel network_priority_model;
+      attribute DiffservCodepoint request_diffserv_codepoint;
+      attribute DiffservCodepoint reply_diffserv_codepoint;
+    };
+};
+
+#pragma prefix ""
+
+#endif /* TAO_DIFFSERV_POLICY_IDL */
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h
new file mode 100644
index 00000000000..2c6f69d9411
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s TAO_DiffServPolicy
+// ------------------------------
+#ifndef TAO_DIFFSERVPOLICY_EXPORT_H
+#define TAO_DIFFSERVPOLICY_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_DIFFSERVPOLICY_HAS_DLL)
+#  define TAO_DIFFSERVPOLICY_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_DIFFSERVPOLICY_HAS_DLL */
+
+#if !defined (TAO_DIFFSERVPOLICY_HAS_DLL)
+#  define TAO_DIFFSERVPOLICY_HAS_DLL 1
+#endif /* ! TAO_DIFFSERVPOLICY_HAS_DLL */
+
+#if defined (TAO_DIFFSERVPOLICY_HAS_DLL) && (TAO_DIFFSERVPOLICY_HAS_DLL == 1)
+#  if defined (TAO_DIFFSERVPOLICY_BUILD_DLL)
+#    define TAO_DiffServPolicy_Export ACE_Proper_Export_Flag
+#    define TAO_DIFFSERVPOLICY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_DIFFSERVPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_DIFFSERVPOLICY_BUILD_DLL */
+#    define TAO_DiffServPolicy_Export ACE_Proper_Import_Flag
+#    define TAO_DIFFSERVPOLICY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_DIFFSERVPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_DIFFSERVPOLICY_BUILD_DLL */
+#else /* TAO_DIFFSERVPOLICY_HAS_DLL == 1 */
+#  define TAO_DiffServPolicy_Export
+#  define TAO_DIFFSERVPOLICY_SINGLETON_DECLARATION(T)
+#  define TAO_DIFFSERVPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_DIFFSERVPOLICY_HAS_DLL == 1 */
+
+// Set TAO_DIFFSERVPOLICY_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_DIFFSERVPOLICY_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_DIFFSERVPOLICY_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_DIFFSERVPOLICY_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_DIFFSERVPOLICY_NTRACE */
+
+#if (TAO_DIFFSERVPOLICY_NTRACE == 1)
+#  define TAO_DIFFSERVPOLICY_TRACE(X)
+#else /* (TAO_DIFFSERVPOLICY_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_DIFFSERVPOLICY_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_DIFFSERVPOLICY_NTRACE == 1) */
+
+#endif /* TAO_DIFFSERVPOLICY_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
new file mode 100644
index 00000000000..3fed4990ac9
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
@@ -0,0 +1,62 @@
+#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
+
+ACE_RCSID (DiffServPolicy,
+           DiffServPolicy_Factory,
+           "$Id$")
+
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+#include "tao/PolicyC.h"
+#include "tao/ORB_Constants.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+CORBA::Policy_ptr
+TAO_DiffServ_PolicyFactory::create_policy (
+    CORBA::PolicyType type,
+    const CORBA::Any &value)
+{
+  if (type == TAO::CLIENT_NETWORK_PRIORITY_TYPE)
+    return TAO_Client_Network_Priority_Policy::create (value);
+
+  if (type == TAO::NETWORK_PRIORITY_TYPE)
+    return TAO_Server_Network_Priority_Policy::create (value);
+
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
+}
+
+CORBA::Policy_ptr
+TAO_DiffServ_PolicyFactory::_create_policy (CORBA::PolicyType type)
+{
+  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+
+  if (type == TAO::CLIENT_NETWORK_PRIORITY_TYPE)
+    {
+      ACE_NEW_THROW_EX (policy,
+                        TAO_Client_Network_Priority_Policy (),
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO::VMCID,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
+
+      return policy;
+    }
+
+  if (type == TAO::NETWORK_PRIORITY_TYPE)
+    {
+      ACE_NEW_THROW_EX (policy,
+                        TAO_Server_Network_Priority_Policy (),
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO::VMCID,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
+
+      return policy;
+    }
+
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
new file mode 100644
index 00000000000..9c58492b252
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file     DiffServPolicy_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author  Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *  @author  Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_DIFFSERV_POLICY_FACTORY_H
+#define TAO_DIFFSERV_POLICY_FACTORY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/orbconf.h"
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PI/PI.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/// Policy factory for all DiffServ related policies.
+class TAO_DiffServPolicy_Export TAO_DiffServ_PolicyFactory
+  : public virtual PortableInterceptor::PolicyFactory,
+    public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
+                                   const CORBA::Any &value);
+
+  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type);
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_DIFFSERV_POLICY_FACTORY_H */
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
new file mode 100644
index 00000000000..52532c410ad
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -0,0 +1,87 @@
+// $Id$
+
+#include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
+#include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
+#include "tao/ORB_Core.h"
+#include "tao/PI/ORBInitInfo.h"
+
+ACE_RCSID (DiffServPolicy,
+           DiffServPolicy_ORBInitializer,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+void
+TAO_DiffServPolicy_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr)
+{
+}
+
+void
+TAO_DiffServPolicy_ORBInitializer::post_init (
+    PortableInterceptor::ORBInitInfo_ptr info)
+{
+  this->register_policy_factories (info);
+}
+
+void
+TAO_DiffServPolicy_ORBInitializer::register_policy_factories (
+  PortableInterceptor::ORBInitInfo_ptr info)
+{
+  if (CORBA::is_nil (this->policy_factory_.in ()))
+    {
+      PortableInterceptor::PolicyFactory_ptr policy_factory;
+      ACE_NEW_THROW_EX (policy_factory,
+                        TAO_DiffServ_PolicyFactory,
+                          CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO::VMCID,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO));
+
+      this->policy_factory_ = policy_factory;
+    }
+
+  // Bind the same policy factory to all DiffServ related policy
+  // types since a single policy factory is used to create each of
+  // the different types of DiffServ policies.
+  static CORBA::PolicyType const type[] = {
+    TAO::CLIENT_NETWORK_PRIORITY_TYPE,
+    TAO::NETWORK_PRIORITY_TYPE
+  };
+
+  const CORBA::PolicyType *end =
+    type + sizeof (type) / sizeof (type[0]);
+
+  for (CORBA::PolicyType const * i = type;
+       i != end;
+       ++i)
+    {
+      try
+        {
+          info->register_policy_factory (*i, this->policy_factory_.in ());
+        }
+      catch ( ::CORBA::BAD_INV_ORDER& ex)
+        {
+          if (ex.minor () == (CORBA::OMGVMCID | 16))
+            {
+              // The factory is already there, it happens because the
+              // magic initializer in PortableServer.cpp registers
+              // with the ORB multiple times.  This is an indication
+              // that we should do no more work in this
+              // ORBInitializer.
+              return;
+            }
+          throw;
+        }
+      catch ( ::CORBA::Exception&)
+        {
+          // Rethrow any other exceptions...
+          throw;
+        }
+    }
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
new file mode 100644
index 00000000000..74b3295c32c
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file DiffServPolicy_ORBInitializer.h
+ *
+ *  $Id$
+ *
+ *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *          Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_DIFFSERV_POLICY_ORB_INITIALIZER_H
+#define TAO_DIFFSERV_POLICY_ORB_INITIALIZER_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PI/PI.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/// DiffServ Policy ORB initializer.
+class TAO_DiffServPolicy_Export TAO_DiffServPolicy_ORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
+{
+public:
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+private:
+
+  /// Register DiffServ policy factories.
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
+
+private:
+  PortableInterceptor::PolicyFactory_var policy_factory_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_DIFFSERV_POLICY_ORB_INITIALIZER_H */
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
new file mode 100644
index 00000000000..52bf8eab4ad
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -0,0 +1,106 @@
+// @(#) $Id$
+
+#include "tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Policy_Set.h"
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/Service_Context.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Network_Priority_Protocols_Hooks.h"
+#include "tao/ORB_Core.h"
+#include "tao/Connection_Handler.h"
+#include "tao/Transport.h"
+
+ACE_RCSID(DiffServPolicy,
+          DiffServ_Network_Priority_Hook,
+          "$Id$")
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+TAO_DiffServ_Network_Priority_Hook::~TAO_DiffServ_Network_Priority_Hook(void)
+{
+}
+
+void
+TAO_DiffServ_Network_Priority_Hook::update_network_priority (
+  TAO_Root_POA &poa, TAO_POA_Policy_Set &policy_set)
+{
+  for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
+    {
+      CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
+
+      if (policy->policy_type () == TAO::NETWORK_PRIORITY_TYPE)
+        {
+          ::TAO::NetworkPriorityPolicy_var npp =
+            ::TAO::NetworkPriorityPolicy::_narrow (policy.in ());
+
+          if (!CORBA::is_nil (npp.in ()))
+            {
+              TAO::NetworkPriorityModel network_priority_model =
+                npp->network_priority_model ();
+
+              poa.cached_policies ().network_priority_model (
+                TAO::Portable_Server::Cached_Policies::NetworkPriorityModel (
+                  network_priority_model));
+
+              TAO::DiffservCodepoint request_diffserv_codepoint  =
+                npp->request_diffserv_codepoint ();
+
+              TAO::DiffservCodepoint reply_diffserv_codepoint  =
+                npp->reply_diffserv_codepoint ();
+
+              poa.cached_policies ().request_diffserv_codepoint (
+                request_diffserv_codepoint);
+              poa.cached_policies ().reply_diffserv_codepoint (
+                reply_diffserv_codepoint);
+            }
+        }
+    }
+}
+
+void
+TAO_DiffServ_Network_Priority_Hook::set_dscp_codepoint (
+  TAO_ServerRequest &req, TAO_Root_POA &poa)
+{
+  CORBA::Long dscp_codepoint = 0;
+  TAO_Service_Context &request_service_context =
+    req.request_service_context ();
+
+  TAO_Network_Priority_Protocols_Hooks *nph =
+   poa.orb_core ().get_network_priority_protocols_hooks ();
+
+  TAO::Portable_Server::Cached_Policies::NetworkPriorityModel npm =
+    poa.cached_policies ().network_priority_model ();
+
+  if (npm == TAO::Portable_Server::Cached_Policies::
+             CLIENT_PROPAGATED_NETWORK_PRIORITY)
+    {
+      if (nph != 0)
+        {
+          dscp_codepoint = nph->get_dscp_codepoint (request_service_context);
+        }
+    }
+  else if (npm == TAO::Portable_Server::Cached_Policies::
+                  SERVER_DECLARED_NETWORK_PRIORITY)
+    {
+      dscp_codepoint = poa.cached_policies ().reply_diffserv_codepoint ();
+    }
+
+  TAO_Connection_Handler *connection_handler =
+    req.transport ()->connection_handler ();
+  connection_handler->set_dscp_codepoint (dscp_codepoint);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DEFINE (TAO_DiffServPolicy, TAO_DiffServ_Network_Priority_Hook)
+ACE_STATIC_SVC_DEFINE (TAO_DiffServ_Network_Priority_Hook,
+                       ACE_TEXT ("TAO_Network_Priority_Hook"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_DiffServ_Network_Priority_Hook),
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
+                       0)
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
new file mode 100644
index 00000000000..fc9a7e98a6d
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    DiffServ_Network_Priority_Hook.h
+ *
+ *  $Id$
+ *
+ *  @author  Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *           Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_DIFFSERV_NETWORK_PRIORITY_HOOK_H
+#define TAO_DIFFSERV_NETWORK_PRIORITY_HOOK_H
+
+#include /**/ "ace/pre.h"
+#include "ace/Service_Config.h"
+
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/Network_Priority_Hook.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_DiffServPolicy_Export TAO_DiffServ_Network_Priority_Hook
+  : public TAO_Network_Priority_Hook
+{
+public:
+  virtual ~TAO_DiffServ_Network_Priority_Hook(void);
+
+  /// This function is a hook, that is called from the Root_POA's
+  /// constructor. It allows the POA to cache the server side network
+  /// priority policy, so that it can be used for sending replies with the
+  /// policy-specified DiffServ codepoint.
+  ///
+  void update_network_priority (TAO_Root_POA &poa, 
+                                TAO_POA_Policy_Set &poa_policy_set);
+
+  /// This function is a hook, that is used by the POA's servant dispatcher
+  /// when it tries to assign DiffServ codepoints on the replies.
+  ///
+  void set_dscp_codepoint (TAO_ServerRequest &req,
+                           TAO_Root_POA &poa);
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy,
+                               TAO_DiffServ_Network_Priority_Hook)
+ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServ_Network_Priority_Hook)
+
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_DIFFSERV_NETWORK_PRIORITY_HOOK_H */
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
new file mode 100644
index 00000000000..b831eb3eeef
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -0,0 +1,193 @@
+#include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/ORB_Core.h"
+#include "tao/Service_Context.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.h"
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+#include "ace/OS_NS_string.h"
+
+ACE_RCSID (DiffServPolicy,
+           DiffServ_Protocols_Hooks,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_DS_Network_Priority_Protocols_Hooks::
+TAO_DS_Network_Priority_Protocols_Hooks (void)
+  : orb_core_ (0)
+{
+}
+
+
+TAO_DS_Network_Priority_Protocols_Hooks::
+~TAO_DS_Network_Priority_Protocols_Hooks (void)
+{
+}
+
+void
+TAO_DS_Network_Priority_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core)
+{
+  this->orb_core_ = orb_core;
+}
+
+void
+TAO_DS_Network_Priority_Protocols_Hooks::np_service_context (
+    TAO_Stub *stub,
+    TAO_Service_Context &service_context,
+    CORBA::Boolean restart)
+{
+  // If the restart flag is true, then this call for a
+  // reinvocation. We need not prepare the Service Context List once
+  // again. We can use the already existing one.
+  if (!restart)
+    {
+      CORBA::Policy_var cnpp =
+        stub->get_cached_policy (TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY);
+
+      if (!CORBA::is_nil (cnpp.in ()))
+        {
+          TAO::NetworkPriorityPolicy_var cnp =
+            TAO::NetworkPriorityPolicy::_narrow (cnpp.in ());
+
+          TAO::DiffservCodepoint reply_diffserv_codepoint;
+          reply_diffserv_codepoint = cnp->reply_diffserv_codepoint ();
+
+          CORBA::Long rep_dscp_codepoint = reply_diffserv_codepoint;
+
+          this->add_rep_np_service_context_hook (service_context,
+                                                 rep_dscp_codepoint);
+        }
+    }
+}
+
+void
+TAO_DS_Network_Priority_Protocols_Hooks::add_rep_np_service_context_hook (
+   TAO_Service_Context &service_context,
+   CORBA::Long &dscp_codepoint)
+{
+  TAO_OutputCDR cdr;
+  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
+      || (cdr << dscp_codepoint) == 0)
+    {
+      throw CORBA::MARSHAL ();
+    }
+
+  service_context.set_context (IOP::REP_NWPRIORITY, cdr);
+}
+
+CORBA::Long
+TAO_DS_Network_Priority_Protocols_Hooks::get_dscp_codepoint (
+  TAO_Service_Context &sc)
+{
+  CORBA::Long dscp_codepoint = 0;
+  const IOP::ServiceContext *context;
+
+  if (sc.get_context (IOP::REP_NWPRIORITY, &context) == 1)
+    {
+      TAO_InputCDR cdr (reinterpret_cast
+                        <const char*>
+                        (context->context_data.get_buffer ()),
+                        context->context_data.length ());
+
+      CORBA::Boolean byte_order;
+      if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
+        {
+          throw CORBA::MARSHAL ();
+        }
+      cdr.reset_byte_order (static_cast<int> (byte_order));
+
+      if ((cdr >> dscp_codepoint) == 0)
+        {
+          throw CORBA::MARSHAL ();
+        }
+    }
+
+  return dscp_codepoint;
+}
+
+CORBA::Long
+TAO_DS_Network_Priority_Protocols_Hooks::get_dscp_codepoint (
+  TAO_Stub *stub, CORBA::Object *object)
+{
+  CORBA::Long dscp = 0;
+  TAO::DiffservCodepoint diffserv_codepoint;
+  CORBA::Policy_var server_nw_priority_policy;
+
+  CORBA::Policy_var client_nw_priority_policy =
+    stub->get_cached_policy (
+        TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY);
+
+  if (CORBA::is_nil (client_nw_priority_policy.in ()))
+    {
+      TAO_Stub *server_stub = object->_stubobj ();
+      TAO_MProfile server_profiles = server_stub->base_profiles ();
+      CORBA::PolicyList_var policy_list =
+        server_profiles.policy_list ();
+
+      CORBA::ULong length = policy_list->length ();
+
+      for (CORBA::ULong i = 0; i < length; ++i)
+        {
+          if (policy_list[i]->policy_type () == TAO::NETWORK_PRIORITY_TYPE)
+            {
+              server_nw_priority_policy =
+                CORBA::Policy::_duplicate (policy_list[i]);
+            }
+        }
+
+      if (CORBA::is_nil (server_nw_priority_policy.in ()))
+        {
+          return dscp;
+        }
+      else
+        {
+          TAO::NetworkPriorityPolicy_var npp =
+            TAO::NetworkPriorityPolicy::_narrow (
+              server_nw_priority_policy.in ());
+
+          if (!CORBA::is_nil (npp.in ()))
+            {
+              TAO::NetworkPriorityModel network_priority_model =
+                npp->network_priority_model ();
+
+              if (network_priority_model ==
+                  TAO::SERVER_DECLARED_NETWORK_PRIORITY)
+                {
+                  diffserv_codepoint =
+                    npp->request_diffserv_codepoint ();
+                  dscp = diffserv_codepoint;
+                  return dscp;
+                }
+            }
+        }
+    }
+  else
+    {
+      TAO::NetworkPriorityPolicy_var client_nw_priority =
+        TAO::NetworkPriorityPolicy::_narrow (client_nw_priority_policy.in ());
+
+      if (!CORBA::is_nil (client_nw_priority.in ()))
+        {
+          diffserv_codepoint =
+            client_nw_priority->request_diffserv_codepoint ();
+          dscp = diffserv_codepoint;
+          return dscp;
+        }
+    }
+
+  return dscp;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (TAO_DS_Network_Priority_Protocols_Hooks,
+                       ACE_TEXT ("DS_Network_Priority_Protocols_Hooks"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_DS_Network_Priority_Protocols_Hooks),
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO_DiffServPolicy,
+                    TAO_DS_Network_Priority_Protocols_Hooks)
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
new file mode 100644
index 00000000000..559fd4d8b4a
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
@@ -0,0 +1,91 @@
+// -*- C++ -*-
+
+// ===================================================================
+/**
+ *  @file   DiffServ_Protocols_Hooks.h
+ *
+ *  $Id$
+ *
+ *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *          Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+// ===================================================================
+
+#ifndef TAO_DIFFSERV_PROTOCOLS_HOOKS_H
+#define TAO_DIFFSERVT_PROTOCOLS_HOOKS_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/orbconf.h"
+
+#include "tao/Network_Priority_Protocols_Hooks.h"
+#include "ace/Service_Config.h"
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_DiffServPolicy_Export TAO_DS_Network_Priority_Protocols_Hooks
+      : public TAO_Network_Priority_Protocols_Hooks
+{
+public:
+
+  /// Constructor
+  TAO_DS_Network_Priority_Protocols_Hooks (void);
+
+  /// Destructor
+  virtual ~TAO_DS_Network_Priority_Protocols_Hooks (void);
+
+  /// Initialize the network priority protocols hooks instance.
+  void init_hooks (TAO_ORB_Core *orb_core);
+
+  /// This function is used by the client side ORB to figure out
+  /// the DiffServ codepoint that needs to be added to the request
+  /// to be sent to the server.
+  ///
+  CORBA::Long get_dscp_codepoint (TAO_Stub *stub, CORBA::Object *object);
+
+  /// This function is used by the server side to figure out the
+  /// DiffServ codepoint that is attached and sent as part of the 
+  /// service context of the request from the client side.
+  /// Specifically, when CLIENT_PROPAGATED networ priority model
+  /// is followed, the clients sent the DiffServ codepoint, they
+  /// want the server to use in the reply, as a service context
+  /// entry in the request.
+  ///
+  CORBA::Long get_dscp_codepoint (TAO_Service_Context &sc);
+
+  /// This function is called from the ORB_Core to add
+  /// network priority policy specific information on the request
+  /// service context. Specifically, when CLIENT_PROPAGATED network
+  /// priority model is used, the DiffServ codepoint that needs to be used
+  /// by the server side in the reply, is specified as a service context
+  /// entry, just like how RT-CORBA's CLIENT_PROPAGATED priority model works.
+  ///
+  void np_service_context (TAO_Stub *stub,
+                           TAO_Service_Context &service_context,
+                           CORBA::Boolean restart);
+
+  /// Helper function that is used by the np_service_context () method.
+  ///
+  void add_rep_np_service_context_hook (
+    TAO_Service_Context &service_context,
+    CORBA::Long &dscp_codepoint);
+
+protected:
+
+  TAO_ORB_Core *orb_core_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy,
+                               TAO_DS_Network_Priority_Protocols_Hooks)
+ACE_FACTORY_DECLARE (TAO_DiffServPolicy,
+                     TAO_DS_Network_Priority_Protocols_Hooks)
+
+#include /**/ "ace/post.h"
+#endif /* TAO_DIFFSERV_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
new file mode 100644
index 00000000000..12420df0717
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -0,0 +1,170 @@
+// $Id$
+
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/SystemException.h"
+#include "tao/ORB_Constants.h"
+
+ACE_RCSID (DiffServPolicy,
+           Server_Network_Priority_Policy,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (0)
+  , reply_diffserv_codepoint_ (0)
+  , network_priority_model_ (TAO::NO_NETWORK_PRIORITY)
+{
+}
+
+TAO_Server_Network_Priority_Policy::~TAO_Server_Network_Priority_Policy (void)
+{
+}
+
+TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (
+  const TAO::DiffservCodepoint &request_diffserv_codepoint,
+  const TAO::DiffservCodepoint &reply_diffserv_codepoint,
+  TAO::NetworkPriorityModel &network_priority_model)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (request_diffserv_codepoint)
+  , reply_diffserv_codepoint_ (reply_diffserv_codepoint)
+  , network_priority_model_ (network_priority_model)
+{
+}
+
+TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (
+   const TAO_Server_Network_Priority_Policy &rhs)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
+  , TAO::NetworkPriorityPolicy ()
+  , TAO_Local_RefCounted_Object ()
+  , request_diffserv_codepoint_ (rhs.request_diffserv_codepoint_)
+  , reply_diffserv_codepoint_ (rhs.reply_diffserv_codepoint_)
+  , network_priority_model_ (rhs.network_priority_model_)
+{
+}
+
+CORBA::Policy_ptr
+TAO_Server_Network_Priority_Policy::create (const CORBA::Any &)
+{
+  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+
+  ACE_NEW_THROW_EX (policy,
+                    TAO_Server_Network_Priority_Policy (),
+                    CORBA::NO_MEMORY (TAO::VMCID,
+                                      CORBA::COMPLETED_NO));
+  return policy;
+}
+
+CORBA::PolicyType
+TAO_Server_Network_Priority_Policy::policy_type (void)
+{
+  return TAO::NETWORK_PRIORITY_TYPE;
+}
+
+TAO_Server_Network_Priority_Policy *
+TAO_Server_Network_Priority_Policy::clone (void) const
+{
+  TAO_Server_Network_Priority_Policy *copy = 0;
+  ACE_NEW_RETURN (copy,
+                  TAO_Server_Network_Priority_Policy (*this),
+                  0);
+  return copy;
+}
+
+TAO::DiffservCodepoint
+TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (void)
+{
+  return this->request_diffserv_codepoint_;
+}
+
+void
+TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
+   TAO::DiffservCodepoint req_dscp)
+{
+  this->request_diffserv_codepoint_ = req_dscp;
+}
+
+TAO::DiffservCodepoint
+TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (void)
+{
+  return this->reply_diffserv_codepoint_;
+}
+
+void
+TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
+   TAO::DiffservCodepoint reply_dscp)
+{
+  this->reply_diffserv_codepoint_ = reply_dscp;
+}
+
+TAO::NetworkPriorityModel
+TAO_Server_Network_Priority_Policy::network_priority_model (void)
+{
+  return this->network_priority_model_;
+}
+
+void
+TAO_Server_Network_Priority_Policy::network_priority_model (
+  TAO::NetworkPriorityModel npm)
+{
+  this->network_priority_model_ = npm;
+}
+
+CORBA::Policy_ptr
+TAO_Server_Network_Priority_Policy::copy (void)
+{
+  TAO_Server_Network_Priority_Policy* servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    TAO_Server_Network_Priority_Policy (*this),
+                    CORBA::NO_MEMORY ());
+
+  return servant;
+}
+
+void
+TAO_Server_Network_Priority_Policy::destroy (void)
+{
+}
+
+TAO_Cached_Policy_Type
+TAO_Server_Network_Priority_Policy::_tao_cached_type (void) const
+{
+  return TAO_CACHED_POLICY_NETWORK_PRIORITY;
+}
+
+TAO_Policy_Scope
+TAO_Server_Network_Priority_Policy::_tao_scope (void) const
+{
+  return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE |
+                  TAO_POLICY_CLIENT_EXPOSED);
+}
+
+CORBA::Boolean
+TAO_Server_Network_Priority_Policy::_tao_encode (TAO_OutputCDR &out_cdr)
+{
+  return ((out_cdr << request_diffserv_codepoint_) &&
+          (out_cdr << reply_diffserv_codepoint_) &&
+          (out_cdr << network_priority_model_));
+}
+
+CORBA::Boolean
+TAO_Server_Network_Priority_Policy::_tao_decode (TAO_InputCDR &in_cdr)
+{
+  return ((in_cdr >> request_diffserv_codepoint_) &&
+          (in_cdr >> reply_diffserv_codepoint_) &&
+          (in_cdr >> network_priority_model_));
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
new file mode 100644
index 00000000000..37b440dc4c5
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -0,0 +1,118 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   Server_Network_Priority_Policy.h
+ *
+ *  $Id$
+ *
+ *
+ */
+//=============================================================================
+
+
+#ifndef TAO_SERVER_NETWORK_PRIORITY_POLICY_H
+#define TAO_SERVER_NETWORK_PRIORITY_POLICY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/DiffServPolicy/DiffServPolicy_Export.h"
+#include "tao/DiffServPolicy/DiffServPolicyC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "tao/Basic_Types.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class TAO_Server_Network_Priority_Policy
+ *
+ * @brief Implementation class for TAO-specific Network Priority Policy.
+ *
+ * This policy is defined by a server application to specify the
+ * network priority model that it would like to follow, as well as
+ * the request DiffServ codepoint and reply DiffServ codepoint
+ * corresponding to the network priority model.
+ */
+class TAO_DiffServPolicy_Export TAO_Server_Network_Priority_Policy
+  : public TAO::NetworkPriorityPolicy,
+    public TAO_Local_RefCounted_Object
+{
+public:
+
+  /// default constructor.
+  TAO_Server_Network_Priority_Policy (void);
+
+  /// Constructor.
+  TAO_Server_Network_Priority_Policy (
+     const TAO::DiffservCodepoint &request_diffserv_codepoint,
+     const TAO::DiffservCodepoint &reply_diffserv_codepoint,
+     TAO::NetworkPriorityModel &network_priority_model);
+
+  /// Copy constructor.
+  TAO_Server_Network_Priority_Policy (
+     const TAO_Server_Network_Priority_Policy &rhs);
+
+  /// Returns a copy of <this>.
+  TAO_Server_Network_Priority_Policy *clone (void) const;
+
+  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+
+  void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
+
+  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+
+  void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
+
+  TAO::NetworkPriorityModel network_priority_model (void);
+
+  void network_priority_model (TAO::NetworkPriorityModel npm);
+
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
+
+  CORBA::PolicyType policy_type (void);
+
+  CORBA::Policy_ptr copy (void);
+
+  void destroy (void);
+
+  // Return the cached policy type for this policy.
+  TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+  // Returns the scope at which this policy can be applied. See orbconf.h.
+  TAO_Policy_Scope _tao_scope (void) const;
+
+  /// This method writes a CDR representation of the object state.
+  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+
+  /// This method reads the object state from a CDR representation.
+  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
+
+protected:
+
+  virtual ~TAO_Server_Network_Priority_Policy (void);
+
+private:
+  /// The attributes
+  TAO::DiffservCodepoint request_diffserv_codepoint_;
+  TAO::DiffservCodepoint reply_diffserv_codepoint_;
+  TAO::NetworkPriorityModel network_priority_model_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_SERVER_NETWORK_PRIORITY_POLICY_H */
diff --git a/TAO/tao/DiffServPolicy/TAO_DiffServPolicy.pc.in b/TAO/tao/DiffServPolicy/TAO_DiffServPolicy.pc.in
new file mode 100644
index 00000000000..67d0a2f065a
--- /dev/null
+++ b/TAO/tao/DiffServPolicy/TAO_DiffServPolicy.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: TAO_DiffServPolicy
+Description: TAO DiffServPolicy Library
+Requires: TAO_PI, TAO_PortableServer, TAO
+Version: @VERSION@
+Libs: -L${libdir} -lTAO_DiffServPolicy
+Cflags: -I${includedir}
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index d86e97751cf..d769f788f6a 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -303,7 +303,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -322,7 +321,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -382,11 +380,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::DomainManager_ptr>
@@ -1055,7 +1049,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -1074,7 +1067,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -1134,11 +1126,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   dynamic_cast<POA_CORBA::ConstructionPolicy_ptr>
     (servant)
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index f8810004498..578f77dc2b1 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -139,9 +139,7 @@ namespace POA_CORBA
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void get_domain_policy_skel (
         TAO_ServerRequest & server_request,
@@ -169,8 +167,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -182,8 +179,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_DomainManager_Strategized_Proxy_Broker *
     the_TAO_DomainManager_Strategized_Proxy_Broker (void);
@@ -218,10 +214,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
@@ -306,9 +299,7 @@ namespace POA_CORBA
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void make_domain_manager_skel (
         TAO_ServerRequest & server_request,
@@ -367,8 +358,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -380,8 +370,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *
     the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
@@ -418,18 +407,13 @@ namespace POA_CORBA
         int num_args
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));static void
+      ;static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
@@ -440,10 +424,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
@@ -454,10 +435,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index ac024975dee..d65a01973ec 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -97,9 +97,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
       servant,
@@ -120,9 +117,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
       servant,
@@ -143,9 +137,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
       servant,
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 02cdc148bbf..104c41a5088 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -92,10 +92,7 @@ namespace POA_CORBA
     ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -152,30 +149,21 @@ namespace POA_CORBA
 
     CORBA::PolicyType policy_type (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Policy_ptr copy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -184,10 +172,7 @@ namespace POA_CORBA
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
index 937efa3ed1a..a24aaedddda 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -129,9 +129,6 @@ template <class T> ACE_INLINE
     ::CORBA::PolicyType policy_type
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->get_domain_policy (
     policy_type
@@ -239,9 +236,6 @@ template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->policy_type (
 
@@ -255,9 +249,6 @@ template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->copy (
 
@@ -269,11 +260,7 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
 
@@ -289,9 +276,6 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
     ::CORBA::Boolean constr_policy
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->make_domain_manager (
     object_type,
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index c9c216b82fa..a8b9f7b0f9e 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -175,11 +175,7 @@ TAO::Collocation_Proxy_Broker *
 
 ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
     ::CORBA::PolicyType policy_type
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (!this->is_evaluated ())
     {
@@ -375,11 +371,7 @@ TAO::Collocation_Proxy_Broker *
 void CORBA::ConstructionPolicy::make_domain_manager (
     ::CORBA::InterfaceDef_ptr object_type,
     ::CORBA::Boolean constr_policy
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (!this->is_evaluated ())
     {
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index d2545586694..3727ed2fd02 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -42,7 +42,6 @@
 
 #include /**/ "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -144,10 +143,7 @@ namespace CORBA
 
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -266,10 +262,7 @@ namespace CORBA
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 71ac22beb08..497d93b86bc 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -35,14 +35,7 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::create_dyn_any (
-      const CORBA::Any & value
-
-    )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
+TAO_DynAnyFactory::create_dyn_any (const CORBA::Any & value)
 {
   return
     TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -51,14 +44,7 @@ TAO_DynAnyFactory::create_dyn_any (
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::create_dyn_any_from_type_code (
-      CORBA::TypeCode_ptr type
-
-    )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
+TAO_DynAnyFactory::create_dyn_any_from_type_code (CORBA::TypeCode_ptr type)
 {
   // Second arg is typed in the template parameter, repeating it
   // this way allows cleaner template code.
@@ -70,61 +56,38 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any_without_truncation (
-    const CORBA::Any & /* value */
-
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode,
-      DynamicAny::MustTruncate
-    ))
+    const CORBA::Any & /* value */)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    DynamicAny::DynAny::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 DynamicAny::DynAnySeq *
 TAO_DynAnyFactory::create_multiple_dyn_anys (
     const DynamicAny::AnySeq & /* values */,
-    ::CORBA::Boolean /* allow_truncate */
-
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode,
-      DynamicAny::MustTruncate
-    ))
+    ::CORBA::Boolean /* allow_truncate */)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 DynamicAny::AnySeq *
 TAO_DynAnyFactory::create_multiple_anys (
-    const DynamicAny::DynAnySeq & /* values */
-
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+    const DynamicAny::DynAnySeq & /* values */)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 // 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
-                            )
+TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc)
 {
   CORBA::TCKind tck = tc->kind ();
 
   while (tck == CORBA::tk_alias)
     {
-      CORBA::TypeCode_var temp =
-        tc->content_type ();
+      CORBA::TypeCode_var temp = tc->content_type ();
 
-      tck = TAO_DynAnyFactory::unalias (temp.in ()
-                                       );
+      tck = TAO_DynAnyFactory::unalias (temp.in ());
     }
 
   return tck;
@@ -132,8 +95,7 @@ TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
 
 // Same as above, but returns the type code.
 CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
-                                )
+TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc)
 {
   CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
   CORBA::TCKind tck = retval->kind ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index e480a94162a..18338af792a 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -49,49 +49,28 @@ public:
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
       const CORBA::Any & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
+      );
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
       CORBA::TypeCode_ptr type
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_without_truncation (
       const CORBA::Any & value
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode,
-        DynamicAny::MustTruncate
-      ));
+    );
 
   virtual DynamicAny::DynAnySeq * create_multiple_dyn_anys (
       const DynamicAny::AnySeq & values,
       ::CORBA::Boolean allow_truncate
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode,
-        DynamicAny::MustTruncate
-      ));
+    );
 
   virtual DynamicAny::AnySeq * create_multiple_anys (
       const DynamicAny::DynAnySeq & values
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+    );
 
   /// TAO-specific methods.
 
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
index f11b5b34b49..aa938ff4259 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
@@ -34,11 +34,6 @@ namespace TAO
   void
   DynAnyBasicTypeUtils<T>::insert_value (const T &val,
                                          TAO_DynCommon *the_dynany)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ))
   {
     if (the_dynany->destroyed ())
       {
@@ -64,16 +59,10 @@ namespace TAO
   template<typename T>
   typename BasicTypeTraits<T>::return_type
   DynAnyBasicTypeUtils<T>::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 (),
-                          BasicTypeTraits<T>::return_type ());
+        throw ::CORBA::OBJECT_NOT_EXIST ();
       }
 
     if (the_dynany->has_components ())
@@ -92,8 +81,7 @@ namespace TAO
 
         if (!(my_any >>= extval))
           {
-            ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                              BasicTypeTraits<T>::return_type ());
+            throw DynamicAny::DynAny::TypeMismatch ();
           }
 
         return BasicTypeTraits<T>::convert (extval);
@@ -104,9 +92,6 @@ namespace TAO
   void
   DynAnyFlagUtils<T>::set_flag_t (DynamicAny::DynAny_ptr component,
                                   CORBA::Boolean destroying)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
   {
     T *tmp = T::_narrow (component);
 
@@ -208,11 +193,9 @@ namespace TAO
         case CORBA::tk_abstract_interface:
         case CORBA::tk_component:
         case CORBA::tk_home:
-          ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                            DynamicAny::DynAny::_nil ());
+          throw ::CORBA::NO_IMPLEMENT ();
         case CORBA::tk_native:
-          ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
-                            DynamicAny::DynAny::_nil ());
+          throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
         default:
           break;
         }
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h
index f91d18b9f25..4eef1f6d36b 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.h
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h
@@ -38,20 +38,10 @@ namespace TAO
   {
     static void
     insert_value (const T &val,
-                  TAO_DynCommon *the_dynany)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          DynamicAny::DynAny::TypeMismatch,
-          DynamicAny::DynAny::InvalidValue
-        ));
+                  TAO_DynCommon *the_dynany);
 
     static typename BasicTypeTraits<T>::return_type
-    get_value (TAO_DynCommon *the_dynany)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          DynamicAny::DynAny::TypeMismatch,
-          DynamicAny::DynAny::InvalidValue
-        ));
+    get_value (TAO_DynCommon *the_dynany);
   };
 
   // Encapsulates code that would otherwise be repeated in
@@ -62,10 +52,7 @@ namespace TAO
   {
     static void
     set_flag_t (DynamicAny::DynAny_ptr component,
-                CORBA::Boolean destroying)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
+                CORBA::Boolean destroying);
   };
 
   // Used by MakeDynAnyUtils below, parameterized on the type of
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 88b8d3a65a9..ca1d281536a 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -211,11 +211,6 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref)
 
 void
 TAO_DynAny_i::from_any (const CORBA::Any &any)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -242,12 +237,10 @@ TAO_DynAny_i::from_any (const CORBA::Any &any)
 
 CORBA::Any_ptr
 TAO_DynAny_i::to_any (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Any_ptr retval;
@@ -261,12 +254,10 @@ TAO_DynAny_i::to_any (void)
 
 CORBA::Boolean
 TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs);
@@ -512,9 +503,6 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
 
 void
 TAO_DynAny_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -530,19 +518,13 @@ TAO_DynAny_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynAny_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                    DynamicAny::DynAny::_nil ());
+  throw DynamicAny::DynAny::TypeMismatch ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index a02b03b5077..8fb87212a98 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -68,42 +68,24 @@ public:
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
 private:
   /// Check if the typecode is acceptable.
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 1a286428a50..62789a697e9 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -36,13 +36,11 @@ TAO_DynArray_i::init_common (void)
 }
 
 void
-TAO_DynArray_i::init (const CORBA::Any & any
-                      )
+TAO_DynArray_i::init (const CORBA::Any & any)
 {
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                  );
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind != CORBA::tk_array)
     {
@@ -51,8 +49,7 @@ TAO_DynArray_i::init (const CORBA::Any & any
 
   this->type_ = tc;
 
-  CORBA::ULong numfields = this->get_tc_length (tc.in ()
-                                               );
+  CORBA::ULong numfields = this->get_tc_length (tc.in ());
   // Resize the array.
   this->da_members_.size (numfields);
 
@@ -65,9 +62,12 @@ TAO_DynArray_i::init (const CORBA::Any & any
 
   if (impl->encoded  ())
     {
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        throw CORBA::INTERNAL ();
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -86,8 +86,7 @@ TAO_DynArray_i::init (const CORBA::Any & any
       TAO::Unknown_IDL_Type *field_unk = 0;
       TAO_InputCDR unk_in (cdr);
       ACE_NEW (field_unk,
-               TAO::Unknown_IDL_Type (field_tc.in (),
-                                      unk_in));
+               TAO::Unknown_IDL_Type (field_tc.in (), unk_in));
       field_any.replace (field_unk);
 
       // This recursive step will call the correct constructor
@@ -98,18 +97,14 @@ TAO_DynArray_i::init (const CORBA::Any & any
           field_any);
 
       // Move to the next field in the CDR stream.
-      (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr
-                                              );
+      (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr);
     }
 }
 
 void
-TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
-                      )
+TAO_DynArray_i::init (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                  );
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc);
 
   if (kind != CORBA::tk_array)
     {
@@ -118,16 +113,14 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
-  CORBA::ULong numfields = this->get_tc_length (tc
-                                               );
+  CORBA::ULong numfields = this->get_tc_length (tc);
 
   // Resize the array.
   this->da_members_.size (numfields);
 
   this->init_common ();
 
-  CORBA::TypeCode_var elemtype =
-    this->get_element_type ();
+  CORBA::TypeCode_var elemtype = this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
@@ -150,23 +143,18 @@ TAO_DynArray_i::get_element_type (void)
 
   while (kind != CORBA::tk_array)
     {
-      element_type =
-        element_type->content_type ();
+      element_type = element_type->content_type ();
 
       kind = element_type->kind ();
     }
 
   // Return the content type.
-  CORBA::TypeCode_ptr retval =
-    element_type->content_type ();
-
-  return retval;
+  return element_type->content_type ();
 }
 
 // Get the length from the (possibly aliased) typecode.
 CORBA::ULong
-TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
-                               )
+TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc)
 {
   CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc);
   CORBA::TCKind kind = tctmp->kind ();
@@ -177,16 +165,13 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
       kind = tctmp->kind ();
     }
 
-  CORBA::ULong retval = tctmp->length ();
-
-  return retval;
+  return tctmp->length ();
 }
 
 // ****************************************************************
 
 TAO_DynArray_i *
-TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref
-                         )
+TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -200,14 +185,10 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref
 
 DynamicAny::AnySeq *
 TAO_DynArray_i::get_elements (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
@@ -234,13 +215,7 @@ TAO_DynArray_i::get_elements (void)
 }
 
 void
-TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
-                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value)
 {
   if (this->destroyed_)
     {
@@ -263,8 +238,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
       // Check each arg element for type match.
       value_tc = value[i].type ();
       CORBA::Boolean equivalent =
-        value_tc->equivalent (element_type.in ()
-                             );
+        value_tc->equivalent (element_type.in ());
 
       if (equivalent)
         {
@@ -284,14 +258,10 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
 
 DynamicAny::DynAnySeq *
 TAO_DynArray_i::get_elements_as_dyn_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   DynamicAny::DynAnySeq *retval = 0;
@@ -306,9 +276,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (void)
     {
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
-      this->set_flag (this->da_members_[i].in (),
-                      0
-                     );
+      this->set_flag (this->da_members_[i].in (), 0);
 
       safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
@@ -322,11 +290,6 @@ TAO_DynArray_i::set_elements_as_dyn_any (
     const DynamicAny::DynAnySeq & values
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -340,8 +303,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
       throw DynamicAny::DynAny::InvalidValue ();
     }
 
-  CORBA::TypeCode_var element_type =
-    this->get_element_type ();
+  CORBA::TypeCode_var element_type = this->get_element_type ();
 
   CORBA::TypeCode_var val_type;
   CORBA::Boolean equivalent;
@@ -350,14 +312,12 @@ TAO_DynArray_i::set_elements_as_dyn_any (
     {
       val_type = values[i]->type ();
 
-      equivalent = val_type->equivalent (element_type.in ()
-                                        );
+      equivalent = val_type->equivalent (element_type.in ());
 
 
       if (equivalent)
         {
-          this->da_members_[i] =
-            values[i]->copy ();
+          this->da_members_[i] = values[i]->copy ();
         }
       else
         {
@@ -369,13 +329,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynArray_i::from_any (const CORBA::Any& any
-                          )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynArray_i::from_any (const CORBA::Any& any)
 {
   if (this->destroyed_)
     {
@@ -383,9 +337,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent =
-    this->type_.in ()->equivalent (tc.in ()
-                                  );
+  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ());
 
   if (equivalent)
     {
@@ -396,9 +348,12 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
       if (impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *unk =
+          TAO::Unknown_IDL_Type * const unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+          if (!unk)
+            throw CORBA::INTERNAL ();
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -409,16 +364,14 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
         }
 
       CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
-      CORBA::ULong arg_length = this->get_tc_length (tc.in ()
-                                                    );
+      CORBA::ULong arg_length = this->get_tc_length (tc.in ());
 
       if (length != arg_length)
         {
           throw DynamicAny::DynAny::TypeMismatch ();
         }
 
-      CORBA::TypeCode_var field_tc =
-        this->get_element_type ();
+      CORBA::TypeCode_var field_tc = this->get_element_type ();
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
@@ -426,8 +379,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
           TAO_InputCDR unk_in (cdr);
           TAO::Unknown_IDL_Type *field_unk = 0;
           ACE_NEW (field_unk,
-                   TAO::Unknown_IDL_Type (field_tc.in (),
-                                          unk_in));
+                   TAO::Unknown_IDL_Type (field_tc.in (), unk_in));
           field_any.replace (field_unk);
 
           this->da_members_[i]->destroy ();
@@ -438,9 +390,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
               field_any);
 
           // Move to the next field in the CDR stream.
-          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr
-                                                  );
+          (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr);
         }
 
       this->current_position_ = arg_length ? 0 : -1;
@@ -453,18 +403,13 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
 CORBA::Any_ptr
 TAO_DynArray_i::to_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  CORBA::TypeCode_var field_tc =
-    this->get_element_type ();
+  CORBA::TypeCode_var field_tc = this->get_element_type ();
 
   TAO_OutputCDR out_cdr;
   CORBA::Any_var field_any;
@@ -473,8 +418,7 @@ TAO_DynArray_i::to_any (void)
   for (size_t i = 0; i < length; ++i)
     {
       // Recursive step.
-      field_any =
-        this->da_members_[i]->to_any ();
+      field_any = this->da_members_[i]->to_any ();
 
       TAO::Any_Impl *field_impl = field_any->impl ();
       TAO_OutputCDR field_out;
@@ -482,9 +426,12 @@ TAO_DynArray_i::to_any (void)
 
       if (field_impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *field_unk =
+          TAO::Unknown_IDL_Type * const field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
 
+          if (!field_unk)
+            throw CORBA::INTERNAL ();
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
@@ -496,8 +443,7 @@ TAO_DynArray_i::to_any (void)
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
-                                                 &out_cdr
-                                                );
+                                                 &out_cdr);
     }
 
   TAO_InputCDR in_cdr (out_cdr);
@@ -518,26 +464,20 @@ TAO_DynArray_i::to_any (void)
 }
 
 CORBA::Boolean
-TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
-                       )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs)
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = rhs->type ();
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                             );
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ());
 
   if (!equivalent)
     {
-      return 0;
+      return false;
     }
 
   DynamicAny::DynAny_var tmp;
@@ -545,29 +485,24 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (static_cast<CORBA::Long> (i)
-                );
+      rhs->seek (static_cast<CORBA::Long> (i));
 
       tmp = rhs->current_component ();
 
       // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in ()
-                                );
+      member_equal = tmp->equal (this->da_members_[i].in ());
 
       if (!member_equal)
         {
-          return 0;
+          return false;
         }
     }
 
-  return 1;
+  return true;
 }
 
 void
 TAO_DynArray_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -579,9 +514,7 @@ TAO_DynArray_i::destroy (void)
       // Do a deep destroy.
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
-          this->set_flag (da_members_[i].in (),
-                          1
-                         );
+          this->set_flag (da_members_[i].in (), 1);
 
           this->da_members_[i]->destroy ();
         }
@@ -592,15 +525,10 @@ TAO_DynArray_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynArray_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->current_position_ == -1)
@@ -610,13 +538,9 @@ TAO_DynArray_i::current_component (void)
 
   CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_);
 
-  this->set_flag (this->da_members_[index].in (),
-                  0
-                 );
+  this->set_flag (this->da_members_[index].in (), 0);
 
-  return DynamicAny::DynAny::_duplicate (
-            this->da_members_[index].in ()
-          );
+  return DynamicAny::DynAny::_duplicate (this->da_members_[index].in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 17742413936..c10f33015a8 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -66,81 +66,45 @@ public:
 
   // = Functions specific to DynArray.
 
-  virtual DynamicAny::AnySeq * get_elements (
-      void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual DynamicAny::AnySeq * get_elements (void);
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-    ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
 private:
   /// Returns the type of elements contained in the array.
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 5eb152bd428..163028c36ae 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -35,26 +35,17 @@ TAO_DynCommon::~TAO_DynCommon (void)
 
 CORBA::TypeCode_ptr
 TAO_DynCommon::type (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   return CORBA::TypeCode::_duplicate (this->type_.in ());
 }
 
 void
-TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
-                       )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
+TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any)
 {
   if (this->destroyed_)
     {
@@ -63,16 +54,13 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
 
   CORBA::TypeCode_var tc = dyn_any->type ();
 
-  CORBA::Boolean const equivalent =
-    this->type_.in ()->equivalent (tc.in ()
-                                  );
+  CORBA::Boolean const equivalent = this->type_.in ()->equivalent (tc.in ());
 
   if (equivalent)
     {
       CORBA::Any_var any = dyn_any->to_any ();
 
-      this->from_any (any.in ()
-                     );
+      this->from_any (any.in ());
     }
   else
     {
@@ -81,130 +69,61 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
 }
 
 void
-TAO_DynCommon::insert_boolean (CORBA::Boolean value
-                               )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::insert_value (value,
-                                                           this);
+TAO_DynCommon::insert_boolean (CORBA::Boolean value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_octet (CORBA::Octet value
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::Octet>::insert_value (value,
-                                                         this);
+TAO_DynCommon::insert_octet (CORBA::Octet value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::Octet>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_char (CORBA::Char value
-                            )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_char (CORBA::Char value)
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Char>::insert_value (value,
-                                                        this);
+  TAO::DynAnyBasicTypeUtils<CORBA::Char>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_short (CORBA::Short value
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::Short>::insert_value (value,
-                                                         this);
+TAO_DynCommon::insert_short (CORBA::Short value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::Short>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_ushort (CORBA::UShort value
-                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_ushort (CORBA::UShort value)
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::UShort>::insert_value (value,
-                                                          this);
+  TAO::DynAnyBasicTypeUtils<CORBA::UShort>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_long (CORBA::Long value
-                            )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_long (CORBA::Long value)
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Long>::insert_value (value,
-                                                        this);
+  TAO::DynAnyBasicTypeUtils<CORBA::Long>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_ulong (CORBA::ULong value
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::ULong>::insert_value (value,
-                                                         this);
+TAO_DynCommon::insert_ulong (CORBA::ULong value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::ULong>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_float (CORBA::Float value
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::Float>::insert_value (value,
-                                                         this);
+TAO_DynCommon::insert_float (CORBA::Float value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::Float>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_double (CORBA::Double value
-                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_double (CORBA::Double value)
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::Double>::insert_value (value,
-                                                          this);
+  TAO::DynAnyBasicTypeUtils<CORBA::Double>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_string (const char * value
-                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_string (const char * value)
 {
   if (this->destroyed_)
     {
@@ -216,14 +135,12 @@ TAO_DynCommon::insert_string (const char * value
       DynamicAny::DynAny_var cc =
         this->check_component ();
 
-      cc->insert_string (value
-                        );
+      cc->insert_string (value);
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                       );
+        TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
       CORBA::TCKind const kind =
         unaliased_tc->kind ();
@@ -247,13 +164,7 @@ TAO_DynCommon::insert_string (const char * value
 }
 
 void
-TAO_DynCommon::insert_reference (CORBA::Object_ptr value
-                                 )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_reference (CORBA::Object_ptr value)
 {
   if (this->destroyed_)
     {
@@ -265,15 +176,13 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
       DynamicAny::DynAny_var cc =
         this->check_component ();
 
-      cc->insert_reference (value
-                           );
+      cc->insert_reference (value);
     }
   else
     {
       CORBA::Boolean good_type = true;
       CORBA::TCKind const kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                   );
+        TAO_DynAnyFactory::unalias (this->type_.in ());
 
       if (kind != CORBA::tk_objref)
         {
@@ -290,8 +199,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 
               if (ACE_OS::strcmp (value_id, my_id) != 0)
                 {
-                  good_type = value->_is_a (my_id
-                                           );
+                  good_type = value->_is_a (my_id);
                 }
             }
         }
@@ -330,78 +238,39 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 }
 
 void
-TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
-                                )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::TypeCode_ptr>::insert_value (value,
-                                                                this);
+TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::TypeCode_ptr>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_longlong (CORBA::LongLong value
-                                )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::insert_value (value,
-                                                            this);
+TAO_DynCommon::insert_longlong (CORBA::LongLong value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
-                                 )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::insert_value (value,
-                                                             this);
+TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value)
+{
+  TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::insert_value (value, this);
 }
 
 void
-TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
-                                  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_longdouble (CORBA::LongDouble value)
 {
   TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::insert_value (value,
                                                               this);
 }
 
 void
-TAO_DynCommon::insert_wchar (CORBA::WChar value
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_wchar (CORBA::WChar value)
 {
   TAO::DynAnyBasicTypeUtils<CORBA::WChar>::insert_value (value,
                                                          this);
 }
 
 void
-TAO_DynCommon::insert_wstring (const CORBA::WChar * value
-                               )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_wstring (const CORBA::WChar * value)
 {
   if (this->destroyed_)
     {
@@ -413,14 +282,12 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
       DynamicAny::DynAny_var cc =
         this->check_component ();
 
-      cc->insert_wstring (value
-                         );
+      cc->insert_wstring (value);
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring
-                                     );
+        this->check_type_and_unalias (CORBA::_tc_wstring);
 
       CORBA::ULong const bound = unaliased_tc->length ();
 
@@ -435,13 +302,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
 }
 
 void
-TAO_DynCommon::insert_any (const CORBA::Any &value
-                           )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_any (const CORBA::Any &value)
 {
   TAO::DynAnyBasicTypeUtils<CORBA::Any>::insert_value (value,
                                                        this);
@@ -450,13 +311,7 @@ TAO_DynCommon::insert_any (const CORBA::Any &value
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than insert_any, not more.
 void
-TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
-                               )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value)
 {
   if (this->destroyed_)
     {
@@ -465,18 +320,11 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
 
   CORBA::Any_var any = value->to_any ();
 
-  this->insert_any (any.in ()
-                   );
+  this->insert_any (any.in ());
 }
 
 void
-TAO_DynCommon::insert_val (CORBA::ValueBase *value
-                           )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_val (CORBA::ValueBase *value)
 {
   if (this->destroyed_)
     {
@@ -488,14 +336,12 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
       DynamicAny::DynAny_var cc =
         this->check_component ();
 
-      cc->insert_val (value
-                     );
+      cc->insert_val (value);
     }
   else
     {
       CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                   );
+        TAO_DynAnyFactory::unalias (this->type_.in ());
 
       if (kind != CORBA::tk_value)
         {
@@ -536,8 +382,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
       TAO_InputCDR in (out);
       TAO::Unknown_IDL_Type *unk = 0;
       ACE_NEW (unk,
-               TAO::Unknown_IDL_Type (this->type_.in (),
-                                      in));
+               TAO::Unknown_IDL_Type (this->type_.in (), in));
       this->any_.replace (unk);
     }
 }
@@ -546,115 +391,64 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
 
 CORBA::Boolean
 TAO_DynCommon::get_boolean (void)
-  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 (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this);
 }
 
 CORBA::Char
 TAO_DynCommon::get_char (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this);
 }
 
 CORBA::Short
 TAO_DynCommon::get_short (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this);
 }
 
 CORBA::UShort
 TAO_DynCommon::get_ushort (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this);
 }
 
 CORBA::Long
 TAO_DynCommon::get_long (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this);
 }
 
 CORBA::ULong
 TAO_DynCommon::get_ulong (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this);
 }
 
 CORBA::Float
 TAO_DynCommon::get_float (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this);
 }
 
 CORBA::Double
 TAO_DynCommon::get_double (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this);
 }
 
 char *
 TAO_DynCommon::get_string (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -667,16 +461,14 @@ TAO_DynCommon::get_string (void)
   else
     {
       CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                       );
+        TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
       CORBA::TCKind kind =
         unaliased_tc->kind ();
 
       if (kind != CORBA::tk_string)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       char *retval = 0;
@@ -688,8 +480,7 @@ TAO_DynCommon::get_string (void)
       // it must be for some other reason.
       if ((this->any_ >>= CORBA::Any::to_string (retval, bound)) == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                            0);
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       return CORBA::string_dup (retval);
@@ -698,16 +489,10 @@ TAO_DynCommon::get_string (void)
 
 CORBA::Object_ptr
 TAO_DynCommon::get_reference (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::Object::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -723,8 +508,7 @@ TAO_DynCommon::get_reference (void)
 
       if ((this->any_ >>= CORBA::Any::to_object (retval.inout ())) == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            CORBA::Object::_nil ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       return retval._retn ();
@@ -733,22 +517,15 @@ TAO_DynCommon::get_reference (void)
 
 CORBA::TypeCode_ptr
 TAO_DynCommon::get_typecode (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc =
-        this->check_component ();
+      DynamicAny::DynAny_var cc = this->check_component ();
 
       return cc->get_typecode ();
     }
@@ -758,8 +535,7 @@ TAO_DynCommon::get_typecode (void)
 
       if ((this->any_ >>= retval) == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            CORBA::TypeCode::_nil ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       return CORBA::TypeCode::_duplicate (retval);
@@ -768,55 +544,33 @@ TAO_DynCommon::get_typecode (void)
 
 CORBA::LongLong
 TAO_DynCommon::get_longlong (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this);
 }
 
 CORBA::ULongLong
 TAO_DynCommon::get_ulonglong (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this);
 }
 
 CORBA::LongDouble
 TAO_DynCommon::get_longdouble (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this);
 }
 
 CORBA::WChar
 TAO_DynCommon::get_wchar (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc =
-        this->check_component ();
+      DynamicAny::DynAny_var cc = this->check_component ();
 
       return cc->get_wchar ();
     }
@@ -826,8 +580,7 @@ TAO_DynCommon::get_wchar (void)
 
       if ((this->any_ >>= CORBA::Any::to_wchar (retval)) == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       return retval;
@@ -836,16 +589,10 @@ TAO_DynCommon::get_wchar (void)
 
 CORBA::WChar *
 TAO_DynCommon::get_wstring (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -861,16 +608,14 @@ TAO_DynCommon::get_wstring (void)
       // type code equivalence twice without risking a throw of
       // BadKind.
       CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring
-                                     );
+        this->check_type_and_unalias (CORBA::_tc_wstring);
 
       CORBA::WChar *retval = 0;
 
       CORBA::ULong bound =
         unaliased_tc->length ();
 
-      (void) (this->any_ >>= CORBA::Any::to_wstring (retval,
-                                                     bound));
+      (void) (this->any_ >>= CORBA::Any::to_wstring (retval, bound));
 
       return CORBA::wstring_dup (retval);
     }
@@ -878,16 +623,10 @@ TAO_DynCommon::get_wstring (void)
 
 CORBA::Any_ptr
 TAO_DynCommon::get_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -903,8 +642,7 @@ TAO_DynCommon::get_any (void)
 
       if ((this->any_ >>= tmp) == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       CORBA::Any *retval = 0;
@@ -919,16 +657,10 @@ TAO_DynCommon::get_any (void)
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
 TAO_DynCommon::get_dyn_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Any_var any = this->get_any ();
@@ -941,15 +673,10 @@ TAO_DynCommon::get_dyn_any (void)
 
 CORBA::ValueBase *
 TAO_DynCommon::get_val (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -962,12 +689,11 @@ TAO_DynCommon::get_val (void)
   else
     {
       CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                   );
+        TAO_DynAnyFactory::unalias (this->type_.in ());
 
       if (kind != CORBA::tk_value)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), 0);
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       CORBA::ValueBase_var retval;
@@ -975,7 +701,7 @@ TAO_DynCommon::get_val (void)
 
       if (any_impl == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       // This should always be non-zero for dynamic anys.
@@ -991,7 +717,7 @@ TAO_DynCommon::get_val (void)
 
       if (!good_extract)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       return retval._retn ();
@@ -1003,14 +729,10 @@ TAO_DynCommon::get_val (void)
 CORBA::Boolean
 TAO_DynCommon::seek (CORBA::Long slot
                      )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        false);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_ == 0)
@@ -1033,29 +755,21 @@ TAO_DynCommon::seek (CORBA::Long slot
 
 void
 TAO_DynCommon::rewind (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
       throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  (void) this->seek (0
-                    );
+  (void) this->seek (0);
 }
 
 CORBA::Boolean
 TAO_DynCommon::next (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_ == 0
@@ -1074,14 +788,10 @@ TAO_DynCommon::next (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynCommon::copy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Any_var any = this->to_any ();
@@ -1096,14 +806,10 @@ TAO_DynCommon::copy (void)
 
 CORBA::ULong
 TAO_DynCommon::component_count (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   return this->component_count_;
@@ -1112,13 +818,7 @@ TAO_DynCommon::component_count (void)
 // ****************************************************************
 
 void
-TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
-                                )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value)
 {
   if (this->destroyed_)
     {
@@ -1161,8 +861,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
                   // 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
-                                           );
+                  good_type = value->_is_a (my_id);
                 }
             }
         }
@@ -1181,8 +880,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
           TAO_InputCDR in (out);
           TAO::Unknown_IDL_Type *unk = 0;
           ACE_NEW (unk,
-                   TAO::Unknown_IDL_Type (this->type_.in (),
-                                          in));
+                   TAO::Unknown_IDL_Type (this->type_.in (), in));
           this->any_.replace (unk);
         }
       else
@@ -1194,16 +892,10 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
 
 CORBA::AbstractBase_ptr
 TAO_DynCommon::get_abstract (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::AbstractBase::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
@@ -1216,12 +908,11 @@ TAO_DynCommon::get_abstract (void)
   else
     {
       CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                   );
+        TAO_DynAnyFactory::unalias (this->type_.in ());
 
       if (kind != CORBA::tk_abstract_interface)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), 0);
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       CORBA::AbstractBase_var retval;
@@ -1229,7 +920,7 @@ TAO_DynCommon::get_abstract (void)
 
       if (any_impl == 0)
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       // This should always be non-zero for dynamic anys.
@@ -1243,7 +934,7 @@ TAO_DynCommon::get_abstract (void)
       // all cases.
       if (!(for_reading >> retval.inout ()))
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (), 0);
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       return retval._retn ();
@@ -1253,14 +944,7 @@ TAO_DynCommon::get_abstract (void)
 // ****************************************************************
 
 void
-TAO_DynCommon::insert_boolean_seq (
-    const CORBA::BooleanSeq &value
-    )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynCommon::insert_boolean_seq (const CORBA::BooleanSeq &value)
 {
   TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::insert_value (value,
                                                               this);
@@ -1268,11 +952,6 @@ TAO_DynCommon::insert_boolean_seq (
 
 void
 TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::insert_value (value,
                                                             this);
@@ -1280,11 +959,6 @@ TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value)
 
 void
 TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::insert_value (value,
                                                            this);
@@ -1292,35 +966,18 @@ TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value)
 
 void
 TAO_DynCommon::insert_short_seq (const CORBA::ShortSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::insert_value (value,
-                                                            this);
+  TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::insert_value (value, this);
 }
 
 void
 TAO_DynCommon::insert_ushort_seq (const CORBA::UShortSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::insert_value (value,
-                                                             this);
+  TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::insert_value (value, this);
 }
 
 void
 TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::insert_value (value,
                                                            this);
@@ -1328,11 +985,6 @@ TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value)
 
 void
 TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::insert_value (value,
                                                             this);
@@ -1340,11 +992,6 @@ TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value)
 
 void
 TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::insert_value (value,
                                                             this);
@@ -1352,11 +999,6 @@ TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value)
 
 void
 TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::insert_value (value,
                                                              this);
@@ -1364,11 +1006,6 @@ TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value)
 
 void
 TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::insert_value (value,
                                                                this);
@@ -1376,11 +1013,6 @@ TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value)
 
 void
 TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::insert_value (value,
                                                                 this);
@@ -1388,11 +1020,6 @@ TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value)
 
 void
 TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::insert_value (value,
                                                                  this);
@@ -1400,11 +1027,6 @@ TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value)
 
 void
 TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::insert_value (value,
                                                             this);
@@ -1414,11 +1036,6 @@ TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value)
 
 CORBA::BooleanSeq *
 TAO_DynCommon::get_boolean_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::BooleanSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this);
@@ -1427,11 +1044,6 @@ TAO_DynCommon::get_boolean_seq (void)
 
 CORBA::OctetSeq *
 TAO_DynCommon::get_octet_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::OctetSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this);
@@ -1440,11 +1052,6 @@ TAO_DynCommon::get_octet_seq (void)
 
 CORBA::CharSeq *
 TAO_DynCommon::get_char_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::CharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this);
@@ -1453,11 +1060,6 @@ TAO_DynCommon::get_char_seq (void)
 
 CORBA::ShortSeq *
 TAO_DynCommon::get_short_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::ShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this);
@@ -1466,11 +1068,6 @@ TAO_DynCommon::get_short_seq (void)
 
 CORBA::UShortSeq *
 TAO_DynCommon::get_ushort_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::UShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this);
@@ -1479,11 +1076,6 @@ TAO_DynCommon::get_ushort_seq (void)
 
 CORBA::LongSeq *
 TAO_DynCommon::get_long_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::LongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this);
@@ -1492,11 +1084,6 @@ TAO_DynCommon::get_long_seq (void)
 
 CORBA::ULongSeq *
 TAO_DynCommon::get_ulong_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::ULongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this);
@@ -1505,11 +1092,6 @@ TAO_DynCommon::get_ulong_seq (void)
 
 CORBA::FloatSeq *
 TAO_DynCommon::get_float_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::FloatSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this);
@@ -1518,11 +1100,6 @@ TAO_DynCommon::get_float_seq (void)
 
 CORBA::DoubleSeq *
 TAO_DynCommon::get_double_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::DoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this);
@@ -1531,11 +1108,6 @@ TAO_DynCommon::get_double_seq (void)
 
 CORBA::LongLongSeq *
 TAO_DynCommon::get_longlong_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::LongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this);
@@ -1544,11 +1116,6 @@ TAO_DynCommon::get_longlong_seq (void)
 
 CORBA::ULongLongSeq *
 TAO_DynCommon::get_ulonglong_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::ULongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this);
@@ -1557,11 +1124,6 @@ TAO_DynCommon::get_ulonglong_seq (void)
 
 CORBA::LongDoubleSeq *
 TAO_DynCommon::get_longdouble_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::LongDoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this);
@@ -1570,11 +1132,6 @@ TAO_DynCommon::get_longdouble_seq (void)
 
 CORBA::WCharSeq *
 TAO_DynCommon::get_wchar_seq (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   CORBA::WCharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this);
@@ -1586,9 +1143,6 @@ TAO_DynCommon::get_wchar_seq (void)
 void
 TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
                          CORBA::Boolean destroying)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   CORBA::TypeCode_var tc = component->type ();
 
@@ -1637,16 +1191,10 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
 
 DynamicAny::DynAny_ptr
 TAO_DynCommon::check_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->current_position_ == -1)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        DynamicAny::DynAny::_nil ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   DynamicAny::DynAny_var cc =
@@ -1666,8 +1214,7 @@ TAO_DynCommon::check_component (void)
     case CORBA::tk_except:
     case CORBA::tk_struct:
     case CORBA::tk_union:
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        DynamicAny::DynAny::_nil ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     case CORBA::tk_sequence:
       if (TAO_DynCommon::is_basic_type_seq (tc.in ()))
         {
@@ -1675,8 +1222,7 @@ TAO_DynCommon::check_component (void)
         }
       else
         {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            DynamicAny::DynAny::_nil ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     default:
       return cc._retn ();
@@ -1685,10 +1231,6 @@ TAO_DynCommon::check_component (void)
 
 void
 TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   CORBA::Boolean const equivalent =
     this->type_->equivalent (tc);
@@ -1750,10 +1292,6 @@ TAO_DynCommon::ref_to_component (CORBA::Boolean val)
 CORBA::TypeCode_ptr
 TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
                                        )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   this->check_type (tc);
 
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index a4093d39233..da687a20953 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -42,627 +42,265 @@ public:
   // = Some functions common to all Dynamic Any types.
 
   virtual CORBA::TypeCode_ptr type (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual void assign (
       DynamicAny::DynAny_ptr dyn_any
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+      );
 
   virtual void insert_boolean (
       CORBA::Boolean value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_octet (
       CORBA::Octet value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_char (
       CORBA::Char value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
   virtual void insert_short (
       CORBA::Short value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
   virtual void insert_ushort (
       CORBA::UShort value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual void insert_long (
       CORBA::Long value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_ulong (
       CORBA::ULong value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_float (
       CORBA::Float value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_double (
       CORBA::Double value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_string (
       const char * value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_reference (
       CORBA::Object_ptr value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_longlong (
       CORBA::LongLong value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_ulonglong (
       CORBA::ULongLong value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_longdouble (
       CORBA::LongDouble value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_wchar (
       CORBA::WChar value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_wstring (
       const CORBA::WChar * value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_any (
       const CORBA::Any & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_dyn_any (
       DynamicAny::DynAny_ptr value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_val (
       CORBA::ValueBase * value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual CORBA::Boolean get_boolean (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Octet get_octet (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Char get_char (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Short get_short (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::UShort get_ushort (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Long get_long (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ULong get_ulong (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Float get_float (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Double get_double (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual char * get_string (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Object_ptr get_reference (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::LongLong get_longlong (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ULongLong get_ulonglong (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::LongDouble get_longdouble (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::WChar get_wchar (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::WChar * get_wstring (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Any * get_any (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual DynamicAny::DynAny_ptr get_dyn_any (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ValueBase * get_val (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::Boolean seek (
       CORBA::Long index
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   virtual void rewind (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual CORBA::Boolean next (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual DynamicAny::DynAny_ptr copy (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual CORBA::ULong component_count (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual void insert_abstract (
       CORBA::AbstractBase_ptr value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual CORBA::AbstractBase_ptr get_abstract (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual void insert_boolean_seq (
       const CORBA::BooleanSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_octet_seq (
       const CORBA::OctetSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_char_seq (
       const CORBA::CharSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_short_seq (
       const CORBA::ShortSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_ushort_seq (
       const CORBA::UShortSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_long_seq (
       const CORBA::LongSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_ulong_seq (
       const CORBA::ULongSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_float_seq (
       const CORBA::FloatSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_double_seq (
       const CORBA::DoubleSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_longlong_seq (
       const CORBA::LongLongSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_ulonglong_seq (
       const CORBA::ULongLongSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_longdouble_seq (
       const CORBA::LongDoubleSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual void insert_wchar_seq (
       const CORBA::WCharSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual CORBA::BooleanSeq * get_boolean_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::OctetSeq * get_octet_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::CharSeq * get_char_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ShortSeq * get_short_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::UShortSeq * get_ushort_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::LongSeq * get_long_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ULongSeq * get_ulong_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::FloatSeq * get_float_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::DoubleSeq * get_double_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::LongLongSeq * get_longlong_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::ULongLongSeq * get_ulonglong_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::LongDoubleSeq * get_longdouble_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::WCharSeq * get_wchar_seq (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   /// This sets one of two flags in this base class. CORBA 2.4.2
   /// requires that destroy() do nothing if it is called on
@@ -677,26 +315,14 @@ public:
       DynamicAny::DynAny_ptr component,
       CORBA::Boolean destroying
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+    );
 
   // Utility functions.
 
-  DynamicAny::DynAny_ptr check_component (void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+  DynamicAny::DynAny_ptr check_component (void);
 
   void check_type (CORBA::TypeCode_ptr tc
-                   )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+                   );
 
   static bool is_basic_type_seq (CORBA::TypeCode_ptr tc);
 
@@ -741,11 +367,7 @@ private:
   // Utility functions used by insert_* and get_*.
 
   CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                              )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+                                              );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index aa2e8f27d89..7cc69934e98 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -38,9 +38,7 @@ void
 TAO_DynEnum_i::init (const CORBA::Any &any)
 {
   CORBA::TypeCode_var tc = any.type ();
-
-  CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ());
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind != CORBA::tk_enum)
     {
@@ -53,9 +51,12 @@ TAO_DynEnum_i::init (const CORBA::Any &any)
 
   if (impl->encoded ())
     {
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        throw CORBA::INTERNAL ();
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -106,35 +107,25 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref)
 
 char *
 TAO_DynEnum_i::get_as_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  const char *retval =
-    this->type_.in ()->member_name (this->value_);
+  const char *retval = this->type_.in ()->member_name (this->value_);
 
   return CORBA::string_dup (retval);
 }
 
 void
-TAO_DynEnum_i::set_as_string (const char *value_as_string
-                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynEnum_i::set_as_string (const char *value_as_string)
 {
-  CORBA::ULong count =
-    this->type_.in ()->member_count ();
+  CORBA::ULong count = this->type_.in ()->member_count ();
 
   CORBA::ULong i;
   const char *temp = 0;
 
   for (i = 0; i < count; ++i)
     {
-      temp = this->type_.in ()->member_name (i
-                                            );
+      temp = this->type_.in ()->member_name (i);
 
-      if (!ACE_OS::strcmp (value_as_string,
-                           temp))
+      if (!ACE_OS::strcmp (value_as_string, temp))
         {
           break;
         }
@@ -152,23 +143,14 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string
 
 CORBA::ULong
 TAO_DynEnum_i::get_as_ulong (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   return this->value_;
 }
 
 void
-TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
-                             )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong)
 {
-  CORBA::ULong max =
-    this->type_.in ()->member_count ();
+  CORBA::ULong const max = this->type_.in ()->member_count ();
 
   if (value_as_ulong < max)
     {
@@ -183,13 +165,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
 // ****************************************************************
 
 void
-TAO_DynEnum_i::from_any (const CORBA::Any& any
-                         )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
+TAO_DynEnum_i::from_any (const CORBA::Any& any)
 {
   CORBA::TypeCode_var tc = any.type ();
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
@@ -201,9 +177,12 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
 
       if (impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *unk =
+          TAO::Unknown_IDL_Type * const unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+          if (!unk)
+            throw CORBA::INTERNAL ();
+
           // We don't want unk's rd_ptr to move, in case we are shared by
           // another Any, so we use this to copy the state, not the buffer.
           TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -225,9 +204,6 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
 
 CORBA::Any_ptr
 TAO_DynEnum_i::to_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   TAO_OutputCDR out_cdr;
 
@@ -251,9 +227,6 @@ TAO_DynEnum_i::to_any (void)
 
 CORBA::Boolean
 TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   CORBA::TypeCode_var tc = rhs->type ();
 
@@ -271,9 +244,12 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
 
   if (impl->encoded ())
     {
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        throw CORBA::INTERNAL ();
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -292,9 +268,6 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
 
 void
 TAO_DynEnum_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -309,19 +282,13 @@ TAO_DynEnum_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynEnum_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                    DynamicAny::DynAny::_nil ());
+  throw DynamicAny::DynAny::TypeMismatch ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 506844d4543..15cbc510818 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -68,77 +68,45 @@ public:
 
   virtual char * get_as_string (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_as_string (
       const char * value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::ULong get_as_ulong (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_as_ulong (
       CORBA::ULong value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
 private:
   // Called by both versions of init().
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 02ef4ec50bc..fcc700e0427 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -40,8 +40,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any)
 {
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ());
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind != CORBA::tk_sequence)
     {
@@ -58,9 +57,12 @@ TAO_DynSequence_i::init (const CORBA::Any& any)
 
   if (impl->encoded ())
     {
-      TAO::Unknown_IDL_Type *unk =
+      TAO::Unknown_IDL_Type * const unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        throw CORBA::INTERNAL ();
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -89,30 +91,24 @@ TAO_DynSequence_i::init (const CORBA::Any& any)
       TAO_InputCDR unk_in (cdr);
       TAO::Unknown_IDL_Type *field_unk = 0;
       ACE_NEW (field_unk,
-               TAO::Unknown_IDL_Type (field_tc.in (),
-                                      unk_in));
+               TAO::Unknown_IDL_Type (field_tc.in (), unk_in));
       field_any.replace (field_unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
         TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
-          field_any._tao_get_typecode (),
-          field_any);
+          field_any._tao_get_typecode (), field_any);
 
       // Move to the next field in the CDR stream.
-      (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr
-                                              );
+      (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr);
     }
 }
 
 void
-TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
-                         )
+TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                  );
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc);
 
   if (kind != CORBA::tk_sequence)
     {
@@ -130,8 +126,7 @@ TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
 // ****************************************************************
 
 TAO_DynSequence_i *
-TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref
-                            )
+TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -160,8 +155,7 @@ TAO_DynSequence_i::get_element_type (void)
     }
 
   // Return the content type.
-  CORBA::TypeCode_ptr retval =
-    element_type->content_type ();
+  CORBA::TypeCode_ptr retval = element_type->content_type ();
 
   return retval;
 }
@@ -170,14 +164,10 @@ TAO_DynSequence_i::get_element_type (void)
 
 CORBA::ULong
 TAO_DynSequence_i::get_length (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   return this->component_count_;
@@ -185,10 +175,6 @@ TAO_DynSequence_i::get_length (void)
 
 void
 TAO_DynSequence_i::set_length (CORBA::ULong length)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -197,8 +183,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length)
 
   // CORBA::TypeCode::length() does not accept aliased type codes.
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                   );
+    TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   CORBA::ULong bound = stripped_tc->length ();
 
@@ -264,14 +249,10 @@ TAO_DynSequence_i::set_length (CORBA::ULong length)
 
 DynamicAny::AnySeq *
 TAO_DynSequence_i::get_elements (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
@@ -299,11 +280,6 @@ TAO_DynSequence_i::get_elements (void)
 
 void
 TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -311,8 +287,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
     }
 
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                   );
+    TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   CORBA::ULong length = value.length ();
   CORBA::ULong bound = stripped_tc->length ();
@@ -338,8 +313,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
       this->da_members_.size (length);
     }
 
-  CORBA::TypeCode_var element_type =
-    this->get_element_type ();
+  CORBA::TypeCode_var element_type = this->get_element_type ();
 
   CORBA::TypeCode_var value_tc;
 
@@ -348,8 +322,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
       // Check each arg element for type match.
       value_tc = value[i].type ();
       CORBA::Boolean equivalent =
-        value_tc->equivalent (element_type.in ()
-                             );
+        value_tc->equivalent (element_type.in ());
 
       if (equivalent)
         {
@@ -388,14 +361,10 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
 
 DynamicAny::DynAnySeq *
 TAO_DynSequence_i::get_elements_as_dyn_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   DynamicAny::DynAnySeq *retval = 0;
@@ -410,9 +379,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (void)
     {
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
-      this->set_flag (this->da_members_[i].in (),
-                      0
-                     );
+      this->set_flag (this->da_members_[i].in (), 0);
 
       safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
@@ -424,11 +391,6 @@ TAO_DynSequence_i::get_elements_as_dyn_any (void)
 void
 TAO_DynSequence_i::set_elements_as_dyn_any (
   const DynamicAny::DynAnySeq & values)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -436,8 +398,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
     }
 
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                   );
+    TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   CORBA::ULong length = values.length ();
   CORBA::ULong bound = stripped_tc->length ();
@@ -463,9 +424,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
     {
       val_type = values[i]->type ();
 
-      equivalent = val_type->equivalent (element_type.in ()
-                                        );
-
+      equivalent = val_type->equivalent (element_type.in ());
 
       if (equivalent)
         {
@@ -504,11 +463,6 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 
 void
 TAO_DynSequence_i::from_any (const CORBA::Any & any)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -517,8 +471,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
-    this->type_.in ()->equivalent (tc.in ()
-                                  );
+    this->type_.in ()->equivalent (tc.in ());
 
   if (equivalent)
     {
@@ -529,9 +482,12 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
 
       if (impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *unk =
+          TAO::Unknown_IDL_Type * const unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+          if (!unk)
+            throw CORBA::INTERNAL ();
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -578,9 +534,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
               field_any);
 
           // Move to the next field in the CDR stream.
-          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr
-                                                  );
+          (void) TAO_Marshal_Object::perform_skip (field_tc.in (), &cdr);
         }
 
       // Destroy any dangling members.
@@ -608,14 +562,10 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
 
 CORBA::Any_ptr
 TAO_DynSequence_i::to_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   TAO_OutputCDR out_cdr;
@@ -636,9 +586,12 @@ TAO_DynSequence_i::to_any (void)
 
       if (field_impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *field_unk =
+          TAO::Unknown_IDL_Type * const field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
 
+          if (!field_unk)
+            throw CORBA::INTERNAL ();
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
@@ -650,8 +603,7 @@ TAO_DynSequence_i::to_any (void)
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
-                                                 &out_cdr
-                                                );
+                                                 &out_cdr);
     }
 
   TAO_InputCDR in_cdr (out_cdr);
@@ -673,29 +625,24 @@ TAO_DynSequence_i::to_any (void)
 
 CORBA::Boolean
 TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = rhs->type ();
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                             );
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ());
 
   if (!equivalent)
     {
-      return 0;
+      return false;
     }
 
   if (rhs->component_count () != this->component_count_)
     {
-      return 0;
+      return false;
     }
 
   DynamicAny::DynAny_var tmp;
@@ -703,29 +650,24 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs)
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (static_cast<CORBA::Long> (i)
-                );
+      rhs->seek (static_cast<CORBA::Long> (i));
 
       tmp = rhs->current_component ();
 
       // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in ()
-                                );
+      member_equal = tmp->equal (this->da_members_[i].in ());
 
       if (!member_equal)
         {
-          return 0;
+          return false;
         }
     }
 
-  return 1;
+  return true;
 }
 
 void
 TAO_DynSequence_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -737,9 +679,7 @@ TAO_DynSequence_i::destroy (void)
       // Do a deep destroy.
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
-          this->set_flag (da_members_[i].in (),
-                          1
-                         );
+          this->set_flag (da_members_[i].in (), 1);
 
           this->da_members_[i]->destroy ();
         }
@@ -750,15 +690,10 @@ TAO_DynSequence_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynSequence_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->current_position_ == -1)
@@ -768,13 +703,9 @@ TAO_DynSequence_i::current_component (void)
 
   CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_);
 
-  this->set_flag (this->da_members_[index].in (),
-                  0
-                 );
+  this->set_flag (this->da_members_[index].in (), 0);
 
-  return DynamicAny::DynAny::_duplicate (
-            this->da_members_[index].in ()
-          );
+  return DynamicAny::DynAny::_duplicate (this->da_members_[index].in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 440dd3b3c33..d11675bd240 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -68,53 +68,30 @@ public:
 
   virtual CORBA::ULong get_length (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_length (
       CORBA::ULong len
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual DynamicAny::AnySeq * get_elements (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
@@ -122,42 +99,24 @@ public:
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
 private:
   // Utility, turns the type of elements contained in the sequence.
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 331e55dc52c..f8965f73c1b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -90,6 +90,9 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any)
     {
       unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!unk)
+        throw CORBA::INTERNAL ();
+
       in = unk->_tao_get_cdr ();
     }
   else
@@ -187,29 +190,21 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref)
 
 DynamicAny::FieldName
 TAO_DynStruct_i::current_member_name (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // Is this an empty exception?
   if (this->component_count_ == 0)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        0);
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 
   if (this->current_position_ == -1)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        0);
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // member_name() does not work with aliased type codes.
@@ -226,29 +221,21 @@ TAO_DynStruct_i::current_member_name (void)
 // Returns the unaliased TCKind.
 CORBA::TCKind
 TAO_DynStruct_i::current_member_kind (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // Is this an empty exception?
   if (this->component_count_ == 0)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        CORBA::tk_null);
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 
   if (this->current_position_ == -1)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        CORBA::tk_null);
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // member_type() does not work with aliased type codes.
@@ -267,14 +254,10 @@ TAO_DynStruct_i::current_member_kind (void)
 
 DynamicAny::NameValuePairSeq *
 TAO_DynStruct_i::get_members (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   DynamicAny::NameValuePairSeq* members;
@@ -320,11 +303,6 @@ TAO_DynStruct_i::get_members (void)
 
 void
 TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -377,14 +355,10 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
 
 DynamicAny::NameDynAnyPairSeq *
 TAO_DynStruct_i::get_members_as_dyn_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   DynamicAny::NameDynAnyPairSeq * members;
@@ -427,11 +401,6 @@ TAO_DynStruct_i::set_members_as_dyn_any (
     const DynamicAny::NameDynAnyPairSeq & values
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -484,11 +453,6 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 
 void
 TAO_DynStruct_i::from_any (const CORBA::Any & any)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -512,6 +476,9 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
         {
           unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+          if (!unk)
+            throw CORBA::INTERNAL ();
+
           in = unk->_tao_get_cdr ();
         }
       else
@@ -573,14 +540,10 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
 
 CORBA::Any_ptr
 TAO_DynStruct_i::to_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   TAO_OutputCDR out_cdr;
@@ -615,6 +578,9 @@ TAO_DynStruct_i::to_any (void)
           field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
 
+          if (!field_unk)
+            throw CORBA::INTERNAL ();
+
           field_in_cdr = field_unk->_tao_get_cdr ();
         }
       else
@@ -649,14 +615,10 @@ TAO_DynStruct_i::to_any (void)
 
 CORBA::Boolean
 TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = rhs->type ();
@@ -694,9 +656,6 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs)
 
 void
 TAO_DynStruct_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -721,22 +680,16 @@ TAO_DynStruct_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynStruct_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->component_count_ == 0)
     {
       // Empty exception - no component.
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        DynamicAny::DynAny::_nil ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 
   if (this->current_position_ == -1)
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 0733c23c2dd..56c9974b308 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -68,97 +68,53 @@ public:
 
   virtual DynamicAny::FieldName current_member_name (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::TCKind current_member_kind (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual DynamicAny::NameValuePairSeq *get_members (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_members (
       const DynamicAny::NameValuePairSeq& value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ));
+;
 
 private:
   /// Check if the typecode is acceptable.
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index d3a01b7299c..897d8947f39 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -78,18 +78,37 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc)
 
   // member_type()/member_label() do not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-  TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                 );
+  TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   CORBA::Any_var first_label =
-    unaliased_tc->member_label (this->current_position_
-                               );
+    unaliased_tc->member_label (this->current_position_);
 
   // Initialize the discriminator to the label value of the first member.
-  this->discriminator_ =
-    TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
-      first_label.in ()._tao_get_typecode (),
-      first_label.in ());
+  CORBA::TypeCode_var disc_tc = unaliased_tc->discriminator_type ();
+  CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in ());
+  CORBA::TCKind label_kind = TAO_DynAnyFactory::unalias (first_label->_tao_get_typecode ());
+  if (disc_kind == CORBA::tk_enum &&
+      label_kind == CORBA::tk_ulong)
+    {
+      // incase the discriminator is an enum type we have to walk
+      // a slightly more complex path because enum labels are
+      // stored as ulong in the union tc
+      this->discriminator_ =
+        TAO::MakeDynAnyUtils::make_dyn_any_t<CORBA::TypeCode_ptr> (
+          disc_tc.in (),
+          disc_tc.in ());
+      CORBA::ULong label_val;
+      first_label >>= label_val;
+      TAO_DynEnum_i::_narrow (this->discriminator_.in ())
+                                    ->set_as_ulong (label_val);
+    }
+  else
+    {
+      this->discriminator_ =
+        TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
+          first_label.in ()._tao_get_typecode (),
+          first_label.in ());
+    }
 
   CORBA::TypeCode_var first_type =
     unaliased_tc->member_type (this->current_position_
@@ -119,11 +138,6 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref)
 // an Any argument.
 void
 TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
 {
   // discriminator_type () does not work with aliased type codes,
   // only on unions, so strip the alias out of the type code
@@ -145,9 +159,12 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
 
   if (impl->encoded ())
     {
-      TAO::Unknown_IDL_Type *tmp =
+      TAO::Unknown_IDL_Type * const tmp =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+      if (!tmp)
+        throw CORBA::INTERNAL ();
+
       in = tmp->_tao_get_cdr ();
     }
   else
@@ -279,14 +296,10 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
 
 DynamicAny::DynAny_ptr
 TAO_DynUnion_i::get_discriminator (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
@@ -300,10 +313,6 @@ TAO_DynUnion_i::get_discriminator (void)
 
 void
 TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
@@ -363,8 +372,24 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
         }
 
       // If we got a match, a named member will be active.
-      this->discriminator_->from_any (label_any.in ()
+      CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in ());
+      CORBA::TCKind label_kind = TAO_DynAnyFactory::unalias (label_any->_tao_get_typecode ());
+      if (disc_kind == CORBA::tk_enum &&
+          label_kind == CORBA::tk_ulong)
+        {
+          // incase the discriminator is an enum type we have to walk
+          // a slightly more complex path because enum labels are
+          // stored as ulong in the union tc
+          CORBA::ULong label_val;
+          label_any >>= label_val;
+          TAO_DynEnum_i::_narrow (this->discriminator_.in ())
+                                        ->set_as_ulong (label_val);
+        }
+      else
+        {
+          this->discriminator_->from_any (label_any.in ()
                                      );
+        }
 
       // member_type() does not work with aliased type codes.
       CORBA::TypeCode_var member_tc =
@@ -384,6 +409,10 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
       this->component_count_ = 2;
 
       this->member_slot_ = i;
+
+      // we're through, disc, value has already been set
+      // no need for the copy operation below.
+      return;
     }
   else
     {
@@ -419,10 +448,6 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
 
 void
 TAO_DynUnion_i::set_to_default_member (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
@@ -467,10 +492,6 @@ TAO_DynUnion_i::set_to_default_member (void)
 
 void
 TAO_DynUnion_i::set_to_no_active_member (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
@@ -522,14 +543,10 @@ TAO_DynUnion_i::set_to_no_active_member (void)
 
 CORBA::Boolean
 TAO_DynUnion_i::has_no_active_member (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // No active member (CORBA 2.3.1).
@@ -539,14 +556,10 @@ TAO_DynUnion_i::has_no_active_member (void)
 
 CORBA::TCKind
 TAO_DynUnion_i::discriminator_kind (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc =
@@ -560,15 +573,10 @@ TAO_DynUnion_i::discriminator_kind (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynUnion_i::member (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Boolean has_no_active_member =
@@ -576,8 +584,7 @@ TAO_DynUnion_i::member (void)
 
   if (has_no_active_member)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        DynamicAny::DynAny::_nil ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
@@ -591,15 +598,10 @@ TAO_DynUnion_i::member (void)
 
 char *
 TAO_DynUnion_i::member_name (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Boolean has_no_active_member =
@@ -607,8 +609,7 @@ TAO_DynUnion_i::member_name (void)
 
   if (has_no_active_member)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        0);
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   const char *retval = this->type_->member_name (this->member_slot_
@@ -619,15 +620,10 @@ TAO_DynUnion_i::member_name (void)
 
 CORBA::TCKind
 TAO_DynUnion_i::member_kind (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::Boolean has_no_active_member =
@@ -635,8 +631,7 @@ TAO_DynUnion_i::member_kind (void)
 
   if (has_no_active_member)
     {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        CORBA::tk_null);
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   CORBA::TypeCode_var tc =
@@ -652,11 +647,6 @@ TAO_DynUnion_i::member_kind (void)
 
 void
 TAO_DynUnion_i::from_any (const CORBA::Any& any)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   if (this->destroyed_)
     {
@@ -689,14 +679,10 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any)
 
 CORBA::Any_ptr
 TAO_DynUnion_i::to_any (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   TAO_OutputCDR out_cdr;
@@ -715,9 +701,12 @@ TAO_DynUnion_i::to_any (void)
 
   if (disc_any_impl->encoded ())
     {
-      TAO::Unknown_IDL_Type *disc_unk =
+      TAO::Unknown_IDL_Type * const disc_unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (disc_any_impl);
 
+      if (!disc_unk)
+        throw CORBA::INTERNAL ();
+
       disc_in_cdr = disc_unk->_tao_get_cdr ();
     }
   else
@@ -747,9 +736,12 @@ TAO_DynUnion_i::to_any (void)
 
       if (member_any_impl->encoded ())
         {
-          TAO::Unknown_IDL_Type *member_unk =
+          TAO::Unknown_IDL_Type * const member_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (member_any_impl);
 
+          if (!member_unk)
+            throw CORBA::INTERNAL ();
+
           member_in_cdr = member_unk->_tao_get_cdr ();
         }
       else
@@ -785,14 +777,10 @@ TAO_DynUnion_i::to_any (void)
 
 CORBA::Boolean
 TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs
@@ -824,9 +812,6 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs)
 
 void
 TAO_DynUnion_i::destroy (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   if (this->destroyed_)
     {
@@ -855,15 +840,10 @@ TAO_DynUnion_i::destroy (void)
 
 DynamicAny::DynAny_ptr
 TAO_DynUnion_i::current_component (void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->current_position_ == 1)
@@ -890,9 +870,6 @@ CORBA::Boolean
 TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
                              const CORBA::Any &other_any
                              )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   // Use my_any so we can detect a default case label,
   // if we are iterating through the union type code's
@@ -938,7 +915,37 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
         CORBA::ULong my_val;
         CORBA::ULong other_val;
         my_any >>= my_val;
-        other_any >>= other_val;
+
+        // check whether the discriminator is possibly an enum type
+        // since these get stored as ulong label values as well
+        CORBA::TypeCode_var other_tc = other_any.type ();
+        CORBA::TCKind kind = TAO_DynAnyFactory::unalias (other_tc.in ());
+        if (kind == CORBA::tk_enum)
+          {
+            TAO::Any_Impl *other_impl = other_any.impl ();
+
+            if (other_impl->encoded ())
+              {
+                TAO::Unknown_IDL_Type *other_unk =
+                  dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
+
+                // We don't want unk's rd_ptr to move, in case we are
+                // shared by another Any, so we use this to copy the
+                // state, not the buffer.
+                TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
+                for_reading.read_ulong (other_val);
+              }
+            else
+              {
+                TAO_OutputCDR other_out;
+                other_impl->marshal_value (other_out);
+                TAO_InputCDR other_in (other_out);
+                other_in.read_ulong (other_val);
+              }
+          }
+        else
+          other_any >>= other_val;
+
         return my_val == other_val;
       }
     case CORBA::tk_boolean:
@@ -993,9 +1000,12 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
 
         if (my_impl->encoded ())
           {
-            TAO::Unknown_IDL_Type *my_unk =
+            TAO::Unknown_IDL_Type * const my_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (my_impl);
 
+            if (!my_unk)
+              throw CORBA::INTERNAL ();
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (my_unk->_tao_get_cdr ());
@@ -1013,9 +1023,12 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
 
         if (other_impl->encoded ())
           {
-            TAO::Unknown_IDL_Type *other_unk =
+            TAO::Unknown_IDL_Type * const other_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
 
+            if (!other_unk)
+              throw CORBA::INTERNAL ();
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 28ac989dd3b..819b8a10391 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -65,126 +65,70 @@ public:
 
   virtual DynamicAny::DynAny_ptr get_discriminator (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void set_discriminator (
       DynamicAny::DynAny_ptr d
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
   virtual void set_to_default_member (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
   virtual void set_to_no_active_member (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
   virtual CORBA::Boolean has_no_active_member (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::TCKind discriminator_kind (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr member (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual char * member_name (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::TCKind member_kind (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
       const CORBA::Any & value
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+;
 
   virtual CORBA::Any * to_any (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
       )
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual void destroy (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+;
 
   virtual DynamicAny::DynAny_ptr current_component (
       void)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+;
 
 private:
   /// Code common to the constructor from an Any arg and the member
   /// function from_any().
   void set_from_any (const CORBA::Any &any
-                     )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
+                     );
 
   /// Called by both versions of init().
   void init_common (void);
@@ -192,10 +136,7 @@ private:
   /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
                               const CORBA::Any &other_any
-                              )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+                              );
 
   /// Use copy() or assign() instead of these.
   TAO_DynUnion_i (const TAO_DynUnion_i &src);
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index b5183908461..0b5ee19d56d 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -20,12 +20,8 @@ CORBA::Any *
 TAO_DynValueBox_i::get_boxed_value (
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
@@ -33,11 +29,6 @@ TAO_DynValueBox_i::set_boxed_value (
     const CORBA::Any & /* boxed */
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
@@ -46,13 +37,8 @@ DynamicAny::DynAny_ptr
 TAO_DynValueBox_i::get_boxed_value_as_dyn_any (
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    DynamicAny::DynAny::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
@@ -60,10 +46,6 @@ TAO_DynValueBox_i::set_boxed_value_as_dyn_any (
     DynamicAny::DynAny_ptr /* boxed */
 
   )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h
index 4a8bd9c6895..7f7d6f717bf 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.h
+++ b/TAO/tao/DynamicAny/DynValueBox_i.h
@@ -46,38 +46,21 @@ public:
 
   virtual CORBA::Any * get_boxed_value (
       void
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+    );
 
   virtual void set_boxed_value (
       const CORBA::Any & boxed
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+    );
 
   virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (
       void
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
+    );
 
   virtual void set_boxed_value_as_dyn_any (
       DynamicAny::DynAny_ptr boxed
 
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
+    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index 6f0aabaaccc..40de3f745ed 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -17,31 +17,19 @@ TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void)
 }
 
 CORBA::Boolean
-TAO_DynValueCommon_i::is_null (
-    void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynValueCommon_i::is_null (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_DynValueCommon_i::set_to_null (
-    void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynValueCommon_i::set_to_null (void)
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_DynValueCommon_i::set_to_value (
-    void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynValueCommon_i::set_to_value (void)
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h
index 654619bcc04..462eb86b53e 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.h
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.h
@@ -44,23 +44,11 @@ public:
 
   ~TAO_DynValueCommon_i (void);
 
-  virtual CORBA::Boolean is_null (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual CORBA::Boolean is_null (void);
 
-  virtual void set_to_null (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void set_to_null (void);
 
-  virtual void set_to_value (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual void set_to_value (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 2db1ded4b65..788af58bdeb 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -19,47 +19,28 @@ TAO_DynValue_i::~TAO_DynValue_i (void)
 char *
 TAO_DynValue_i::current_member_name (
     void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TCKind
 TAO_DynValue_i::current_member_kind (
     void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    CORBA::tk_null);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 DynamicAny::NameValuePairSeq *
 TAO_DynValue_i::get_members (
     void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_DynValue_i::set_members (
     const DynamicAny::NameValuePairSeq & /* value */
     )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
@@ -67,22 +48,14 @@ TAO_DynValue_i::set_members (
 DynamicAny::NameDynAnyPairSeq *
 TAO_DynValue_i::get_members_as_dyn_any (
     void)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO_DynValue_i::set_members_as_dyn_any (
     const DynamicAny::NameDynAnyPairSeq & /* value */
     )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
 {
   throw ::CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h
index 205073b735c..da927158cf8 100644
--- a/TAO/tao/DynamicAny/DynValue_i.h
+++ b/TAO/tao/DynamicAny/DynValue_i.h
@@ -45,50 +45,24 @@ public:
   ~TAO_DynValue_i (void);
 
   virtual char * current_member_name (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual CORBA::TCKind current_member_kind (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      void);
 
   virtual DynamicAny::NameValuePairSeq * get_members (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual void set_members (
       const DynamicAny::NameValuePairSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      void)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      void);
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value
-      )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
+      );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 99c4133f520..947f67c30c6 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -24,7 +24,6 @@ CORBA::Object_ptr
 TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
                                       int,
                                       ACE_TCHAR *[])
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index cf5aa46991c..4f75403d742 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -39,8 +39,7 @@ public:
   /// Creates a DynamicAny factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv [])
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
new file mode 100644
index 00000000000..aea071fcfe3
--- /dev/null
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -0,0 +1,525 @@
+// $Id$
+
+#include "AMH_DSI_Response_Handler.h"
+#include "Request.h"
+#include "ExceptionList.h"
+#include "DII_Invocation.h"
+#include "Server_Request.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/GIOP_Utils.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/Object.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+
+ACE_RCSID (DynamicInterface, AMH_DSI_Response_Handler,
+           "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "AMH_DSI_Response_Handler.inl"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+const char*
+TAO_AMH_DSI_Exception_Holder::_tao_obv_static_repository_id ()
+{
+  return "IDL:TAO_AMH_DSI_Exception_Holder:1.0";
+}
+
+TAO_AMH_DSI_Exception_Holder::TAO_AMH_DSI_Exception_Holder (CORBA::Exception *ex)
+  : exception_ (ex)
+{
+}
+
+TAO_AMH_DSI_Exception_Holder::~TAO_AMH_DSI_Exception_Holder ()
+{
+}
+
+void
+tao_TAO_AMH_DSI_Exception_Holder_add_ref (TAO_AMH_DSI_Exception_Holder * p)
+{
+  CORBA::add_ref (p);
+}
+
+void
+tao_TAO_AMH_DSI_Exception_Holder_remove_ref (TAO_AMH_DSI_Exception_Holder * p)
+{
+  CORBA::remove_ref (p);
+}
+
+
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (void)
+  : ptr_ (0)
+{
+}
+
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (
+    TAO_AMH_DSI_Exception_Holder * p)
+  : ptr_ (p)
+{
+}
+
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (
+    const TAO_AMH_DSI_Exception_Holder * p)
+  : ptr_ (const_cast<TAO_AMH_DSI_Exception_Holder *> (p))
+{
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (
+    const TAO_AMH_DSI_Exception_Holder_var & p)
+{
+  CORBA::add_ref (p.ptr ());
+  this->ptr_ = p.ptr ();
+}
+
+TAO_AMH_DSI_Exception_Holder_var::~TAO_AMH_DSI_Exception_Holder_var (void)
+{
+  CORBA::remove_ref (this->ptr_);
+}
+
+TAO_AMH_DSI_Exception_Holder_var &
+TAO_AMH_DSI_Exception_Holder_var::operator= (TAO_AMH_DSI_Exception_Holder *p)
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_AMH_DSI_Exception_Holder_var &
+TAO_AMH_DSI_Exception_Holder_var::operator= (
+    const TAO_AMH_DSI_Exception_Holder_var & p)
+{
+  if (this != &p)
+    {
+      CORBA::remove_ref (this->ptr_);
+      TAO_AMH_DSI_Exception_Holder *tmp = p.ptr ();
+      CORBA::add_ref (tmp);
+      this->ptr_ = tmp;
+    }
+
+  return *this;
+}
+
+TAO_AMH_DSI_Exception_Holder_var::operator const TAO_AMH_DSI_Exception_Holder* (
+    ) const // cast
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder_var::operator TAO_AMH_DSI_Exception_Holder*& (
+    ) // cast
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder_var::in (void) const
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *&
+TAO_AMH_DSI_Exception_Holder_var::inout (void)
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *&
+TAO_AMH_DSI_Exception_Holder_var::out (void)
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  TAO_AMH_DSI_Exception_Holder* tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+void
+TAO_AMH_DSI_Exception_Holder_var::tao_add_ref (
+    TAO_AMH_DSI_Exception_Holder *p
+  )
+{
+  CORBA::add_ref (p);
+}
+
+void
+TAO_AMH_DSI_Exception_Holder_var::tao_remove_ref (
+    TAO_AMH_DSI_Exception_Holder *p
+  )
+{
+  CORBA::remove_ref (p);
+}
+
+TAO_AMH_DSI_Exception_Holder_out::TAO_AMH_DSI_Exception_Holder_out (
+    TAO_AMH_DSI_Exception_Holder * &p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+TAO_AMH_DSI_Exception_Holder_out::TAO_AMH_DSI_Exception_Holder_out (
+     TAO_AMH_DSI_Exception_Holder_var & p)
+  : ptr_ (p.out ())
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = 0;
+}
+
+TAO_AMH_DSI_Exception_Holder_out::TAO_AMH_DSI_Exception_Holder_out (
+    const TAO_AMH_DSI_Exception_Holder_out &p)
+  : ptr_ (const_cast<TAO_AMH_DSI_Exception_Holder_out&> (p).ptr_)
+{}
+
+TAO_AMH_DSI_Exception_Holder_out &
+TAO_AMH_DSI_Exception_Holder_out::operator= (
+    const TAO_AMH_DSI_Exception_Holder_out &p)
+{
+  this->ptr_ = const_cast<TAO_AMH_DSI_Exception_Holder_out &> (p).ptr_;
+  return *this;
+}
+
+TAO_AMH_DSI_Exception_Holder_out &
+TAO_AMH_DSI_Exception_Holder_out::operator= (
+    const TAO_AMH_DSI_Exception_Holder_var &p)
+{
+  TAO_AMH_DSI_Exception_Holder *tmp = p.ptr ();
+  CORBA::add_ref (tmp);
+  this->ptr_ = tmp;
+  return *this;
+}
+
+TAO_AMH_DSI_Exception_Holder_out &
+TAO_AMH_DSI_Exception_Holder_out::operator= (TAO_AMH_DSI_Exception_Holder *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_AMH_DSI_Exception_Holder_out::operator TAO_AMH_DSI_Exception_Holder*& ()
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *&
+TAO_AMH_DSI_Exception_Holder_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+TAO_AMH_DSI_Exception_Holder *
+TAO_AMH_DSI_Exception_Holder::_downcast (CORBA::ValueBase * v)
+{
+  return dynamic_cast < TAO_AMH_DSI_Exception_Holder * >(v);
+}
+
+const char *
+TAO_AMH_DSI_Exception_Holder::_tao_obv_repository_id (void) const
+{
+  return this->_tao_obv_static_repository_id ();
+}
+
+void
+TAO_AMH_DSI_Exception_Holder::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_AMH_DSI_Exception_Holder *tmp =
+    static_cast<TAO_AMH_DSI_Exception_Holder *> (_tao_void_pointer);
+  delete tmp;
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_unmarshal (
+    TAO_InputCDR &strm,
+    TAO_AMH_DSI_Exception_Holder *&new_object
+  )
+{
+  CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
+  CORBA::Boolean retval =
+    CORBA::ValueBase::_tao_unmarshal_pre (
+        strm,
+        base,
+        TAO_AMH_DSI_Exception_Holder::_tao_obv_static_repository_id ()
+      );
+
+  if (retval == 0)
+    {
+      return false;
+    }
+
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+
+      if (base == 0)
+        {
+          return false;  // %! except.?
+        }
+
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
+          return false;
+        }
+    }
+
+  // Now base must be null or point to the unmarshaled object.
+  // Align the pointer to the right subobject.
+  new_object = TAO_AMH_DSI_Exception_Holder::_downcast (base);
+  return retval;
+}
+
+void
+TAO_AMH_DSI_Exception_Holder::raise_invoke ()
+{
+  this->exception_->_raise ();
+}
+
+// The pseudo-object _nil method.
+TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler::_nil (void)
+{
+  return (TAO_AMH_DSI_Response_Handler_ptr) 0;
+}
+
+
+TAO_AMH_DSI_Response_Handler::TAO_AMH_DSI_Response_Handler (
+    TAO_ServerRequest & sr)
+  : TAO_AMH_Response_Handler (),
+    orb_core_ (sr.orb_core ())
+{
+}
+
+TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler (void)
+{
+}
+
+void
+TAO_AMH_DSI_Response_Handler::invoke_reply (CORBA::NVList_ptr args,
+					    CORBA::NamedValue_ptr result)
+{
+  try
+   {
+     this->_tao_rh_init_reply ();
+
+    // Send the return value, if any.
+    if (result != 0 && result->value () != 0)
+      {
+	      result->value ()->impl ()->marshal_value (this->_tao_out);
+      }
+
+    // Send the "inout" and "out" parameters.
+    if (args != 0)
+      {
+	      args->_tao_encode (this->_tao_out, CORBA::ARG_INOUT | CORBA::ARG_OUT);
+      }
+    this->_tao_rh_send_reply ();
+  }
+  catch (const CORBA::Exception &)
+    {
+      // TODO:
+    }
+}
+
+void
+TAO_AMH_DSI_Response_Handler::invoke_excep (TAO_AMH_DSI_Exception_Holder * h)
+{
+  try
+    {
+      h->raise_invoke ();
+    }
+  catch (const CORBA::Exception & ex)
+    {
+      this->_tao_rh_send_exception (ex);
+    }
+}
+
+void
+TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
+    CORBA::ULong reply_status,
+    TAO_OutputCDR & encap)
+{
+  // for this to be effective, ACE & TAO must be built with
+  // ACE_ENABLE_SWAP_ON_WRITE defined in ace/config.h
+  this->_tao_out.reset_byte_order (encap.byte_order ());
+  // This reply path handles only user exceptions.
+  switch (reply_status)
+    {
+    case TAO_AMI_REPLY_USER_EXCEPTION:
+      this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
+      break;
+    case TAO_AMI_REPLY_SYSTEM_EXCEPTION:
+      this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
+      break;
+
+      // TODO: we don't handle location forward at this moment.
+      // need to be addressed later.
+      //
+      //case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
+      //  this->exception_type_ = TAO_GIOP_LOCATION_FORWARD;
+      //  break;
+    }
+  try
+    {
+      this->_tao_rh_init_reply ();
+
+      // We know nothing about this exception, so we marshal it as a block
+      // of bytes. The outgoing stream's byte order has already been matched
+      // to the original source of the reply.
+      this->_tao_out.write_char_array (encap.buffer (), encap.length ());
+      // This will prevent the marshaling of any parameters into this reply.
+      //  this->sent_gateway_exception_ = 1;
+      this->_tao_rh_send_reply ();
+    }
+  catch (const CORBA::Exception &)
+    {
+      // TODO:
+    }
+
+}
+
+void
+TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
+    CORBA::ULong reply_status,
+    TAO_InputCDR &encap)
+{
+  // for this to be effective, ACE & TAO must be built with
+  // ACE_ENABLE_SWAP_ON_WRITE defined in ace/config.h
+  this->_tao_out.reset_byte_order(encap.byte_order());
+  // This reply path handles only user exceptions.
+  switch (reply_status)
+    {
+    //case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
+    case TAO_AMI_REPLY_USER_EXCEPTION:
+      this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
+      break;
+    case TAO_AMI_REPLY_SYSTEM_EXCEPTION:
+      this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
+      break;
+
+    // we don't handle location forward at this moment.
+    // need to be addressed later.
+    //
+    //case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
+    //  this->exception_type_ = TAO_GIOP_LOCATION_FORWARD;
+    //  break;
+    }
+  try
+  {
+    this->_tao_rh_init_reply ();
+
+  // We know nothing about this exception, so we marshal it as a block
+  // of bytes. The outgoing stream's byte order has already been matched
+  // to the original source of the reply.
+    this->_tao_out.write_octet_array_mb (encap.start());
+  // This will prevent the marshaling of any parameters into this reply.
+  //  this->sent_gateway_exception_ = 1;
+    this->_tao_rh_send_reply ();
+  }
+  catch (const CORBA::Exception &)
+  {
+    // TODO:
+  }
+
+}
+
+void *
+TAO_AMH_DSI_Response_Handler::_downcast (const char *)
+{
+  return this;
+}
+
+TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler::_narrow (CORBA::Object_ptr obj)
+{
+  return TAO_AMH_DSI_Response_Handler::_unchecked_narrow (obj);
+}
+
+TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj)
+{
+  if (CORBA::is_nil (obj))
+    return TAO_AMH_DSI_Response_Handler::_nil ();
+
+  return dynamic_cast < TAO_AMH_DSI_Response_Handler_ptr > (obj);
+}
+
+const char*
+TAO_AMH_DSI_Response_Handler::_interface_repository_id (void) const
+{
+  return 0;
+}
+
+CORBA::TypeCode_ptr
+TAO_AMH_DSI_Exception_Holder::_tao_type (void) const
+{
+  return 0;
+}
+
+void
+TAO_AMH_DSI_Exception_Holder::_tao_obv_truncatable_repo_ids (
+    Repository_Id_List &) const
+{
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_match_formal_type (ptrdiff_t ) const
+{
+  return false;
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_marshal_v (TAO_OutputCDR &) const
+{
+  return true;
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_unmarshal_v (TAO_InputCDR &)
+{
+  return true;
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_marshal__Test_TAO_AMH_DSI_Exception_Holder (
+    TAO_OutputCDR &)
+{
+  return true;
+}
+
+CORBA::Boolean
+TAO_AMH_DSI_Exception_Holder::_tao_unmarshal__Test_TAO_AMH_DSI_Exception_Holder (
+    TAO_InputCDR &)
+{
+  return true;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
new file mode 100644
index 00000000000..8f6af4aa735
--- /dev/null
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -0,0 +1,263 @@
+// -*- C++ -*-
+
+//=====================================================================
+/**
+ *  @file AMH_DSI_Response_Handler.h
+ *
+ *  $Id$
+ *
+ *  @brief Handle the Repsonse appropriately.
+ */
+//=====================================================================
+
+#ifndef TAO_AMH_DSI_RESPONSE_HANDLER_H
+#define TAO_AMH_DSI_RESPONSE_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/Messaging/AMH_Response_Handler.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "dynamicinterface_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_AMH_DSI_Response_Handler;
+typedef TAO_AMH_DSI_Response_Handler *TAO_AMH_DSI_Response_Handler_ptr;
+
+/**
+ * @class TAO_AMH_DSI_Response_Handler_var
+ *
+ * @brief The T_var class for response handler
+ *
+ * As any other pseudo object, this class has a T_var class too.
+ *
+ */
+class TAO_DynamicInterface_Export TAO_AMH_DSI_Response_Handler_var
+{
+public:
+  TAO_AMH_DSI_Response_Handler_var (void);
+  TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_Response_Handler_ptr);
+  TAO_AMH_DSI_Response_Handler_var (
+      const TAO_AMH_DSI_Response_Handler_var &);
+  ~TAO_AMH_DSI_Response_Handler_var (void);
+
+  TAO_AMH_DSI_Response_Handler_var &operator= (
+      TAO_AMH_DSI_Response_Handler_ptr);
+  TAO_AMH_DSI_Response_Handler_var &operator= (
+      const TAO_AMH_DSI_Response_Handler_var &);
+  TAO_AMH_DSI_Response_Handler_ptr operator-> (void) const;
+
+  operator const TAO_AMH_DSI_Response_Handler_ptr &() const;
+  operator TAO_AMH_DSI_Response_Handler_ptr &();
+
+  TAO_AMH_DSI_Response_Handler_ptr in (void) const;
+  TAO_AMH_DSI_Response_Handler_ptr &inout (void);
+  TAO_AMH_DSI_Response_Handler_ptr &out (void);
+  TAO_AMH_DSI_Response_Handler_ptr _retn (void);
+  TAO_AMH_DSI_Response_Handler_ptr ptr (void) const;
+
+private:
+  TAO_AMH_DSI_Response_Handler_ptr ptr_;
+};
+
+class TAO_AMH_DSI_Exception_Holder;
+typedef TAO_AMH_DSI_Exception_Holder *TAO_AMH_DSI_Exception_Holder_ptr;
+
+/**
+ * @class TAO_AMH_DSI_Exception_Holder_var
+ *
+ * @brief The T_var class for exception holder
+ *
+ * As any other pseudo object, this class has a T_var class too.
+ *
+ */
+class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_var
+{
+public:
+  TAO_AMH_DSI_Exception_Holder_var (void);
+  TAO_AMH_DSI_Exception_Holder_var (TAO_AMH_DSI_Exception_Holder*);
+  TAO_AMH_DSI_Exception_Holder_var (
+      const TAO_AMH_DSI_Exception_Holder*);
+  TAO_AMH_DSI_Exception_Holder_var (
+      const TAO_AMH_DSI_Exception_Holder_var &);
+  ~TAO_AMH_DSI_Exception_Holder_var (void);
+
+  TAO_AMH_DSI_Exception_Holder_var &operator= (
+      TAO_AMH_DSI_Exception_Holder*);
+  TAO_AMH_DSI_Exception_Holder_var &operator= (
+      const TAO_AMH_DSI_Exception_Holder_var &);
+  TAO_AMH_DSI_Exception_Holder* operator-> (void) const;
+
+  operator const TAO_AMH_DSI_Exception_Holder* () const;
+  operator TAO_AMH_DSI_Exception_Holder*& ();
+
+  TAO_AMH_DSI_Exception_Holder* in (void) const;
+  TAO_AMH_DSI_Exception_Holder*& inout (void);
+  TAO_AMH_DSI_Exception_Holder*& out (void);
+  TAO_AMH_DSI_Exception_Holder* _retn (void);
+  TAO_AMH_DSI_Exception_Holder* ptr (void) const;
+
+  // Hooks used by template sequence and valuetype manager classes
+  // for non-defined forward declared valuetypes.
+  static void tao_add_ref (TAO_AMH_DSI_Exception_Holder *);
+  static void tao_remove_ref (TAO_AMH_DSI_Exception_Holder *);
+
+private:
+  TAO_AMH_DSI_Exception_Holder* ptr_;
+};
+
+/**
+ * @class TAO_AMH_DSI_Exception_Holder_out
+ *
+ * @brief The T_out class for exception holder
+ *
+ */
+class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_out
+{
+public:
+  TAO_AMH_DSI_Exception_Holder_out (TAO_AMH_DSI_Exception_Holder* &);
+  TAO_AMH_DSI_Exception_Holder_out (TAO_AMH_DSI_Exception_Holder_var &);
+  TAO_AMH_DSI_Exception_Holder_out (
+      const TAO_AMH_DSI_Exception_Holder_out &);
+  TAO_AMH_DSI_Exception_Holder_out &operator= (
+      const TAO_AMH_DSI_Exception_Holder_out &);
+  TAO_AMH_DSI_Exception_Holder_out &operator= (
+      const TAO_AMH_DSI_Exception_Holder_var &);
+  TAO_AMH_DSI_Exception_Holder_out &operator= (
+      TAO_AMH_DSI_Exception_Holder*);
+  operator TAO_AMH_DSI_Exception_Holder*& ();
+  TAO_AMH_DSI_Exception_Holder*& ptr (void);
+  TAO_AMH_DSI_Exception_Holder* operator-> (void);
+
+private:
+  TAO_AMH_DSI_Exception_Holder* &ptr_;
+};
+
+/**
+ * @class TAO_AMH_DSI_Exception_Holder
+ *
+ * @brief This is the class for holding exception.
+ *
+ */
+class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder
+  : public virtual CORBA::DefaultValueRefCountBase,
+    public virtual CORBA::ValueBase
+{
+public:
+  typedef TAO_AMH_DSI_Exception_Holder_var _var_type;
+  TAO_AMH_DSI_Exception_Holder (CORBA::Exception *ex);
+
+  virtual ~TAO_AMH_DSI_Exception_Holder (void);
+
+  static TAO_AMH_DSI_Exception_Holder* _downcast ( CORBA::ValueBase* );
+
+  static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &,
+                                         TAO_AMH_DSI_Exception_Holder *& );
+  virtual const char* _tao_obv_repository_id (void) const;
+  static const char* _tao_obv_static_repository_id (void);
+
+  static void _tao_any_destructor (void *);
+
+  virtual void raise_invoke ( );
+
+  CORBA::TypeCode_ptr _tao_type (void) const;
+  void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
+  CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
+
+protected:
+  TAO_AMH_DSI_Exception_Holder (void);
+  ///  *** Terrible Hack ? ***
+  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
+  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+
+private:
+  TAO_AMH_DSI_Exception_Holder (const TAO_AMH_DSI_Exception_Holder &);
+  void operator= (const TAO_AMH_DSI_Exception_Holder &);
+  CORBA::Exception *exception_;
+
+protected:
+  virtual CORBA::Boolean _tao_marshal__Test_TAO_AMH_DSI_Exception_Holder (
+              TAO_OutputCDR &);
+  virtual CORBA::Boolean _tao_unmarshal__Test_TAO_AMH_DSI_Exception_Holder (
+              TAO_InputCDR &);
+};
+
+/**
+ * @class TAO_AMH_DSI_Response_Handler
+ *
+ * @brief This is the main class for DSI using AMH.
+ *
+ * With ordinary DSI, the POA calls _dispatch, which in turn calls invoke
+ * on the DSI handler. Invoke completely handles the request, and packages
+ * the result in the request object so that it can be marshalled and sent
+ * back to the caller.
+ *
+ * With the AMH variation, the DSI handler's invoke method starts the
+ * processing, but delegates the result packaging to a response handler.
+ * This way, if the invocation takes a long time, or involves blocking
+ * calls, then the result handling can be managed by another thread.
+ * This is particularly useful for gateway implementations, where the
+ * middle tier should not have to block waiting for replies.
+ *
+ * As this is built on the CORBA object model, there are separate classes
+ * representing the interface and the implementation.
+ *
+ */
+class TAO_DynamicInterface_Export TAO_AMH_DSI_Response_Handler
+  : public virtual TAO_AMH_Response_Handler
+{
+public:
+  typedef TAO_AMH_DSI_Response_Handler_ptr _ptr_type;
+  typedef TAO_AMH_DSI_Response_Handler_var _var_type;
+
+  TAO_AMH_DSI_Response_Handler (TAO_ServerRequest &sr);
+  ~TAO_AMH_DSI_Response_Handler (void);
+
+  virtual void invoke_reply (CORBA::NVList_ptr args,
+                             CORBA::NamedValue_ptr result);
+
+  virtual void invoke_excep ( TAO_AMH_DSI_Exception_Holder * h);
+
+  virtual void gateway_exception_reply (CORBA::ULong reply_status,
+                                        TAO_OutputCDR &encap);
+
+  virtual void gateway_exception_reply (CORBA::ULong reply_status,
+                                        TAO_InputCDR &encap);
+
+  /// Returns a CORBA::Object_ptr for the target object.
+  CORBA::Object_ptr _this ();
+
+  /// CORBA Object related methods
+  static TAO_AMH_DSI_Response_Handler* _duplicate (
+             TAO_AMH_DSI_Response_Handler_ptr);
+  static TAO_AMH_DSI_Response_Handler* _nil (void);
+  static TAO_AMH_DSI_Response_Handler* _narrow (CORBA::Object_ptr);
+  static TAO_AMH_DSI_Response_Handler* _unchecked_narrow (CORBA::Object_ptr);
+
+protected:
+
+  /// Return 0.  Should never be used.
+  virtual const char *_interface_repository_id (void) const;
+
+  /// Simply returns "this"
+  virtual void *_downcast (const char *repository_id);
+
+private:
+  TAO_ORB_Core *orb_core_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+# include "AMH_DSI_Response_Handler.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_AMH_DSI_RESPONSE_HANDLER_H */
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
new file mode 100644
index 00000000000..d9cb5ca1adc
--- /dev/null
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
@@ -0,0 +1,111 @@
+// -*- C++ -*-
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler::_duplicate (TAO_AMH_DSI_Response_Handler_ptr x)
+{
+  if (x != 0)
+    {
+      x->_add_ref ();
+    }
+
+  return x;
+}
+
+
+// Inline operations for class TAO_AMH_DSI_Response_Handler_var
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (void)
+  : ptr_ (TAO_AMH_DSI_Response_Handler::_nil ())
+{
+}
+
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_Response_Handler_ptr p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void)
+{
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (const TAO_AMH_DSI_Response_Handler_var &p)
+  : ptr_ (TAO_AMH_DSI_Response_Handler::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_var &
+TAO_AMH_DSI_Response_Handler_var::operator= (TAO_AMH_DSI_Response_Handler_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_var &
+TAO_AMH_DSI_Response_Handler_var::operator= (const TAO_AMH_DSI_Response_Handler_var &p)
+{
+  if (this != &p)
+    {
+      CORBA::release (this->ptr_);
+      this->ptr_ = TAO_AMH_DSI_Response_Handler::_duplicate (p.ptr ());
+    }
+  return *this;
+}
+
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::operator const TAO_AMH_DSI_Response_Handler_ptr &() const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_AMH_DSI_Response_Handler_var::operator TAO_AMH_DSI_Response_Handler_ptr &()
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler_var::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr &
+TAO_AMH_DSI_Response_Handler_var::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr &
+TAO_AMH_DSI_Response_Handler_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = TAO_AMH_DSI_Response_Handler::_nil ();
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
+TAO_AMH_DSI_Response_Handler_var::_retn (void)
+{
+  // yield ownership
+  TAO_AMH_DSI_Response_Handler_ptr val = this->ptr_;
+  this->ptr_ = TAO_AMH_DSI_Response_Handler::_nil ();
+  return val;
+}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index dde0661c6fe..4f369575dda 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -5,7 +5,6 @@ ACE_RCSID (DynamicInterface,
            "$Id$")
 
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/Environment.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
 
@@ -46,17 +45,13 @@ CORBA::Context::_decr_refcnt (void)
 const char *
 CORBA::Context::context_name (void) const
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 CORBA::Context_ptr
 CORBA::Context::parent (void) const
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 void
@@ -94,8 +89,7 @@ CORBA::Context::get_values (const char * /* start_scope */,
   throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
-CORBA::ContextList::ContextList (CORBA::ULong len,
-                                 char* *ctx_list)
+CORBA::ContextList::ContextList (CORBA::ULong len, char* *ctx_list)
   : ref_count_ (1)
 {
   for (CORBA::ULong i=0; i < len; i++)
@@ -138,8 +132,7 @@ CORBA::ContextList::item (CORBA::ULong slot)
 
   if (this->ctx_list_.get (ctx, slot) == -1)
     {
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                        0);
+      throw ::CORBA::TypeCode::Bounds ();
     }
   else
     {
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 8be691e8c81..82ea2a9f7ef 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -36,7 +36,6 @@
 
 #include "ace/Unbounded_Queue.h"
 #include "ace/Atomic_Op.h"
-#include "ace/CORBA_macros.h"
 #include "ace/Synch_Traits.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -95,24 +94,18 @@ namespace CORBA
     CORBA::Context_ptr parent (void) const;
 
     void create_child (const char *child_ctx_name,
-                       CORBA::Context_out child_ctx
-                       );
+                       CORBA::Context_out child_ctx);
 
-    void set_one_value (const char *propname,
-                        const CORBA::Any &propvalue
-                        );
+    void set_one_value (const char *propname, const CORBA::Any &propvalue);
 
-    void set_values (CORBA::NVList_ptr values
-                     );
+    void set_values (CORBA::NVList_ptr values);
 
-    void delete_values (const char *propname
-                        );
+    void delete_values (const char *propname);
 
     void get_values (const char *start_scope,
                      CORBA::Flags op_flags,
                      const char *pattern,
-                     CORBA::NVList_ptr &values
-                     );
+                     CORBA::NVList_ptr &values);
 
     // Useful for template programming.
     typedef CORBA::Context_ptr _ptr_type;
@@ -139,8 +132,7 @@ namespace CORBA
 
     /// Constructor - initialize given a length and an array of
     /// strings.
-    ContextList (CORBA::ULong len,
-                       char **ctx_list);
+    ContextList (CORBA::ULong len, char **ctx_list);
 
     /// Destructor.
     ~ContextList (void);
@@ -167,12 +159,10 @@ namespace CORBA
     void add_consume (char *ctx);
 
     /// Return the typecode at slot i. Raises the "Bounds" exception.
-    char *item (CORBA::ULong slot
-                );
+    char *item (CORBA::ULong slot);
 
     /// Remove the typecode at slot i. Raises the "Bounds" exception.
-    void remove (CORBA::ULong slot
-                 );
+    void remove (CORBA::ULong slot);
 
     /// Increment and decrement ref counts.
     void _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 3ecfa63d85b..392390a809c 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -28,11 +28,10 @@ namespace TAO
       {
         if (this->x_ !=0 && this->x_->value ()->impl ())
           {
-            this->x_->value ()->impl ()->_tao_decode (cdr
-                                                     );
+            this->x_->value ()->impl ()->_tao_decode (cdr);
           }
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
@@ -55,11 +54,9 @@ namespace TAO
   {
     try
       {
-        this->x_->_tao_encode (cdr,
-                               CORBA::ARG_IN | CORBA::ARG_INOUT
-                              );
+        this->x_->_tao_encode (cdr, CORBA::ARG_IN | CORBA::ARG_INOUT);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
@@ -82,10 +79,9 @@ namespace TAO
         this->x_->_tao_incoming_cdr (
             cdr,
             CORBA::ARG_OUT | CORBA::ARG_INOUT,
-            this->lazy_evaluation_
-           );
+            this->lazy_evaluation_);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
@@ -104,8 +100,7 @@ namespace TAO
         if (!this->x_->item (i)->value ())
           return;
 
-        (*lst)[i].argument.replace (
-          this->x_->item (i)->value ()->impl ());
+        (*lst)[i].argument.replace (this->x_->item (i)->value ()->impl ());
 
         switch (this->x_->item (i)->flags ())
           {
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl
index 5acf60d6876..c8a05b4183a 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ b/TAO/tao/DynamicInterface/DII_Arguments.inl
@@ -22,15 +22,14 @@ namespace TAO
   // ===================================================================
 
   ACE_INLINE
-  NVList_Argument::NVList_Argument (CORBA::NVList_ptr x,
-                                    bool lazy_eval)
+  NVList_Argument::NVList_Argument (CORBA::NVList_ptr x, bool lazy_eval)
     : x_ (x)
       , lazy_evaluation_ (lazy_eval)
   {
   }
 
   ACE_INLINE
-  CORBA::NVList_ptr 
+  CORBA::NVList_ptr
   NVList_Argument::arg () const
   {
     return this->x_;
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index 7a0968c2b0a..4f0462c8ce7 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -4,7 +4,7 @@
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/operation_details.h"
-
+#include "tao/SystemException.h"
 
 ACE_RCSID (DynamicInterface,
            DII_Arguments_Converter_Impl,
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 0035b79a946..1c24576d764 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -16,6 +16,7 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -49,24 +50,27 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
   Dynamic::ParameterList *
   DII_Invocation::arguments (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    // Generate the argument list on demand.
-    Dynamic::ParameterList *parameter_list =
-      TAO_RequestInfo_Util::make_parameter_list ();
+    Dynamic::ParameterList_var safe_parameter_list;
 
-    Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-    TAO::Argument **args =
-      this->details_.args ();
+    TAO::Argument ** const args = this->details_.args ();
 
     if (this->details_.args_num () > 1)
       {
         // Take the second argument since the first is a return value.
-        TAO::NVList_Argument *tmp_arg =
+        TAO::NVList_Argument * const tmp_arg =
           dynamic_cast <TAO::NVList_Argument*> (args[1]);
 
-        tmp_arg->interceptor_paramlist (parameter_list);
+        if (tmp_arg)
+          {
+            // Generate the argument list on demand.
+            Dynamic::ParameterList * const parameter_list =
+              TAO_RequestInfo_Util::make_parameter_list ();
+
+            safe_parameter_list = parameter_list;
+
+            tmp_arg->interceptor_paramlist (parameter_list);
+          }
       }
 
     return safe_parameter_list._retn ();
@@ -75,17 +79,14 @@ namespace TAO
 
   Invocation_Status
   DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     return Synch_Twoway_Invocation::remote_twoway (max_wait_time);
   }
 
   Invocation_Status
   DII_Invocation::handle_user_exception (TAO_InputCDR &cdr)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
-    Reply_Guard mon (this,
-                     TAO_INVOKE_FAILURE);
+    Reply_Guard mon (this, TAO_INVOKE_FAILURE);
 
     if (TAO_debug_level > 3)
       {
@@ -106,18 +107,14 @@ namespace TAO
     // Pull the exception ID out of the marshaling buffer.
     if (tmp_stream.read_string (buf.inout ()) == 0)
       {
-        ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                          CORBA::COMPLETED_YES),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_YES);
       }
 
     for (CORBA::ULong i = 0;
          this->excp_list_ != 0 && i < this->excp_list_->count ();
          i++)
       {
-          CORBA::TypeCode_var tc =
-            this->excp_list_->item (i
-                                   );
+          CORBA::TypeCode_var tc = this->excp_list_->item (i);
 
           const char *xid = tc->id ();
 
@@ -139,8 +136,7 @@ namespace TAO
 
           mon.set_status (TAO_INVOKE_USER_EXCEPTION);
 
-          ACE_THROW_RETURN (CORBA::UnknownUserException (any),
-                            TAO_INVOKE_USER_EXCEPTION);
+          throw ::CORBA::UnknownUserException (any);
         }
 
     // If we couldn't find the right exception, report it as
@@ -155,9 +151,7 @@ namespace TAO
     // @@ It would seem that if the remote exception is a
     //    UserException we can assume that the request was
     //    completed.
-    ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
-                                      CORBA::COMPLETED_YES),
-                      TAO_INVOKE_USER_EXCEPTION);
+    throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES);
 
   }
 
@@ -183,24 +177,27 @@ namespace TAO
   //@NOTE: Need to figure a way to share this code
   Dynamic::ParameterList *
   DII_Deferred_Invocation::arguments (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    // Generate the argument list on demand.
-    Dynamic::ParameterList *parameter_list =
-      TAO_RequestInfo_Util::make_parameter_list ();
+    Dynamic::ParameterList_var safe_parameter_list;
 
-    Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-    TAO::Argument **args =
-      this->details_.args ();
+    TAO::Argument ** const args = this->details_.args ();
 
     if (this->details_.args_num () > 1)
       {
         // Take the second argument since the first is a return value.
-        TAO::NVList_Argument *tmp_arg =
+        TAO::NVList_Argument * const tmp_arg =
           dynamic_cast <TAO::NVList_Argument*> (args[1]);
 
-        tmp_arg->interceptor_paramlist (parameter_list);
+        if (tmp_arg)
+          {
+            // Generate the argument list on demand.
+            Dynamic::ParameterList * const parameter_list =
+              TAO_RequestInfo_Util::make_parameter_list ();
+
+            safe_parameter_list = parameter_list;
+
+            tmp_arg->interceptor_paramlist (parameter_list);
+          }
       }
 
     return safe_parameter_list._retn ();
@@ -209,7 +206,6 @@ namespace TAO
 
   Invocation_Status
   DII_Deferred_Invocation::remote_invocation (ACE_Time_Value *max_wait_time)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     this->safe_rd_->transport (this->resolver_.transport ());
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index 11bb74a18dc..373d6058500 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -31,6 +31,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_DII_Deferred_Reply_Dispatcher;
+class TAO_DII_Asynch_Reply_Dispatcher;
 
 namespace Dynamic
 {
@@ -53,15 +54,12 @@ namespace TAO
                     bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList *arguments (void);
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
-    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time)
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time);
 
-    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr)
-      ACE_THROW_SPEC ((CORBA::Exception));
+    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr);
   private:
 
     CORBA::ExceptionList *excp_list_;
@@ -85,12 +83,10 @@ namespace TAO
                              bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList *arguments (void);
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
-    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time)
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time);
 
   private:
 
@@ -98,6 +94,42 @@ namespace TAO
     CORBA::Request_ptr host_;
 
   };
+
+  /**
+   * @class TAO_GIOP_DII_Asynch_Invocation
+   *
+   * @brief This class is responsible to send the asynchronous
+   * invocation.
+   *
+   * This class is responsible to send the asynchronous
+   * invocation. This class connects (or looks up a connection from the cache)
+   * to the remote server, builds the CDR stream for the Request, send
+   * the CDR stream and returns.
+   *
+   */
+  class TAO_DynamicInterface_Export TAO_GIOP_DII_Asynch_Invocation
+    : public TAO::Asynch_Remote_Invocation
+  {
+  public:
+    TAO_GIOP_DII_Asynch_Invocation (TAO_Stub *data,
+                                    TAO_ORB_Core* orb_core,
+                                    CORBA::Boolean argument_flag,
+                                    const CORBA::Request_ptr req,
+                                    CORBA::Object_ptr reply_handler,
+                                    int byte_order = TAO_ENCAP_BYTE_ORDER);
+
+    int invoke (void);
+
+  private:
+    /// Implementation of the invoke() methods, handles the basic
+    /// send/reply code and the system exceptions.
+    int invoke_i (void);
+
+
+    /// Reply dispatcher for the current synchronous Asynch_Invocation.
+    TAO_DII_Asynch_Reply_Dispatcher *rd_;
+  };
+
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 81fcbd730fe..76922e3d88d 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -9,6 +9,7 @@
 #include "tao/Transport.h"
 #include "tao/Transport.h"
 #include "tao/Pluggable_Messaging.h"
+#include "tao/SystemException.h"
 #include "tao/DynamicInterface/Request.h"
 
 #include "ace/os_include/os_errno.h"
@@ -45,6 +46,10 @@ namespace TAO
   {
   }
 
+  DII_Invocation_Adapter::~DII_Invocation_Adapter (void)
+  {
+  }
+
   Invocation_Status
   DII_Invocation_Adapter::invoke_twoway (
         TAO_Operation_Details &op,
@@ -57,12 +62,11 @@ namespace TAO
     if (this->mode_ != TAO_DII_INVOCATION ||
         this->type_ != TAO_TWOWAY_INVOCATION)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::INTERNAL (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
 
     r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
@@ -74,16 +78,11 @@ namespace TAO
                                this->request_);
 
 
-    Invocation_Status status =
-      synch.remote_invocation (max_wait_time
-                              );
+    Invocation_Status status = synch.remote_invocation (max_wait_time);
 
-
-    if (status == TAO_INVOKE_RESTART &&
-        synch.is_forwarded ())
+    if (status == TAO_INVOKE_RESTART && synch.is_forwarded ())
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
 
 #if TAO_HAS_INTERCEPTORS == 1
         const CORBA::Boolean permanent_forward =
@@ -93,8 +92,7 @@ namespace TAO
 #endif
         this->object_forwarded (effective_target,
                                 r.stub (),
-                                permanent_forward
-                               );
+                                permanent_forward);
       }
     return status;
   }
@@ -128,8 +126,7 @@ namespace TAO
   void
   DII_Deferred_Invocation_Adapter::invoke (
       TAO::Exception_Data *ex,
-      unsigned long ex_count
-      )
+      unsigned long ex_count)
   {
     // New reply dispatcher on the heap, because we will go out of
     // scope and hand over the  reply dispatcher to the ORB.
@@ -140,9 +137,7 @@ namespace TAO
                                            this->orb_core_),
                       CORBA::NO_MEMORY ());
 
-    Invocation_Adapter::invoke (ex,
-                                ex_count
-                               );
+    Invocation_Adapter::invoke (ex, ex_count);
   }
 
   Invocation_Status
@@ -150,19 +145,17 @@ namespace TAO
       TAO_Operation_Details &op,
       CORBA::Object_var &effective_target,
       Profile_Transport_Resolver &r,
-      ACE_Time_Value *&max_wait_time
-      )
+      ACE_Time_Value *&max_wait_time)
   {
     // Simple sanity check
     if (this->mode_ != TAO_DII_DEFERRED_INVOCATION ||
         this->type_ != TAO_TWOWAY_INVOCATION)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                   TAO_INVOKE_FAILURE);
+        throw ::CORBA::INTERNAL (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
 
     r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
@@ -175,18 +168,49 @@ namespace TAO
 
     r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
 
-    Invocation_Status status =
-      synch.remote_invocation (max_wait_time
-                              );
+    Invocation_Status status = synch.remote_invocation (max_wait_time);
 
     if (status == TAO_INVOKE_RESTART)
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
       }
 
     return status;
   }
-} // End namespace TAO
 
+  DII_Asynch_Invocation_Adapter::DII_Asynch_Invocation_Adapter (
+      CORBA::Object *target,
+      Argument **args,
+      int arg_count,
+      const char *operation,
+      int op_len,
+      CORBA::Request *req,
+      TAO::Invocation_Mode mode)
+    : DII_Invocation_Adapter (target,
+                              args,
+                              arg_count,
+                              operation,
+                              op_len,
+                              0,
+                              req,
+                              mode)
+  {
+  }
+
+  void
+  DII_Asynch_Invocation_Adapter::invoke_reply_handler (Messaging::ReplyHandler_ptr)
+  {
+  }
+
+  Invocation_Status
+  DII_Asynch_Invocation_Adapter::invoke_twoway (
+        TAO_Operation_Details &,
+        CORBA::Object_var &,
+        Profile_Transport_Resolver &,
+        ACE_Time_Value *&)
+  {
+    return TAO_INVOKE_FAILURE;
+  }
+
+} // End namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index 88a1df41668..c407865c222 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -22,6 +22,10 @@
 
 #include "tao/Invocation_Adapter.h"
 
+#if defined (TAO_HAS_AMI)
+#include "tao/Messaging/Messaging.h"
+#endif /* TAO_HAS_AMI */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -32,10 +36,10 @@ class TAO_Operation_Details;
 class TAO_Stub;
 class TAO_ORB_Core;
 class TAO_DII_Deferred_Reply_Dispatcher;
+class TAO_DII_Asynch_Reply_Dispatcher;
 namespace  CORBA
 {
   class Object;
-  class SystemException;
   class ExceptionList;
   class Request;
 }
@@ -87,8 +91,7 @@ namespace TAO
                             CORBA::Request *r,
                             Invocation_Mode mode = TAO_DII_INVOCATION);
 
-
-    virtual ~DII_Invocation_Adapter (void) {}
+    virtual ~DII_Invocation_Adapter (void);
 
   protected:
 
@@ -96,8 +99,7 @@ namespace TAO
         TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-       );
+        ACE_Time_Value *&max_wait_time);
 
   private:
 
@@ -114,7 +116,9 @@ namespace TAO
   };
 
   /**
+   * @class  DII_Deferred_Invocation_Adapter
    *
+   * @brief This class is for deferred DII invocation.
    */
   class TAO_DynamicInterface_Export DII_Deferred_Invocation_Adapter
     : protected Invocation_Adapter
@@ -132,9 +136,7 @@ namespace TAO
         TAO::Invocation_Mode mode = TAO_DII_DEFERRED_INVOCATION);
 
     /// Invoke the target
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                        );
+    virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count);
 
 
   protected:
@@ -142,8 +144,7 @@ namespace TAO
         TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-       );
+        ACE_Time_Value *&max_wait_time);
 
   private:
     CORBA::Request *request_;
@@ -154,6 +155,45 @@ namespace TAO
     /// Cache the orb_core
     TAO_ORB_Core * const orb_core_;
   };
+
+#if defined (TAO_HAS_AMI)
+  /**
+   * @class  DII_Asynch_Invocation_Adapter
+   *
+   * @brief This class is for asynchronous DII invocation.
+   */
+  class TAO_DynamicInterface_Export DII_Asynch_Invocation_Adapter
+    : protected DII_Invocation_Adapter
+  {
+  public:
+    DII_Asynch_Invocation_Adapter (
+       CORBA::Object *target,
+       Argument **args,
+       int arg_number,
+       const char *operation,
+       int op_len,
+       CORBA::Request *req,
+       TAO::Invocation_Mode mode = TAO_DII_ASYNCH_INVOCATION);
+
+    /// Invoke the target
+    void invoke_reply_handler (Messaging::ReplyHandler_ptr reply_handler_ptr);
+
+
+  protected:
+    virtual Invocation_Status invoke_twoway (
+                TAO_Operation_Details &op,
+                CORBA::Object_var &effective_target,
+                Profile_Transport_Resolver &r,
+                ACE_Time_Value *&max_wait_time);
+
+  private:
+    /// Reply dispatcher for the current Invocation.
+    TAO_DII_Asynch_Reply_Dispatcher *rd_;
+
+    /// Cache the orb_core
+    TAO_ORB_Core *orb_core_;
+  };
+#endif /* TAO_HAS_AMI */
 } // End namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 769a3bd5090..74ae33a1881 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -2,11 +2,10 @@
 
 #include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
 #include "tao/DynamicInterface/Request.h"
-#include "tao/Environment.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Pluggable_Messaging_Utils.h"
-
+#include "tao/SystemException.h"
 
 ACE_RCSID(DynamicInterface,
           DII_Reply_Dispatcher,
@@ -32,8 +31,7 @@ TAO_DII_Deferred_Reply_Dispatcher::~TAO_DII_Deferred_Reply_Dispatcher (void)
 // Dispatch the reply.
 int
 TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
-    TAO_Pluggable_Reply_Params &params
-  )
+    TAO_Pluggable_Reply_Params &params)
 {
   if (params.input_cdr_ == 0)
     return -1;
@@ -41,9 +39,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
   this->reply_status_ = params.reply_status_;
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
-
+  ACE_Data_Block *db = this->reply_cdr_.clone_from (*params.input_cdr_);
 
   if (db == 0)
     {
@@ -82,11 +78,9 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
   try
     {
       // Call the Request back and send the reply data.
-      this->req_->handle_response (this->reply_cdr_,
-                                   this->reply_status_
-                                  );
+      this->req_->handle_response (this->reply_cdr_, this->reply_status_);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -107,22 +101,18 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
   try
     {
       // Generate a fake exception....
-      CORBA::COMM_FAILURE comm_failure (0,
-                                        CORBA::COMPLETED_MAYBE);
+      CORBA::COMM_FAILURE comm_failure (0, CORBA::COMPLETED_MAYBE);
 
       TAO_OutputCDR out_cdr;
 
-      comm_failure._tao_encode (out_cdr
-                               );
+      comm_failure._tao_encode (out_cdr);
 
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
 
-      this->req_->handle_response (cdr,
-                                   TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION
-                                  );
+      this->req_->handle_response (cdr, TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -134,4 +124,117 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
   (void) this->decr_refcount ();
 }
 
+TAO_DII_Asynch_Reply_Dispatcher::TAO_DII_Asynch_Reply_Dispatcher (
+    const Messaging::ReplyHandler_ptr callback,
+    TAO_ORB_Core *orb_core)
+  : TAO_Asynch_Reply_Dispatcher_Base (orb_core),
+    db_ (sizeof buf_,
+         ACE_Message_Block::MB_DATA,
+         this->buf_,
+         orb_core->input_cdr_buffer_allocator (),
+         orb_core->locking_strategy (),
+         ACE_Message_Block::DONT_DELETE,
+         orb_core->input_cdr_dblock_allocator ()),
+    reply_cdr_ (&db_,
+                ACE_Message_Block::DONT_DELETE,
+                TAO_ENCAP_BYTE_ORDER,
+                TAO_DEF_GIOP_MAJOR,
+                TAO_DEF_GIOP_MINOR,
+                orb_core),
+    callback_ (callback)
+{
+}
+
+TAO_DII_Asynch_Reply_Dispatcher::~TAO_DII_Asynch_Reply_Dispatcher (void)
+{
+  // this was handed to us by the caller.
+  CORBA::release(callback_);
+}
+
+int
+TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply (
+    TAO_Pluggable_Reply_Params &params
+  )
+{
+  this->reply_status_ = params.reply_status_;
+
+  // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
+  ACE_Data_Block *db =
+    this->reply_cdr_.clone_from (*params.input_cdr_);
+
+  // See whether we need to delete the data block by checking the
+  // flags. We cannot be happy that we initally allocated the
+  // datablocks of the stack. If this method is called twice, as is in
+  // some cases where the same invocation object is used to make two
+  // invocations like forwarding, the release becomes essential.
+  if (ACE_BIT_DISABLED (db->flags (),
+                        ACE_Message_Block::DONT_DELETE))
+    db->release ();
+
+  // Steal the buffer, that way we don't do any unnecesary copies of
+  // this data.
+  CORBA::ULong max = params.svc_ctx_.maximum ();
+  CORBA::ULong len = params.svc_ctx_.length ();
+  IOP::ServiceContext* context_list = params.svc_ctx_.get_buffer (1);
+  this->reply_service_info_.replace (max, len, context_list, 1);
+
+  if (TAO_debug_level >= 4)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P | %t):")
+                  ACE_TEXT ("TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply: status = %d\n"),
+                  this->reply_status_));
+    }
+
+  try
+    {
+      // Call the handler with the reply data.
+      CORBA::Request::_tao_reply_stub (this->reply_cdr_,
+                                       this->callback_,
+                                       this->reply_status_);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      if (TAO_debug_level >= 4)
+        {
+          ex._tao_print_exception ("Exception during reply handler");
+        }
+    }
+  // This was dynamically allocated. Now the job is done.
+  (void) this->decr_refcount ();
+
+  return 1;
+}
+
+void
+TAO_DII_Asynch_Reply_Dispatcher::connection_closed (void)
+{
+  try
+    {
+      // Generate a fake exception....
+      CORBA::COMM_FAILURE comm_failure (0,
+                                        CORBA::COMPLETED_MAYBE);
+
+      TAO_OutputCDR out_cdr;
+
+      comm_failure._tao_encode (out_cdr);
+
+      // Turn into an output CDR
+      TAO_InputCDR cdr (out_cdr);
+      CORBA::Request::_tao_reply_stub (
+          this->reply_cdr_,
+          this->callback_,
+          TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      if (TAO_debug_level >= 4)
+        {
+          ex._tao_print_exception (
+            "DII_Asynch_Reply_Dispacher::connection_closed");
+        }
+    }
+
+  (void) this->decr_refcount ();
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 920915558cb..c1933cdcce6 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -25,6 +25,10 @@
 #include "tao/orbconf.h"
 #include "tao/Asynch_Reply_Dispatcher_Base.h"
 
+#if defined (TAO_HAS_AMI)
+#include "tao/Messaging/Messaging.h"
+#endif /* TAO_HAS_AMI */
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
@@ -40,7 +44,6 @@ class TAO_ORB_Core;
  *
  * @brief Reply dispatcher for DII deferred requests.
  */
-
 class TAO_DynamicInterface_Export TAO_DII_Deferred_Reply_Dispatcher
   : public TAO_Asynch_Reply_Dispatcher_Base
 {
@@ -50,7 +53,7 @@ public:
 
 
 
-  // = The Reply_Dispatcher methods
+  /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
   virtual void connection_closed (void);
@@ -71,6 +74,42 @@ private:
   const CORBA::Request_ptr req_;
 };
 
+#if defined (TAO_HAS_AMI)
+/**
+ * @class TAO_DII_Asynch_Reply_Dispatcher
+ *
+ * @brief Reply dispatcher for DII asynch requests.
+ */
+class TAO_DynamicInterface_Export TAO_DII_Asynch_Reply_Dispatcher
+  : public TAO_Asynch_Reply_Dispatcher_Base
+{
+public:
+  TAO_DII_Asynch_Reply_Dispatcher (const Messaging::ReplyHandler_ptr callback,
+                                     TAO_ORB_Core *orb_core);
+  virtual ~TAO_DII_Asynch_Reply_Dispatcher (void);
+
+  /// The Reply_Dispatcher methods
+  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
+
+  virtual void connection_closed (void);
+
+private:
+
+  /// The buffer that is used to initialise the data block
+  char buf_[ACE_CDR::DEFAULT_BUFSIZE];
+
+  /// datablock that is created on teh stack to initialise the CDR
+  /// stream underneath.
+  ACE_Data_Block db_;
+
+  /// CDR stream for reading the input.
+  TAO_InputCDR reply_cdr_;
+
+  /// Where the reply needs to go.
+  const Messaging::ReplyHandler_ptr callback_;
+};
+#endif /* TAO_HAS_AMI */
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
new file mode 100644
index 00000000000..8d4298d2e78
--- /dev/null
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -0,0 +1,55 @@
+// $Id$
+
+#include "Request.h"
+#include "ExceptionList.h"
+#include "DII_Invocation.h"
+#if defined (TAO_HAS_AMI)
+#include "DII_Reply_Handler.h"
+#endif /* TAO_HAS_AMI */
+
+#include "tao/Object.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+
+ACE_RCSID(DynamicInterface, Request, "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "DII_Reply_Handler.inl"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// The pseudo-object _nil method.
+TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler::_nil (void)
+{
+  return static_cast<TAO_DII_Reply_Handler_ptr> (0);
+}
+
+// DII Request class implementation
+int TAO_DII_Reply_Handler::_tao_class_id = 0;
+TAO_DII_Reply_Handler::TAO_DII_Reply_Handler ()
+{
+}
+
+TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler (void)
+{
+}
+
+TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler::_narrow (CORBA::Object_ptr obj)
+{
+  return TAO_DII_Reply_Handler::_unchecked_narrow (obj);
+}
+
+TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler::_unchecked_narrow (CORBA::Object_ptr obj)
+{
+  if (CORBA::is_nil (obj))
+    return TAO_DII_Reply_Handler::_nil ();
+
+  return
+    reinterpret_cast<TAO_DII_Reply_Handler_ptr> (
+        &TAO_DII_Reply_Handler::_tao_class_id);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
new file mode 100644
index 00000000000..997c83b2d21
--- /dev/null
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -0,0 +1,106 @@
+// -*- C++ -*-
+
+//==============================================================
+/**
+ *  @file DII_Reply_Handler.h
+ *
+ *  $Id$
+ *
+ *  @brief Handler of DII twoway asynch replies type.
+ */
+// =============================================================
+
+#ifndef TAO_DII_REPLY_HANDLER_H
+#define TAO_DII_REPLY_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "dynamicinterface_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/// Forward declaration
+class TAO_DII_Reply_Handler;
+typedef TAO_DII_Reply_Handler* TAO_DII_Reply_Handler_ptr;
+
+/**
+ * @class TAO_DII_Reply_Handler_var
+ *
+ * @brief The T_var class for reply handler
+ *
+ * As any other pseudo object, this class has a T_var class too.
+ *
+ */
+class TAO_DynamicInterface_Export TAO_DII_Reply_Handler_var
+{
+public:
+  TAO_DII_Reply_Handler_var (void);
+  TAO_DII_Reply_Handler_var (TAO_DII_Reply_Handler_ptr);
+  TAO_DII_Reply_Handler_var (const TAO_DII_Reply_Handler_var &);
+  ~TAO_DII_Reply_Handler_var (void);
+
+  TAO_DII_Reply_Handler_var &operator= (TAO_DII_Reply_Handler_ptr);
+  TAO_DII_Reply_Handler_var &operator= (const TAO_DII_Reply_Handler_var &);
+  TAO_DII_Reply_Handler_ptr operator-> (void) const;
+
+  operator const TAO_DII_Reply_Handler_ptr &() const;
+  operator TAO_DII_Reply_Handler_ptr &();
+
+  TAO_DII_Reply_Handler_ptr in (void) const;
+  TAO_DII_Reply_Handler_ptr &inout (void);
+  TAO_DII_Reply_Handler_ptr &out (void);
+  TAO_DII_Reply_Handler_ptr _retn (void);
+  TAO_DII_Reply_Handler_ptr ptr (void) const;
+
+private:
+  TAO_DII_Reply_Handler_ptr ptr_;
+};
+
+/**
+ * @class TAO_DII_Reply_Handler
+ *
+ * @brief The class for DII reply handler
+ *
+ * Provides a way to create requests and populate it with parameters for
+ * use in the Dynamic Invocation Interface.
+ */
+class TAO_DynamicInterface_Export TAO_DII_Reply_Handler
+  : public virtual TAO_Local_RefCounted_Object
+{
+public:
+  TAO_DII_Reply_Handler ();
+  virtual ~TAO_DII_Reply_Handler (void);
+
+  /// Callback method for asynchronous requests.
+  virtual void handle_response (TAO_InputCDR &incoming) = 0;
+
+  virtual void handle_excep (TAO_InputCDR &incoming,
+                             CORBA::ULong reply_status) = 0;
+
+  /// CORBA Object related methods
+  static TAO_DII_Reply_Handler* _duplicate (TAO_DII_Reply_Handler_ptr);
+  static TAO_DII_Reply_Handler* _nil (void);
+  static TAO_DII_Reply_Handler* _narrow (CORBA::Object_ptr);
+  static TAO_DII_Reply_Handler* _unchecked_narrow (CORBA::Object_ptr);
+
+  static int _tao_class_id;
+
+  typedef TAO_DII_Reply_Handler_ptr _ptr_type;
+  typedef TAO_DII_Reply_Handler_var _var_type;
+
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+# include "DII_Reply_Handler.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_DII_REPLY_HANDLER_H */
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
new file mode 100644
index 00000000000..cfc16dc9b36
--- /dev/null
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
@@ -0,0 +1,113 @@
+// -*- C++ -*-
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler::_duplicate (TAO_DII_Reply_Handler_ptr x)
+{
+  if (x != 0)
+    {
+      x->_add_ref ();
+    }
+
+  return x;
+}
+
+// Inline operations for class TAO_DII_Reply_Handler_var
+ACE_INLINE
+TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (void)
+  : ptr_ (TAO_DII_Reply_Handler::_nil ())
+{
+}
+
+ACE_INLINE
+TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (
+    TAO_DII_Reply_Handler_ptr p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (
+    const TAO_DII_Reply_Handler_var &p)
+  : ptr_ (TAO_DII_Reply_Handler::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE TAO_DII_Reply_Handler_var &
+TAO_DII_Reply_Handler_var::operator= (TAO_DII_Reply_Handler_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_var &
+TAO_DII_Reply_Handler_var::operator= (const TAO_DII_Reply_Handler_var &p)
+{
+  if (this != &p)
+    {
+      CORBA::release (this->ptr_);
+      this->ptr_ = TAO_DII_Reply_Handler::_duplicate (p.ptr ());
+    }
+  return *this;
+}
+
+ACE_INLINE
+TAO_DII_Reply_Handler_var::operator const TAO_DII_Reply_Handler_ptr &() const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_DII_Reply_Handler_var::operator TAO_DII_Reply_Handler_ptr &()
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler_var::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr &
+TAO_DII_Reply_Handler_var::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr &
+TAO_DII_Reply_Handler_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = TAO_DII_Reply_Handler::_nil ();
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_DII_Reply_Handler_ptr
+TAO_DII_Reply_Handler_var::_retn (void)
+{
+  // yield ownership
+  TAO_DII_Reply_Handler_ptr val = this->ptr_;
+  this->ptr_ = TAO_DII_Reply_Handler::_nil ();
+  return val;
+}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index fba11751451..cb4e04a7e8f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
-#include "tao/Exception.h"
+#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -28,9 +28,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
     CORBA::NamedValue_ptr result,
     CORBA::ExceptionList_ptr exceptions,
     CORBA::Request_ptr &request,
-    CORBA::Flags req_flags
-
-  )
+    CORBA::Flags req_flags)
 {
   ACE_NEW_THROW_EX (request,
                     CORBA::Request (obj,
@@ -53,8 +51,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
 CORBA::Request_ptr
 TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                                    CORBA::ORB_ptr orb,
-                                   const char *operation
-                                   )
+                                   const char *operation)
 {
   CORBA::Request_ptr req = CORBA::Request::_nil ();
   ACE_NEW_THROW_EX (req,
@@ -120,9 +117,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
 
 void
 TAO_Dynamic_Adapter_Impl::create_exception_list (
-    CORBA::ExceptionList_ptr &list
-
-  )
+    CORBA::ExceptionList_ptr &list)
 {
   ACE_NEW_THROW_EX (list,
                     CORBA::ExceptionList,
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 96e66e9dafc..6d09c74f9f9 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    Dynamic_Adapter_Impl.h
-//
-// = DESCRIPTION
-//    Header file for class TAO_Dynamic_Adapter_Impl.
-//
-// = AUTHOR
-//     Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Dynamic_Adapter_Impl.h
+ *
+ *  $Id$
+ *
+ *  Header file for class TAO_Dynamic_Adapter_Impl.
+ *
+ *
+ *  @author  Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNAMIC_ADAPTER_IMPL_H
 #define TAO_DYNAMIC_ADAPTER_IMPL_H
@@ -57,13 +54,11 @@ public:
                                CORBA::NamedValue_ptr result,
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags
-                              );
+                               CORBA::Flags req_flags);
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
-                                      const char *op
-                                     );
+                                      const char *op);
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -81,8 +76,7 @@ public:
 
   // CORBA::ORB::create_exception_list.
 
-  virtual void create_exception_list (CORBA::ExceptionList_ptr &list
-                                     );
+  virtual void create_exception_list (CORBA::ExceptionList_ptr &list);
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index be9247638db..fc6563ccb8e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -19,11 +19,9 @@ ACE_RCSID (DynamicInterface,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
-TAO_DynamicImplementation::_is_a (const char *logical_type_id
-                                  )
+TAO_DynamicImplementation::_is_a (const char *logical_type_id)
 {
-  CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface ();
+  CORBA::RepositoryId_var id = this->get_id_from_primary_interface ();
 
   return ACE_OS::strcmp (logical_type_id, id.in ()) == 0;
 }
@@ -38,7 +36,7 @@ TAO_DynamicImplementation::_this (void)
   TAO_Stub *stub = this->_create_stub ();
 
   // Create a object.
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
+  CORBA::Object_ptr retval = CORBA::Object_ptr ();
   ACE_NEW_RETURN (retval,
                   CORBA::Object (stub,
                                  1,
@@ -53,23 +51,18 @@ TAO_DynamicImplementation::_get_interface (void)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
+        TAO_ORB_Core::ifr_client_adapter_name ());
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
+      throw ::CORBA::INTF_REPOS ();
     }
 
-  CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface ();
+  CORBA::RepositoryId_var id = this->get_id_from_primary_interface ();
 
   // This doesn't take multiple ORBs into account, but it's being
   // used only to resolve the IFR, so we should be ok.
-  return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
-                                 id.in ()
-                                );
+  return adapter->get_interface (TAO_ORB_Core_instance ()->orb (), id.in ());
 }
 
 const char *
@@ -80,10 +73,8 @@ TAO_DynamicImplementation::_interface_repository_id (void) const
 }
 
 void *
-TAO_DynamicImplementation::_downcast (const char *repository_id)
+TAO_DynamicImplementation::_downcast (const char *)
 {
-  ACE_UNUSED_ARG (repository_id);
-
   // Don't know enough to do better.
   return this;
 }
@@ -102,8 +93,7 @@ TAO_DynamicImplementation::_create_stub (void)
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
   PortableServer::POA_var poa =
@@ -111,25 +101,20 @@ TAO_DynamicImplementation::_create_stub (void)
 
   CORBA::PolicyList_var client_exposed_policies =
     poa_current_impl->poa ()->client_exposed_policies (
-        poa_current_impl->priority ()
-      );
+        poa_current_impl->priority ());
 
   CORBA::RepositoryId_var pinterface =
-    this->_primary_interface (poa_current_impl->object_id (),
-                              poa.in ()
-                             );
+    this->_primary_interface (poa_current_impl->object_id (), poa.in ());
 
   return
     poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (),
                                            pinterface.in (),
-                                           poa_current_impl->priority ()
-                                          );
+                                           poa_current_impl->priority ());
 }
 
 void
 TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
-                                      void * /* context */
-                                      )
+                                      void * /* context */)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -160,8 +145,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
   try
     {
       // Delegate to user.
-      this->invoke (dsi_request
-                   );
+      this->invoke (dsi_request);
 
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
@@ -169,7 +153,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
           dsi_request->dsi_marshal ();
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
@@ -182,9 +166,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
 }
 
 CORBA::RepositoryId
-TAO_DynamicImplementation::get_id_from_primary_interface (
-
-  )
+TAO_DynamicImplementation::get_id_from_primary_interface (void)
 {
   // If this method is called outside of the
   // context of a request invocation on a target object being served
@@ -197,16 +179,12 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
-  PortableServer::POA_var poa =
-    poa_current_impl->get_POA ();
+  PortableServer::POA_var poa = poa_current_impl->get_POA ();
 
-  return this->_primary_interface (poa_current_impl->object_id (),
-                                   poa.in ()
-                                  );
+  return this->_primary_interface (poa_current_impl->object_id (), poa.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 53b700b7c6e..0d15ec38c3d 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    Dynamic_Implementation.h
-//
-// = DESCRIPTION
-//    Header file for class TAO_DynamicImplementation.
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Dynamic_Implementation.h
+ *
+ *  $Id$
+ *
+ *  Header file for class TAO_DynamicImplementation.
+ *
+ *
+ *  @author Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNAMIC_IMPLEMENTATION_H
 #define TAO_DYNAMIC_IMPLEMENTATION_H
@@ -59,29 +55,23 @@ public:
   /// The invoke() method receives requests issued to any CORBA object
   /// incarnated by the DSI servant and performs the processing
   /// necessary to execute the request.
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ) = 0;
+  virtual void invoke (CORBA::ServerRequest_ptr request) = 0;
 
   /// The _primary_interface() method receives an ObjectId value and a
   /// POA_ptr as input parameters and returns a valid RepositoryId
   /// representing the most-derived interface for that oid.
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-
-    ) = 0;
+      PortableServer::POA_ptr poa) = 0;
 
   /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                );
+  virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
   /// Returns a CORBA::Object_ptr for the target object.
   CORBA::Object_ptr _this (void);
 
   /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      void
-    );
+  virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
 protected:
 
@@ -95,15 +85,11 @@ protected:
   virtual TAO_Stub *_create_stub (void);
 
   /// Turns around and calls invoke.
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context
-                          );
+  virtual void _dispatch (TAO_ServerRequest &request, void *context);
 
 private:
   /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
-  CORBA::RepositoryId get_id_from_primary_interface (
-      void
-    );
+  CORBA::RepositoryId get_id_from_primary_interface (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index ee0c7c39354..7263b740ba1 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -5,7 +5,6 @@ ACE_RCSID (DynamicInterface,
            "$Id$")
 
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
@@ -58,8 +57,7 @@ CORBA::ExceptionList::item (CORBA::ULong slot)
 
   if (this->tc_list_.get (tc, slot) == -1)
     {
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::TypeCode::Bounds ();
     }
   else
     {
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 1fd0259e5d0..28b7fc5b385 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -1,23 +1,19 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    ExceptionList.h
-//
-// = DESCRIPTION
-//    This file defines the ExceptionList datatype used in
-//    dynamic invocations.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ExceptionList.h
+ *
+ *  $Id$
+ *
+ *  This file defines the ExceptionList datatype used in
+ *  dynamic invocations.
+ *
+ *
+ *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
+ */
+//=============================================================================
+
 
 #ifndef TAO_CORBA_EXCEPTIONLIST_H
 #define TAO_CORBA_EXCEPTIONLIST_H
@@ -39,7 +35,6 @@
 
 #include "ace/Unbounded_Queue.h"
 #include "ace/Atomic_Op.h"
-#include "ace/CORBA_macros.h"
 #include "ace/Synch_Traits.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -71,8 +66,7 @@ namespace CORBA
 
     /// Constructor - initialize given a length and an array of
     /// TypeCodes.
-    ExceptionList (CORBA::ULong len,
-                   CORBA::TypeCode_ptr *tc_list);
+    ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list);
 
     /// Destructor.
     ~ExceptionList (void);
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 0583a1769e7..873e7a0973b 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -10,6 +10,11 @@ ACE_RCSID (DynamicInterface,
 #include "tao/DynamicInterface/DII_Arguments.h"
 #include "tao/DynamicInterface/Context.h"
 
+#if defined (TAO_HAS_AMI)
+#include "tao/Messaging/Asynch_Invocation_Adapter.h"
+#include "tao/DynamicInterface/DII_Reply_Handler.h"
+#endif /* TAO_HAS_AMI */
+
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/Object.h"
 #include "tao/Pluggable_Messaging_Utils.h"
@@ -163,9 +168,7 @@ CORBA::Request::invoke (void)
        this->exceptions_.in (),
        this);
 
-  _tao_call.invoke (0,
-                    0
-                   );
+  _tao_call.invoke (0, 0);
 
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -198,9 +201,7 @@ CORBA::Request::send_oneway (void)
       TAO::TAO_SYNCHRONOUS_INVOCATION,
       true); // is_dii_request
 
-  _tao_call.invoke (0,
-                    0
-                   );
+  _tao_call.invoke (0, 0);
 }
 
 void
@@ -242,10 +243,66 @@ CORBA::Request::send_deferred (void)
       this->orb_->orb_core (),
       this);
 
-  _tao_call.invoke (0,
-                    0
-                   );
+  _tao_call.invoke (0, 0);
+}
+
+#if defined (TAO_HAS_AMI)
+void
+CORBA::Request::sendc (CORBA::Object_ptr handler)
+{
+  TAO::NamedValue_Argument _tao_retval (this->result_);
+
+  TAO::NVList_Argument _tao_in_list (this->args_,
+                                     this->lazy_evaluation_);
+
+  TAO::Argument *_tao_arg_list [] = {
+    &_tao_retval,
+    &_tao_in_list
+  };
+
+  TAO::Asynch_Invocation_Adapter _tao_call (
+       this->target_,
+       _tao_arg_list,
+       sizeof( _tao_arg_list ) / sizeof( TAO::Argument* ),
+       const_cast<char *> (this->opname_),
+       static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
+       0 // collocation proxy broker
+       );
+
+  _tao_call.invoke (dynamic_cast<Messaging::ReplyHandler_ptr>(handler),
+                    &CORBA::Request::_tao_reply_stub);
+
+}
+
+void
+CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
+                                 Messaging::ReplyHandler_ptr rh,
+                                 CORBA::ULong reply_status)
+{
+  // Retrieve Reply Handler object.
+  TAO_DII_Reply_Handler* reply_handler =
+    dynamic_cast<TAO_DII_Reply_Handler*> (rh);
+
+  // Exception handling
+  switch (reply_status)
+    {
+    case TAO_AMI_REPLY_OK:
+    case TAO_AMI_REPLY_NOT_OK:
+      {
+        reply_handler->handle_response(_tao_in);
+        break;
+      }
+    case TAO_AMI_REPLY_USER_EXCEPTION:
+    case TAO_AMI_REPLY_SYSTEM_EXCEPTION:
+      {
+        reply_handler->handle_excep (_tao_in,
+                                     reply_status);
+
+        break;
+      }
+    }
 }
+#endif /* TAO_HAS_AMI */
 
 void
 CORBA::Request::get_response (void)
@@ -283,8 +340,7 @@ CORBA::Request::poll_response (void)
 
 void
 CORBA::Request::handle_response (TAO_InputCDR &incoming,
-                                 CORBA::ULong reply_status
-                                 )
+                                 CORBA::ULong reply_status)
 {
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -298,14 +354,12 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
       if (this->result_ != 0)
         {
           // We can be sure that the impl is a TAO::Unknown_IDL_Type.
-          this->result_->value ()->impl ()->_tao_decode (incoming
-                                                        );
+          this->result_->value ()->impl ()->_tao_decode (incoming);
         }
 
       this->args_->_tao_incoming_cdr (incoming,
                                       CORBA::ARG_OUT | CORBA::ARG_INOUT,
-                                      this->lazy_evaluation_
-                                     );
+                                      this->lazy_evaluation_);
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX,
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index e4e19e434e1..0e577c88818 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -36,6 +36,10 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/NVList.h"
 
+#if defined (TAO_HAS_AMI)
+#include "tao/Messaging/Messaging.h"
+#endif /* TAO_HAS_AMI */
+
 #include "ace/SString.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -149,9 +153,18 @@ namespace CORBA
     //@}
 
     /// Callback method for deferred synchronous requests.
-    void handle_response (TAO_InputCDR &incoming,
-                          CORBA::ULong reply_status
-                          );
+    void handle_response (TAO_InputCDR &incoming, CORBA::ULong reply_status);
+
+#if defined (TAO_HAS_AMI)
+    /// The 'asychronous' send method. The object is a DSI based callback
+    /// handler. This handler must implement Messaging::ReplyHandler
+    void sendc (CORBA::Object_ptr handler);
+
+    static void _tao_reply_stub (
+                    TAO_InputCDR &_tao_reply_cdr,
+                    Messaging::ReplyHandler_ptr _tao_reply_handler,
+                    CORBA::ULong reply_status);
+#endif /* TAO_HAS_AMI */
 
     /// Pseudo object methods.
     static CORBA::Request* _duplicate (CORBA::Request*);
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 2c0cc17b921..a34ce8e1fe2 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -63,7 +63,7 @@ CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
     exception_ (0),
     refcount_ (1),
     orb_server_request_ (orb_server_request),
-    sent_gateway_exception_ (0)
+    sent_gateway_exception_ (false)
 {
   this->orb_server_request_.is_dsi ();
 }
@@ -82,8 +82,7 @@ CORBA::ServerRequest::~ServerRequest (void)
 // Unmarshal in/inout params, and set up to marshal the appropriate
 // inout/out/return values later on.
 void
-CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
-                                 )
+CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list)
 {
   // arguments() must be called before either of these.
   if (this->params_ != 0 || this->exception_ != 0)
@@ -96,13 +95,11 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
 
   this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
                                     CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                    this->lazy_evaluation_
-                                   );
+                                    this->lazy_evaluation_);
 
   // Pass this alignment back to the TAO_ServerRequest.
   this->orb_server_request_.dsi_nvlist_align (
-                                this->params_->_tao_target_alignment ()
-                              );
+                                this->params_->_tao_target_alignment ());
 }
 
 // Store the result value.  There's either an exception, or a result,
@@ -133,8 +130,7 @@ CORBA::ServerRequest::set_result (const CORBA::Any &value
 
 // Store the exception value.
 void
-CORBA::ServerRequest::set_exception (const CORBA::Any &value
-                                     )
+CORBA::ServerRequest::set_exception (const CORBA::Any &value)
 {
   CORBA::TypeCode_var tc = value.type ();
 
@@ -179,8 +175,7 @@ CORBA::ServerRequest::dsi_marshal (void)
       if (this->retval_ != 0)
         {
           this->retval_->impl ()->marshal_value (
-                                      *this->orb_server_request_.outgoing ()
-                                    );
+                                      *this->orb_server_request_.outgoing ());
         }
 
       // Send the "inout" and "out" parameters.
@@ -188,9 +183,7 @@ CORBA::ServerRequest::dsi_marshal (void)
         {
           this->params_->_tao_encode (
                              *this->orb_server_request_.outgoing (),
-                             CORBA::ARG_INOUT | CORBA::ARG_OUT
-
-                           );
+                             CORBA::ARG_INOUT | CORBA::ARG_OUT);
         }
     }
   else
@@ -202,8 +195,7 @@ CORBA::ServerRequest::dsi_marshal (void)
       this->orb_server_request_.init_reply ();
 
       this->exception_->impl ()->marshal_value (
-                                     *this->orb_server_request_.outgoing ()
-                                   );
+                                     *this->orb_server_request_.outgoing ());
     }
 
   this->orb_server_request_.tao_send_reply ();
@@ -229,7 +221,7 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
     );
 
   // This will prevent the marshaling of any parameters into this reply.
-  this->sent_gateway_exception_ = 1;
+  this->sent_gateway_exception_ = true;
 
   this->orb_server_request_.tao_send_reply ();
 }
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index b7d94dd59e1..26ddc2109b2 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Server_Request.h
+ *
+ *  $Id$
+ *
+ *  Header file for CORBA's Dynamic Server Skeleton Interface's
+ *  "Server Request" type.
+ *
+ *
+ *  @author  Copyright 1994-1995 by Sun Microsystems
+ *  @author Inc. and Chris Cleeland.  Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
+ */
+//=============================================================================
+
 
 #ifndef TAO_CORBA_SERVER_REQUEST_H
 #define TAO_CORBA_SERVER_REQUEST_H
@@ -77,24 +74,21 @@ namespace CORBA
     /// Implementation uses this to provide the ORB with the operation's
     /// parameter list ... on return, their values are available; the
     /// list fed in has typecodes and (perhap) memory assigned.
-    void arguments (CORBA::NVList_ptr &list
-                    );
+    void arguments (CORBA::NVList_ptr &list);
 
     /// Implementation uses this to provide the operation result
     /// ... illegal if exception() was called or params() was not called.
     ///
     /// XXX Implementation should be able to assume response has been
     /// sent when this returns, and reclaim memory it allocated.
-    void set_result (const CORBA::Any &value
-                     );
+    void set_result (const CORBA::Any &value);
 
     /// Implementation uses this to provide the exception value which is
     /// the only result of this particular invocation.
     ///
     /// XXX Implementation should be able to assume response has been
     /// sent when this returns, and reclaim memory it allocated.
-    void set_exception (const CORBA::Any &value
-                        );
+    void set_exception (const CORBA::Any &value);
 
     // = Get various universal call attributes.
 
@@ -172,7 +166,7 @@ namespace CORBA
     TAO_ServerRequest &orb_server_request_;
 
     /// Have we sent a user exception obtained from a gateway?
-    int sent_gateway_exception_;
+    bool sent_gateway_exception_;
   };
 } // End CORBA namespace
 
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 88e3d466953..99f6a45212a 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -3,17 +3,15 @@
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-
 ACE_RCSID (DynamicInterface,
            Unknown_User_Exception,
            "$Id$")
@@ -71,7 +69,7 @@ CORBA::UnknownUserException::_downcast (CORBA::Exception const * ex)
 void
 CORBA::UnknownUserException::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
 CORBA::Exception *
@@ -87,17 +85,13 @@ CORBA::UnknownUserException::_tao_duplicate (void) const
 }
 
 void
-CORBA::UnknownUserException::_tao_encode (
-    TAO_OutputCDR &
-
-  ) const
+CORBA::UnknownUserException::_tao_encode (TAO_OutputCDR &) const
 {
   throw ::CORBA::MARSHAL ();
 }
 
 void
-CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &
-                                         )
+CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &)
 {
   throw ::CORBA::MARSHAL ();
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index c97f08f5dcf..83a6dbbcddc 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -79,15 +79,12 @@ namespace CORBA
     virtual void _raise (void) const;
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                             );
+    virtual void _tao_encode (TAO_OutputCDR &cdr) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr);
 
     /// Narrow to an UnknowUserException.
     static UnknownUserException * _downcast (CORBA::Exception *ex);
-    static UnknownUserException const * _downcast (
-      CORBA::Exception const * ex);
+    static UnknownUserException const * _downcast (CORBA::Exception const * ex);
 
     // = TAO specific extension.
 
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
index ed9a0f22403..41858d37da7 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -20,11 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index 6552490eaa7..8f75a01f480 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -35,10 +35,9 @@ TAO_EndpointPolicy_Initializer::init (void)
 
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index 56161ad79be..b5f87c7500f 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -22,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
-: orb_core_ (orb_core)
+  : orb_core_ (orb_core)
 {
 }
 
@@ -30,63 +30,62 @@ TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
 CORBA::Policy_ptr
 TAO_EndpointPolicy_Factory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
+    const CORBA::Any &value)
 {
   if (type == EndpointPolicy::ENDPOINT_POLICY_TYPE)
-  {
-    const EndpointPolicy::EndpointList* endpoint_list;
-    if ((value >>= endpoint_list) == 0)
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-      CORBA::Policy::_nil ());
-
-    TAO_Acceptor_Registry & registry
-      = this->orb_core_->lane_resources ().acceptor_registry ();
-
-    TAO_Acceptor ** acceptors_begin = registry.begin ();
-    TAO_Acceptor ** acceptors_end = registry.end ();
-    CORBA::ULong num_eps = endpoint_list->length ();
+    {
+      const EndpointPolicy::EndpointList* endpoint_list;
+      if (!(value >>= endpoint_list))
+        throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
-    // The endpoint list in the value is validated to ensure that
-    // at least one endpoint in the list matches an endpoint the
-    // ORB is listening on.
+      TAO_Acceptor_Registry & registry =
+        this->orb_core_->lane_resources ().acceptor_registry ();
 
-    bool found_one = false;
-    for (CORBA::ULong idx = 0; !found_one && idx < num_eps; ++idx)
-    {
-      CORBA::ULong prot_tag = (*endpoint_list)[idx]->protocol_tag();
+      TAO_Acceptor ** const acceptors_begin = registry.begin ();
+      TAO_Acceptor ** const acceptors_end = registry.end ();
+      CORBA::ULong const num_eps = endpoint_list->length ();
 
-      const TAO_Endpoint_Value_Impl *evi =
-        dynamic_cast <const TAO_Endpoint_Value_Impl*> ((*endpoint_list)[idx]);
+      // The endpoint list in the value is validated to ensure that
+      // at least one endpoint in the list matches an endpoint the
+      // ORB is listening on.
 
-      for (TAO_Acceptor** acceptor = acceptors_begin;
-           !found_one && acceptor != acceptors_end;
-           ++acceptor)
+      bool found_one = false;
+      for (CORBA::ULong idx = 0; !found_one && idx < num_eps; ++idx)
         {
-          if ((*acceptor)->tag() == prot_tag)
-            found_one = evi->validate_acceptor(*acceptor);
+          CORBA::ULong prot_tag = (*endpoint_list)[idx]->protocol_tag();
+
+          TAO_Endpoint_Value_Impl const * const evi =
+            dynamic_cast <TAO_Endpoint_Value_Impl const *> (
+              (*endpoint_list)[idx]);
+
+          if (!evi)
+            continue;
+
+          for (TAO_Acceptor** acceptor = acceptors_begin;
+               !found_one && acceptor != acceptors_end;
+               ++acceptor)
+            {
+              if ((*acceptor)->tag () == prot_tag)
+                found_one = evi->validate_acceptor (*acceptor);
+            }
         }
+
+      // There is no endpoint policy value matches an endpoint the ORB
+      // is listening on. A CORBA::PolicyError exception with a
+      // PolicyErrorCode of UNSUPPORTED_POLICY_VALUE is raised.
+      if (!found_one)
+        throw ::CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY_VALUE);
+
+      TAO_EndpointPolicy_i *tmp = 0;
+      ACE_NEW_THROW_EX (tmp,
+                        TAO_EndpointPolicy_i (*endpoint_list),
+                        CORBA::NO_MEMORY (TAO::VMCID,
+                                          CORBA::COMPLETED_NO));
+
+      return tmp;
     }
-    // There is no endpoint policy value matches an endpoint the ORB
-    // is listening on. A CORBA::PolicyError exception with a
-    // PolicyErrorCode of UNSUPPORTED_POLICY_VALUE is raised.
-    if (!found_one)
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY_VALUE),
-                        CORBA::Policy::_nil ());
-
-    TAO_EndpointPolicy_i *tmp;
-    ACE_NEW_THROW_EX (tmp,
-      TAO_EndpointPolicy_i (*endpoint_list),
-      CORBA::NO_MEMORY (TAO::VMCID,
-      CORBA::COMPLETED_NO));
-
-    return tmp;
-  }
   else
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
index 0877fa147df..b4aa4f331ee 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
@@ -48,9 +48,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           );
 private:
 
   TAO_ORB_Core * orb_core_;
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index 41acbc30ea9..3ed5bd91deb 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -17,7 +17,6 @@ void
 TAO_EndpointPolicy_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -25,7 +24,6 @@ void
 TAO_EndpointPolicy_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
                                   );
@@ -37,6 +35,10 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
   )
 {
   TAO_ORBInitInfo * local_info = dynamic_cast <TAO_ORBInitInfo *> (info);
+
+  if (!local_info)
+    throw CORBA::INTERNAL ();
+
   TAO_ORB_Core * the_orb_core = local_info->orb_core ();
 
   // Register the EndpointPolicy policy factories.
@@ -59,7 +61,7 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
                                      policy_factory.in ()
                                     );
     }
-  catch ( ::CORBA::BAD_INV_ORDER& ex)
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
     {
       if (ex.minor () == (CORBA::OMGVMCID | 16))
         {
@@ -71,11 +73,6 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
         }
       throw;
     }
-  catch ( ::CORBA::Exception&)
-    {
-      // Rethrow any other exceptions...
-      throw;
-    }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
index b75c52d370a..04bb65e447a 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
@@ -50,12 +50,10 @@ public:
   //@{
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         );
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          );
 
   //@}
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 955e6854896..335a5dd7c11 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
-
 #include "tao/SystemException.h"
 
 ACE_RCSID (EndpointPolicy,
            EndpointPolicy_i,
            "$Id$")
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value)
@@ -33,7 +31,6 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i ()
 
 CORBA::PolicyType
 TAO_EndpointPolicy_i::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return EndpointPolicy::ENDPOINT_POLICY_TYPE;
 }
@@ -50,7 +47,6 @@ TAO_EndpointPolicy_i::clone (void) const
 
 EndpointPolicy::EndpointList *
 TAO_EndpointPolicy_i::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   EndpointPolicy::EndpointList* list = 0;
   ACE_NEW_RETURN (list,
@@ -62,7 +58,6 @@ TAO_EndpointPolicy_i::value (void)
 
 CORBA::Policy_ptr
 TAO_EndpointPolicy_i::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EndpointPolicy_i* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -74,7 +69,6 @@ TAO_EndpointPolicy_i::copy (void)
 
 void
 TAO_EndpointPolicy_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_.length (0);
 }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index 429b6681ebe..66cee376baa 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -60,24 +60,18 @@ public:
 
   // = The EndpointPolicy::Policy methods
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
   virtual EndpointPolicy::EndpointList * value (
     void
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ));
+  );
 
 private:
   /// The attribute
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index 20feeebff71..4cd7b83ce7d 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -54,7 +54,7 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor) const
 {
   TAO_IIOP_Acceptor *iacc = dynamic_cast<TAO_IIOP_Acceptor *>(acceptor);
   if (iacc == 0)
-    return 0;
+    return false;
 
 #if 0
   // @@@ mesnier_p@ociweb.com @@@
@@ -73,46 +73,40 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor) const
       char hostname[513];
       eps[eps_idx].get_host_name(hostname,512);
       if (this->is_equivalent_i(eps[eps_idx].get_port_number(),hostname))
-        return 1;
+        return true;
     }
-  return 0;
+  return false;
 #else
-  return 1;
+  return true;
 #endif /* 0 */
 }
 
 char *
-IIOPEndpointValue_i::host ( void )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+IIOPEndpointValue_i::host (void)
 {
   return CORBA::string_dup (this->host_.in());
 }
 
 void
 IIOPEndpointValue_i::host (const char *h)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->host_ = h;
 }
 
 CORBA::UShort
 IIOPEndpointValue_i::port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->port_;
 }
 
 void
 IIOPEndpointValue_i::port (CORBA::UShort p )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->port_ = p;
 }
 
-
 CORBA::ULong
 IIOPEndpointValue_i::protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return IOP::TAG_INTERNET_IOP;
 }
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 3d03d1fdfe8..f42b3b52043 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -66,8 +66,7 @@ public:
 
   /// Value initializing constructor, this is typically for creation
   /// of one-off values.
-  IIOPEndpointValue_i (const char *host,
-                       CORBA::UShort port);
+  IIOPEndpointValue_i (const char *host, CORBA::UShort port);
 
   virtual ~IIOPEndpointValue_i (void);
 
@@ -85,20 +84,15 @@ public:
   CORBA::Boolean validate_acceptor (TAO_Acceptor *) const;
 
   /// Host attribute get/set operators.
-  char * host ( void )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void host (const char *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * host (void);
+  void host (const char * h);
 
   /// Port attribute get/set operators.
-  CORBA::UShort port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void port (CORBA::UShort )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::UShort port (void);
+  void port (CORBA::UShort p);
 
   // Protocol tag get operator, inherited from EndpointValueBase
-  CORBA::ULong protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ULong protocol_tag (void);
 
 private:
   CORBA::Boolean is_equivalent_i (CORBA::UShort port, const char *host) const;
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
index 83d838a6f84..842445db1fd 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -27,7 +27,6 @@
 
 #include /**/ "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 5362927702f..c2783085c39 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -25,9 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is used in the implementation of the _raise methods
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 #include "tao/CORBA_String.h"
@@ -105,12 +102,21 @@ namespace CORBA
   class TAO_Export Exception
   {
   public:
-    /// Destructor.
-    virtual ~Exception (void);
 
     /// Copy constructor.
+    /**
+     * @note This constructor should be protected, but VC7.1 at
+     *       warning level 4 complains about the inaccessible copy
+     *       constructor preventing it from being caught.  However,
+     *       that probably isn't true for most cases since CORBA
+     *       exceptions are typically caught by reference, not by
+     *       copy.
+     */
     Exception (const Exception &src);
 
+    /// Destructor.
+    virtual ~Exception (void);
+
     // = To throw the exception (when using the standard mapping).
     virtual void _raise (void) const = 0;
 
@@ -133,27 +139,23 @@ namespace CORBA
     /**
      * @note This method is TAO-specific.
      */
-    void _tao_print_exception (const char *info,
-                               FILE *f = stdout) const;
+    void _tao_print_exception (const char *info, FILE *f = stdout) const;
 
 #if defined (ACE_USES_WCHAR)
     /// ACE_WCHAR_T version of _tao_print_exception.
     /**
      * @note This method is TAO-specific.
      */
-    void _tao_print_exception (const ACE_WCHAR_T *info,
-                               FILE *f = stdout) const;
+    void _tao_print_exception (const ACE_WCHAR_T *info, FILE *f = stdout) const;
 #endif  // ACE_USES_WCHAR
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const = 0;
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ) const = 0;
+    virtual void _tao_encode (TAO_OutputCDR &cdr) const = 0;
 
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                              ) = 0;
+    virtual void _tao_decode (TAO_InputCDR &cdr) = 0;
 
     /// Used in the non-copying Any insertion operator.
     static void _tao_any_destructor (void *);
@@ -192,8 +194,7 @@ namespace CORBA
     Exception & operator = (const Exception & src);
 
     /// Construct from a respository id.
-    Exception (const char *repository_id,
-               const char *local_name);
+    Exception (const char *repository_id, const char *local_name);
 
   private:
 
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 479f06a2d5c..7c1ff3dced7 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -38,7 +38,6 @@ CORBA::Object_ptr
 TAO_FILE_Parser::parse_string (const char *ior,
                                CORBA::ORB_ptr orb
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
   // called if <match_prefix> returns 1.
@@ -65,7 +64,7 @@ TAO_FILE_Parser::parse_string (const char *ior,
 
       reader.alloc ()->free (string);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       reader.alloc ()->free (string);
       throw;
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 5946fc9e86f..622a5e1b4fb 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -47,8 +47,7 @@ public:
   virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index de1d1bfd087..2a90e493d3e 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -17,7 +17,7 @@ In_Fixed_Array_Argument_T (const typename S_forany::_slice_type * x)
         //         doesn't work either).  It's not clear if this is
         //         really the right thing to do but the code won't
         //         compile without it.
-        (S_forany::slice_type *) x
+        (S_forany::_slice_type *) x
 #else
         const_cast<typename S_forany::_slice_type *> (x)
 #endif  /* IBMCPP <= 600 */
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index b7a0952feac..23d1f6a365d 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -49,14 +49,11 @@ TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
 {
 }
 
-
 void
-TAO_GIOP_Message_Base::init (CORBA::Octet major,
-                             CORBA::Octet minor)
+TAO_GIOP_Message_Base::init (CORBA::Octet major, CORBA::Octet minor)
 {
   // Set the giop version of the out stream
-  this->out_stream_.set_version (major,
-                                 minor);
+  this->out_stream_.set_version (major, minor);
 }
 
 TAO_OutputCDR &
@@ -85,13 +82,10 @@ TAO_GIOP_Message_Base::generate_request_header (
   cdr.get_version (major, minor);
 
   // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
+  this->set_state (major, minor, generator_parser);
 
   // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_REQUEST,
-                                    cdr))
+  if (!this->write_protocol_header (TAO_GIOP_REQUEST, cdr))
     {
       if (TAO_debug_level)
         {
@@ -103,9 +97,7 @@ TAO_GIOP_Message_Base::generate_request_header (
     }
 
   // Now call the implementation for the rest of the header
-  if (!generator_parser->write_request_header (op,
-                                               spec,
-                                               cdr))
+  if (!generator_parser->write_request_header (op, spec, cdr))
     {
       if (TAO_debug_level)
         ACE_ERROR ((LM_ERROR,
@@ -121,8 +113,7 @@ int
 TAO_GIOP_Message_Base::generate_locate_request_header (
     TAO_Operation_Details &op,
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
- )
+    TAO_OutputCDR &cdr)
 {
   // Get a parser for us
   TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
@@ -132,13 +123,10 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
   cdr.get_version (major, minor);
 
   // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
+  this->set_state (major, minor, generator_parser);
 
   // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST,
-                                    cdr))
+  if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST, cdr))
     {
       if (TAO_debug_level)
         ACE_ERROR ((LM_ERROR,
@@ -149,9 +137,7 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
 
   // Now call the implementation for the rest of the header
   if (!generator_parser->write_locate_request_header
-      (op.request_id (),
-       spec,
-       cdr))
+      (op.request_id (), spec, cdr))
     {
       if (TAO_debug_level)
         ACE_ERROR ((LM_ERROR,
@@ -168,8 +154,7 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
 int
 TAO_GIOP_Message_Base::generate_reply_header (
     TAO_OutputCDR &cdr,
-    TAO_Pluggable_Reply_Params_Base &params
-  )
+    TAO_Pluggable_Reply_Params_Base &params)
 {
   // Get a parser for us
   TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
@@ -179,13 +164,10 @@ TAO_GIOP_Message_Base::generate_reply_header (
   cdr.get_version (major, minor);
 
   // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
+  this->set_state (major, minor, generator_parser);
 
   // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_REPLY,
-                                    cdr))
+  if (!this->write_protocol_header (TAO_GIOP_REPLY, cdr))
     {
       if (TAO_debug_level)
         ACE_ERROR ((LM_ERROR,
@@ -198,9 +180,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
     {
       // Now call the implementation for the rest of the header
       int const result =
-        generator_parser->write_reply_header (cdr,
-                                              params
-                                             );
+        generator_parser->write_reply_header (cdr, params);
 
       if (!result)
         {
@@ -212,7 +192,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
           return -1;
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 4)
         ex._tao_print_exception (
@@ -242,9 +222,7 @@ TAO_GIOP_Message_Base::generate_fragment_header (TAO_OutputCDR & cdr,
     return -1;
 
   // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
+  this->set_state (major, minor, generator_parser);
 
   // Write the GIOP header first
   if (!this->write_protocol_header (TAO_GIOP_FRAGMENT, cdr)
@@ -301,16 +279,12 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
       ACE_Message_Block* consolidated_block = 0;
       if (stream.begin()->cont () != 0)
         {
-          ACE_NEW_RETURN (consolidated_block,
-                          ACE_Message_Block,
-                          0);
+          ACE_NEW_RETURN (consolidated_block, ACE_Message_Block, 0);
           ACE_CDR::consolidate (consolidated_block, stream.begin ());
           buf = (char *) (consolidated_block->rd_ptr ());
         }
       ///
-      this->dump_msg ("send",
-                      reinterpret_cast <u_char *> (buf),
-                      total_len);
+      this->dump_msg ("send", reinterpret_cast <u_char *> (buf), total_len);
 
       //
       delete consolidated_block;
@@ -358,7 +332,7 @@ TAO_GIOP_Message_Base::message_type (
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("TAO (%P|%t) %N:%l        message_type : ")
                     ACE_TEXT ("wrong message.\n")));
-    }
+           }
     }
 
   return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
@@ -405,8 +379,7 @@ TAO_GIOP_Message_Base::parse_next_message (ACE_Message_Block &incoming,
 
       /* init out-parameters */
       this->init_queued_data (&qd, state);
-      mesg_length  = TAO_GIOP_MESSAGE_HEADER_LEN
-                   + state.payload_size ();
+      mesg_length  = TAO_GIOP_MESSAGE_HEADER_LEN + state.payload_size ();
 
       return 1; /* complete header */
     }
@@ -446,8 +419,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
               return -1;
             }
 
-          qd->msg_block_->copy (incoming.rd_ptr (),
-                                incoming.length ());
+          qd->msg_block_->copy (incoming.rd_ptr (), incoming.length ());
 
           incoming.rd_ptr (incoming.length ()); // consume all available data
 
@@ -493,8 +465,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
       qd->missing_data_ = 0;
     }
 
-  qd->msg_block_->copy (incoming.rd_ptr (),
-                        copying_len);
+  qd->msg_block_->copy (incoming.rd_ptr (), copying_len);
 
   incoming.rd_ptr (copying_len);
   this->init_queued_data (qd, state);
@@ -535,8 +506,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
           return -1;
         }
 
-      if (qd->msg_block_->copy (incoming.rd_ptr (),
-                                n_copy) == -1)
+      if (qd->msg_block_->copy (incoming.rd_ptr (), n_copy) == -1)
         {
            return -1;
         }
@@ -594,8 +564,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
       // ..now we are set to copy the right amount of data to the
       // node..
-      if (qd->msg_block_->copy (incoming.rd_ptr (),
-                                copy_len) == -1)
+      if (qd->msg_block_->copy (incoming.rd_ptr (), copy_len) == -1)
         {
           return -1;
         }
@@ -628,8 +597,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
       // Copy the right amount of data in to the node...
       // node..
-      if (qd->msg_block_->copy (incoming.rd_ptr (),
-                                copy_len) == -1)
+      if (qd->msg_block_->copy (incoming.rd_ptr (), copy_len) == -1)
         {
           return -1;
         }
@@ -719,8 +687,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   // Get the flag in the message block
   flg = qd->msg_block_->self_flags ();
 
-  if (ACE_BIT_ENABLED (flg,
-                       ACE_Message_Block::DONT_DELETE))
+  if (ACE_BIT_ENABLED (flg, ACE_Message_Block::DONT_DELETE))
     {
       // Use the same datablock
       db = qd->msg_block_->data_block ();
@@ -732,7 +699,6 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
       db = qd->msg_block_->data_block ()->duplicate ();
     }
 
-
   TAO_InputCDR input_cdr (db,
                           flg,
                           rd_pos,
@@ -781,9 +747,7 @@ TAO_GIOP_Message_Base::process_reply_message (
   TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
 
   // Get the state information that we need to use
-  this->set_state (qd->major_version_,
-                   qd->minor_version_,
-                   generator_parser);
+  this->set_state (qd->major_version_, qd->minor_version_, generator_parser);
 
   // Get the read and write positions before we steal data.
   size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
@@ -821,15 +785,11 @@ TAO_GIOP_Message_Base::process_reply_message (
     {
     case TAO_PLUGGABLE_MESSAGE_REPLY:
       // Should be taken care by the state specific parsing
-      retval =
-        generator_parser->parse_reply (input_cdr,
-                                       params);
+      retval = generator_parser->parse_reply (input_cdr, params);
 
       break;
     case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY:
-      retval =
-        generator_parser->parse_locate_reply (input_cdr,
-                                              params);
+      retval = generator_parser->parse_locate_reply (input_cdr, params);
       break;
     default:
       retval = -1;
@@ -840,8 +800,7 @@ TAO_GIOP_Message_Base::process_reply_message (
 
   params.input_cdr_ = &input_cdr;
 
-  retval =
-    params.transport_->tms ()->dispatch_reply (params);
+  retval = params.transport_->tms ()->dispatch_reply (params);
 
   if (retval == -1)
     {
@@ -861,8 +820,7 @@ int
 TAO_GIOP_Message_Base::generate_exception_reply (
     TAO_OutputCDR &cdr,
     TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
+    const CORBA::Exception &x)
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
@@ -870,12 +828,10 @@ TAO_GIOP_Message_Base::generate_exception_reply (
   try
     {
       // Make the GIOP & reply header.
-      this->generate_reply_header (cdr,
-                                   params);
-      x._tao_encode (cdr
-                    );
+      this->generate_reply_header (cdr, params);
+      x._tao_encode (cdr);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
@@ -948,7 +904,6 @@ TAO_GIOP_Message_Base::process_request (
 
   CORBA::ULong request_id = 0;
   CORBA::Boolean response_required = false;
-
   int parse_error = 0;
 
   try
@@ -984,8 +939,7 @@ TAO_GIOP_Message_Base::process_request (
       this->orb_core_->request_dispatcher ()->dispatch (
           this->orb_core_,
           request,
-          forward_to
-         );
+          forward_to);
 
 //@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END
 
@@ -1109,23 +1063,20 @@ TAO_GIOP_Message_Base::process_request (
                                     (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
                                     CORBA::COMPLETED_MAYBE);
 
-          result = this->send_reply_exception (transport,
-                                               output,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &exception);
-          if (result == -1)
+          if (this->send_reply_exception (transport,
+                                          output,
+                                          request_id,
+                                          &request.reply_service_info (),
+                                          &exception) == -1
+              && TAO_debug_level > 0)
             {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ")
-                              ACE_TEXT ("%p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_request ()")));
-                  exception._tao_print_exception (
-                    "TAO_GIOP_Message_Base::process_request[3]");
-                }
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ")
+                          ACE_TEXT ("%p: ")
+                          ACE_TEXT ("cannot send exception\n"),
+                          ACE_TEXT ("process_request ()")));
+              exception._tao_print_exception (
+                "TAO_GIOP_Message_Base::process_request[3]");
             }
         }
       else if (TAO_debug_level > 0)
@@ -1136,7 +1087,7 @@ TAO_GIOP_Message_Base::process_request (
           // However, in this case, we cannot close the connection
           // down, since it really isn't the client's fault.
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t|%N|%l) exception thrown ")
+                      ACE_TEXT ("TAO (%P|%t) exception thrown ")
                       ACE_TEXT ("but client is not waiting a response\n")));
         }
 
@@ -1155,8 +1106,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 {
   // This will extract the request header, set <response_required> as
   // appropriate.
-  TAO_GIOP_Locate_Request_Header locate_request (input,
-                                                 this->orb_core_);
+  TAO_GIOP_Locate_Request_Header locate_request (input, this->orb_core_);
 
   TAO_GIOP_Locate_Status_Msg status_info;
 
@@ -1167,8 +1117,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
   try
     {
-      int parse_error =
-        parser->parse_locate_header (locate_request);
+      int parse_error = parser->parse_locate_header (locate_request);
 
       if (parse_error != 0)
         {
@@ -1250,7 +1199,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
         }
     }
 
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1705,9 +1654,7 @@ TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major,
   TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
 
   // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
+  this->set_state (major, minor, generator_parser);
 
   return generator_parser->fragment_header_length ();
 }
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index f8c2452f0f7..67f03e81a0e 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -77,14 +77,12 @@ public:
   virtual int generate_locate_request_header (
       TAO_Operation_Details &op,
       TAO_Target_Specification &spec,
-      TAO_OutputCDR &cdr
-    );
+      TAO_OutputCDR &cdr);
 
   /// Write the reply header
   virtual int generate_reply_header (
       TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params
-    );
+      TAO_Pluggable_Reply_Params_Base &params);
 
   virtual int generate_fragment_header (TAO_OutputCDR & cdr,
                                         CORBA::ULong request_id);
@@ -132,8 +130,7 @@ public:
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
-    );
+      const CORBA::Exception &x);
 
   /// Header length
   virtual size_t header_length (void) const;
@@ -186,9 +183,7 @@ protected:
                   TAO_GIOP_Message_Generator_Parser *&) const;
 
   /// Print out a debug messages..
-  void dump_msg (const char *label,
-                 const u_char *ptr,
-                 size_t len);
+  void dump_msg (const char *label, const u_char *ptr, size_t len);
 
   /// Get the message type. The return value would be one of the
   /// following:
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index bee6b9d2a62..2bb432ebf57 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -20,7 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Basic_Types.h"
+#include "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -65,9 +66,7 @@ public:
   /// Write the reply header in to @a output
   virtual bool write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      TAO_Pluggable_Reply_Params_Base &reply) = 0;
 
   /// Writes the locate _reply message in to the @a output
   virtual bool write_locate_reply_mesg (
@@ -86,8 +85,7 @@ public:
 
   /// Parse the Loacte Request Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
-  virtual int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &) = 0;
+  virtual int parse_locate_header (TAO_GIOP_Locate_Request_Header &) = 0;
 
   /// Parse the reply message
   virtual int parse_reply (TAO_InputCDR &input,
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index f293b39d13f..f634e2beac2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -63,8 +63,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
       return false;
     }
 
-  msg.write_string (opdetails.opname_len (),
-                    opdetails.opname ());
+  msg.write_string (opdetails.opname_len (), opdetails.opname ());
 
   // Last element of request header is the principal; no portable way
   // to get it, we just pass empty principal (convention: indicates
@@ -149,7 +148,6 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
     TAO_Pluggable_Reply_Params_Base &reply
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the service context list.
 #if (TAO_HAS_MINIMUM_CORBA == 1)
@@ -250,8 +248,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
       else
         {
           // <target> can only have the values above
-          ACE_THROW_RETURN (CORBA::MARSHAL (),
-                            0);
+          throw ::CORBA::MARSHAL ();
         }
 
       output << CORBA::ULong (TAO_SVC_CONTEXT_ALIGN);
@@ -411,8 +408,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
 
 int
 TAO_GIOP_Message_Generator_Parser_10::parse_locate_header (
-    TAO_GIOP_Locate_Request_Header &request
-  )
+    TAO_GIOP_Locate_Request_Header &request)
 {
   // Get the stream
   TAO_InputCDR &msg = request.incoming_stream ();
@@ -427,8 +423,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_locate_header (
   request.request_id (req_id);
 
   // Get the object key
-  hdr_status =
-    hdr_status && request.profile ().unmarshall_object_key (msg);
+  hdr_status = hdr_status && request.profile ().unmarshall_object_key (msg);
 
   return hdr_status ? 0 : -1;
 }
@@ -465,8 +460,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_reply (
 int
 TAO_GIOP_Message_Generator_Parser_10::parse_locate_reply (
     TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
+    TAO_Pluggable_Reply_Params &params)
 {
   if (TAO_GIOP_Message_Generator_Parser::parse_locate_reply (cdr,
                                                              params) == -1)
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index 45dbb9f62c5..c209644d37b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -41,8 +41,7 @@ public:
   virtual bool write_request_header (
       const TAO_Operation_Details &opdetails,
       TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
+      TAO_OutputCDR &msg);
 
   /// Write the LocateRequest header
   virtual bool write_locate_request_header (
@@ -56,8 +55,7 @@ public:
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   /// Writes the locate _reply message in to the @a output
   virtual bool write_locate_reply_mesg (
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 5dc4cf05c60..2854acd6de4 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -119,7 +119,6 @@ bool
 TAO_GIOP_Message_Generator_Parser_12::write_reply_header (
     TAO_OutputCDR & output,
     TAO_Pluggable_Reply_Params_Base &reply)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the request ID
   output.write_ulong (reply.request_id_);
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index 2fb34e24a4b..9fe63865a35 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -58,8 +58,7 @@ public:
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   /// Writes the locate _reply message in to the @a output
   virtual bool write_locate_reply_mesg (
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 12e666c5f2d..e70a7fb4a7b 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -676,8 +676,7 @@ int
 TAO_GIOP_Message_Lite::generate_exception_reply (
     TAO_OutputCDR &cdr,
     TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
+    const CORBA::Exception &x)
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
@@ -689,7 +688,7 @@ TAO_GIOP_Message_Lite::generate_exception_reply (
                                 params);
       x._tao_encode (cdr);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
@@ -864,15 +863,6 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
     }
   catch (...)
     {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.  If
-      // we have native exceptions but no support for them in the ORB
-      // we should still be able to catch it.  If we don't have native
-      // exceptions it couldn't have been raised in the first place!
-      int result = 0;
-
       if (response_required)
         {
           CORBA::UNKNOWN exception (
@@ -883,23 +873,20 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
               CORBA::COMPLETED_MAYBE
             );
 
-          result = this->send_reply_exception (transport,
-                                               this->orb_core_,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &exception);
-          if (result == -1)
+          if (this->send_reply_exception (transport,
+                                          this->orb_core_,
+                                          request_id,
+                                          &request.reply_service_info (),
+                                          &exception) == -1
+              && TAO_debug_level > 0)
             {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_request[3], ")
-                              ACE_TEXT ("%p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_request ()")));
-                  exception._tao_print_exception (
-                    "TAO_GIOP_Message_Lite::process_request[3]");
-                }
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_request[3], ")
+                          ACE_TEXT ("%p: ")
+                          ACE_TEXT ("cannot send exception\n"),
+                          ACE_TEXT ("process_request ()")));
+              exception._tao_print_exception (
+                "TAO_GIOP_Message_Lite::process_request[3]");
             }
         }
       else if (TAO_debug_level > 0)
@@ -914,7 +901,9 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                       ACE_TEXT ("but client is not waiting a response\n")));
         }
 
-      return result;
+      // Propagate the non-CORBA C++ exception up to the application
+      // server.
+      throw;
     }
 
   return 0;
@@ -1029,7 +1018,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
         }
     }
 
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1158,7 +1147,7 @@ TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr,
 
   params.input_cdr_= &cdr;
 
-  if ( params.transport_->tms ()->dispatch_reply (params) == -1)
+  if (params.transport_->tms ()->dispatch_reply (params) == -1)
     {
       // Something really critical happened, we will forget about
       // every reply on this connection.
@@ -1182,7 +1171,6 @@ TAO_GIOP_Message_Lite::write_reply_header (
     TAO_Pluggable_Reply_Params_Base &reply
      /*  */
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the GIOP Lite header first
   this->write_protocol_header (TAO_GIOP_REPLY,
@@ -1485,7 +1473,7 @@ TAO_GIOP_Message_Lite::send_reply_exception (
 
       x->_tao_encode (output);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 22807573742..3eb46c95ba3 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -24,7 +24,6 @@
 
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/GIOP_Utils.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -141,7 +140,7 @@ public:
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
+      const CORBA::Exception &x
     );
 
   /// Consolidate fragmented message with associated fragments, being
@@ -252,8 +251,7 @@ private:
   int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Writes the locate _reply message in to the <output>
   int write_locate_reply_mesg (
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 55799ea5dcf..1d19bfbb7ce 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -27,7 +27,6 @@ TAO_GIOP_Message_State::TAO_GIOP_Message_State (void)
 {
 }
 
-
 int
 TAO_GIOP_Message_State::parse_message_header (ACE_Message_Block &incoming)
 {
@@ -103,9 +102,6 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
   return 0; // success
 }
 
-
-
-
 int
 TAO_GIOP_Message_State::parse_magic_bytes (char *buf)
 {
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
index 2de1bbb2b03..a91d573d232 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -10,7 +10,7 @@ TAO_GIOP_Message_State::message_size (void) const
   CORBA::ULong len =
     this->message_size_ + TAO_GIOP_MESSAGE_HEADER_LEN;
 
-  return len; 
+  return len;
 }
 
 ACE_INLINE CORBA::ULong
@@ -34,24 +34,4 @@ TAO_GIOP_Message_State::reset (void)
   this->missing_data_ = 0;
 }
 
-#if 0
-ACE_INLINE int
-TAO_GIOP_Message_State::message_fragmented (void)
-{
-  if (this->more_fragments)
-    return 1;
-
-  return 0;
-}
-
-
-
-ACE_INLINE CORBA::Boolean
-TAO_GIOP_Message_State::header_received (void) const
-{
-  return this->message_size != 0;
-}
-
-#endif
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
index 6328534b3fc..941389650c1 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -21,8 +21,7 @@ TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj,
 }
 
 ACE_INLINE TAO_GIOP_Message_Version &
-TAO_GIOP_Message_Version::operator= (
-    const TAO_GIOP_Message_Version &src)
+TAO_GIOP_Message_Version::operator= (const TAO_GIOP_Message_Version &src)
 {
   if (this != &src)
     {
@@ -35,18 +34,16 @@ TAO_GIOP_Message_Version::operator= (
 
 
 ACE_INLINE void
-TAO_GIOP_Message_Version::set_version (CORBA::Octet maj,
-                                       CORBA::Octet min)
+TAO_GIOP_Message_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
 {
   this->major = maj;
   this->minor = min;
 }
 
 ACE_INLINE bool
-TAO_GIOP_Message_Version::operator== (
-    const TAO_GIOP_Message_Version &src)
+TAO_GIOP_Message_Version::operator== (const TAO_GIOP_Message_Version &src)
 {
-  return this->major == src.major && this->minor == src.minor;
+  return this->minor == src.minor && this->major == src.major;
 }
 
 ACE_INLINE bool
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index f0619104cb2..50a7819434a 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -57,6 +57,7 @@
  */
 
 #include "tao/Range_Checking_T.h"
+#include "ace/checked_iterator.h"
 
 #include <algorithm>
 
@@ -118,7 +119,9 @@ public:
     generic_sequence tmp(rhs.maximum_);
     tmp.length_ = rhs.length_;
     element_traits::copy_range(
-        rhs.buffer_, rhs.buffer_ + rhs.length_, tmp.buffer_);
+        rhs.buffer_,
+        rhs.buffer_ + rhs.length_,
+        ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
     swap(tmp);
   }
 
@@ -181,7 +184,9 @@ public:
     generic_sequence tmp(length);
     tmp.length_ = length;
     element_traits::copy_range(
-        buffer_, buffer_ + length_, tmp.buffer_);
+      buffer_,
+      buffer_ + length_,
+      ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
     element_traits::initialize_range(
         tmp.buffer_ + length_, tmp.buffer_ + length);
 
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 68a127359cb..b5f02f0ee3f 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -4,12 +4,14 @@
 #include "tao/HTTP_Client.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
+#include "tao/SystemException.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"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            HTTP_Parser,
@@ -36,7 +38,6 @@ CORBA::Object_ptr
 TAO_HTTP_Parser::parse_string (const char *ior,
                                CORBA::ORB_ptr orb
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
   // called if <match_prefix> returns 1.
@@ -118,17 +119,7 @@ TAO_HTTP_Parser::parse_string (const char *ior,
   for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ())
     string += curr->rd_ptr();
 
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  try
-    {
-      object = orb->string_to_object (string.c_str());
-    }
-  catch ( ::CORBA::Exception&)
-    {
-      throw;
-    }
-
-  return object;
+  return orb->string_to_object (string.c_str());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h
index b55ad6a00e3..931bc9bec03 100644
--- a/TAO/tao/HTTP_Parser.h
+++ b/TAO/tao/HTTP_Parser.h
@@ -48,8 +48,7 @@ public:
   virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 2463bc1bc80..b027a4dcee3 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -76,8 +76,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
 
   if (CORBA::is_nil (obj.in ()))
     {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        CORBA::InterfaceDef::_nil ());
+      throw ::CORBA::INTF_REPOS ();
     }
 
   CORBA::Repository_var repo =
@@ -86,8 +85,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
 
   if (CORBA::is_nil (repo.in ()))
     {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        CORBA::InterfaceDef::_nil ());
+      throw ::CORBA::INTF_REPOS ();
     }
 
   CORBA::Contained_var result = repo->lookup_id (repo_id
@@ -130,14 +128,10 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
     {
       _tao_call.invoke (0, 0);
     }
-  catch ( ::CORBA::OBJECT_NOT_EXIST&)
+  catch (const ::CORBA::OBJECT_NOT_EXIST&)
     {
       return CORBA::InterfaceDef::_nil ();
     }
-  catch ( ::CORBA::Exception&)
-    {
-      throw;
-    }
 
   return _tao_retval.retn ();
 }
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 246a1b678ef..4d9bae8a588 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -15,14 +15,12 @@
 #define TAO_IFR_CLIENT_ADAPTER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 30758b60b00..6a3800ebba2 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -91,13 +91,9 @@ TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
   // if they should be spread across multiple profiles.
   if (priority == TAO_INVALID_PRIORITY &&
       this->orb_core_->orb_params ()->shared_profile () == 0)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
+    return this->create_new_profile (object_key, mprofile, priority);
   else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
+    return this->create_shared_profile (object_key, mprofile, priority);
 }
 
 int
@@ -681,7 +677,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
     {
       // In this case we have to find the end of the numeric address and
       // start looking for the port separator from there.
-      const char *cp_pos = ACE_OS::strchr(address, ']');
+      char const * const cp_pos = ACE_OS::strchr (address, ']');
       if (cp_pos == 0)
         {
           // No valid IPv6 address specified.
@@ -693,6 +689,12 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
         }
       else
         {
+          // Extract out just the host part of the address.
+          size_t const len = cp_pos - (address + 1);
+
+          if (len >= sizeof (tmp_host))
+            return -1;
+
           ipv6_in_host = true;
           host_defaulted = (cp_pos == address+1) ||
             (cp_pos == address+3 && address[1] == ':' && address[2] == ':');
@@ -702,8 +704,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
             port_separator_loc = 0;
           if (def_type)
             *def_type = AF_INET6;
-          // Extract out just the host part of the address.
-          size_t const len = cp_pos - (address + 1);
+
           ACE_OS::memcpy (tmp_host, address + 1, len);
           tmp_host[len] = '\0';
         }
@@ -716,6 +717,10 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
           {
             // Extract out just the host part of the address.
             size_t const len = port_separator_loc - address;
+
+            if (len >= sizeof (tmp_host))
+              return -1;
+
             ACE_OS::memcpy (tmp_host, address, len);
             tmp_host[len] = '\0';
           }
@@ -766,7 +771,11 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
       if (tmp_host[0] == '\0')
         {
           // Extract out just the host part of the address.
-          const size_t len = port_separator_loc - address;
+          size_t const len = port_separator_loc - address;
+
+          if (len >= sizeof (tmp_host))
+            return -1;
+          
           ACE_OS::memcpy (tmp_host, address, len);
           tmp_host[len] = '\0';
         }
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 01f0e6043e3..eb56835c1f4 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -107,24 +107,24 @@ TAO_IIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (protocol_properties);
+            }
         }
-      else
+      catch (const ::CORBA::Exception&)
         {
-          tph->server_protocol_properties_at_orb_level (protocol_properties);
+          return -1;
         }
     }
-  catch ( ::CORBA::Exception&)
-    {
-      return -1;
-    }
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -448,21 +448,8 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
 }
 
 int
-TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+TAO_IIOP_Connection_Handler::set_tos (int tos)
 {
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = static_cast<int> (codepoint) << 2;
-    }
-
   if (tos != this->dscp_codepoint_)
     {
       int result = 0;
@@ -509,7 +496,41 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
       // On successful setting of TOS field.
       if (result == 0)
         this->dscp_codepoint_ = tos;
+    }
+  return 0;
+}
+
+int
+TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Long dscp_codepoint)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+
+  CORBA::Long codepoint = dscp_codepoint;
+
+  tos = static_cast<int> (codepoint) << 2;
+
+  this->set_tos (tos);
+
+  return 0;
+}
 
+int
+TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+
+  if (set_network_priority)
+    {
+      TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
+
+      if (tph != 0)
+        {
+          CORBA::Long codepoint =
+            tph->get_dscp_codepoint ();
+
+          tos = static_cast<int> (codepoint) << 2;
+          this->set_tos (tos);
+        }
     }
 
   return 0;
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index d00a736d5a4..42011955fd9 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -104,6 +104,7 @@ public:
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+  int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
   virtual int open_handler (void *);
 
@@ -131,6 +132,10 @@ protected:
   virtual int release_os_resources (void);
   //@}
 
+  // helper function used by the set_dscp_codepoint () methods to
+  // set the TOS field in the IP packets.
+  int set_tos (int tos);
+
 private:
 
   /// Stores the type of service value.
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index bf18d18008a..77d80f5cc9b 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -17,6 +17,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_time.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            IIOP_Connector,
@@ -214,28 +215,34 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   TAO_IIOP_Connection_Handler **sh_ptr = &svc_handler;
   TAO_IIOP_Endpoint **ep_ptr = &iiop_endpoint;
   TAO_LF_Multi_Event mev;
-  mev.add_event(svc_handler);
-  TAO_Transport* tp = this->complete_connection (result, desc,
-                                                 sh_ptr, ep_ptr,
-                                                 1U, r, &mev,  timeout);
-  return tp;
+  mev.add_event (svc_handler);
+
+  return this->complete_connection (result,
+                                    desc,
+                                    sh_ptr,
+                                    ep_ptr,
+                                    1U,
+                                    r,
+                                    &mev,
+                                    timeout);
 }
 
 TAO_Transport *
-TAO_IIOP_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *r,
-                                     TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value *timeout)
+TAO_IIOP_Connector::make_parallel_connection (
+  TAO::Profile_Transport_Resolver * r,
+  TAO_Transport_Descriptor_Interface & desc,
+  ACE_Time_Value * timeout)
 {
   TAO_Endpoint *root_ep = desc.endpoint();
   unsigned max_count = 1;
   unsigned long ns_stagger =
-    this->orb_core()->orb_params()->parallel_connect_delay();
+    this->orb_core ()->orb_params ()->parallel_connect_delay ();
   unsigned long sec_stagger = ns_stagger/1000;
   ns_stagger = (ns_stagger % 1000) * 1000000;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
+  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(), 0);
        ep != 0;
-       ep = ep->next_filtered(this->orb_core(),root_ep))
-    max_count++;
+       ep = ep->next_filtered (this->orb_core(), root_ep))
+    ++max_count;
 
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
@@ -295,8 +302,14 @@ TAO_IIOP_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *r
 
   TAO_Transport *winner = 0;
   if (count > 0) // only complete if at least one pending or success
-    winner = this->complete_connection (result,desc,
-                                        shlist,eplist,count,r,&mev,timeout);
+    winner = this->complete_connection (result,
+                                        desc,
+                                        shlist,
+                                        eplist,
+                                        count,r,
+                                        &mev,
+                                        timeout);
+
   delete [] shlist; // reference reductions should have been done already
   delete [] eplist;
   return winner;
@@ -492,7 +505,7 @@ TAO_IIOP_Connector::complete_connection (int result,
           for (unsigned i = 0; i < count; i++)
             {
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection,")
+                          ACE_TEXT ("(%P|%t) IIOP_Connector::complete_connection,")
                           ACE_TEXT (" connection to <%s:%d> failed (%p)\n"),
                           ACE_TEXT_CHAR_TO_TCHAR (ep_list[i]->host ()),
                           ep_list[i]->port (),
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 6bc63f11934..8c947e3b258 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -93,9 +93,7 @@ protected:
 #endif  /* TAO_HAS_SENDFILE==1 */
 
 
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
+  virtual ssize_t recv (char *buf, size_t len, const ACE_Time_Value *s = 0);
 
   virtual int send_message_shared (TAO_Stub *stub,
                                    int message_semantics,
@@ -128,8 +126,7 @@ public:
                                        TAO_Target_Specification &spec,
                                        TAO_OutputCDR &msg);
 
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
+  virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor);
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
index 8a181d8164a..964ebcf0881 100644
--- a/TAO/tao/IOP_IOR.pidl
+++ b/TAO/tao/IOP_IOR.pidl
@@ -103,6 +103,8 @@ module IOP
   const ServiceId FT_GROUP_VERSION = 12;
   const ServiceId FT_REQUEST = 13;
 
+  const ServiceId REP_NWPRIORITY = 0x54410005;
+
   // The following are defined in 03-01-11
   const ProfileId TAG_UIPMC = 3;
   const ComponentId TAG_GROUP = 39;
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index 9023125147f..aca2830859c 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -29,7 +29,6 @@ TAO_IORInfo::~TAO_IORInfo (void)
 CORBA::Policy_ptr
 TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -45,15 +44,12 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
   // ........
 
   // No policy matching the given PolicyType was found.
-  ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
-                                       CORBA::COMPLETED_NO),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::INV_POLICY (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO);
 }
 
 void
 TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -70,7 +66,6 @@ TAO_IORInfo::add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -84,7 +79,6 @@ TAO_IORInfo::add_ior_component_to_profile (
 
 char *
 TAO_IORInfo::manager_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -94,7 +88,6 @@ TAO_IORInfo::manager_id (void)
 
 PortableInterceptor::AdapterState
 TAO_IORInfo::state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -103,7 +96,6 @@ TAO_IORInfo::state (void)
 
 PortableInterceptor::ObjectReferenceTemplate *
 TAO_IORInfo::adapter_template (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -117,9 +109,7 @@ TAO_IORInfo::adapter_template (void)
 
   if (adapter_template == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   return adapter_template;
@@ -127,7 +117,6 @@ TAO_IORInfo::adapter_template (void)
 
 PortableInterceptor::ObjectReferenceFactory *
 TAO_IORInfo::current_factory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -141,9 +130,7 @@ TAO_IORInfo::current_factory (void)
 
   if (adapter_factory == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   return adapter_factory;
@@ -153,7 +140,6 @@ void
 TAO_IORInfo::current_factory (
     PortableInterceptor::ObjectReferenceFactory * current_factory
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index df8723f914f..ab1de4f7bcc 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -62,43 +62,35 @@ public:
   /// effect for the object whose IOR is being created.
   virtual CORBA::Policy_ptr get_effective_policy (
       CORBA::PolicyType type
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Add the given tagged component to all profiles.
   virtual void add_ior_component (
       const IOP::TaggedComponent & component
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Add the given tagged component to all profiles matching the given
   /// ProfileId.
   virtual void add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   virtual char * manager_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual PortableInterceptor::AdapterState state (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual void current_factory (
       PortableInterceptor::ObjectReferenceFactory * current_factory
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   //@}
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index e30e2e7505b..b0204d72240 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -11,13 +11,13 @@ ACE_RCSID (IORInterceptor,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::~
+  TAO_IORInterceptor_Adapter_Factory_Impl (void)
 {
 }
 
 TAO_IORInterceptor_Adapter *
 TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter_Impl *nia = 0;
   ACE_NEW_THROW_EX (nia,
@@ -36,13 +36,11 @@ int
 TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
 {
   TAO_ORB_Core::iorinterceptor_adapter_factory_name (
-      "Concrete_IORInterceptor_Adapter_Factory"
-    );
+    "Concrete_IORInterceptor_Adapter_Factory");
 
   return
     ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_IORInterceptor_Adapter_Factory_Impl
-      );
+    ace_svc_desc_TAO_IORInterceptor_Adapter_Factory_Impl);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
@@ -57,3 +55,4 @@ ACE_STATIC_SVC_DEFINE (
   )
 
 ACE_FACTORY_DEFINE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 6696a5320c2..81815bfac90 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -43,8 +43,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl
 public:
   virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void);
 
-  virtual TAO_IORInterceptor_Adapter * create (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TAO_IORInterceptor_Adapter * create (void);
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 8d175bb9826..56728db7e70 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -53,7 +53,6 @@ void
 TAO_IORInterceptor_Adapter_Impl::establish_components (
   TAO_Root_POA* poa
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const size_t interceptor_count = this->ior_interceptor_list_.size ();
 
@@ -84,7 +83,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
             info.in ()
            );
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           // According to the Portable Interceptors specification,
           // IORInterceptor::establish_components() must not throw an
@@ -127,7 +126,6 @@ void
 TAO_IORInterceptor_Adapter_Impl::components_established (
   PortableInterceptor::IORInfo_ptr info
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
@@ -153,7 +151,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
                );
             }
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
           throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
                                       CORBA::COMPLETED_NO);
@@ -166,7 +164,6 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const size_t interceptor_count = this->ior_interceptor_list_.size ();
 
@@ -210,7 +207,6 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
       const char * id,
       PortableInterceptor::AdapterState state
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// Whenever the POAManager state is changed, the
   /// adapter_manager_state_changed method is to be invoked on all the IOR
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 9094acb23fc..bfd1492c220 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -64,26 +64,22 @@ public:
 
   virtual void destroy_interceptors (void);
 
-  virtual void establish_components (TAO_Root_POA *poa )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void establish_components (TAO_Root_POA *poa );
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
   virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       );
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   virtual void adapter_manager_state_changed (
       const char * id,
       PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
 private:
   /// List of IOR interceptors maintained
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
index 6dfeb9f191c..b881e436af0 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
@@ -1,19 +1,16 @@
 #include "tao/IORInterceptor/IORInterceptor_Details.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (IORInterceptor,
            IORInterceptor_Details,
            "$Id$")
 
-#include "tao/SystemException.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
   void
-  IORInterceptor_Details::apply_policies (
-      const CORBA::PolicyList &/*policies*/
-      )
+  IORInterceptor_Details::apply_policies (const CORBA::PolicyList &)
   {
     // There are currently no policies that apply to IOR Interceptors.
     throw ::CORBA::INV_POLICY ();
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index 752aff0b006..0579d23a713 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -22,9 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
 #include "tao/PI_ForwardC.h"
 #include "tao/Policy_ForwardC.h"
+#include "tao/TAO_Export.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class T> class ACE_Array_Base;
@@ -64,19 +64,13 @@ public:
   virtual ~TAO_IORInterceptor_Adapter (void);
 
   virtual void add_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-
-    ) = 0;
+      PortableInterceptor::IORInterceptor_ptr interceptor) = 0;
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-
-    ) = 0;
-
-  virtual void destroy_interceptors (
+      const CORBA::PolicyList& policies) = 0;
 
-      ) = 0;
+  virtual void destroy_interceptors (void) = 0;
 
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
@@ -86,26 +80,20 @@ public:
    * IORInterceptor::components_established() once the former is
    * completed.
    */
-  virtual void establish_components (TAO_Root_POA *poa )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual void establish_components (TAO_Root_POA *poa) = 0;
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual void components_established (PortableInterceptor::IORInfo_ptr info)
+    = 0;
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      PortableInterceptor::AdapterState state) = 0;
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      PortableInterceptor::AdapterState state) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index 87f6fc0057e..43a176f2f5b 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -21,7 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -42,10 +43,7 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory
 public:
   virtual ~TAO_IORInterceptor_Adapter_Factory (void);
 
-  virtual TAO_IORInterceptor_Adapter * create (
-
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual TAO_IORInterceptor_Adapter * create (void) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index adcb4b6d6ca..f9a82d8050e 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -20,7 +20,6 @@ TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
                                     int,
                                     ACE_TCHAR *[]
                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 8bfbd4e69e2..e4f32a91866 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynamicAny.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    IORManip_Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IORMANIP_LOADER_H
 #define TAO_IORMANIP_LOADER_H
@@ -38,9 +35,7 @@ public:
   /// Creates a IORManip factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 28ad17d8f5e..614e4ef86de 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -25,12 +25,7 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::Invalid_IOR))
+    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors)
 {
   // we need to create a new CORBA::Object which has the union of the
   // two profile lists.  However, if any profiles are duplicates (i.e. in
@@ -47,8 +42,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
   // make sure we have some profiles
   if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::EmptyProfileList ();
 
   // initialize with estimated pfile count.
   TAO_MProfile Merged_Profiles (count);
@@ -58,8 +52,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
   // they are the same type and they do not have duplicate profiles.
   auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ());
   if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::Invalid_IOR ();
   CORBA::String_var id =
     CORBA::string_dup (iors[0]->_stubobj ()->type_id.in ());
 
@@ -74,19 +67,16 @@ TAO_IOR_Manipulation_impl::merge_iors (
       // check to see if any of the profile in tmp_pfiles are already
       // in Merged_Profiles.  If so raise exception.
       if (Merged_Profiles.is_equivalent (tmp_pfiles.get ()))
-        ACE_THROW_RETURN (TAO_IOP::Duplicate (),
-                          CORBA::Object::_nil ());
+        throw TAO_IOP::Duplicate ();
 
       // If the object type_id's differ then raise an exception.
       if (id.in () && iors[i]->_stubobj ()->type_id.in () &&
           ACE_OS::strcmp (id.in (), iors[i]->_stubobj ()->type_id.in ()))
-        ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                          CORBA::Object::_nil ());
+        throw TAO_IOP::Invalid_IOR ();
 
       // append profiles
       if (Merged_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-        ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                          CORBA::Object::_nil ());
+        throw TAO_IOP::Invalid_IOR ();
 
     }
 
@@ -96,8 +86,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
-                                          Merged_Profiles
-                                         );
+                                          Merged_Profiles);
 
   // Make the stub memory allocation exception safe for the duration
   // of this method.
@@ -115,8 +104,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
     {
-      ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                        CORBA::Object::_nil ());
+      throw TAO_IOP::Invalid_IOR ();
     }
 
   // Release ownership of the pointers protected by the auto_ptrs since they
@@ -129,12 +117,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::add_profiles (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::Invalid_IOR))
+    CORBA::Object_ptr ior2)
 {
 
   // Get an estimate of the number of profiles
@@ -150,20 +133,13 @@ TAO_IOR_Manipulation_impl::remove_profiles (
     CORBA::Object_ptr group,
     CORBA::Object_ptr ior2
     )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::Invalid_IOR,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::NotFound
-      ))
 {
   // First verify they are the same type!
   CORBA::String_var id =
     CORBA::string_dup (group->_stubobj ()->type_id.in ());
   if (id.in () && ior2->_stubobj ()->type_id.in () &&
       ACE_OS::strcmp (id.in (), ior2->_stubobj ()->type_id.in ()))
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::Invalid_IOR ();
 
   // Since we are removing from group ...
   CORBA::ULong count = group->_stubobj ()->base_profiles ().profile_count ();
@@ -171,16 +147,14 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   // make sure we have some profiles
   if (count == 0 ||
       ior2->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::EmptyProfileList ();
 
   // initialize with estimated pfile count.
   TAO_MProfile Diff_Profiles (count);
 
   auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ());
   if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::Invalid_IOR ();
 
   // We are done with add_profiles.
   // At this point, we don't do remove_profiles()
@@ -216,8 +190,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
     {
-      ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                        CORBA::Object::_nil ());
+      throw TAO_IOP::Invalid_IOR ();
     }
 
   // Now we can remove the profiles which we want to elimitate from
@@ -228,8 +201,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   TAO_MProfile& mp = stub -> base_profiles();
   if (mp.remove_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      CORBA::Object::_nil ());
+    throw TAO_IOP::NotFound ();
 
   // MS C++ knows nothing about reset!
   // tmp_pfiles.reset (0); // get rid of last MProfile
@@ -242,14 +214,10 @@ TAO_IOR_Manipulation_impl::set_property (
     TAO_IOP::TAO_IOR_Property_ptr prop,
     CORBA::Object_ptr group
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::Invalid_IOR,
-                   TAO_IOP::Duplicate))
 {
   // make sure we have some profiles
   if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      0);
+    throw TAO_IOP::Invalid_IOR ();
 
   // Call the implementation object to
   return prop->set_property (group
@@ -263,21 +231,15 @@ TAO_IOR_Manipulation_impl::set_primary (
     CORBA::Object_ptr new_primary,
     CORBA::Object_ptr group
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::Invalid_IOR,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::MultiProfileList))
 {
   // make sure we have some profiles in GROUP
   if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      0);
+    throw TAO_IOP::Invalid_IOR ();
 
   // Make sure we have only one profile in new_primary
   // @@ Will fail if the object has been
   /*if (new_primary->_stubobj ()->base_profiles ().profile_count () > 1)
-    ACE_THROW_RETURN (TAO_IOP::MultiProfileList (),
-    0);*/
+    throw TAO_IOP::MultiProfileList ();*/
 
   // Call the callback object to do the rest of the processing.
   return prop->set_primary (new_primary,
@@ -291,14 +253,10 @@ TAO_IOR_Manipulation_impl::get_primary (
       CORBA::Object_ptr group
 
     )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    ))
 {
   // make sure we have some profiles in IOR
   if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (), 0);
+    throw TAO_IOP::NotFound ();
   // @@ Bala: this was throwing TAO_IOP::Invalid_IOR, but it was not
   // in the throw spec, that will result in a CORBA::UNKNOWN at
   // run-time (if it does not crash).  Any idea about what is going on
@@ -311,9 +269,7 @@ TAO_IOR_Manipulation_impl::get_primary (
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::is_primary_set (
     TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr group
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    CORBA::Object_ptr group)
 {
   return prop->is_primary_set (group);
 }
@@ -321,9 +277,7 @@ TAO_IOR_Manipulation_impl::is_primary_set (
 CORBA::Boolean
 TAO_IOR_Manipulation_impl:: remove_primary_tag (
     TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr group
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    CORBA::Object_ptr group)
 {
   return prop->remove_primary_tag (group);
 }
@@ -333,8 +287,6 @@ TAO_IOR_Manipulation_impl::is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::NotFound))
 {
   CORBA::ULong count = 0;
   TAO_Profile *pfile1, *pfile2;
@@ -353,25 +305,18 @@ TAO_IOR_Manipulation_impl::is_in_ior (
     }
 
   if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      0);
+    throw TAO_IOP::NotFound ();
 
   return count;
 }
 
 CORBA::ULong
-TAO_IOR_Manipulation_impl::get_profile_count (
-    CORBA::Object_ptr group
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList))
+TAO_IOR_Manipulation_impl::get_profile_count (CORBA::Object_ptr group)
 {
-  CORBA::ULong count;
-  count = group->_stubobj ()->base_profiles ().profile_count ();
+  CORBA::ULong const count = group->_stubobj ()->base_profiles ().profile_count ();
 
   if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      0);
+    throw TAO_IOP::EmptyProfileList ();
 
   return count;
 }
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index d81fedd2886..7e24336b88c 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManipulation.h
-//
-// = DESCRIPTION
-//    This class implements IOR interface to the ORB
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    IORManipulation.h
+ *
+ *  $Id$
+ *
+ *  This class implements IOR interface to the ORB
+ *
+ *
+ *  @author  Fred Kuhns <fredk@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IOR_MANIPULATION_H
 #define TAO_IOR_MANIPULATION_H
@@ -50,51 +47,28 @@ class TAO_IOR_Manipulation_impl
   //
 public:
 
+  /// constructor
   TAO_IOR_Manipulation_impl (void);
-  // constructor
 
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::Duplicate,
-        TAO_IOP::Invalid_IOR
-      ));
+    );
 
   virtual CORBA::Object_ptr add_profiles (
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::Duplicate,
-        TAO_IOP::Invalid_IOR
-      ));
+      );
 
   virtual CORBA::Object_ptr remove_profiles (
     CORBA::Object_ptr group,
     CORBA::Object_ptr ior2
-    )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::Invalid_IOR,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::NotFound
-      ));
+    );
 
   virtual CORBA::Boolean set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
       )
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate
-    ));
+;
 
   // @@ note awkward argument order
   virtual CORBA::Boolean set_primary (
@@ -102,62 +76,38 @@ public:
       CORBA::Object_ptr new_primary,
       CORBA::Object_ptr group
       )
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate,
-      TAO_IOP::MultiProfileList
-    ));
+;
 
   virtual CORBA::Object_ptr get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
       )
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    ));
+;
 
   virtual CORBA::Boolean is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
       )
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+;
 
    virtual CORBA::Boolean remove_primary_tag (
        TAO_IOP::TAO_IOR_Property_ptr prop,
        CORBA::Object_ptr iogr
-       )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+       );
 
   virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::NotFound
-      ));
+    );
 
   virtual CORBA::ULong get_profile_count (
     CORBA::Object_ptr group
-    )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList
-      ));
+    );
 
 protected:
 
+  /// destructor
   ~TAO_IOR_Manipulation_impl (void);
-  // destructor
 
 };
 
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 9054a9624b9..132144ddd86 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -18,10 +18,9 @@ ACE_RCSID (IORTable,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate (
-    TAO_IOR_Table_Impl_ptr p)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::duplicate (TAO_IOR_Table_Impl_ptr p)
 {
-  if (! ::CORBA::is_nil (p))
+  if (!::CORBA::is_nil (p))
     {
       p->_add_ref ();
     }
@@ -30,22 +29,20 @@ TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate (
 }
 
 void
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::release (
-    TAO_IOR_Table_Impl_ptr p)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p)
 {
   ::CORBA::release (p);
 }
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::nil (void)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void)
 {
   return TAO_IOR_Table_Impl::_nil ();
 }
 
 ::CORBA::Boolean
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::marshal (
-    const TAO_IOR_Table_Impl_ptr,
-    TAO_OutputCDR &)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr,
+                                                  TAO_OutputCDR &)
 {
   return false;
 }
@@ -56,7 +53,6 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 
 char *
 TAO_IOR_Table_Impl::find (const char *object_key)
-  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   // We don't want the lock held during locate, so make it go out
   // of scope before then.
@@ -70,7 +66,7 @@ TAO_IOR_Table_Impl::find (const char *object_key)
         return CORBA::string_dup (ior.c_str ());
       }
     if (CORBA::is_nil (this->locator_.in ()))
-      ACE_THROW_RETURN (IORTable::NotFound (), 0);
+      throw IORTable::NotFound ();
   }
 
   return this->locator_->locate (object_key);
@@ -78,7 +74,6 @@ TAO_IOR_Table_Impl::find (const char *object_key)
 
 void
 TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR)
-  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   if (this->map_.bind (object_key, IOR) != 0)
@@ -87,7 +82,6 @@ TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR)
 
 void
 TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->map_.rebind (object_key, IOR);
@@ -95,7 +89,6 @@ TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR)
 
 void
 TAO_IOR_Table_Impl::unbind (const char * object_key)
-  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   if (this->map_.unbind (object_key) != 0)
@@ -104,7 +97,6 @@ TAO_IOR_Table_Impl::unbind (const char * object_key)
 
 void
 TAO_IOR_Table_Impl::set_locator (IORTable::Locator_ptr locator)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->locator_ = IORTable::Locator::_duplicate (locator);
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index e6feaf6ea01..08d7eeb1b0d 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -37,60 +37,46 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IOR_Table_Impl;
 typedef TAO_IOR_Table_Impl *TAO_IOR_Table_Impl_ptr;
-typedef TAO_Objref_Var_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var;
-typedef TAO_Objref_Out_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out;
+typedef TAO_Objref_Var_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var;
+typedef TAO_Objref_Out_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out;
 
 class TAO_IOR_Table_Impl
   : public virtual IORTable::Table,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
-    static TAO_IOR_Table_Impl_ptr _nil (void)
-    {
-      return static_cast<TAO_IOR_Table_Impl_ptr> (0);
-    }
+  static TAO_IOR_Table_Impl_ptr
+  _nil (void)
+  {
+    return static_cast<TAO_IOR_Table_Impl_ptr> (0);
+  }
 
   /// Constructor
   TAO_IOR_Table_Impl (void);
 
   /// Find the object, using the locator if it is not on the table.
-  char *find (const char *object_key)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      IORTable::NotFound
-    ));
-
-    /**
-     * @name The IORTable::Table methods
-     *
-     * Please check the IORTable.pidl file for details.
-     */
-    //@{
-    virtual void bind (const char * object_key, const char * IOR)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::AlreadyBound
-      ));
-
-    virtual void rebind (const char * object_key, const char * IOR)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void unbind (const char * object_key)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ));
-
-    virtual void set_locator (IORTable::Locator_ptr the_locator)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    //@}
+  char *find (const char *object_key);
+
+  /**
+   * @name The IORTable::Table methods
+   *
+   * Please check the IORTable.pidl file for details.
+   */
+  //@{
+  virtual void bind (const char * object_key, const char * IOR);
+
+  virtual void rebind (const char * object_key, const char * IOR);
+
+  virtual void unbind (const char * object_key);
+
+  virtual void set_locator (IORTable::Locator_ptr the_locator);
+  //@}
 
 private:
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> Map;
+  typedef ACE_Hash_Map_Manager_Ex <ACE_CString, ACE_CString,
+                                   ACE_Hash <ACE_CString>,
+                                   ACE_Equal_To <ACE_CString>,
+                                   ACE_Null_Mutex> Map;
 
   /// The map
   Map map_;
@@ -106,23 +92,19 @@ private:
 namespace TAO
 {
   template<>
-  struct TAO_IORTable_Export Objref_Traits< TAO_IOR_Table_Impl>
+  struct TAO_IORTable_Export
+  Objref_Traits <TAO_IOR_Table_Impl>
   {
-    static TAO_IOR_Table_Impl_ptr duplicate (
-        TAO_IOR_Table_Impl_ptr
-      );
+    static TAO_IOR_Table_Impl_ptr duplicate (TAO_IOR_Table_Impl_ptr);
 
-    static void release (
-        TAO_IOR_Table_Impl_ptr
-      );
+    static void release (TAO_IOR_Table_Impl_ptr);
 
     static TAO_IOR_Table_Impl_ptr nil (void);
 
-    static ::CORBA::Boolean marshal (
-        const TAO_IOR_Table_Impl_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
+    static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p,
+                                     TAO_OutputCDR &cdr);
+  }
+  ;
 }
 
 
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index 4b46f57d614..eac61635d6d 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -94,14 +94,13 @@ TAO_Table_Adapter::check_close (int)
 int
 TAO_Table_Adapter::priority (void) const
 {
-  return 16; // @@
+  return static_cast<int> (TAO_DEFAULT_ADAPTER_REGISTRY_SIZE);
 }
 
 int
 TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              TAO_ServerRequest &,
                              CORBA::Object_out forward_to)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IOR_Table_Impl_var rootref;
   {
@@ -171,7 +170,7 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub)
     {
       found = this->find_object (key, forward_to.out ());
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
     }
 
@@ -190,7 +189,6 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub)
 CORBA::Long
 TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
                                 CORBA::Object_out forward_to)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
   TAO::ObjectKey::encode_sequence_to_string (object_key.out (), key);
@@ -199,7 +197,7 @@ TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
       CORBA::String_var ior = root_->find (object_key.in ());
       forward_to = this->orb_core_.orb ()->string_to_object (ior.in ());
     }
-  catch ( ::IORTable::NotFound&)
+  catch (const ::IORTable::NotFound&)
     {
       return 0;
     }
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 628b1a4d8ae..ffeafdb2a8c 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -49,8 +49,7 @@ public:
   virtual int priority (void) const;
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
-                        CORBA::Object_out foward_to)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Object_out foward_to);
 
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
@@ -64,8 +63,7 @@ private:
   /// Helper method to find an object bound in the table.
   /// @return 1 if found, 0 otherwise.
   CORBA::Long find_object (TAO::ObjectKey &key,
-                           CORBA::Object_out forward_to)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::Object_out forward_to);
 
   /// The ORB Core we belong to
   TAO_ORB_Core &orb_core_;
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 4dffe43fa50..8d2cdbd8289 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -21,7 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -59,9 +60,8 @@ public:
    * The call may raise the standard system exceptions (NO_MEMORY,
    * INV_OBJREF, etc.)
    */
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb)
+    = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 175e0b6a867..038a8c76223 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -27,8 +27,7 @@ namespace TAO
     }
 
     void
-    ImR_Client_Adapter_Impl::imr_notify_startup (
-      TAO_Root_POA* poa )
+    ImR_Client_Adapter_Impl::imr_notify_startup (TAO_Root_POA* poa )
     {
       CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
 
@@ -85,15 +84,12 @@ namespace TAO
       PortableServer::ObjectId_var id =
         root_poa->activate_object_i (this->server_object_,
                                      poa->server_priority (),
-                                     wait_occurred_restart_call_ignored
-                                    );
+                                     wait_occurred_restart_call_ignored);
 
-      CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  (), false
-                                                          );
+      CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  (), false);
 
       ImplementationRepository::ServerObject_var svr
-        = ImplementationRepository::ServerObject::_narrow (obj.in ()
-                                                          );
+        = ImplementationRepository::ServerObject::_narrow (obj.in ());
 
       if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
         {
@@ -128,14 +124,13 @@ namespace TAO
 
           imr_locator->server_is_running (poa->name().c_str (),
                                           partial_ior.c_str(),
-                                          svr.in()
-                                         );
+                                          svr.in());
         }
-      catch ( ::CORBA::SystemException&)
+      catch (const ::CORBA::SystemException&)
         {
           throw;
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
           throw ::CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
@@ -147,8 +142,7 @@ namespace TAO
     }
 
     void
-    ImR_Client_Adapter_Impl::imr_notify_shutdown (
-      TAO_Root_POA* poa )
+    ImR_Client_Adapter_Impl::imr_notify_shutdown (TAO_Root_POA* poa )
     {
       // Notify the Implementation Repository about shutting down.
       CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
@@ -173,10 +167,9 @@ namespace TAO
           ImplementationRepository::Administration_var imr_locator =
             ImplementationRepository::Administration::_narrow (imr.in ());
 
-          imr_locator->server_is_shutting_down (poa->name().c_str ()
-                                               );
+          imr_locator->server_is_shutting_down (poa->name().c_str ());
         }
-      catch ( ::CORBA::COMM_FAILURE&)
+      catch (const ::CORBA::COMM_FAILURE&)
         {
           // At the moment we call this during ORB shutdown and the ORB is
           // configured to drop replies during shutdown (it does by default in
@@ -184,13 +177,13 @@ namespace TAO
           if (TAO_debug_level > 0)
             ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n"));
         }
-      catch ( ::CORBA::TRANSIENT&)
+      catch (const ::CORBA::TRANSIENT&)
         {
           // Similarly, there are cases where we could get a TRANSIENT.
           if (TAO_debug_level > 0)
             ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n"));
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           ex._tao_print_exception (
             "ImR_Client_Adapter_Impl::imr_notify_shutdown()");
@@ -199,8 +192,7 @@ namespace TAO
 
       if (this->server_object_)
         {
-          PortableServer::POA_var poa =
-            this->server_object_->_default_POA ();
+          PortableServer::POA_var poa = this->server_object_->_default_POA ();
 
           TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ());
 
@@ -210,8 +202,7 @@ namespace TAO
             }
 
           PortableServer::ObjectId_var id =
-            root_poa->servant_to_id_i (this->server_object_
-                                      );
+            root_poa->servant_to_id_i (this->server_object_);
 
           root_poa->deactivate_object_i (id.in());
 
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index 711732af5aa..08fe8da3515 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -15,13 +15,11 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 
 void
 ServerObject_i::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerObject_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note : We want our child POAs to be able to unregister themselves from
   // the ImR, so we must destroy them before shutting down the orb.
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index f7b28b8af41..cd6d8191b7a 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -41,16 +41,13 @@ class TAO_IMR_Client_Export ServerObject_i
 {
 public:
   /// Constructor.
-  ServerObject_i (CORBA::ORB_ptr orb,
-                  PortableServer::POA_ptr poa);
+  ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void ping (void);
 
   /// Shutdown the server.
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   /// Returns the default POA for this servant.
   PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 6a226f7d062..8753897eb8f 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -13,7 +13,7 @@
 #include "tao/Collocation_Proxy_Broker.h"
 #include "tao/GIOP_Utils.h"
 #include "tao/TAOC.h"
-
+#include "tao/SystemException.h"
 #include "ace/Service_Config.h"
 
 #if !defined (__ACE_INLINE__)
@@ -35,12 +35,10 @@ namespace TAO
 
   void
   Invocation_Adapter::invoke (TAO::Exception_Data *ex_data,
-                              unsigned long ex_count
-                              )
+                              unsigned long ex_count)
   {
     // Should stub object be refcounted here?
-    TAO_Stub *stub =
-      this->get_stub ();
+    TAO_Stub *stub = this->get_stub ();
 
     TAO_Operation_Details op_details (this->operation_,
                                       this->op_len_,
@@ -50,15 +48,11 @@ namespace TAO
                                       ex_count,
                                       this->is_dii_request_);
 
-    this->invoke_i (stub,
-                    op_details
-                   );
+    this->invoke_i (stub, op_details);
   }
 
   void
-  Invocation_Adapter::invoke_i (TAO_Stub *stub,
-                                TAO_Operation_Details &details
-                                )
+  Invocation_Adapter::invoke_i (TAO_Stub *stub, TAO_Operation_Details &details)
   {
     // The invocation has got to be within the context of the
     // corresponding ORB's configuration. Otherwise things like
@@ -86,36 +80,30 @@ namespace TAO
         // the object reference also refers to a collocated object.
         if (cpb_ != 0 || effective_target->_servant () != 0)
           {
-            strat =
-              TAO_ORB_Core::collocation_strategy (effective_target.in ()
-                                                 );
+            strat = TAO_ORB_Core::collocation_strategy (effective_target.in ());
           }
 
-        if (strat == TAO_CS_REMOTE_STRATEGY ||
-            strat == TAO_CS_LAST)
+        if (strat == TAO_CS_REMOTE_STRATEGY || strat == TAO_CS_LAST)
           {
             ACE_Time_Value *max_wait_time = 0;
             status =
               this->invoke_remote_i (stub,
                                      details,
                                      effective_target,
-                                     max_wait_time
-                                    );
+                                     max_wait_time);
           }
         else
           {
             if (strat == TAO_CS_THRU_POA_STRATEGY)
               {
-                (void) this->set_response_flags (stub,
-                                                 details);
+                (void) this->set_response_flags (stub, details);
               }
 
             status =
               this->invoke_collocated_i (stub,
                                          details,
                                          effective_target,
-                                         strat
-                                        );
+                                         strat);
           }
 
         if (status == TAO_INVOKE_RESTART)
@@ -134,8 +122,7 @@ namespace TAO
   }
 
   bool
-  Invocation_Adapter::get_timeout (TAO_Stub *stub,
-                                   ACE_Time_Value &timeout)
+  Invocation_Adapter::get_timeout (TAO_Stub *stub, ACE_Time_Value &timeout)
   {
     bool has_timeout = false;
     this->target_->orb_core ()->call_timeout_hook (stub,
@@ -152,12 +139,11 @@ namespace TAO
       this->target_->_stubobj ();
 
     if (stub == 0)
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        stub);
+      throw ::CORBA::INTERNAL (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
 
     return stub;
   }
@@ -166,8 +152,7 @@ namespace TAO
   Invocation_Adapter::invoke_collocated_i (TAO_Stub *stub,
                                            TAO_Operation_Details &details,
                                            CORBA::Object_var &effective_target,
-                                           Collocation_Strategy strat
-                                           )
+                                           Collocation_Strategy strat)
   {
     // To make a collocated call we must have a collocated proxy broker, the
     // invoke_i() will make sure that we only come here when we have one
@@ -184,16 +169,12 @@ namespace TAO
                                     details,
                                     this->type_ == TAO_TWOWAY_INVOCATION);
 
-    status =
-      coll_inv.invoke (this->cpb_,
-                       strat
-                      );
+    status = coll_inv.invoke (this->cpb_, strat);
 
     if (status == TAO_INVOKE_RESTART &&
         coll_inv.is_forwarded ())
       {
-        effective_target =
-            coll_inv.steal_forwarded_reference ();
+        effective_target = coll_inv.steal_forwarded_reference ();
 
 #if TAO_HAS_INTERCEPTORS == 1
         const bool is_permanent_forward =
@@ -204,8 +185,7 @@ namespace TAO
 
         (void) this->object_forwarded (effective_target,
                                        stub,
-                                       is_permanent_forward
-                                      );
+                                       is_permanent_forward);
       }
 
     return status;
@@ -251,19 +231,15 @@ namespace TAO
   Invocation_Adapter::invoke_remote_i (TAO_Stub *stub,
                                        TAO_Operation_Details &details,
                                        CORBA::Object_var &effective_target,
-                                       ACE_Time_Value *&max_wait_time
-                                       )
+                                       ACE_Time_Value *&max_wait_time)
   {
     ACE_Time_Value tmp_wait_time;
-    bool is_timeout  =
-      this->get_timeout (stub,
-                         tmp_wait_time);
+    bool const is_timeout = this->get_timeout (stub, tmp_wait_time);
 
     if (is_timeout)
       max_wait_time = &tmp_wait_time;
 
-    (void) this->set_response_flags (stub,
-                                     details);
+    (void) this->set_response_flags (stub, details);
 
     CORBA::Octet rflags = details.response_flags ();
     bool block_connect =
@@ -278,8 +254,7 @@ namespace TAO
       stub,
       block_connect);
 
-    resolver.resolve (max_wait_time
-                     );
+    resolver.resolve (max_wait_time);
 
     if (TAO_debug_level)
       {
@@ -298,16 +273,14 @@ namespace TAO
         return this->invoke_oneway (details,
                                     effective_target,
                                     resolver,
-                                    max_wait_time
-                                   );
+                                    max_wait_time);
       }
     else if (this->type_ == TAO_TWOWAY_INVOCATION)
       {
         return this->invoke_twoway (details,
                                     effective_target,
                                     resolver,
-                                    max_wait_time
-                                   );
+                                    max_wait_time);
       }
 
     return TAO_INVOKE_FAILURE;
@@ -317,34 +290,27 @@ namespace TAO
   Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     )
+                                     ACE_Time_Value *&max_wait_time)
   {
     // Simple sanity check
     if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION ||
         this->type_ != TAO_TWOWAY_INVOCATION)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::INTERNAL (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
 
-    TAO::Synch_Twoway_Invocation synch (this->target_,
-                                        r,
-                                        details);
+    TAO::Synch_Twoway_Invocation synch (this->target_,  r, details);
 
-    Invocation_Status const status =
-      synch.remote_twoway (max_wait_time
-                          );
+    Invocation_Status const status = synch.remote_twoway (max_wait_time);
 
     if (status == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
 
 #if TAO_HAS_INTERCEPTORS == 1
         const bool is_permanent_forward =
@@ -355,8 +321,7 @@ namespace TAO
 
         this->object_forwarded (effective_target,
                                 r.stub (),
-                                is_permanent_forward
-                               );
+                                is_permanent_forward);
       }
 
     return status;
@@ -366,22 +331,15 @@ namespace TAO
   Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     )
+                                     ACE_Time_Value *&max_wait_time)
   {
-    TAO::Synch_Oneway_Invocation synch (this->target_,
-                                        r,
-                                        details);
+    TAO::Synch_Oneway_Invocation synch (this->target_, r, details);
 
-    Invocation_Status const s =
-      synch.remote_oneway (max_wait_time
-                          );
+    Invocation_Status const s = synch.remote_oneway (max_wait_time);
 
-    if (s == TAO_INVOKE_RESTART &&
-        synch.is_forwarded ())
+    if (s == TAO_INVOKE_RESTART && synch.is_forwarded ())
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
 
 #if TAO_HAS_INTERCEPTORS == 1
         const bool is_permanent_forward =
@@ -391,8 +349,7 @@ namespace TAO
 #endif
         this->object_forwarded (effective_target,
                                 r.stub (),
-                                is_permanent_forward
-                               );
+                                is_permanent_forward);
       }
 
     return s;
@@ -401,13 +358,11 @@ namespace TAO
   void
   Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
                                         TAO_Stub *stub,
-                                        CORBA::Boolean permanent_forward
-                                        )
+                                        CORBA::Boolean permanent_forward)
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
-    TAO_Stub *stubobj =
-      effective_target->_stubobj ();
+    TAO_Stub *stubobj = effective_target->_stubobj ();
 
     if (stubobj == 0)
       throw ::CORBA::INTERNAL (
@@ -416,7 +371,6 @@ namespace TAO
           errno),
         CORBA::COMPLETED_NO);
 
-
     // Reset the profile in the stubs
     stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index c6da4157d14..8897da1dd84 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -20,9 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// @NOTE: Do not include any headers unessarily here.
-#include "ace/CORBA_macros.h"
-
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Invocation_Utils.h"
 #include "tao/Collocation_Strategy.h"
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 51741319030..48a0a6f557a 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -10,7 +10,7 @@
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/PortableInterceptorC.h"
 # include "tao/ClientRequestInterceptor_Adapter_Factory.h"
-#endif /* TAO_HAS_INTERCEPTORS == 1*/
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Invocation_Base.inl"
@@ -24,6 +24,13 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+namespace
+{
+  // Exception used to represent non-CORBA exceptions.  A global
+  // instance is used since it will never be modified.
+  CORBA::UNKNOWN /* const */ unknown_exception;
+}
+
 namespace TAO
 {
   Invocation_Base::Invocation_Base (CORBA::Object_ptr ot,
@@ -31,7 +38,7 @@ namespace TAO
                                     TAO_Stub *stub,
                                     TAO_Operation_Details &details,
                                     bool response_expected,
-                                    bool request_is_remote)
+                                    bool TAO_INTERCEPTOR (request_is_remote))
     : details_ (details)
     , forwarded_to_ (0)
     , response_expected_ (response_expected)
@@ -45,18 +52,15 @@ namespace TAO
     , invoke_status_ (TAO_INVOKE_START)
     , caught_exception_ (0)
     , is_remote_request_ (request_is_remote)
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
   {
-#if TAO_HAS_INTERCEPTORS == 0
-    ACE_UNUSED_ARG (request_is_remote);
-#endif /*TAO_HAS_INTERCEPTORS == 0*/
   }
 
   Invocation_Base::~Invocation_Base (void)
   {
 #if TAO_HAS_INTERCEPTORS == 1
     adapter_ = 0;
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
   }
 
   void
@@ -81,21 +85,22 @@ namespace TAO
 
   Invocation_Status
   Invocation_Base::send_request_interception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
         try
           {
-            this->adapter_->send_request (*this
-                                         );
+            // This is a begin interception point
+            this->adapter_->send_request (*this);
           }
         catch ( ::CORBA::Exception& ex)
           {
-            (void) this->handle_any_exception (&ex
-                                              );
-
-            // This is a begin interception point
+            (void) this->handle_any_exception (&ex);
+            throw;
+          }
+        catch (...)
+          {
+            (void) this->handle_all_exception ();
             throw;
           }
 
@@ -109,7 +114,6 @@ namespace TAO
 
   Invocation_Status
   Invocation_Base::receive_reply_interception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
@@ -119,8 +123,12 @@ namespace TAO
           }
         catch ( ::CORBA::Exception& ex)
           {
-            (void) this->handle_any_exception (&ex );
-
+            (void) this->handle_any_exception (&ex);
+            throw;
+          }
+        catch (...)
+          {
+            (void) this->handle_all_exception ();
             throw;
           }
 
@@ -138,7 +146,6 @@ namespace TAO
 
   Invocation_Status
   Invocation_Base::receive_other_interception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
@@ -149,7 +156,11 @@ namespace TAO
         catch ( ::CORBA::Exception& ex)
           {
             (void) this->handle_any_exception (&ex);
-
+            throw;
+          }
+        catch (...)
+          {
+            (void) this->handle_all_exception ();
             throw;
           }
 
@@ -161,8 +172,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_any_exception (CORBA::Exception *ex
-                                         )
+  Invocation_Base::handle_any_exception (CORBA::Exception *ex)
   {
     this->exception (ex);
 
@@ -171,8 +181,7 @@ namespace TAO
 
     if (adapter_ != 0)
       {
-        this->adapter_->receive_exception (*this
-                                          );
+        this->adapter_->receive_exception (*this);
 
         if (this->forwarded_to_.in ())
           {
@@ -190,19 +199,16 @@ namespace TAO
   PortableInterceptor::ReplyStatus
   Invocation_Base::handle_all_exception (void)
   {
-    CORBA::UNKNOWN ex;
-    this->exception (&ex);
+    this->exception (&unknown_exception);
 
     PortableInterceptor::ReplyStatus status =
       PortableInterceptor::SYSTEM_EXCEPTION;
 
     if (adapter_ != 0)
       {
-        this->adapter_->receive_exception (*this
-                                          );
+        this->adapter_->receive_exception (*this);
 
-        status =
-          this->adapter_->reply_status (*this);
+        status = this->adapter_->reply_status (*this);
       }
 
     return status;
@@ -232,7 +238,7 @@ namespace TAO
         return -1;
       }
   }
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 27f204854e9..24e383404f4 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -198,24 +198,20 @@ namespace TAO
   protected:
     /// Helper method to invoke send_request interception call to all
     /// the registered interceptors.
-    Invocation_Status send_request_interception (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    Invocation_Status send_request_interception (void);
 
     /// Helper method to invoke receive_reply interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_reply_interception (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    Invocation_Status receive_reply_interception (void);
 
     /// Helper method to invoke receive_other interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_other_interception (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    Invocation_Status receive_other_interception (void);
 
     /// Helper methods to handle interception calls when exceptions
     /// are thrown by the PortableInterceptor.
     PortableInterceptor::ReplyStatus
-        handle_any_exception (CORBA::Exception *e
-                             );
+        handle_any_exception (CORBA::Exception * e);
 
     PortableInterceptor::ReplyStatus
         handle_all_exception (void);
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 3a6981e5a2b..c47fe1a5fa1 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -28,8 +28,7 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 
 void
 TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                                ACE_Time_Value *max_wait_time
-                                                )
+                                                ACE_Time_Value *max_wait_time)
 {
   do
     {
@@ -45,18 +44,12 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
           if (r->profile ()->endpoint_count () > 1 &&
               r->use_parallel_connect())
             {
-
-              TAO_Endpoint *ep =
-                r->profile ()->endpoint ();
+              TAO_Endpoint *ep = r->profile ()->endpoint ();
 
               TAO_Base_Transport_Property desc (ep);
-              bool success =
-                r->try_parallel_connect (&desc,
-                                         max_wait_time
-                                        );
 
               // Check if the connect has completed.
-              if (success)
+              if (r->try_parallel_connect (&desc, max_wait_time))
                 return;
               // The default implementation of try_parallel_connect returns
               // a not supported errno. In this case, allow the ordinary
@@ -72,13 +65,9 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
                ep = r->profile ()->next_filtered_endpoint (ep))
             {
               TAO_Base_Transport_Property desc (ep);
-              bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                               );
 
               // Check if the connect has completed.
-              if (retval)
+              if (r->try_connect (&desc, max_wait_time))
                 return;
             }
 
@@ -86,7 +75,6 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
     }
   while (r->stub ()->next_profile_retry () != 0);
 
-
   // If we get here, we completely failed to find an endpoint selector
   // that we know how to use, so throw an exception.
   throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index d7142cd86d3..baff9eddef3 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -26,8 +26,6 @@
 
 #include /**/ "tao/Versioned_Namespace.h"
 
-#include "ace/CORBA_macros.h"
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -68,8 +66,7 @@ public:
 
   /// Select the endpoint and set @a r's @c profile_
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ) = 0;
+                                ACE_Time_Value *val) = 0;
 
 };
 
@@ -96,8 +93,7 @@ public:
   virtual ~TAO_Default_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                               );
+                                ACE_Time_Value *val);
 
 };
 
diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h
index d63994908f0..d719a87c7e1 100644
--- a/TAO/tao/Invocation_Utils.h
+++ b/TAO/tao/Invocation_Utils.h
@@ -67,7 +67,8 @@ namespace TAO
     TAO_ASYNCHRONOUS_POLLER_INVOCATION,
     /// Types of DII
     TAO_DII_INVOCATION,
-    TAO_DII_DEFERRED_INVOCATION
+    TAO_DII_DEFERRED_INVOCATION,
+    TAO_DII_ASYNCH_INVOCATION
   };
 }
 
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index bc401286334..a52852f0529 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -30,21 +30,19 @@ TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
 {
   if (timeout != 0)
     {
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   *timeout);
+      options.set (ACE_Synch_Options::USE_REACTOR, *timeout);
     }
   else
     {
       // Making it sure it is blocking.
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   ACE_Time_Value::zero);
+      options.set (ACE_Synch_Options::USE_REACTOR, ACE_Time_Value::zero);
     }
 }
 
 int
 TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                                  TAO_Transport *transport,
-                               ACE_Time_Value *max_wait_time)
+                                 ACE_Time_Value *max_wait_time)
 {
   if (transport == 0)
     return -1;
@@ -53,9 +51,7 @@ TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
     this->orb_core_->leader_follower ();
 
   int result =
-    leader_follower.wait_for_event (ev,
-                                    transport,
-                                    max_wait_time);
+    leader_follower.wait_for_event (ev, transport, max_wait_time);
 
   if (ev->error_detected () && result != -1)
     result = -1;
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 35e6e514046..515df085157 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -50,13 +50,10 @@ public:
    * Concrete implementation for this class. Please see
    * Connect_Strategy.h for details
    */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
+  virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt);
 
 protected:
-  virtual int wait_i (TAO_LF_Event *ev,
-                      TAO_Transport *t,
-                    ACE_Time_Value *val);
+  virtual int wait_i (TAO_LF_Event *ev, TAO_Transport *t, ACE_Time_Value *val);
 
 };
 
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index cc69d6fcea3..f40ccdb1317 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -26,8 +26,7 @@ TAO_LF_Event::~TAO_LF_Event (void)
 }
 
 void
-TAO_LF_Event::state_changed (int new_state,
-                             TAO_Leader_Follower &lf)
+TAO_LF_Event::state_changed (int new_state, TAO_Leader_Follower &lf)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lf.lock ());
 
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 5344efdf36f..abad06792e1 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -107,8 +107,7 @@ public:
    */
   /// Accessor to change the state. The state isnt changed unless
   /// certain conditions are satisfied.
-  void state_changed (int new_state,
-                      TAO_Leader_Follower &lf);
+  void state_changed (int new_state, TAO_Leader_Follower &lf);
 
   /// Return 1 if the condition was satisfied successfully, 0 if it
   /// has not
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index f6dcac517ef..c2b8ff51498 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Event_Binder
 {
 public:
   /// Constructor
-  TAO_LF_Event_Binder (TAO_LF_Event *event,
-                       TAO_LF_Follower *folloer);
+  TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *folloer);
 
   /// Destructor
   ~TAO_LF_Event_Binder (void);
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
index f1161f6b14f..341c5d1b6d4 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Follower_Auto_Adder
 {
 public:
   /// Constructor
-  TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &,
-                              TAO_LF_Follower *follower);
+  TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, TAO_LF_Follower *follower);
 
   /// Destructor
   ~TAO_LF_Follower_Auto_Adder (void);
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index a3dfb19996e..c39e2f91191 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -44,8 +44,7 @@ public:
   virtual void set_upcall_thread (TAO_Leader_Follower &);
   virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
                                      TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
+  virtual void reset_event_loop_thread (int call_reset, TAO_Leader_Follower &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index 220f01e1cc8..09fc4819ed8 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -59,7 +59,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (
             return -1;
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index d60771f3915..1801651cc72 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -60,7 +60,6 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum)
 
 CORBA::Boolean
 CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj)
-  ACE_THROW_SPEC (())
 {
   return (other_obj == this) ? true : false;
 }
@@ -75,7 +74,7 @@ CORBA::LocalObject::_key (void)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) Cannot get _key from a LocalObject!\n")));
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -118,39 +117,31 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr,
 CORBA::Request_ptr
 CORBA::LocalObject::_request (const char *)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
 }
 
 CORBA::Object_ptr
 CORBA::LocalObject::_get_component (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 char *
 CORBA::LocalObject::_repository_id (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 CORBA::InterfaceDef_ptr
 CORBA::LocalObject::_get_interface (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 CORBA::ImplementationDef_ptr
 CORBA::LocalObject::_get_implementation (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -160,40 +151,32 @@ CORBA::LocalObject::_get_implementation (void)
 CORBA::Policy_ptr
 CORBA::LocalObject::_get_policy (CORBA::PolicyType)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 CORBA::Policy_ptr
 CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Object_ptr
 CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
                                            CORBA::SetOverrideType)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 CORBA::PolicyList *
 CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 CORBA::Boolean
 CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    false);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -201,9 +184,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out)
 CORBA::ORB_ptr
 CORBA::LocalObject::_get_orb (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index bc700bac3c3..74edf65f639 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -140,8 +140,7 @@ namespace CORBA
      * different ORB protocols are in use) there is no default
      * implementation.
      */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj)
-      ACE_THROW_SPEC (());
+    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj);
 
     // = Reference count managment.
     /// Increment the reference count.
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 6095fdcd4e3..6611730e9a8 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -8,6 +8,7 @@
 #include "tao/GIOP_Utils.h"
 #include "tao/Profile.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 #include "ace/Countdown_Time.h"
 
@@ -32,7 +33,6 @@ namespace TAO
 
   Invocation_Status
   LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
 
@@ -51,33 +51,23 @@ namespace TAO
         // to call the interceptors in this case?
         this->resolver_.transport ()->close_connection ();
 
-        ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
-                                           CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
       }
 
     TAO_Target_Specification tspec;
     this->init_target_spec (tspec);
 
-    TAO_Transport *transport =
-      this->resolver_.transport ();
+    TAO_Transport *transport = this->resolver_.transport ();
 
     TAO_OutputCDR &cdr = transport->out_stream ();
 
-    int const retval =
-      transport->generate_locate_request (tspec,
-                                          this->details_,
-                                          cdr);
-
-    if (retval == -1)
+    if (transport->generate_locate_request (tspec, this->details_, cdr) == -1)
       return TAO_INVOKE_FAILURE;
 
     countdown.update ();
 
     Invocation_Status s =
-      this->send_message (cdr,
-                          TAO_Transport::TAO_TWOWAY_REQUEST,
-                          max_wait_time);
+      this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time);
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -90,10 +80,7 @@ namespace TAO
     if (this->resolver_.transport ()->idle_after_send ())
       this->resolver_.transport_released ();
 
-    s =
-      this->wait_for_reply (max_wait_time,
-                            rd,
-                            dispatch_guard);
+    s = this->wait_for_reply (max_wait_time, rd, dispatch_guard);
 
     s = this->check_reply (rd);
 
@@ -109,8 +96,7 @@ namespace TAO
   Invocation_Status
   LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd)
   {
-    TAO_InputCDR &cdr =
-      rd.reply_cdr ();
+    TAO_InputCDR &cdr = rd.reply_cdr ();
 
     // Set the translators
     this->resolver_.transport ()->assign_translators (&cdr, 0);
@@ -120,13 +106,10 @@ namespace TAO
       case TAO_GIOP_OBJECT_HERE:
         break;
       case TAO_GIOP_UNKNOWN_OBJECT:
-        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
-                                                   CORBA::COMPLETED_YES),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::OBJECT_NOT_EXIST (TAO::VMCID, CORBA::COMPLETED_YES);
       case TAO_GIOP_OBJECT_FORWARD:
       case TAO_GIOP_OBJECT_FORWARD_PERM:
-        return this->location_forward (cdr
-                                      );
+        return this->location_forward (cdr);
 
       case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
         {
@@ -137,16 +120,12 @@ namespace TAO
             {
               // Could not demarshal the exception id, raise a local
               // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                                CORBA::COMPLETED_MAYBE),
-                                TAO_INVOKE_SYSTEM_EXCEPTION);
+              throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE);
             }
 
           // This kind of exception shouldn't happen with locate requests,
           // but if it does, we turn it into a CORBA::UNKNOWN exception.
-          ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
-                                            CORBA::COMPLETED_YES),
-                            TAO_INVOKE_SYSTEM_EXCEPTION);
+          throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES);
         }
       case TAO_GIOP_LOC_NEEDS_ADDRESSING_MODE:
         {
@@ -159,9 +138,7 @@ namespace TAO
             {
               // Could not demarshal the addressing disposition, raise a local
               // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                                CORBA::COMPLETED_MAYBE),
-                                TAO_INVOKE_SUCCESS);
+              throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE);
             }
 
           // Now set this addressing mode in the profile, so that
diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h
index d1aaebf63da..5605c65ad04 100644
--- a/TAO/tao/LocateRequest_Invocation.h
+++ b/TAO/tao/LocateRequest_Invocation.h
@@ -27,11 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Synch_Reply_Dispatcher;
 
-namespace CORBA
-{
-  class SystemException;
-}
-
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -65,8 +60,7 @@ namespace TAO
         TAO_Operation_Details &detail);
 
     /// Start the invocation.
-    Invocation_Status invoke (ACE_Time_Value *max_wait_time)
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status invoke (ACE_Time_Value *max_wait_time);
 
   private:
     /// Helper to check the reply status
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index d805a80c5e3..c37d24c319b 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -6,7 +6,7 @@
 #include "tao/Transport_Mux_Strategy.h"
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
-
+#include "tao/SystemException.h"
 #include "ace/Service_Config.h"
 
 ACE_RCSID (tao,
@@ -48,8 +48,7 @@ namespace TAO
     ACE_Time_Value tmp_wait_time;
     ACE_Time_Value *max_wait_time = 0;
 
-    bool const is_timeout  =
-      this->get_timeout (tmp_wait_time);
+    bool const is_timeout = this->get_timeout (tmp_wait_time);
 
     if (is_timeout)
       max_wait_time = &tmp_wait_time;
@@ -65,35 +64,25 @@ namespace TAO
 
         try
           {
-            resolver.init_inconsistent_policies (
-                );
+            resolver.init_inconsistent_policies ();
 
-            resolver.resolve (max_wait_time
-                             );
+            resolver.resolve (max_wait_time);
 
             // Dummy operation details that is used to instantiate the
             // LocateRequest class.
-            TAO_Operation_Details op (0,
-                                      0);
+            TAO_Operation_Details op (0, 0);
 
             op.request_id (resolver.transport ()->tms ()->request_id ());
-            TAO::LocateRequest_Invocation synch (this->target_,
-                                                 resolver,
-                                                 op);
+            TAO::LocateRequest_Invocation synch (this->target_, resolver, op);
 
-            s = synch.invoke (max_wait_time
-                             );
+            s = synch.invoke (max_wait_time);
           }
-        catch ( ::CORBA::INV_POLICY&)
+        catch (const ::CORBA::INV_POLICY&)
           {
             this->list_ =
               resolver.steal_inconsistent_policies ();
             throw;
           }
-        catch ( ::CORBA::Exception&)
-          {
-            throw;
-          }
       }
 
     return;
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index f0d092ad31b..0e653657f4c 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -53,8 +53,7 @@ namespace TAO
   class TAO_Export LocateRequest_Invocation_Adapter
   {
   public:
-    LocateRequest_Invocation_Adapter (
-        CORBA::Object_ptr target);
+    LocateRequest_Invocation_Adapter (CORBA::Object_ptr target);
 
     /// Start the invocation on the target
     void invoke (void);
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 2a8c88be7b7..bdc3a590e22 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -37,11 +37,9 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 }
 
 CORBA::Object_ptr
-TAO_MCAST_Parser::parse_string (const char *ior,
-                                CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_MCAST_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
 {
-  const char *mcast_name =
+  char const * const mcast_name =
     ior + sizeof (::mcast_prefix) + 1;
 
   assign_to_variables (mcast_name);
@@ -50,40 +48,29 @@ TAO_MCAST_Parser::parse_string (const char *ior,
    * Now that we got the global variables.
    * we can invoke multicast_to_service and multicast_query
    */
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-
-  CORBA::UShort const port =
-    (CORBA::UShort) ACE_OS::atoi (this->mcast_port_.in ());
-
   ACE_Time_Value *timeout = orb->get_timeout ();
 
-  object = multicast_to_service (service_name_.in (),
-                                 port,
-                                 this->mcast_address_.in (),
-                                 this->mcast_ttl_.in (),
-                                 this->mcast_nic_.in (),
-                                 orb,
-                                 timeout);
-
-  return object;
+  return
+    this->multicast_to_service (service_name_.in (),
+                                this->mcast_port_,
+                                this->mcast_address_.in (),
+                                this->mcast_ttl_,
+                                this->mcast_nic_.in (),
+                                orb,
+                                timeout);
 }
 
 CORBA::Object_ptr
 TAO_MCAST_Parser::multicast_to_service (const char *service_name,
-                                        u_short port,
+                                        unsigned short port,
                                         const char *mcast_address,
-                                        const char *mcast_ttl,
+                                        int mcast_ttl,
                                         const char *mcast_nic,
                                         CORBA::ORB_ptr orb,
                                         ACE_Time_Value *timeout)
 {
-  char buf[2048];
-  char *ior = buf;
-
-  CORBA::String_var cleaner;
-
-  CORBA::Object_var return_value =
-    CORBA::Object::_nil ();
+  char buf[TAO_DEFAULT_IOR_SIZE];
+  char * ior = buf;
 
   // Use UDP multicast to locate the  service.
   int const result = this->multicast_query (ior,
@@ -95,13 +82,16 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
                                             timeout,
                                             orb);
 
-  // If the IOR didn't fit into <buf>, memory for it was dynamically
-  // allocated - make sure it gets deallocated.
-  if (ior != buf)
-    cleaner = ior;
+  CORBA::Object_var return_value;
 
   if (result == 0)
     {
+      CORBA::String_var cleaner;
+      // If the IOR didn't fit into <buf>, memory for it was dynamically
+      // allocated - make sure it gets deallocated.
+      if (ior != buf)
+        cleaner = ior;
+
       // Convert IOR to an object reference.
       return_value =
         orb->string_to_object (ior);
@@ -112,11 +102,11 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
 }
 
 int
-TAO_MCAST_Parser::multicast_query (char *&buf,
+TAO_MCAST_Parser::multicast_query (char* & buf,
                                    const char *service_name,
-                                   u_short port,
+                                   unsigned short port,
                                    const char *mcast_address,
-                                   const char *mcast_ttl,
+                                   int mcast_ttl,
                                    const char *mcast_nic,
                                    ACE_Time_Value *timeout,
                                    CORBA::ORB_ptr orb)
@@ -187,7 +177,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
                          multicast_addr.get_type ());
 
           // Set TTL
-          int mcast_ttl_optval = ACE_OS::atoi (mcast_ttl);
+          int mcast_ttl_optval = mcast_ttl;
 
 #if defined (ACE_HAS_IPV6)
           if (multicast_addr.get_type () == AF_INET6)
@@ -295,7 +285,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
                       // Allocate more space for the ior if we don't
                       // have enough.
                       ior_len = (CORBA::Short) ACE_NTOHS (ior_len);
-                      if (ior_len > TAO_DEFAULT_IOR_SIZE)
+                      if (ior_len >= TAO_DEFAULT_IOR_SIZE)
                         {
                           buf = CORBA::string_alloc (ior_len);
                           if (buf == 0)
@@ -354,14 +344,16 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
 }
 
 void
-TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
+TAO_MCAST_Parser::assign_to_variables (char const * mcast_name)
 {
   /*
    * The format now is "multicast_address:port:nicaddress:ttl/object_key"
    */
   ACE_CString mcast_name_cstring (mcast_name);
 
-  ssize_t pos_colon1 = mcast_name_cstring.find (':', 0);
+  ACE_CString::size_type pos_colon1 =
+    mcast_name_cstring.find (':', 0);
+
 #if defined (ACE_HAS_IPV6)
   // IPv6 numeric address in host string?
   bool ipv6_in_host = false;
@@ -372,7 +364,8 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
     {
       // In this case we have to find the end of the numeric address and
       // start looking for the port separator from there.
-      int cp_pos = mcast_name_cstring.find (']', 0);
+      ACE_CString::size_type const cp_pos =
+        mcast_name_cstring.find (']', 0);
       if (cp_pos == 0)
         {
           // No valid IPv6 address specified.
@@ -399,9 +392,9 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
   if (pos_colon1 == 0)
     {
 #if defined (ACE_HAS_IPV6)
-      const char *default_addr = ACE_DEFAULT_MULTICASTV6_ADDR;
+      const char default_addr[] = ACE_DEFAULT_MULTICASTV6_ADDR;
 #else /* ACE_HAS_IPV6 */
-      const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
+      const char default_addr[] = ACE_DEFAULT_MULTICAST_ADDR;
 #endif  /* !ACE_HAS_IPV6 */
       this->mcast_address_ = default_addr;
     }
@@ -423,45 +416,37 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
                                   mcast_name_cstring.length() -
                                   pos_colon1);
 
-  ssize_t pos_colon2 = mcast_name_cstring.find (':', 0);
+  ACE_CString::size_type const pos_colon2 =
+    mcast_name_cstring.find (':', 0);
 
   if (pos_colon2 == 0)
     {
-      /*
-       * If the port is not specified, use the default.
-       * The default multicast port is the same as the default port
-       * no. for Naming_Service, for now. But for other services,
-       * check and modify the default values as needed.
-       */
-      char default_port[33];
-
-      int trial_port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-
       if (mcast_name_cstring.find ("InterfaceRepository") !=
           ACE_CString::npos)
         {
-          trial_port = TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT;
+          this->mcast_port_ =
+            TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT;
         }
       else if (mcast_name_cstring.find ("ImplRepoService") !=
                ACE_CString::npos)
         {
-           trial_port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
+          this->mcast_port_ =
+            TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
         }
       else if (mcast_name_cstring.find ("TradingService") !=
                ACE_CString::npos)
         {
-           trial_port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
+          this->mcast_port_ = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
         }
-
-
-      ACE_OS::itoa (trial_port, default_port, 10);
-
-      this->mcast_port_ = (const char *) default_port;
     }
   else
     {
-      this->mcast_port_ = mcast_name_cstring.substring (0,
-                                                        pos_colon2).c_str ();
+      int const the_port =
+        ACE_OS::atoi (mcast_name_cstring.substring (0,
+                                                    pos_colon2).c_str ());
+
+      if (the_port > 0 && the_port < 0xffffL)
+        this->mcast_port_ = the_port;
     }
 
   mcast_name_cstring =
@@ -469,7 +454,7 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
                                   mcast_name_cstring.length() - pos_colon2);
 
 
-  ssize_t pos_colon3 = mcast_name_cstring.find (':', 0);
+  ACE_CString::size_type const pos_colon3 = mcast_name_cstring.find (':', 0);
 
   this->mcast_nic_ =
     mcast_name_cstring.substring (0,
@@ -479,28 +464,26 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
     mcast_name_cstring.substring (pos_colon3 + 1,
                                   mcast_name_cstring.length() - pos_colon3);
 
-  ssize_t pos_colon4 = mcast_name_cstring.find ('/', 0);
+  ACE_CString::size_type const pos_colon4 =
+    mcast_name_cstring.find ('/', 0);
 
-  if (pos_colon4 == 0)
+  if (pos_colon4 != 0)
     {
-      // And, the default TTL to be 1
-      const char *default_ttl = "1";
-      this->mcast_ttl_ = default_ttl;
-    }
-  else
-    {
-      this->mcast_ttl_ =
-        mcast_name_cstring.substring (0,
-                                      pos_colon4).c_str ();
+      // Change TTL to non-default value.
+      int const the_ttl =
+        ACE_OS::atoi (mcast_name_cstring.substring (0, pos_colon4).c_str ());
+
+      if (the_ttl > 0 && the_ttl <= 255)  // Valid TTLs: (0, 255]
+        this->mcast_ttl_ = the_ttl;
     }
+
   mcast_name_cstring =
     mcast_name_cstring.substring (pos_colon4,
                                   mcast_name_cstring.length() - pos_colon4);
 
   this->service_name_ =
     mcast_name_cstring.substring (1,
-                                  mcast_name_cstring.length()
-                                  -1).c_str ();
+                                  mcast_name_cstring.length() - 1).c_str ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index 35c8f170ad7..d3d8f5b2fc1 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -51,38 +51,47 @@ public:
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          CORBA::ORB_ptr orb);
 
 private:
 
   CORBA::Object_ptr multicast_to_service (const char *service_name,
-                                          CORBA::UShort port,
+                                          unsigned short port,
                                           const char *mcast_address,
-                                          const char *mcast_ttl,
+                                          int mcast_ttl,
                                           const char *mcast_nic,
                                           CORBA::ORB_ptr orb,
                                           ACE_Time_Value *timeout);
 
   int multicast_query (char *&buf,
                        const char *service_name,
-                       u_short port,
+                       unsigned short port,
                        const char *mcast_address,
-                       const char *mcast_ttl,
+                       int mcast_ttl,
                        const char *mcast_nic,
                        ACE_Time_Value *timeout,
                        CORBA::ORB_ptr orb);
 
   /* Simple method to assign values to the global members:
      mcast_address_, mcast_port_, mcast_nic_, mcast_ttl_ */
-  void assign_to_variables (const char * &mcast_name_ptr);
+  void assign_to_variables (char const * mcast_name_ptr);
+
+private:
 
-  // Global private variables
   CORBA::String_var mcast_address_;
-  CORBA::String_var mcast_port_;
+
+  /// Default multicast port (currently Name Service mcast port).
+  unsigned short    mcast_port_;
+
+  /// Multicast network interface card.
   CORBA::String_var mcast_nic_;
-  CORBA::String_var mcast_ttl_;
+
+  /// Default time-to-live (default is 1).
+  int               mcast_ttl_;
+
+  /// Multicast service name
   CORBA::String_var service_name_;
+
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MCAST_Parser.inl b/TAO/tao/MCAST_Parser.inl
index fc19f658c44..afa7790eb1a 100644
--- a/TAO/tao/MCAST_Parser.inl
+++ b/TAO/tao/MCAST_Parser.inl
@@ -2,10 +2,17 @@
 //
 // $Id$
 
+#include "tao/default_ports.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_MCAST_Parser::TAO_MCAST_Parser (void)
+  : mcast_address_ ()
+  , mcast_port_ (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
+  , mcast_nic_ ()
+  , mcast_ttl_ (1)
+  , service_name_ ()
 {
 }
 
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 221ca7cfeaf..352ffc47871 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            MProfile,
@@ -32,7 +33,7 @@ TAO_MProfile::~TAO_MProfile (void)
               CORBA::Policy_ptr policy = (*this->policy_list_)[i];
               policy->destroy ();
             }
-          catch ( ::CORBA::Exception&)
+          catch (const ::CORBA::Exception&)
             {
               // Ignore all exceptions to allow other policies to be
               // destroyed.
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 475897559e5..94021756257 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -764,7 +764,6 @@ libTAO_la_SOURCES = \
   DLL_Parser.cpp \
   Default_Collocation_Resolver.cpp \
   Default_Endpoint_Selector_Factory.cpp \
-  Default_Protocols_Hooks.cpp \
   Default_Stub_Factory.cpp \
   Default_Thread_Lane_Resources_Manager.cpp \
   DomainC.cpp \
@@ -844,6 +843,7 @@ libTAO_la_SOURCES = \
   Messaging_SyncScopeC.cpp \
   Muxed_TMS.cpp \
   NVList_Adapter.cpp \
+  Network_Priority_Protocols_Hooks.cpp \
   New_Leader_Generator.cpp \
   Null_Fragmentation_Strategy.cpp \
   ORB.cpp \
@@ -1065,7 +1065,6 @@ nobase_include_HEADERS = \
   DLL_Parser.h \
   Default_Collocation_Resolver.h \
   Default_Endpoint_Selector_Factory.h \
-  Default_Protocols_Hooks.h \
   Default_Stub_Factory.h \
   Default_Thread_Lane_Resources_Manager.h \
   Domain.pidl \
@@ -1223,6 +1222,7 @@ nobase_include_HEADERS = \
   Messaging_SyncScopeC.h \
   Muxed_TMS.h \
   NVList_Adapter.h \
+  Network_Priority_Protocols_Hooks.h \
   New_Leader_Generator.h \
   Null_Fragmentation_Strategy.h \
   ORB.h \
@@ -1253,6 +1253,7 @@ nobase_include_HEADERS = \
   Object_Ref_Table.h \
   Object_Ref_Table.inl \
   Object_Reference_Sequence_Element_T.h \
+  Object_Reference_Const_Sequence_Element_T.h \
   Object_Reference_Traits_Base_T.h \
   Object_Reference_Traits_T.h \
   Object_T.cpp \
@@ -2904,6 +2905,7 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/LifespanStrategyTransient.cpp \
   PortableServer/LifespanStrategyTransientFactoryImpl.cpp \
   PortableServer/Local_Servant_Base.cpp \
+  PortableServer/Network_Priority_Hook.cpp \
   PortableServer/Non_Servant_Upcall.cpp \
   PortableServer/ORT_Adapter_Factory.cpp \
   PortableServer/Object_Adapter.cpp \
@@ -3077,6 +3079,7 @@ nobase_include_HEADERS += \
   PortableServer/LifespanStrategyTransientFactoryImpl.h \
   PortableServer/Local_Servant_Base.h \
   PortableServer/Local_Servant_Base.inl \
+  PortableServer/Network_Priority_Hook.h \
   PortableServer/Non_Servant_Upcall.h \
   PortableServer/Non_Servant_Upcall.inl \
   PortableServer/ORT_Adapter.h \
@@ -4223,12 +4226,14 @@ libTAO_DynamicInterface_la_CPPFLAGS = \
   -DTAO_DYNAMICINTERFACE_BUILD_DLL
 
 libTAO_DynamicInterface_la_SOURCES = \
+  DynamicInterface/AMH_DSI_Response_Handler.cpp \
   DynamicInterface/Context.cpp \
   DynamicInterface/DII_Arguments.cpp \
   DynamicInterface/DII_Arguments_Converter_Impl.cpp \
   DynamicInterface/DII_Invocation.cpp \
   DynamicInterface/DII_Invocation_Adapter.cpp \
   DynamicInterface/DII_Reply_Dispatcher.cpp \
+  DynamicInterface/DII_Reply_Handler.cpp \
   DynamicInterface/Dynamic_Adapter_Impl.cpp \
   DynamicInterface/Dynamic_Implementation.cpp \
   DynamicInterface/ExceptionList.cpp \
@@ -4250,6 +4255,8 @@ libTAO_DynamicInterface_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  DynamicInterface/AMH_DSI_Response_Handler.h \
+  DynamicInterface/AMH_DSI_Response_Handler.inl \
   DynamicInterface/Context.h \
   DynamicInterface/Context.inl \
   DynamicInterface/DII_Arguments.h \
@@ -4259,6 +4266,7 @@ nobase_include_HEADERS += \
   DynamicInterface/DII_Invocation.h \
   DynamicInterface/DII_Invocation_Adapter.h \
   DynamicInterface/DII_Reply_Dispatcher.h \
+  DynamicInterface/DII_Reply_Handler.h \
   DynamicInterface/Dynamic_Adapter_Impl.h \
   DynamicInterface/Dynamic_Implementation.h \
   DynamicInterface/ExceptionList.h \
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 846a65647fd..c8df60412ba 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -18,12 +18,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
-  : mesg_base_ (0)
+  : exception_type_ (TAO_GIOP_NO_EXCEPTION)
+  , mesg_base_ (0)
   , request_id_ (0)
   , transport_ (0)
   , orb_core_ (0)
   , argument_flag_ (1)
-  , exception_type_ (TAO_GIOP_NO_EXCEPTION)
   , reply_status_ (TAO_RS_UNINITIALIZED)
   , allocator_ (0)
 {
@@ -121,8 +121,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
-    this->mesg_base_->generate_reply_header (this->_tao_out,
-                                             reply_params);
+    this->mesg_base_->generate_reply_header (this->_tao_out, reply_params);
 
     // We are done initialising the reply
     this->reply_status_ = TAO_RS_INITIALIZED;
@@ -133,7 +132,6 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
 void
 TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
 {
-
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
@@ -176,8 +174,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
 }
 
 void
-TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
-                                                  )
+TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -248,9 +245,7 @@ TAO_AMH_Response_Handler::_remove_ref (void)
 namespace TAO
 {
   void
-  ARH_Refcount_Functor::operator () (
-      TAO_AMH_Response_Handler *arh)
-    ACE_THROW_SPEC (())
+  ARH_Refcount_Functor::operator () (TAO_AMH_Response_Handler *arh) throw ()
   {
     (void) arh->_remove_ref ();
   }
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 9f25b914054..ac869cdea24 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -105,10 +105,7 @@ protected:
   void _tao_rh_send_reply (void);
 
   /// Send back an exception to the client.
-  void _tao_rh_send_exception (CORBA::Exception &ex
-                              );
-
-protected:
+  void _tao_rh_send_exception (const CORBA::Exception &ex);
 
   /// The outgoing CDR stream
   /**
@@ -119,13 +116,20 @@ protected:
    */
   TAO_OutputCDR _tao_out;
 
+  //  TAO_GIOP_ReplyStatusType exception_type_;
+  /// Exception type (will be NO_EXCEPTION in the majority of the
+  /// cases).
+  // @@ Mayur: I do not think we need this one, we can deduce the type
+  //    of reply depending on the _tao_rh_*() method called.
+  CORBA::ULong exception_type_;
+
+
 private:
 
   // Private and undefined, standard C++ idiom to prohibit copying.
   TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&);
   TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&);
 
-private:
   /// Pointer to the original message-base
   TAO_Pluggable_Messaging *mesg_base_;
 
@@ -154,13 +158,6 @@ private:
   //    ResponseHandler to set this field correctly!
   CORBA::Boolean argument_flag_;
 
-  //  TAO_GIOP_ReplyStatusType exception_type_;
-  /// Exception type (will be NO_EXCEPTION in the majority of the
-  /// cases).
-  // @@ Mayur: I do not think we need this one, we can deduce the type
-  //    of reply depending on the _tao_rh_*() method called.
-  CORBA::ULong exception_type_;
-
   /**
    * Various states the ResponseHandler can be in.
    *
@@ -211,8 +208,7 @@ namespace TAO
   class TAO_Messaging_Export ARH_Refcount_Functor
   {
   public:
-    void operator() (TAO_AMH_Response_Handler *arh)
-      ACE_THROW_SPEC (());
+    void operator() (TAO_AMH_Response_Handler *arh) throw ();
   };
 
 }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index b2c5088fa35..b7de10524f4 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -25,45 +25,43 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   Asynch_Remote_Invocation::Asynch_Remote_Invocation (
-      CORBA::Object_ptr otarget,
-      Profile_Transport_Resolver &resolver,
-      TAO_Operation_Details &detail,
-      TAO_Asynch_Reply_Dispatcher_Base *rd,
-      bool response_expected)
+    CORBA::Object_ptr otarget,
+    Profile_Transport_Resolver &resolver,
+    TAO_Operation_Details &detail,
+    TAO_Asynch_Reply_Dispatcher_Base *rd,
+    bool response_expected)
     : Synch_Twoway_Invocation (otarget,
                                resolver,
                                detail,
                                response_expected)
-      , safe_rd_ (rd)
+    , safe_rd_ (rd)
   {
   }
 
   Invocation_Status
-  Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
-                                               )
-    ACE_THROW_SPEC ((CORBA::Exception))
+  Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value * max_wait_time)
   {
     TAO_Target_Specification tspec;
     this->init_target_spec (tspec);
 
-    TAO_OutputCDR &cdr =
+    TAO_OutputCDR & cdr =
       this->resolver_.transport ()->messaging_object ()->out_stream ();
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
 #if TAO_HAS_INTERCEPTORS == 1
-    s =
-      this->send_request_interception ();
+    s = this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
-#endif /*TAO_HAS_INTERCEPTORS */
 
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to take care of the cases when things go wrong.
     try
       {
+#endif /* TAO_HAS_INTERCEPTORS */
+
         // Oneway semantics.  See comments for below send_message()
         // call.
         cdr.message_attributes (this->details_.request_id (),
@@ -71,12 +69,9 @@ namespace TAO
                                 TAO_Transport::TAO_ONEWAY_REQUEST,
                                 max_wait_time);
 
-        this->write_header (tspec,
-                            cdr
-                           );
+        this->write_header (tspec, cdr);
 
-        this->marshal_data (cdr
-                           );
+        this->marshal_data (cdr);
 
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
@@ -93,9 +88,7 @@ namespace TAO
           {
             // @@ What is the right way to handle this error? Do we need
             // to call the interceptors in this case?
-            ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
-                                               CORBA::COMPLETED_NO),
-                              TAO_INVOKE_FAILURE);
+            throw ::CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
           }
 
         // Do not unbind during destruction. We need the entry to be
@@ -107,11 +100,9 @@ namespace TAO
         // Send it as a oneway request. It will make all the required
         // paraphernalia within the ORB to fire, like buffering if
         // send blocks etc.
-        s =
-          this->send_message (cdr,
-                              TAO_Transport::TAO_ONEWAY_REQUEST,
-                              max_wait_time
-                             );
+        s = this->send_message (cdr,
+                                TAO_Transport::TAO_ONEWAY_REQUEST,
+                                max_wait_time);
 
 #if TAO_HAS_INTERCEPTORS == 1
         // NOTE: We don't need to do the auto_ptr <> trick. We got here
@@ -126,13 +117,12 @@ namespace TAO
         // Nothing great on here. If we get a restart during send or a
         // proper send, we are supposed to call receiver_other ()
         // interception point. So we do that here
-        Invocation_Status tmp =
-          this->receive_other_interception ();
+        Invocation_Status const tmp = this->receive_other_interception ();
 
         // We got an error during the interception.
         if (s == TAO_INVOKE_SUCCESS && tmp != TAO_INVOKE_SUCCESS)
           s = tmp;
-#endif /*TAO_HAS_INTERCEPTORS */
+#endif /* TAO_HAS_INTERCEPTORS */
 
         // If an error occurred just return. At this point all the
         // endpoint interception would have been invoked. The callee
@@ -145,10 +135,11 @@ namespace TAO
         if (this->resolver_.transport ()->idle_after_send ())
           (void) this->resolver_.transport_released ();
 
+#if TAO_HAS_INTERCEPTORS == 1
       }
     catch ( ::CORBA::Exception& ex)
       {
-#if TAO_HAS_INTERCEPTORS == 1
+
         PortableInterceptor::ReplyStatus const status =
           this->handle_any_exception (&ex);
 
@@ -157,11 +148,23 @@ namespace TAO
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-#else
-        ACE_UNUSED_ARG (ex);
-#endif /*TAO_HAS_INTERCEPTORS*/
           throw;
       }
+    catch (...)
+      {
+        // Notify interceptors of non-CORBA exception, and propagate
+        // that exception to the caller.
+
+         PortableInterceptor::ReplyStatus const st =
+           this->handle_all_exception ();
+
+         if (st == PortableInterceptor::LOCATION_FORWARD ||
+             st == PortableInterceptor::TRANSPORT_RETRY)
+           s = TAO_INVOKE_RESTART;
+         else
+           throw;
+      }
+#endif /* TAO_HAS_INTERCEPTORS */
 
     return s;
   }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
index 0aee5c7a088..3a6df1d100d 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ b/TAO/tao/Messaging/Asynch_Invocation.h
@@ -36,11 +36,6 @@ class TAO_Operation_Details;
 class TAO_InputCDR;
 class TAO_Asynch_Reply_Dispatcher_Base;
 
-namespace CORBA
-{
-  class SystemException;
-}
-
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -55,9 +50,7 @@ namespace TAO
                               TAO_Asynch_Reply_Dispatcher_Base *rd,
                               bool response_expected = true);
 
-    Invocation_Status remote_invocation (ACE_Time_Value *value
-                                         )
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status remote_invocation (ACE_Time_Value *value);
 
   protected:
     // To prevent leaking memory from the reply dispatcher that we
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 67dfb1386bc..c4c15850c87 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -47,8 +47,7 @@ namespace TAO
   void
   Asynch_Invocation_Adapter::invoke (
     Messaging::ReplyHandler_ptr reply_handler_ptr,
-    const TAO_Reply_Handler_Skeleton &reply_handler_skel
-    )
+    const TAO_Reply_Handler_Skeleton &reply_handler_skel)
   {
     TAO_Stub * stub =
       this->get_stub ();
@@ -131,8 +130,7 @@ namespace TAO
     return Invocation_Adapter::invoke_collocated_i (stub,
                                                     details,
                                                     effective_target,
-                                                    strat
-                                                   );
+                                                    strat);
   }
 
   Invocation_Status
@@ -140,19 +138,17 @@ namespace TAO
     TAO_Operation_Details &op,
     CORBA::Object_var &effective_target,
     Profile_Transport_Resolver &r,
-    ACE_Time_Value *&max_wait_time
-    )
+    ACE_Time_Value *&max_wait_time)
   {
     // Simple sanity check
     if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION
         || this->type_ != TAO_TWOWAY_INVOCATION)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::INTERNAL (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
 
     if (this->safe_rd_.get ())
@@ -163,8 +159,7 @@ namespace TAO
         // AMI Timeout Handling Begin
         ACE_Time_Value tmp;
 
-        if (this->get_timeout (r.stub (),
-                               tmp))
+        if (this->get_timeout (r.stub (), tmp))
           {
             this->safe_rd_->schedule_timer (
                 op.request_id (),
@@ -180,9 +175,7 @@ namespace TAO
        op,
        this->safe_rd_.release ());
 
-    Invocation_Status const s =
-      asynch.remote_invocation (max_wait_time
-                               );
+    Invocation_Status const s = asynch.remote_invocation (max_wait_time);
 
     if (s == TAO_INVOKE_RESTART &&
         asynch.is_forwarded ())
@@ -196,10 +189,7 @@ namespace TAO
         CORBA::Boolean const permanent_forward = false;
 #endif
 
-        this->object_forwarded (effective_target,
-                                r.stub (),
-                                permanent_forward
-                               );
+        this->object_forwarded (effective_target, r.stub (), permanent_forward);
       }
 
     return s;
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 85c7501e9dd..03f84fab1e0 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -25,7 +25,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/Asynch_Reply_Dispatcher_Base.h"
 #include "tao/Invocation_Adapter.h"
-#include "ace/CORBA_macros.h"
 #include "ace/Global_Macros.h"
 #include "ace/Auto_Functor.h"
 
@@ -43,7 +42,6 @@ class TAO_Asynch_Reply_Dispatcher_Base;
 namespace  CORBA
 {
   class Object;
-  class SystemException;
 }
 
 namespace TAO
@@ -73,27 +71,22 @@ namespace TAO
         TAO::Invocation_Mode mode = TAO_ASYNCHRONOUS_CALLBACK_INVOCATION);
 
     void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr,
-                 const TAO_Reply_Handler_Skeleton &reply_handler_skel
-                );
+                 const TAO_Reply_Handler_Skeleton &reply_handler_skel);
 
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                        );
+    virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count);
   protected:
 
     virtual Invocation_Status invoke_twoway (
         TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-       );
+        ACE_Time_Value *&max_wait_time);
 
     virtual Invocation_Status invoke_collocated_i (
         TAO_Stub *stub,
         TAO_Operation_Details &details,
         CORBA::Object_var &effective_target,
-        Collocation_Strategy strat
-       );
+        Collocation_Strategy strat);
 
   private:
     /// Autofunctor to manage the reply dispatcher
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 6f34dd52d84..a2a1a4b3796 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -8,8 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 
-#include "ace/CORBA_macros.h"
-
 ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -35,9 +33,7 @@ TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
 
 // Dispatch the reply.
 int
-TAO_Asynch_Reply_Dispatcher::dispatch_reply (
-    TAO_Pluggable_Reply_Params &params
-  )
+TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
 {
   if (params.input_cdr_ == 0)
     return -1;
@@ -58,8 +54,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
   this->reply_status_ = params.reply_status_;
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
+  ACE_Data_Block *db = this->reply_cdr_.clone_from (*params.input_cdr_);
 
   if (db == 0)
     {
@@ -126,10 +121,9 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
           // Call the Reply Handler's skeleton.
           reply_handler_skel_ (this->reply_cdr_,
                                this->reply_handler_.in (),
-                               reply_error
-                               );
+                               reply_error);
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level >= 4)
             ex._tao_print_exception ("Exception during reply handler");
@@ -165,7 +159,6 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 
       comm_failure._tao_encode (out_cdr);
 
-
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
 
@@ -173,11 +166,10 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
         {
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                     );
+                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION);
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -231,11 +223,10 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
         {
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                     );
+                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION);
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -249,8 +240,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 
 long
 TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id,
-                                             const ACE_Time_Value &max_wait_time
-                                             )
+                                             const ACE_Time_Value &max_wait_time)
 {
   if (this->timeout_handler_ == 0)
     {
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 4989fb659f4..f60b1e46785 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -59,8 +59,7 @@ public:
 
   /// Install the timeout handler
   long schedule_timer (CORBA::ULong request_id,
-                       const ACE_Time_Value &max_wait_time
-                      );
+                       const ACE_Time_Value &max_wait_time);
 
 private:
   /// Skeleton for the call back method in the Reply Handler.
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 1aa3051b9a2..cc34fa8f55a 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -3,6 +3,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (Messaging,
@@ -37,17 +38,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
 }
 
 TimeBase::TimeT
-TAO_ConnectionTimeoutPolicy::relative_expiry (
-    void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ConnectionTimeoutPolicy::relative_expiry (void)
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_ConnectionTimeoutPolicy::policy_type (
-    void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ConnectionTimeoutPolicy::policy_type (void)
 {
   return TAO::CONNECTION_TIMEOUT_POLICY_TYPE;
 }
@@ -66,15 +63,12 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
         {
           policy =
             orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-             );
+              TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
         }
       else
         {
           policy =
-            stub->get_cached_policy (
-              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-             );
+            stub->get_cached_policy (TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
         }
 
       if (CORBA::is_nil (policy.in ()))
@@ -84,9 +78,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
         }
 
       TAO::ConnectionTimeoutPolicy_var p =
-        TAO::ConnectionTimeoutPolicy::_narrow (
-          policy.in ()
-         );
+        TAO::ConnectionTimeoutPolicy::_narrow (policy.in ());
 
       TimeBase::TimeT t = p->relative_expiry ();
       TimeBase::TimeT seconds = t / 10000000u;
@@ -104,25 +96,23 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                       time_value.msec ()));
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
 }
 
 CORBA::Policy_ptr
-TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val
-                                            )
+TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val)
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
 
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
-  TAO_ConnectionTimeoutPolicy *tmp;
+  TAO_ConnectionTimeoutPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ConnectionTimeoutPolicy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -143,7 +133,6 @@ TAO_ConnectionTimeoutPolicy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_ConnectionTimeoutPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -158,7 +147,6 @@ TAO_ConnectionTimeoutPolicy::copy (void)
 
 void
 TAO_ConnectionTimeoutPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 67d4e401033..a3e17bb91b8 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -63,24 +63,19 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   );
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_ConnectionTimeoutPolicy *clone (void) const;
 
   // = The TAO::ConnectionTinoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT relative_expiry (void);
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index b66bcba0eb5..76e4c7695b5 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -43,9 +43,7 @@ namespace TAO
     this->count_ = exceptions_count;
   }
 
-  void ExceptionHolder::raise_exception (
-        void
-    )
+  void ExceptionHolder::raise_exception (void)
     {
       TAO_Messaging_Helper::exception_holder_raise (
         this->data_,
@@ -53,13 +51,11 @@ namespace TAO
         this->marshaled_exception ().get_buffer (),
         this->marshaled_exception ().length (),
         this->byte_order (),
-        this->is_system_exception ()
-       );
+        this->is_system_exception ());
       }
 
   void ExceptionHolder::raise_exception_with_list (
-      const ::Dynamic::ExceptionList &
-    )
+      const ::Dynamic::ExceptionList &)
     {
       // todo convert exceptionlist to something we can really use.
       this->raise_exception ();
@@ -84,14 +80,12 @@ namespace TAO
   }
 
   CORBA::ValueBase *
-  ExceptionHolderFactory::create_for_unmarshal (
-    void)
+  ExceptionHolderFactory::create_for_unmarshal (void)
   {
     TAO::ExceptionHolder* ret_val = 0;
     ACE_NEW_THROW_EX (ret_val,
                       ExceptionHolder,
                       CORBA::NO_MEMORY ());
-
     return ret_val;
   }
 
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h
index ea07d781443..0378b7226be 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.h
+++ b/TAO/tao/Messaging/ExceptionHolder_i.h
@@ -54,8 +54,7 @@ namespace TAO
       ::CORBA::Boolean byte_order,
       const ::CORBA::OctetSeq &marshaled_exception,
       ::TAO::Exception_Data* data,
-      ::CORBA::ULong exceptions_count
-    );
+      ::CORBA::ULong exceptions_count);
 
     void set_exception_data (::TAO::Exception_Data* data,
                              ::CORBA::ULong exceptions_count);
@@ -63,8 +62,7 @@ namespace TAO
     virtual void raise_exception (void);
 
     virtual void raise_exception_with_list (
-        const ::Dynamic::ExceptionList & exc_list
-      );
+        const ::Dynamic::ExceptionList & exc_list);
 
     virtual CORBA::ValueBase* _copy_value (void);
 
@@ -90,8 +88,7 @@ namespace TAO
     public virtual CORBA::ValueFactoryBase
   {
   public:
-    virtual CORBA::ValueBase * create_for_unmarshal (
-      void);
+    virtual CORBA::ValueBase * create_for_unmarshal (void);
   };
 
 }
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 04f69d33aa5..11fc5907498 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -63,9 +63,7 @@ enum TAO_AMI_Reply_Status
 typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr,
-    CORBA::ULong reply_status
-
-    );
+    CORBA::ULong reply_status);
 
 namespace TAO
 {
@@ -88,8 +86,7 @@ namespace TAO_Messaging_Helper
            CORBA::Octet *marshaled_data,
            CORBA::ULong marshaled_data_length,
            CORBA::Boolean byte_order,
-           CORBA::Boolean is_system_exception
-          );
+           CORBA::Boolean is_system_exception);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index 1ffb963fb19..f9c1897c6a4 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -51,10 +51,9 @@ TAO_Messaging_Loader::init (int,
 
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h
index 0a046f44675..8a3d8ae118c 100644
--- a/TAO/tao/Messaging/Messaging_Loader.h
+++ b/TAO/tao/Messaging/Messaging_Loader.h
@@ -37,8 +37,7 @@ public:
   virtual ~TAO_Messaging_Loader (void);
 
   /// Initialize the Messaging loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
+  virtual int init (int argc, ACE_TCHAR* []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index 7fb43b0f8ea..98beb835500 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -18,11 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-  TAO_ORB_Core::set_timeout_hook
-    (TAO_RelativeRoundtripTimeoutPolicy::hook);
+  TAO_ORB_Core::set_timeout_hook (TAO_RelativeRoundtripTimeoutPolicy::hook);
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
@@ -30,8 +28,7 @@ TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-  TAO_ORB_Core::connection_timeout_hook
-    (TAO_ConnectionTimeoutPolicy::hook);
+  TAO_ORB_Core::connection_timeout_hook (TAO_ConnectionTimeoutPolicy::hook);
 #endif  /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
 
 }
@@ -39,7 +36,6 @@ TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 void
 TAO_Messaging_ORBInitializer::post_init (
   PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 
@@ -150,7 +146,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
         {
           info->register_policy_factory (*i, policy_factory.in ());
         }
-      catch ( ::CORBA::BAD_INV_ORDER& ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -162,11 +158,6 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
             }
           throw;
         }
-      catch ( ::CORBA::Exception&)
-        {
-          // Rethrow any other exceptions...
-          throw;
-        }
     }
 }
 
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index 443118bf601..d5462ee0dbc 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -49,11 +49,9 @@ public:
    */
   //@{
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   //@}
 
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 278d07e5ec6..e54fe791701 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -22,8 +22,7 @@ TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
 {
   TAO::BufferingConstraint *buffering_constraint = 0;
   if ((val >>= buffering_constraint) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_Buffering_Constraint_Policy *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -39,31 +38,25 @@ CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
   if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE)
-    return TAO_RelativeRoundtripTimeoutPolicy::create (value
-                                                      );
+    return TAO_RelativeRoundtripTimeoutPolicy::create (value);
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
   if (type == TAO::CONNECTION_TIMEOUT_POLICY_TYPE)
-    return TAO_ConnectionTimeoutPolicy::create (value
-                                               );
+    return TAO_ConnectionTimeoutPolicy::create (value);
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
   if (type == Messaging::SYNC_SCOPE_POLICY_TYPE)
-    return TAO_Sync_Scope_Policy::create (value
-                                         );
+    return TAO_Sync_Scope_Policy::create (value);
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
-    return this->create_buffering_constraint_policy (value
-                                                    );
+    return this->create_buffering_constraint_policy (value);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   if (
@@ -96,13 +89,11 @@ TAO_Messaging_PolicyFactory::create_policy (
       type == Messaging::MAX_HOPS_POLICY_TYPE ||
 #endif  /* TAO_HAS_MAX_HOPS_POLICY == 1 */
       type == Messaging::QUEUE_ORDER_POLICY_TYPE)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY);
 
   ACE_UNUSED_ARG (value);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index a2e5d63eae0..51c46e053ca 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -43,9 +43,7 @@ class TAO_Messaging_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any & value);
 private:
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   CORBA::Policy_ptr
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index 022de7a4acf..a4b44a0ac93 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -43,7 +43,6 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
 TimeBase::TimeT
 TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
     void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
 }
@@ -51,7 +50,6 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
 CORBA::PolicyType
 TAO_RelativeRoundtripTimeoutPolicy::policy_type (
     void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE;
 }
@@ -70,14 +68,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
         {
           policy =
             orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-             );
+              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
         }
       else
         {
           policy =
-            stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-                                    );
+            stub->get_cached_policy (
+              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
         }
 
       if (CORBA::is_nil (policy.in ()))
@@ -87,9 +84,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
         }
 
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
-        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-          policy.in ()
-         );
+        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in ());
 
       TimeBase::TimeT t = p->relative_expiry ();
       TimeBase::TimeT seconds = t / 10000000u;
@@ -107,7 +102,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                       time_value.msec ()));
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
@@ -118,11 +113,9 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val)
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
-
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_RelativeRoundtripTimeoutPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -145,7 +138,6 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_RelativeRoundtripTimeoutPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -160,7 +152,6 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void)
 
 void
 TAO_RelativeRoundtripTimeoutPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -176,8 +167,7 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
   TimeBase::TimeT t = this->relative_expiry_;
   TimeBase::TimeT seconds = t / 10000000u;
   TimeBase::TimeT microseconds = (t % 10000000u) / 10;
-  time_value.set (ACE_U64_TO_U32 (seconds),
-                  ACE_U64_TO_U32 (microseconds));
+  time_value.set (ACE_U64_TO_U32 (seconds), ACE_U64_TO_U32 (microseconds));
 
   if (TAO_debug_level > 0)
     {
@@ -215,7 +205,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 
 CORBA::PolicyType
 TAO_Sync_Scope_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::SYNC_SCOPE_POLICY_TYPE;
 }
@@ -234,14 +223,12 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
         {
           policy =
             orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_SYNC_SCOPE
-             );
+              TAO_CACHED_POLICY_SYNC_SCOPE);
         }
       else
         {
           policy =
-            stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE
-                                    );
+            stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
         }
 
       if (CORBA::is_nil (policy.in ()))
@@ -262,20 +249,18 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
       has_synchronization = true;
       scope = p->synchronization ();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::create (const CORBA::Any& val
-                               )
+TAO_Sync_Scope_Policy::create (const CORBA::Any& val)
 {
   Messaging::SyncScope synchronization;
   if ((val >>= synchronization) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_Sync_Scope_Policy *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -297,14 +282,12 @@ TAO_Sync_Scope_Policy::clone (void) const
 
 Messaging::SyncScope
 TAO_Sync_Scope_Policy::synchronization (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->synchronization_;
 }
 
 CORBA::Policy_ptr
 TAO_Sync_Scope_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Sync_Scope_Policy *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -316,7 +299,6 @@ TAO_Sync_Scope_Policy::copy (void)
 
 void
 TAO_Sync_Scope_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 TAO_Cached_Policy_Type
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index dea4905a49a..5da18bf8731 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -56,24 +56,19 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   );
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT relative_expiry (void);
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
@@ -129,19 +124,15 @@ public:
 
   // = The Messaging::SyncScopePolicy methods.
 
-  virtual Messaging::SyncScope synchronization (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Messaging::SyncScope synchronization (void);
 
   void get_synchronization (Messaging::SyncScope &synchronization) const;
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 68df7c44eb5..1420eb9ff80 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -126,8 +126,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
                       *this->lock_,
                       -1);
 
-    result =
-      this->dispatcher_table_.unbind (params.request_id_, rd);
+    result = this->dispatcher_table_.unbind (params.request_id_, rd);
 
     if (TAO_debug_level > 8)
       ACE_DEBUG ((LM_DEBUG,
@@ -157,7 +156,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
     // cases we dispatch with the lock held.
     // Dispatch the reply.
     // They return 1 on success, and -1 on failure.
-    result =  rd->dispatch_reply (params);
+    result = rd->dispatch_reply (params);
   }
 
   return result;
@@ -194,7 +193,6 @@ TAO_Muxed_TMS::connection_closed (void)
       retval = this->clear_cache ();
     }
   while (retval != -1);
-
 }
 
 int
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
index 250d5435b42..625dfc5afa6 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -24,7 +24,6 @@
 #include "tao/Basic_Types.h"
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -45,13 +44,9 @@ class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
 public:
   virtual ~TAO_NVList_Adapter (void);
 
-  virtual void create_list (
-      CORBA::Long count,
-      CORBA::NVList_ptr &new_list) = 0;
-
-  virtual void create_named_value (
-      CORBA::NamedValue_ptr &nv) = 0;
+  virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0;
 
+  virtual void create_named_value (CORBA::NamedValue_ptr &nv) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.cpp b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
new file mode 100644
index 00000000000..1f8e7ef4297
--- /dev/null
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
@@ -0,0 +1,16 @@
+// $Id$
+
+#include "tao/Network_Priority_Protocols_Hooks.h"
+
+ACE_RCSID (tao,
+           Network_Priority_Protocols_Hooks,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Network_Priority_Protocols_Hooks::
+~TAO_Network_Priority_Protocols_Hooks (void)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.h b/TAO/tao/Network_Priority_Protocols_Hooks.h
new file mode 100644
index 00000000000..f76db69ebe8
--- /dev/null
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.h
@@ -0,0 +1,68 @@
+// -*- C++ -*-
+
+// ===================================================================
+/**
+ *  @file   Network_Priority_Protocols_Hooks.h
+ *
+ *  $Id$
+ *
+ *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *          Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+// ===================================================================
+
+#ifndef TAO_NETWORK_PRIORITY_PROTOCOLS_HOOKS_H
+#define TAO_NETWORK_PRIORITY_PROTOCOLS_HOOKS_H
+
+#include /**/ "ace/pre.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include /**/ "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace CORBA
+{
+  class Environment;
+  class Object;
+}
+
+class TAO_ORB_Core;
+class TAO_Service_Context;
+class TAO_Connection_Handler;
+class TAO_Stub;
+
+class TAO_Export TAO_Network_Priority_Protocols_Hooks
+      : public ACE_Service_Object
+{
+public:
+  /// destructor
+  virtual ~TAO_Network_Priority_Protocols_Hooks (void);
+
+  virtual void init_hooks (TAO_ORB_Core *orb_core) = 0;
+
+  virtual CORBA::Long get_dscp_codepoint (TAO_Stub *stub,
+        CORBA::Object *object) = 0;
+
+  virtual CORBA::Long get_dscp_codepoint (TAO_Service_Context &req) = 0;
+
+  virtual void np_service_context (TAO_Stub *stub,
+                                   TAO_Service_Context &service_context,
+                                   CORBA::Boolean restart) = 0;
+
+  virtual void add_rep_np_service_context_hook (
+    TAO_Service_Context &service_context,
+    CORBA::Long &dscp_codepoint) = 0;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_NETWORK_PRIORITY_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp
index 79ddde5c290..7146119c73e 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.cpp
+++ b/TAO/tao/Null_Fragmentation_Strategy.cpp
@@ -1,9 +1,7 @@
 // $Id$
 
-
 #include "tao/Null_Fragmentation_Strategy.h"
 
-
 TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void)
 {
 }
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index ace58815d2d..0a70c65601d 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -45,9 +45,7 @@ public:
 
   TAO_Null_Fragmentation_Strategy (void) {}
   virtual ~TAO_Null_Fragmentation_Strategy (void);
-  virtual int fragment (TAO_OutputCDR &,
-                        ACE_CDR::ULong,
-                        ACE_CDR::ULong);
+  virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 63312b4bfac..46a74c5d45f 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -45,11 +45,7 @@ ACE_RCSID (tao,
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
-
-void TAO_unexpected_exception_handler (void)
-{
-  throw ::CORBA::UNKNOWN ();
-}
+#include "ace/CORBA_macros.h"
 
 static const char ior_prefix[] = "IOR:";
 
@@ -117,17 +113,15 @@ CORBA::ORB::InvalidName::_tao_duplicate (void) const
 
 void CORBA::ORB::InvalidName::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
-void CORBA::ORB::InvalidName::_tao_encode (
-    TAO_OutputCDR &) const
+void CORBA::ORB::InvalidName::_tao_encode (TAO_OutputCDR &) const
 {
   throw ::CORBA::MARSHAL ();
 }
 
-void CORBA::ORB::InvalidName::_tao_decode (
-    TAO_InputCDR &)
+void CORBA::ORB::InvalidName::_tao_decode (TAO_InputCDR &)
 {
   throw ::CORBA::MARSHAL ();
 }
@@ -240,7 +234,7 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv)
     return 0;
 
   if (result == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw ::CORBA::INTERNAL ();
 
   return 1;
 }
@@ -256,7 +250,7 @@ CORBA::ORB::work_pending (void)
     return 0;
 
   if (result == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw ::CORBA::INTERNAL ();
 
   return 1;
 }
@@ -304,9 +298,7 @@ CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef,
       throw ::CORBA::INTF_REPOS ();
     }
 
-  adapter->create_operation_list (this,
-                                  opDef,
-                                  result);
+  adapter->create_operation_list (this, opDef, result);
 }
 
 
@@ -350,12 +342,11 @@ CORBA::ORB::get_service_information (
   CORBA::ServiceType /* service_type */,
   CORBA::ServiceInformation_out /* service_information */)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (
+    CORBA::SystemException::_tao_minor_code (
+      0,
+      ENOTSUP),
+    CORBA::COMPLETED_NO);
 }
 
 void
@@ -411,12 +402,11 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr &)
 CORBA::Boolean
 CORBA::ORB::poll_next_response (void)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (
+    CORBA::SystemException::_tao_minor_code (
+      0,
+      ENOTSUP),
+    CORBA::COMPLETED_NO);
 }
 
 // ****************************************************************
@@ -433,13 +423,10 @@ CORBA::ORB::create_struct_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_struct_tc (id,
-                                    name,
-                                    members);
+  return adapter->create_struct_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -455,8 +442,7 @@ CORBA::ORB::create_union_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return adapter->create_union_tc (id,
@@ -477,13 +463,10 @@ CORBA::ORB::create_enum_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_enum_tc (id,
-                                  name,
-                                  members);
+  return adapter->create_enum_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -498,13 +481,10 @@ CORBA::ORB::create_alias_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_alias_tc (id,
-                                   name,
-                                   original_type);
+  return adapter->create_alias_tc (id, name, original_type);
 }
 
 CORBA::TypeCode_ptr
@@ -519,13 +499,10 @@ CORBA::ORB::create_exception_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_exception_tc (id,
-                                       name,
-                                       members);
+  return adapter->create_exception_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -539,12 +516,10 @@ CORBA::ORB::create_interface_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_interface_tc (id,
-                                       name);
+  return adapter->create_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
@@ -557,8 +532,7 @@ CORBA::ORB::create_string_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return adapter->create_string_tc (bound);
@@ -574,8 +548,7 @@ CORBA::ORB::create_wstring_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return adapter->create_wstring_tc (bound);
@@ -592,12 +565,10 @@ CORBA::ORB::create_fixed_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_fixed_tc (digits,
-                                   scale);
+  return adapter->create_fixed_tc (digits, scale);
 }
 
 CORBA::TypeCode_ptr
@@ -611,12 +582,10 @@ CORBA::ORB::create_sequence_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_sequence_tc (bound,
-                                      element_type);
+  return adapter->create_sequence_tc (bound, element_type);
 }
 
 CORBA::TypeCode_ptr
@@ -630,12 +599,10 @@ CORBA::ORB::create_array_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_array_tc (length,
-                                   element_type);
+  return adapter->create_array_tc (length, element_type);
 }
 
 CORBA::TypeCode_ptr
@@ -652,12 +619,10 @@ CORBA::ORB::create_value_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_value_tc (id,
-                                   name,
+  return adapter->create_value_tc (id, name,
                                    type_modifier,
                                    concrete_base,
                                    members);
@@ -675,19 +640,14 @@ CORBA::ORB::create_value_box_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_value_box_tc (id,
-                                       name,
-                                       boxed_type);
+  return adapter->create_value_box_tc (id, name, boxed_type);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_native_tc (
-    const char *id,
-    const char *name)
+CORBA::ORB::create_native_tc (const char *id, const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -695,17 +655,14 @@ CORBA::ORB::create_native_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_native_tc (id,
-                                    name);
+  return adapter->create_native_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_recursive_tc (
-    const char *id)
+CORBA::ORB::create_recursive_tc (const char *id)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -713,17 +670,14 @@ CORBA::ORB::create_recursive_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return adapter->create_recursive_tc (id);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_abstract_interface_tc (
-    const char *id,
-    const char *name)
+CORBA::ORB::create_abstract_interface_tc (const char *id, const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -731,18 +685,14 @@ CORBA::ORB::create_abstract_interface_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_abstract_interface_tc (id,
-                                                name);
+  return adapter->create_abstract_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_local_interface_tc (
-    const char *id,
-    const char *name)
+CORBA::ORB::create_local_interface_tc (const char *id, const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -750,18 +700,14 @@ CORBA::ORB::create_local_interface_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_local_interface_tc (id,
-                                             name);
+  return adapter->create_local_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_component_tc (
-    const char *id,
-    const char *name)
+CORBA::ORB::create_component_tc (const char *id, const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -769,18 +715,14 @@ CORBA::ORB::create_component_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_component_tc (id,
-                                       name);
+  return adapter->create_component_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
-CORBA::ORB::create_home_tc (
-    const char *id,
-    const char *name)
+CORBA::ORB::create_home_tc (const char *id, const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -788,12 +730,10 @@ CORBA::ORB::create_home_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
-  return adapter->create_home_tc (id,
-                                  name);
+  return adapter->create_home_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
@@ -810,8 +750,7 @@ CORBA::ORB::create_event_tc (
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return adapter->create_event_tc (id,
@@ -830,8 +769,7 @@ CORBA::ORB::resolve_policy_manager (void)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-  TAO_Policy_Manager *policy_manager =
-    this->orb_core_->policy_manager ();
+  TAO_Policy_Manager *policy_manager = this->orb_core_->policy_manager ();
 
   if (policy_manager == 0)
     {
@@ -850,7 +788,6 @@ CORBA::ORB::resolve_policy_manager (void)
 CORBA::Object_ptr
 CORBA::ORB::resolve_policy_current (void)
 {
-
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
@@ -916,13 +853,10 @@ CORBA::ORB::resolve_service (TAO::MCAST_SERVICEID mcast_service_id)
       static char const mcast_fmt[] = "mcast://:%d::";
       static size_t const PORT_BUF_SIZE = 256;
 
-      char def_init_ref[PORT_BUF_SIZE] = { 0 }; // snprintf() doesn't
-                                                // null terminate.
-                                                // Make sure we do.
+      char def_init_ref[PORT_BUF_SIZE] = { 0 };
 
       ACE_OS::snprintf (def_init_ref,
-                        PORT_BUF_SIZE - 1, // Account for null
-                                           // terminator.
+                        PORT_BUF_SIZE,
                         mcast_fmt,
                         port);
 
@@ -951,8 +885,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
     {
-      result = this->orb_core ()->resolve_poa_current
-        ();
+      result = this->orb_core ()->resolve_poa_current ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
     {
@@ -964,39 +897,32 @@ CORBA::ORB::resolve_initial_references (const char *name,
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
     {
-      result = this->orb_core ()->resolve_ior_manipulation
-        ();
+      result = this->orb_core ()->resolve_ior_manipulation ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0)
     {
-      result = this->orb_core ()->resolve_ior_table
-        ();
+      result = this->orb_core ()->resolve_ior_table ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0)
     {
-      result = this->orb_core ()->resolve_dynanyfactory
-        ();
+      result = this->orb_core ()->resolve_dynanyfactory ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
     {
-      result = this->orb_core ()->resolve_typecodefactory
-        ();
+      result = this->orb_core ()->resolve_typecodefactory ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_CODECFACTORY) == 0)
     {
-      result = this->orb_core ()->resolve_codecfactory
-        ();
+      result = this->orb_core ()->resolve_codecfactory ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_COMPRESSIONMANAGER) == 0)
     {
-      result = this->orb_core ()->resolve_compression_manager
-        ();
+      result = this->orb_core ()->resolve_compression_manager ();
     }
 #if TAO_HAS_INTERCEPTORS == 1
   else if (ACE_OS::strcmp (name, TAO_OBJID_PICurrent) == 0)
     {
-      result = this->orb_core ()->resolve_picurrent
-        ();
+      result = this->orb_core ()->resolve_picurrent ();
     }
 #endif
 
@@ -1034,11 +960,9 @@ CORBA::ORB::resolve_initial_references (const char *name,
   CORBA::String_var ior_env_var_name =
     CORBA::string_alloc (static_cast<CORBA::ULong> (ACE_OS::strlen (name) + 3));
 
-  ACE_OS::strcpy (ior_env_var_name.inout (),
-                  name);
+  ACE_OS::strcpy (ior_env_var_name.inout (), name);
 
-  ACE_OS::strcat (ior_env_var_name.inout (),
-                  "IOR");
+  ACE_OS::strcat (ior_env_var_name.inout (), "IOR");
 
   ACE_CString service_ior = ACE_OS::getenv (ior_env_var_name.in ());
 
@@ -1082,13 +1006,12 @@ CORBA::ORB::resolve_initial_references (const char *name,
     return result._retn ();
   // -----------------------------------------------------------------
 
-  ACE_THROW_RETURN (CORBA::ORB::InvalidName (), CORBA::Object::_nil ());
+  throw ::CORBA::ORB::InvalidName ();
 }
 
 #if !defined(CORBA_E_MICRO)
 void
-CORBA::ORB::register_initial_reference (const char * id,
-                                        CORBA::Object_ptr obj)
+CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj)
 {
   if (id == 0 || ACE_OS::strlen (id) == 0)
     throw ::CORBA::ORB::InvalidName ();
@@ -1149,20 +1072,6 @@ TAO::ORB::init_orb_globals (void)
     {
       ++orb_init_count;
     }
-
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-  /**
-   * @note The new TypeCode implementation obviates the above
-   *       comment.  Standard CORBA exception TypeCodes are now
-   *       available before CORBA::ORB_init() is ever called.
-   */
-  TAO_Singleton_Manager::instance ()->_set_unexpected (
-    ::TAO_unexpected_exception_handler);
 }
 
 CORBA::ORB_ptr
@@ -1182,26 +1091,8 @@ CORBA::ORB::_tao_make_ORB (TAO_ORB_Core * orb_core)
 // ORB initialization, per OMG document 98-12-01.
 
 CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char *orb_name)
+CORBA::ORB_init (int &argc, char *argv[], const char *orbid)
 {
-  CORBA::Environment env;
-  return CORBA::ORB_init (argc,
-                          argv,
-                          orb_name,
-                          env /* unused */);
-}
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char *orbid,
-                 CORBA::Environment &try_ENV)
-{
-  // This ugly macro will go away once we've merged the two ORB_init's.
-  ACE_UNUSED_ARG(try_ENV); // FUZZ: ignore check_for_ace_check
-
   // Use this string variable to hold the orbid
   ACE_CString orbid_string (orbid);
 
@@ -1233,7 +1124,7 @@ CORBA::ORB_init (int &argc,
   // It doesn't make sense for argc to be zero and argv to be
   // non-empty/zero, or for argc to be greater than zero and argv be
   // zero.
-  const size_t argv0_len =
+  size_t const argv0_len =
     (command_line.get_TCHAR_argv ()
      ? (*command_line.get_TCHAR_argv ()
         ? ACE_OS::strlen (*command_line.get_TCHAR_argv ())
@@ -1245,16 +1136,13 @@ CORBA::ORB_init (int &argc,
           && (command_line.get_TCHAR_argv () == 0
               || command_line.get_TCHAR_argv ()[0] == 0)))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        CORBA::ORB::_nil ());
+      throw ::CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          0,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
-
-
   if (orbid_string.length () == 0)
     {
       ACE_Arg_Shifter arg_shifter (command_line.get_argc (),
@@ -1358,12 +1246,11 @@ CORBA::ORB_init (int &argc,
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("Unable to initialize the ")
                   ACE_TEXT ("Service Configurator")));
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        CORBA::ORB::_nil ());
+      throw ::CORBA::INITIALIZE (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ORB_CORE_INIT_LOCATION_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   TAO::ORBInitializer_Registry_Adapter * orbinitializer_registry =
@@ -1405,9 +1292,7 @@ CORBA::ORB_init (int &argc,
   // Before returning remember to store the ORB into the table...
   if (TAO::ORB_Table::instance ()->bind (orbid_string.c_str (),
                                          oc.get ()) != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (0,
-                                       CORBA::COMPLETED_NO),
-                      CORBA::ORB::_nil ());
+    throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
 
   // Return a duplicate since the ORB_Core should release the last
   // reference to the ORB.
@@ -1426,9 +1311,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
   if (!CORBA::is_nil (obj))
     {
       if (!obj->can_convert_to_ior ())
-        ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 4,
-                                          CORBA::COMPLETED_NO),
-                          0);
+        throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
 
       // Allow a user to provide custom object stringification
       char* user_string =
@@ -1476,13 +1359,13 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
 
       // Marshal the objref into an encapsulation bytestream.
       (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if ((cdr << obj) == 0)
-        ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+      if (!(cdr << obj))
+        throw ::CORBA::MARSHAL ();
 
       // Now hexify the encapsulated CDR data into a string, and
       // return that string.
 
-      const size_t total_len = cdr.total_length ();
+      size_t const total_len = cdr.total_length ();
 
       char *cp = 0;
       ACE_ALLOCATOR_RETURN (cp,
@@ -1497,9 +1380,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
       ACE_OS::strcpy (cp, ior_prefix);
       cp += sizeof (ior_prefix) - 1;
 
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
+      for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ())
         {
           const char *bytes = i->rd_ptr ();
           size_t len = i->length ();
@@ -1529,12 +1410,11 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
                         ACE_TEXT ("pointer is zero when converting\n")
                         ACE_TEXT ("object reference to URL IOR.\n")));
 
-          ACE_THROW_RETURN (CORBA::MARSHAL (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            0);
+          throw ::CORBA::MARSHAL (
+            CORBA::SystemException::_tao_minor_code (
+              0,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       TAO_MProfile &mp = obj->_stubobj ()->base_profiles ();
@@ -1547,12 +1427,11 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
                         ACE_TEXT ("object.  No profiles.\n")));
 
 
-          ACE_THROW_RETURN (CORBA::MARSHAL (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            0);
+          throw ::CORBA::MARSHAL (
+            CORBA::SystemException::_tao_minor_code (
+              0,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       // For now we just use the first profile.
@@ -1573,25 +1452,21 @@ CORBA::ORB::string_to_object (const char *str)
 
   // Check for NULL pointer
   if (str == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                        CORBA::SystemException::_tao_minor_code (
-                          0,
-                          EINVAL),
-                        CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
+    throw ::CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        0,
+        EINVAL),
+      CORBA::COMPLETED_NO);
 
   TAO_IOR_Parser *ior_parser =
     this->orb_core_->parser_registry ()->match_parser (str);
 
   if (ior_parser != 0)
     {
-      return ior_parser->parse_string (str,
-                                       this);
+      return ior_parser->parse_string (str, this);
     }
 
-  if (ACE_OS::strncmp (str,
-                       ior_prefix,
-                       sizeof ior_prefix - 1) == 0)
+  if (ACE_OS::strncmp (str, ior_prefix, sizeof ior_prefix - 1) == 0)
     return this->ior_string_to_object (str + sizeof ior_prefix - 1);
   else
     return this->url_ior_string_to_object (str);
@@ -1609,8 +1484,7 @@ CORBA::ORB::id (void)
 
 #if !defined(CORBA_E_MICRO)
 CORBA::Policy_ptr
-CORBA::ORB::create_policy (CORBA::PolicyType type,
-                           const CORBA::Any& val)
+CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val)
 {
   this->check_shutdown ();
 
@@ -1619,8 +1493,7 @@ CORBA::ORB::create_policy (CORBA::PolicyType type,
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::Policy::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   // Attempt to obtain the policy from the policy factory registry.
@@ -1639,8 +1512,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type)
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::Policy::_nil ());
+      throw ::CORBA::INTERNAL ();
     }
 
   // Attempt to obtain the policy from the policy factory registry.
@@ -1686,8 +1558,7 @@ CORBA::ORB::ior_string_to_object (const char *str)
 
   if (tmp [0] && !isspace (tmp [0]))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   // Create deencapsulation stream ... then unmarshal objref from that
@@ -1721,33 +1592,28 @@ CORBA::ORB::url_ior_string_to_object (const char* str)
   // of profiles and tell the MProfile object to allocate enough memory
   // to hold them all.
 
-  TAO_Connector_Registry *conn_reg =
-    this->orb_core_->connector_registry ();
+  TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry ();
 
-  int const retv =
-    conn_reg->make_mprofile (str,
-                             mprofile);
+  int const retv = conn_reg->make_mprofile (str, mprofile);
   // Return nil.
 
   if (retv != 0)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
+      throw ::CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          0,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Now make the TAO_Stub.
-  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
-                                                 mprofile);
+  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, mprofile);
 
   TAO_Stub_Auto_Ptr safe_objdata (data);
 
   // Figure out if the servant is collocated.
-  CORBA::Object_ptr obj =
-    this->orb_core_->create_object (safe_objdata.get ());
+  CORBA::Object_ptr obj = this->orb_core_->create_object (safe_objdata.get ());
+
   if (CORBA::is_nil (obj))
     return CORBA::Object::_nil ();
 
@@ -1784,10 +1650,9 @@ CORBA::ORB::register_value_factory (const char *repository_id,
 
   if (vta)
     {
-      int const result = vta->vf_map_rebind (repository_id,
-                                             factory);
+      int const result = vta->vf_map_rebind (repository_id, factory);
 
-      if (result == 0)              // No previous factory found
+      if (result == 0) // No previous factory found
         {
           return 0;
         }
@@ -1795,8 +1660,7 @@ CORBA::ORB::register_value_factory (const char *repository_id,
       if (result == -1)
         {
           // Error on bind.
-          ACE_THROW_RETURN (CORBA::MARSHAL (),
-                            0);
+          throw ::CORBA::MARSHAL ();
         }
     }
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 9bae8a49d7d..7512207e020 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -29,6 +29,7 @@
 #include "tao/objectid.h"
 #include "tao/CORBA_methods.h"
 #include "tao/VarOut_T.h"
+#include "tao/Pseudo_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/Sequence_T.h"
@@ -59,6 +60,7 @@ class TAO_OutputCDR;
 class TAO_Stub;
 class TAO_Valuetype_Adapter;
 class TAO_Acceptor_Filter;
+class TAO_ORB_Core;
 
 // ****************************************************************
 
@@ -177,11 +179,9 @@ namespace CORBA
 
       virtual void _raise (void) const;
 
-      virtual void _tao_encode (TAO_OutputCDR &
-                                ) const;
+      virtual void _tao_encode (TAO_OutputCDR &) const;
 
-      virtual void _tao_decode (TAO_InputCDR &
-                               );
+      virtual void _tao_decode (TAO_InputCDR &);
     };
 
     typedef char *ObjectId;
@@ -214,8 +214,7 @@ namespace CORBA
      * pointer.  Typically these strings are created using
      * object_to_string(), but not necessarily locally.
      */
-    CORBA::Object_ptr string_to_object (const char *str
-                                        );
+    CORBA::Object_ptr string_to_object (const char *str);
 
     /**
      * Turn an object reference into a string.  Each type of ORB,
@@ -224,69 +223,52 @@ namespace CORBA
      * this is typically eventually given to @c string_to_object() as
      * an argument.
      */
-    char * object_to_string (CORBA::Object_ptr obj
-                             );
+    char * object_to_string (CORBA::Object_ptr obj);
 
 #if !defined(CORBA_E_MICRO)
     // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
     CORBA::ValueFactory register_value_factory (
         const char *repository_id,
-        CORBA::ValueFactory factory
-        );
+        CORBA::ValueFactory factory);
 #endif
 
 #if !defined(CORBA_E_MICRO)
-    void unregister_value_factory (const char * repository_id
-                                   );
+    void unregister_value_factory (const char * repository_id);
 #endif
 
 #if !defined(CORBA_E_MICRO)
-    CORBA::ValueFactory lookup_value_factory (
-        const char *repository_id
-        );
+    CORBA::ValueFactory lookup_value_factory (const char *repository_id);
 #endif
 
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-    void create_list (CORBA::Long count,
-                      CORBA::NVList_ptr &new_list
-                      );
+    void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list);
 
     void create_operation_list(CORBA::OperationDef_ptr opDef,
-                               CORBA::NVList_ptr& result
-                               );
+                               CORBA::NVList_ptr& result);
 
-    void create_named_value (CORBA::NamedValue_ptr &nmval
-                             );
+    void create_named_value (CORBA::NamedValue_ptr &nmval);
 
-    void create_exception_list (CORBA::ExceptionList_ptr &exclist
-                                );
+    void create_exception_list (CORBA::ExceptionList_ptr &exclist);
 
-    void create_environment (CORBA::Environment_ptr &new_env
-                             );
+    void create_environment (CORBA::Environment_ptr &new_env);
 
     // The following are not implemented and just throw
     // CORBA::NO_IMPLEMENT.
 
-    void create_context_list (CORBA::ContextList_ptr &ctxtlist
-                              );
+    void create_context_list (CORBA::ContextList_ptr &ctxtlist);
 
-    void get_default_context (CORBA::Context_ptr &ctx
-                              );
+    void get_default_context (CORBA::Context_ptr &ctx);
 
     CORBA::Boolean get_service_information (
       CORBA::ServiceType service_type,
-      CORBA::ServiceInformation_out service_information
-      );
+      CORBA::ServiceInformation_out service_information);
 
-    void send_multiple_requests_oneway (const CORBA::RequestSeq &req
-                                        );
+    void send_multiple_requests_oneway (const CORBA::RequestSeq &req);
 
-    void send_multiple_requests_deferred (const CORBA::RequestSeq &req
-                                          );
+    void send_multiple_requests_deferred (const CORBA::RequestSeq &req);
 
-    void get_next_response (CORBA::Request_ptr &req
-                            );
+    void get_next_response (CORBA::Request_ptr &req);
 
     CORBA::Boolean poll_next_response (void);
 
@@ -295,113 +277,85 @@ namespace CORBA
     CORBA::TypeCode_ptr create_struct_tc (
         const char *id,
         const char *name,
-        const CORBA::StructMemberSeq &members
-        );
+        const CORBA::StructMemberSeq &members);
 
     CORBA::TypeCode_ptr create_union_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr discriminator_type,
-        const CORBA::UnionMemberSeq &members
-        );
+        const CORBA::UnionMemberSeq &members);
 
     CORBA::TypeCode_ptr create_enum_tc (
         const char *id,
         const char *name,
-        const CORBA::EnumMemberSeq &members
-        );
+        const CORBA::EnumMemberSeq &members);
 
     CORBA::TypeCode_ptr create_alias_tc (
         const char *id,
         const char *name,
-        CORBA::TypeCode_ptr original_type
-        );
+        CORBA::TypeCode_ptr original_type);
 
     CORBA::TypeCode_ptr create_exception_tc (
         const char *id,
         const char *name,
-        const CORBA::StructMemberSeq &members
-        );
+        const CORBA::StructMemberSeq &members);
 
-    CORBA::TypeCode_ptr create_interface_tc (
-        const char *id,
-        const char *name
-        );
+    CORBA::TypeCode_ptr create_interface_tc (const char *id, const char *name);
 
-    CORBA::TypeCode_ptr create_string_tc (
-        CORBA::ULong bound
-        );
+    CORBA::TypeCode_ptr create_string_tc (CORBA::ULong bound);
 
-    CORBA::TypeCode_ptr create_wstring_tc (
-        CORBA::ULong bound
-        );
+    CORBA::TypeCode_ptr create_wstring_tc (CORBA::ULong bound);
 
     CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
-        CORBA::UShort scale
-        );
+        CORBA::UShort scale);
 
     CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
-        CORBA::TypeCode_ptr element_type
-        );
+        CORBA::TypeCode_ptr element_type);
 
     CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
-        CORBA::TypeCode_ptr element_type
-        );
+        CORBA::TypeCode_ptr element_type);
 
     CORBA::TypeCode_ptr create_value_tc (
         const char *id,
         const char *name,
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq &members
-        );
+        const CORBA::ValueMemberSeq &members);
 
     CORBA::TypeCode_ptr create_value_box_tc (
         const char *id,
         const char *name,
-        CORBA::TypeCode_ptr boxed_type
-        );
+        CORBA::TypeCode_ptr boxed_type);
 
-    CORBA::TypeCode_ptr create_native_tc (
-        const char *id,
-        const char *name
-        );
+    CORBA::TypeCode_ptr create_native_tc (const char *id, const char *name);
 
-    CORBA::TypeCode_ptr create_recursive_tc (
-        const char *id
-        );
+    CORBA::TypeCode_ptr create_recursive_tc (const char *id);
 
     CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char *id,
-        const char *name
-        );
+        const char *name);
 
     CORBA::TypeCode_ptr create_local_interface_tc (
         const char *id,
-        const char *name
-        );
+        const char *name);
 
     CORBA::TypeCode_ptr create_component_tc (
         const char *id,
-        const char *name
-        );
+        const char *name);
 
     CORBA::TypeCode_ptr create_home_tc (
         const char *id,
-        const char *name
-
-        );
+        const char *name);
 
     CORBA::TypeCode_ptr create_event_tc (
         const char *id,
         const char *name,
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq &members
-        );
+        const CORBA::ValueMemberSeq &members);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -428,8 +382,7 @@ namespace CORBA
      * operation timesout and returns, any invocations showing up on
      * the server will be buffered by TCP.
      **/
-    void run (ACE_Time_Value &tv
-              );
+    void run (ACE_Time_Value &tv);
 
     /**
      * Instructs the ORB to initialize itself and run its event loop in
@@ -446,8 +399,7 @@ namespace CORBA
      * operation timesout and returns, any invocations showing up on
      * the server will be buffered by TCP.
      **/
-    void run (ACE_Time_Value *tv
-              );
+    void run (ACE_Time_Value *tv);
 
     /// Returns an indication of whether the ORB needs to perform some
     /// work.
@@ -460,8 +412,7 @@ namespace CORBA
      * @note This is useful for implementing an event loop with an
      *       idle timeout.
      */
-    CORBA::Boolean work_pending (ACE_Time_Value &tv
-                                 );
+    CORBA::Boolean work_pending (ACE_Time_Value &tv);
 
     /**
      * This operation performs an implementation-defined unit of work.
@@ -470,10 +421,8 @@ namespace CORBA
      * appropriate @c ACE_Time_Value as described in run().
      **/
     void perform_work (void);
-    void perform_work (ACE_Time_Value &tv
-                       );
-    void perform_work (ACE_Time_Value *tv
-                       );
+    void perform_work (ACE_Time_Value &tv);
+    void perform_work (ACE_Time_Value *tv);
 
     /**
      * This operation instructs the ORB to shut down. Shutting down the
@@ -483,8 +432,7 @@ namespace CORBA
      * deactivation or other operations associated with object adapters)
      * has completed.
      */
-    void shutdown (CORBA::Boolean wait_for_completion = false
-                   );
+    void shutdown (CORBA::Boolean wait_for_completion = false);
 
     /**
      * Explicitly destroy the ORB, releasing any resources.  Note that
@@ -500,10 +448,7 @@ namespace CORBA
      */
     void destroy (void);
 
-    CORBA::Object_ptr resolve_initial_references (
-        const char *name
-
-      );
+    CORBA::Object_ptr resolve_initial_references (const char *name);
 
     /**
      * This method acts as a mini-bootstrapping Naming Service, which is
@@ -523,25 +468,20 @@ namespace CORBA
      */
     CORBA::Object_ptr resolve_initial_references (
       const char *name,
-      ACE_Time_Value *timeout
-      );
+      ACE_Time_Value *timeout);
 
 #if !defined(CORBA_E_MICRO)
     /// Register an object reference with the ORB.
-    void register_initial_reference (const char * id,
-                                     CORBA::Object_ptr obj
-                                     );
+    void register_initial_reference (const char * id, CORBA::Object_ptr obj);
 #endif
 
     /// Returns a sequence of ObjectIds that lists which objects have
     /// references available via the initial references mechanism.
-    CORBA::ORB::ObjectIdList_ptr list_initial_services (
-      void);
+    CORBA::ORB::ObjectIdList_ptr list_initial_services (void);
 
 #if !defined(CORBA_E_MICRO)
     CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                     const CORBA::Any& val
-                                     );
+                                     const CORBA::Any& val);
 #endif
 
     // ----------------------------------------------------------------
@@ -551,8 +491,7 @@ namespace CORBA
 #if !defined(CORBA_E_MICRO)
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
-    CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                     );
+    CORBA::Policy_ptr _create_policy (CORBA::PolicyType type);
 #endif
 
     // Reference counting...
@@ -608,12 +547,10 @@ namespace CORBA
     void resolve_service (TAO::MCAST_SERVICEID service_id);
 
     /// Convert an OMG IOR into an object reference.
-    CORBA::Object_ptr ior_string_to_object (const char* ior
-                                           );
+    CORBA::Object_ptr ior_string_to_object (const char* ior);
 
     /// Convert an URL style IOR into an object reference.
-    CORBA::Object_ptr url_ior_string_to_object (const char* ior
-                                               );
+    CORBA::Object_ptr url_ior_string_to_object (const char* ior);
 
     /// Check if ORB has shutdown.  If it has, throw the appropriate
     /// exception.
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 8e1581ef989..533b348acc1 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -24,9 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace PortableInterceptor
 {
   void
-  register_orb_initializer (
-    ORBInitializer_ptr init
-    )
+  register_orb_initializer (ORBInitializer_ptr init)
   {
     {
       // Using ACE_Static_Object_Lock::instance() precludes
@@ -69,9 +67,7 @@ namespace PortableInterceptor
 
     if (orbinitializer_registry_ != 0)
       {
-        orbinitializer_registry_->register_orb_initializer (
-          init
-         );
+        orbinitializer_registry_->register_orb_initializer (init);
       }
     else
       {
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 81c1d59ae05..dc53a16dde8 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -21,10 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
-#include "tao/default_environment.h"
-
-#include "ace/CORBA_macros.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -35,10 +32,7 @@ namespace PortableInterceptor
 
   /// Register an ORBInitializer with the global ORBInitializer
   /// table.
-  TAO_Export void register_orb_initializer (
-      ORBInitializer_ptr init
-
-    );
+  TAO_Export void register_orb_initializer (ORBInitializer_ptr init);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 4b90a6adff5..a450106d554 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -22,9 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Basic_Types.h"
-#include "tao/SystemException.h"
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -55,8 +53,7 @@ namespace TAO
       /// Register an ORBInitializer with the underlying ORBInitializer
       /// array.
       virtual void register_orb_initializer (
-        PortableInterceptor::ORBInitializer_ptr init
-        ) = 0;
+        PortableInterceptor::ORBInitializer_ptr init) = 0;
 
       /**
        * Begin initialization of all registered ORBInitializers before
@@ -70,8 +67,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
-        ) = 0;
+        PortableInterceptor::SlotId &slotid) = 0;
 
       /**
        * Complete initialization of all registered ORBInitializers after
@@ -92,8 +88,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId slotid
-        ) = 0;
+        PortableInterceptor::SlotId slotid) = 0;
   };
 }
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index b9eb4757dfa..10db2c27840 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -23,6 +23,7 @@
 #include "tao/Thread_Lane_Resources_Manager.h"
 #include "tao/TSS_Resources.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Network_Priority_Protocols_Hooks.h"
 #include "tao/IORInterceptor_Adapter.h"
 #include "tao/IORInterceptor_Adapter_Factory.h"
 #include "tao/debug.h"
@@ -37,6 +38,7 @@
 #include "tao/ORBInitializer_Registry_Adapter.h"
 #include "tao/Codeset_Manager.h"
 #include "tao/GIOP_Fragmentation_Strategy.h"
+#include "tao/SystemException.h"
 
 #include "tao/Valuetype_Adapter.h"
 #include "tao/Valuetype_Adapter_Factory.h"
@@ -52,7 +54,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Static_Object_Lock.h"
 #include "ace/Auto_Ptr.h"
-
+#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 // Needed to set ACE_LOG_MSG::msg_ostream()
@@ -118,7 +120,7 @@ TAO_ORB_Core_Static_Resources::instance (void)
   ACE_Service_Gestalt *current = ACE_Service_Config::current();
   TAO_ORB_Core_Static_Resources* tocsr =
     ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance
-    (current,"TAO_ORB_Core_Static_Resources",true);
+    (current, "TAO_ORB_Core_Static_Resources", true);
 
   if (tocsr == 0)
     {
@@ -129,7 +131,7 @@ TAO_ORB_Core_Static_Resources::instance (void)
       // harmless memory leak would be to use reference counting.
       current->process_directive(ace_svc_desc_TAO_ORB_Core_Static_Resources);
       tocsr = ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance
-        (current,"TAO_ORB_Core_Static_Resources",true);
+        (current, "TAO_ORB_Core_Static_Resources", true);
 
       ACE_Service_Gestalt *global = ACE_Service_Config::global();
       if (current != global)
@@ -141,13 +143,14 @@ TAO_ORB_Core_Static_Resources::instance (void)
         }
     }
 
-  //  return TAO_ORB_Core_Static_Resources::instance_;
   return tocsr;
 }
 
 TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
   : sync_scope_hook_ (0),
     protocols_hooks_name_ ("Protocols_Hooks"),
+    network_priority_protocols_hooks_name_ (
+      "Network_Priority_Protocols_Hooks"),
     timeout_hook_ (0),
     connection_timeout_hook_ (0),
     endpoint_selector_factory_name_ ("Default_Endpoint_Selector_Factory"),
@@ -178,6 +181,8 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot
 {
   this->sync_scope_hook_ = other.sync_scope_hook_;
   this->protocols_hooks_name_ = other.protocols_hooks_name_;
+  this->network_priority_protocols_hooks_name_ =
+    other.network_priority_protocols_hooks_name_;
   this->timeout_hook_ = other.timeout_hook_;
   this->connection_timeout_hook_ = other.connection_timeout_hook_;
   this->endpoint_selector_factory_name_ =
@@ -204,6 +209,7 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   : protocols_hooks_ (0),
+    network_priority_protocols_hooks_ (0),
 #if TAO_USE_LOCAL_MEMORY_POOL == 1
     use_local_memory_pool_ (true),
 #else
@@ -674,12 +680,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
         {
           if (this->orb_params ()->preferred_interfaces (
                 ACE_TEXT_ALWAYS_CHAR (current_arg)) == false)
-            ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
+            throw ::CORBA::INTERNAL (
+              CORBA::SystemException::_tao_minor_code (
+                TAO_ORB_CORE_INIT_LOCATION_CODE,
+                0),
+              CORBA::COMPLETED_NO);
 
           arg_shifter.consume_arg ();
         }
@@ -739,12 +744,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                           ACE_TEXT ("Invalid ORBInitRef argument '%s'")
                           ACE_TEXT ("format is ObjectID=IOR\n"),
                           current_arg));
-              ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
+              throw ::CORBA::INTERNAL (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_ORB_CORE_INIT_LOCATION_CODE,
+                  0),
+                CORBA::COMPLETED_NO);
             }
           ACE_CString object_id (ACE_TEXT_ALWAYS_CHAR(current_arg),
                                  pos - current_arg);
@@ -757,12 +761,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                           ACE_TEXT ("Duplicate -ORBInitRef ")
                           ACE_TEXT ("argument '%s'\n"),
                           current_arg));
-              ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
+              throw ::CORBA::INTERNAL (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_ORB_CORE_INIT_LOCATION_CODE,
+                  0),
+                CORBA::COMPLETED_NO);
             }
           arg_shifter.consume_arg ();
         }
@@ -997,7 +1000,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
           // Fill in later
           // @@ To do later: Priyanka.
 
-          ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1);
+          throw ::CORBA::NO_IMPLEMENT ();
         }
        else if (0 != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBUseSharedProfile"))))
@@ -1077,12 +1080,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                                               : current_arg)));
             }
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            -1);
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ORB_CORE_INIT_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       ////////////////////////////////////////////////////////////////
@@ -1116,12 +1118,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                           env_endpoint));
             }
 
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            -1);
+          throw ::CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ORB_CORE_INIT_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
 
@@ -1154,12 +1155,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("ORB Core unable to find a ")
                   ACE_TEXT ("Resource Factory instance")));
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INTERNAL (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ORB_CORE_INIT_LOCATION_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   // Set whether or not to use the local memory pool for the cdr allocators.
@@ -1174,12 +1174,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("ORB Core unable to initialize reactor")));
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INITIALIZE (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ORB_CORE_INIT_LOCATION_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
@@ -1190,12 +1189,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("ORB Core unable to find a ")
                   ACE_TEXT ("Server Strategy Factory instance")));
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INTERNAL (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ORB_CORE_INIT_LOCATION_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   ssf->open (this);
@@ -1249,13 +1247,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       static char const mcast_fmt[] = "mcast://:%d::";
       static size_t const PORT_BUF_SIZE = 256;
 
-      char def_init_ref[PORT_BUF_SIZE] = { 0 }; // snprintf() doesn't
-                                                // null terminate.
-                                                // Make sure we do.
+      char def_init_ref[PORT_BUF_SIZE] = { 0 };
 
       ACE_OS::snprintf (def_init_ref,
-                        PORT_BUF_SIZE - 1, // Account for null
-                                           // terminator.
+                        PORT_BUF_SIZE,
                         mcast_fmt,
                         ns_port);
 
@@ -1303,12 +1298,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
   // all factories loaded by the service configurator.
   // Load all protocol factories!
   if (trf->init_protocol_factories () == -1)
-    ACE_THROW_RETURN (CORBA::INITIALIZE (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_ORB_CORE_INIT_LOCATION_CODE,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      -1);
+    throw ::CORBA::INITIALIZE (
+      CORBA::SystemException::_tao_minor_code (
+        TAO_ORB_CORE_INIT_LOCATION_CODE,
+        0),
+      CORBA::COMPLETED_NO);
 
   // init the ORB core's pointer
   this->protocol_factories_ = trf->get_protocol_factories ();
@@ -1325,17 +1319,28 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
     (this->configuration (),
      ACE_TEXT_CHAR_TO_TCHAR (protocols_hooks_name.c_str()));
 
-  // Must have valid protocol hooks.
-  if (this->protocols_hooks_ == 0)
-    ACE_THROW_RETURN (CORBA::INITIALIZE (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_ORB_CORE_INIT_LOCATION_CODE,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      -1);
+  if (this->protocols_hooks_ != 0)
+    {
+      // Initialize the protocols hooks instance.
+      this->protocols_hooks_->init_hooks (this);
+    }
 
-  // Initialize the protocols hooks instance.
-  this->protocols_hooks_->init_hooks (this);
+  // Look in the service repository for an instance of the
+  // Network Priority Protocol Hooks.
+  const ACE_CString &network_priority_protocols_hooks_name =
+     TAO_ORB_Core_Static_Resources::instance ()->
+       network_priority_protocols_hooks_name_;
+
+  this->network_priority_protocols_hooks_ =
+    ACE_Dynamic_Service<TAO_Network_Priority_Protocols_Hooks>::instance
+    (this->configuration (),
+     ACE_TEXT_CHAR_TO_TCHAR (network_priority_protocols_hooks_name.c_str()));
+
+  if (this->network_priority_protocols_hooks_ != 0)
+    {
+      // Initialize the protocols hooks instance.
+      this->network_priority_protocols_hooks_->init_hooks (this);
+    }
 
   // As a last step perform initializations of the service callbacks
   this->services_callbacks_init ();
@@ -1356,7 +1361,7 @@ TAO_ORB_Core::fini (void)
       // Shutdown the ORB and block until the shutdown is complete.
       this->shutdown (1);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ACE_CString message =
         "Exception caught in trying to shutdown ";
@@ -1718,6 +1723,16 @@ TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks_name)
 }
 
 void
+TAO_ORB_Core::set_network_priority_protocols_hooks (
+  const char *network_priority_protocols_hooks_name)
+{
+  // Is synchronization necessary?
+  TAO_ORB_Core_Static_Resources::instance ()->
+    network_priority_protocols_hooks_name_ =
+      network_priority_protocols_hooks_name;
+}
+
+void
 TAO_ORB_Core::services_callbacks_init (void)
 {
   // We (should) know what are the services that would need
@@ -1731,38 +1746,32 @@ TAO_ORB_Core::services_callbacks_init (void)
 TAO::Invocation_Status
 TAO_ORB_Core::service_raise_comm_failure (
     IOP::ServiceContextList &clist,
-    TAO_Profile *profile
-    )
+    TAO_Profile *profile)
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
-                 raise_comm_failure (clist,
-                                     profile
-                                    );
+                 raise_comm_failure (clist, profile);
     }
 
-  ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          errno),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_SYSTEM_EXCEPTION);
+  throw ::CORBA::COMM_FAILURE (
+    CORBA::SystemException::_tao_minor_code (
+      TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
+      errno),
+    CORBA::COMPLETED_MAYBE);
 }
 
 
 TAO::Invocation_Status
 TAO_ORB_Core::service_raise_transient_failure (
     IOP::ServiceContextList &clist,
-    TAO_Profile *profile
-    )
+    TAO_Profile *profile)
 {
   if (this->ft_service_.service_callback ())
     {
       return
         this->ft_service_.service_callback ()->raise_transient_failure (clist,
-                                 profile
-                                );
+                                 profile);
     }
 
   return TAO::TAO_INVOKE_FAILURE;
@@ -1772,14 +1781,21 @@ void
 TAO_ORB_Core::service_context_list (
     TAO_Stub *stub,
     TAO_Service_Context &service_context,
-    CORBA::Boolean restart
-    )
+    CORBA::Boolean restart)
 {
   // @NOTE: Can use Interceptors instead..
-  this->protocols_hooks_->rt_service_context (stub,
-                                              service_context,
-                                              restart
-                                             );
+  if (this->protocols_hooks_ != 0)
+    {
+      this->protocols_hooks_->rt_service_context (stub, service_context, restart);
+    }
+
+  // call the network priority protocols hooks that has been
+  // registered.
+  if (network_priority_protocols_hooks_ != 0)
+    {
+      this->network_priority_protocols_hooks_->np_service_context (stub,
+        service_context, restart);
+    }
 }
 
 TAO_Client_Strategy_Factory *
@@ -1823,7 +1839,6 @@ TAO_ORB_Core::root_poa (void)
       // the correct service repository (ours), instead of the global one.
       ACE_Service_Config_Guard scg (this->configuration ());
 
-
       TAO_ORB_Core_Static_Resources* static_resources =
         TAO_ORB_Core_Static_Resources::instance ();
 
@@ -1861,11 +1876,9 @@ TAO_ORB_Core::root_poa (void)
           poa_adapter->open ();
 
           // @@ Not exception safe
-          this->root_poa_ =
-            poa_adapter->root ();
+          this->root_poa_ = poa_adapter->root ();
 
-          this->adapter_registry_.insert (poa_adapter.get ()
-                                         );
+          this->adapter_registry_.insert (poa_adapter.get ());
 
           poa_adapter.release ();
         }
@@ -1891,14 +1904,10 @@ TAO_ORB_Core::poa_adapter (void)
 
 TAO_Stub *
 TAO_ORB_Core::create_stub (const char *repository_id,
-                           const TAO_MProfile &profiles
-                           )
+                           const TAO_MProfile &profiles)
 {
   TAO_Stub *retval =
-    this->stub_factory ()->create_stub (repository_id,
-                                        profiles,
-                                        this
-                                       );
+    this->stub_factory ()->create_stub (repository_id, profiles, this);
   return retval;
 }
 
@@ -1914,8 +1923,7 @@ TAO_ORB_Core::request_dispatcher (TAO_Request_Dispatcher *request_dispatcher)
 TAO_Stub *
 TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
                                   const char *type_id,
-                                  CORBA::PolicyList *policy_list
-                                  )
+                                  CORBA::PolicyList *policy_list)
 {
   // Add the Polices contained in "policy_list" to each profile so
   // that those policies will be exposed to the client in the IOR.  In
@@ -1927,9 +1935,9 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
   // orbos\98-05-05.pdf Section 5.4)
   if (policy_list->length () != 0)
     {
-      TAO_Profile * profile;
+      TAO_Profile * profile = 0;
 
-      const CORBA::ULong count = mprofile.profile_count ();
+      CORBA::ULong const count = mprofile.profile_count ();
       for (CORBA::ULong i = 0; i < count; ++i)
         {
           // Get the ith profile
@@ -1939,8 +1947,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
     }
 
   /// Initialize a TAO_Stub object with the mprofile thats passed.
-  TAO_Stub *stub =
-    this->create_stub (type_id, mprofile);
+  TAO_Stub *stub = this->create_stub (type_id, mprofile);
 
   stub->base_profiles ().policy_list (policy_list);
 
@@ -1948,8 +1955,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
 }
 
 void
-TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator
-                                      )
+TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator)
 {
   if (this->bidir_adapter_ == 0)
     {
@@ -1989,8 +1995,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
       {
         ::TAO_ORB_Core * const other_core = (*i).second.core ();
 
-        if (this->is_collocation_enabled (other_core,
-                                          mprofile))
+        if (this->is_collocation_enabled (other_core, mprofile))
           {
             other_core->_incr_refcnt();
              TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core);
@@ -2005,8 +2010,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
       TAO_Adapter_Registry *ar =
         collocated_orb_core.get ()->adapter_registry ();
 
-      x = ar->create_collocated_object (stub,
-                                        mprofile);
+      x = ar->create_collocated_object (stub, mprofile);
     }
 
 
@@ -2023,16 +2027,14 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
 }
 
 CORBA::Long
-TAO_ORB_Core::initialize_object (TAO_Stub *stub,
-                                 CORBA::Object_ptr)
+TAO_ORB_Core::initialize_object (TAO_Stub *stub, CORBA::Object_ptr)
 {
   // @@ What about forwarding.  With this approach we are never forwarded
   //    when we use collocation!
   const TAO_MProfile &mprofile =
     stub->base_profiles ();
 
-  return initialize_object_i (stub,
-                              mprofile);
+  return initialize_object_i (stub, mprofile);
 }
 
 CORBA::Long
@@ -2044,8 +2046,7 @@ TAO_ORB_Core::reinitialize_object (TAO_Stub *stub)
 }
 
 CORBA::Long
-TAO_ORB_Core::initialize_object_i (TAO_Stub *stub,
-                                   const TAO_MProfile &mprofile)
+TAO_ORB_Core::initialize_object_i (TAO_Stub *stub, const TAO_MProfile &mprofile)
 
 {
   CORBA::Long retval = 0;
@@ -2143,9 +2144,7 @@ TAO_ORB_Core::lf_strategy (void)
 }
 
 int
-TAO_ORB_Core::run (ACE_Time_Value *tv,
-                   int perform_work
-                   )
+TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
 {
   // ORB::run may be called from a thread, different from the one that
   // did the ORB_init, consequently we must establish the Service
@@ -2264,8 +2263,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 
 
 void
-TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
-                        )
+TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -2276,8 +2274,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
     // Check if we are on the right state, i.e. do not accept
     // shutdowns with the 'wait_for_completion' flag set in the middle
     // of an upcall (because those deadlock).
-    this->adapter_registry_.check_close (wait_for_completion
-                                        );
+    this->adapter_registry_.check_close (wait_for_completion);
 
     // Set the 'has_shutdown' flag, so any further attempt to shutdown
     // becomes a noop.
@@ -2288,8 +2285,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
     // does!) callback into ORB Core code.
   }
 
-  this->adapter_registry_.close (wait_for_completion
-                                );
+  this->adapter_registry_.close (wait_for_completion);
 
   // Shutdown reactor.
   this->thread_lane_resources_manager ().shutdown_reactor ();
@@ -2373,8 +2369,7 @@ TAO_ORB_Core::destroy_interceptors (void)
 #if TAO_HAS_INTERCEPTORS == 1
       if (this->client_request_interceptor_adapter_ != 0)
         {
-          this->client_request_interceptor_adapter_->destroy_interceptors (
-            );
+          this->client_request_interceptor_adapter_->destroy_interceptors ();
 
           delete this->client_request_interceptor_adapter_;
           this->client_request_interceptor_adapter_ = 0;
@@ -2382,8 +2377,7 @@ TAO_ORB_Core::destroy_interceptors (void)
 
       if (this->server_request_interceptor_adapter_ != 0)
         {
-          this->server_request_interceptor_adapter_->destroy_interceptors (
-            );
+          this->server_request_interceptor_adapter_->destroy_interceptors ();
 
           delete this->server_request_interceptor_adapter_;
           this->server_request_interceptor_adapter_ = 0;
@@ -2393,8 +2387,7 @@ TAO_ORB_Core::destroy_interceptors (void)
 
       if (this->ior_interceptor_adapter_ != 0)
         {
-          this->ior_interceptor_adapter_->destroy_interceptors (
-              );
+          this->ior_interceptor_adapter_->destroy_interceptors ();
 
           this->ior_interceptor_adapter_ = 0;
         }
@@ -2502,8 +2495,7 @@ TAO_ORB_Core::resolve_compression_manager_i (void)
 
   if (loader != 0)
     {
-      this->compression_manager_ =
-        loader->create_object (this->orb_, 0, 0);
+      this->compression_manager_ = loader->create_object (this->orb_, 0, 0);
     }
 }
 
@@ -2529,8 +2521,7 @@ TAO_ORB_Core::resolve_poa_current_i (void)
 
   if (loader != 0)
     {
-      this->poa_current_ =
-        loader->create_object (this->orb_, 0, 0);
+      this->poa_current_ = loader->create_object (this->orb_, 0, 0);
     }
 }
 
@@ -2559,8 +2550,7 @@ TAO_ORB_Core::resolve_picurrent_i (void)
 
   if (loader != 0)
     {
-      CORBA::Object_ptr pi =
-        loader->create_object (this->orb_, 0, 0);
+      CORBA::Object_ptr pi = loader->create_object (this->orb_, 0, 0);
 
       this->pi_current_ = pi;
     }
@@ -2592,8 +2582,7 @@ TAO_ORB_Core::resolve_dynanyfactory_i (void)
 
   if (loader != 0)
     {
-      this->dynany_factory_ =
-        loader->create_object (this->orb_, 0, 0);
+      this->dynany_factory_ = loader->create_object (this->orb_, 0, 0);
     }
 }
 
@@ -2619,8 +2608,7 @@ TAO_ORB_Core::resolve_iormanipulation_i (void)
 
   if (loader != 0)
     {
-      this->ior_manip_factory_ =
-        loader->create_object (this->orb_, 0, 0);
+      this->ior_manip_factory_ = loader->create_object (this->orb_, 0, 0);
     }
 }
 
@@ -2661,8 +2649,7 @@ TAO_ORB_Core::resolve_ior_table_i (void)
 
 int
 TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
-                                   const ACE_CString &endpoints
-                                   )
+                                   const ACE_CString &endpoints)
 {
   if (this->orb_params ()->add_endpoints (lane,
                                           endpoints) != 0)
@@ -2671,12 +2658,11 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
                   ACE_TEXT ("(%P|%t)\n")
                   ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ())));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                           CORBA::SystemException::_tao_minor_code (
-                              TAO_ORB_CORE_INIT_LOCATION_CODE,
-                              EINVAL),
-                           CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ORB_CORE_INIT_LOCATION_CODE,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   return 0;
@@ -2718,8 +2704,7 @@ TAO_ORB_Core::resolve_rir (const char *name
         }
       else
         {
-          TAO_Connector_Registry *conn_reg =
-            this->connector_registry ();
+          TAO_Connector_Registry *conn_reg = this->connector_registry ();
 
           // Obtain the appropriate object key delimiter for the
           // specified protocol.
@@ -2937,7 +2922,7 @@ TAO_ORB_Core::implrepo_service (void)
           // @@ Worry about assigning a different IOR? (brunsch)
           this->implrepo_service_ = temp._retn ();
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
           // Just make sure that we have a null pointer.  Ignore the exception
           // anyway.
@@ -3011,8 +2996,7 @@ int
 TAO_ORB_Core::add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup,
                                     size_t &slot_id)
 {
-  return this->tss_cleanup_funcs_.register_cleanup_function (cleanup,
-                                                             slot_id);
+  return this->tss_cleanup_funcs_.register_cleanup_function (cleanup, slot_id);
 }
 
 void
@@ -3135,91 +3119,68 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-TAO_ORB_Core::get_policy (CORBA::PolicyType type
-                          )
+TAO_ORB_Core::get_policy (CORBA::PolicyType type)
 {
   CORBA::Policy_var result;
 
-  TAO_Policy_Manager *policy_manager =
-    this->policy_manager ();
+  TAO_Policy_Manager *policy_manager = this->policy_manager ();
   if (policy_manager != 0)
     {
-      result = policy_manager->get_policy (type
-                                          );
+      result = policy_manager->get_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
-      result =
-        this->get_default_policies ()->get_policy (type
-                                                  );
+      result = this->get_default_policies ()->get_policy (type);
     }
 
   return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type
-                                            )
+TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type)
 {
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
+  TAO_Policy_Current &policy_current = this->policy_current ();
 
-  CORBA::Policy_var result =
-    policy_current.get_policy (type
-                              );
+  CORBA::Policy_var result = policy_current.get_policy (type);
 
   if (CORBA::is_nil (result.in ()))
     {
-      result = this->get_policy (type
-                                );
+      result = this->get_policy (type);
     }
 
   return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
-                                 )
+TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   CORBA::Policy_var result;
 
-  TAO_Policy_Manager *policy_manager =
-    this->policy_manager ();
+  TAO_Policy_Manager *policy_manager = this->policy_manager ();
   if (policy_manager != 0)
     {
-      result =
-        policy_manager->get_cached_policy (type
-                                          );
+      result = policy_manager->get_cached_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
-      result =
-        this->get_default_policies ()->get_cached_policy (type
-                                                         );
+      result = this->get_default_policies ()->get_cached_policy (type);
     }
 
   return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_ORB_Core::get_cached_policy_including_current (
-    TAO_Cached_Policy_Type type
-    )
+TAO_ORB_Core::get_cached_policy_including_current (TAO_Cached_Policy_Type type)
 {
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
+  TAO_Policy_Current &policy_current = this->policy_current ();
 
-  CORBA::Policy_var result =
-    policy_current.get_cached_policy (type
-                                     );
+  CORBA::Policy_var result = policy_current.get_cached_policy (type);
 
   if (CORBA::is_nil (result.in ()))
     {
-      result =
-        this->get_cached_policy (type
-                                );
+      result = this->get_cached_policy (type);
     }
 
   return result._retn ();
@@ -3241,13 +3202,11 @@ TAO_ORB_Core::default_environment (CORBA::Environment *env)
 
 void
 TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::IORInterceptor_ptr interceptor
-   )
+   PortableInterceptor::IORInterceptor_ptr interceptor)
 {
   if (this->ior_interceptor_adapter ())
     {
-      this->ior_interceptor_adapter_->add_interceptor (interceptor
-                                                      );
+      this->ior_interceptor_adapter_->add_interceptor (interceptor);
     }
   else
     {
@@ -3281,15 +3240,13 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
 
               if (ior_ap_factory)
                 {
-                  this->ior_interceptor_adapter_ =
-                    ior_ap_factory->create ();
+                  this->ior_interceptor_adapter_ = ior_ap_factory->create ();
                 }
             }
-          catch ( ::CORBA::Exception& ex)
+          catch (const ::CORBA::Exception& ex)
             {
               ex._tao_print_exception (
-                "Cannot initialize the "
-                "ior_interceptor_adapter \n");
+                "Cannot initialize the ior_interceptor_adapter \n");
             }
         }
     }
@@ -3306,8 +3263,7 @@ TAO_ORB_Core::add_interceptor (
 {
   if (this->clientrequestinterceptor_adapter_i ())
     {
-      this->client_request_interceptor_adapter_->add_interceptor (interceptor
-                                                                 );
+      this->client_request_interceptor_adapter_->add_interceptor (interceptor);
     }
   else
     {
@@ -3356,8 +3312,7 @@ TAO_ORB_Core::add_interceptor (
 {
   if (this->serverrequestinterceptor_adapter_i ())
     {
-      this->server_request_interceptor_adapter_->add_interceptor (interceptor
-                                                                 );
+      this->server_request_interceptor_adapter_->add_interceptor (interceptor);
     }
   else
     {
@@ -3374,15 +3329,13 @@ TAO_ORB_Core::add_interceptor (
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-   const CORBA::PolicyList& policies
-   )
+   const CORBA::PolicyList& policies)
 {
   if (this->clientrequestinterceptor_adapter_i ())
     {
       this->client_request_interceptor_adapter_->add_interceptor (
         interceptor,
-        policies
-       );
+        policies);
 
     }
   else
@@ -3400,15 +3353,13 @@ TAO_ORB_Core::add_interceptor (
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-   const CORBA::PolicyList& policies
-   )
+   const CORBA::PolicyList& policies)
 {
   if (this->serverrequestinterceptor_adapter_i ())
     {
       this->server_request_interceptor_adapter_->add_interceptor (
         interceptor,
-        policies
-       );
+        policies);
 
     }
   else
@@ -3474,22 +3425,19 @@ TAO_ORB_Core::valuetype_adapter (void)
 
               if (vt_ap_factory)
                 {
-                  this->valuetype_adapter_ =
-                    vt_ap_factory->create ();
+                  this->valuetype_adapter_ = vt_ap_factory->create ();
                 }
             }
-          catch ( ::CORBA::Exception& ex)
+          catch (const ::CORBA::Exception& ex)
             {
               ex._tao_print_exception (
-                "Cannot initialize the "
-                "valuetype_adapter \n");
+                "Cannot initialize the valuetype_adapter \n");
             }
         }
 
       if (this->valuetype_adapter_ == 0)
         {
-           ACE_THROW_RETURN (CORBA::INTERNAL (),
-                             0);
+           throw ::CORBA::INTERNAL ();
         }
     }
 
@@ -3525,7 +3473,7 @@ TAO_ORB_Core_instance (void)
               CORBA::ORB_var orb =
                 CORBA::ORB_init (argc, 0, 0);
             }
-          catch ( ::CORBA::Exception&)
+          catch (const ::CORBA::Exception&)
             {
               // @@ What should we do here?
             }
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 301cdb1427c..3b42fc720dd 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -80,6 +80,7 @@ class TAO_Profile;
 class TAO_Endpoint_Selector_Factory;
 class TAO_Message_State_Factory;
 class TAO_Protocols_Hooks;
+class TAO_Network_Priority_Protocols_Hooks;
 class TAO_BiDir_Adapter;
 
 class TAO_Flushing_Strategy;
@@ -160,8 +161,7 @@ class TAO_Export TAO_ORB_Core
   friend class TAO_ORB_Core_Auto_Ptr;
   friend CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          char *argv[],
-                                         const char *,
-                                         CORBA::Environment &);
+                                         const char *);
 public:
 
   /// Constructor.
@@ -323,6 +323,10 @@ public:
   /// Sets the value of TAO_ORB_Core::protocols_hooks_
   static void set_protocols_hooks (const char *protocols_hooks_name);
 
+  /// Sets the value of TAO_ORB_Core::network_priority_protocols_hooks_
+  static void set_network_priority_protocols_hooks (
+    const char *network_priority_protocols_hooks_name);
+
   /// Sets the value of TAO_ORB_Core::endpoint_selector_factory_
   static void set_endpoint_selector_factory (
     const char *endpoint_selector_factory_name);
@@ -338,6 +342,10 @@ public:
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
   TAO_Protocols_Hooks * get_protocols_hooks (void);
 
+  /// Gets the value of TAO_ORB_Core::network_priority_protocols_hooks__
+  TAO_Network_Priority_Protocols_Hooks * 
+    get_network_priority_protocols_hooks (void);
+
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
 
@@ -419,24 +427,20 @@ public:
 
   /// Get a policy.  First, check the ORB-level Policy Manager, then
   /// check the ORB defaults.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                               );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type);
 
   /// Get a policy.  First, check the thread current, then check the
   /// ORB-level Policy Manager, then check the ORB defaults.
-  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type
-                                                 );
+  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type);
 
   /// Get a cached policy.  First, check the ORB-level Policy Manager,
   /// then check the ORB defaults.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                      );
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   /// Get a cached policy.  First, check the thread current, then
   /// check the ORB-level Policy Manager, then check the ORB defaults.
   CORBA::Policy_ptr get_cached_policy_including_current (
-      TAO_Cached_Policy_Type type
-     );
+      TAO_Cached_Policy_Type type);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -558,6 +562,9 @@ public:
   /// Handle to the factory for protocols_hooks_..
   TAO_Protocols_Hooks *protocols_hooks_;
 
+  /// Handle to the factory for network_priority_protocols_hooks_..
+  TAO_Network_Priority_Protocols_Hooks *network_priority_protocols_hooks_;
+
   /// Obtain the TSS resources of this orb.
   TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
 
@@ -571,8 +578,7 @@ public:
   /// Register a TSS cleanup function.  The slot ID for the
   /// corresponding ORB core TSS resource is returned by the reference
   /// argument.  This method return 0 on success, and -1 on failure.
-  int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup,
-                            size_t &slot_id);
+  int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, size_t &slot_id);
 
   /// Return the underlying TSS cleanup function registry.
   TAO_Cleanup_Func_Registry *tss_cleanup_funcs (void);
@@ -587,13 +593,10 @@ public:
   TAO_Thread_Lane_Resources &lane_resources (void);
 
   /// Run the event loop.
-  int run (ACE_Time_Value *tv,
-           int perform_work
-          );
+  int run (ACE_Time_Value *tv, int perform_work);
 
   /// End the event loop
-  void shutdown (CORBA::Boolean wait_for_completion
-                );
+  void shutdown (CORBA::Boolean wait_for_completion);
 
   /// Get the shutdown flag value
   bool has_shutdown (void) const;
@@ -613,16 +616,14 @@ public:
   /// based on the endpoint.
   TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
                                 const char *type_id,
-                                CORBA::PolicyList *policy_list
-                               );
+                                CORBA::PolicyList *policy_list);
 
   /// Factory method that create the "right" Stub depending on
   /// wheather RTCORBA is loaded or not. The factory used to create
   /// the stub, is loaded at ORB initialization, and its type depends
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
-                         const TAO_MProfile &profiles
-                        );
+                         const TAO_MProfile &profiles);
 
   /// Create a new object, use the adapter registry to create a
   /// collocated object, if not possible then create a regular
@@ -636,8 +637,7 @@ public:
   /// user decides to use lazy initialization of CORBA object, then
   /// this is the route that we have to take to do the
   /// initialization.
-  CORBA::Long initialize_object (TAO_Stub *the_stub,
-                                 CORBA::Object_ptr obj);
+  CORBA::Long initialize_object (TAO_Stub *the_stub, CORBA::Object_ptr obj);
 
   /// Reinitialise a stub after the effective profile has changed.
   /// This will happen after a location forward has been received
@@ -687,8 +687,7 @@ public:
 
   /// Resolve an initial reference via the -ORBInitRef and
   // -ORBDefaultInitRef options.
-  CORBA::Object_ptr resolve_rir (const char *name
-                                );
+  CORBA::Object_ptr resolve_rir (const char *name);
 
   /// Resolve the RT ORB reference for this ORB.
   CORBA::Object_ptr resolve_rt_orb (void);
@@ -698,9 +697,7 @@ public:
   const char *server_id (void) const;
 
   /// List all the service known by the ORB
-  CORBA::ORB_ObjectIdList *list_initial_references (
-
-    );
+  CORBA::ORB_ObjectIdList *list_initial_references (void);
 
   /// Reference counting...
   unsigned long _incr_refcnt (void);
@@ -754,15 +751,13 @@ public:
   /**
    * For details on how this is used please see the FT service
    */
-  CORBA::ULong hash_service (TAO_Profile *this_p,
-                             CORBA::ULong max);
+  CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max);
 
   /// Call the service layers with the Service Context to check
   /// whether they would like to add something to the list.
   void service_context_list (TAO_Stub *stub,
                              TAO_Service_Context &service_context,
-                             CORBA::Boolean retstart
-                            );
+                             CORBA::Boolean retstart);
 
   /// Return a reference to the Fault Tolerant service object.
   TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
@@ -772,16 +767,14 @@ public:
   /// this case.
   TAO::Invocation_Status service_raise_comm_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-     );
+      TAO_Profile *profile);
 
   /// Raise a transient failure exception if a service is not loaded,
   /// else delegate to the service to see what the service has to do
   /// for this case.
   TAO::Invocation_Status service_raise_transient_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-     );
+      TAO_Profile *profile);
 
   //@}
 
@@ -803,25 +796,21 @@ public:
 
   /// Register a client request interceptor.
   void add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-   );
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
   /// Register a server request interceptor.
   void add_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-   );
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
   /// Register a client request interceptor with policies.
   void add_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-   );
+    const CORBA::PolicyList& policies);
 
   /// Register a server request interceptor with policies.
   void add_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-   );
+    const CORBA::PolicyList& policies);
 
   /// Get the Client Request Interceptor adapter.
   /// Will not create a new one if not available yet.
@@ -834,9 +823,7 @@ public:
 #endif /* TAO_HAS_INTERCEPTORS */
 
   /// Register an IOR interceptor.
-  void add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-   );
+  void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor);
   //@}
 
   /// Return the valuetype adapter
@@ -871,8 +858,7 @@ public:
 
   /// Call the libraries to handover the validators if they havent
   /// registered yet with the list of validators.
-  void load_policy_validators (TAO_Policy_Validator &validator
-                              );
+  void load_policy_validators (TAO_Policy_Validator &validator);
 
   /// Return the flushing strategy
   /**
@@ -981,8 +967,7 @@ protected:
   /// Helper method to hold the common code part for -ORBEndpoint and
   /// -ORBListenEndpoint options.
   int set_endpoint_helper (const ACE_CString &lane,
-                           const ACE_CString &endpoints
-                          );
+                           const ACE_CString &endpoints);
 
   /// Return pointer to the policy factory registry associated with
   /// this ORB core.
@@ -1299,6 +1284,12 @@ public:
    */
   ACE_CString protocols_hooks_name_;
 
+
+  /**
+   * Name of the network_priority_protocols_hooks that needs to be instantiated.
+  */
+  ACE_CString network_priority_protocols_hooks_name_;
+
   /// The hook to be set for the RelativeRoundtripTimeoutPolicy.
   TAO_ORB_Core::Timeout_Hook timeout_hook_;
 
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index 2492c939b3e..825d94fe73c 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -75,6 +75,12 @@ TAO_ORB_Core::get_protocols_hooks (void)
   return this->protocols_hooks_;
 }
 
+ACE_INLINE TAO_Network_Priority_Protocols_Hooks *
+TAO_ORB_Core::get_network_priority_protocols_hooks (void)
+{
+  return this->network_priority_protocols_hooks_;
+}
+
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::service_profile_selection (const TAO_MProfile &mprofile,
                                          TAO_Profile  *&profile)
@@ -98,8 +104,7 @@ TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj)
   CORBA::Boolean retval = 0;
   if (this->ft_service_.service_callback ())
     {
-      retval =
-        this->ft_service_.service_callback ()->object_is_nil (obj);
+      retval = this->ft_service_.service_callback ()->object_is_nil (obj);
     }
   return retval;
 }
@@ -610,7 +615,7 @@ TAO_ORB_Core::is_permanent_forward_condition
   const TAO_Service_Callbacks *service_callback =
       this->fault_tolerance_service ().service_callback ();
 
-  const CORBA::Boolean permanent_forward_condition =
+  CORBA::Boolean const permanent_forward_condition =
       service_callback &&
       service_callback->is_permanent_forward_condition (obj,
                                                         service_context);
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index f3cba5e3281..266ed9542f6 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO::ORT_Adapter_Impl::tao_server_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->server_id ();
@@ -23,7 +22,6 @@ TAO::ORT_Adapter_Impl::tao_server_id (void)
 
 char *
 TAO::ORT_Adapter_Impl::tao_orb_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->orb_id ();
@@ -31,7 +29,6 @@ TAO::ORT_Adapter_Impl::tao_orb_id (void)
 
 PortableInterceptor::AdapterName *
 TAO::ORT_Adapter_Impl::tao_adapter_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->adapter_name ();
@@ -40,11 +37,8 @@ TAO::ORT_Adapter_Impl::tao_adapter_name (void)
 CORBA::Object_ptr
 TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
                                     const PortableInterceptor::ObjectId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ort_factory_->make_object (repo_id,
-                                          id
-                                         );
+  return this->ort_factory_->make_object (repo_id, id);
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index 3b5c09072de..bdc9af25c20 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -65,14 +65,11 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * tao_server_id (void);
 
-    virtual char * tao_orb_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * tao_orb_id (void);
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * tao_adapter_name (void);
     //@}
 
     /**
@@ -84,8 +81,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
         const char * repository_id,
-        const PortableInterceptor::ObjectId & id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+        const PortableInterceptor::ObjectId & id);
     //@}
 
   private:
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index eb25db6608c..78b973c67fb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -30,21 +30,18 @@ namespace TAO
 
   char *
   ObjectReferenceTemplate::server_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
   ObjectReferenceTemplate::orb_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
   ObjectReferenceTemplate::adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
 
@@ -65,12 +62,15 @@ namespace TAO
       const char *,
       const PortableInterceptor::ObjectId &
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    if (CORBA::is_nil(poa_.in()))
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
+    if (CORBA::is_nil (this->poa_.in ()))
+      throw ::CORBA::BAD_INV_ORDER ();
 
-    TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
+    TAO_Root_POA* const tao_poa =
+      dynamic_cast<TAO_Root_POA*> (this->poa_.in());
+
+    if (!tao_poa)
+      throw ::CORBA::INTERNAL ();
 
     return tao_poa->invoke_key_to_object ();
   }
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index eeb4cae1deb..e97ac59a3b0 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -25,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ObjRefTemplate/Default_ORTC.h"
-#include "tao/SystemException.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -69,14 +68,11 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * server_id (void);
 
-    virtual char * orb_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * orb_id (void);
 
-    virtual PortableInterceptor::AdapterName * adapter_name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * adapter_name (void);
     //@}
 
     /**
@@ -88,8 +84,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableInterceptor::ObjectId & id);
     //@}
 
   protected:
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index d5e751b6933..205983dc9c5 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -22,6 +22,7 @@
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Object.inl"
@@ -170,8 +171,7 @@ CORBA::Object::can_convert_to_ior (void) const
 }
 
 char*
-CORBA::Object::convert_to_ior (bool,
-                               const char*) const
+CORBA::Object::convert_to_ior (bool, const char*) const
 {
   return 0;
 }
@@ -213,15 +213,14 @@ CORBA::Object::_is_a (const char *type_id)
   // XXX if type_id is that of CORBA::Object, "yes, we comply" :-)
 
   if (this->protocol_proxy_ == 0)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    throw ::CORBA::NO_IMPLEMENT ();
 
   if (this->_stubobj ()->type_id.in () != 0
       && ACE_OS::strcmp (type_id,
                          this->_stubobj ()->type_id.in ()) == 0)
     return true;
 
-  return this->proxy_broker ()->_is_a (this,
-                                       type_id);
+  return this->proxy_broker ()->_is_a (this, type_id);
 }
 
 const char*
@@ -291,7 +290,6 @@ CORBA::Object::_hash (CORBA::ULong maximum)
 
 CORBA::Boolean
 CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj)
-  ACE_THROW_SPEC (())
 {
   if (other_obj == this)
     {
@@ -323,12 +321,11 @@ CORBA::Object::_key (void)
                   ACE_TEXT ("profile in use\n")));
     }
 
-  ACE_THROW_RETURN (CORBA::INTERNAL (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        EINVAL),
-                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::INTERNAL (
+    CORBA::SystemException::_tao_minor_code (
+      0,
+      EINVAL),
+    CORBA::COMPLETED_NO);
 }
 
 void
@@ -455,8 +452,7 @@ CORBA::Object::_request (const char *operation)
     }
   else
     {
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                        0);
+      throw ::CORBA::NO_IMPLEMENT ();
     }
 }
 
@@ -475,14 +471,10 @@ CORBA::Object::_non_existent (void)
     {
       retval = this->proxy_broker ()->_non_existent (this);
     }
-  catch ( ::CORBA::OBJECT_NOT_EXIST&)
+  catch (const ::CORBA::OBJECT_NOT_EXIST&)
     {
       retval = true;
     }
-  catch ( ::CORBA::Exception&)
-    {
-      throw;
-    }
 
   return retval;
 }
@@ -534,7 +526,7 @@ CORBA::Object::_get_policy (
   if (this->protocol_proxy_)
     return this->protocol_proxy_->get_policy (type);
   else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
+    throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Policy_ptr
@@ -546,7 +538,7 @@ CORBA::Object::_get_cached_policy (
   if (this->protocol_proxy_)
     return this->protocol_proxy_->get_cached_policy (type);
   else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
+    throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Object_ptr
@@ -557,11 +549,10 @@ CORBA::Object::_set_policy_overrides (
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   if (!this->protocol_proxy_)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
+    throw ::CORBA::NO_IMPLEMENT ();
 
   TAO_Stub* stub =
-    this->protocol_proxy_->set_policy_overrides (policies,
-                                                 set_add);
+    this->protocol_proxy_->set_policy_overrides (policies, set_add);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
 
@@ -595,7 +586,7 @@ CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types)
   if (this->protocol_proxy_)
     return this->protocol_proxy_->get_policy_overrides (types);
   else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
@@ -605,32 +596,28 @@ CORBA::Object::_validate_connection (
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   inconsistent_policies = 0;
-
-  CORBA::Boolean retval = false;
+  CORBA::Boolean retval = true;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  // If the object is collocated then use non_existent to see whether
-  // it's there.
+  // Note that the OBJECT_NOT_EXIST exception should be propagated to
+  // the caller rather than return false, which is why we do not use
+  // CORBA::Object::_non_existent().  This behavior is consistent
+  // with the non-collocated case.
   if (this->_is_collocated ())
-      return !(this->_non_existent ());
+      return !(this->proxy_broker ()->_non_existent (this));
 
   TAO::LocateRequest_Invocation_Adapter tao_call (this);
   try
     {
       tao_call.invoke ();
     }
-  catch ( ::CORBA::INV_POLICY&)
+  catch (const ::CORBA::INV_POLICY&)
     {
-      inconsistent_policies =
-        tao_call.get_inconsistent_policies ();
+      inconsistent_policies = tao_call.get_inconsistent_policies ();
       retval = false;
     }
-  catch ( ::CORBA::Exception&)
-    {
-      throw;
-    }
-
-  retval = true;
+#else
+  retval = false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   return retval;
@@ -652,7 +639,7 @@ CORBA::Object::_get_orb (void)
       if (this->protocol_proxy_)
         return CORBA::ORB::_duplicate (this->protocol_proxy_->orb_core ()->orb ());
       else
-        ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::ORB::_nil());
+        throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -741,8 +728,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
       for (CORBA::ULong i = 0; i != profile_count; ++i)
         {
-          IOP::TaggedProfile &tpfile =
-            obj->ior_->profiles[i];
+          IOP::TaggedProfile &tpfile = obj->ior_->profiles[i];
 
           // NOTE: This is a place for optimizations. Here we have an
           // 2 allocations and 2 copies. Future optimizations should
@@ -757,8 +743,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
                             orb_core->input_cdr_msgblock_allocator (),
                             orb_core);
 
-          TAO_Profile *pfile =
-            connector_registry->create_profile (cdr);
+          TAO_Profile *pfile = connector_registry->create_profile (cdr);
 
           if (pfile != 0)
             mp.give_profile (pfile);
@@ -777,11 +762,9 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
         }
 
 
-      objdata =
-        orb_core->create_stub (obj->ior_->type_id.in (),
-                               mp);
+      objdata = orb_core->create_stub (obj->ior_->type_id.in (), mp);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         ex._tao_print_exception (
@@ -795,8 +778,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
   TAO_Stub_Auto_Ptr safe_objdata (objdata);
 
   // This call will set the stub proxy broker if necessary
-  if (orb_core->initialize_object (safe_objdata.get (),
-                                   obj) == -1)
+  if (orb_core->initialize_object (safe_objdata.get (), obj) == -1)
     return;
 
   obj->protocol_proxy_ = objdata;
@@ -880,8 +862,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
           for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i)
             {
-              TAO_Profile *pfile =
-                connector_registry->create_profile (cdr);
+              TAO_Profile *pfile = connector_registry->create_profile (cdr);
               if (pfile != 0)
                 mp.give_profile (pfile);
             }
@@ -899,11 +880,9 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
                                 0);
             }
 
-
-          objdata = orb_core->create_stub (type_hint.in (),
-                                           mp);
+          objdata = orb_core->create_stub (type_hint.in (), mp);
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level > 0)
             ex._tao_print_exception (
@@ -934,8 +913,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
       cdr >> *ior;
       ACE_NEW_RETURN (x,
-                      CORBA::Object (ior,
-                                     orb_core),
+                      CORBA::Object (ior, orb_core),
                       0);
     }
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 55bb36094ee..f800a8d16dc 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -150,8 +150,7 @@ namespace CORBA
      * private state.  Since that changes easily (when different ORB
      * protocols are in use) there is no default implementation.
      */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj)
-      ACE_THROW_SPEC (());
+    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
@@ -290,8 +289,7 @@ namespace CORBA
             TAO_Abstract_ServantBase *servant = 0,
             TAO_ORB_Core *orb_core = 0);
 
-    Object (IOP::IOR *ior,
-            TAO_ORB_Core *orb_core = 0);
+    Object (IOP::IOR *ior, TAO_ORB_Core *orb_core = 0);
 
     /// Get the underlying stub object.
     virtual TAO_Stub *_stubobj (void) const;
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index 38a851353de..cd7e16d10f1 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -144,10 +144,7 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key,
                   TAO::Refcounted_ObjectKey (key),
                   -1);
 
-
-
-  int retval =  this->table_.bind (key,
-                                   key_new);
+  int const retval =  this->table_.bind (key, key_new);
 
   if (retval != -1)
     {
@@ -166,8 +163,7 @@ TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new)
 {
   TAO::Refcounted_ObjectKey *tmp = 0;
 
-  if (this->table_.unbind (key_new->object_key (),
-                           tmp) != -1)
+  if (this->table_.unbind (key_new->object_key (), tmp) != -1)
     {
       // @@ Cant do much if the unbind fails.
       // Remove our refcount on the ObjectKey
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index aaa686edadb..bea994c294a 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -109,16 +109,14 @@ namespace TAO
      * new it is bounded to the table. Returns a 0 on success and a -1
      * on failure.
      */
-    int bind (const ObjectKey &key,
-              Refcounted_ObjectKey *&key_new);
+    int bind (const ObjectKey &key, Refcounted_ObjectKey *&key_new);
 
     /// Unbind an ObjectKey from the table.
     int unbind (TAO::Refcounted_ObjectKey *&key);
 
   protected:
     /// Implementation for bind ().
-    int bind_i (const ObjectKey &key,
-                Refcounted_ObjectKey *&key_new);
+    int bind_i (const ObjectKey &key, Refcounted_ObjectKey *&key_new);
 
     /// Implementation for unbind ().
     int unbind_i (Refcounted_ObjectKey *&key);
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index abd6d5ded9a..af8f7841018 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -38,6 +38,7 @@
 #endif /* __BORLANDC__ */
 
 #include "ace/ACE.h"
+#include "ace/Truncate.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
@@ -97,8 +98,8 @@ TAO::ObjectKey::~ObjectKey (void)
 // Hand crafted.
 
 void
-TAO::ObjectKey::encode_sequence_to_string (char * &str,
-                                           const TAO::unbounded_value_sequence<CORBA::Octet> &seq)
+TAO::ObjectKey::encode_sequence_to_string (char* & str,
+                                           TAO::unbounded_value_sequence<CORBA::Octet> const & seq)
 {
   // We must allocate a buffer which is (gag) 3 times the length
   // of the sequence, which is the length required in the worst-case
@@ -109,19 +110,22 @@ TAO::ObjectKey::encode_sequence_to_string (char * &str,
   // OR, we could just return this space.  The classic time-space tradeoff,
   // and for now we'll let time win out, which means that we only do the
   // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
+  CORBA::ULong const seq_len = seq.length ();
+  CORBA::ULong const len = 3 * seq_len; /* space for zero termination
+                                           not needed */
   str = CORBA::string_alloc (len);
 
-  char *cp = str;
+  char * const eos = str + len;
+  char *       cp  = str;
 
-  for (u_int i = 0;
-       cp < (str + len) && i < seq.length();
+  for (CORBA::ULong i = 0;
+       cp < eos && i < seq_len;
        ++i)
     {
-      u_char bt = seq[i];
+      unsigned char bt = seq[i];
       if (is_legal (bt))
         {
-          *cp++ = (char) bt;
+          *cp++ = static_cast<char> (bt);
           continue;
         }
 
@@ -133,11 +137,12 @@ TAO::ObjectKey::encode_sequence_to_string (char * &str,
   *cp = '\0';
 }
 
-int TAO::ObjectKey::is_legal (u_char & c)
+CORBA::Boolean
+TAO::ObjectKey::is_legal (unsigned char c)
 {
-  if (isalnum(c))
+  if (isalnum (c))
   {
-    return 1;
+    return true;
   }
   else
   {
@@ -150,8 +155,9 @@ int TAO::ObjectKey::is_legal (u_char & c)
 }
 
 void
-TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq,
-                                           const char *str)
+TAO::ObjectKey::decode_string_to_sequence (
+  TAO::unbounded_value_sequence<CORBA::Octet> & seq,
+  char const * str)
 {
   if (str == 0)
     {
@@ -159,18 +165,24 @@ TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::
       return;
     }
 
-  size_t length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
+  size_t const str_len = ACE_OS::strlen (str);
 
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
+  // Ensure sequence length value does not exceed maximum value for
+  // sequence index type (CORBA::ULong).  This is mostly an issue for
+  // 64-bit MS Windows builds.
+  CORBA::ULong const len =
+    ACE_Utils::truncate_cast<CORBA::ULong> (str_len);
+  
+  char const * const eos = str + str_len;
+  char const *       cp  = str;
 
-  u_int i = 0;
+  // Set the length of the sequence to be as long as we'll possibly
+  // need...we'll reset it to the actual length later.
+  seq.length (len);
+
+  CORBA::ULong i = 0;
   for (;
-       cp < eos && i < seq.length ();
+       cp < eos && i < len;
        ++i)
     {
       if (*cp == '%' || *cp == '\\')
@@ -178,8 +190,8 @@ TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::
           // This is an escaped non-printable,
           // so we decode the hex values into
           // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
+          seq[i]  = static_cast<CORBA::Octet> (ACE::hex2byte (cp[1]) << 4);
+          seq[i] |= static_cast<CORBA::Octet> (ACE::hex2byte (cp[2]));
           cp += 3;
         }
       else
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index e21fd58e7d6..a28f547aaa4 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -120,21 +120,21 @@ namespace TAO
     // Hand crafted.
 
     static void encode_sequence_to_string (
-        char * &str,
-        const TAO::unbounded_value_sequence<CORBA::Octet> &seq
+        char* & str,
+        TAO::unbounded_value_sequence<CORBA::Octet> const & seq
       );
     static void decode_string_to_sequence (
         TAO::unbounded_value_sequence<CORBA::Octet> &seq,
-        const char *str
+        char const * str
       );
-    static int is_legal (u_char & c);
+    static CORBA::Boolean is_legal (unsigned char c);
 
     /// A special method that gives no regard to how the ORB has
     /// configured  the resource factory. This will be used only
     /// during Profile decoding and should be safe. This is a solution
-    /// for the bug report [BUG 1616]
-    static CORBA::Boolean demarshal_key (ObjectKey &key,
-                                         TAO_InputCDR &cdr);
+    /// for the bug report [Bug 1616]
+    static CORBA::Boolean demarshal_key (ObjectKey & key,
+                                         TAO_InputCDR & cdr);
   };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index a8c625b6e46..3dcfd290fe8 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -20,7 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -59,8 +60,7 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR* argv [])
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+                                           ACE_TCHAR* argv []) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index a23bb503ff7..d4c953c27bf 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -23,8 +23,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Object_Ref_Table::bind (const char *id,
-                            CORBA::Object_ptr obj)
+TAO_Object_Ref_Table::bind (const char *id, CORBA::Object_ptr obj)
 {
   // Make sure that the supplied Object reference is valid,
   // i.e. not nil.
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 142afaab8b3..ec2b38c65e8 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -15,7 +15,8 @@
 #define TAO_OBJECT_REF_TABLE_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +25,6 @@
 #include "tao/CORBA_String.h"
 #include "tao/Object.h"
 #include /**/ "tao/TAO_Export.h"
-#include "tao/orbconf.h"
 
 #include "ace/Array_Map.h"
 
diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl
index e9abc371750..09250afe0c3 100644
--- a/TAO/tao/Object_Ref_Table.inl
+++ b/TAO/tao/Object_Ref_Table.inl
@@ -29,8 +29,7 @@ TAO_Object_Ref_Table::register_initial_reference (
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_Object_Ref_Table::resolve_initial_reference (
-  const char * id)
+TAO_Object_Ref_Table::resolve_initial_reference (const char * id)
 {
   return this->find (id);  // Returns a duplicate.
 }
diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
new file mode 100644
index 00000000000..bd6da2a4915
--- /dev/null
+++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
@@ -0,0 +1,85 @@
+#ifndef guard_object_const_reference_sequence_element_hpp
+#define guard_object_const_reference_sequence_element_hpp
+/**
+ * @file
+ *
+ * @brief Implement the type returned by const operator[] in object_reference
+ * sequences.
+ *
+ * $Id$
+ *
+ * @author Johnny Willemsen
+ */
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename obj_ref_traits>
+class object_reference_const_sequence_element
+{
+public:
+  typedef typename obj_ref_traits::object_type object_reference_type;
+  typedef object_reference_type * value_type;
+  typedef object_reference_type const * const_value_type;
+  typedef typename obj_ref_traits::object_type_var object_reference_var;
+
+public:
+  object_reference_const_sequence_element(
+      value_type const & e, CORBA::Boolean release)
+    : element_(&e)
+    , release_(release)
+  {
+  }
+
+  object_reference_const_sequence_element(
+      object_reference_const_sequence_element const & rhs)
+    : element_(rhs.element_)
+    , release_(rhs.release_)
+  {
+  }
+
+  ~object_reference_const_sequence_element()
+  {
+  }
+
+  inline operator const_value_type() const
+  {
+    return *element_;
+  }
+
+  inline const object_reference_type * in (void) const {
+    return *this->element_;
+  }
+
+  inline value_type operator->() const
+  {
+    return *this->element_;
+  }
+
+  inline CORBA::Boolean release() const
+  {
+    return this->release_;
+  }
+
+private:
+  // This function is not implemented
+  object_reference_const_sequence_element();
+  object_reference_const_sequence_element & operator=(
+      object_reference_const_sequence_element const & rhs);
+
+private:
+  value_type const * const element_;
+  CORBA::Boolean release_;
+};
+
+} // namespace details
+} // namespace CORBA
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_object_const_reference_sequence_element_hpp
diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h
index 004c191fe28..1ca1c412a67 100644
--- a/TAO/tao/Object_Reference_Traits_T.h
+++ b/TAO/tao/Object_Reference_Traits_T.h
@@ -42,11 +42,21 @@ struct object_reference_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
+  // Allow MSVC++ >= 8 checked iterators to be used.
+  template <typename iter>
+  inline static void copy_range(
+      object_type ** begin, object_type ** end, iter dst)
+  {
+    std::transform(begin, end, dst, &derived::duplicate);
+  }
+#else
   inline static void copy_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
+# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 7892e35bf4a..8e3212a8138 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -6,6 +6,7 @@
 #include "tao/Object_T.h"
 #include "tao/Stub.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -22,16 +23,12 @@ namespace TAO
         return T::_nil ();
       }
 
-    CORBA::Boolean const is_it = obj->_is_a (repo_id);
-
-    if (is_it == false)
+    if (obj->_is_a (repo_id) == false)
       {
         return T::_nil ();
       }
 
-    return TAO::Narrow_Utils<T>::unchecked_narrow (obj,
-                                                   repo_id,
-                                                   pbf);
+    return TAO::Narrow_Utils<T>::unchecked_narrow (obj, repo_id, pbf);
   }
 
   template<typename T> T *
@@ -41,12 +38,9 @@ namespace TAO
     T *proxy = 0;
     try
       {
-        proxy =
-          TAO::Narrow_Utils<T>::unchecked_narrow (obj,
-                                                  0,
-                                                  pbf);
+        proxy = TAO::Narrow_Utils<T>::unchecked_narrow (obj, 0, pbf);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         // Swallow the exception
         return T::_nil ();
@@ -82,7 +76,7 @@ namespace TAO
     if (stub == 0)
       {
         // If we're here, we have been passed a bogus objref.
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (), T::_nil ());
+        throw ::CORBA::BAD_PARAM ();
       }
 
     stub->_incr_refcnt ();
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index df39e83d6d6..cce3cd67c53 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -24,7 +24,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/Versioned_Namespace.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -52,8 +51,7 @@ namespace TAO
                          Proxy_Broker_Factory);
 
     // Version used the operators.
-    static T_ptr unchecked_narrow (CORBA::Object_ptr,
-                                   Proxy_Broker_Factory);
+    static T_ptr unchecked_narrow (CORBA::Object_ptr, Proxy_Broker_Factory);
 
     static T_ptr unchecked_narrow (CORBA::Object_ptr,
                                    const char *repo_id,
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 2ecfcd75efc..f31f071b640 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -15,13 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/CORBA_macros.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
 #include "tao/varbase.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -57,9 +56,7 @@ public:
   ~TAO_Objref_Var_T (void);
 
   TAO_Objref_Var_T<T> & operator= (T *);
-  TAO_Objref_Var_T<T> & operator= (
-      const TAO_Objref_Var_T<T> &
-    );
+  TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &);
   T * operator-> (void) const;
 
   // Cast operators.
diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index 2fe2023f18e..f806b51a0d0 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -1,4 +1,5 @@
 #include "tao/PI/ClientRequestDetails.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -15,9 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   void
-  ClientRequestDetails::apply_policies (
-      const CORBA::PolicyList &policies
-      )
+  ClientRequestDetails::apply_policies (const CORBA::PolicyList &policies)
   {
     // Flag to check for duplicate ProcessingModePolicy objects in the list.
     bool processing_mode_applied = false;
@@ -53,12 +52,10 @@ namespace TAO
             // Narrow the Policy to the ProcessingModePolicy interface.
             PortableInterceptor::ProcessingModePolicy_var pm_policy =
                     PortableInterceptor::ProcessingModePolicy::_narrow (
-                                                 policy.in ()
-                                                );
+                                                 policy.in ());
 
             // Save the value of the ProcessingModePolicy in our data member.
-            this->processing_mode_ =
-              pm_policy->processing_mode ();
+            this->processing_mode_ = pm_policy->processing_mode ();
           }
         else
           {
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 80abab464d6..349f5e9768d 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -54,8 +54,7 @@ namespace TAO
 
     ClientRequestDetails (void);
 
-    void apply_policies (const CORBA::PolicyList& policies
-                        );
+    void apply_policies (const CORBA::PolicyList& policies);
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated client request interceptor based upon the
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 1bce119c9ee..5a21d8f01dc 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -25,6 +25,8 @@ ACE_RCSID (PI,
 #include "tao/Service_Context.h"
 #include "tao/Exception_Data.h"
 
+#include "ace/CORBA_macros.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
@@ -62,9 +64,7 @@ TAO_ClientRequestInfo::setup_picurrent (void)
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
-    IOP::ServiceId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    IOP::ServiceId id)
 {
   IOP::ServiceContext_var service_context;
 
@@ -76,15 +76,12 @@ TAO_ClientRequestInfo::get_service_context_i (
   else
     {
       // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 26,
-                                          CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 26, CORBA::COMPLETED_NO);
     }
 }
 
 CORBA::Object_ptr
 TAO_ClientRequestInfo::target (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -93,7 +90,6 @@ TAO_ClientRequestInfo::target (void)
 
 CORBA::Object_ptr
 TAO_ClientRequestInfo::effective_target (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -102,7 +98,6 @@ TAO_ClientRequestInfo::effective_target (void)
 
 IOP::TaggedProfile *
 TAO_ClientRequestInfo::effective_profile (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -125,9 +120,7 @@ TAO_ClientRequestInfo::effective_profile (void)
 
   if (ep == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                          CORBA::COMPLETED_NO),
-                                          0);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
     }
 
   // @@BAD_PARAM exception
@@ -142,15 +135,13 @@ TAO_ClientRequestInfo::effective_profile (void)
 // with the spec.
 CORBA::Any *
 TAO_ClientRequestInfo::received_exception (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
   if (this->invocation_->reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
       && this->invocation_->reply_status () != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO), 0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // The spec says that if it is a user exception which can't be
@@ -179,42 +170,32 @@ TAO_ClientRequestInfo::received_exception (void)
 }
 
 char *
-TAO_ClientRequestInfo::received_exception_id (
-    void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::received_exception_id (void)
 {
   this->check_validity ();
 
-  CORBA::Exception *caught_exception =
-    invocation_->caught_exception ();
+  CORBA::Exception *caught_exception = invocation_->caught_exception ();
 
   if (caught_exception == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   return CORBA::string_dup (caught_exception->_rep_id ());
 }
 
 IOP::TaggedComponent *
-TAO_ClientRequestInfo::get_effective_component (
-    IOP::ComponentId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::get_effective_component (IOP::ComponentId id)
 {
   this->check_validity ();
 
-  TAO_Stub *stub =
-    this->invocation_->effective_target ()->_stubobj ();
+  TAO_Stub *stub = this->invocation_->effective_target ()->_stubobj ();
 
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
+  TAO_Tagged_Components &ecs = stub->profile_in_use ()->tagged_components ();
 
   IOP::MultipleComponentProfile &components = ecs.components ();
 
-  const CORBA::ULong len = components.length ();
+  CORBA::ULong const len = components.length ();
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       if (components[i].tag == id)
@@ -242,24 +223,17 @@ TAO_ClientRequestInfo::get_effective_component (
 
   // No tagged component was found that matched the given
   // IOP::ComponentId.
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 }
 
 IOP::TaggedComponentSeq *
-TAO_ClientRequestInfo::get_effective_components (
-    IOP::ComponentId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::get_effective_components (IOP::ComponentId id)
 {
   this->check_validity ();
 
-  TAO_Stub *stub =
-    this->invocation_->target ()->_stubobj ();
+  TAO_Stub *stub = this->invocation_->target ()->_stubobj ();
 
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
+  TAO_Tagged_Components &ecs = stub->profile_in_use ()->tagged_components ();
 
   IOP::MultipleComponentProfile &components = ecs.components ();
 
@@ -298,44 +272,36 @@ TAO_ClientRequestInfo::get_effective_components (
       // No tagged component sequence was allocated, meaning no tagged
       // components were found that matched the given
       // IOP::ComponentId.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                          CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
     }
 
   return safe_tagged_components._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type)
 {
   this->check_validity ();
 
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
-  return this->invocation_->target ()->_get_policy (type
-                                                   );
+  return this->invocation_->target ()->_get_policy (type);
 #else
   ACE_UNUSED_ARG (type);
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (
+    CORBA::SystemException::_tao_minor_code (
+      TAO::VMCID,
+      ENOTSUP),
+    CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 }
 
 void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    CORBA::Boolean replace)
 {
   this->check_validity ();
 
@@ -351,7 +317,6 @@ TAO_ClientRequestInfo::add_request_service_context (
 
 CORBA::ULong
 TAO_ClientRequestInfo::request_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -428,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void)
                     "(%P|%t) since its request ID generator is not\n"
                     "(%P|%t) supported on this platform.\n"));
 
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw ::CORBA::INTERNAL ();
     }
 
   return id;
@@ -436,7 +401,6 @@ TAO_ClientRequestInfo::request_id (void)
 
 char *
 TAO_ClientRequestInfo::operation (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -446,7 +410,6 @@ TAO_ClientRequestInfo::operation (void)
 
 Dynamic::ParameterList *
 TAO_ClientRequestInfo::arguments (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -457,8 +420,7 @@ TAO_ClientRequestInfo::arguments (void)
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
   if (this->parameter_list (*parameter_list) == false)
-    ACE_THROW_RETURN (CORBA::MARSHAL (),
-                      0);
+    throw ::CORBA::MARSHAL ();
 
   return safe_parameter_list._retn ();
 
@@ -485,7 +447,6 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
 
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo::exceptions (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -495,8 +456,7 @@ TAO_ClientRequestInfo::exceptions (void)
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
 
   if (this->exception_list (*exception_list) == false)
-    ACE_THROW_RETURN (CORBA::MARSHAL (),
-                      0);
+    throw ::CORBA::MARSHAL ();
 
   return safe_exception_list._retn ();
 }
@@ -504,7 +464,6 @@ TAO_ClientRequestInfo::exceptions (void)
 bool
 TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 {
-
   if (this->invocation_->operation_details ().ex_count ())
     {
       exception_list.length (this->invocation_->operation_details ().ex_count ());
@@ -526,29 +485,22 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 
 Dynamic::ContextList *
 TAO_ClientRequestInfo::contexts (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 Dynamic::RequestContext *
 TAO_ClientRequestInfo::operation_context (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 CORBA::Any *
 TAO_ClientRequestInfo::result (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -560,8 +512,7 @@ TAO_ClientRequestInfo::result (void)
   CORBA::Any_var safe_result_any = result_any;
 
   if (this->result (result_any) == false)
-    ACE_THROW_RETURN (CORBA::MARSHAL (),
-                      0);
+    throw ::CORBA::MARSHAL ();
 
   return safe_result_any._retn ();
 }
@@ -579,7 +530,6 @@ TAO_ClientRequestInfo::result (CORBA::Any *any)
 
 CORBA::Boolean
 TAO_ClientRequestInfo::response_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -588,7 +538,6 @@ TAO_ClientRequestInfo::response_expected (void)
 
 Messaging::SyncScope
 TAO_ClientRequestInfo::sync_scope (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -597,16 +546,13 @@ TAO_ClientRequestInfo::sync_scope (void)
 
 PortableInterceptor::ReplyStatus
 TAO_ClientRequestInfo::reply_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
   if (this->invocation_->reply_status() == -1)
     {
       // A reply hasn't been received yet.
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   return this->invocation_->reply_status();
@@ -614,15 +560,12 @@ TAO_ClientRequestInfo::reply_status (void)
 
 CORBA::Object_ptr
 TAO_ClientRequestInfo::forward_reference (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
   if (this->invocation_->reply_status() != PortableInterceptor::LOCATION_FORWARD)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // TAO::Invocation_Base::forward_reference() already duplicates the
@@ -632,22 +575,15 @@ TAO_ClientRequestInfo::forward_reference (void)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id)
 {
   this->check_validity ();
 
-  return this->rs_pi_current_.get_slot (id
-                                       );
+  return this->rs_pi_current_.get_slot (id);
 }
 
 IOP::ServiceContext *
-TAO_ClientRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::get_request_service_context (IOP::ServiceId id)
 {
   this->check_validity ();
 
@@ -655,16 +591,11 @@ TAO_ClientRequestInfo::get_request_service_context (
   TAO_Service_Context &service_context_list =
     this->invocation_->request_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
-TAO_ClientRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id)
 {
   this->check_validity ();
 
@@ -672,9 +603,7 @@ TAO_ClientRequestInfo::get_reply_service_context (
   TAO_Service_Context &service_context_list =
     this->invocation_->reply_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 void
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 22abd55b4d9..2ed39cac06e 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -78,52 +78,34 @@ public:
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
-  virtual CORBA::ULong request_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong request_id (void);
 
   /// Return the operation name for the current request.
-  virtual char * operation (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * operation (void);
 
   /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Dynamic::ParameterList * arguments (void);
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Dynamic::ExceptionList * exceptions (void);
 
-  virtual Dynamic::ContextList * contexts (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Dynamic::ContextList * contexts (void);
 
-  virtual Dynamic::RequestContext * operation_context (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Dynamic::RequestContext * operation_context (void);
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any * result (void);
 
   /// Returns true for a two-way operation, and false otherwise.
-  virtual CORBA::Boolean response_expected (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual CORBA::Boolean response_expected (void);
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
-  virtual Messaging::SyncScope sync_scope (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Messaging::SyncScope sync_scope (void);
 
   /// Return the reply status for the current request.
   /**
@@ -131,96 +113,62 @@ public:
    * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
    * TRANSPORT_RETRY, UNKNOWN.
    */
-  virtual PortableInterceptor::ReplyStatus reply_status (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableInterceptor::ReplyStatus reply_status (void);
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
-  virtual CORBA::Object_ptr forward_reference (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
+  virtual CORBA::Object_ptr forward_reference (void);
 
-  virtual CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::InvalidSlot));
+  virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      IOP::ServiceId id);
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
-  virtual IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::ServiceContext * get_reply_service_context (IOP::ServiceId id);
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
-  virtual CORBA::Object_ptr target (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Object_ptr target (void);
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
-  virtual CORBA::Object_ptr effective_target (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Object_ptr effective_target (void);
 
-  virtual IOP::TaggedProfile * effective_profile (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::TaggedProfile * effective_profile (void);
 
   /// Return an Any containing the received exception, if any.
   /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
   /**
    * @note There is no trivial way to extract the exception from an Any.
    */
-  virtual CORBA::Any * received_exception (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any * received_exception (void);
 
   /// Return the repository ID for the received exception.
-  virtual char * received_exception_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * received_exception_id (void);
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
-  virtual IOP::TaggedComponent * get_effective_component (
-      IOP::ComponentId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::TaggedComponent * get_effective_component (IOP::ComponentId id);
 
   /// Return all IOP::TaggedComponent(s) that match the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
-  virtual IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::TaggedComponentSeq * get_effective_components (IOP::ComponentId id);
 
   /// Return the policy of the given type in effect for the current
   /// request.
-  virtual CORBA::Policy_ptr get_request_policy (
-      CORBA::PolicyType type
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr get_request_policy (CORBA::PolicyType type);
 
   /// Add the IOP::ServiceContext to the request (outgoing)
   /// IOP::ServiceContextList.
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace
-      )
-     ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Boolean replace);
 
   /*
   * Proprietary accessor methods for the FT retention ID and
@@ -262,9 +210,7 @@ private:
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
-      IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      IOP::ServiceId id);
 
 private:
   /// Pointer to the invocation object.
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 53b77a2cf6b..3575003f79b 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -42,9 +42,7 @@ namespace TAO
 
             if (registered.details_.should_be_processed (is_remote_request))
               {
-                registered.interceptor_->
-                  send_request (&ri
-                               );
+                registered.interceptor_->send_request (&ri);
               }
 
             // The starting interception point completed successfully.
@@ -54,16 +52,13 @@ namespace TAO
       }
     catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc
-                                      );
+        this->process_forward_request (invocation, exc);
       }
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_reply (
-    Invocation_Base &invocation
-    )
+    Invocation_Base &invocation)
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -106,8 +101,7 @@ namespace TAO
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_exception (
-      Invocation_Base &invocation
-      )
+      Invocation_Base &invocation)
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -137,18 +131,13 @@ namespace TAO
 
             if (registered.details_.should_be_processed (is_remote_request))
               {
-                registered.interceptor_->
-                  receive_exception (
-                    &ri
-                   );
+                registered.interceptor_->receive_exception (&ri);
               }
           }
       }
     catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc
-                                      );
+        this->process_forward_request (invocation, exc);
       }
     catch ( ::CORBA::Exception& ex)
       {
@@ -218,8 +207,7 @@ namespace TAO
       }
     catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc);
+        this->process_forward_request (invocation, exc);
       }
     catch ( ::CORBA::Exception& ex)
       {
@@ -272,8 +260,7 @@ namespace TAO
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies)
   {
-    this->interceptor_list_.add_interceptor (interceptor,
-                                             policies);
+    this->interceptor_list_.add_interceptor (interceptor, policies);
   }
 
   void
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index f37ef7e108d..5f14dcb2f63 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -78,35 +78,29 @@ namespace TAO
     //@{
     /// This method implements one of the "starting" client side
     /// interception points.
-    virtual void send_request (Invocation_Base &invocation
-                              );
+    virtual void send_request (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_reply (Invocation_Base &invocation
-                               );
+    virtual void receive_reply (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_exception (Invocation_Base &invocation
-                                   );
+    virtual void receive_exception (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_other (Invocation_Base &invocation
-                               );
+    virtual void receive_other (Invocation_Base &invocation);
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-     );
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-     );
+      const CORBA::PolicyList& policies);
 
     virtual void destroy_interceptors (void);
 
@@ -119,8 +113,7 @@ namespace TAO
     /// i.e. invoke the receive_other() interception point, in addition
     /// to notifying the Invocation object of the LOCATION_FORWARD.
     void process_forward_request (Invocation_Base &invocation,
-                                  PortableInterceptor::ForwardRequest &exc
-                                 );
+                                  PortableInterceptor::ForwardRequest &exc);
 
   private:
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index ba15a78da6f..2ecbc63a348 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/PI/ORBInitInfoC.h"
 #include "tao/PI/InterceptorC.h"
-#include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
 
@@ -44,8 +43,7 @@ namespace TAO
   template <typename InterceptorType, typename DetailsType>
   void
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
-    InterceptorType_ptr_type interceptor
-    )
+    InterceptorType_ptr_type interceptor)
   {
     if (!CORBA::is_nil (interceptor))
       {
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 5cfc907fd76..6a15e8f1b4c 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -64,20 +64,16 @@ namespace TAO
     /// Constructor.
     Interceptor_List (void);
 
-    void add_interceptor (
-      InterceptorType_ptr_type i
-     );
+    void add_interceptor (InterceptorType_ptr_type i);
 
     /// Register an interceptor with policies.
     void add_interceptor (InterceptorType_ptr_type i,
-                          const CORBA::PolicyList& policies
-                         );
+                          const CORBA::PolicyList& policies);
 
     void destroy_interceptors (void);
 
     /// Return the registered interceptor in sequence element @a index.
-    RegisteredInterceptor& registered_interceptor (
-      size_t index);
+    RegisteredInterceptor& registered_interceptor (size_t index);
 
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 469fe4c1ba9..ae2c2f5a1d9 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -3,12 +3,12 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Object_Loader.h"
 #include "tao/PolicyFactory_Registry_Adapter.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Service_Config.h"
+#include "ace/CORBA_macros.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/PI/PICurrent.h"
@@ -29,17 +29,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (
-    TAO_ORBInitInfo_ptr p
-  )
+TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (TAO_ORBInitInfo_ptr p)
 {
   return TAO_ORBInitInfo::_duplicate (p);
 }
 
 void
-TAO::Objref_Traits<TAO_ORBInitInfo>::release (
-    TAO_ORBInitInfo_ptr p
-  )
+TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p)
 {
   ::CORBA::release (p);
 }
@@ -77,7 +73,6 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
 
 CORBA::StringSeq *
 TAO_ORBInitInfo::arguments (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -106,7 +101,6 @@ TAO_ORBInitInfo::arguments (void)
 
 char *
 TAO_ORBInitInfo::orb_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -117,7 +111,6 @@ TAO_ORBInitInfo::orb_id (void)
 
 IOP::CodecFactory_ptr
 TAO_ORBInitInfo::codec_factory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->codec_factory_.in ()))
     {
@@ -150,10 +143,7 @@ TAO_ORBInitInfo::codec_factory (void)
 void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
-    CORBA::Object_ptr obj
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::InvalidName))
+    CORBA::Object_ptr obj)
 {
   this->check_validity ();
 
@@ -170,32 +160,22 @@ TAO_ORBInitInfo::register_initial_reference (
 }
 
 CORBA::Object_ptr
-TAO_ORBInitInfo::resolve_initial_references (
-    const char * id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::InvalidName))
+TAO_ORBInitInfo::resolve_initial_references (const char * id)
 {
   this->check_validity ();
 
   if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (),
-                      CORBA::Object::_nil ());
+    throw PortableInterceptor::ORBInitInfo::InvalidName ();
 
   // The ORB is practically fully initialized by the time this point
   // is reached so just use the ORB's resolve_initial_references()
   // mechanism.
-  return
-    this->orb_core_->orb ()->resolve_initial_references (id
-                                                        );
+  return this->orb_core_->orb ()->resolve_initial_references (id);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
@@ -213,10 +193,7 @@ TAO_ORBInitInfo::add_client_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
@@ -235,32 +212,22 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_ior_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
+    PortableInterceptor::IORInterceptor_ptr interceptor)
 {
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor
-                                    );
+  this->orb_core_->add_interceptor (interceptor);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
+    const CORBA::PolicyList& policies)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                   );
+  this->orb_core_->add_interceptor (interceptor, policies);
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
@@ -275,18 +242,12 @@ TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
 void
 TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
+    const CORBA::PolicyList& policies)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                   );
+  this->orb_core_->add_interceptor (interceptor, policies);
 
 #else
   ACE_UNUSED_ARG (interceptor);
@@ -304,9 +265,6 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
     PortableInterceptor::IORInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
 {
   this->check_validity ();
 
@@ -325,7 +283,6 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
 
 PortableInterceptor::SlotId
 TAO_ORBInitInfo::allocate_slot_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -334,12 +291,11 @@ TAO_ORBInitInfo::allocate_slot_id (void)
   // initialization.  ORB initialization is already atomic.
   return this->slot_count_++;
 #else
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::NO_IMPLEMENT (
+    CORBA::SystemException::_tao_minor_code (
+      0,
+      ENOTSUP),
+    CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
@@ -348,7 +304,6 @@ TAO_ORBInitInfo::register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -360,15 +315,11 @@ TAO_ORBInitInfo::register_policy_factory (
       throw ::CORBA::INTERNAL ();
     }
 
-  registry->register_policy_factory (type,
-                                     policy_factory
-                                     );
+  registry->register_policy_factory (type, policy_factory);
 }
 
 size_t
-TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup)
 {
   this->check_validity ();
 
@@ -378,12 +329,11 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
                                                             slot_id);
 
   if (result != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          0,
-                          errno),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw ::CORBA::INTERNAL (
+      CORBA::SystemException::_tao_minor_code (
+        0,
+        errno),
+      CORBA::COMPLETED_NO);
 
   return slot_id;
 }
@@ -411,10 +361,7 @@ TAO_ORBInitInfo::_get_orb (void)
   return CORBA::ORB::_duplicate (this->orb_core_->orb ());
 }
 
-TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-
-  )
+TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 72c2cb20624..dd1ec663ffa 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -77,20 +77,14 @@ public:
   //@{
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
-  virtual CORBA::StringSeq * arguments (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::StringSeq * arguments (void);
 
   /// Return the ORBid for the ORB currently being initialized.
-  virtual char * orb_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * orb_id (void);
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::CodecFactory_ptr codec_factory (void);
 
   /// Register a mapping between a string and a corresponding object
   /// reference with the ORB being initialized.
@@ -102,93 +96,57 @@ public:
    * resolve_initial_references() that may be called in the
    * ORBInitializer::post_init() call.
    */
-  virtual void register_initial_reference (
-      const char * id,
-      CORBA::Object_ptr obj
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
+  virtual void register_initial_reference (const char * id, CORBA::Object_ptr obj);
 
   /// Obtain a reference to an object that may not yet be available
   /// via the usual CORBA::ORB::resolve_initial_references() mechanism
   /// since the ORB may not be fully initialized yet.
-  virtual CORBA::Object_ptr resolve_initial_references (
-      const char * id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
+  virtual CORBA::Object_ptr resolve_initial_references (const char * id);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized.
   virtual void add_client_request_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized.
   virtual void add_server_request_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized.
   virtual void add_ior_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::IORInterceptor_ptr interceptor);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_client_request_interceptor_with_policy (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_server_request_interceptor_with_policy (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized, along with a list of policies.
   virtual void add_ior_interceptor_with_policy (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
-  virtual PortableInterceptor::SlotId allocate_slot_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableInterceptor::SlotId allocate_slot_id (void);
 
   /// Register a policy factory of the given policy type with the ORB
   /// currently being initialized.
   virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::PolicyFactory_ptr policy_factory);
 
-  virtual CORBA::ORB_ptr _get_orb (
-      void
-    );
+  virtual CORBA::ORB_ptr _get_orb (void);
   //@}
 
   /**
@@ -208,10 +166,7 @@ public:
    * An accompanying cleanup function (e.g. a TSS destructor) can also
    * be registered.
    */
-  size_t allocate_tss_slot_id (
-      ACE_CLEANUP_FUNC cleanup
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  size_t allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup);
 
   /// Return a pointer to the ORB Core associated with the ORB being
   /// initialized.
@@ -247,14 +202,10 @@ public:
 
   static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
 
-  static TAO_ORBInitInfo_ptr _narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _narrow (CORBA::Object_ptr obj);
 
 
-  static TAO_ORBInitInfo_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj);
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -311,17 +262,10 @@ namespace TAO
   template<>
   struct TAO_PI_Export Objref_Traits<TAO_ORBInitInfo>
   {
-    static TAO_ORBInitInfo_ptr duplicate (
-        TAO_ORBInitInfo_ptr
-      );
-    static void release (
-        TAO_ORBInitInfo_ptr
-      );
+    static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr);
+    static void release (TAO_ORBInitInfo_ptr);
     static TAO_ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        TAO_ORBInitInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
+    static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr);
   };
 }
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c2725c18d9f..f89cc913d20 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -8,11 +8,11 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
 
 #include "ace/Static_Object_Lock.h"
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Log_Msg.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (PI,
            ORBInitializer_Registry,
@@ -59,7 +59,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
       this->register_orb_initializer (orb_initializer.in ()
                                                     );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
@@ -91,8 +91,7 @@ TAO::ORBInitializer_Registry::fini (void)
 
 void
 TAO::ORBInitializer_Registry::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init
-  )
+  PortableInterceptor::ORBInitializer_ptr init)
 {
   if (!CORBA::is_nil (init))
     {
@@ -123,8 +122,7 @@ TAO::ORBInitializer_Registry::pre_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId &slotid
-  )
+  PortableInterceptor::SlotId &slotid)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -173,8 +171,7 @@ TAO::ORBInitializer_Registry::post_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId slotid
-  )
+  PortableInterceptor::SlotId slotid)
 {
   if (pre_init_count > 0)
     {
@@ -199,8 +196,7 @@ TAO::ORBInitializer_Registry::post_init (
 
       for (size_t i = 0; i < pre_init_count; ++i)
         {
-          this->initializers_[i]->post_init (orb_init_info_.in ()
-                                            );
+          this->initializers_[i]->post_init (orb_init_info_.in ());
         }
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 42209ab9be2..abca05f343e 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -64,27 +64,22 @@ namespace TAO
     /// Register an ORBInitializer with the underlying ORBInitializer
     /// array.
     virtual void register_orb_initializer (
-                   PortableInterceptor::ORBInitializer_ptr init
-                  );
+                   PortableInterceptor::ORBInitializer_ptr init);
 
     /// Begin initialization of all registered ORBInitializers before
     /// the ORB itself is initialized.
-    virtual size_t pre_init (
-                             TAO_ORB_Core *orb_core,
+    virtual size_t pre_init (TAO_ORB_Core *orb_core,
                              int argc,
                              char *argv[],
-                             PortableInterceptor::SlotId &slotid
-                            );
+                             PortableInterceptor::SlotId &slotid);
 
     /// Complete initialization of all registered ORBInitializers after
     /// the ORB has been initialized.
-    virtual void post_init (
-                            size_t pre_init_count,
+    virtual void post_init (size_t pre_init_count,
                             TAO_ORB_Core *orb_core,
                             int argc,
                             char *argv[],
-                            PortableInterceptor::SlotId slotid
-                           );
+                            PortableInterceptor::SlotId slotid);
 
   private:
     // Prevent copying
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 35e4022e65f..11abf6d283e 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -6,6 +6,7 @@
 #include "tao/PI/PI_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (PI,
            PI,
@@ -52,7 +53,7 @@ TAO_PI_Init::Initializer (void)
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                     );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 30e4c7ed372..77056497fcd 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (tao,
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/TAO_Server_Request.h"
-#include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -31,10 +31,7 @@ TAO::PICurrent::~PICurrent (void)
 }
 
 CORBA::Any *
-TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
-                         )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier)
 {
   this->check_validity (identifier);
 
@@ -43,10 +40,7 @@ TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
 
 void
 TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
-                         const CORBA::Any &data
-                         )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+                         const CORBA::Any &data)
 {
   this->check_validity (identifier);
 
@@ -86,8 +80,7 @@ TAO::PICurrent::tsc (void)
 }
 
 void
-TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
-                                )
+TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier)
 {
   // 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
@@ -108,8 +101,7 @@ TAO::PICurrent::_get_orb (void)
 }
 
 void
-TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
-                            )
+TAO::PICurrent::initialize (PortableInterceptor::SlotId sc)
 {
   // Only allow a single initialization; sc is the number of
   // allocated PICurrent data slots the end user wants. If 0
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 97985e1d80d..aaa65bd96e6 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -71,22 +71,14 @@ namespace TAO
     //@{
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
-    virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id
-                                  )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+    virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id);
 
     /// Set information in the slot table at the given SlotId.
     virtual void set_slot (PortableInterceptor::SlotId identifier,
-                           const CORBA::Any & data
-                           )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+                           const CORBA::Any & data);
     //@}
 
-    virtual CORBA::ORB_ptr _get_orb (
-        void
-      );
+    virtual CORBA::ORB_ptr _get_orb (void);
 
     /// Number of slots allocated in the slot table.
     PortableInterceptor::SlotId slot_count (void) const;
@@ -96,8 +88,7 @@ namespace TAO
     PICurrent_Impl * tsc (void);
 
     /// Verify the validity of the given SlotId.
-    void check_validity (const PortableInterceptor::SlotId &identifier
-                        );
+    void check_validity (const PortableInterceptor::SlotId &identifier);
 
     /// Initialize the PICurrent object.
     void initialize (PortableInterceptor::SlotId sc);
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index e1b5a29c5cc..b8a773317cd 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -12,17 +12,14 @@ ACE_RCSID (tao,
 #endif /* __ACE_INLINE__ */
 
 #include "tao/TAO_Server_Request.h"
-#include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 #include "tao/debug.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Any *
-TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
-                               )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier)
 {
   // No need to check validity of SlotId.  It is validated before this
   // method is invoked.
@@ -69,10 +66,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
 
 void
 TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
-                               const CORBA::Any & data
-                               )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+                               const CORBA::Any & data)
 {
   // No need to check validity of SlotId.  It is validated before this
   // method is invoked.
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index ec1c051f91e..34c3f315bde 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -58,17 +58,11 @@ namespace TAO
 
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
-    CORBA::Any *get_slot (PortableInterceptor::SlotId identifier
-                          )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+    CORBA::Any *get_slot (PortableInterceptor::SlotId identifier);
 
     /// Set information in the slot table at the given SlotId.
     void set_slot (PortableInterceptor::SlotId identifier,
-                   const CORBA::Any & data
-                   )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+                   const CORBA::Any & data);
 
     /// Logically/Lazy (shallow) copy the given object's slot table.
     void take_lazy_copy (PICurrent_Impl *p);
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 7f5587703c4..c563f30d03f 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -28,14 +28,9 @@ ACE_RCSID (PI,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
-TAO_PICurrent_Loader::create_object (
-  CORBA::ORB_ptr orb,
-  int,
-  ACE_TCHAR *[]
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_PICurrent_Loader::create_object (CORBA::ORB_ptr orb,  int, ACE_TCHAR *[])
 {
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+  CORBA::Object_ptr obj = CORBA::Object_ptr ();
   ACE_NEW_RETURN (obj,
                   TAO::PICurrent (*orb->orb_core ()),
                   CORBA::Object::_nil ());
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index 8b6e981c62c..4f9cc30d8ba 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -40,9 +40,7 @@ public:
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index efdf142fb7a..9ba41f28778 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -8,6 +8,7 @@
 #include "tao/PI/ProcessingModePolicyC.h"
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfoC.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -17,14 +18,12 @@ ACE_RCSID (tao,
 
 void
 TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
 TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The PI policy factory is stateless and reentrant, so share a
   // single instance between all ORBs.
@@ -65,10 +64,9 @@ TAO_PI_ORBInitializer::register_policy_factories (
     {
       try
         {
-          info->register_policy_factory (*i,
-                                         this->policy_factory_.in ());
+          info->register_policy_factory (*i, this->policy_factory_.in ());
         }
-      catch ( ::CORBA::BAD_INV_ORDER& ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -81,11 +79,6 @@ TAO_PI_ORBInitializer::register_policy_factories (
             }
           throw;
         }
-      catch ( ::CORBA::Exception&)
-        {
-          // Rethrow any other exceptions...
-          throw;
-        }
     }
 }
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index f77777cafe6..aa24c63d127 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -48,24 +48,16 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   //@}
 
-
 private:
 
   /// Register PortableInterceptor policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                 );
-
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Instance of the PI policy factory.
   /**
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
index c314da293f4..ccb5a6a50da 100644
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ b/TAO/tao/PI/PI_PolicyFactory.cpp
@@ -4,6 +4,8 @@
 
 #include "tao/PI/ProcessingModePolicy.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -14,10 +16,7 @@ ACE_RCSID (tao,
 CORBA::Policy_ptr
 TAO_PI_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
+    const CORBA::Any &value)
 {
   if (type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
     {
@@ -26,8 +25,7 @@ TAO_PI_PolicyFactory::create_policy (
 
       if ((value >>= policy_value) == 0)
         {
-          ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                            CORBA::Policy::_nil ());
+          throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
         }
 
       ACE_NEW_THROW_EX (processing_mode_policy,
@@ -38,8 +36,7 @@ TAO_PI_PolicyFactory::create_policy (
       return processing_mode_policy;
     }
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index 17bd5d9bd0a..8800ecbb14d 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -37,10 +37,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                   const CORBA::Any & value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 8fcaedadd74..b99583692aa 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -169,11 +169,8 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 ::CORBA::Policy_ptr
 PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index 6b1f0a47ecd..2e982ba7bad 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -42,8 +42,6 @@
 
 #include "tao/PI/pi_export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
@@ -131,20 +129,13 @@ namespace PortableInterceptor
         const ::CORBA::Any & value
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::CORBA::PolicyError
-      )) = 0;
+      = 0;
 
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PolicyError
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index a9a60845044..b3788ff5b01 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -1,8 +1,8 @@
 #include "tao/PI/PolicyFactory_Registry.h"
 #include "tao/PI/PolicyFactoryC.h"
 #include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
 #include "tao/PolicyC.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (PI,
            PolicyFactory_Registry,
@@ -33,8 +33,7 @@ TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
 void
 TAO_PolicyFactory_Registry::register_policy_factory (
   CORBA::PolicyType type,
-  PortableInterceptor::PolicyFactory_ptr policy_factory
-  )
+  PortableInterceptor::PolicyFactory_ptr policy_factory)
 {
   if (CORBA::is_nil (policy_factory))
     {
@@ -48,8 +47,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
   PortableInterceptor::PolicyFactory_ptr factory =
     PortableInterceptor::PolicyFactory::_duplicate (policy_factory);
 
-  const int result = this->factories_.bind (type,
-                                            factory);
+  const int result = this->factories_.bind (type, factory);
 
   if (result != 0)
     {
@@ -82,35 +80,26 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
     {
       // Policy factory corresponding to given policy type does not
       // exist in policy factory map.
-      ACE_THROW_RETURN (
-         CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),  // @@ Right exception?
-         CORBA::Policy::_nil ());
+      throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
     }
 
-  return policy_factory->create_policy (type,
-                                        value
-                                       );
+  return policy_factory->create_policy (type, value);
 }
 
 CORBA::Policy_ptr
-TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
-                                            )
+TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type)
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
 
-  if (this->factories_.find (type,
-                             policy_factory) == -1)
+  if (this->factories_.find (type, policy_factory) == -1)
     {
       // Policy factory corresponding to given policy type does not
       // exist in policy factory map.
-      ACE_THROW_RETURN (
-         CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),  // @@ Right exception?
-         CORBA::Policy::_nil ());
+      throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
     }
 
-  return policy_factory->_create_policy (type
-                                        );
+  return policy_factory->_create_policy (type);
 }
 
 bool
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 18ceb0a92d4..bc939533f23 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -26,7 +26,6 @@
 #include "tao/PolicyFactory_Registry_Adapter.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -70,19 +69,16 @@ public:
   /// initialization.
   void register_policy_factory (
     CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory
-   );
+    PortableInterceptor::PolicyFactory_ptr policy_factory);
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any @a value.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value
-                                  );
+                                   const CORBA::Any &value);
 
   /// Create an empty policy, usually to be filled in later by
   /// demarshaling.
-  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                   );
+  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type);
 
   /// Check if a @c PolicyFactory corresponding to the given type,
   /// exists.
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 9530a0956c2..0a5627af836 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -5,6 +5,8 @@
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -22,7 +24,6 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 
 CORBA::Policy_ptr
 TAO_ProcessingModePolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ProcessingModePolicy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -34,20 +35,17 @@ TAO_ProcessingModePolicy::copy (void)
 
 void
 TAO_ProcessingModePolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 PortableInterceptor::ProcessingMode
 TAO_ProcessingModePolicy::processing_mode (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return processing_mode_;
 }
 
 CORBA::PolicyType
 TAO_ProcessingModePolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
 }
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index 0b6fbebbcbb..eb500462474 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -46,18 +46,13 @@ public:
   /// Constructor.
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
-  virtual PortableInterceptor::ProcessingMode processing_mode
-                                        (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableInterceptor::ProcessingMode processing_mode (void);
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 private:
   /// The attribute
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index e05c080d831..2388515e963 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -11,6 +11,7 @@
 #include "tao/ORB_Constants.h"
 #include "tao/StringSeqC.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (tao,
            RequestInfo_Util,
@@ -87,8 +88,7 @@ TAO_RequestInfo_Util::make_request_context (void)
 }
 
 CORBA::Any *
-TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                )
+TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any)
 {
   CORBA::Any *any = 0;
   ACE_NEW_THROW_EX (any,
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index 240984f3b02..650cc77b488 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -25,7 +25,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/CORBA_macros.h"
 #include "tao/PI/pi_export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -64,20 +63,15 @@ public:
    * class.
    */
   //@{
-  static Dynamic::ParameterList * make_parameter_list (
-    void);
+  static Dynamic::ParameterList * make_parameter_list (void);
 
-  static Dynamic::ExceptionList * make_exception_list (
-    void);
+  static Dynamic::ExceptionList * make_exception_list (void);
 
-  static Dynamic::ContextList * make_context_list (
-    void);
+  static Dynamic::ContextList * make_context_list (void);
 
-  static Dynamic::RequestContext * make_request_context (
-    void);
+  static Dynamic::RequestContext * make_request_context (void);
 
-  static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                               );
+  static CORBA::Any * make_any (CORBA::Boolean tk_void_any);
   //@}
 };
 
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index 8d587c11162..4c8fe0aec64 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -58,7 +58,7 @@ TAO_PI_Server_Loader::init (int,
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                     );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Caught exception:");
       return -1;
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 00c30c716b2..827ac975c0d 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -18,17 +18,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_PortableServer_ORBInitializer::pre_init (
   PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_PortableServer_ORBInitializer::post_init (
   PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                  );
+  this->register_policy_factories (info);
 }
 
 void
@@ -74,7 +71,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
         {
           info->register_policy_factory (*i, policy_factory.in ());
         }
-      catch ( ::CORBA::BAD_INV_ORDER& ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -87,11 +84,6 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
             }
           throw;
         }
-      catch ( ::CORBA::Exception&)
-        {
-          // Rethrow any other exceptions...
-          throw;
-        }
     }
 #else
   ACE_UNUSED_ARG (info);
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index e35324dcfb9..cdbcce827cc 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -40,11 +40,9 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   //@}
 
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index d62e0e5f103..e2a8d8665f9 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -21,8 +21,6 @@ CORBA::Policy_ptr
 TAO_PortableServer_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
 #if !defined (CORBA_E_MICRO)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
@@ -102,14 +100,12 @@ TAO_PortableServer_PolicyFactory::create_policy (
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 #else
   ACE_UNUSED_ARG (value);
   ACE_UNUSED_ARG (type);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 #endif
 }
 
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index 40f95076ee6..c0d5a5037a3 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -32,9 +32,7 @@ class TAO_PortableServer_PolicyFactory
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                   const CORBA::Any & value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 057d604fca8..587934d6784 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -33,8 +33,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions,
-  CORBA::OctetSeq_out oc
-  )
+  CORBA::OctetSeq_out oc)
 {
   // This method implements one of the "starting" server side
   // interception point.
@@ -59,9 +58,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
           if (registered.details_.should_be_processed (is_remote_request))
             {
               registered.interceptor_->
-                tao_ft_interception_point (&request_info,
-                                           oc
-                                          );
+                tao_ft_interception_point (&request_info, oc);
             }
 
           if (oc != 0)
@@ -71,8 +68,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                        nargs,
                                        servant_upcall,
                                        exceptions,
-                                       nexceptions
-                                      );
+                                       nexceptions);
 
               return;
             }
@@ -82,7 +78,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
           ++server_request.interceptor_count ();
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -91,8 +87,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                nargs,
                                servant_upcall,
                                exceptions,
-                               nexceptions
-                              );
+                               nexceptions);
     }
 }
 
@@ -103,8 +98,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This method implements one of the "intermediate" server side
   // interception point.
@@ -147,12 +141,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           if (registered.details_.should_be_processed (is_remote_request))
             {
               registered.interceptor_->
-                receive_request_service_contexts (&request_info
-                                                 );
+                receive_request_service_contexts (&request_info);
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -161,8 +154,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                nargs,
                                servant_upcall,
                                exceptions,
-                               nexceptions
-                              );
+                               nexceptions);
     }
 }
 
@@ -178,8 +170,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This method implements one of the "starting" server side
   // interception point if extended interceptors are not in place.
@@ -210,8 +201,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           if (registered.details_.should_be_processed (is_remote_request))
             {
               registered.interceptor_->
-                receive_request_service_contexts (&request_info
-                                                 );
+                receive_request_service_contexts (&request_info);
             }
 
           // The starting interception point completed successfully.
@@ -219,7 +209,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           ++server_request.interceptor_count ();
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -228,8 +218,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                nargs,
                                servant_upcall,
                                exceptions,
-                               nexceptions
-                              );
+                               nexceptions);
     }
 }
 
@@ -281,8 +270,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
           if (registered.details_.should_be_processed (is_remote_request))
             {
               registered.interceptor_->
-                receive_request (&request_info
-                                );
+                receive_request (&request_info);
             }
 
           // Note that no interceptors are pushed on to or popped off
@@ -290,7 +278,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
           // an intermediate interception point.
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -299,8 +287,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                         nargs,
                         servant_upcall,
                         exceptions,
-                        nexceptions
-                       );
+                        nexceptions);
     }
 
 }
@@ -347,9 +334,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
 
       if (registered.details_.should_be_processed (is_remote_request))
         {
-          registered.interceptor_->
-            send_reply (&request_info
-                       );
+          registered.interceptor_->send_reply (&request_info);
         }
     }
 
@@ -365,8 +350,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -402,13 +386,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                send_exception (&request_info
-                               );
+              registered.interceptor_->send_exception (&request_info);
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -439,8 +421,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                             nargs,
                             servant_upcall,
                             exceptions,
-                            nexceptions
-                           );
+                            nexceptions);
 
       PortableInterceptor::ReplyStatus status =
         server_request.reply_status ();
@@ -461,8 +442,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   size_t nargs,
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -498,13 +478,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                send_other (&request_info
-                           );
+              registered.interceptor_->send_other (&request_info);
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -513,15 +491,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
                         nargs,
                         servant_upcall,
                         exceptions,
-                        nexceptions
-                       );
+                        nexceptions);
     }
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
-  PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-  )
+  PortableInterceptor::ServerRequestInterceptor_ptr interceptor)
 {
   this->interceptor_list_.add_interceptor (interceptor);
 }
@@ -529,17 +505,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-  const CORBA::PolicyList& policies
-  )
+  const CORBA::PolicyList& policies)
 {
-  this->interceptor_list_.add_interceptor (interceptor,
-                                           policies
-                                          );
+  this->interceptor_list_.add_interceptor (interceptor, policies);
 }
 
 void
-TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
-  void)
+TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
 {
   this->interceptor_list_.destroy_interceptors ();
 }
@@ -564,8 +536,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
   TAO_ServerRequest & server_request,
-  TAO::Upcall_Command & command
-  )
+  TAO::Upcall_Command & command)
 {
   TAO::PICurrent_Guard const pi_guard (server_request,
                                        true  /* Copy TSC to RSC */);
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index d9d403925c7..47f296a1504 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -92,8 +92,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
-        CORBA::OctetSeq_out oc
-       );
+        CORBA::OctetSeq_out oc);
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
     /// This method implements the "intermediate" server side
@@ -109,8 +108,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method an "intermediate" server side interception point.
     void receive_request (
@@ -119,8 +117,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -130,8 +127,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -141,8 +137,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -152,8 +147,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
     //@}
 
     /// Register an interceptor.
@@ -163,20 +157,17 @@ namespace TAO
 
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-     );
+      const CORBA::PolicyList& policies);
 
     virtual void destroy_interceptors (void);
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void);
 
-    virtual void deallocate_pi_current (
-        TAO::PICurrent_Impl *picurrent);
+    virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent);
 
     virtual void execute_command (
         TAO_ServerRequest &server_request,
-        TAO::Upcall_Command &command
-       );
+        TAO::Upcall_Command &command);
 
   private:
 
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index b416d2faef1..2c7fcb81774 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -6,6 +6,8 @@
 #include "tao/PI_Server/ServerRequestDetails.inl"
 #endif /* defined INLINE */
 
+#include "tao/SystemException.h"
+
 ACE_RCSID (PI_Server,
            ServerRequestDetails,
            "$Id$")
@@ -33,8 +35,7 @@ namespace TAO
           }
 
         // Obtain the PolicyType from the current Policy object.
-        CORBA::PolicyType const policy_type =
-          policy->policy_type ();
+        CORBA::PolicyType const policy_type = policy->policy_type ();
 
         if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
           {
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 9ac1c7a4301..cc166115e68 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
 TAO::ServerRequestInfo::request_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The request ID returned by this method need not correspond to the
   // GIOP request ID sent with the client request.  The request ID
@@ -72,20 +71,16 @@ TAO::ServerRequestInfo::request_id (void)
 
 char *
 TAO::ServerRequestInfo::operation (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
 TAO::ServerRequestInfo::arguments (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // Generate the argument list on demand.
@@ -120,13 +115,10 @@ TAO::ServerRequestInfo::arguments (void)
 
 Dynamic::ExceptionList *
 TAO::ServerRequestInfo::exceptions (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // Generate the exception list on demand.
@@ -153,31 +145,22 @@ TAO::ServerRequestInfo::exceptions (void)
 
 Dynamic::ContextList *
 TAO::ServerRequestInfo::contexts (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 Dynamic::RequestContext *
 TAO::ServerRequestInfo::operation_context (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 CORBA::Any *
 TAO::ServerRequestInfo::result (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // Generate the result on demand.
@@ -199,44 +182,34 @@ TAO::ServerRequestInfo::result (void)
 
 CORBA::Boolean
 TAO::ServerRequestInfo::response_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_request_.response_expected ();
 }
 
 Messaging::SyncScope
 TAO::ServerRequestInfo::sync_scope (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.sync_with_server ())
     return Messaging::SYNC_WITH_SERVER;
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    -1);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::ReplyStatus
 TAO::ServerRequestInfo::reply_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () == -1)
     // A reply hasn't been received yet.
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                            CORBA::COMPLETED_NO),
-                      -1);
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   return this->server_request_.reply_status ();
 }
 
 CORBA::Object_ptr
 TAO::ServerRequestInfo::forward_reference (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                            CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   // TAO_ServerRequest::forward_location() already duplicates the
   // object reference.  There is no need to duplicate it here.
@@ -245,8 +218,6 @@ TAO::ServerRequestInfo::forward_reference (void)
 
 CORBA::Any *
 TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
 {
   // Retrieve the total number of assigned slots from the PICurrent.
   // No TSS access is incurred.
@@ -257,7 +228,7 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
     dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
   if (pi_current == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw ::CORBA::INTERNAL ();
 
   pi_current->check_validity (id);
 
@@ -270,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
     this->server_request_.request_service_context ();
@@ -280,7 +250,6 @@ TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context & service_context_list =
     this->server_request_.reply_service_context ();
@@ -291,9 +260,7 @@ TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id)
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_service_context_i (
     TAO_Service_Context & service_context_list,
-    IOP::ServiceId id
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    IOP::ServiceId id)
 {
   IOP::ServiceContext_var service_context;
 
@@ -305,9 +272,7 @@ TAO::ServerRequestInfo::get_service_context_i (
   else
     {
       // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 26,
-                                          CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 26, CORBA::COMPLETED_NO);
     }
 }
 
@@ -316,14 +281,11 @@ TAO::ServerRequestInfo::get_service_context_i (
 // with the spec.
 CORBA::Any *
 TAO::ServerRequestInfo::sending_exception (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
       && this->server_request_.reply_status () != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   // The spec says that if it is a user exception which cannot be
@@ -350,33 +312,26 @@ TAO::ServerRequestInfo::sending_exception (void)
 
 char *
 TAO::ServerRequestInfo::server_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     return
       CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 char *
 TAO::ServerRequestInfo::orb_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     return
       CORBA::string_dup (this->server_request_.orb_core ()->orbid ());
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::AdapterName *
 TAO::ServerRequestInfo::adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter_name attribute defines a name for the object adapter
   // that services requests for the invoked object. In the case of the
@@ -387,14 +342,11 @@ TAO::ServerRequestInfo::adapter_name (void)
     return
       this->servant_upcall_->poa ().adapter_name ();
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::ObjectId *
 TAO::ServerRequestInfo::object_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     {
@@ -429,27 +381,20 @@ TAO::ServerRequestInfo::object_id (void)
       return obj_id._retn ();
     }
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 CORBA::OctetSeq *
 TAO::ServerRequestInfo::adapter_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     return this->servant_upcall_->poa ().id ();
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 char *
-TAO::ServerRequestInfo::target_most_derived_interface (
-    void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO::ServerRequestInfo::target_most_derived_interface (void)
 {
   PortableServer::Servant const servant =
     (this->servant_upcall_ == 0
@@ -458,18 +403,14 @@ TAO::ServerRequestInfo::target_most_derived_interface (
 
   if (servant == 0)
     {
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
   return CORBA::string_dup (servant->_interface_repository_id ());
 }
 
 CORBA::Policy_ptr
-TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
-                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type)
 {
   if (this->servant_upcall_ != 0)
     {
@@ -483,26 +424,19 @@ TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
       else
         {
           // No policy matching the given PolicyType was found.
-          ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
-                                               CORBA::COMPLETED_NO),
-                            CORBA::Policy::_nil ());
+          throw ::CORBA::INV_POLICY (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO);
         }
     }
 
   // @@ Technically, we shouldn't be throwing this exception since
   //    this method should be valid in all server side request
   //    interception points.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 void
 TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
-                                  const CORBA::Any &data
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
+                                  const CORBA::Any &data)
 {
   // Retrieve the total number of assigned slots from the PICurrent
   // object.  No TSS access is incurred.
@@ -524,9 +458,7 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
 }
 
 CORBA::Boolean
-TAO::ServerRequestInfo::target_is_a (const char * id
-                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO::ServerRequestInfo::target_is_a (const char * id)
 {
   // Implemented in the generated skeleton.
 
@@ -535,24 +467,18 @@ TAO::ServerRequestInfo::target_is_a (const char * id
      ? 0
      : this->servant_upcall_->servant ());
 
-
   if (servant == 0)
     {
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
-  return servant->_is_a (id
-                        );
+  return servant->_is_a (id);
 }
 
 void
 TAO::ServerRequestInfo::add_reply_service_context (
     const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+    CORBA::Boolean replace)
 {
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index c19c6893f6f..d2be9d8e200 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -83,50 +83,34 @@ namespace TAO
 
     /// Return an ID unique to the current request.  This request ID may
     /// or may not be the same as the GIOP request ID.
-    virtual CORBA::ULong request_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::ULong request_id (void);
 
     /// Return the operation name for the current request.
-    virtual char * operation (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * operation (void);
 
     /// Return the list of arguments passed to the current operation.
-    virtual Dynamic::ParameterList * arguments (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (void);
 
     /// Return the list of exceptions the current operation is capable
     /// of throwing.
-    virtual Dynamic::ExceptionList * exceptions (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ExceptionList * exceptions (void);
 
-    virtual Dynamic::ContextList * contexts (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ContextList * contexts (void);
 
-    virtual Dynamic::RequestContext * operation_context (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::RequestContext * operation_context (void);
 
     /// Return the result of the current request.  If there is no
     /// return value then an @c Any with @c tk_void @c TypeCode is
     /// returned.  This method is not valid for oneway operations.
-    virtual CORBA::Any * result (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * result (void);
 
     /// Returns @c true for a two-way operation, and @c false otherwise.
-    virtual CORBA::Boolean response_expected (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean response_expected (void);
 
     /// Return the @c sync_scope policy value for the current one-way
     /// operation.  If the operation is not a one-way, a
     /// @c CORBA::BAD_INV_ORDER exception is thrown.
-    virtual Messaging::SyncScope sync_scope (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Messaging::SyncScope sync_scope (void);
 
     /// Return the reply status for the current request.
     /**
@@ -134,37 +118,25 @@ namespace TAO
      * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD,
      * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
-    virtual PortableInterceptor::ReplyStatus reply_status (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::ReplyStatus reply_status (void);
 
     /// If the reply status is
     /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
-    virtual CORBA::Object_ptr forward_reference (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+    virtual CORBA::Object_ptr forward_reference (void);
 
     /// Retrieve data from the "request scope" @c PICurrent object.
-    virtual CORBA::Any * get_slot (
-                                   PortableInterceptor::SlotId id
-                                   )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+    virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the request service context list.
     virtual IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        IOP::ServiceId id);
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the reply service context list.
     virtual IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        IOP::ServiceId id);
 
     /// Return an @c Any containing the exception being sent, if any.
     /// Otherwise, throw a @c CORBA::BAD_INV_ORDER exception.
@@ -172,69 +144,48 @@ namespace TAO
      * @note There is no trivial way to extract the exception from an
      *       @c Any.
      */
-    virtual CORBA::Any * sending_exception (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * sending_exception (void);
 
     /// Return the @c ObjectId for the target object.
-    virtual PortableInterceptor::ObjectId * object_id (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::ObjectId * object_id (void);
 
     /// Return the @c AdapterId for the POA handling the current
     /// request.
-    virtual CORBA::OctetSeq * adapter_id (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::OctetSeq * adapter_id (void);
 
     /// Return the server_id of the server. The value is passed to
     /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * server_id (void);
 
     /// Return the ORBId value that is passed to the @c ORB_init
     /// call.
-    virtual char * orb_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * orb_id (void);
 
     /// Return the name of the object adapter that services requests
     /// for the invoked object.
-    virtual PortableInterceptor::AdapterName * adapter_name (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * adapter_name (void);
 
     /// Return the most derived interface of the target object.
-    virtual char * target_most_derived_interface (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * target_most_derived_interface (void);
 
     /// Return the policy of the given type in effect for the current
     /// request.
-    virtual CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Policy_ptr get_server_policy (CORBA::PolicyType type);
 
     /// Insert data into the "request scope" @c PICurrent object.
     virtual void set_slot (PortableInterceptor::SlotId id,
-                           const CORBA::Any & data
-                           )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+                           const CORBA::Any & data);
 
     /// Returns true if the target's type corresponds to the given
     /// @c RepositoryId.
-    virtual CORBA::Boolean target_is_a (const char * id
-                                        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean target_is_a (const char * id);
 
     /// Add the @c IOP::ServiceContext to the reply (outgoing)
     /// @c IOP::ServiceContextList.
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
   public:
 
@@ -270,8 +221,7 @@ namespace TAO
     IOP::ServiceContext * get_service_context_i (
         TAO_Service_Context & service_context_list,
         IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
   protected:
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 0414e800f56..bea14050e88 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -43,7 +43,6 @@
 #include "tao/PI_Server/pi_server_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
@@ -155,10 +154,7 @@ namespace PortableInterceptor
         ::CORBA::OctetSeq_out os
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) {}
+      {}
 
 #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */
 
@@ -167,12 +163,8 @@ namespace PortableInterceptor
 
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -181,10 +173,7 @@ namespace PortableInterceptor
         ::PortableInterceptor::ServerRequestInfo_ptr ri
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -193,9 +182,7 @@ namespace PortableInterceptor
         ::PortableInterceptor::ServerRequestInfo_ptr ri
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -204,10 +191,7 @@ namespace PortableInterceptor
         ::PortableInterceptor::ServerRequestInfo_ptr ri
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -216,10 +200,7 @@ namespace PortableInterceptor
         ::PortableInterceptor::ServerRequestInfo_ptr ri
 
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index 8a31b17ac2e..53531b2d534 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -33,8 +33,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core)
   char **names;
   int number_of_names = 0;
 
-  orb_core->resource_factory ()->get_parser_names (names,
-                                                   number_of_names);
+  orb_core->resource_factory ()->get_parser_names (names, number_of_names);
 
   if (number_of_names == 0)
     {
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index d4f8a91a049..3102016a818 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -115,8 +115,7 @@ public:
   virtual int format_message (TAO_OutputCDR &cdr) = 0;
 
   /// Do any initialisations that may be needed.
-  virtual void init (CORBA::Octet major,
-                     CORBA::Octet minor) = 0;
+  virtual void init (CORBA::Octet major, CORBA::Octet minor) = 0;
 
   /// Parse the details of the next message from the @a incoming
   /// and initializes attributes of @a qd. Returns 0 if the message
@@ -152,12 +151,11 @@ public:
       TAO_Pluggable_Reply_Params &reply_info,
       TAO_Queued_Data *qd) = 0;
 
-
   /// Generate a reply message with the exception @a ex.
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &ex) = 0;
+      const CORBA::Exception &ex) = 0;
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl
index 7a10993036e..628d0f9c242 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.inl
+++ b/TAO/tao/Pluggable_Messaging_Utils.inl
@@ -18,8 +18,7 @@ TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
 
 ACE_INLINE void
 TAO_Pluggable_Reply_Params_Base::service_context_notowned (
-    IOP::ServiceContextList *svc
-  )
+    IOP::ServiceContextList *svc)
 {
   this->service_context_ = svc;
 }
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 84528418d76..d8bd6c86f20 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -162,7 +162,7 @@ CORBA::PolicyError::_tao_duplicate (void) const
 
 void CORBA::PolicyError::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
 void CORBA::PolicyError::_tao_encode (
@@ -298,13 +298,10 @@ CORBA::InvalidPolicies::_tao_duplicate (void) const
 
 void CORBA::InvalidPolicies::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
-void CORBA::InvalidPolicies::_tao_encode (
-    TAO_OutputCDR &cdr
-
-  ) const
+void CORBA::InvalidPolicies::_tao_encode (TAO_OutputCDR &cdr) const
 {
   if (cdr << *this)
     {
@@ -314,10 +311,7 @@ void CORBA::InvalidPolicies::_tao_encode (
   throw ::CORBA::MARSHAL ();
 }
 
-void CORBA::InvalidPolicies::_tao_decode (
-    TAO_InputCDR &cdr
-
-  )
+void CORBA::InvalidPolicies::_tao_decode (TAO_InputCDR &cdr)
 {
   if (cdr >> *this)
     {
@@ -410,9 +404,6 @@ TAO::Collocation_Proxy_Broker *
 CORBA::PolicyType CORBA::Policy::policy_type (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (!this->is_evaluated ())
     {
@@ -451,9 +442,6 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 ::CORBA::Policy_ptr CORBA::Policy::copy (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (!this->is_evaluated ())
     {
@@ -492,9 +480,6 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 void CORBA::Policy::destroy (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (!this->is_evaluated ())
     {
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 829c4027622..e44ef0465a3 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -42,7 +42,6 @@
 
 #include /**/ "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -284,30 +283,21 @@ namespace CORBA
 
     virtual CORBA::PolicyType policy_type (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -429,9 +419,7 @@ namespace CORBA
         const ::CORBA::PolicyTypeSeq & ts
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -441,10 +429,7 @@ namespace CORBA
         ::CORBA::SetOverrideType set_add
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::InvalidPolicies
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 01620c2d43d..0c8596949e4 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -23,9 +23,6 @@
 
 #include "tao/Basic_Types.h"
 
-#include "ace/CORBA_macros.h"
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //-- Forward Declarations--
@@ -65,19 +62,16 @@ namespace TAO
     /// initialization.
     virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      ) = 0;
+      PortableInterceptor::PolicyFactory_ptr policy_factory) = 0;
 
     /// Construct a policy of the given type with the information
     /// contained in the CORBA::Any @a value.
     virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                             const CORBA::Any &value
-                                             ) = 0;
+                                             const CORBA::Any &value) = 0;
 
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
-    virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                              ) = 0;
+    virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type) = 0;
 
     /// Check if a @c PolicyFactory corresponding to the given type,
     /// exists.
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index f538b416258..de2f5008240 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -45,10 +45,7 @@ TAO_Policy_Current::get_policy (
 }
 
 CORBA::PolicyList *
-TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Policy_Current::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
 
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
@@ -58,10 +55,7 @@ TAO_Policy_Current::get_policy_overrides (
 
 void
 TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::InvalidPolicies))
+                                          CORBA::SetOverrideType set_add)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
@@ -69,13 +63,11 @@ TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::Policy_ptr
-TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
-                                       )
+TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_cached_policy (type
-                                );
+  return impl.get_cached_policy (type);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index 62bbd4e456b..142efa29cb4 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -61,16 +61,13 @@ public:
   virtual CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
 
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
 
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::InvalidPolicies));
+      );
 
   // = Set and get the implementation.
   TAO_Policy_Current_Impl &implementation (void) const;
diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp
index d5c986a4f41..44c07ee2549 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -8,7 +8,6 @@
 # include "tao/Policy_Current_Impl.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
@@ -18,23 +17,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_Policy_Current_Impl::set_policy_overrides (
     const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add
-
-  )
+    CORBA::SetOverrideType set_add)
 {
-  this->manager_impl_.set_policy_overrides (policies,
-                                            set_add
-                                           );
+  this->manager_impl_.set_policy_overrides (policies, set_add);
 }
 
 CORBA::PolicyList *
-TAO_Policy_Current_Impl::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & ts
-
-  )
+TAO_Policy_Current_Impl::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
 {
-  return this->manager_impl_.get_policy_overrides (ts
-                                                  );
+  return this->manager_impl_.get_policy_overrides (ts);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index 7be08d5dc8e..7f0606e9199 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -33,11 +33,6 @@
 #include "tao/LocalObject.h"
 #include "tao/Policy_Set.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Current_Impl
@@ -47,19 +42,14 @@ public:
   TAO_Policy_Current_Impl (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                               );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                      );
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   // = The CORBA::PolicyManager operations
 
-  CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-
-      );
+  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & ts);
   void set_policy_overrides (const CORBA::PolicyList & policies,
                              CORBA::SetOverrideType set_add
                              );
@@ -71,10 +61,6 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "tao/Policy_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index 0c9a9536e8b..753f38fb1e5 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -11,19 +11,15 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy
-      )
+TAO_Policy_Current_Impl::get_policy (CORBA::PolicyType policy)
 {
   return this->manager_impl_.get_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
-                                            )
+TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
 {
-  return this->manager_impl_.get_cached_policy (type
-                                               );
+  return this->manager_impl_.get_cached_policy (type);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 750dcbaa7e9..bf40e768f2e 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -16,9 +16,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
-                                          )
-     ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->impl_.get_policy_overrides (ts);
@@ -26,10 +24,7 @@ TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
 
 void
 TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::InvalidPolicies))
+                                          CORBA::SetOverrideType set_add)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->impl_.set_policy_overrides (policies, set_add);
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index b3297a727d3..44565ba7a58 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -47,26 +47,18 @@ public:
   TAO_Policy_Manager (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                               );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                      );
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+        const CORBA::PolicyTypeSeq & ts);
 
   virtual void set_policy_overrides (const CORBA::PolicyList & policies,
-                                     CORBA::SetOverrideType set_add
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::InvalidPolicies));
+                                     CORBA::SetOverrideType set_add);
 
 private:
 
diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl
index 4d61f6110da..04149822c24 100644
--- a/TAO/tao/Policy_Manager.inl
+++ b/TAO/tao/Policy_Manager.inl
@@ -11,17 +11,14 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_policy (
-  CORBA::PolicyType policy
-  )
+TAO_Policy_Manager::get_policy (CORBA::PolicyType policy)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->impl_.get_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
-                                       )
+TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type)
 {
 
   // @@ Previous code used a "double-checked locking hack" to check
@@ -31,8 +28,7 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
 
-  return this->impl_.get_cached_policy (type
-                                       );
+  return this->impl_.get_cached_policy (type);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 1ec2b80722b..a8f8db0e797 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -3,17 +3,16 @@
 #include "tao/Policy_Set.h"
 #include "tao/SystemException.h"
 #include "tao/debug.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Policy_Set.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            Policy_Set,
            "$Id$")
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
@@ -29,7 +28,7 @@ TAO_Policy_Set::~TAO_Policy_Set (void)
     {
       this->cleanup_i ();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // Ignore exceptions...
     }
@@ -61,18 +60,21 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
           CORBA::Policy_var copy =
             policy->copy ();
 
+          TAO_Cached_Policy_Type const cached_type =
+            copy->_tao_cached_type ();
+
           // Add the "cacheable" policies into the cache.
-          if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED)
+          if (cached_type != TAO_CACHED_POLICY_UNCACHED
+              && cached_type >= 0)
             {
-              this->cached_policies_[copy->_tao_cached_type ()] =
-                copy.ptr ();
+              this->cached_policies_[cached_type] = copy.ptr ();
             }
 
           this->policy_list_[i] = copy._retn ();
         }
 
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 4)
         ex._tao_print_exception ("TAO_Policy_Set::TAO_Policy_Set");
@@ -83,8 +85,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
 }
 
 void
-TAO_Policy_Set::copy_from (TAO_Policy_Set *source
-                           )
+TAO_Policy_Set::copy_from (TAO_Policy_Set *source)
 {
   if (source == 0)
     {
@@ -113,10 +114,14 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
       CORBA::ULong const length = this->policy_list_.length ();
       this->policy_list_.length (length + 1);
 
+      TAO_Cached_Policy_Type const cached_type =
+        copy->_tao_cached_type ();
+
       // Add the "cacheable" policies into the cache.
-      if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED)
+      if (cached_type != TAO_CACHED_POLICY_UNCACHED
+          && cached_type >= 0)
         {
-          this->cached_policies_[copy->_tao_cached_type ()] = copy.ptr ();
+          this->cached_policies_[cached_type] = copy.ptr ();
         }
 
       this->policy_list_[length] = copy._retn ();
@@ -146,8 +151,7 @@ TAO_Policy_Set::cleanup_i (void)
   // @@ !!! Add comments regarding Policy lifetimes, etc.
 void
 TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
-                                      CORBA::SetOverrideType set_add
-                                      )
+                                      CORBA::SetOverrideType set_add)
 {
   // @@ The spec does not say what to do on this case.
   if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE)
@@ -199,8 +203,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
 }
 
 void
-TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
-                            )
+TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy)
 {
   if (! this->compatible_scope (policy->_tao_scope()))
     {
@@ -239,9 +242,11 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
 
   // If this is a policy that gets accessed on the critical path,
   // save a pointer to it in the cache.
-  TAO_Cached_Policy_Type cached_policy_type = policy->_tao_cached_type ();
+  TAO_Cached_Policy_Type const cached_policy_type =
+    policy->_tao_cached_type ();
 
-  if (cached_policy_type != TAO_CACHED_POLICY_UNCACHED)
+  if (cached_policy_type != TAO_CACHED_POLICY_UNCACHED
+      && cached_policy_type >= 0)
     {
       this->cached_policies_[cached_policy_type] = copy.ptr ();
     }
@@ -251,8 +256,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
 }
 
 CORBA::PolicyList *
-TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                      )
+TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types)
 {
   CORBA::ULong const slots = types.length ();
   CORBA::PolicyList *policy_list_ptr = 0;
@@ -336,8 +340,7 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const
 }
 
 CORBA::Policy_ptr
-TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                   )
+TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   if (type != TAO_CACHED_POLICY_UNCACHED
       && type < TAO_CACHED_POLICY_MAX_CACHED)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 36f426dd5ed..8df15b71161 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -54,8 +54,7 @@ public:
 
   /// Copy the state from @a source, it uses the copy() operator to
   /// obtain independent copies of all the policies.
-  void copy_from (TAO_Policy_Set* source
-                 );
+  void copy_from (TAO_Policy_Set* source);
 
   /**
    * Modify the list of policies to include @a policies.
@@ -65,18 +64,15 @@ public:
    * No attempt is made to validate the policies for consistency.
    */
   void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add
-                            );
+                             CORBA::SetOverrideType set_add);
 
   /// Get the values (if any) for the policies in @a types, if @a
   /// types is an empty list the method returns *all* the current
   /// policies.
-  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                           );
+  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                               );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a cached policy for speedy lookups.
   /**
@@ -90,12 +86,10 @@ public:
   CORBA::Policy_ptr get_cached_const_policy (TAO_Cached_Policy_Type type) const;
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                      );
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   /// Utility method to set a single policy.
-  void set_policy (const CORBA::Policy_ptr policy
-                  );
+  void set_policy (const CORBA::Policy_ptr policy);
 
   /// Returns the policy at the specified index.
   /// @c CORBA::Policy::_nil () is returned if the policy doesn't
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index e367522f078..660f63644a4 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -65,8 +65,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
 
 
 void
-TAO_Policy_Validator::validate (TAO_Policy_Set &policies
-                                )
+TAO_Policy_Validator::validate (TAO_Policy_Set &policies)
 {
   this->validate_impl (policies);
 
@@ -77,8 +76,7 @@ TAO_Policy_Validator::validate (TAO_Policy_Set &policies
 }
 
 void
-TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
-                                      )
+TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies)
 {
   this->merge_policies_impl (policies);
 
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 747d991d4df..fdb948bb7d3 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -18,14 +18,14 @@
 #define TAO_POLICY_VALIDATOR_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -64,14 +64,12 @@ public:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate (TAO_Policy_Set &policies
-                );
+  void validate (TAO_Policy_Set &policies);
 
   /**
    * Add/merge policies.
    **/
-  void merge_policies (TAO_Policy_Set &policies
-                      );
+  void merge_policies (TAO_Policy_Set &policies);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -97,11 +95,9 @@ public:
  TAO_ORB_Core & orb_core() const;
 
 protected:
-  virtual void validate_impl (TAO_Policy_Set &policies
-                              ) = 0;
+  virtual void validate_impl (TAO_Policy_Set &policies) = 0;
 
-  virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    ) = 0;
+  virtual void merge_policies_impl (TAO_Policy_Set &policies) = 0;
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
 
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index d58ba68db7b..845c1bec8c9 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -2,13 +2,15 @@
 
 #include "tao/PortableServer/Active_Object_Map.h"
 #include "tao/PortableServer/Active_Object_Map_Entry.h"
-#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Active_Object_Map.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "tao/SystemException.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID(PortableServer,
           Active_Object_Map,
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index 829acb189c5..16cec7c1071 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
index 1a36cac5f5d..32981d41e67 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -28,7 +28,6 @@ namespace TAO
     CORBA::Boolean
     Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // Default policies
       CORBA::PolicyList default_policies;
@@ -43,10 +42,9 @@ namespace TAO
         {
           child->the_activator (this);
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
-          (void) child->destroy (1,
-                                 1);
+          (void) child->destroy (1, 1);
 
           return false;
         }
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index 71bff543e51..d5d648b8a3b 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -45,8 +45,7 @@ namespace TAO
       Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
 
       CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                      const char *name)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                                      const char *name);
 
     protected:
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 737aa70f09d..d064dc51e57 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -86,14 +86,10 @@ namespace TAO
             _tao_retval = target->_servant ()->_repository_id ();
           }
       }
-    catch ( ::CORBA::OBJECT_NOT_EXIST&)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    catch ( ::CORBA::Exception&)
-      {
-        throw;
-      }
 
     return _tao_retval;
   }
@@ -164,14 +160,10 @@ namespace TAO
             _tao_retval = target->_servant ()->_get_component ();
           }
       }
-    catch ( ::CORBA::OBJECT_NOT_EXIST&)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    catch ( ::CORBA::Exception&)
-      {
-        throw;
-      }
 
     return _tao_retval._retn ();
   }
@@ -211,14 +203,10 @@ namespace TAO
             _tao_retval = target->_servant ()->_get_interface ();
           }
       }
-    catch ( ::CORBA::OBJECT_NOT_EXIST&)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    catch ( ::CORBA::Exception&)
-      {
-        throw;
-      }
 
     return _tao_retval;
   }
diff --git a/TAO/tao/PortableServer/DII_Arguments_Converter.h b/TAO/tao/PortableServer/DII_Arguments_Converter.h
index 60109b80891..b2b0291f448 100644
--- a/TAO/tao/PortableServer/DII_Arguments_Converter.h
+++ b/TAO/tao/PortableServer/DII_Arguments_Converter.h
@@ -43,9 +43,9 @@ public:
 
   virtual ~TAO_DII_Arguments_Converter (void);
 
-  virtual void convert ( TAO_ServerRequest & server_request,
-                         TAO::Argument * const args[],
-                         size_t nargs) = 0;
+  virtual void convert (TAO_ServerRequest & server_request,
+                        TAO::Argument * const args[],
+                        size_t nargs) = 0;
 };
 
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 63e6773dac9..284fb7e1dd9 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -2,11 +2,14 @@
 
 #include "tao/PortableServer/Default_Servant_Dispatcher.h"
 #include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Network_Priority_Hook.h"
 
 ACE_RCSID(PortableServer,
           Default_Servant_Dispatcher,
           "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
@@ -40,11 +43,12 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
 
 void
 TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (
-  TAO_Root_POA &,
+  TAO_Root_POA &poa,
   CORBA::Short,
-  TAO_ServerRequest &,
+  TAO_ServerRequest &req,
   TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
+  poa.network_priority_hook ()-> set_dscp_codepoint (req, poa);
 }
 
 void
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 0c521f8e592..2c16f0dad5f 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -7,10 +7,9 @@
 #endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #include "tao/Abstract_Servant_Base.h"
-#include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "tao/Object.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (PortableServer,
            Direct_Collocation_Upcall_Wrapper,
@@ -27,40 +26,30 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall (
   const char * op,
   size_t op_len,
   TAO::Collocation_Strategy strategy)
-    ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_Abstract_ServantBase * const servant = obj->_servant ();
 
   TAO_Collocated_Skeleton collocated_skel;
-  int const status = servant->_find (op,
-                                     collocated_skel,
-                                     strategy,
-                                     op_len);
 
-  if (status == -1)
+  if (servant->_find (op, collocated_skel, strategy, op_len) == -1)
     {
       throw ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
+#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   try
     {
-      collocated_skel (servant,
-                       args,
-                       num_args);
-    }
+#endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
+      collocated_skel (servant, args, num_args);
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+    }
   catch (const ::PortableServer::ForwardRequest& forward_request)
     {
       forward_obj =
         CORBA::Object::_duplicate (forward_request.forward_reference.in ());
-      return;
     }
 #else
-  catch (const ::CORBA::Exception&)
-    {
-      ACE_UNUSED_ARG (forward_obj);
-      throw;
-    }
+  ACE_UNUSED_ARG (forward_obj);
 #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
 }
 
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index e84fb58ade4..ca178c39e5a 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -27,7 +27,6 @@
 #include "tao/Exception.h"
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -61,8 +60,7 @@ namespace TAO
       int num_args,
       const char * op,
       size_t op_len,
-      TAO::Collocation_Strategy strategy)
-    ACE_THROW_SPEC ((CORBA::Exception));
+      TAO::Collocation_Strategy strategy);
   };
 
 }  // End namespace TAO
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 619f02bc679..5e5c697efe6 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            IdAssignmentPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     IdAssignmentPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdAssignmentPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     IdAssignmentPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdAssignmentPolicyValue
     IdAssignmentPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     IdAssignmentPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index cf9db21a4f1..b46b3746bdf 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::IdAssignmentPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::IdAssignmentPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index 4949af6817b..f0096d44855 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            IdUniquenessPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     IdUniquenessPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdUniquenessPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     IdUniquenessPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdUniquenessPolicyValue
     IdUniquenessPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     IdUniquenessPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index 944738e6b94..04335db05e9 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::IdUniquenessPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::IdUniquenessPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
index 2f5bef0c049..70be6e3c5d2 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -23,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 #include "tao/orbconf.h"
-#include "tao/Environment.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 287d32547e0..6d3a91be8fb 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            ImplicitActivationPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ImplicitActivationPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ImplicitActivationPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     ImplicitActivationPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ImplicitActivationPolicyValue
     ImplicitActivationPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     ImplicitActivationPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index 50f1465a0c5..a53dad9fcc3 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ImplicitActivationPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ImplicitActivationPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index 32d14ed4fe0..d478bece27d 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableServer,
            LifespanPolicy,
            "$Id$")
 
+#include "ace/CORBA_macros.h"
+
 #if !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -21,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     LifespanPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       LifespanPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -33,20 +34,17 @@ namespace TAO
 
     void
     LifespanPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::LifespanPolicyValue
     LifespanPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     LifespanPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::LIFESPAN_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 50c3246bc08..78b7be973fa 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       LifespanPolicy (::PortableServer::LifespanPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::LifespanPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::LifespanPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 02b20df1881..2ae31deafd4 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -50,9 +50,7 @@ namespace TAO
     }
 
     void
-    LifespanStrategyFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      )
+    LifespanStrategyFactoryImpl::destroy (LifespanStrategy *strategy)
     {
       switch (strategy->type ())
       {
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 3d089ef2b79..8f16ff49b3a 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -21,9 +21,7 @@ namespace TAO
   namespace Portable_Server
   {
     void
-    LifespanStrategyPersistent::strategy_init (
-      TAO_Root_POA *poa
-      )
+    LifespanStrategyPersistent::strategy_init (TAO_Root_POA *poa)
     {
       LifespanStrategy::strategy_init (poa);
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 29ed3ec4cac..19d079dcb95 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -38,9 +38,7 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistentFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      )
+    LifespanStrategyPersistentFactoryImpl::destroy (LifespanStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index 0072ac6fd52..724f137d507 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -38,9 +38,7 @@ namespace TAO
     }
 
     void
-    LifespanStrategyTransientFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      )
+    LifespanStrategyTransientFactoryImpl::destroy (LifespanStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
index 50823b5cfef..7ce7d293988 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp
@@ -14,9 +14,7 @@ ACE_RCSID (PortableServer,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
-                                  void *
-                                  )
+TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void *)
 {
   throw ::CORBA::BAD_OPERATION ();
 }
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
index d4cc2342b5f..50931390395 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ b/TAO/tao/PortableServer/Local_Servant_Base.h
@@ -46,9 +46,7 @@ protected:
   TAO_Stub *_create_stub (void);
 
   /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (TAO_ServerRequest &request,
-                  void *servant_upcall
-                 );
+  void _dispatch (TAO_ServerRequest &request, void *servant_upcall);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
new file mode 100644
index 00000000000..7669319307a
--- /dev/null
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -0,0 +1,49 @@
+// @(#) $Id$
+
+#include "tao/PortableServer/Network_Priority_Hook.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Cached_Policies.h"
+
+ACE_RCSID(PortableServer,
+          Network_Priority_Hook,
+          "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void)
+{
+}
+
+void
+TAO_Network_Priority_Hook::update_network_priority (
+  TAO_Root_POA &poa, TAO_POA_Policy_Set &)
+{
+  poa.cached_policies ().network_priority_model
+    (TAO::Portable_Server::Cached_Policies::NO_NETWORK_PRIORITY);
+  poa.cached_policies ().reply_diffserv_codepoint (0);
+  poa.cached_policies ().request_diffserv_codepoint (0);
+}
+
+void
+TAO_Network_Priority_Hook::set_dscp_codepoint (
+  TAO_ServerRequest &, TAO_Root_POA &)
+{
+}
+
+int
+TAO_Network_Priority_Hook::initialize (void)
+{
+  return ACE_Service_Config::process_directive
+    (ace_svc_desc_TAO_Network_Priority_Hook);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Network_Priority_Hook)
+ACE_STATIC_SVC_DEFINE (TAO_Network_Priority_Hook,
+                       ACE_TEXT ("TAO_Network_Priority_Hook"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Network_Priority_Hook),
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
+                       0)
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h
new file mode 100644
index 00000000000..f9300b347dc
--- /dev/null
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Network_Priority_Hook.h
+ *
+ *  $Id$
+ *
+ *  Provides default network priority hook for use by the POA
+ *
+ *  @author  Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
+ *  @author  Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_NETWORK_PRIORITY_HOOK_H
+#define TAO_NETWORK_PRIORITY_HOOK_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Versioned_Namespace.h"
+#include "tao/orbconf.h"
+#include "ace/Service_Object.h"
+#include "ace/Service_Config.h"
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_POA_Policy_Set;
+class TAO_Root_POA;
+class TAO_ServerRequest;
+
+class TAO_PortableServer_Export TAO_Network_Priority_Hook
+  : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_Network_Priority_Hook(void);
+
+  virtual void update_network_priority (TAO_Root_POA& poa,
+                                        TAO_POA_Policy_Set& poa_policy_set);
+
+
+  virtual void set_dscp_codepoint (TAO_ServerRequest &req,
+                                   TAO_Root_POA& poa);
+
+  /// Static initializer ensures the factory is loaded
+  static int initialize (void);
+
+};
+
+
+static int
+TAO_Requires_Network_Priority_Hook =
+TAO_Network_Priority_Hook::initialize ();
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_Network_Priority_Hook)
+ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Network_Priority_Hook)
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_NETWORK_PRIORITY_HOOK_H */
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index e29eb94b753..6c3a108831f 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -75,7 +75,7 @@ namespace TAO
                 {
                   this->poa_.complete_destruction_i ();
                 }
-              catch (::CORBA::Exception&ex)
+              catch (const::CORBA::Exception&ex)
                 {
                   // Ignore exceptions
                   ex._tao_print_exception ("TAO_POA::complete_destruction_i");
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 8fab6447616..96918af52df 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
 #include "tao/PI_ForwardC.h"
 #include "ace/Service_Object.h"
 #include "ace/Array_Base.h"
@@ -63,13 +62,11 @@ namespace TAO
     virtual int activate (const char *server_id,
                           const char *orb_id,
                           PortableInterceptor::AdapterName *,
-                          PortableServer::POA_ptr poa
-                          ) = 0;
+                          PortableServer::POA_ptr poa) = 0;
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory *current_factory
-      ) = 0;
+      PortableInterceptor::ObjectReferenceFactory *current_factory) = 0;
 
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *
@@ -88,21 +85,11 @@ namespace TAO
      *
      * Methods required by the
      * PortableInterceptor::ObjectReferenceFactory ValueType.
-     *
-     * @todo
-     * @@ Johnny, we won't be needing the exception specification
-     * below for long.  Once bug 1852 is fixed, we can the
-     * exception specification and the "tao/SystemException.h"
-     * include above.
      */
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+      const PortableInterceptor::ObjectId & id) = 0;
     //@}
   };
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 8c854b27170..32b5513fe66 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -342,8 +342,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 int
 TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
                                       TAO_ServerRequest &req,
-                                      CORBA::Object_out forward_to
-                                      )
+                                      CORBA::Object_out forward_to)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
 
@@ -354,11 +353,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   // Set up state in the POA et al (including the POA Current), so
   // that we know that this servant is currently in an upcall.
   const char *operation = req.operation ();
-  int result =
-    servant_upcall.prepare_for_upcall (key,
-                                       operation,
-                                       forward_to
-                                      );
+  int result = servant_upcall.prepare_for_upcall (key, operation, forward_to);
 
   if (result != TAO_Adapter::DS_OK)
     return result;
@@ -366,13 +361,11 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   // Preprocess request.
   if (req.collocated ())
     {
-      servant_upcall.pre_invoke_collocated_request (
-        );
+      servant_upcall.pre_invoke_collocated_request ();
     }
   else
     {
-      servant_upcall.pre_invoke_remote_request (req
-                                               );
+      servant_upcall.pre_invoke_remote_request (req);
     }
 
   // Servant dispatch.
@@ -401,8 +394,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
 void
 TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
-                                TAO_Root_POA *&poa
-                                )
+                                TAO_Root_POA *&poa)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = false;
@@ -434,8 +426,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                              is_persistent,
                              is_root,
                              poa_creation_time,
-                             poa
-                            );
+                             poa);
   }
 
   if (result != 0)
@@ -444,8 +435,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
 
 int
 TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_Root_POA *&poa
-                                  )
+                                  TAO_Root_POA *&poa)
 {
   int result = -1;
 
@@ -457,8 +447,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 
   TAO_Root_POA *parent = this->root_;
   if (parent == 0 || parent->name () != *iterator)
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      -1);
+    throw ::CORBA::OBJ_ADAPTER ();
   else
     ++iterator;
 
@@ -470,9 +459,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 
       try
         {
-          current = parent->find_POA_i (*iterator,
-                                        1
-                                       );
+          current = parent->find_POA_i (*iterator, 1);
         }
       catch (const PortableServer::POA::AdapterNonExistent&)
         {
@@ -496,8 +483,7 @@ int
 TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         CORBA::Boolean root,
                                         const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
-                                        TAO_Root_POA *&poa
-                                        )
+                                        TAO_Root_POA *&poa)
 {
   int result = 0;
 
@@ -507,8 +493,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
     }
   else
     {
-      result = this->transient_poa_map_->find (system_name,
-                                               poa);
+      result = this->transient_poa_map_->find (system_name, poa);
     }
 
   if (poa == 0
@@ -524,12 +509,9 @@ TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
                               poa_name_out system_name)
 {
   if (poa->persistent ())
-    return this->bind_persistent_poa (folded_name,
-                                      poa,
-                                      system_name);
+    return this->bind_persistent_poa (folded_name, poa, system_name);
   else
-    return this->bind_transient_poa (poa,
-                                     system_name);
+    return this->bind_transient_poa (poa, system_name);
 }
 
 int
@@ -538,31 +520,24 @@ TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa,
                                 const poa_name &system_name)
 {
   if (poa->persistent ())
-    return this->unbind_persistent_poa (folded_name,
-                                        system_name);
+    return this->unbind_persistent_poa (folded_name, system_name);
   else
     return this->unbind_transient_poa (system_name);
 }
 
 int
-TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
-                                      )
+TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
 
   PortableServer::ObjectId id;
   TAO_Root_POA *poa = 0;
 
-  this->locate_poa (key,
-                    id,
-                    poa
-                   );
+  this->locate_poa (key, id, poa);
 
   PortableServer::Servant servant = 0;
   TAO_SERVANT_LOCATION servant_location =
-    poa->locate_servant_i (id,
-                           servant
-                          );
+    poa->locate_servant_i (id, servant);
 
   switch (servant_location)
     {
@@ -586,14 +561,9 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
   PortableServer::ObjectId id;
   TAO_Root_POA *poa = 0;
 
-  this->locate_poa (key,
-                    id,
-                    poa);
-
-  TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant);
+  this->locate_poa (key, id, poa);
 
-  return servant_location;
+  return poa->locate_servant_i (id, servant);
 }
 
 void
@@ -618,8 +588,7 @@ TAO_Object_Adapter::open (void)
   ::CORBA::PolicyList policy;
   PortableServer::POAManager_var poa_manager
     = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME,
-                                              policy
-                                             );
+                                              policy);
 #else
   PortableServer::POAManager_ptr poa_manager_ptr;
   ::CORBA::PolicyList policy_list;
@@ -655,8 +624,7 @@ TAO_Object_Adapter::open (void)
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Merge policies from the ORB level.
-  this->validator ().merge_policies (policies.policies ()
-                                    );
+  this->validator ().merge_policies (policies.policies ());
 
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -664,9 +632,7 @@ TAO_Object_Adapter::open (void)
   // administrative action that has not been performed, an
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
-  policies.validate_policies (this->validator (),
-                              this->orb_core_
-                             );
+  policies.validate_policies (this->validator (), this->orb_core_);
 
   // Construct a new POA
   TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
@@ -677,8 +643,7 @@ TAO_Object_Adapter::open (void)
                                                 this->lock (),
                                                 this->thread_lock (),
                                                 this->orb_core_,
-                                                this
-                                               );
+                                                this);
 
   // The Object_Adapter will keep a reference to the Root POA so that
   // on its destruction, it can check whether the Root POA has been
@@ -695,8 +660,7 @@ TAO_Object_Adapter::open (void)
 }
 
 void
-TAO_Object_Adapter::close (int wait_for_completion
-                           )
+TAO_Object_Adapter::close (int wait_for_completion)
 {
   this->check_close (wait_for_completion);
 
@@ -726,10 +690,8 @@ TAO_Object_Adapter::close (int wait_for_completion
     this->poa_manager_factory_ = 0;
 #endif
   }
-  CORBA::Boolean etherealize_objects = 1;
-  root->destroy (etherealize_objects,
-                 wait_for_completion
-                );
+  CORBA::Boolean etherealize_objects = true;
+  root->destroy (etherealize_objects, wait_for_completion);
   ::CORBA::release (root);
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   release_poa_manager_factory (factory);
@@ -737,12 +699,10 @@ TAO_Object_Adapter::close (int wait_for_completion
 }
 
 void
-TAO_Object_Adapter::check_close (int wait_for_completion
-                                 )
+TAO_Object_Adapter::check_close (int wait_for_completion)
 {
   TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion
-                                                );
+                                                 wait_for_completion);
 }
 
 int
@@ -754,8 +714,7 @@ TAO_Object_Adapter::priority (void) const
 int
 TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                               TAO_ServerRequest &request,
-                              CORBA::Object_out forward_to
-                              )
+                              CORBA::Object_out forward_to)
 {
   if (key.length() < TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE
       || ACE_OS::memcmp (key.get_buffer (),
@@ -783,8 +742,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                                  0,  // servant_upcall
                                                  0,  // exceptions
                                                  0, // nexceptions
-                                                 ocs.out ()
-                                                );
+                                                 ocs.out ());
 
           /// If we have a cached result, just go ahead and send the reply
           /// and let us  return
@@ -814,8 +772,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                                          0,  // nargs
                                                          0,  // servant_upcall
                                                          0,  // exceptions
-                                                         0   // nexceptions
-                                                        );
+                                                         0);   // nexceptions
 
           // If a PortableInterceptor::ForwardRequest exception was
           // thrown, then set the forward_to object reference and return
@@ -828,10 +785,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
         }
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-      result = this->dispatch_servant (key,
-                                       request,
-                                       forward_to
-                                      );
+      result = this->dispatch_servant (key, request, forward_to);
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -868,11 +822,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                        0,  // nargs
                                        0,  // servant_upcall
                                        0,  // exceptions
-                                       0   // nexceptions
-                                      );
+                                       0);   // nexceptions
 
-          status =
-            request.reply_status ();
+          status = request.reply_status ();
         }
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -983,11 +935,9 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
 
       try
         {
-          this->find_servant (objkey.in (),
-              servant
-             );
+          this->find_servant (objkey.in (), servant);
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
         }
 
@@ -1021,8 +971,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
 int
 TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_Root_POA *&poa
-  )
+  TAO_Root_POA *&poa)
 {
   poa_name folded_name;
   int result = this->persistent_poa_system_map_.recover_key (system_name,
@@ -1030,8 +979,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
 
   if (result == 0)
     {
-      result = this->persistent_poa_system_map_.find (system_name,
-                                                      poa);
+      result = this->persistent_poa_system_map_.find (system_name, poa);
       if (result != 0
           || folded_name != poa->folded_name ())
         {
@@ -1040,10 +988,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
                                                                    poa);
           if (result != 0)
             {
-              result =
-                this->object_adapter_->activate_poa (folded_name,
-                                                     poa
-                                                    );
+              result = this->object_adapter_->activate_poa (folded_name, poa);
             }
         }
     }
@@ -1099,8 +1044,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 int
 TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_Root_POA *&poa
-  )
+  TAO_Root_POA *&poa)
 {
   int result =
     this->object_adapter_->persistent_poa_name_map_->find (system_name,
@@ -1108,9 +1052,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
   if (result != 0)
     {
       result =
-        this->object_adapter_->activate_poa (system_name,
-                                             poa
-                                            );
+        this->object_adapter_->activate_poa (system_name, poa);
     }
 
   return result;
@@ -1123,8 +1065,7 @@ TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (
   poa_name_out system_name)
 {
   int result =
-    this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                           poa);
+    this->object_adapter_->persistent_poa_name_map_->bind (folded_name, poa);
   if (result == 0)
     ACE_NEW_RETURN (system_name,
                     poa_name (folded_name),
@@ -1240,8 +1181,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
                               ACE_OS::thr_self ()))
     {
       // If so wait...
-      int result =
-        this->non_servant_upcall_condition_.wait ();
+      int const result = this->non_servant_upcall_condition_.wait ();
       if (result == -1)
         throw ::CORBA::OBJ_ADAPTER ();
     }
@@ -1255,7 +1195,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void)
     {
       this->wait_for_non_servant_upcalls_to_complete ();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete "
@@ -1274,12 +1214,9 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
 
 void
 TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req,
-                                 TAO::Portable_Server::Servant_Upcall& upcall
-                                 )
+                                 TAO::Portable_Server::Servant_Upcall& upcall)
 {
-  upcall.servant ()->_dispatch(req,
-                               &upcall
-                              );
+  upcall.servant ()->_dispatch(req, &upcall);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl
index 0a0777bc6ab..9a09c7e9f1b 100644
--- a/TAO/tao/PortableServer/Object_Adapter.inl
+++ b/TAO/tao/PortableServer/Object_Adapter.inl
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -50,37 +51,29 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
-                                    )
+TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
-  return this->locate_servant_i (key
-                                );
+  return this->locate_servant_i (key);
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
-                                  PortableServer::Servant &servant
-                                  )
+                                  PortableServer::Servant &servant)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
-  return this->find_servant_i (key,
-                               servant
-                              );
+  return this->find_servant_i (key, servant);
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_Root_POA *&poa
-                                         )
+                                         TAO_Root_POA *&poa)
 {
-  return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa
-                                                   );
+  return this->hint_strategy_->find_persistent_poa (system_name, poa);
 }
 
 ACE_INLINE int
@@ -93,9 +86,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
 {
   if (activate_it)
     {
-      return this->find_persistent_poa (system_name,
-                                        poa
-                                       );
+      return this->find_persistent_poa (system_name, poa);
     }
   else
     {
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index a271dfdf4d1..b6e0766e3e8 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -54,15 +54,12 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 
 char *
 TAO_POA_Manager::get_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 void
 TAO_POA_Manager::activate_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
 {
   // This operation changes the state of the POA manager to active. If
   // issued while the POA manager is in the inactive state, the
@@ -87,21 +84,16 @@ TAO_POA_Manager::activate_i (void)
         }
     }
 
-  this->adapter_manager_state_changed (this->state_
-                                      );
+  this->adapter_manager_state_changed (this->state_);
 }
 
 void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
-                               CORBA::Boolean wait_for_completion
-                               )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
+                               CORBA::Boolean wait_for_completion)
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                     );
+                                                      wait_for_completion);
 
   // This operation changes the state of the POA manager to
   // inactive. If issued while the POA manager is in the inactive
@@ -153,9 +145,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
       // strategy to stop the dispatching threads.
       poa->poa_deactivated_hook ();
 
-      poa->deactivate_all_objects_i (etherealize_objects,
-                                     wait_for_completion
-                                    );
+      poa->deactivate_all_objects_i (etherealize_objects, wait_for_completion);
     }
 
   // If the ORB::shutdown operation is called, it makes a call on
@@ -163,15 +153,11 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
   // manager known in the process; the wait_for_completion parameter
   // to deactivate will be the same as the similarly named parameter
   // of ORB::shutdown.
-
-  this->adapter_manager_state_changed (this->state_
-                                      );
+  this->adapter_manager_state_changed (this->state_);
 }
 
 void
-TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state
-                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state)
 {
   PortableInterceptor::AdapterState adapter_state =
     static_cast<PortableInterceptor::AdapterState> (state);
@@ -182,23 +168,18 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
   if (ior_adapter)
     {
       ior_adapter->adapter_manager_state_changed (this->id_.in (),
-                                                  adapter_state
-                                                 );
+                                                  adapter_state);
     }
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 void
-TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
+TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                     );
+                                                      wait_for_completion);
 
   // This operation changes the state of the POA manager to
   // holding. If issued while the POA manager is in the inactive
@@ -237,25 +218,19 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
            ++iterator)
         {
           TAO_Root_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion
-                                    );
+          poa->wait_for_completions (wait_for_completion);
         }
     }
 
-  this->adapter_manager_state_changed (this->state_
-                                      );
+  this->adapter_manager_state_changed (this->state_);
 }
 
 void
-TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
-                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
+TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion)
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                     );
+                                                      wait_for_completion);
 
   // This operation changes the state of the POA manager to
   // discarding. If issued while the POA manager is in the inactive
@@ -296,13 +271,11 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
            ++iterator)
         {
           TAO_Root_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion
-                                    );
+          poa->wait_for_completions (wait_for_completion);
         }
     }
 
-  this->adapter_manager_state_changed (this->state_
-                                      );
+  this->adapter_manager_state_changed (this->state_);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 6e37d9db634..8f46f7f56ab 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -62,35 +62,23 @@ class TAO_PortableServer_Export TAO_POA_Manager :
 
 public:
 
-  void activate (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void activate (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests (CORBA::Boolean wait_for_completion
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void hold_requests (CORBA::Boolean wait_for_completion);
 
   void discard_requests (CORBA::Boolean wait_for_completion
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                         );
 
   void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                   CORBA::Boolean wait_for_completion);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager::State get_state (void);
 
-  char *get_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char *get_id (void);
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -106,46 +94,30 @@ public:
   /// Check the state of this POA manager
   void check_state (void);
 
-  PortableServer::POAManager::State get_state_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager::State get_state_i ();
 
-  virtual CORBA::ORB_ptr _get_orb (
-
-    );
+  virtual CORBA::ORB_ptr _get_orb (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-  CORBA::PolicyList& get_policies ();
+  CORBA::PolicyList& get_policies (void);
 #endif
 
 protected:
 
-  void activate_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void activate_i (void);
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+                     CORBA::Boolean wait_for_completion);
 
   /// Method needed for notifying the IORInterceptors that the state
   /// of POAManager changed.
-  void adapter_manager_state_changed (PortableServer::POAManager::State state
-                                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void adapter_manager_state_changed (PortableServer::POAManager::State state);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests_i (CORBA::Boolean wait_for_completion
-                        )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void hold_requests_i (CORBA::Boolean wait_for_completion);
 
-  void discard_requests_i (CORBA::Boolean wait_for_completion
-                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
+  void discard_requests_i (CORBA::Boolean wait_for_completion);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index c8bcd0e7c50..066b1112a38 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
+#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -15,11 +15,7 @@ TAO_POA_Manager::lock (void)
 
 ACE_INLINE void
 TAO_POA_Manager::activate (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->activate_i ();
 }
@@ -27,56 +23,37 @@ TAO_POA_Manager::activate (void)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion)
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->hold_requests_i (wait_for_completion);
 }
 
 ACE_INLINE void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion
-                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion)
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->discard_requests_i (wait_for_completion);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion
-                             )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
+                             CORBA::Boolean wait_for_completion)
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
-  this->deactivate_i (etherealize_objects,
-                      wait_for_completion
-                     );
+  this->deactivate_i (etherealize_objects, wait_for_completion);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->state_;
 }
 
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_);
@@ -131,7 +108,7 @@ TAO_POA_Manager::generate_manager_id (void) const
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 ACE_INLINE
-CORBA::PolicyList& TAO_POA_Manager::get_policies ()
+CORBA::PolicyList& TAO_POA_Manager::get_policies (void)
 {
   return this->policies_;
 }
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index 8fa54df8ab7..eb3a8ef823f 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -4,6 +4,7 @@
 #include "tao/PortableServer/POAManager.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
 
 ACE_RCSID (PortableServer,
            POAManagerFactory,
@@ -28,20 +29,15 @@ TAO_POAManager_Factory::create_POAManager (
   const char * id,
   const ::CORBA::PolicyList & policies
   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                     ::CORBA::PolicyError))
 {
   // Validate the policy.
   TAO_POA_Policy_Set tao_policies (TAO_POA_Policy_Set (this->object_adapter_.default_poa_policies ()));
 
   // Merge policies from the ORB level.
-  this->object_adapter_.validator ().merge_policies (tao_policies.policies ()
-                                                     );
+  this->object_adapter_.validator ().merge_policies (tao_policies.policies ());
 
   // Merge in any policies that the user may have specified.
-  tao_policies.merge_policies (policies
-                             );
+  tao_policies.merge_policies (policies);
 
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -50,8 +46,7 @@ TAO_POAManager_Factory::create_POAManager (
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
   tao_policies.validate_policies (this->object_adapter_.validator (),
-                                  this->object_adapter_.orb_core ()
-                                 );
+                                  this->object_adapter_.orb_core ());
 
   PortableServer::POAManager_var poamanager;
 
@@ -62,9 +57,7 @@ TAO_POAManager_Factory::create_POAManager (
     // If we already have a manager with the same name throw an exception
     if (!CORBA::is_nil (poamanager.in()))
       {
-        ACE_THROW_RETURN (
-          ::PortableServer::POAManagerFactory::ManagerAlreadyExists (),
-          ::PortableServer::POAManager::_nil ());
+        throw ::PortableServer::POAManagerFactory::ManagerAlreadyExists ();
       }
   }
 
@@ -86,9 +79,7 @@ TAO_POAManager_Factory::create_POAManager (
 }
 
 ::PortableServer::POAManagerFactory::POAManagerSeq *
-TAO_POAManager_Factory::list (
-  void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_POAManager_Factory::list (void)
 {
   ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers;
   CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong>
@@ -114,9 +105,7 @@ TAO_POAManager_Factory::list (
 }
 
 ::PortableServer::POAManager_ptr
-TAO_POAManager_Factory::find (
-  const char * id )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_POAManager_Factory::find (const char * id )
 {
   ::PortableServer::POAManager_ptr poamanager =
     ::PortableServer::POAManager::_nil();
@@ -125,8 +114,7 @@ TAO_POAManager_Factory::find (
         iterator != this->poamanager_set_.end ();
         ++iterator)
     {
-      CORBA::String_var poamanagerid =
-        (*iterator)->get_id ();
+      CORBA::String_var poamanagerid = (*iterator)->get_id ();
 
       if (ACE_OS::strcmp (id, poamanagerid.in()) == 0)
         {
@@ -155,8 +143,7 @@ int
 TAO_POAManager_Factory::remove_poamanager (
   ::PortableServer::POAManager_ptr poamanager)
 {
-  int retval = 0;
-  retval = this->poamanager_set_.remove (poamanager);
+  int retval = this->poamanager_set_.remove (poamanager);
 
   if (retval == 0)
     {
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index ea0fa1d0cee..fe6ad4c46ed 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -49,19 +49,11 @@ public:
 
   virtual ::PortableServer::POAManager_ptr create_POAManager (
       const char * id,
-      const ::CORBA::PolicyList & policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                      ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                      ::CORBA::PolicyError));
-
-  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::PortableServer::POAManager_ptr find (
-      const char * id )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+      const ::CORBA::PolicyList & policies);
+
+  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void);
+
+  virtual ::PortableServer::POAManager_ptr find (const char * id);
 
   void remove_all_poamanagers (void);
 
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 561ddb683bb..d531f09197f 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -33,7 +33,10 @@ namespace TAO
         servant_retention_ (::PortableServer::RETAIN),
         request_processing_ (::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
         priority_model_ (Cached_Policies::NOT_SPECIFIED),
-        server_priority_ (TAO_INVALID_PRIORITY)
+        server_priority_ (TAO_INVALID_PRIORITY),
+        network_priority_model_ (Cached_Policies::NO_NETWORK_PRIORITY),
+        request_diffserv_codepoint_ (0),
+        reply_diffserv_codepoint_ (0)
     {
     }
 
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 60465f8238a..5b8caca49d0 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -50,6 +50,13 @@ namespace TAO
         NOT_SPECIFIED
       };
 
+      enum NetworkPriorityModel
+      {
+        CLIENT_PROPAGATED_NETWORK_PRIORITY,
+        SERVER_DECLARED_NETWORK_PRIORITY,
+        NO_NETWORK_PRIORITY
+      };
+
       Cached_Policies ();
 
       ~Cached_Policies (void);
@@ -72,6 +79,37 @@ namespace TAO
       PriorityModel priority_model (void) const;
       CORBA::Short server_priority (void) const;
 
+      /// Returns the network priority model that was set using a policy
+      /// by the server application.
+      ///
+      NetworkPriorityModel network_priority_model (void) const;
+
+      /// Returns the request DiffServ codepoint that was set using a policy
+      /// by the server application.
+      ///
+      CORBA::Long request_diffserv_codepoint (void) const;
+
+      /// Returns the reply DiffServ codepoint that was set using a policy
+      /// by the server application.
+      ///
+      CORBA::Long reply_diffserv_codepoint (void) const;
+
+      /// Caches the network priority model that was set using a policy
+      /// by the server application.
+      ///
+      void network_priority_model (
+        NetworkPriorityModel network_priority_model);
+
+      /// Caches the request DiffServ codepoint that was set using a policy
+      /// by the server application.
+      ///
+      void request_diffserv_codepoint (CORBA::Long diffserv_codepoint);
+
+      /// Caches the reply DiffServ codepoint that was set using a policy
+      /// by the server application.
+      ///
+      void reply_diffserv_codepoint (CORBA::Long diffserv_codepoint);
+
       void priority_model (PriorityModel priority_model);
       void server_priority (CORBA::Short priority);
       void implicit_activation (::PortableServer::ImplicitActivationPolicyValue value);
@@ -100,6 +138,12 @@ namespace TAO
       PriorityModel priority_model_;
 
       CORBA::Short server_priority_;
+
+      NetworkPriorityModel network_priority_model_;
+
+      CORBA::Long request_diffserv_codepoint_;
+
+      CORBA::Long reply_diffserv_codepoint_;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl
index b3699fe3e7d..3bf565f61f6 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.inl
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl
@@ -74,6 +74,44 @@ namespace TAO
       this->server_priority_ = priority;
     }
 
+     ACE_INLINE Cached_Policies::NetworkPriorityModel
+    Cached_Policies::network_priority_model (void) const
+    {
+      return this->network_priority_model_;
+    }
+
+    ACE_INLINE CORBA::Long
+    Cached_Policies::request_diffserv_codepoint (void) const
+    {
+      return this->request_diffserv_codepoint_;
+    }
+
+    ACE_INLINE CORBA::Long
+    Cached_Policies::reply_diffserv_codepoint (void) const
+    {
+      return this->reply_diffserv_codepoint_;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::network_priority_model (
+       NetworkPriorityModel network_priority_model)
+    {
+      this->network_priority_model_ = network_priority_model;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::request_diffserv_codepoint (
+      CORBA::Long diffserv_codepoint)
+    {
+      this->request_diffserv_codepoint_ = diffserv_codepoint;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::reply_diffserv_codepoint (CORBA::Long diffserv_codepoint)
+    {
+      this->reply_diffserv_codepoint_ = diffserv_codepoint;
+    }
+
     ACE_INLINE void
     Cached_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
     {
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 2dcaf4ceefa..defd9558ce1 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -19,53 +19,41 @@ namespace TAO
   {
     PortableServer::POA_ptr
     POA_Current::get_POA (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
       if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
+        throw PortableServer::Current::NoContext ();
       return impl->get_POA ();
     }
 
     PortableServer::ObjectId *
     POA_Current::get_object_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
       if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
+        throw PortableServer::Current::NoContext ();
       return impl->get_object_id ();
     }
 
     PortableServer::Servant
     POA_Current::get_servant (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
       if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
+        throw PortableServer::Current::NoContext ();
       return impl->get_servant ();
     }
 
     CORBA::Object_ptr
     POA_Current::get_reference (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
     {
       POA_Current_Impl *impl = this->implementation ();
 
       if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
+        throw PortableServer::Current::NoContext ();
       return impl->get_reference ();
     }
 
@@ -79,8 +67,7 @@ namespace TAO
     POA_Current_Impl *
     POA_Current::implementation (POA_Current_Impl *new_current)
     {
-      TAO_TSS_Resources *tss =
-        TAO_TSS_Resources::instance ();
+      TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
       POA_Current_Impl *old =
         static_cast <POA_Current_Impl *>
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 57a97f0e37e..204190abccd 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -48,18 +48,14 @@ namespace TAO
        * Can raise the @c NoContext exception if this function is
        * not invoked in the context of an upcall.
        */
-      PortableServer::POA_ptr get_POA (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::POA_ptr get_POA (void);
 
       /**
        * Returns the object id of the current request being invoked.  Can
        * raise the @c NoContext exception if this function is not
        * invoked in the context of an upcall.
        */
-      PortableServer::ObjectId *get_object_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::ObjectId *get_object_id (void);
 
       /**
        * This operation returns a locally manufactured reference to the object
@@ -70,18 +66,14 @@ namespace TAO
        * Object::is_equivalent operation to compare the two references may not
        * necessarily return true.
        */
-      CORBA::Object_ptr get_reference (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      CORBA::Object_ptr get_reference (void);
 
       /**
        * Returns a reference to the servant that hosts the object in whose
        * context it is called. If called outside the context of the POA
        * dispatched operation, a NoContext exception is raised
        */
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
+      PortableServer::Servant get_servant (void);
 
       /// Returns the class that implements this interface.
       POA_Current_Impl *implementation (void);
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 5656041765c..baefc206285 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -9,9 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Object_ptr
 TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
                                         int,
-                                        ACE_TCHAR * []
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                                        ACE_TCHAR * [])
 {
   TAO::Portable_Server::POA_Current* adapter = 0;
   ACE_NEW_RETURN (adapter,
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h
index 678ce9f043c..28087757bde 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.h
+++ b/TAO/tao/PortableServer/POA_Current_Factory.h
@@ -34,9 +34,7 @@ public:
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index eab3e4d0e4f..87c214651a5 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -28,13 +28,12 @@ namespace TAO
         servant_ (0),
         priority_ (TAO_INVALID_PRIORITY),
         previous_current_impl_ (0),
-        setup_done_ (0)
+        setup_done_ (false)
     {
     }
 
     void
-    POA_Current_Impl::setup (::TAO_Root_POA *p,
-                             const TAO::ObjectKey &key)
+    POA_Current_Impl::setup (::TAO_Root_POA *p, const TAO::ObjectKey &key)
     {
       // Remember information about this upcall.
       this->poa_ = p;
@@ -49,7 +48,7 @@ namespace TAO
       this->tss_resources_->poa_current_impl_ = this;
 
       // Setup is complete.
-      this->setup_done_ = 1;
+      this->setup_done_ = true;
     }
 
     POA_Current_Impl *
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
index c14df79916d..32c6841f397 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -137,8 +137,7 @@ namespace TAO
       void teardown (void);
 
       /// Setup the current.
-      void setup (::TAO_Root_POA *impl,
-                  const TAO::ObjectKey &key);
+      void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key);
 
     private:
 
@@ -174,7 +173,7 @@ namespace TAO
       POA_Current_Impl *previous_current_impl_;
 
       /// Is setup complete?
-      int setup_done_;
+      bool setup_done_;
 
       /// Pointer to tss resources.
       TAO_TSS_Resources *tss_resources_;
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index f13233c81e9..17b976b6244 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -15,9 +15,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    POA_Guard::POA_Guard (::TAO_Root_POA &poa
-                          ,
-                          int check_for_destruction)
+    POA_Guard::POA_Guard (::TAO_Root_POA &poa, bool check_for_destruction)
       : guard_ (poa.lock ())
     {
       if (!this->guard_.locked ())
@@ -33,8 +31,7 @@ namespace TAO
       // course, the thread making the non-servant upcall is this thread.
       poa.object_adapter ().wait_for_non_servant_upcalls_to_complete ();
 
-      if (check_for_destruction &&
-          poa.cleanup_in_progress ())
+      if (check_for_destruction && poa.cleanup_in_progress ())
         throw
           CORBA::BAD_INV_ORDER (
             CORBA::SystemException::_tao_minor_code (
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index ae77c6de2be..2757259f5d8 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -19,9 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 #include "ace/Guard_T.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -41,9 +40,7 @@ namespace TAO
     class TAO_PortableServer_Export POA_Guard
     {
     public:
-      POA_Guard (::TAO_Root_POA &poa
-                 ,
-                 int check_for_destruction = 1);
+      POA_Guard (::TAO_Root_POA &poa, bool check_for_destruction = true);
 
     private:
       ACE_Guard<ACE_Lock> guard_;
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index cd60ac7b1a2..084ce2cb75f 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -33,8 +33,8 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
 }
 
 void
-TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                                       )
+TAO_POA_Policy_Set::add_client_exposed_fixed_policies (
+  CORBA::PolicyList *client_exposed_policies)
 {
   CORBA::ULong cep_index = client_exposed_policies->length ();
 
@@ -48,9 +48,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
       if (policy->_tao_scope () & TAO_POLICY_CLIENT_EXPOSED)
         {
           client_exposed_policies->length (cep_index + 1);
-          (*client_exposed_policies)[cep_index] =
-                                  policy->copy ();
-
+          (*client_exposed_policies)[cep_index] = policy->copy ();
           cep_index++;
         }
     }
@@ -58,8 +56,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
 
 void
 TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
-                                       TAO_ORB_Core &orb_core
-                                       )
+                                       TAO_ORB_Core &orb_core)
 {
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
@@ -80,7 +77,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
 
       if (validator.legal_policy (type) == 0)
         {
-#if ! defined (CORBA_E_MICRO)
+#if !defined (CORBA_E_MICRO)
           // An invalid policy was specified.  Let the user know about
           // it.
           throw PortableServer::POA::InvalidPolicy ();
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl
index e91e7111d94..ced101d0a5d 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.inl
+++ b/TAO/tao/PortableServer/POA_Policy_Set.inl
@@ -17,33 +17,26 @@ TAO_POA_Policy_Set::get_policy_by_index (CORBA::ULong index)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                       )
+TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
 {
-  return this->impl_.get_cached_policy (type
-                                       );
+  return this->impl_.get_cached_policy (type);
 }
 
 ACE_INLINE void
-TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies
-                                    )
+TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies)
 {
   // Add the policies if they don't exist, override them if they do.
-  this->impl_.set_policy_overrides (policies,
-                                    CORBA::ADD_OVERRIDE
-                                   );
+  this->impl_.set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 }
 
 ACE_INLINE void
-TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
-                                  )
+TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy)
 {
   this->impl_.set_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy
-                                )
+TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy)
 {
   return this->impl_.get_policy (policy);
 }
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 4d4aa7d4ddc..592be9ab1e9 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -42,7 +42,6 @@
 
 #include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/OctetSeqC.h"
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 38d9d2ffe71..1cecf8b3974 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -262,7 +262,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -281,7 +280,6 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -346,9 +344,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     int
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::Policy_ptr>
@@ -367,9 +362,6 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     int
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::Policy_ptr>
@@ -386,11 +378,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   dynamic_cast<POA_CORBA::Policy_ptr>
     (servant)
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 4f6a78dc428..5158592f1c4 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -146,9 +146,7 @@ namespace POA_CORBA
     virtual CORBA::PolicyType policy_type (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void _get_policy_type_skel (
         TAO_ServerRequest & server_request,
@@ -163,9 +161,7 @@ namespace POA_CORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void copy_skel (
         TAO_ServerRequest & server_request,
@@ -180,9 +176,7 @@ namespace POA_CORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void destroy_skel (
         TAO_ServerRequest & server_request,
@@ -211,8 +205,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -224,8 +217,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_Policy_Strategized_Proxy_Broker *
     the_TAO_Policy_Strategized_Proxy_Broker (void);
@@ -260,10 +252,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
@@ -274,10 +263,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
@@ -288,10 +274,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 6424524af08..ef5c094ce39 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -92,30 +92,21 @@ namespace POA_CORBA
 
     CORBA::PolicyType policy_type (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Policy_ptr copy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index c896883e321..12d3f23e7cb 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -128,9 +128,6 @@ template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->policy_type (
 
@@ -142,11 +139,7 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->copy (
 
@@ -160,9 +153,6 @@ template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
 
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index 90ab76fe374..6381ccf9bd2 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -14,14 +14,13 @@
 #define TAO_POLICY_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index 336bf44a057..332cbb25d69 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -42,7 +42,7 @@ TAO_Regular_POA::remove_from_parent_i (void)
   // Remove POA from the parent
   if (this->parent_ != 0)
     {
-      int result = this->parent_->delete_child (this->name_);
+      int const result = this->parent_->delete_child (this->name_);
       if (result != 0)
         {
           throw ::CORBA::OBJ_ADAPTER ();
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index 0aa05f9f33d..a1184f34572 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -50,8 +50,7 @@ public:
 
   virtual ~TAO_Regular_POA (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
 protected:
   virtual void remove_from_parent_i (void);
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index bbfe8339c0e..a97a96b8471 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::POA_ptr
 TAO_Regular_POA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->parent_);
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 99e04676cbb..3a1f478abc6 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -23,7 +23,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     RequestProcessingPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       RequestProcessingPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -35,20 +34,17 @@ namespace TAO
 
     void
     RequestProcessingPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::RequestProcessingPolicyValue
     RequestProcessingPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     RequestProcessingPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index f9783203f29..d28b27a30b8 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::RequestProcessingPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::RequestProcessingPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 9a5f04eb0a3..237449a1938 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -29,17 +29,14 @@ namespace TAO
     void
     RequestProcessingStrategy::strategy_init(
       TAO_Root_POA *poa,
-      ::PortableServer::ServantRetentionPolicyValue sr_value
-      )
+      ::PortableServer::ServantRetentionPolicyValue sr_value)
     {
       poa_ = poa;
       sr_value_ = sr_value;
     }
 
     void
-    RequestProcessingStrategy::strategy_init(
-      TAO_Root_POA *poa
-      )
+    RequestProcessingStrategy::strategy_init(TAO_Root_POA *poa)
     {
       poa_ = poa;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index fa8fdc6f861..2d515d52f87 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -67,24 +67,20 @@ namespace TAO
 
       virtual PortableServer::ServantManager_ptr get_servant_manager (
         void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void set_servant (PortableServer::Servant servant )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
+        = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
       virtual PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
+        = 0;
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
@@ -111,18 +107,14 @@ namespace TAO
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0;
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 3becbba1b37..4ee454e9b61 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -25,29 +25,20 @@ namespace TAO
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyAOMOnly::get_servant_manager (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyAOMOnly::set_servant_manager (
-      PortableServer::ServantManager_ptr /*imgr*/
-                         )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
+      PortableServer::ServantManager_ptr /*imgr*/)
     {
       throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyAOMOnly::set_servant (
-      PortableServer::Servant /*servant*/
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::Servant /*servant*/)
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -56,22 +47,16 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::get_servant (void)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     TAO_SERVANT_LOCATION
     RequestProcessingStrategyAOMOnly::locate_servant (
       const PortableServer::ObjectId & system_id,
-      PortableServer::Servant & servant
-      )
+      PortableServer::Servant & servant)
     {
-      return this->poa_->servant_present (system_id,
-                                          servant
-                                         );
+      return this->poa_->servant_present (system_id, servant);
     }
 
     PortableServer::Servant
@@ -80,21 +65,19 @@ 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*/
-      )
+      bool & /*wait_occurred_restart_call*/)
     {
       PortableServer::Servant servant = 0;
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
-                                          poa_current_impl
-                                         );
+                                          poa_current_impl);
 
       if (servant == 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2,
-                                                     CORBA::COMPLETED_NO),
-                            0);
+          throw ::CORBA::OBJECT_NOT_EXIST (
+            CORBA::OMGVMCID | 2,
+            CORBA::COMPLETED_NO);
         }
 
       return servant;
@@ -102,30 +85,22 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      )
+      const PortableServer::ObjectId &system_id)
     {
-      return this->poa_->find_servant (system_id
-                                      );
+      return this->poa_->find_servant (system_id);
     }
 
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::id_to_servant (
-      const PortableServer::ObjectId &id
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
+      const PortableServer::ObjectId &id)
     {
-      return this->poa_->user_id_to_servant_i (id
-                                              );
+      return this->poa_->user_id_to_servant_i (id);
     }
 
     void
     RequestProcessingStrategyAOMOnly::cleanup_servant (
       PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      )
+      const PortableServer::ObjectId &user_id)
     {
       if (servant)
         {
@@ -139,9 +114,7 @@ namespace TAO
       // This operation causes the association of the Object Id specified
       // by the oid parameter and its servant to be removed from the
       // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
+      if (this->poa_->unbind_using_user_id (user_id) != 0)
         {
           throw ::CORBA::OBJ_ADAPTER ();
         }
@@ -155,11 +128,7 @@ namespace TAO
 
     PortableServer::ObjectId *
     RequestProcessingStrategyAOMOnly::servant_to_id (
-      PortableServer::Servant servant
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::Servant servant)
     {
       return this->poa_->servant_to_user_id (servant);
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 69555e2a84d..96d79641ce9 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -43,28 +43,20 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_POA == 0)
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant_manager (void);
 
       void
       set_servant_manager (PortableServer::ServantManager_ptr imgr
-                           )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                           );
 
       void
       set_servant (PortableServer::Servant servant
-                   )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                   );
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
       PortableServer::Servant
-      get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant (void);
 
       virtual
       TAO_SERVANT_LOCATION
@@ -87,10 +79,7 @@ namespace TAO
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
@@ -101,10 +90,7 @@ namespace TAO
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index d28ded5325d..2b18dd7ff53 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -29,37 +29,26 @@ namespace TAO
     }
 
     void
-    RequestProcessingStrategyDefaultServant::strategy_cleanup(
-      void)
+    RequestProcessingStrategyDefaultServant::strategy_cleanup(void)
     {
       this->default_servant_ = 0;
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyDefaultServant::get_servant_manager (
-      void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+    RequestProcessingStrategyDefaultServant::get_servant_manager (void)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyDefaultServant::set_servant_manager (
-      PortableServer::ServantManager_ptr /*imgr*/
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::ServantManager_ptr /*imgr*/)
     {
       throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::get_servant (
-      void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+    RequestProcessingStrategyDefaultServant::get_servant (void)
     {
       // This operation returns the default servant associated with the
       // POA.
@@ -70,8 +59,6 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::set_servant (
       PortableServer::Servant servant
       )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation registers the specified servant with the POA as
       // the default servant. This servant will be used for all requests
@@ -107,9 +94,7 @@ namespace TAO
     {
       TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
 
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                             );
+      location = this->poa_->servant_present (system_id, servant);
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -135,8 +120,7 @@ namespace TAO
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
-                                          poa_current_impl
-                                         );
+                                          poa_current_impl);
 
       if (servant == 0)
         {
@@ -148,9 +132,9 @@ namespace TAO
           PortableServer::Servant default_servant = this->default_servant_.in ();
           if (default_servant == 0)
             {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 3,
-                                                    CORBA::COMPLETED_NO),
-                                                    0);
+              throw ::CORBA::OBJ_ADAPTER (
+                CORBA::OMGVMCID | 3,
+                CORBA::COMPLETED_NO);
             }
           else
             {
@@ -164,15 +148,13 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      )
+      const PortableServer::ObjectId &system_id)
     {
       PortableServer::Servant servant = this->default_servant_.in ();
 
       if (servant == 0)
         {
-          servant = this->poa_->find_servant (system_id
-                                             );
+          servant = this->poa_->find_servant (system_id);
         }
 
       return servant;
@@ -180,11 +162,7 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::id_to_servant (
-      const PortableServer::ObjectId & /*id*/
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
+      const PortableServer::ObjectId & /*id*/)
     {
       PortableServer::Servant servant = this->default_servant_.in ();
 
@@ -195,8 +173,7 @@ namespace TAO
            * no default servant is available, we will raise the
            * ObjectNotActive system exception.
            */
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
+          throw PortableServer::POA::ObjectNotActive ();
         }
 
       return servant;
@@ -220,9 +197,7 @@ namespace TAO
       // This operation causes the association of the Object Id specified
       // by the oid parameter and its servant to be removed from the
       // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
+      if (this->poa_->unbind_using_user_id (user_id) != 0)
         {
           throw ::CORBA::OBJ_ADAPTER ();
         }
@@ -238,9 +213,6 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::servant_to_id (
       PortableServer::Servant servant
       )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       PortableServer::Servant default_servant = this->default_servant_.in ();
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index 53b8fea0084..f536a91a970 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -44,25 +44,17 @@ namespace TAO
       virtual void strategy_cleanup(void);
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      get_servant_manager (void);
 
       void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::Servant get_servant (void);
 
       void set_servant (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
@@ -83,10 +75,7 @@ namespace TAO
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
@@ -97,10 +86,7 @@ namespace TAO
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 7f1583967bf..2729e7c0cc6 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -23,40 +23,32 @@ namespace TAO
   namespace Portable_Server
   {
     RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) :
-      etherealize_objects_ (1)
+      etherealize_objects_ (true)
     {
     }
 
     void
-    RequestProcessingStrategyServantActivator::strategy_cleanup (
-      void)
+    RequestProcessingStrategyServantActivator::strategy_cleanup (void)
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
         ACE_UNUSED_ARG (non_servant_upcall);
 
-        this->servant_activator_ =
-          PortableServer::ServantActivator::_nil ();
+        this->servant_activator_ = PortableServer::ServantActivator::_nil ();
       }
 
       RequestProcessingStrategy::strategy_cleanup ();
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantActivator::get_servant_manager (
-      void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+    RequestProcessingStrategyServantActivator::get_servant_manager (void)
     {
       return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
     }
 
     void
     RequestProcessingStrategyServantActivator::set_servant_manager (
-      PortableServer::ServantManager_ptr imgr
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
+      PortableServer::ServantManager_ptr imgr)
     {
       // This operation sets the default servant manager associated with the
       // POA. This operation may only be invoked once after a POA has been
@@ -69,24 +61,19 @@ namespace TAO
         }
 
       this->servant_activator_ =
-        PortableServer::ServantActivator::_narrow (imgr
-                                                  );
+        PortableServer::ServantActivator::_narrow (imgr);
 
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                     );
+      this->validate_servant_manager (this->servant_activator_.in ());
     }
 
     TAO_SERVANT_LOCATION
     RequestProcessingStrategyServantActivator::locate_servant (
       const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      )
+      PortableServer::Servant &servant)
     {
       TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
 
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                             );
+      location = this->poa_->servant_present (system_id, servant);
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -112,8 +99,7 @@ namespace TAO
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
-                                          poa_current_impl
-                                         );
+                                          poa_current_impl);
 
       if (servant != 0)
         {
@@ -139,12 +125,9 @@ namespace TAO
       // reference.
       //
 
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                     );
+      this->validate_servant_manager (this->servant_activator_.in ());
 
-      servant =
-        this->incarnate_servant (poa_current_impl.object_id ()
-                                );
+      servant = this->incarnate_servant (poa_current_impl.object_id ());
 
       // If the incarnate operation returns a servant that is
       // already active for a different Object Id and if the POA
@@ -161,8 +144,7 @@ namespace TAO
           // If we are not allowed to activate the servant, throw an exception
           // etherealize is not called because the servant is never added to
           // the active object map
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // The POA enters the returned Servant value into the Active
@@ -172,7 +154,7 @@ namespace TAO
       // are no errors or if a restart is not required.
       if (!wait_occurred_restart_call)
         {
-          int result =
+          int const result =
             this->poa_->
               rebind_using_user_id_and_system_id (servant,
                                                   poa_current_impl.object_id (),
@@ -182,8 +164,7 @@ namespace TAO
             {
               // Throw an exception, etherealize is not called because servant
               // is not added to the active object map
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
+              throw ::CORBA::OBJ_ADAPTER ();
             }
 
           // Increment the reference count on the servant upcall.
@@ -194,8 +175,7 @@ namespace TAO
           CORBA::Boolean cleanup_in_progress = 0;
           this->etherealize_servant (poa_current_impl.object_id (),
                                      servant,
-                                     cleanup_in_progress
-                                    );
+                                     cleanup_in_progress);
 
           // We ended up waiting on a condition variable, the
           // POA state may have changed while we are waiting.
@@ -228,14 +208,12 @@ namespace TAO
                                              this->poa_,
                                              servant,
                                              cleanup_in_progress,
-                                             remaining_activations
-                                            );
+                                             remaining_activations);
     }
 
     PortableServer::Servant
     RequestProcessingStrategyServantActivator::incarnate_servant (
-      const PortableServer::ObjectId& object_id
-      )
+      const PortableServer::ObjectId& object_id)
     {
       PortableServer::Servant servant = 0;
 
@@ -247,15 +225,11 @@ namespace TAO
       // Invocations of incarnate on the servant manager are serialized.
       // Invocations of etherealize on the servant manager are serialized.
       // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-      servant = this->servant_activator_->incarnate (object_id,
-                                                     this->poa_
-                                                    );
+      servant = this->servant_activator_->incarnate (object_id, this->poa_);
 
       if (servant == 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
-                                                CORBA::COMPLETED_NO),
-                                                0);
+          throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO);
         }
       else
         {
@@ -301,8 +275,7 @@ namespace TAO
             {
               this->etherealize_servant (user_id,
                                          servant,
-                                         this->poa_->cleanup_in_progress ()
-                                        );
+                                         this->poa_->cleanup_in_progress ());
             }
           else
             {
@@ -317,9 +290,7 @@ namespace TAO
       // This operation causes the association of the Object Id specified
       // by the oid parameter and its servant to be removed from the
       // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
+      if (this->poa_->unbind_using_user_id (user_id) != 0)
         throw ::CORBA::OBJ_ADAPTER ();
     }
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 0bff114eb4c..7b4504180bf 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -40,14 +40,10 @@ namespace TAO
 
       virtual void strategy_cleanup(void);
 
-      PortableServer::ServantManager_ptr get_servant_manager (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::ServantManager_ptr get_servant_manager (void);
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+                                );
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index 02693960ad4..f51ac0a48e4 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -26,8 +26,7 @@ namespace TAO
     }
 
     void
-    RequestProcessingStrategyServantLocator::strategy_cleanup(
-      void)
+    RequestProcessingStrategyServantLocator::strategy_cleanup(void)
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -40,20 +39,14 @@ namespace TAO
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantLocator::get_servant_manager (
-      void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+    RequestProcessingStrategyServantLocator::get_servant_manager (void)
     {
       return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
     }
 
     void
     RequestProcessingStrategyServantLocator::set_servant_manager (
-      PortableServer::ServantManager_ptr imgr
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::ServantManager_ptr imgr)
     {
       // This operation sets the default servant manager associated with the
       // POA. This operation may only be invoked once after a POA has been
@@ -63,11 +56,10 @@ namespace TAO
       if (!CORBA::is_nil (this->servant_locator_.in ()))
         {
           throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
-                                           CORBA::COMPLETED_NO);
+                                        CORBA::COMPLETED_NO);
         }
 
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
-                                                                       );
+      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr);
 
       this->validate_servant_manager (this->servant_locator_.in ());
     }
@@ -75,14 +67,10 @@ namespace TAO
     TAO_SERVANT_LOCATION
     RequestProcessingStrategyServantLocator::locate_servant (
       const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      )
+      PortableServer::Servant &servant)
     {
-      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
-
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                             );
+      TAO_SERVANT_LOCATION  location =
+        this->poa_->servant_present (system_id, servant);
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -101,15 +89,11 @@ 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*/
-      )
+      bool &/*wait_occurred_restart_call*/)
     {
-      PortableServer::Servant servant = 0;
-
-      servant = this->poa_->find_servant (system_id,
-                                          servant_upcall,
-                                          poa_current_impl
-                                         );
+      PortableServer::Servant servant = this->poa_->find_servant (system_id,
+                                                                  servant_upcall,
+                                                                  poa_current_impl);
 
       if (servant != 0)
         {
@@ -162,14 +146,11 @@ namespace TAO
         this->servant_locator_->preinvoke (poa_current_impl.object_id (),
                                            this->poa_,
                                            operation,
-                                           cookie
-                                          );
+                                           cookie);
 
       if (servant == 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
-                                                CORBA::COMPLETED_NO),
-                                                0);
+          throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO);
         }
 
       // Remember the cookie
@@ -185,8 +166,7 @@ namespace TAO
     void
     RequestProcessingStrategyServantLocator::cleanup_servant (
       PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      )
+      const PortableServer::ObjectId &user_id)
     {
       if (servant)
         {
@@ -200,9 +180,7 @@ namespace TAO
       // This operation causes the association of the Object Id specified
       // by the oid parameter and its servant to be removed from the
       // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
+      if (this->poa_->unbind_using_user_id (user_id) != 0)
         {
           throw ::CORBA::OBJ_ADAPTER ();
         }
@@ -224,7 +202,8 @@ namespace TAO
       // exception the methods normal return is overrriden, the request completes
       // with the exception
 
-      if (!CORBA::is_nil (this->servant_locator_.in ()))
+      if (!CORBA::is_nil (this->servant_locator_.in ()) &&
+          servant_upcall.servant())
         {
           try
             {
@@ -232,10 +211,9 @@ namespace TAO
                                             this->poa_,
                                             servant_upcall.operation (),
                                             servant_upcall.locator_cookie (),
-                                            servant_upcall.servant ()
-                                           );
+                                            servant_upcall.servant ());
             }
-          catch ( ::CORBA::Exception&)
+          catch (const ::CORBA::Exception&)
             {
               // Ignore errors from servant locator ....
             }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index d8421919159..534f183a3bd 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -40,21 +40,13 @@ namespace TAO
 
       virtual void strategy_cleanup(void);
 
-      PortableServer::ServantManager_ptr get_servant_manager (
-        void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+      PortableServer::ServantManager_ptr get_servant_manager (void);
 
-      void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+      void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-       );
+        PortableServer::Servant &servant);
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
@@ -65,13 +57,11 @@ 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
-       );
+        bool &wait_occurred_restart_call);
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-       );
+        const PortableServer::ObjectId &user_id);
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index 8ba3bc27b77..01b51f34b47 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -58,8 +58,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyServantLocatorFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      )
+      RequestProcessingStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
index eb36b20eba1..de7bcb6d926 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
@@ -40,9 +40,7 @@ namespace TAO
         ::PortableServer::RequestProcessingPolicyValue value,
         ::PortableServer::ServantRetentionPolicyValue srvalue);
 
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-       );
+      virtual void destroy (RequestProcessingStrategy *strategy);
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index d383a2ddd89..2be69725f9b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -24,31 +24,21 @@ namespace TAO
     }
 
     PortableServer::Servant
-    RequestProcessingStrategyServantManager::get_servant (
-      void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+    RequestProcessingStrategyServantManager::get_servant (void)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyServantManager::set_servant (
-      PortableServer::Servant servant
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::Servant)
     {
-      ACE_UNUSED_ARG (servant);
-
       throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyServantManager::validate_servant_manager (
-      PortableServer::ServantManager_ptr servant_manager
-      )
+      PortableServer::ServantManager_ptr servant_manager)
     {
       // When no servant manager is set, give an exception with minor code 4,
       // see 11.3.8.6 of the corba spec
@@ -60,31 +50,21 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      )
+      const PortableServer::ObjectId &system_id)
     {
-      return this->poa_->find_servant (system_id
-                                      );
+      return this->poa_->find_servant (system_id);
     }
 
     PortableServer::ObjectId *
     RequestProcessingStrategyServantManager::servant_to_id (
-      PortableServer::Servant servant
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
+      PortableServer::Servant servant)
     {
       return this->poa_->servant_to_user_id (servant);
     }
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::id_to_servant (
-      const PortableServer::ObjectId &id
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
+      const PortableServer::ObjectId &id)
     {
       return this->poa_->user_id_to_servant_i (id);
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index be63e7652ae..8a6c09546a1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -37,35 +37,22 @@ namespace TAO
     public:
       RequestProcessingStrategyServantManager (void);
 
-      PortableServer::Servant get_servant (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      PortableServer::Servant get_servant (void);
 
-      void set_servant (PortableServer::Servant servant )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      void set_servant (PortableServer::Servant servant);
 
       void validate_servant_manager (
         PortableServer::ServantManager_ptr servant_manager
        );
 
       virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id
-       );
+        const PortableServer::ObjectId &system_id);
 
       virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
+        const PortableServer::ObjectId &id);
 
       virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual ::PortableServer::RequestProcessingPolicyValue type() const;
     };
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index b5f37deb69b..2ee286db779 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -32,6 +32,7 @@
 #include "tao/PortableServer/ImplicitActivationStrategy.h"
 #include "tao/PortableServer/ThreadStrategy.h"
 #include "tao/PortableServer/Acceptor_Filter_Factory.h"
+#include "tao/PortableServer/Network_Priority_Hook.h"
 
 #include "tao/StringSeqC.h"
 #include "tao/PortableInterceptorC.h"
@@ -41,7 +42,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "tao/Environment.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -81,7 +81,6 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
 
 PortableServer::ThreadPolicy_ptr
 TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ThreadPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -97,7 +96,6 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
 
 PortableServer::LifespanPolicy_ptr
 TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::LifespanPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -112,7 +110,6 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
 TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -126,7 +123,6 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
 TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -141,7 +137,6 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -153,7 +148,6 @@ TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivat
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -165,7 +159,6 @@ TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionP
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -211,6 +204,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     policies_ (policies),
     ort_adapter_ (0),
     adapter_state_ (PortableInterceptor::HOLDING),
+    network_priority_hook_ (0),
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
@@ -244,6 +238,16 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
   // a cache.
   this->cached_policies_.update (this->policies_);
 
+  this->network_priority_hook_
+    = ACE_Dynamic_Service<TAO_Network_Priority_Hook>::instance (
+        "TAO_Network_Priority_Hook");
+
+  if (this->network_priority_hook_ != 0)
+    {
+      this->network_priority_hook_->update_network_priority (
+        *this, this->policies_);
+    }
+
 #if (TAO_HAS_MINIMUM_POA == 1)
   // If this is the RootPOA, set the value of the ImplicitActivationPolicy
   // to IMPLICIT_ACTIVATION since it is impossible to pass the policy
@@ -297,7 +301,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     {
       this->active_policy_strategies_.lifespan_strategy()->notify_startup ();
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       this->poa_manager_.remove_poa (this);
       this->object_adapter ().unbind_poa (this,
@@ -364,9 +368,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const char *adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Initialize a TAO_POA_Policy_Set instance so that it contains the
   // default POA policies.
@@ -474,9 +475,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const TAO_POA_Policy_Set &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // This operaton creates a new POA as a child of the target POA. The
   // specified name identifies the new POA with respect to other POAs
@@ -488,8 +486,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
   // Child was found
   if (result != -1)
     {
-      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
-                        PortableServer::POA::_nil ());
+      throw PortableServer::POA::AdapterAlreadyExists ();
     }
 
   //
@@ -522,8 +519,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                                  poa);
   if (result != 0)
     {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        PortableServer::POA::_nil ());
+      throw ::CORBA::OBJ_ADAPTER ();
     }
 
   // Increment the reference count on the child POA since the children
@@ -558,8 +554,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
 PortableServer::POA_ptr
 TAO_Root_POA::find_POA (const char *adapter_name,
                         CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -574,8 +568,6 @@ TAO_Root_POA::find_POA (const char *adapter_name,
 TAO_Root_POA *
 TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
                           CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   TAO_Root_POA *child = 0;
   int result = this->children_.find (child_name,
@@ -608,7 +600,7 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
                       this,
                       child_name.c_str ());
                 }
-              catch ( ::CORBA::SystemException&)
+              catch (const ::CORBA::SystemException&)
                 {
                   throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
                                               CORBA::COMPLETED_NO);
@@ -645,8 +637,7 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
   else
     {
       // Otherwise, the AdapterNonExistent exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
-                        0);
+      throw PortableServer::POA::AdapterNonExistent ();
     }
 }
 #endif
@@ -662,9 +653,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA (const char *adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
                           const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -677,9 +665,6 @@ TAO_Root_POA::create_POA (const char *adapter_name,
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // If we had upgradeable locks, this would initially be a read lock
   //
@@ -691,9 +676,6 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_user_id (servant);
@@ -701,10 +683,6 @@ TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -714,9 +692,6 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
@@ -725,7 +700,6 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -736,9 +710,6 @@ TAO_Root_POA::the_children (void)
 
 PortableServer::Servant
 TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -748,9 +719,6 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
 
 CORBA::Object_ptr
 TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -762,7 +730,6 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                         const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -776,7 +743,6 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
                        CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO::Portable_Server::POA_Guard poa_guard (*this , 0);
@@ -795,7 +761,6 @@ TAO_Root_POA::remove_from_parent_i (void)
 void
 TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
                          CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
     return;
@@ -972,7 +937,6 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
   CORBA::ULong child_current = static_cast <CORBA::ULong>
@@ -997,7 +961,6 @@ TAO_Root_POA::the_children_i (void)
 
 PortableInterceptor::AdapterName *
 TAO_Root_POA::adapter_name_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter name is the sequence of names starting from the
   // RootPOA to the one whose name is requested.  The name of the
@@ -1055,7 +1018,6 @@ TAO_Root_POA::adapter_name_i (void)
 void
 TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
                                  const IOP::TaggedComponent &component)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
   const CORBA::ULong profile_count = mprofile.profile_count ();
@@ -1073,7 +1035,6 @@ TAO_Root_POA::add_ior_component_to_profile (
     TAO_MProfile & mprofile,
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
   // ProfileId.
@@ -1104,7 +1065,6 @@ void
 TAO_Root_POA::adapter_state_changed (
    const TAO::ORT_Array &array_obj_ref_template,
    PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
@@ -1119,9 +1079,6 @@ PortableServer::ObjectId *
 TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
                                  CORBA::Short priority,
                                  bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     activate_object (servant,
@@ -1131,9 +1088,6 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
 
 PortableServer::ObjectId *
 TAO_Root_POA::activate_object (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1161,10 +1115,6 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant)
 void
 TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                        PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1195,10 +1145,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant servant,
                                          CORBA::Short priority,
                                          bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     activate_object_with_id (id,
@@ -1211,8 +1157,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                         CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->deactivate_all_objects_i (etherealize_objects);
 
@@ -1275,8 +1219,6 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
 
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.request_processing_strategy ()->
     etherealize_objects (etherealize_objects);
@@ -1287,9 +1229,6 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
 
 void
 TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -1300,9 +1239,6 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
 
 void
 TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     deactivate_object (id);
@@ -1316,8 +1252,6 @@ TAO_Root_POA::is_persistent (void) const
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference (const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -1329,13 +1263,10 @@ TAO_Root_POA::create_reference (const char *intf)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_i (const char *intf,
                                   CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   if (!this->has_system_id ())
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
   return this->active_policy_strategies_.servant_retention_strategy()->
@@ -1345,7 +1276,6 @@ TAO_Root_POA::create_reference_i (const char *intf,
 CORBA::Object_ptr
 TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
                                              const PortableServer::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const PortableInterceptor::ObjectId &user_oid =
     reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
@@ -1367,7 +1297,6 @@ CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                           const char *intf,
                                           CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
   // Object Id value was not generated by the system or for this POA,
@@ -1381,9 +1310,7 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
   if (this->has_system_id () &&
       !this->is_poa_generated_id (user_id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
 
   return this->active_policy_strategies_.servant_retention_strategy()->
@@ -1392,9 +1319,6 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     servant_to_id (servant);
@@ -1402,9 +1326,6 @@ TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_reference (servant);
@@ -1412,16 +1333,11 @@ TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
+      throw ::CORBA::BAD_PARAM ();
     }
 
   PortableServer::ObjectId system_id;
@@ -1432,8 +1348,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference)
     {
       // In case this object reference is not generated by this POA throw
       // an exception
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
+      throw PortableServer::POA::WrongAdapter ();
     }
 
   PortableServer::Servant servant =
@@ -1498,15 +1413,11 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
 PortableServer::ObjectId *
 TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
+      throw ::CORBA::BAD_PARAM ();
     }
 
   // The WrongPolicy exception is declared to allow future extensions.
@@ -1522,8 +1433,7 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
 
   if (!is_generated)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
+      throw PortableServer::POA::WrongAdapter ();
     }
 
   // Lock access for the duration of this transaction.
@@ -1561,9 +1471,6 @@ TAO_Root_POA::cleanup_servant (
 PortableServer::Servant
 TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
 
   PortableServer::Servant servant =
@@ -1592,9 +1499,6 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
 PortableServer::Servant
 TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     user_id_to_servant (id);
@@ -1604,9 +1508,6 @@ CORBA::Object_ptr
 TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
                                  bool indirect
                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     id_to_reference (id, indirect);
@@ -1614,7 +1515,6 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
 
 CORBA::OctetSeq *
 TAO_Root_POA::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::OctetSeq *id = 0;
   ACE_NEW_THROW_EX (id,
@@ -2002,8 +1902,7 @@ TAO_Root_POA::invoke_key_to_object (void)
                               this->key_to_object_params_.servant_,
                               this->key_to_object_params_.collocated_,
                               this->key_to_object_params_.priority_,
-                              this->key_to_object_params_.indirect_
-                             );
+                              this->key_to_object_params_.indirect_);
 }
 
 CORBA::Object_ptr
@@ -2012,8 +1911,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
                              TAO_ServantBase *servant,
                              CORBA::Boolean collocated,
                              CORBA::Short priority,
-                             bool indirect
-                             )
+                             bool indirect)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
@@ -2031,8 +1929,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
          && this->orb_core ().imr_endpoints_in_ior ())
     {
       // Check to see if we alter the IOR.
-      CORBA::Object_var imr =
-        this->orb_core ().implrepo_service ();
+      CORBA::Object_var imr = this->orb_core ().implrepo_service ();
 
       if (CORBA::is_nil (imr.in ())
           || !imr->_stubobj ()
@@ -2087,9 +1984,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
                     "ImR-ified IOR = \n%s\n",
                     ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
 
-      obj =
-        this->orb_core_.orb ()->string_to_object (ior.c_str ()
-                                                 );
+      obj = this->orb_core_.orb ()->string_to_object (ior.c_str ());
 
       return obj;
     }
@@ -2100,8 +1995,7 @@ orbkey:
   ACE_UNUSED_ARG (indirect);
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority);
+  TAO_Stub *data = this->key_to_stub_i (key, type_id, priority);
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
@@ -2134,8 +2028,7 @@ orbkey:
 TAO_Stub *
 TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key,
                            const char *type_id,
-                           CORBA::Short priority
-                           )
+                           CORBA::Short priority)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
@@ -2148,12 +2041,10 @@ TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key,
 TAO_Stub *
 TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
                              const char *type_id,
-                             CORBA::Short priority
-                             )
+                             CORBA::Short priority)
 {
   CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority
-                                  );
+    this->client_exposed_policies (priority);
 
   TAO_Acceptor_Filter* filter = 0;
 
@@ -2179,8 +2070,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
       type_id,
       client_exposed_policies._retn (),
       filter,
-      this->orb_core_.lane_resources ().acceptor_registry ()
-     );
+      this->orb_core_.lane_resources ().acceptor_registry ());
 
   return data;
 }
@@ -2198,8 +2088,7 @@ TAO_Root_POA::establish_components (void)
 }
 
 void
-TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info
-                                      )
+TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info)
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
@@ -2211,10 +2100,9 @@ TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info
 }
 
 void
-TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component
-                                  )
+TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component)
 {
-  const CORBA::ULong old_len = this->tagged_component_.length ();
+  CORBA::ULong const old_len = this->tagged_component_.length ();
 
   this->tagged_component_.length (old_len + 1);
   this->tagged_component_[old_len] = component;
@@ -2249,11 +2137,10 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                   TAO_Acceptor_Filter *filter,
                                   TAO_Acceptor_Registry &acceptor_registry)
 {
-  int error = 0;
+  bool error = false;
 
   // Count the number of endpoints.
-  size_t const profile_count =
-    acceptor_registry.endpoint_count ();
+  size_t const profile_count = acceptor_registry.endpoint_count ();
 
   // Create a profile container and have acceptor registries populate
   // it with profiles as appropriate.
@@ -2262,10 +2149,9 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
   // Allocate space for storing the profiles.  There can never be more
   // profiles than there are endpoints.  In some cases, there can be
   // less profiles than endpoints.
-  int result =
-    mprofile.set (static_cast <CORBA::ULong> (profile_count));
+  int result = mprofile.set (static_cast <CORBA::ULong> (profile_count));
   if (result == -1)
-    error = 1;
+    error = true;
 
   if (!error)
     {
@@ -2275,46 +2161,40 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
                               acceptor_registry.begin (),
                               acceptor_registry.end ());
       if (result == -1)
-        error = 1;
+        error = true;
     }
 
   if (!error)
     result = filter->encode_endpoints (mprofile);
+
   if (result == -1)
-    error = 1;
+    error = true;
 
   if (error)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw ::CORBA::INTERNAL (
+      CORBA::SystemException::_tao_minor_code (
+        TAO_MPROFILE_CREATION_ERROR,
+        0),
+      CORBA::COMPLETED_NO);
 
   // Make sure we have at least one profile.  <mp> may end up being
   // empty if none of the acceptor endpoints have the right priority
   // for this object, for example.
   if (mprofile.profile_count () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw ::CORBA::BAD_PARAM (
+      CORBA::SystemException::_tao_minor_code (
+        TAO_MPROFILE_CREATION_ERROR,
+        0),
+      CORBA::COMPLETED_NO);
 
   TAO_Stub *stub =
-    this->orb_core_.create_stub_object (mprofile,
-                                        type_id,
-                                        policy_list
-                                       );
+    this->orb_core_.create_stub_object (mprofile, type_id, policy_list);
 
   // Add the saved tagged components methods to the profiles.
   CORBA::ULong len = this->tagged_component_.length ();
   for (CORBA::ULong i = 0; i != len; ++i)
     {
-      this->add_ior_component (mprofile,
-                               this->tagged_component_[i]
-                              );
+      this->add_ior_component (mprofile, this->tagged_component_[i]);
       }
 
   len = this->tagged_component_id_.length ();
@@ -2323,16 +2203,14 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
     {
       this->add_ior_component_to_profile (mprofile,
                                           this->tagged_component_id_[k],
-                                          this->profile_id_array_[k]
-                                         );
+                                          this->profile_id_array_[k]);
     }
 
   return stub;
 }
 
 CORBA::PolicyList *
-TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
-                                       )
+TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -2343,16 +2221,14 @@ TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
   CORBA::PolicyList_var policies = client_exposed_policies;
 
   // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                    );
+  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies);
 
   return policies._retn ();
 }
 
 TAO_SERVANT_LOCATION
 TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
-                                PortableServer::Servant &servant
-                                )
+                                PortableServer::Servant &servant)
 {
   return this->active_policy_strategies_.request_processing_strategy()->
           locate_servant (system_id, servant);
@@ -2360,8 +2236,7 @@ TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
 
 TAO_SERVANT_LOCATION
 TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id,
-                               PortableServer::Servant &servant
-                               )
+                               PortableServer::Servant &servant)
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
           servant_present (system_id, servant);
@@ -2371,26 +2246,21 @@ PortableServer::Servant
 TAO_Root_POA::find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        )
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl)
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
           find_servant (system_id,
                         servant_upcall,
-                        poa_current_impl
-                       );
+                        poa_current_impl);
 }
 
 int
 TAO_Root_POA::find_servant_priority (
          const PortableServer::ObjectId &system_id,
-         CORBA::Short &priority
-        )
+         CORBA::Short &priority)
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-          find_servant_priority (system_id,
-                                 priority
-                                );
+          find_servant_priority (system_id, priority);
 }
 
 TAO::ORT_Adapter_Factory *
@@ -2409,8 +2279,7 @@ TAO_Root_POA::ORT_adapter_i (void)
 
   try
     {
-      TAO::ORT_Adapter_Factory * ort_ap_factory =
-        this->ORT_adapter_factory ();
+      TAO::ORT_Adapter_Factory * ort_ap_factory = this->ORT_adapter_factory ();
 
       if (!ort_ap_factory)
         return 0;
@@ -2418,11 +2287,9 @@ TAO_Root_POA::ORT_adapter_i (void)
       // Get the full adapter name of this POA, do this before we
       // create the adapter so that in case this fails, we just
       // return 0 and not a not activated adapter
-      PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i ();
+      PortableInterceptor::AdapterName *adapter_name = this->adapter_name_i ();
 
-      this->ort_adapter_ =
-          ort_ap_factory->create ();
+      this->ort_adapter_ = ort_ap_factory->create ();
 
       if (!this->ort_adapter_)
         return 0;
@@ -2434,10 +2301,9 @@ TAO_Root_POA::ORT_adapter_i (void)
       this->ort_adapter_->activate (this->orb_core_.server_id (),
                                     this->orb_core_.orbid (),
                                     adapter_name,
-                                    this
-                                   );
+                                    this);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception (
         "(%P|%t) Cannot initialize the "
@@ -2451,7 +2317,6 @@ TAO_Root_POA::ORT_adapter_i (void)
 
 PortableServer::AdapterActivator_ptr
 TAO_Root_POA::the_activator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
@@ -2462,7 +2327,6 @@ TAO_Root_POA::the_activator (void)
 void
 TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2476,8 +2340,6 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa
 
 PortableServer::ServantManager_ptr
 TAO_Root_POA::get_servant_manager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
@@ -2487,10 +2349,7 @@ TAO_Root_POA::get_servant_manager (void)
 }
 
 void
-TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2501,8 +2360,6 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
 
 PortableServer::Servant
 TAO_Root_POA::get_servant_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     get_servant ();
@@ -2510,15 +2367,11 @@ TAO_Root_POA::get_servant_i (void)
 
 PortableServer::Servant
 TAO_Root_POA::get_servant (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  PortableServer::Servant servant =
-    this->get_servant_i ();
+  PortableServer::Servant servant = this->get_servant_i ();
 
   if (servant != 0)
     {
@@ -2541,16 +2394,12 @@ TAO_Root_POA::get_servant (void)
     {
       // If no servant has been associated with the POA, the NoServant
       // exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
-                        0);
+      throw PortableServer::POA::NoServant ();
     }
 }
 
 void
-TAO_Root_POA::set_servant (PortableServer::Servant servant
-                           )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+TAO_Root_POA::set_servant (PortableServer::Servant servant)
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2635,6 +2484,18 @@ TAO_Root_POA::is_servant_active (
     is_servant_in_map (servant, wait_occurred_restart_call);
 }
 
+TAO::Portable_Server::Cached_Policies&
+TAO_Root_POA::cached_policies (void)
+{
+  return this->cached_policies_;
+}
+
+TAO_Network_Priority_Hook*
+TAO_Root_POA::network_priority_hook (void)
+{
+  return this->network_priority_hook_;
+}
+
 TAO::Portable_Server::Cached_Policies::PriorityModel
 TAO_Root_POA::priority_model (void) const
 {
@@ -2674,7 +2535,6 @@ TAO_Root_POA::root (void) const
 
 TAO::ORT_Adapter *
 TAO_Root_POA::ORT_adapter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ort_adapter_ != 0)
     return this->ort_adapter_;
@@ -2684,7 +2544,9 @@ TAO_Root_POA::ORT_adapter (void)
 
   // DCL ..
   if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
+    {
+      return this->ort_adapter_;
+    }
 
   return this->ORT_adapter_i ();
 }
@@ -2734,8 +2596,7 @@ TAO_Root_POA::get_policy (CORBA::PolicyType policy)
 void
 TAO_Root_POA::check_state (void)
 {
-  this->active_policy_strategies_.lifespan_strategy ()->
-    check_state ();
+  this->active_policy_strategies_.lifespan_strategy ()->check_state ();
 }
 
 const char *
@@ -2758,7 +2619,6 @@ TAO_Root_POA::imr_client_adapter_name (void)
 
 PortableServer::POAManager_ptr
 TAO_Root_POA::the_POAManager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
@@ -2766,7 +2626,6 @@ TAO_Root_POA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
 TAO_Root_POA::the_POAManagerFactory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
 }
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index d7d69bfb6e3..eab87c81a9c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -74,6 +74,7 @@ class TAO_Acceptor_Filter_Factory;
 class TAO_POAManager_Factory;
 #endif
 
+class TAO_Network_Priority_Hook;
 class TAO_Acceptor_Registry;
 class TAO_IORInfo;
 class TAO_Regular_POA;
@@ -131,53 +132,43 @@ public:
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+    );
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
                                     CORBA::Boolean activate_it
-                                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                                    );
 #endif
 
   void destroy (CORBA::Boolean etherealize_objects,
                 CORBA::Boolean wait_for_completion
-                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                );
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::ThreadPolicy_ptr create_thread_policy (
       PortableServer::ThreadPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (
       PortableServer::LifespanPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
       PortableServer::IdUniquenessPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
       PortableServer::IdAssignmentPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 #endif
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -185,51 +176,42 @@ public:
   create_implicit_activation_policy (
       PortableServer::ImplicitActivationPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::ServantRetentionPolicy_ptr
   create_servant_retention_policy (
       PortableServer::ServantRetentionPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::RequestProcessingPolicy_ptr
   create_request_processing_policy (
       PortableServer::RequestProcessingPolicyValue value
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * the_name (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
   PortableServer::POAList *the_children (
       void
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::POAManager_ptr the_POAManager (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 #endif
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableInterceptor::AdapterName *adapter_name (void);
 
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
@@ -245,115 +227,68 @@ public:
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::AdapterActivator_ptr the_activator (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      );
 
   PortableServer::ServantManager_ptr get_servant_manager (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+      void);
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                            );
 
-  PortableServer::Servant get_servant (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant (void);
 
   void set_servant (PortableServer::Servant servant
-                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                    );
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
   PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
 #if !defined (CORBA_E_MICRO)
   void activate_object_with_id (const PortableServer::ObjectId &id,
                                 PortableServer::Servant p_servant
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                );
 #endif
 
   void deactivate_object (const PortableServer::ObjectId &oid
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                          );
 
   CORBA::Object_ptr create_reference (const char *intf
-                                      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                      );
 
   CORBA::Object_ptr create_reference_with_id (
       const PortableServer::ObjectId &oid,
       const char *intf
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                           );
 
   PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant
-                                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                                );
 
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                          );
 
   PortableServer::Servant reference_to_servant (
       CORBA::Object_ptr reference
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
   PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                         );
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                     );
 
-  CORBA::OctetSeq *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::OctetSeq *id (void);
 
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
@@ -404,6 +339,12 @@ public:
   /// ORB Core for POA.
   TAO_ORB_Core &orb_core (void) const;
 
+  /// obtain a reference to the cached_profiles
+  TAO::Portable_Server::Cached_Policies& cached_policies (void);
+
+  /// obtain a handle to the network priority hooks
+  TAO_Network_Priority_Hook* network_priority_hook (void);
+
   TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const;
 
   CORBA::Boolean cleanup_in_progress (void);
@@ -491,10 +432,7 @@ public:
     bool &wait_occurred_restart_call);
 
   void deactivate_object_i (const PortableServer::ObjectId &oid
-                            )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy));
+                            );
 
   CORBA::Boolean is_persistent (void) const;
 
@@ -549,23 +487,14 @@ public:
       CORBA::Short priority,
       bool &wait_occurred_restart_call
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
                                        bool indirect
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                       );
 
   PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                             );
 
   TAO_SYNCH_CONDITION &servant_deactivation_condition (void);
 
@@ -577,10 +506,7 @@ public:
   int delete_child (const String &child);
 
   PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid
-                                                )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                                );
 
   virtual CORBA::ORB_ptr _get_orb (
 
@@ -630,63 +556,49 @@ protected:
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+    );
 
   PortableServer::POA_ptr create_POA_i (const String &adapter_name,
                                         PortableServer::POAManager_ptr poa_manager,
                                         const TAO_POA_Policy_Set &policies
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+                                        );
 
   TAO_Root_POA *find_POA_i (const ACE_CString &child_name,
                        CORBA::Boolean activate_it
-                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                       );
 #endif
 
   void destroy_i (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion
-                  )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                  );
 
   void complete_destruction_i (void);
 
-  PortableServer::POAList *the_children_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAList *the_children_i (void);
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableInterceptor::AdapterName *adapter_name_i (void);
 
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
   void adapter_state_changed (
       const TAO::ORT_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Add the given tagged component to all profiles.
   void add_ior_component (TAO_MProfile & mprofile,
                           const IOP::TaggedComponent & component
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          );
 
   /// Add the given tagged component to all profiles matching the given
   /// ProfileId.
   void add_ior_component_to_profile (TAO_MProfile & mprofile,
                                      const IOP::TaggedComponent & component,
                                      IOP::ProfileId profile_id
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     );
 
   /// Wrapper for the ORB's key_to_object that will alter the object pointer
   /// if the ImplRepo is used.
@@ -711,9 +623,7 @@ protected:
                                 TAO_Acceptor_Registry &acceptor_registry
                                );
 
-  PortableServer::Servant get_servant_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant_i (void);
 
 protected:
 #if !defined (CORBA_E_MICRO)
@@ -721,63 +631,42 @@ protected:
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority,
                                   bool &wait_occurred_restart_call
-                                  )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                  );
 #endif
 
   virtual void remove_from_parent_i (void);
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                 );
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                  CORBA::Boolean wait_for_completion
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                 );
 
   void wait_for_completions (CORBA::Boolean wait_for_completion
                             );
 
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA::Short priority
-                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                        );
 
   CORBA::Object_ptr create_reference_with_id_i (
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   PortableServer::Servant reference_to_servant_i (
       CORBA::Object_ptr reference
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
+    );
 
   CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant
-                                            )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                            );
 
   PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+                                           );
 
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
@@ -811,16 +700,14 @@ protected:
 protected:
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_adapter_template (void);
 
   /// Accessor methods to ObjectReferenceTemplate, non locked version
   PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
   PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_obj_ref_factory (void);
 
   /// Set the object reference factory
   void set_obj_ref_factory (
@@ -846,14 +733,12 @@ public:
   CORBA::Object_ptr
   invoke_key_to_object_helper_i (const char * repository_id,
                                  const PortableServer::ObjectId & id
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 );
 protected:
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  TAO::ORT_Adapter *ORT_adapter (void);
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one but assumes the POA lock is already hold
@@ -923,6 +808,8 @@ protected:
 
   TAO::Portable_Server::Cached_Policies cached_policies_;
 
+  TAO_Network_Priority_Hook *network_priority_hook_;
+
   TAO::Portable_Server::Active_Policy_Strategies active_policy_strategies_;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index 57851ab838f..d9da3792237 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-// Exception macros
-#include "tao/Environment.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
@@ -27,21 +24,18 @@ TAO_Root_POA::policies (void)
 
 ACE_INLINE PortableServer::POA_ptr
 TAO_Root_POA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_INLINE PortableInterceptor::AdapterName *
 TAO_Root_POA::adapter_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->adapter_name_i ();
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
 TAO_Root_POA::get_adapter_template (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -66,7 +60,6 @@ TAO_Root_POA::get_adapter_template_i ()
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
 TAO_Root_POA::get_obj_ref_factory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -98,7 +91,6 @@ TAO_Root_POA::name (void) const
 
 ACE_INLINE char *
 TAO_Root_POA::the_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.c_str ());
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index b2598398103..5daea4a5819 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -24,7 +24,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ServantRetentionPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ServantRetentionPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -36,20 +35,17 @@ namespace TAO
 
     void
     ServantRetentionPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ServantRetentionPolicyValue
     ServantRetentionPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return this->value_;
     }
 
     CORBA::PolicyType
     ServantRetentionPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index 354ade7d9fc..ac39b59738b 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ServantRetentionPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ServantRetentionPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 41ffc3ef013..f1b1de2de9b 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -65,9 +65,7 @@ namespace TAO
         CORBA::Short priority,
         bool &wait_occurred_restart_call
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
 #if !defined (CORBA_E_MICRO)
       virtual void activate_object_with_id (
@@ -76,10 +74,7 @@ namespace TAO
         CORBA::Short priority,
         bool &wait_occurred_restart_call
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::ObjectAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 #endif
 
       virtual void deactivate_object (const PortableServer::ObjectId &id
@@ -92,56 +87,44 @@ namespace TAO
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual PortableServer::Servant user_id_to_servant (
         const PortableServer::ObjectId &id
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId &id,
         bool indirect
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual void deactivate_all_objects (void)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant servant
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
         )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
+          = 0;
 
       virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
         )
-          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+          = 0;
 
       virtual int rebind_using_user_id_and_system_id (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index f6d22016419..72da99cd4aa 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -2,6 +2,7 @@
 
 #include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
 #include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -40,17 +41,21 @@ namespace TAO
         ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance (strategy_factory_name);
 
       if (strategy_factory == 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_factory_name));
+        {
+          if (TAO_debug_level > 1)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
+                        strategy_factory_name));
+
+          return 0;
+        }
 
       return strategy_factory->create (value);
     }
 
     void
     ServantRetentionStrategyFactoryImpl::destroy (
-      ServantRetentionStrategy *strategy
-      )
+      ServantRetentionStrategy *strategy)
     {
       const char *strategy_factory_name = 0;
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 94803862d60..da629fa29e0 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -33,16 +33,13 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyNonRetain::strategy_init (
-      TAO_Root_POA *poa
-      )
+    ServantRetentionStrategyNonRetain::strategy_init (TAO_Root_POA *poa)
     {
       poa_ = poa;
     }
 
     void
-    ServantRetentionStrategyNonRetain::strategy_cleanup (
-      void)
+    ServantRetentionStrategyNonRetain::strategy_cleanup (void)
     {
       poa_ = 0;
     }
@@ -60,17 +57,12 @@ namespace TAO
     ServantRetentionStrategyNonRetain::find_servant (
       const PortableServer::ObjectId &/*system_id*/)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::system_id_to_object_id (
-      const PortableServer::ObjectId &system_id
-      )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
+      const PortableServer::ObjectId &system_id)
     {
       // The system id is the id (and no conversion/transformation is
       // needed).
@@ -85,24 +77,16 @@ namespace TAO
     PortableServer::Servant
     ServantRetentionStrategyNonRetain::user_id_to_servant (
       const PortableServer::ObjectId &/*id*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::id_to_reference (
       const PortableServer::ObjectId &/*id*/,
       bool /*indirect*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     TAO_SERVANT_LOCATION
@@ -154,31 +138,21 @@ namespace TAO
 
     void
     ServantRetentionStrategyNonRetain::deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::servant_to_user_id (
       PortableServer::Servant /*servant*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::servant_to_reference (
       PortableServer::Servant /*servant*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::ObjectId *
@@ -186,12 +160,8 @@ namespace TAO
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
       bool &/*wait_occurred_restart_call*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      throw PortableServer::POA::WrongPolicy ();
     }
 
 #if !defined (CORBA_E_MICRO)
@@ -201,10 +171,6 @@ namespace TAO
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
       bool &/*wait_occurred_restart_call*/)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::ObjectAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -214,8 +180,6 @@ namespace TAO
     ServantRetentionStrategyNonRetain::create_reference (
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation creates an object reference that encapsulates a
       // POA-generated Object Id value and the specified interface
@@ -249,9 +213,7 @@ namespace TAO
                                              priority,
                                              true);
 
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        user_id
-                                                       );
+      return this->poa_->invoke_key_to_object_helper_i (intf, user_id);
     }
 
     CORBA::Object_ptr
@@ -259,7 +221,6 @@ namespace TAO
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
       // specified Object Id and interface repository Id values. This
@@ -274,7 +235,7 @@ namespace TAO
 
       // Otherwise, it is the NON_RETAIN policy.  Therefore, user id
       // is the same as system id.
-      PortableServer::ObjectId *sys_id;
+      PortableServer::ObjectId *sys_id = 0;
       ACE_NEW_THROW_EX (sys_id,
                         PortableServer::ObjectId (oid),
                         CORBA::NO_MEMORY ());
@@ -289,9 +250,7 @@ namespace TAO
                                              priority,
                                              true);
 
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        oid
-                                                       );
+      return this->poa_->invoke_key_to_object_helper_i (intf, oid);
     }
 
     int
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 6950af6e4c0..8bac1e0af4d 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -46,10 +46,7 @@ namespace TAO
       PortableServer::ObjectId *
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
-                       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
+                       bool &wait_occurred_restart_call);
 
 #if !defined (CORBA_E_MICRO)
       virtual
@@ -57,11 +54,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
+                               bool &wait_occurred_restart_call);
 #endif
 
       virtual void deactivate_object (const PortableServer::ObjectId &id);
@@ -74,24 +67,15 @@ namespace TAO
 
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+      user_id_to_servant (const PortableServer::ObjectId &id);
 
       CORBA::Object_ptr
       id_to_reference (const PortableServer::ObjectId &id,
-                       bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+                       bool indirect);
 
       virtual TAO_SERVANT_LOCATION servant_present (
         const PortableServer::ObjectId &system_id,
@@ -106,33 +90,22 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      virtual void deactivate_all_objects (void);
 
       virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant servant)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        PortableServer::Servant servant);
 
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
-        CORBA::Short priority)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        CORBA::Short priority);
 
       virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
-        CORBA::Short priority)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+        CORBA::Short priority);
 
       virtual int rebind_using_user_id_and_system_id (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index fce866f9a08..3177736104e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -77,9 +77,8 @@ namespace TAO
     {
 
       TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
-      int result = this->active_object_map_->
-        find_entry_using_user_id (id,
-                                  active_object_map_entry);
+      int const result = this->active_object_map_->
+        find_entry_using_user_id (id, active_object_map_entry);
 
       // If there is no active object associated with the specified Object
       // Id, the operation raises an ObjectNotActive exception.
@@ -112,8 +111,7 @@ namespace TAO
       if (new_count == 0)
         {
           this->poa_->cleanup_servant (active_object_map_entry->servant_,
-                                       active_object_map_entry->user_id_
-                                      );
+                                       active_object_map_entry->user_id_);
         }
       else
         {
@@ -136,8 +134,7 @@ namespace TAO
     ServantRetentionStrategyRetain::unbind_using_user_id (
       const PortableServer::ObjectId &user_id)
     {
-      return this->active_object_map_->
-        unbind_using_user_id (user_id);
+      return this->active_object_map_->unbind_using_user_id (user_id);
     }
 
     PortableServer::Servant
@@ -147,11 +144,9 @@ namespace TAO
       // Find user id from system id.
       PortableServer::ObjectId_var user_id;
       if (active_object_map_->
-          find_user_id_using_system_id (system_id,
-                                        user_id.out()) != 0)
+          find_user_id_using_system_id (system_id, user_id.out()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // This operation returns the active servant associated with the
@@ -170,8 +165,7 @@ namespace TAO
 
       if (result == -1)
         {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
+          throw PortableServer::POA::ObjectNotActive ();
         }
 
       return servant;
@@ -180,9 +174,6 @@ namespace TAO
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::system_id_to_object_id (
       const PortableServer::ObjectId &system_id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
     {
       // The object denoted by the reference does not have to be
       // active for this operation to succeed.
@@ -191,8 +182,7 @@ namespace TAO
           find_user_id_using_system_id (system_id,
                                         user_id.out ()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       return user_id._retn ();
@@ -201,9 +191,6 @@ namespace TAO
     PortableServer::Servant
     ServantRetentionStrategyRetain::user_id_to_servant (
       const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the POA has the RETAIN policy and the specified ObjectId is in
       // the Active Object Map, this operation returns the servant
@@ -211,13 +198,11 @@ namespace TAO
       PortableServer::Servant servant = 0;
 
       int const result =
-        this->active_object_map_->find_servant_using_user_id (id,
-                                                              servant);
+        this->active_object_map_->find_servant_using_user_id (id, servant);
 
       if (result == -1)
         {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
+          throw PortableServer::POA::ObjectNotActive ();
         }
 
       return servant;
@@ -227,9 +212,6 @@ namespace TAO
     ServantRetentionStrategyRetain::id_to_reference (
       const PortableServer::ObjectId &id,
       bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If an object with the specified Object Id value is currently
       // active, a reference encapsulating the information used to
@@ -253,15 +235,13 @@ namespace TAO
                                                  indirect);
 
           return this->poa_->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                                            id
-                                                           );
+                                                            id);
         }
       else
         {
           // If the Object Id value is not active in the POA, an
           // ObjectNotActive exception is raised.
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            CORBA::Object::_nil ());
+          throw PortableServer::POA::ObjectNotActive ();
         }
     }
 
@@ -276,8 +256,7 @@ namespace TAO
           find_user_id_using_system_id (system_id,
                                         user_id.out()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_SERVANT_NOT_FOUND);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       TAO_Active_Object_Map_Entry *entry = 0;
@@ -310,8 +289,7 @@ namespace TAO
           find_user_id_using_system_id (system_id,
                                         user_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       poa_current_impl.object_id(user_id);
@@ -353,8 +331,7 @@ namespace TAO
           find_user_id_using_system_id (system_id,
                                         user_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            -1);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // If the POA has the RETAIN policy, the POA looks in the Active
@@ -385,8 +362,7 @@ namespace TAO
     {
       bool deactivated = false;
       int servant_in_map =
-        this->active_object_map_->is_servant_in_map (servant,
-                                                     deactivated);
+        this->active_object_map_->is_servant_in_map (servant, deactivated);
 
       if (!servant_in_map)
         {
@@ -478,8 +454,6 @@ namespace TAO
 
     void
     ServantRetentionStrategyRetain::deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the etherealize_objects parameter is TRUE, the POA has the
       // RETAIN policy, and a servant manager is registered with the POA,
@@ -518,17 +492,13 @@ namespace TAO
            i < counter;
            ++i)
         {
-          this->deactivate_map_entry (map_entries[i]
-                                     );
+          this->deactivate_map_entry (map_entries[i]);
         }
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::servant_to_user_id (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation requires the RETAIN and either the UNIQUE_ID or
       // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
@@ -536,8 +506,7 @@ namespace TAO
       if (!((!this->poa_->allow_multiple_activations ()
                 || this->poa_->allow_implicit_activation ())))
         {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
+          throw PortableServer::POA::WrongPolicy ();
         }
 
       /**
@@ -580,8 +549,7 @@ namespace TAO
                                                       this->poa_->server_priority (),
                                                       user_id.out ()) != 0)
             {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
+              throw ::CORBA::OBJ_ADAPTER ();
             }
 
           //
@@ -590,9 +558,7 @@ namespace TAO
 
           // Inform the custom servant dispatching (CSD) strategy that the
           // sevant is activated.
-          this->poa_->servant_activated_hook (servant,
-                                              user_id.in ()
-                                             );
+          this->poa_->servant_activated_hook (servant, user_id.in ());
 
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -610,24 +576,19 @@ namespace TAO
       /*
        * Otherwise, the ServantNotActive exception is raised.
        */
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                        0);
+      throw PortableServer::POA::ServantNotActive ();
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::servant_to_system_id_i (
       PortableServer::Servant servant,
       CORBA::Short &priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
     {
 #if defined (CORBA_E_COMPACT) || defined (CORBA_E_MICRO)
       if (this->poa_->allow_multiple_activations () ||
             this->poa_->allow_implicit_activation ())
         {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
+          throw PortableServer::POA::WrongPolicy ();
         }
 
 #else
@@ -637,8 +598,7 @@ namespace TAO
       if (!((!this->poa_->allow_multiple_activations ()
                 || this->poa_->allow_implicit_activation ())))
         {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
+          throw PortableServer::POA::WrongPolicy ();
         }
 #endif
 
@@ -672,8 +632,7 @@ namespace TAO
                                                         priority,
                                                         system_id.out ()) != 0)
             {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
+              throw ::CORBA::OBJ_ADAPTER ();
             }
 
           //
@@ -682,9 +641,7 @@ namespace TAO
 
           // Inform the custom servant dispatching (CSD) strategy that the
           // sevant is activated.
-          this->poa_->servant_activated_hook (servant,
-                                              system_id.in ()
-                                             );
+          this->poa_->servant_activated_hook (servant, system_id.in ());
 
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -700,16 +657,12 @@ namespace TAO
         }
 
       // Otherwise, the ServantNotActive exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                        0);
+      throw PortableServer::POA::ServantNotActive ();
     }
 
     CORBA::Object_ptr
     ServantRetentionStrategyRetain::servant_to_reference (
       PortableServer::Servant servant)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy))
     {
       // Note: The allocation of an Object Id value and installation in
       // the Active Object Map caused by implicit activation may actually
@@ -717,24 +670,19 @@ namespace TAO
       // reference. The real requirement here is that a reference is
       // produced that will behave appropriately (that is, yield a
       // consistent Object Id value when asked politely).
-      CORBA::Short priority =
-        this->poa_->server_priority ();
+      CORBA::Short priority = this->poa_->server_priority ();
 
       PortableServer::ObjectId_var system_id =
-        this->servant_to_system_id_i (servant,
-                                      priority
-                                     );
+        this->servant_to_system_id_i (servant, priority);
 
       PortableServer::ObjectId user_id;
 
       // This operation requires the RETAIN, therefore don't worry about
       // the NON_RETAIN case.
       if (this->active_object_map_->
-          find_user_id_using_system_id (system_id.in (),
-                                        user_id) != 0)
+          find_user_id_using_system_id (system_id.in (), user_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // Remember params for potentially invoking <key_to_object> later.
@@ -752,9 +700,7 @@ namespace TAO
       // application code. Think what would happen if the app calls us
       // back. We need to get to this at some point.
       return this->poa_->invoke_key_to_object_helper_i (
-              servant->_interface_repository_id (),
-              user_id
-             );
+              servant->_interface_repository_id (), user_id);
     }
 
     PortableServer::ObjectId *
@@ -762,14 +708,10 @@ namespace TAO
       PortableServer::Servant servant,
       CORBA::Short priority,
       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       if (!this->poa_->has_system_id ())
         {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
+          throw PortableServer::POA::WrongPolicy ();
         }
 
       bool may_activate =
@@ -783,8 +725,7 @@ namespace TAO
             }
           else
             {
-              ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
-                                0);
+              throw PortableServer::POA::ServantAlreadyActive ();
             }
         }
 
@@ -797,8 +738,7 @@ namespace TAO
                                                   priority,
                                                   user_id.out ()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       //
@@ -807,9 +747,7 @@ namespace TAO
 
       // Inform the custom servant dispatching (CSD) strategy that the
       // sevant is activated.
-      this->poa_->servant_activated_hook (servant,
-                                          user_id.in ()
-                                         );
+      this->poa_->servant_activated_hook (servant, user_id.in ());
 
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -831,10 +769,6 @@ namespace TAO
       PortableServer::Servant servant,
       CORBA::Short priority,
       bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::ObjectAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
     {
       // If the POA has the SYSTEM_ID policy and it detects that the
       // Object Id value was not generated by the system or for this POA,
@@ -885,7 +819,7 @@ namespace TAO
       if (!priorities_match)
         {
           throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
-                                           CORBA::COMPLETED_NO));
+                                          CORBA::COMPLETED_NO));
         }
 
       bool const may_activate =
@@ -919,9 +853,7 @@ namespace TAO
 
       // Inform the custom servant dispatching (CSD) strategy that the
       // sevant is activated.
-      this->poa_->servant_activated_hook (servant,
-                                          id
-                                         );
+      this->poa_->servant_activated_hook (servant, id);
 
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -939,8 +871,6 @@ namespace TAO
     ServantRetentionStrategyRetain::create_reference (
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
     {
       // This operation creates an object reference that encapsulates a
       // POA-generated Object Id value and the specified interface
@@ -959,8 +889,7 @@ namespace TAO
                                                     priority,
                                                     system_id.out ()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // Find user id from system id.
@@ -968,8 +897,7 @@ namespace TAO
           find_user_id_using_system_id (system_id.in (),
                                         user_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // Remember params for potentially invoking <key_to_object> later.
@@ -981,9 +909,7 @@ namespace TAO
                                        true);
 
       return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        user_id
-                                                       );
-
+                                                        user_id);
     }
 
     CORBA::Object_ptr
@@ -991,7 +917,6 @@ namespace TAO
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority)
-        ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
       // specified Object Id and interface repository Id values. This
@@ -1015,8 +940,7 @@ namespace TAO
                                         priority,
                                         system_id.out ()) != 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       // Remember params for potentially invoking <key_to_object> later.
@@ -1027,9 +951,7 @@ namespace TAO
                                        priority,
                                        true);
 
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                  oid
-                                                 );
+      return this->poa_->invoke_key_to_object_helper_i (intf, oid);
     }
 
     int
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 4ea03f1fa3f..ca8dd792244 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -48,10 +48,7 @@ namespace TAO
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
                        bool &wait_occurred_restart_call
-                            )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
+                            );
 
 #if !defined (CORBA_E_MICRO)
       virtual
@@ -59,11 +56,7 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
+                               bool &wait_occurred_restart_call);
 #endif
 
       void deactivate_object (const PortableServer::ObjectId &id);
@@ -73,23 +66,14 @@ namespace TAO
        );
 
       virtual PortableServer::ObjectId * system_id_to_object_id (
-        const PortableServer::ObjectId &system_id)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
+        const PortableServer::ObjectId &system_id);
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+      user_id_to_servant (const PortableServer::ObjectId &id);
 
       CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id,
-                                         bool indirect)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
+                                         bool indirect);
 
       virtual
       TAO_SERVANT_LOCATION
@@ -106,40 +90,29 @@ namespace TAO
         CORBA::Short &priority
        );
 
-      virtual void deactivate_all_objects (void)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
+      virtual void deactivate_all_objects (void);
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       CORBA::Object_ptr
       servant_to_reference (PortableServer::Servant servant
-                            )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy));
+                            );
 
       virtual
       CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
-        )
-          ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
       virtual ::PortableServer::ServantRetentionPolicyValue type() const;
 
@@ -158,10 +131,7 @@ namespace TAO
           PortableServer::Servant p_servant,
           CORBA::Short &priority
 
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy));
+        );
 
       virtual
       int rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 6f23b70114f..2ca679a8ff7 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -9,7 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/Stub.h"
-#include "tao/Environment.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/IFR_Client_Adapter.h"
 
@@ -76,16 +75,13 @@ TAO_ServantBase::~TAO_ServantBase (void)
 PortableServer::POA_ptr
 TAO_ServantBase::_default_POA (void)
 {
-  CORBA::Object_var object =
-    TAO_ORB_Core_instance ()->root_poa ();
+  CORBA::Object_var object = TAO_ORB_Core_instance ()->root_poa ();
 
-  return PortableServer::POA::_narrow (object.in ()
-                                      );
+  return PortableServer::POA::_narrow (object.in ());
 }
 
 CORBA::Boolean
-TAO_ServantBase::_is_a (const char *logical_type_id
-                        )
+TAO_ServantBase::_is_a (const char *logical_type_id)
 {
   static char const id[] = "IDL:omg.org/CORBA/Object:1.0";
   return ACE_OS::strcmp (logical_type_id, id) == 0;
@@ -102,20 +98,17 @@ TAO_ServantBase::_get_interface (void)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
+        TAO_ORB_Core::ifr_client_adapter_name ());
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
+      throw ::CORBA::INTF_REPOS ();
     }
 
   // This doesn't take multiple ORBs into account, but it's being
   // used only to resolve the IFR, so we should be ok.
   return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
-                                 this->_interface_repository_id ()
-                                );
+                                 this->_interface_repository_id ());
 }
 
 CORBA::Object_ptr
@@ -175,11 +168,9 @@ TAO_ServantBase::_create_stub (void)
     }
   else
     {
-      PortableServer::POA_var poa =
-        this->_default_POA ();
+      PortableServer::POA_var poa = this->_default_POA ();
 
-      CORBA::Object_var object =
-        poa->servant_to_reference (this);
+      CORBA::Object_var object = poa->servant_to_reference (this);
 
       // Get the stub object
       stub = object->_stubobj ();
@@ -197,8 +188,7 @@ TAO_ServantBase::_create_stub (void)
 
 void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
                                                    void * servant_upcall,
-                                                   void * derived_this
-                                                   )
+                                                   void * derived_this)
 {
   TAO_Skeleton skel;
   char const * const opname = req.operation ();
@@ -232,10 +222,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
       // the right operation on the skeleton class, and marshal any
       // results.  De/marshaling will only occur in the uncollocated
       // case.
-      skel (req,
-            servant_upcall,
-            derived_this
-           );
+      skel (req, servant_upcall, derived_this);
 
       /*
        * Dispatch resolution specialization add hook.
@@ -253,7 +240,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
           req.tao_send_reply ();
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       // If an exception was raised we should marshal it and send
       // the appropriate reply to the client
@@ -274,8 +261,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
 
 void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
                                                     void * servant_upcall,
-                                                    void * derived_this
-                                                    )
+                                                    void * derived_this)
 {
   TAO_Skeleton skel;
   const char *opname = req.operation ();
@@ -304,10 +290,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
       // the right operation on the skeleton class, and marshal any
       // results.  De/marshaling will only occur in the uncollocated
       // case.
-      skel (req,
-            servant_upcall,
-            derived_this
-           );
+      skel (req, servant_upcall, derived_this);
 
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 217a3ea006b..b8923c91fdc 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -67,33 +67,22 @@ public:
   virtual ~TAO_ServantBase (void);
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-      void
-    );
+  virtual PortableServer::POA_ptr _default_POA (void);
 
   /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                );
+  virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (
-      void
-    );
+  virtual CORBA::Boolean _non_existent (void);
 
   /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      void
-    );
+  virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
   /// Default _get_component: always returns CORBA::Object::_nil().
-  virtual CORBA::Object_ptr _get_component (
-      void
-    );
+  virtual CORBA::Object_ptr _get_component (void);
 
   /// Get the repository id.
-  virtual char * _repository_id (
-      void
-    );
+  virtual char * _repository_id (void);
 
   /// This is an auxiliary method for _this() and _narrow().
   virtual TAO_Stub *_create_stub (void);
@@ -105,9 +94,7 @@ public:
    * results and out parameters (if any) or the exceptions thrown into
    * @a request.
    */
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall
-                          ) = 0;
+  virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall) = 0;
 
   /// Please see documentation in tao/Abstract_Servant_Base.h for
   /// details.
@@ -156,13 +143,11 @@ protected:
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest & req,
                                             void * servant_upcall,
-                                            void * derived_this
-                                           );
+                                            void * derived_this);
 
   virtual void asynchronous_upcall_dispatch (TAO_ServerRequest & req,
                                              void * servant_upcall,
-                                             void * derived_this
-                                            );
+                                             void * derived_this);
 
 protected:
   /// Reference counter.
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 82737fc268c..f2c2c0e319e 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -58,7 +58,6 @@ public:
       CORBA::Short servant_priority,
 			TAO_ServerRequest &req,
       TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-
     ) = 0;
 
   /// Pre_invoke collocated request.
@@ -81,8 +80,7 @@ public:
       ACE_Lock &lock,
       TAO_SYNCH_MUTEX &thread_lock,
       TAO_ORB_Core &orb_core,
-      TAO_Object_Adapter *object_adapter
-      ) = 0;
+      TAO_Object_Adapter *object_adapter) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index 3e8bd473bd0..b3c62852440 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -52,8 +52,7 @@ namespace TAO
     Servant_Upcall::prepare_for_upcall (
       const TAO::ObjectKey &key,
       const char *operation,
-      CORBA::Object_out forward_to
-      )
+      CORBA::Object_out forward_to)
     {
       while (1)
         {
@@ -63,8 +62,7 @@ namespace TAO
             this->prepare_for_upcall_i (key,
                                         operation,
                                         forward_to,
-                                        wait_occurred_restart_call
-                                       );
+                                        wait_occurred_restart_call);
 
           if (result == TAO_Adapter::DS_FAILED &&
               wait_occurred_restart_call)
@@ -89,15 +87,13 @@ namespace TAO
       const TAO::ObjectKey &key,
       const char *operation,
       CORBA::Object_out forward_to,
-      bool &wait_occurred_restart_call
-      )
+      bool &wait_occurred_restart_call)
     {
       // Acquire the object adapter lock first.
       int result = this->object_adapter_->lock ().acquire ();
       if (result == -1)
         // Locking error.
-        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                          TAO_Adapter::DS_FAILED);
+        throw ::CORBA::OBJ_ADAPTER ();
 
       // We have acquired the object adapter lock.  Record this for later
       // use.
@@ -106,21 +102,16 @@ namespace TAO
       // Check if a non-servant upcall is in progress.  If a non-servant
       // upcall is in progress, wait for it to complete.  Unless of
       // course, the thread making the non-servant upcall is this thread.
-      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        );
+      this->object_adapter_->wait_for_non_servant_upcalls_to_complete ();
 
       // Locate the POA.
-      this->object_adapter_->locate_poa (key,
-                                         this->system_id_,
-                                         this->poa_
-                                        );
+      this->object_adapter_->locate_poa (key, this->system_id_, this->poa_);
 
       // Check the state of the POA.
       this->poa_->check_state ();
 
       // Setup current for this request.
-      this->current_context_.setup (this->poa_,
-                                    key);
+      this->current_context_.setup (this->poa_, key);
 
       // Increase <poa->outstanding_requests_> for the duration of finding
       // the POA, finding the servant, and making the upcall.
@@ -129,21 +120,22 @@ namespace TAO
       // We have setup the POA Current.  Record this for later use.
       this->state_ = POA_CURRENT_SETUP;
 
+#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
       try
         {
+#endif /* TAO_HAS_MINIMUM_CORBA */
           // Lookup the servant.
           this->servant_ =
             this->poa_->locate_servant_i (operation,
                                           this->system_id_,
                                           *this,
                                           this->current_context_,
-                                          wait_occurred_restart_call
-                                         );
+                                          wait_occurred_restart_call);
 
           if (wait_occurred_restart_call)
             return TAO_Adapter::DS_FAILED;
-        }
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+        }
       catch (const ::PortableServer::ForwardRequest& forward_request)
         {
           forward_to =
@@ -151,11 +143,7 @@ namespace TAO
           return TAO_Adapter::DS_FORWARD;
         }
 #else
-      catch (const ::CORBA::Exception&)
-        {
-          ACE_UNUSED_ARG (forward_to);
-          throw;
-        }
+      ACE_UNUSED_ARG (forward_to);
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
       // Now that we know the servant.
@@ -187,27 +175,22 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::pre_invoke_remote_request (
-      TAO_ServerRequest &req
-      )
+    Servant_Upcall::pre_invoke_remote_request (TAO_ServerRequest &req)
     {
       this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request (
         this->poa (),
         this->priority (),
         req,
-        this->pre_invoke_state_
-       );
+        this->pre_invoke_state_);
     }
 
     void
-    Servant_Upcall::pre_invoke_collocated_request (
-      void)
+    Servant_Upcall::pre_invoke_collocated_request (void)
     {
       this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
         this->poa (),
         this->priority (),
-        this->pre_invoke_state_
-       );
+        this->pre_invoke_state_);
     }
 
     void
@@ -226,15 +209,12 @@ namespace TAO
     }
 
     ::TAO_Root_POA *
-    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
-                                )
+    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key)
     {
       // Acquire the object adapter lock first.
-      int result = this->object_adapter_->lock ().acquire ();
-      if (result == -1)
+      if (this->object_adapter_->lock ().acquire () == -1)
         // Locking error.
-        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                          0);
+        throw ::CORBA::OBJ_ADAPTER ();
 
       // We have acquired the object adapter lock.  Record this for later
       // use.
@@ -243,14 +223,10 @@ namespace TAO
       // Check if a non-servant upcall is in progress.  If a non-servant
       // upcall is in progress, wait for it to complete.  Unless of
       // course, the thread making the non-servant upcall is this thread.
-      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        );
+      this->object_adapter_->wait_for_non_servant_upcalls_to_complete ();
 
       // Locate the POA.
-      this->object_adapter_->locate_poa (key,
-                                         this->system_id_,
-                                         this->poa_
-                                        );
+      this->object_adapter_->locate_poa (key, this->system_id_, this->poa_);
 
       return this->poa_;
     }
@@ -340,11 +316,9 @@ namespace TAO
       // lock.  Otherwise, the thread that wants to release this lock will
       // not be able to do so since it can't acquire the object adapterx
       // lock.
-        int result = this->poa_->enter();
-
-        if (result == -1)
-          // Locking error.
-          throw ::CORBA::OBJ_ADAPTER ();
+      if (this->poa_->enter() == -1)
+        // Locking error.
+        throw ::CORBA::OBJ_ADAPTER ();
 #endif /* !TAO_HAS_MINIMUM_POA == 0 */
     }
 
@@ -352,10 +326,8 @@ namespace TAO
     Servant_Upcall::single_threaded_poa_cleanup (void)
     {
 #if (TAO_HAS_MINIMUM_POA == 0)
-      int result = 0;
-
       // Since the servant lock was acquired, we must release it.
-      result = this->poa_->exit ();
+      int const result = this->poa_->exit ();
 
       ACE_UNUSED_ARG (result);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -376,7 +348,7 @@ namespace TAO
       if (this->active_object_map_entry_ != 0)
         {
           // Decrement the reference count.
-          CORBA::UShort new_count =
+          CORBA::UShort const new_count =
             --this->active_object_map_entry_->reference_count_;
 
           if (new_count == 0)
@@ -385,8 +357,7 @@ namespace TAO
                 {
                   this->poa_->cleanup_servant (
                     this->active_object_map_entry_->servant_,
-                    this->active_object_map_entry_->user_id_
-                   );
+                    this->active_object_map_entry_->user_id_);
 
                 }
               catch (...)
@@ -431,7 +402,6 @@ namespace TAO
           // non-servant upcalls to be in progress at this point.
           if (this->poa_->waiting_destruction_)
             {
-
               try
                 {
                   this->poa_->complete_destruction_i ();
@@ -439,8 +409,7 @@ namespace TAO
               catch (const ::CORBA::Exception& ex)
                 {
                   // Ignore exceptions
-                  ex._tao_print_exception (
-                    "TAO_POA::~complete_destruction_i");
+                  ex._tao_print_exception ("TAO_POA::~complete_destruction_i");
                 }
 
               this->poa_ = 0;
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index 5c5b012e62a..ee9a2675b01 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -10,8 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Exception.h"
-#include "tao/Environment.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h
index 5004ae93159..2750adde4a6 100644
--- a/TAO/tao/PortableServer/Servant_var.h
+++ b/TAO/tao/PortableServer/Servant_var.h
@@ -100,10 +100,7 @@ namespace PortableServer
     */
 
     /// Smart pointer operator-> provides access to the underlying object.
-    T const * operator->() const;
-
-    /// Smart pointer operator-> provides access to the underlying object.
-    T * operator->();
+    T * operator->() const;
 
     /// Dereference the underlying object.
     T const & operator*() const;
diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl
index 66796f4499a..e1fd8abe2cc 100644
--- a/TAO/tao/PortableServer/Servant_var.inl
+++ b/TAO/tao/PortableServer/Servant_var.inl
@@ -100,15 +100,8 @@ PortableServer::Servant_var<T>::operator= (T * p)
 */
 
 template <class T>
-ACE_INLINE T const *
-PortableServer::Servant_var<T>::operator->() const
-{
-  return this->ptr_;
-}
-
-template <class T>
 ACE_INLINE T *
-PortableServer::Servant_var<T>::operator->()
+PortableServer::Servant_var<T>::operator->() const
 {
   return this->ptr_;
 }
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index 40d3c9cfcc8..57b630bc0f3 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -22,7 +22,6 @@ namespace TAO
 
     CORBA::Policy_ptr
     ThreadPolicy::copy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ThreadPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -34,20 +33,17 @@ namespace TAO
 
     void
     ThreadPolicy::destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ThreadPolicyValue
     ThreadPolicy::value (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
     ThreadPolicy::policy_type (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::THREAD_POLICY_ID;
     }
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index cd160aa8452..78cb33815ec 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -45,17 +45,13 @@ namespace TAO
     public:
       ThreadPolicy (::PortableServer::ThreadPolicyValue value);
 
-      CORBA::Policy_ptr copy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Policy_ptr copy (void);
 
-      void destroy (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      void destroy (void);
 
-      ::PortableServer::ThreadPolicyValue value (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      ::PortableServer::ThreadPolicyValue value (void);
 
-      CORBA::PolicyType policy_type (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::PolicyType policy_type (void);
 
       /// Return the cached policy type for this policy.
       TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index d37db6f0745..c082224cb0f 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -44,9 +44,7 @@ namespace TAO
     }
 
     void
-    ThreadStrategySingleFactoryImpl::destroy (
-      ThreadStrategy *strategy
-      )
+    ThreadStrategySingleFactoryImpl::destroy (ThreadStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index cd9fde3aae2..c5873d0129e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -39,9 +39,7 @@ namespace TAO
       virtual ThreadStrategy* create (
         ::PortableServer::ThreadPolicyValue value);
 
-      virtual void destroy (
-        ThreadStrategy *strategy
-       );
+      virtual void destroy (ThreadStrategy *strategy);
     };
   }
 }
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 5f56e59e95d..8ba85735a94 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -22,7 +22,6 @@
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Versioned_Namespace.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -43,13 +42,11 @@ namespace TAO
   class TAO_PortableServer_Export Upcall_Command
   {
   public:
-
     /// Destructor.
     virtual ~Upcall_Command (void);
 
     /// Execute the upcall.
     virtual void execute (void) = 0;
-
   };
 
 }  // End namespace TAO
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 076911b755e..8d865765f1d 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -3,6 +3,7 @@
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/DII_Arguments_Converter.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ServerRequestInterceptor_Adapter.h"
@@ -44,10 +45,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 
       if (dii_arguments_converter != 0)
         {
-          dii_arguments_converter->convert (server_request,
-                                            args,
-                                            nargs
-                                           );
+          dii_arguments_converter->convert (server_request, args, nargs);
         }
       else
         throw ::CORBA::NO_IMPLEMENT ();
@@ -55,10 +53,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 
   if (server_request.incoming ())
     {
-      this->pre_upcall (*server_request.incoming (),
-                        args,
-                        nargs
-                       );
+      this->pre_upcall (*server_request.incoming (), args, nargs);
     }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -103,8 +98,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                   the_nargs,
                                                   servant_upcall,
                                                   exceptions,
-                                                  nexceptions
-                                                 );
+                                                  nexceptions);
           }
 
         // Don't bother performing the upcall if an interceptor caused a
@@ -114,9 +108,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
           {
             if (interceptor_adapter != 0)
               {
-                interceptor_adapter->execute_command (server_request,
-                                                      command
-                                                     );
+                interceptor_adapter->execute_command (server_request, command);
               }
             else
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -124,7 +116,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                 // The actual upcall.
                 command.execute ();
               }
-
 #if TAO_HAS_INTERCEPTORS == 1
           }
       }
@@ -155,8 +146,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                the_nargs,
                                                servant_upcall,
                                                exceptions,
-                                               nexceptions
-                                              );
+                                               nexceptions);
             }
         }
     }
@@ -178,11 +168,9 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                the_nargs,
                                                servant_upcall,
                                                exceptions,
-                                               nexceptions
-                                              );
+                                               nexceptions);
 
-          status =
-            server_request.reply_status ();
+          status = server_request.reply_status ();
         }
 
       if (status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -208,10 +196,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
     {
       if (server_request.outgoing ())
         {
-          this->post_upcall (*server_request.outgoing (),
-                             args,
-                             nargs
-                            );
+          this->post_upcall (*server_request.outgoing (), args, nargs);
         }
     }
 }
@@ -219,8 +204,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 void
 TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
                                  TAO::Argument * const * args,
-                                 size_t nargs
-                                 )
+                                 size_t nargs)
 {
   // Demarshal the operation "in" and "inout" arguments, if any.
 
@@ -237,8 +221,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
     {
       if (!(*i)->demarshal (cdr))
         {
-          TAO_InputCDR::throw_skel_exception (errno
-                                             );
+          TAO_InputCDR::throw_skel_exception (errno);
         }
     }
 }
@@ -246,8 +229,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
 void
 TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
                                   TAO::Argument * const * args,
-                                  size_t nargs
-                                  )
+                                  size_t nargs)
 {
   // Marshal the operation "inout" and "out" arguments and return
   // value, if any.
@@ -259,8 +241,7 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
     {
       if (!(*i)->marshal (cdr))
         {
-          TAO_OutputCDR::throw_skel_exception (errno
-                                              );
+          TAO_OutputCDR::throw_skel_exception (errno);
         }
     }
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index 585fad89eb4..59dbe9b47ab 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -25,8 +25,6 @@
 
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
-
 
 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..530610892ec 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -74,7 +74,7 @@ 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); 
+    throw ::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE);
 
   return cdr << this->x_.in ();
 }
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index 86da46eaefb..a3504f16672 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -8,7 +8,6 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index bf2c2700c29..13b2f22d776 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -509,7 +509,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
                                     ACE_TEXT ("policies.\n")));
                     }
                 }
-              catch ( ::CORBA::Exception& ex)
+              catch (const ::CORBA::Exception& ex)
                 {
                   // This case should occur when in the IOR are
                   // embedded policies that TAO doesn't support, so as
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index bc81f383513..648f0bb0757 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -17,6 +17,7 @@
 #include "tao/Client_Strategy_Factory.h"
 
 #include "ace/Countdown_Time.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Profile_Transport_Resolver.inl"
@@ -78,18 +79,14 @@ namespace TAO
   void
   Profile_Transport_Resolver::resolve (ACE_Time_Value *max_time_val
                                        )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Countdown_Time countdown (max_time_val);
 
     TAO_Invocation_Endpoint_Selector *es =
-      this->stub_->orb_core ()->endpoint_selector_factory ()->get_selector (
-          );
+      this->stub_->orb_core ()->endpoint_selector_factory ()->get_selector ();
 
     // Select the endpoint
-    es->select_endpoint (this,
-                         max_time_val
-                        );
+    es->select_endpoint (this, max_time_val);
 
     if (this->transport_.get () == 0)
       {
@@ -153,12 +150,11 @@ namespace TAO
 
     if (conn_reg == 0)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-                            CORBA::SystemException::_tao_minor_code (
-                              0,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          false);
+        throw ::CORBA::INTERNAL (
+          CORBA::SystemException::_tao_minor_code (
+            0,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
 
     ACE_Time_Value connection_timeout;
@@ -200,12 +196,11 @@ namespace TAO
         has_con_timeout == false &&
         errno == ETIME)
       {
-        ACE_THROW_RETURN (CORBA::TIMEOUT (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO_TIMEOUT_CONNECT_MINOR_CODE,
-                              errno),
-                            CORBA::COMPLETED_NO),
-                          false);
+        throw ::CORBA::TIMEOUT (
+          CORBA::SystemException::_tao_minor_code (
+            TAO_TIMEOUT_CONNECT_MINOR_CODE,
+            errno),
+          CORBA::COMPLETED_NO);
       }
     else if (this->transport_.get () == 0)
       {
@@ -247,7 +242,6 @@ namespace TAO
   void
   Profile_Transport_Resolver::init_inconsistent_policies (
     void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_NEW_THROW_EX (this->inconsistent_policies_,
                       CORBA::PolicyList (0),
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 031e75e3885..01bffa9f315 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -21,9 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-
-#include "tao/SystemException.h"
 #include "tao/Transport_Selection_Guard.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -89,8 +86,7 @@ namespace TAO
      * the profile.
      */
     void resolve (ACE_Time_Value *val
-                  )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                  );
 
     //@{
     /**
@@ -153,8 +149,7 @@ namespace TAO
 
     /// Initialize the inconsistent policy list that this object has
     /// cached.
-    void init_inconsistent_policies (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void init_inconsistent_policies (void);
 
     CORBA::PolicyList *inconsistent_policies (void) const;
 
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index c8e8883fd11..22f24e04f6f 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -17,7 +17,6 @@
 
 #include "tao/LF_Invocation_Event.h"
 #include "ace/os_include/os_stddef.h"
-#include "ace/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,6 +27,7 @@ struct iovec;
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
 class ACE_Allocator;
+class ACE_Time_Value;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
index 5c8410bf943..9c604bb96cb 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Linear_Network_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Linear_Network_Priority_Mapping interface,
-//
-// = AUTHOR
-//   Yamuna Krishnamurthy (yamuna@oomworks.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Linear_Network_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ * Declares the Linear_Network_Priority_Mapping interface,
+ *
+ *
+ *  @author Yamuna Krishnamurthy (yamuna@oomworks.com)
+ */
+//=============================================================================
+
 
 #ifndef TAO_LINEAR_NETWORK_PRIORITY_MAPPING_H
 #define TAO_LINEAR_NETWORK_PRIORITY_MAPPING_H
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index 164e7f024b7..c3cf83f6449 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Linear_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Linear_Priority_Mapping interface, as defined in the
-//   RT-CORBA spec.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Linear_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ * Declares the Linear_Priority_Mapping interface, as defined in the
+ * RT-CORBA spec.
+ *
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef TAO_LINEAR_PRIORITY_MAPPING_H
 #define TAO_LINEAR_PRIORITY_MAPPING_H
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index a3b3b58ec75..e64b304dfaa 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Multi_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares a priority mapping to support cross platform communication.
-//
-// = AUTHOR
-//   Brian Mendel (brian.r.mendel@boeing.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Multi_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ * Declares a priority mapping to support cross platform communication.
+ *
+ *
+ *  @author Brian Mendel (brian.r.mendel@boeing.com)
+ */
+//=============================================================================
+
 
 #ifndef TAO_MULTI_PRIORITY_MAPPING_H
 #define TAO_MULTI_PRIORITY_MAPPING_H
@@ -76,9 +73,9 @@ public:
 
 private:
 
+  /// The base settings
   int base_native_priority_;
   int base_corba_priority_;
-  // The base settings
 
   const int priority_spacing_;
   const int priorities_contiguous_;
@@ -86,9 +83,9 @@ private:
   /// The scheduling policy
   int policy_;
 
+  /// The range
   int const min_;
   int const max_;
-  // The range
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 78a1cc4beff..c42023b05e1 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -61,9 +61,7 @@ public:
 
   // the static operations
   static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
-  static TAO_Priority_Mapping_Manager_ptr _narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_Priority_Mapping_Manager_ptr _narrow (CORBA::Object_ptr obj);
 
   static TAO_Priority_Mapping_Manager_ptr _nil (void)
     {
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index c03ea57414b..60b3ab5ff95 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -2358,7 +2358,7 @@ RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const
 
 void RTCORBA::RTORB::MutexNotFound::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
 void RTCORBA::RTORB::MutexNotFound::_tao_encode (
@@ -2453,7 +2453,7 @@ RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const
 
 void RTCORBA::RTORB::InvalidThreadpool::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 7a3f336dd87..e48a877fb3d 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -49,7 +49,6 @@
 #include "tao/ORB.h"
 #include "tao/TimeBaseC.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -305,9 +304,7 @@ namespace RTCORBA
     virtual ::RTCORBA::PriorityModel priority_model (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -315,9 +312,7 @@ namespace RTCORBA
     virtual RTCORBA::Priority server_priority (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -325,9 +320,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -335,9 +328,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -439,9 +430,7 @@ namespace RTCORBA
     virtual RTCORBA::ThreadpoolId threadpool (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -449,9 +438,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -459,9 +446,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -740,9 +725,7 @@ namespace RTCORBA
     virtual ::RTCORBA::ProtocolList * protocols (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -750,9 +733,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -760,9 +741,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -864,9 +843,7 @@ namespace RTCORBA
     virtual ::RTCORBA::ProtocolList * protocols (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -874,9 +851,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -884,9 +859,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -988,9 +961,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -998,9 +969,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -1097,9 +1066,7 @@ namespace RTCORBA
     virtual CORBA::Long send_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1108,9 +1075,7 @@ namespace RTCORBA
         ::CORBA::Long send_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1118,9 +1083,7 @@ namespace RTCORBA
     virtual CORBA::Long recv_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1129,9 +1092,7 @@ namespace RTCORBA
         ::CORBA::Long recv_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1139,9 +1100,7 @@ namespace RTCORBA
     virtual CORBA::Boolean keep_alive (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1150,9 +1109,7 @@ namespace RTCORBA
         ::CORBA::Boolean keep_alive
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1160,9 +1117,7 @@ namespace RTCORBA
     virtual CORBA::Boolean dont_route (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1171,9 +1126,7 @@ namespace RTCORBA
         ::CORBA::Boolean dont_route
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1181,9 +1134,7 @@ namespace RTCORBA
     virtual CORBA::Boolean no_delay (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1192,9 +1143,7 @@ namespace RTCORBA
         ::CORBA::Boolean no_delay
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1202,9 +1151,7 @@ namespace RTCORBA
     virtual CORBA::Boolean enable_network_priority (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1213,9 +1160,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -1401,9 +1346,7 @@ namespace RTCORBA
     virtual CORBA::Long send_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1412,9 +1355,7 @@ namespace RTCORBA
         ::CORBA::Long send_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1422,9 +1363,7 @@ namespace RTCORBA
     virtual CORBA::Long recv_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1433,9 +1372,7 @@ namespace RTCORBA
         ::CORBA::Long recv_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -1532,9 +1469,7 @@ namespace RTCORBA
     virtual CORBA::Long send_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1543,9 +1478,7 @@ namespace RTCORBA
         ::CORBA::Long send_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1553,9 +1486,7 @@ namespace RTCORBA
     virtual CORBA::Long recv_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1564,9 +1495,7 @@ namespace RTCORBA
         ::CORBA::Long recv_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1574,9 +1503,7 @@ namespace RTCORBA
     virtual CORBA::Boolean keep_alive (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1585,9 +1512,7 @@ namespace RTCORBA
         ::CORBA::Boolean keep_alive
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1595,9 +1520,7 @@ namespace RTCORBA
     virtual CORBA::Boolean dont_route (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1606,9 +1529,7 @@ namespace RTCORBA
         ::CORBA::Boolean dont_route
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1616,9 +1537,7 @@ namespace RTCORBA
     virtual CORBA::Boolean no_delay (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1627,9 +1546,7 @@ namespace RTCORBA
         ::CORBA::Boolean no_delay
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1637,9 +1554,7 @@ namespace RTCORBA
     virtual CORBA::Long preallocate_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1648,9 +1563,7 @@ namespace RTCORBA
         ::CORBA::Long preallocate_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1658,9 +1571,7 @@ namespace RTCORBA
     virtual char * mmap_filename (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1669,9 +1580,7 @@ namespace RTCORBA
         const char * mmap_filename
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1679,9 +1588,7 @@ namespace RTCORBA
     virtual char * mmap_lockname (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1690,9 +1597,7 @@ namespace RTCORBA
         const char * mmap_lockname
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -1789,9 +1694,7 @@ namespace RTCORBA
     virtual CORBA::Boolean enable_network_priority (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1800,9 +1703,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -1899,9 +1800,7 @@ namespace RTCORBA
     virtual CORBA::Long send_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1910,9 +1809,7 @@ namespace RTCORBA
         ::CORBA::Long send_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1920,9 +1817,7 @@ namespace RTCORBA
     virtual CORBA::Long recv_buffer_size (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1931,9 +1826,7 @@ namespace RTCORBA
         ::CORBA::Long recv_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1941,9 +1834,7 @@ namespace RTCORBA
     virtual CORBA::Boolean keep_alive (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1952,9 +1843,7 @@ namespace RTCORBA
         ::CORBA::Boolean keep_alive
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1962,9 +1851,7 @@ namespace RTCORBA
     virtual CORBA::Boolean dont_route (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1973,9 +1860,7 @@ namespace RTCORBA
         ::CORBA::Boolean dont_route
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1983,9 +1868,7 @@ namespace RTCORBA
     virtual CORBA::Boolean no_delay (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -1994,9 +1877,7 @@ namespace RTCORBA
         ::CORBA::Boolean no_delay
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2004,9 +1885,7 @@ namespace RTCORBA
     virtual CORBA::Boolean enable_network_priority (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2015,9 +1894,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -2201,9 +2078,7 @@ namespace RTCORBA
     virtual ::RTCORBA::PriorityBands * priority_bands (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2211,9 +2086,7 @@ namespace RTCORBA
     virtual ::CORBA::Policy_ptr copy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2221,9 +2094,7 @@ namespace RTCORBA
     virtual void destroy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -2320,9 +2191,7 @@ namespace RTCORBA
     virtual RTCORBA::Priority the_priority (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2331,9 +2200,7 @@ namespace RTCORBA
         ::RTCORBA::Priority the_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -2430,9 +2297,7 @@ namespace RTCORBA
     virtual void lock (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2440,9 +2305,7 @@ namespace RTCORBA
     virtual void unlock (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2451,9 +2314,7 @@ namespace RTCORBA
         ::TimeBase::TimeT max_wait
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -2550,9 +2411,7 @@ namespace RTCORBA
     virtual ::RTCORBA::Mutex_ptr create_mutex (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2561,9 +2420,7 @@ namespace RTCORBA
         ::RTCORBA::Mutex_ptr the_mutex
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
@@ -2623,9 +2480,7 @@ namespace RTCORBA
         ::CORBA::Boolean_out created_flag
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2634,10 +2489,7 @@ namespace RTCORBA
         const char * name
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::MutexNotFound
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2651,9 +2503,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2663,9 +2513,7 @@ namespace RTCORBA
         ::CORBA::Long recv_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2681,9 +2529,7 @@ namespace RTCORBA
         const char * mmap_lockname
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2692,9 +2538,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2708,9 +2552,7 @@ namespace RTCORBA
         ::CORBA::Boolean enable_network_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
@@ -2775,9 +2617,7 @@ namespace RTCORBA
         ::CORBA::ULong max_request_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2791,9 +2631,7 @@ namespace RTCORBA
         ::CORBA::ULong max_request_buffer_size
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2802,10 +2640,7 @@ namespace RTCORBA
         ::RTCORBA::ThreadpoolId threadpool
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::InvalidThreadpool
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2815,9 +2650,7 @@ namespace RTCORBA
         ::RTCORBA::Priority server_priority
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2826,9 +2659,7 @@ namespace RTCORBA
         ::RTCORBA::ThreadpoolId threadpool
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2837,9 +2668,7 @@ namespace RTCORBA
         const ::RTCORBA::PriorityBands & priority_bands
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2848,9 +2677,7 @@ namespace RTCORBA
         const ::RTCORBA::ProtocolList & protocols
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2859,9 +2686,7 @@ namespace RTCORBA
         const ::RTCORBA::ProtocolList & protocols
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -2869,9 +2694,7 @@ namespace RTCORBA
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         void
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index ee285a98732..6ac6ce02bbe 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -11,6 +11,7 @@
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/SystemException.h"
 
 #include "ace/Thread.h"
 
@@ -31,31 +32,31 @@ TAO_RT_Current::~TAO_RT_Current (void)
 
 RTCORBA::Priority
 TAO_RT_Current::the_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
-  RTCORBA::Priority priority;
+  RTCORBA::Priority priority = 0;
 
-  int const result = tph->get_thread_CORBA_priority (priority);
-
-  if (result == -1)
-    ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO), -1);
+  if (tph != 0)
+    {
+      if (tph->get_thread_CORBA_priority (priority) == -1)
+        throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
+    }
 
   return priority;
 }
 
 void
 TAO_RT_Current::the_priority (RTCORBA::Priority the_priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
-  int const result = tph->set_thread_CORBA_priority (the_priority);
-
-  if (result == -1)
-    throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
+  if (tph != 0)
+    {
+      if (tph->set_thread_CORBA_priority (the_priority) == -1)
+        throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
+    }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index eb4ec47a061..7acf3f227cf 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -52,12 +52,9 @@ public:
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTCORBA::Priority the_priority (void);
 
-  virtual void the_priority (RTCORBA::Priority the_priority
-                             )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void the_priority (RTCORBA::Priority the_priority);
 
 protected:
 
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 1d3c767d922..94904eeb443 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -8,6 +8,8 @@
 
 #include "tao/RTCORBA/RT_Stub.h"
 
+#include "tao/SystemException.h"
+
 ACE_RCSID (RTCORBA,
            RT_Endpoint_Utils,
            "$Id$")
@@ -22,22 +24,24 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
 {
   CORBA::Policy *policy = CORBA::Policy::_nil ();
 
-  TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ());
+  TAO_RT_Stub * const rt_stub =
+    dynamic_cast<TAO_RT_Stub *> (r.stub ());
+
+  if (!rt_stub)
+    throw CORBA::INTERNAL ();
 
   try
     {
       policy =
-        rt_stub->get_cached_policy (type
-                                   );
+        rt_stub->get_cached_policy (type);
     }
-  catch ( ::CORBA::INV_POLICY&)
+  catch (const ::CORBA::INV_POLICY&)
     {
       if (r.inconsistent_policies ())
         {
           CORBA::PolicyList *p = r.inconsistent_policies ();
           p->length (1);
-          (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
-                                                          );
+          (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type);
         }
 
       throw;
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 20e9e2ed233..896172a49f9 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -17,6 +17,7 @@
 #include "tao/Endpoint.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (RTCORBA,
            RT_Invocation_Endpoint_Selectors,
@@ -111,10 +112,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
 
               r.profile (profile);
 
-              int const status =
-                this->endpoint_from_profile (r,
-                                             val
-                                            );
+              int const status = this->endpoint_from_profile (r, val);
 
               if (status == 1)
                 return;
@@ -129,8 +127,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
     {
       if (r.inconsistent_policies ())
         {
-          CORBA::PolicyList *p =
-            r.inconsistent_policies ();
+          CORBA::PolicyList *p = r.inconsistent_policies ();
 
           p->length (1);
           (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy);
@@ -150,8 +147,10 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
     ACE_Time_Value *val)
 {
   // Narrow to the RT Stub.
-  TAO_RT_Stub *rt_stub =
-    dynamic_cast <TAO_RT_Stub *> (r.stub ());
+  TAO_RT_Stub *rt_stub = dynamic_cast <TAO_RT_Stub *> (r.stub ());
+
+  if (!rt_stub)
+    throw CORBA::INTERNAL ();
 
   // Get the priority model policy.
   CORBA::Policy_var priority_model_policy =
@@ -183,7 +182,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
               (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
             }
           // Indicate error.
-          ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
+          throw ::CORBA::INV_POLICY ();
         }
 
       // No priority model policy (and no bands policy): all endpoints
@@ -197,77 +196,78 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
       TAO_Protocols_Hooks *protocol_hooks =
         r.stub ()->orb_core ()->get_protocols_hooks ();
 
-      CORBA::Short server_priority = 0;
-      CORBA::Boolean is_client_propagated = false;
-
-      // Check the priority model policy to see if it is client
-      // propagated.
-      protocol_hooks->get_selector_hook (priority_model_policy.in (),
-                                         is_client_propagated,
-                                         server_priority);
-
-      if (!is_client_propagated)
-        {
-          // Server declared: all endpoints are fair game.
-          all_endpoints_are_valid = 1;
-        }
-      // Client propagated.
-      else
+      if (protocol_hooks != 0)
         {
-          // Get client thread priority.
-          int status =
-            protocol_hooks->get_thread_CORBA_priority (
-              client_thread_priority  // side effect
-             );
-          if (status == -1)
-            {
-              ACE_THROW_RETURN (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                                        CORBA::COMPLETED_NO),
-                                0);
-            }
+          CORBA::Short server_priority = 0;
+          CORBA::Boolean is_client_propagated = false;
 
-          // If there are no bands.
-          if (bands_policy.ptr () == 0)
-            {
+          // Check the priority model policy to see if it is client
+          // propagated.
+          protocol_hooks->get_selector_hook (priority_model_policy.in (),
+                                             is_client_propagated,
+                                             server_priority);
 
-              // Match the priority of the client thread with the
-              // endpoint.
-              match_priority = 1;
+          if (!is_client_propagated)
+            {
+              // Server declared: all endpoints are fair game.
+              all_endpoints_are_valid = 1;
             }
-          // There are bands.
+          // Client propagated.
           else
             {
+              // Get client thread priority.
+              int status =
+                protocol_hooks->get_thread_CORBA_priority (
+                  client_thread_priority  // side effect
+                 );
+              if (status == -1)
+                {
+                  throw ::CORBA::DATA_CONVERSION (
+                    CORBA::OMGVMCID | 1,
+                    CORBA::COMPLETED_NO);
+                }
 
-              // Check which band range we fall in.
-              bool in_range = false;
-              protocol_hooks->get_selector_bands_policy_hook (
-                bands_policy.in (),
-                client_thread_priority,
-                min_priority,
-                max_priority,
-                in_range);
-
-              // If priority doesn't fall into any of the bands.
-              if (!in_range)
+              // If there are no bands.
+              if (bands_policy.ptr () == 0)
                 {
-                  if (r.inconsistent_policies ())
-                    {
 
-                      CORBA::PolicyList *p = r.inconsistent_policies ();
-                      p->length (2);
-                      (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
-                      (*p)[1u] =
-                        CORBA::Policy::_duplicate (
-                          priority_model_policy.in ());
+                  // Match the priority of the client thread with the
+                  // endpoint.
+                  match_priority = 1;
+                }
+              // There are bands.
+              else
+                {
+                  // Check which band range we fall in.
+                  bool in_range = false;
+                  protocol_hooks->get_selector_bands_policy_hook (
+                    bands_policy.in (),
+                    client_thread_priority,
+                    min_priority,
+                    max_priority,
+                    in_range);
+
+                  // If priority doesn't fall into any of the bands.
+                  if (!in_range)
+                    {
+                      if (r.inconsistent_policies ())
+                        {
+
+                          CORBA::PolicyList *p = r.inconsistent_policies ();
+                          p->length (2);
+                          (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
+                          (*p)[1u] =
+                            CORBA::Policy::_duplicate (
+                              priority_model_policy.in ());
+                        }
+
+                      // Indicate error.
+                      throw ::CORBA::INV_POLICY ();
                     }
 
-                  // Indicate error.
-                  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                                    0);
+                  // Match the priority of the band with the endpoint.
+                  match_bands = 1;
                 }
-
-              // Match the priority of the band with the endpoint.
-              match_bands = 1;
             }
         }
     }
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index e00d5d921ec..d0c7b4c22ff 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -4,6 +4,7 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/RTCORBA/RT_ORB.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID(RTCORBA,
@@ -18,7 +19,6 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void)
 
 void
 TAO_RT_Mutex::lock (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.acquire () != 0)
     throw ::CORBA::INTERNAL ();
@@ -26,16 +26,13 @@ TAO_RT_Mutex::lock (void)
 
 void
 TAO_RT_Mutex::unlock (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.release () != 0)
     throw ::CORBA::INTERNAL ();
 }
 
 CORBA::Boolean
-TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
-                        )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time)
 {
   int result;
 
@@ -67,7 +64,7 @@ TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
     return 0;
   else
     // Some really bad error.
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw ::CORBA::INTERNAL ();
 }
 
 const char *
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 89732b0008b..0b3d00bd600 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -58,12 +58,10 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
 public:
 
   /// Acquire the lock.
-  virtual void lock (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void lock (void);
 
   /// Release the lock.
-  virtual void unlock (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void unlock (void);
 
   /**
    * Acquire the lock, but only wait up to @a max_wait time.  Note
@@ -72,8 +70,7 @@ public:
    * using this operation in your program designs.
    */
   virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   );
 
   /// Returns the name of the mutex.
   virtual const char *name (void) const;
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 0f4131d8071..eae181f202b 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -9,6 +9,7 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 #include "ace/Sched_Params.h"
@@ -32,6 +33,9 @@ TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
   TAO_RT_Thread_Lane_Resources_Manager *rt_thread_lane_resources_manager =
     dynamic_cast <TAO_RT_Thread_Lane_Resources_Manager *> (thread_lane_resources_manager);
 
+  if (!rt_thread_lane_resources_manager)
+    throw CORBA::INTERNAL ();
+
   this->tp_manager_ =
     &rt_thread_lane_resources_manager->tp_manager ();
 }
@@ -42,40 +46,28 @@ TAO_RT_ORB::~TAO_RT_ORB (void)
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_mutex (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mutex_mgr_.create_mutex ();
 }
 
 void
-TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex)
 {
-  this->mutex_mgr_.destroy_mutex (mutex
-                                 );
+  this->mutex_mgr_.destroy_mutex (mutex);
 }
 
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_named_mutex (const char *name,
-                                CORBA::Boolean_out created_flag
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                CORBA::Boolean_out created_flag)
 {
-  return this->mutex_mgr_.create_named_mutex (name,
-                                              created_flag
-                                             );
+  return this->mutex_mgr_.create_named_mutex (name, created_flag);
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::open_named_mutex (const char *name
-                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
+TAO_RT_ORB::open_named_mutex (const char *name)
 {
-  return this->mutex_mgr_.open_named_mutex (name
-                                           );
+  return this->mutex_mgr_.open_named_mutex (name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -90,7 +82,6 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
 
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::create_mutex (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *mutex = 0;
   ACE_NEW_THROW_EX (mutex,
@@ -108,9 +99,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (void)
 // as also indicated by the comment below.
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex)
 {
   TAO_RT_Mutex *tao_mutex =
     dynamic_cast<TAO_RT_Mutex *> (mutex);
@@ -135,18 +124,14 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
 }
 #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
-                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr)
 {
 }
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
-                                                CORBA::Boolean_out created_flag
-                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                                CORBA::Boolean_out created_flag)
 {
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
   // The following should be atomic.
@@ -156,15 +141,14 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
                       CORBA::INTERNAL ());
 
   // Optimistic that we'll find it.
-  created_flag = 0;
+  created_flag = false;
 
   // If we find the mutex, simply return it.
   RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
+  if (this->map_.find (name, mutex) != 0)
     {
       // Oops, we didn't find it.
-      created_flag = 1;
+      created_flag = true;
 
       RTCORBA::Mutex_ptr tmp_mutex;
 
@@ -180,13 +164,10 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
       mutex = tmp_mutex;
 
       // Add it to the map.
-      int result =
-        this->map_.bind (name,
-                         mutex);
+      int const result = this->map_.bind (name, mutex);
 
       if (result != 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          RTCORBA::Mutex::_nil ());
+        throw ::CORBA::INTERNAL ();
     }
 
   // Return the one we found or created.
@@ -194,16 +175,12 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
 #else /* TAO_HAS_NAMED_RT_MUTEXES */
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (created_flag);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 #endif /* TAO_HAS_NAMED_RT_MUTEXES */
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
-                                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
+TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name)
 {
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
   // The following should be atomic.
@@ -214,17 +191,14 @@ TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
 
   // If we find the mutex, simply return it.
   RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
-    ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (),
-                      RTCORBA::Mutex::_nil ());
+  if (this->map_.find (name, mutex) != 0)
+    throw RTCORBA::RTORB::MutexNotFound ();
 
   // Return the one we found.
   return mutex._retn ();
 #else /* TAO_HAS_NAMED_RT_MUTEXES */
   ACE_UNUSED_ARG (name);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 #endif /* TAO_HAS_NAMED_RT_MUTEXES */
 }
 
@@ -238,7 +212,6 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Boolean no_delay,
                                             CORBA::Boolean enable_network_priority
                                             )
-  ACE_THROW_SPEC ((CORBA::SystemException ))
 {
   TAO_TCP_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -259,7 +232,6 @@ TAO_RT_ORB::create_unix_domain_protocol_properties (
                                                     CORBA::Long send_buffer_size,
                                                     CORBA::Long recv_buffer_size
                                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UnixDomain_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -281,9 +253,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
                                                       CORBA::Boolean no_delay,
                                                       CORBA::Long preallocate_buffer_size,
                                                       const char *mmap_filename,
-                                                      const char *mmap_lockname
-                                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                                      const char *mmap_lockname)
 {
   TAO_SharedMemory_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -305,7 +275,6 @@ RTCORBA::UserDatagramProtocolProperties_ptr
 TAO_RT_ORB::create_user_datagram_protocol_properties (
                                                       CORBA::Boolean enable_network_priority
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UserDatagram_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -326,7 +295,6 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                        CORBA::Boolean no_delay,
                                                        CORBA::Boolean enable_network_priority
                                                        )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_StreamControl_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -352,7 +320,6 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                CORBA::ULong max_buffered_requests,
                                CORBA::ULong max_request_buffer_size
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool (stacksize,
                                                static_threads,
@@ -373,7 +340,6 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                           CORBA::ULong max_buffered_requests,
                                           CORBA::ULong max_request_buffer_size
                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool_with_lanes (stacksize,
                                                           lanes,
@@ -386,20 +352,15 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
 }
 
 void
-TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::InvalidThreadpool))
+TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
 {
-  this->tp_manager_->destroy_threadpool (threadpool
-                                        );
+  this->tp_manager_->destroy_threadpool (threadpool);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
                                           RTCORBA::Priority server_priority
                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -411,9 +372,7 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
-TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool)
 {
   TAO_ThreadpoolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -428,7 +387,6 @@ RTCORBA::PriorityBandedConnectionPolicy_ptr
 TAO_RT_ORB::create_priority_banded_connection_policy (const
                                                       RTCORBA::PriorityBands & priority_bands
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -441,7 +399,6 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
 
 RTCORBA::PrivateConnectionPolicy_ptr
 TAO_RT_ORB::create_private_connection_policy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -455,7 +412,6 @@ TAO_RT_ORB::create_private_connection_policy (void)
 RTCORBA::ServerProtocolPolicy_ptr
 TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
                                            )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -469,7 +425,6 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
 RTCORBA::ClientProtocolPolicy_ptr
 TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
                                            )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -514,18 +469,14 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
 
 #if defined (linux)
 
-  int sched_policy =
-    orb->orb_core ()->orb_params ()->ace_sched_policy ();
+  int const sched_policy = orb->orb_core ()->orb_params ()->ace_sched_policy ();
 
-  int minimum_priority =
-    ACE_Sched_Params::priority_min (sched_policy);
+  int const minimum_priority = ACE_Sched_Params::priority_min (sched_policy);
 
   ACE_hthread_t thread_id;
   ACE_Thread::self (thread_id);
 
-  return ACE_Thread::setprio (thread_id,
-                              minimum_priority,
-                              sched_policy);
+  return ACE_Thread::setprio (thread_id, minimum_priority, sched_policy);
 
 #else /* linux */
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 110a44ab880..03c51d802dd 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -60,23 +60,14 @@ public:
   /// Destructor.
   ~TAO_Named_RT_Mutex_Manager (void);
 
-  RTCORBA::Mutex_ptr create_mutex (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  RTCORBA::Mutex_ptr create_mutex (void);
 
-  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
 
   RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                         CORBA::Boolean_out created_flag
-                                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Boolean_out created_flag);
 
-  RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                       )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::MutexNotFound
-                     ));
+  RTCORBA::Mutex_ptr open_named_mutex (const char * name);
 
 private:
 
@@ -117,17 +108,14 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTCORBA::Mutex_ptr create_mutex (void);
 
   /**
    * Destroy a mutex.  Currently this is a no-op since RTCORBA::Mutex
    * instances are destroyed as soon as their reference counts go to
    * 0.
    */
-  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                              )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
 
   /**
    * Create a mutex and assign a name to it.  If the
@@ -135,68 +123,47 @@ public:
    * is set to 0.
    */
   virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                                 CORBA::Boolean_out created_flag
-                                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                 CORBA::Boolean_out created_flag);
 
   /// Retrieve a previously created mutex.
-  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                                 )
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RTCORBA::RTORB::MutexNotFound
-                      ));
+  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name);
 
   /**
    * Create and return a TCPProtocolProperties instance with the specified
    * parameters.
    */
   RTCORBA::TCPProtocolProperties_ptr
-  create_tcp_protocol_properties (
-                                  CORBA::Long send_buffer_size,
+  create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                   CORBA::Long recv_buffer_size,
                                   CORBA::Boolean keep_alive,
                                   CORBA::Boolean dont_route,
                                   CORBA::Boolean no_delay,
-                                  CORBA::Boolean enable_network_priority
-                                  )
-    ACE_THROW_SPEC ((CORBA::SystemException ));
+                                  CORBA::Boolean enable_network_priority);
 
   RTCORBA::UnixDomainProtocolProperties_ptr
-  create_unix_domain_protocol_properties (
-                                          CORBA::Long send_buffer_size,
-                                          CORBA::Long recv_buffer_size
-                                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_unix_domain_protocol_properties (CORBA::Long send_buffer_size,
+                                          CORBA::Long recv_buffer_size);
 
   RTCORBA::SharedMemoryProtocolProperties_ptr
-  create_shared_memory_protocol_properties (
-                                            CORBA::Long send_buffer_size,
+  create_shared_memory_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Long recv_buffer_size,
                                             CORBA::Boolean keep_alive,
                                             CORBA::Boolean dont_route,
                                             CORBA::Boolean no_delay,
                                             CORBA::Long preallocate_buffer_size,
                                             const char *mmap_filename,
-                                            const char *mmap_lockname
-                                            )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                            const char *mmap_lockname);
 
   RTCORBA::UserDatagramProtocolProperties_ptr
-  create_user_datagram_protocol_properties (
-                                            CORBA::Boolean enable_network_priority
-                                            )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_user_datagram_protocol_properties (CORBA::Boolean enable_network_priority);
 
   RTCORBA::StreamControlProtocolProperties_ptr
-  create_stream_control_protocol_properties (
-                                             CORBA::Long send_buffer_size,
+  create_stream_control_protocol_properties (CORBA::Long send_buffer_size,
                                              CORBA::Long recv_buffer_size,
                                              CORBA::Boolean keep_alive,
                                              CORBA::Boolean dont_route,
                                              CORBA::Boolean no_delay,
-                                             CORBA::Boolean enable_network_priority
-                                             )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             CORBA::Boolean enable_network_priority);
 
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
   virtual RTCORBA::ThreadpoolId
@@ -206,9 +173,7 @@ public:
                      RTCORBA::Priority default_priority,
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size
-                     )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::ULong max_request_buffer_size);
 
   /**
    * Create a threadpool and separate it into subsets based on
@@ -220,29 +185,19 @@ public:
                                 CORBA::Boolean allow_borrowing,
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::ULong max_request_buffer_size);
 
   /// Free the resources associated with the specified threadpool.
-  virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::InvalidThreadpool));
+  virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool);
 
   /// Create a priority model policy for use when configuring a POA.
   virtual RTCORBA::PriorityModelPolicy_ptr
-  create_priority_model_policy (
-                                RTCORBA::PriorityModel priority_model,
-                                RTCORBA::Priority server_priority
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_priority_model_policy (RTCORBA::PriorityModel priority_model,
+                                RTCORBA::Priority server_priority);
 
   /// Create a ThreadpoolPolicy instance for POA creation
   virtual RTCORBA::ThreadpoolPolicy_ptr
-  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                            )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool);
 
   /**
    * Create a PriorityBandedConnectionPolicy instance
@@ -250,9 +205,7 @@ public:
    */
   virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
   create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
-                                            priority_bands
-                                            )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                            priority_bands);
 
   /**
    * Create a PrivateConnectionPolicy instance to use on client
@@ -260,26 +213,21 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_private_connection_policy (void);
 
   /**
    * Create a ServerProtocolPolicy instance to select and configure
    * communication protocols on the server side.
    */
   virtual RTCORBA::ServerProtocolPolicy_ptr
-  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols);
 
   /**
    * Create a ClientProtocolPolicy instance to select and configure
    * communication protocols on the client side.
    */
   virtual RTCORBA::ClientProtocolPolicy_ptr
-  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols);
 
   /// Reference to our creating ORB Core.
   TAO_ORB_Core *orb_core (void) const;
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 0722dc4e0a8..90d7614d6d8 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -63,7 +63,6 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
 
 void
 TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
   // Register all of the RT related services.
@@ -121,9 +120,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
 
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
-  info->register_initial_reference ("PriorityMappingManager",
-                                    manager
-                                   );
+  info->register_initial_reference ("PriorityMappingManager", manager);
 
   // Create the initial priority mapping instance.
   TAO_Network_Priority_Mapping *npm = 0;
@@ -156,8 +153,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     network_manager;
 
   info->register_initial_reference ("NetworkPriorityMappingManager",
-                                    network_manager
-                                   );
+                                    network_manager);
 
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
@@ -200,9 +196,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
                       CORBA::COMPLETED_NO));
   CORBA::Object_var safe_rt_current = current;
 
-  info->register_initial_reference (TAO_OBJID_RTCURRENT,
-                                    current
-                                   );
+  info->register_initial_reference (TAO_OBJID_RTCURRENT, current);
 
   tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
   tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_);
@@ -211,7 +205,6 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
 
 void
 TAO_RT_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info);
 }
@@ -259,7 +252,7 @@ TAO_RT_ORBInitializer::register_policy_factories (
         {
           info->register_policy_factory (*i, this->policy_factory_.in ());
         }
-      catch ( ::CORBA::BAD_INV_ORDER& ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -272,11 +265,6 @@ TAO_RT_ORBInitializer::register_policy_factories (
             }
           throw;
         }
-      catch ( ::CORBA::Exception&)
-        {
-          // Rethrow any other exceptions...
-          throw;
-        }
     }
 }
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 905a4ed1fa7..adc676ef0de 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -65,20 +65,14 @@ public:
                          long scope_policy,
                          ACE_Time_Value const &dynamic_thread_idle_timeout);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
   /// Register RTCORBA policy factories.
-  void register_policy_factories (
-                                  PortableInterceptor::ORBInitInfo_ptr info
-                                 );
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   /// Instance of the RTCorba policy factory.
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 657243a34fb..12a87c1646e 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -174,10 +174,9 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer;
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception (
         "Unexpected exception caught while "
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index a3e2d4cd375..4184730effb 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -42,8 +42,7 @@ public:
   virtual ~TAO_RT_ORB_Loader (void);
 
   /// Initialize the RT ORB loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
+  virtual int init (int argc, ACE_TCHAR* []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 3b7bfc73eb8..5257e6eaa82 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -17,8 +17,6 @@ CORBA::Policy_ptr
 TAO_RT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
     return TAO_PriorityModelPolicy::create (value);
@@ -38,18 +36,13 @@ TAO_RT_PolicyFactory::create_policy (
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
     return TAO_PriorityBandedConnectionPolicy::create (value);
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 CORBA::Policy_ptr
-TAO_RT_PolicyFactory::_create_policy (
-    CORBA::PolicyType type
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
+TAO_RT_PolicyFactory::_create_policy (CORBA::PolicyType type)
 {
-  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
+  CORBA::Policy_ptr policy = CORBA::Policy_ptr ();
 
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
     {
@@ -90,8 +83,7 @@ TAO_RT_PolicyFactory::_create_policy (
       return policy;
     }
 
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index d51b6ec34c8..99ca81ff1a6 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -48,14 +48,10 @@ public:
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
-                                   )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                   );
 
   CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                    );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 8fc4e57f21f..52fb0b3875b 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -9,6 +9,7 @@
 #include "tao/debug.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -55,16 +56,14 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::create (const CORBA::Any &
-                                 )
+TAO_PriorityModelPolicy::create (const CORBA::Any &)
 {
   /*
    * @@ The following code should be changed once the OMG spec has
    * been fixed such that a RTCORBA::PriorityModelPolicy can be
    * created by using the ORB::create_policy interface.
    */
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                    CORBA::Policy::_nil ());
+  throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 }
 
 RTCORBA::PriorityModel
@@ -75,28 +74,24 @@ TAO_PriorityModelPolicy::get_priority_model (void)
 
 RTCORBA::PriorityModel
 TAO_PriorityModelPolicy::priority_model (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
 TAO_PriorityModelPolicy::server_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
 TAO_PriorityModelPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_PriorityModelPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -109,7 +104,6 @@ TAO_PriorityModelPolicy::copy (void)
 
 void
 TAO_PriorityModelPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -179,8 +173,7 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val
 {
   RTCORBA::ThreadpoolId value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_ThreadpoolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -193,21 +186,18 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val
 
 RTCORBA::ThreadpoolId
 TAO_ThreadpoolPolicy::threadpool (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 CORBA::PolicyType
 TAO_ThreadpoolPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_ThreadpoolPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -220,7 +210,6 @@ TAO_ThreadpoolPolicy::copy (void)
 
 void
 TAO_ThreadpoolPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -262,8 +251,7 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::create (const CORBA::Any &
-                                     )
+TAO_PrivateConnectionPolicy::create (const CORBA::Any &)
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -276,14 +264,12 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any &
 
 CORBA::PolicyType
 TAO_PrivateConnectionPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_PrivateConnectionPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -296,7 +282,6 @@ TAO_PrivateConnectionPolicy::copy (void)
 
 void
 TAO_PrivateConnectionPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -350,8 +335,7 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
 {
   RTCORBA::PriorityBands *value = 0;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -364,7 +348,6 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
 
 RTCORBA::PriorityBands *
 TAO_PriorityBandedConnectionPolicy::priority_bands (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::PriorityBands *tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -377,14 +360,12 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (void)
 
 CORBA::PolicyType
 TAO_PriorityBandedConnectionPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_PriorityBandedConnectionPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -397,7 +378,6 @@ TAO_PriorityBandedConnectionPolicy::copy (void)
 
 void
 TAO_PriorityBandedConnectionPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -464,8 +444,7 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val
 {
   RTCORBA::ProtocolList *value = 0;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_ServerProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -478,7 +457,6 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val
 
 RTCORBA::ProtocolList *
 TAO_ServerProtocolPolicy::protocols (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -491,14 +469,12 @@ TAO_ServerProtocolPolicy::protocols (void)
 
 CORBA::PolicyType
 TAO_ServerProtocolPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_ServerProtocolPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -511,7 +487,6 @@ TAO_ServerProtocolPolicy::copy (void)
 
 void
 TAO_ServerProtocolPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -571,8 +546,7 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val
 {
   RTCORBA::ProtocolList *value = 0;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_ClientProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -585,7 +559,6 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val
 
 RTCORBA::ProtocolList *
 TAO_ClientProtocolPolicy::protocols (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -598,14 +571,12 @@ TAO_ClientProtocolPolicy::protocols (void)
 
 CORBA::PolicyType
 TAO_ClientProtocolPolicy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 TAO_ClientProtocolPolicy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -618,7 +589,6 @@ TAO_ClientProtocolPolicy::copy (void)
 
 void
 TAO_ClientProtocolPolicy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -719,7 +689,6 @@ TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
 
 CORBA::Long
 TAO_TCP_Protocol_Properties::send_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
@@ -727,14 +696,12 @@ TAO_TCP_Protocol_Properties::send_buffer_size (void)
 void
 TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
 TAO_TCP_Protocol_Properties::recv_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
@@ -742,14 +709,12 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (void)
 void
 TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
 TAO_TCP_Protocol_Properties::keep_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
 }
@@ -757,14 +722,12 @@ TAO_TCP_Protocol_Properties::keep_alive (void)
 void
 TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
 TAO_TCP_Protocol_Properties::dont_route (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
 }
@@ -772,13 +735,11 @@ TAO_TCP_Protocol_Properties::dont_route (void)
 void
 TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route
                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
 CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
 }
@@ -786,14 +747,12 @@ CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
 void
 TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay
                                        )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Boolean
 TAO_TCP_Protocol_Properties::enable_network_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
 }
@@ -801,7 +760,6 @@ TAO_TCP_Protocol_Properties::enable_network_priority (void)
 void
 TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
 }
@@ -850,7 +808,6 @@ TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
 
 CORBA::Long
 TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
@@ -858,14 +815,12 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
 void
 TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
 TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
@@ -873,7 +828,6 @@ TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
 void
 TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
@@ -920,7 +874,6 @@ TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (voi
 
 CORBA::Long
 TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
@@ -928,14 +881,12 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
 void
 TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
                                                         )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
 TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
@@ -943,14 +894,12 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
 void
 TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
                                                         )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
 TAO_SharedMemory_Protocol_Properties::keep_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
 }
@@ -958,14 +907,12 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (void)
 void
 TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
                                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
 TAO_SharedMemory_Protocol_Properties::dont_route (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
 }
@@ -973,14 +920,12 @@ TAO_SharedMemory_Protocol_Properties::dont_route (void)
 void
 TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route
                                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
 CORBA::Boolean
 TAO_SharedMemory_Protocol_Properties::no_delay (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
 }
@@ -988,14 +933,12 @@ TAO_SharedMemory_Protocol_Properties::no_delay (void)
 void
 TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay
                                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Long
 TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->preallocate_buffer_size_;
 }
@@ -1003,14 +946,12 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
 void
 TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
                                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->preallocate_buffer_size_ = preallocate_buffer_size;
 }
 
 char *
 TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_filename_.rep ();
 }
@@ -1018,14 +959,12 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
 void
 TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename
                                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_filename_.set (mmap_filename);
 }
 
 char *
 TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_lockname_.rep ();
 }
@@ -1033,7 +972,6 @@ TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
 void
 TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname
                                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_lockname_.set (mmap_lockname);
 }
@@ -1091,7 +1029,6 @@ TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (voi
 
 CORBA::Boolean
 TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
 }
@@ -1099,7 +1036,6 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
 void
 TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
                                                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
 }
@@ -1139,7 +1075,6 @@ TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (v
 
 CORBA::Long
 TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
@@ -1147,14 +1082,12 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
 void
 TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
                                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
 TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
@@ -1162,14 +1095,12 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
 void
 TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
                                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
 TAO_StreamControl_Protocol_Properties::keep_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
 }
@@ -1177,14 +1108,12 @@ TAO_StreamControl_Protocol_Properties::keep_alive (void)
 void
 TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
                                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
 TAO_StreamControl_Protocol_Properties::dont_route (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
 }
@@ -1192,13 +1121,11 @@ TAO_StreamControl_Protocol_Properties::dont_route (void)
 void
 TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route
                                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
 CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
 }
@@ -1206,14 +1133,12 @@ CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
 void
 TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay
                                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Boolean
 TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
 }
@@ -1221,7 +1146,6 @@ TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
 void
 TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
                                                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
 }
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 90af34a3ff6..6893cb5fe6a 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -68,20 +68,15 @@ public:
    */
   RTCORBA::PriorityModel get_priority_model (void);
 
-  RTCORBA::PriorityModel priority_model (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  RTCORBA::PriorityModel priority_model (void);
 
-  RTCORBA::Priority server_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  RTCORBA::Priority server_priority (void);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   /// This method writes a CDR representation of the object state.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -97,8 +92,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -138,17 +132,13 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  RTCORBA::ThreadpoolId threadpool (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  RTCORBA::ThreadpoolId threadpool (void);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -158,8 +148,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -195,14 +184,11 @@ public:
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -212,8 +198,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -254,17 +239,13 @@ public:
    */
   RTCORBA::PriorityBands &priority_bands_rep (void);
 
-  RTCORBA::PriorityBands *priority_bands (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  RTCORBA::PriorityBands *priority_bands (void);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   /// This method writes a CDR representation of the current object.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -280,8 +261,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -329,17 +309,13 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   RTCORBA::ProtocolList *protocols
-  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  (void);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type (void) const;
@@ -349,8 +325,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -393,17 +368,13 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   RTCORBA::ProtocolList *protocols
-  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  (void);
 
-  CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::PolicyType policy_type (void);
 
-  CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Policy_ptr copy (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
   // = CDR Encoder/Decoder.
 
@@ -421,8 +392,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                  );
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -463,47 +433,29 @@ public:
                                CORBA::Boolean no_delay,
                                CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long send_buffer_size (void);
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long recv_buffer_size (void);
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean keep_alive (void);
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean dont_route (void);
 
-  void dont_route (CORBA::Boolean dont_route
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean no_delay (void);
 
-  void no_delay (CORBA::Boolean no_delay
-                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean enable_network_priority (void);
 
-  void enable_network_priority (CORBA::Boolean enable
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void enable_network_priority (CORBA::Boolean enable);
 
   /// This method writes a CDR representation of TCPProtocolProperties.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -548,19 +500,13 @@ public:
   TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
                                       CORBA::Long recv_buffer_size);
 
-  CORBA::Long send_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long send_buffer_size (void);
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long recv_buffer_size (void);
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void recv_buffer_size (CORBA::Long recv_buffer_size);
 
   /**
    * This method writes the CDR encapsulation of an instance of
@@ -621,64 +567,40 @@ public:
 
   // = IDL interface methods.
 
-  CORBA::Long send_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long send_buffer_size (void);
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long recv_buffer_size (void);
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean keep_alive (void);
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean dont_route (void);
 
-  void dont_route (CORBA::Boolean dont_route
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean no_delay (void);
 
   void no_delay (CORBA::Boolean no_delay
-                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                 );
 
-  CORBA::Boolean enable_network_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean enable_network_priority (void);
 
-  CORBA::Long preallocate_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long preallocate_buffer_size (void);
 
-  void preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void preallocate_buffer_size (CORBA::Long preallocate_buffer_size);
 
-  char *mmap_filename (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char *mmap_filename (void);
 
-  void mmap_filename (const char *mmap_filename
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void mmap_filename (const char *mmap_filename);
 
-  char *mmap_lockname (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char *mmap_lockname (void);
 
-  void mmap_lockname (const char *mmap_lockname
-                      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void mmap_lockname (const char *mmap_lockname);
 
   /**
    * This method writes the CDR encapsulation of an instance of
@@ -734,12 +656,9 @@ public:
   /// Constructor.
   TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority);
 
-  CORBA::Boolean enable_network_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean enable_network_priority (void);
 
-  void enable_network_priority (CORBA::Boolean enable
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void enable_network_priority (CORBA::Boolean enable);
 
   /// This method writes a CDR representation of UserDatagramProtocolProperties.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -781,47 +700,29 @@ public:
                                          CORBA::Boolean no_delay,
                                          CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long send_buffer_size (void);
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long recv_buffer_size (void);
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean keep_alive (void);
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean dont_route (void);
 
-  void dont_route (CORBA::Boolean dont_route
-                   )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean no_delay (void);
 
-  void no_delay (CORBA::Boolean no_delay
-                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean enable_network_priority (void);
 
-  void enable_network_priority (CORBA::Boolean enable
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void enable_network_priority (CORBA::Boolean enable);
 
   /// This method writes a CDR representation of StreamControlProtocolProperties.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 92fb8d082eb..383b3da11b9 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -18,6 +18,7 @@
 #include "tao/Policy_Set.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -70,8 +71,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core)
 
 RTCORBA::ProtocolProperties_ptr
 TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
-                                                    CORBA::Policy_ptr policy
-                                                    )
+                                                    CORBA::Policy_ptr policy)
 {
   if (CORBA::is_nil (policy))
     return 0;
@@ -176,8 +176,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie
                                                      )
 {
   RTCORBA::TCPProtocolProperties_var protocol_properties =
-    RTCORBA::TCPProtocolProperties::_narrow (from
-                                            );
+    RTCORBA::TCPProtocolProperties::_narrow (from);
 
   to.send_buffer_size_ = protocol_properties->send_buffer_size ();
   to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
@@ -188,8 +187,7 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie
 }
 
 void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
-                                                                 )
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
     this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP);
@@ -386,8 +384,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (
 
 CORBA::Boolean
 TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag,
-                                                     TAO_Stub *stub
-                                                     )
+                                                     TAO_Stub *stub)
 {
   if (protocol_tag != IOP::TAG_INTERNET_IOP &&
       protocol_tag != TAO_TAG_DIOP_PROFILE &&
@@ -397,14 +394,12 @@ TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag
   RTCORBA::ProtocolProperties_var protocol_properties =
     this->client_protocol_properties_at_object_level (protocol_tag, stub);
 
-  return this->set_network_priority (protocol_tag,
-                                     protocol_properties.in ());
+  return this->set_network_priority (protocol_tag, protocol_properties.in ());
 }
 
 CORBA::Boolean
 TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag,
-                                                     CORBA::Policy *policy
-                                                     )
+                                                     CORBA::Policy *policy)
 {
   if (protocol_tag != IOP::TAG_INTERNET_IOP &&
       protocol_tag != TAO_TAG_DIOP_PROFILE &&
@@ -434,8 +429,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
       RTCORBA::NetworkPriorityMapping *pm =
         this->network_mapping_manager_->mapping ();
 
-      CORBA::Short const priority =
-        this->current_->the_priority ();
+      CORBA::Short const priority = this->current_->the_priority ();
 
       if (pm->to_network (priority, codepoint) == 0)
         {
@@ -450,7 +444,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
           return -1;
         }
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
@@ -478,6 +472,9 @@ TAO_RT_Protocols_Hooks::rt_service_context (
       TAO_RT_Stub *rt_stub =
         dynamic_cast<TAO_RT_Stub *> (stub);
 
+      if (!rt_stub)
+        throw CORBA::INTERNAL ();
+
       CORBA::Policy_var priority_model_policy =
         rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
@@ -493,8 +490,7 @@ TAO_RT_Protocols_Hooks::rt_service_context (
 
           this->add_rt_service_context_hook (service_context,
                                              priority_model_policy.in (),
-                                             client_priority
-                                            );
+                                             client_priority);
         }
       else
         {
@@ -594,14 +590,10 @@ int
 TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority)
 {
   CORBA::Short native_priority = 0;
-  int const result =
-    this->get_thread_CORBA_and_native_priority (priority,
-                                                native_priority
-                                               );
 
-  if (result == -1)
+  if (this->get_thread_CORBA_and_native_priority (priority, native_priority) == -1)
     {
-      return result;
+      return -1;
     }
 
   return 0;
@@ -635,12 +627,9 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
     CORBA::Short &priority,
     CORBA::Short &native_priority)
 {
-  int const result =
-    this->get_thread_native_priority (native_priority);
-
-  if (result == -1)
+  if (this->get_thread_native_priority (native_priority) == -1)
     {
-      return result;
+      return -1;
     }
 
   TAO_Priority_Mapping *priority_mapping =
@@ -659,8 +648,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
 }
 
 int
-TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
-                                                   )
+TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority)
 {
   TAO_Priority_Mapping *priority_mapping =
     this->mapping_manager_.in ()->mapping ();
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 1e69053a4cf..ee410570711 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -8,7 +8,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "tao/Policy_Manager.h"
-
+#include "tao/SystemException.h"
 
 ACE_RCSID (RTCORBA,
            RT_Stub,
@@ -173,7 +173,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
           if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
               type == RTCORBA::THREADPOOL_POLICY_TYPE ||
               type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
-            ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0);
+            throw ::CORBA::NO_PERMISSION ();
         }
     }
 
@@ -224,7 +224,7 @@ TAO_RT_Stub::effective_priority_banded_connection (void)
 
   // Both override and exposed have been set and neither has empty
   // priority bands.  This is illegal (ptc/99-05-03, sec. 4.12.1).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
+  throw ::CORBA::INV_POLICY ();
 }
 
 CORBA::Policy *
@@ -270,7 +270,7 @@ TAO_RT_Stub::effective_client_protocol (void)
 
   // Both override and exposed have been set and neither has empty
   // protocols.  This is illegal (ptc/99-05-03, sec. 4.15.4).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
+  throw ::CORBA::INV_POLICY ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index 4a9fdbe8d87..cdc16fd9a81 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -63,15 +63,12 @@ public:
    * policy type.  Returns the effective override for all other policy
    * types.
    */
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                               );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type);
 
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                      );
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                  CORBA::SetOverrideType set_add
-                                 );
+                                  CORBA::SetOverrideType set_add);
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index d1bac507e1b..109783a88af 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -53,8 +53,7 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                );
+                                 TAO_ORB_Core *orb_core);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 31bfb251a0e..3035e8c84c4 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -50,15 +50,13 @@ TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
 
   TAO_EndpointSet endpoint_set;
 
-  params->get_endpoint_set (TAO_DEFAULT_LANE,
-                            endpoint_set);
+  params->get_endpoint_set (TAO_DEFAULT_LANE, endpoint_set);
 
   bool ignore_address = false;
 
-  int result =
+  int const result =
     this->default_lane_resources_->open_acceptor_registry (endpoint_set,
-                                                           ignore_address
-                                                          );
+                                                           ignore_address);
 
   return result;
 }
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index 79c86d3d785..886314dd2f0 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -63,7 +63,7 @@ TAO_RT_Transport_Descriptor::duplicate (void)
       // Note that we cannot use <insert> because that will reverse the stack.
       if (new_descriptor->property_list_ == 0)
         new_descriptor->property_list_ = new_property;
-      else
+      else if (current_new_property != 0)
         current_new_property->next_ = new_property;
 
       current_new_property = new_property;
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index ef9404012f7..5a37a0282e9 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -60,7 +60,7 @@ TAO_Thread_Pool_Threads::svc (void)
       // Do the work
       this->run (orb_core);
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       // No point propagating this exception.  Print it out.
       ACE_ERROR ((LM_ERROR,
@@ -241,20 +241,17 @@ TAO_Thread_Lane::validate_and_map_priority (void)
 
   // Get the priority mapping manager.
   CORBA::Object_var obj =
-    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                    );
+    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER);
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                          );
+    TAO_Priority_Mapping_Manager::_narrow (obj.in ());
 
   RTCORBA::PriorityMapping *pm =
     mapping_manager.in ()->mapping ();
 
   // Map CORBA priority to native priority.
-  CORBA::Boolean result =
-    pm->to_native (this->lane_priority_,
-                   this->native_priority_);
+  CORBA::Boolean const result =
+    pm->to_native (this->lane_priority_, this->native_priority_);
 
   if (!result)
     throw ::CORBA::DATA_CONVERSION ();
@@ -718,7 +715,6 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             CORBA::ULong max_request_buffer_size,
                                             ACE_Time_Value const &dynamic_thread_idle_timeout
                                             )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
 
@@ -742,7 +738,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                        CORBA::ULong max_request_buffer_size,
                                                        ACE_Time_Value const &dynamic_thread_idle_timeout
                                                        )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
 
@@ -752,15 +747,11 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                allow_request_buffering,
                                                max_buffered_requests,
                                                max_request_buffer_size,
-                                               dynamic_thread_idle_timeout
-                                              );
+                                               dynamic_thread_idle_timeout);
 }
 
 void
-TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                             )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::InvalidThreadpool))
+TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
 {
   TAO_Thread_Pool *tao_thread_pool = 0;
 
@@ -808,7 +799,6 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                               CORBA::ULong max_request_buffer_size,
                                               ACE_Time_Value const &dynamic_thread_idle_timeout
                                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
   TAO_Thread_Pool *thread_pool = 0;
@@ -840,7 +830,6 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                                          CORBA::ULong max_request_buffer_size,
                                                          ACE_Time_Value const &dynamic_thread_idle_timeout
                                                          )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
   TAO_Thread_Pool *thread_pool = 0;
@@ -863,9 +852,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
 }
 
 RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool)
 {
   // Make sure of safe deletion in case of errors.
   auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
@@ -883,13 +870,11 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
       // Finalize thread pool related resources.
       thread_pool->finalize ();
 
-      ACE_THROW_RETURN (
-        CORBA::INTERNAL (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE,
-            errno),
-          CORBA::COMPLETED_NO),
-        result);
+      throw ::CORBA::INTERNAL (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE,
+          errno),
+        CORBA::COMPLETED_NO);
     }
 
   // Bind thread to internal table.
@@ -899,8 +884,7 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
 
   // Throw exceptin in case of errors.
   if (result != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      result);
+    throw ::CORBA::INTERNAL ();
 
   //
   // Success.
@@ -919,9 +903,7 @@ TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id )
   TAO_THREAD_POOL_MANAGER_GUARD;
 
   TAO_Thread_Pool *thread_pool = 0;
-  int result =
-    thread_pools_.find (thread_pool_id,
-                        thread_pool);
+  int const result = thread_pools_.find (thread_pool_id, thread_pool);
 
   ACE_UNUSED_ARG (result);
 
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 0514e9b6469..21009c2d2a4 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -135,8 +135,7 @@ public:
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
                    CORBA::ULong dynamic_threads,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                  );
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Destructor.
   ~TAO_Thread_Lane (void);
@@ -269,8 +268,7 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                  );
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Constructor (for pools with lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -281,8 +279,7 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                  );
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
@@ -386,9 +383,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size,
-                     ACE_Time_Value const &dynamic_thread_idle_timeout
-                     )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Create a threadpool with lanes.
   RTCORBA::ThreadpoolId
@@ -399,14 +394,11 @@ public:
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size,
                                 ACE_Time_Value const &dynamic_thread_idle_timeout
-                                )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                );
 
   /// Destroy a threadpool.
   void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::InvalidThreadpool));
+                           );
 
   TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id);
 
@@ -433,9 +425,7 @@ private:
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
                        CORBA::ULong max_request_buffer_size,
-                       ACE_Time_Value const &dynamic_thread_idle_timeout
-                       )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   RTCORBA::ThreadpoolId
   create_threadpool_with_lanes_i (CORBA::ULong stacksize,
@@ -445,13 +435,10 @@ private:
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                  );
 
   RTCORBA::ThreadpoolId
-  create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                            )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  create_threadpool_helper (TAO_Thread_Pool *thread_pool);
 
   // @}
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index bb1ea26cbdb..0a1a167af7a 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// =================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    RTPortableServer.cpp
-//
-// = AUTHOR
-//    Frank Hunleth <fhunleth@cs.wustl.edu>
-//
-// =================================================================
+//=============================================================================
+/**
+ *  @file    RTPortableServer.cpp
+ *
+ *  $Id$
+ *
+ *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index 53444f8e1b4..aaa8a9ea4ee 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -52,9 +52,7 @@ int
 TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
 {
   // Encode endpoints.
-  for (CORBA::ULong i = 0;
-       i < mprofile.profile_count ();
-       ++i)
+  for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i)
     {
       TAO_Profile *profile = mprofile.get_profile (i);
       if (profile->encode_endpoints () == -1)
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index e49aaefad0c..f11b3cd3c52 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -28,15 +28,13 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const
     return false;
 
   // Get the orb core.
-  TAO_ORB_Core *orb_core =
-    object->_stubobj ()->servant_orb_var ()->orb_core ();
+  TAO_ORB_Core *orb_core = object->_stubobj ()->servant_orb_var ()->orb_core ();
 
   // Lookup the target POA.  Note that Object Adapter lock is held
   // until <servant_upcall> dies.
   TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core);
   TAO_Root_POA *poa =
-    servant_upcall.lookup_POA (object->_stubobj ()->object_key ()
-                              );
+    servant_upcall.lookup_POA (object->_stubobj ()->object_key ());
 
   // Get the thread pool associated with this POA.
   TAO_Thread_Pool *target_thread_pool =
@@ -95,11 +93,10 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const
   CORBA::Short target_priority;
 
   if (-1 == poa->find_servant_priority (servant_upcall.system_id_,
-                                        target_priority
-                                       ))
+                                        target_priority))
   {
     return false;
-  };
+  }
 
   // If it matches the current thread's priority, then we are
   // collocated.  Otherwise we are not.
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index 4dc295d06aa..06f592d5cc9 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -23,8 +23,7 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   if (!orb_core->orb_params ()->disable_rt_collocation_resolver ())
     {
       // Set the name of the collocation resolver to be RT_Collocation_Resolver.
-      TAO_ORB_Core::set_collocation_resolver (
-          "RT_Collocation_Resolver");
+      TAO_ORB_Core::set_collocation_resolver ("RT_Collocation_Resolver");
       ACE_Service_Config::process_directive (
           ace_svc_desc_TAO_RT_Collocation_Resolver);
     }
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 32d8f6856d7..1a79cf2b377 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -9,7 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/Environment.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
 #include "tao/Policy_Manager.h"
@@ -53,14 +52,11 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
                      lock,
                      thread_lock,
                      orb_core,
-                     object_adapter
-                    ),
+                     object_adapter),
   thread_pool_ (0)
 {
-
   // Parse the RT policies and update our policy cache.
-  this->parse_rt_policies (this->policies ()
-                          );
+  this->parse_rt_policies (this->policies ());
 }
 
 TAO_RT_POA::~TAO_RT_POA (void)
@@ -75,8 +71,7 @@ TAO_RT_POA::new_POA (const String &name,
                      ACE_Lock &lock,
                      TAO_SYNCH_MUTEX &thread_lock,
                      TAO_ORB_Core &orb_core,
-                     TAO_Object_Adapter *object_adapter
-                     )
+                     TAO_Object_Adapter *object_adapter)
 {
   TAO_RT_POA *poa = 0;
 
@@ -96,17 +91,14 @@ TAO_RT_POA::new_POA (const String &name,
 }
 
 void
-TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
-                               )
+TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies)
 {
   {
     CORBA::Policy_var policy =
-      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                 );
+      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
     RTCORBA::PriorityModelPolicy_var priority_model =
-      RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                            );
+      RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
     if (!CORBA::is_nil (priority_model.in ()))
       {
@@ -125,13 +117,11 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
 
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
-                                                      policies.policies ()
-                                                     );
+                                                      policies.policies ());
 }
 
 void
-TAO_RT_POA::validate_priority (RTCORBA::Priority priority
-                               )
+TAO_RT_POA::validate_priority (RTCORBA::Priority priority)
 {
   if (priority < RTCORBA::minPriority
            // The line below will always be false unless the value of
@@ -148,11 +138,9 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
   // case, bands do not matter since matching the lanes priority is a
   // stricter condition than meeting the band ranges.  In addition,
   // when the POA was created, the bands had to match the lanes.
-  if (this->thread_pool_ != 0 &&
-      this->thread_pool_->with_lanes ())
+  if (this->thread_pool_ != 0 && this->thread_pool_->with_lanes ())
     {
-      TAO_Thread_Lane **lanes =
-        this->thread_pool_->lanes ();
+      TAO_Thread_Lane **lanes = this->thread_pool_->lanes ();
 
       for (CORBA::ULong i = 0;
            i != this->thread_pool_->number_of_lanes ();
@@ -170,12 +158,10 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
       // Check if we have bands.
       CORBA::Policy_var bands =
         this->policies ().get_cached_policy (
-          TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-         );
+          TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
       RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                           );
+        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ());
 
       TAO_PriorityBandedConnectionPolicy *priority_bands_i =
         dynamic_cast <TAO_PriorityBandedConnectionPolicy *>
@@ -235,22 +221,18 @@ TAO_RT_POA::validate_policies (void)
 TAO_Stub *
 TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                            const char *type_id,
-                           CORBA::Short priority
-                           )
+                           CORBA::Short priority)
 {
   // Client exposed policies.
   CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority
-                                  );
+    this->client_exposed_policies (priority);
 
   // Server protocol policy.
   CORBA::Policy_var protocol =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                        );
+    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                           );
+    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ());
 
   TAO_ServerProtocolPolicy *server_protocol =
     dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
@@ -274,19 +256,15 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
           TAO_Thread_Lane_Resources &resources =
             thread_lane_resources_manager.default_lane_resources ();
 
-          acceptor_registry =
-            &resources.acceptor_registry ();
+          acceptor_registry = &resources.acceptor_registry ();
         }
       else
         {
-          TAO_Thread_Lane **lanes =
-            this->thread_pool_->lanes ();
+          TAO_Thread_Lane **lanes = this->thread_pool_->lanes ();
 
-          TAO_Thread_Lane_Resources &resources =
-            lanes[0]->resources ();
+          TAO_Thread_Lane_Resources &resources = lanes[0]->resources ();
 
-          acceptor_registry =
-            &resources.acceptor_registry ();
+          acceptor_registry = &resources.acceptor_registry ();
         }
 
       return
@@ -294,8 +272,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                            type_id,
                                            client_exposed_policies._retn (),
                                            &filter,
-                                           *acceptor_registry
-                                          );
+                                           *acceptor_registry);
     }
 
   // If this POA has the SERVER_DECLARED policy, create the IOR with
@@ -332,8 +309,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
      );
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                       );
+    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ());
 
   TAO_PriorityBandedConnectionPolicy *priority_bands_i =
     dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
@@ -342,8 +318,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                    type_id,
                                    client_exposed_policies._retn (),
                                    &filter,
-                                   priority_bands_i
-                                  );
+                                   priority_bands_i);
 }
 
 TAO_Stub *
@@ -351,8 +326,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
-                                TAO_PriorityBandedConnectionPolicy *priority_bands
-                                )
+                                TAO_PriorityBandedConnectionPolicy *priority_bands)
 {
   int error = 0;
 
@@ -405,29 +379,24 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
     error = 1;
 
   if (error)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw ::CORBA::INTERNAL (
+      CORBA::SystemException::_tao_minor_code (
+        TAO_MPROFILE_CREATION_ERROR,
+        0),
+      CORBA::COMPLETED_NO);
 
   // Make sure we have at least one profile.  <mp> may end up being
   // empty if none of the acceptor endpoints have the right priority
   // for this object, for example.
   if (mprofile.profile_count () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
+    throw ::CORBA::BAD_PARAM (
+      CORBA::SystemException::_tao_minor_code (
+        TAO_MPROFILE_CREATION_ERROR,
+        0),
+      CORBA::COMPLETED_NO);
 
   return
-    this->orb_core_.create_stub_object (mprofile,
-                                        type_id,
-                                        policy_list
-                                       );
+    this->orb_core_.create_stub_object (mprofile, type_id, policy_list);
 }
 
 size_t
@@ -470,8 +439,7 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
 }
 
 CORBA::PolicyList *
-TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
-                                     )
+TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -482,8 +450,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
   CORBA::PolicyList_var safe_client_exposed_policies = client_exposed_policies;
 
   // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                    );
+  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies);
 
   // Check if the priority model policy has been set, and if so, let
   // the client know about it.
@@ -527,171 +494,107 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
 PortableServer::POA_ptr
 TAO_RT_POA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
-                        const CORBA::PolicyList &policies
-                        )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
-                                                           poa_manager,
-                                                           policies
-                                                          );
-  return poa;
+                        const CORBA::PolicyList &policies)
+{
+  return this->TAO_Regular_POA::create_POA (adapter_name, poa_manager, policies);
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::find_POA (const char *adapter_name,
-                      CORBA::Boolean activate_it
-                      )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
-                                                         activate_it
-                                                        );
-  return poa;
+TAO_RT_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it)
+{
+  return this->TAO_Regular_POA::find_POA (adapter_name, activate_it);
 }
 
 void
 TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                     CORBA::Boolean wait_for_completion)
 {
-  this->TAO_Regular_POA::destroy (etherealize_objects,
-                          wait_for_completion
-                         );
+  this->TAO_Regular_POA::destroy (etherealize_objects, wait_for_completion);
 }
 
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ThreadPolicy_ptr
-TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
 {
-  PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_Regular_POA::create_thread_policy (value
-                                        );
-  return policy;
+  return this->TAO_Regular_POA::create_thread_policy (value);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
 PortableServer::LifespanPolicy_ptr
-TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
 {
-  PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_Regular_POA::create_lifespan_policy (value
-                                          );
-  return policy;
+  return this->TAO_Regular_POA::create_lifespan_policy (value);
 }
 #endif
 
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
-TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
 {
-  PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_uniqueness_policy (value
-                                               );
-  return policy;
+  return this->TAO_Regular_POA::create_id_uniqueness_policy (value);
 }
 #endif
 
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
-TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
 {
-  PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_assignment_policy (value
-                                               );
-  return policy;
+  return this->TAO_Regular_POA::create_id_assignment_policy (value);
 }
 #endif
 
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_implicit_activation_policy (
+  PortableServer::ImplicitActivationPolicyValue value)
 {
-  PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_Regular_POA::create_implicit_activation_policy (value
-                                                     );
-  return policy;
+  return this->TAO_Regular_POA::create_implicit_activation_policy (value);
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_servant_retention_policy (
+  PortableServer::ServantRetentionPolicyValue value)
 {
-  PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_Regular_POA::create_servant_retention_policy (value
-                                                   );
-  return policy;
+  return this->TAO_Regular_POA::create_servant_retention_policy (value);
 }
 
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::create_request_processing_policy (
+  PortableServer::RequestProcessingPolicyValue value)
 {
-  PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_Regular_POA::create_request_processing_policy (value
-                                                    );
-  return policy;
+  return this->TAO_Regular_POA::create_request_processing_policy (value);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
 char *
 TAO_RT_POA::the_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  char * name =
-    this->TAO_Regular_POA::the_name ();
-  return name;
+  return this->TAO_Regular_POA::the_name ();
 }
 
 PortableServer::POA_ptr
 TAO_RT_POA::the_parent (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_ptr parent =
-    this->TAO_Regular_POA::the_parent ();
-  return parent;
+  return this->TAO_Regular_POA::the_parent ();
 }
 
 PortableServer::POAList *
 TAO_RT_POA::the_children (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POAList *children =
-    this->TAO_Regular_POA::the_children ();
-  return children;
+  return this->TAO_Regular_POA::the_children ();
 }
 
 PortableServer::POAManager_ptr
 TAO_RT_POA::the_POAManager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POAManager_ptr poa_manager =
-    this->TAO_Regular_POA::the_POAManager ();
-  return poa_manager;
+  return this->TAO_Regular_POA::the_POAManager ();
 }
 
 
@@ -699,213 +602,114 @@ TAO_RT_POA::the_POAManager (void)
 
 PortableServer::AdapterActivator_ptr
 TAO_RT_POA::the_activator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::AdapterActivator_ptr activator =
-    this->TAO_Regular_POA::the_activator ();
-  return activator;
+  return this->TAO_Regular_POA::the_activator ();;
 }
 
 void
-TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
 {
-  this->TAO_Regular_POA::the_activator (adapter_activator
-                               );
+  this->TAO_Regular_POA::the_activator (adapter_activator);
 }
 
 PortableServer::ServantManager_ptr
 TAO_RT_POA::get_servant_manager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
-  PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_Regular_POA::get_servant_manager ();
-  return servant_manager;
+  return this->TAO_Regular_POA::get_servant_manager ();
 }
 
 void
-TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 {
-  this->TAO_Regular_POA::set_servant_manager (imgr
-                                     );
+  this->TAO_Regular_POA::set_servant_manager (imgr);
 }
 
 PortableServer::Servant
 TAO_RT_POA::get_servant (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
 {
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::get_servant ();
-  return servant;
+  return this->TAO_Regular_POA::get_servant ();
 }
 
 void
-TAO_RT_POA::set_servant (PortableServer::Servant servant
-                         )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::set_servant (PortableServer::Servant servant)
 {
-  this->TAO_Regular_POA::set_servant (servant
-                             );
+  this->TAO_Regular_POA::set_servant (servant);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::ObjectId *
-TAO_RT_POA::activate_object (PortableServer::Servant p_servant
-                             )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::activate_object (PortableServer::Servant p_servant)
 {
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::activate_object (p_servant
-                                   );
-  return object_id;
+  return this->TAO_Regular_POA::activate_object (p_servant);
 }
 
 #if !defined (CORBA_E_MICRO)
 void
 TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                     PortableServer::Servant p_servant
-                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
+                                     PortableServer::Servant p_servant)
 {
-  this->TAO_Regular_POA::activate_object_with_id (id,
-                                          p_servant
-                                         );
+  this->TAO_Regular_POA::activate_object_with_id (id, p_servant);
 }
 #endif
 
 void
-TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
-                               )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid)
 {
-  this->TAO_Regular_POA::deactivate_object (oid
-                                   );
+  this->TAO_Regular_POA::deactivate_object (oid);
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::create_reference (const char *intf
-                              )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::create_reference (const char *intf)
 {
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference (intf
-                                    );
-  return obj;
+  return this->TAO_Regular_POA::create_reference (intf);
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                      const char *intf
-                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                      const char *intf)
 {
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference_with_id (oid,
-                                             intf
-                                            );
-  return obj;
+  return this->TAO_Regular_POA::create_reference_with_id (oid, intf);
 }
 
 PortableServer::ObjectId *
-TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
-                           )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant)
 {
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::servant_to_id (p_servant
-                                 );
-  return object_id;
+  return this->TAO_Regular_POA::servant_to_id (p_servant);
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant)
 {
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::servant_to_reference (p_servant
-                                        );
-  return obj;
+  return this->TAO_Regular_POA::servant_to_reference (p_servant);
 }
 
-
 PortableServer::Servant
-TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
-                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference)
 {
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::reference_to_servant (reference
-                                        );
-  return servant;
+  return this->TAO_Regular_POA::reference_to_servant (reference);
 }
 
 PortableServer::ObjectId *
-TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
-                             )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference)
 {
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::reference_to_id (reference
-                                   );
-  return object_id;
+  return this->TAO_Regular_POA::reference_to_id (reference);
 }
 
 PortableServer::Servant
-TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
-                           )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid)
 {
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::id_to_servant (oid
-                                 );
-  return servant;
+  return this->TAO_Regular_POA::id_to_servant (oid);
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
-                             )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
+TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid)
 {
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::id_to_reference (oid
-                                   );
-  return obj;
+  return this->TAO_Regular_POA::id_to_reference (oid);
 }
 
 CORBA::OctetSeq *
 TAO_RT_POA::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->TAO_Regular_POA::id ();
 }
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 1cf913567bf..41a73486008 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -53,191 +53,119 @@ public:
 
   // RTCORBA specific methods
   CORBA::Object_ptr create_reference_with_priority (const char * intf,
-                                                    RTCORBA::Priority priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                                    RTCORBA::Priority priority);
 
   CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                            const char * intf,
-                                                           RTCORBA::Priority priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+                                                           RTCORBA::Priority priority);
 
   PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
-                                                            RTCORBA::Priority priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                                            RTCORBA::Priority priority);
 
   void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                              PortableServer::Servant p_servant,
-                                             RTCORBA::Priority priority)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                             RTCORBA::Priority priority);
   // End RTCORBA specific methods
 
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
+                                      const CORBA::PolicyList &policies);
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
+                                    CORBA::Boolean activate_it);
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                CORBA::Boolean wait_for_completion);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
   PortableServer::ThreadPolicy_ptr create_thread_policy (
-    PortableServer::ThreadPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableServer::ThreadPolicyValue value);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-    PortableServer::LifespanPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableServer::LifespanPolicyValue value);
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-    PortableServer::IdUniquenessPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableServer::IdUniquenessPolicyValue value);
 #endif
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-    PortableServer::IdAssignmentPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableServer::IdAssignmentPolicyValue value);
 #endif
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::ImplicitActivationPolicy_ptr
     create_implicit_activation_policy (
-      PortableServer::ImplicitActivationPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableServer::ImplicitActivationPolicyValue value);
 
   PortableServer::ServantRetentionPolicy_ptr
     create_servant_retention_policy (
-      PortableServer::ServantRetentionPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableServer::ServantRetentionPolicyValue value);
 
   PortableServer::RequestProcessingPolicy_ptr
     create_request_processing_policy (
-      PortableServer::RequestProcessingPolicyValue value)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableServer::RequestProcessingPolicyValue value);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * the_name (void);
 
-  PortableServer::POA_ptr the_parent (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr the_parent (void);
 
-  PortableServer::POAList *the_children (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAList *the_children (void);
 
-  PortableServer::POAManager_ptr the_POAManager (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POAManager_ptr the_POAManager (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-  PortableServer::AdapterActivator_ptr the_activator (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::AdapterActivator_ptr the_activator (void);
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::ServantManager_ptr get_servant_manager (void);
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::Servant get_servant (void);
 
-  void set_servant (PortableServer::Servant servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  void set_servant (PortableServer::Servant servant);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant);
 
 #if !defined (CORBA_E_MICRO)
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
+                                PortableServer::Servant p_servant);
 #endif
 
-  void deactivate_object (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
+  void deactivate_object (const PortableServer::ObjectId &oid);
 
-  CORBA::Object_ptr create_reference (const char *intf)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+  CORBA::Object_ptr create_reference (const char *intf);
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::OctetSeq *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              const char *intf);
+
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant);
+
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant);
+
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference);
+
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference);
+
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid);
+
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
+
+  CORBA::OctetSeq *id (void);
 
   // End standard POA interface methods.
 
diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl
index 8a50bd7f91e..4b771dd5661 100644
--- a/TAO/tao/RTPortableServer/RT_POA.inl
+++ b/TAO/tao/RTPortableServer/RT_POA.inl
@@ -5,16 +5,12 @@
 // Exception macros
 #include "tao/PortableServer/poa_macros.h"
 #include "tao/PortableServer/POA_Guard.h"
-#include "tao/Environment.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_priority (const char * intf,
-                                            RTCORBA::Priority priority
-                                            )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+                                            RTCORBA::Priority priority)
 {
   // Check that this method can be used based on this POA's policies.
   this->validate_policies ();
@@ -24,18 +20,13 @@ TAO_RT_POA::create_reference_with_priority (const char * intf,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->create_reference_i (intf,
-                                   priority
-                                  );
+  return this->create_reference_i (intf, priority);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                    const char * intf,
-                                                   RTCORBA::Priority priority
-                                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+                                                   RTCORBA::Priority priority)
 {
   // Check that this method can be used based on this POA's policies.
   this->validate_policies ();
@@ -45,26 +36,19 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->create_reference_with_id_i (oid,
-                                           intf,
-                                           priority
-                                          );
+  return this->create_reference_with_id_i (oid, intf, priority);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
-                                           RTCORBA::Priority priority
-                                           )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
+                                           RTCORBA::Priority priority)
 {
   // Check that this method can be used based on this POA's policies.
   this->validate_policies ();
 
   this->validate_priority (priority);
 
-  while (1)
+  while (true)
     {
       bool wait_occurred_restart_call = false;
 
@@ -72,10 +56,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
       TAO_POA_GUARD_RETURN (0);
 
       PortableServer::ObjectId *result =
-        this->activate_object_i (servant,
-                                 priority,
-                                 wait_occurred_restart_call
-                                );
+        this->activate_object_i (servant, priority, wait_occurred_restart_call);
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
@@ -90,19 +71,14 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
 ACE_INLINE void
 TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                   PortableServer::Servant servant,
-                                                  RTCORBA::Priority priority
-                                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
+                                                  RTCORBA::Priority priority)
 {
   // Check that this method can be used based on this POA's policies.
   this->validate_policies ();
 
   this->validate_priority (priority);
 
-  while (1)
+  while (true)
     {
       bool wait_occurred_restart_call = false;
 
@@ -112,8 +88,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
       this->activate_object_with_id_i (oid,
                                        servant,
                                        priority,
-                                       wait_occurred_restart_call
-                                      );
+                                       wait_occurred_restart_call);
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 59351f89c8d..8d02f9342a4 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -34,8 +34,7 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                            )
+TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies)
 {
   this->validate_thread_pool (policies);
 
@@ -55,15 +54,13 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
-                                                       )
+TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies)
 {
   // Make sure we have an endpoint for at least one of the protocols
   // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
   // will be able to create non-nil object references.
   CORBA::Policy_var protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                               );
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   if (CORBA::is_nil (protocol.in ()))
     {
@@ -82,8 +79,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
     }
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                           );
+    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ());
 
   TAO_ServerProtocolPolicy *server_protocol =
     dynamic_cast <TAO_ServerProtocolPolicy *>
@@ -153,8 +149,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
-                                                  )
+TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies)
 {
   // Initialize to the default priority/priority model.
   CORBA::Short priority =
@@ -167,8 +162,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
                                );
 
   RTCORBA::PriorityModelPolicy_var priority_model =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                          );
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
   if (!CORBA::is_nil (priority_model.in ()))
     {
@@ -361,8 +355,7 @@ TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
 }
 
 void
-TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
-                                                  )
+TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies)
 {
   // Check if the user has specified the priority model policy.
   CORBA::Policy_var priority_model =
@@ -374,8 +367,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       // If not, check if the priority model policy has been specified
       // at the ORB level.
       priority_model =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                          );
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
       if (!CORBA::is_nil (priority_model.in ()))
         {
@@ -386,8 +378,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 
   // Check if the user has specified the server protocol policy.
   CORBA::Policy_var server_protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                               );
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   if (CORBA::is_nil (server_protocol.in ()))
     {
@@ -407,8 +398,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 
   // Check if the user has specified the thread pool policy.
   CORBA::Policy_var thread_pool =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                               );
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
 
   if (CORBA::is_nil (thread_pool.in ()))
     {
@@ -529,43 +519,37 @@ TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (RTCO
 /* static */
 TAO_Thread_Pool *
 TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
-                                                  TAO_Policy_Set &policies
-                                                  )
+                                                  TAO_Policy_Set &policies)
 {
   CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                               );
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
 
   RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
-    RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
-                                       );
+    RTCORBA::ThreadpoolPolicy::_narrow (policy.in ());
 
   if (CORBA::is_nil (thread_pool_policy.in ()))
     return 0;
 
-  RTCORBA::ThreadpoolId thread_pool_id =
-    thread_pool_policy->threadpool ();
+  RTCORBA::ThreadpoolId thread_pool_id = thread_pool_policy->threadpool ();
 
   // Get the RTORB.
-  CORBA::Object_var object =
-    orb_core.resolve_rt_orb ();
+  CORBA::Object_var object = orb_core.resolve_rt_orb ();
 
-  RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in ()
-                            );
+  RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
 
-  TAO_RT_ORB *tao_rt_orb =
+  TAO_RT_ORB * const tao_rt_orb =
     dynamic_cast <TAO_RT_ORB *> (rt_orb.in ());
 
-  TAO_Thread_Pool_Manager &tp_manager =
-    tao_rt_orb->tp_manager ();
+  if (!tao_rt_orb)
+    throw CORBA::INTERNAL ();
+
+  TAO_Thread_Pool_Manager & tp_manager = tao_rt_orb->tp_manager ();
 
-  TAO_Thread_Pool *thread_pool =
+  TAO_Thread_Pool * const thread_pool =
     tp_manager.get_threadpool (thread_pool_id);
 
   if (thread_pool == 0)
-    ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (),
-                      0);
+    throw PortableServer::POA::InvalidPolicy ();
 
   return thread_pool;
 }
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 4dd3bfd3460..baecf424454 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -54,8 +54,7 @@ public:
                                                              TAO_ORB_Core &orb_core);
 
   static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
-                                               TAO_Policy_Set &policies
-                                              );
+                                               TAO_Policy_Set &policies);
 
 protected:
 
@@ -64,12 +63,10 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate_impl (TAO_Policy_Set &policies
-                     );
+  void validate_impl (TAO_Policy_Set &policies);
 
   /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies
-                           );
+  void merge_policies_impl (TAO_Policy_Set &policies);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -80,17 +77,13 @@ protected:
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
 
 private:
-  void validate_server_protocol (TAO_Policy_Set &policies
-                                );
+  void validate_server_protocol (TAO_Policy_Set &policies);
 
-  void validate_priorities (TAO_Policy_Set &policies
-                           );
+  void validate_priorities (TAO_Policy_Set &policies);
 
-  void validate_thread_pool (TAO_Policy_Set &policies
-                            );
+  void validate_thread_pool (TAO_Policy_Set &policies);
 
   TAO_Thread_Pool *thread_pool_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 7379cd8df3d..94c77f10cc5 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -12,6 +12,8 @@
 #include "tao/Connection_Handler.h"
 #include "tao/Service_Context.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Network_Priority_Protocols_Hooks.h"
+#include "tao/PortableServer/Network_Priority_Hook.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
 
@@ -82,187 +84,192 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks ();
 
-  const char *priority_model = 0;
-  RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
-
-  // NOT_SPECIFIED PriorityModel processing.
-  if (poa.priority_model () ==
-      TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
-    {
-      priority_model = "RTCORBA::NOT_SPECIFIED";
-    }
-
-  // CLIENT_PROPAGATED PriorityModel processing.
-  else if (poa.priority_model () ==
-      TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
+  if (tph != 0)
     {
-      priority_model = "RTCORBA::CLIENT_PROPAGATED";
-
-      // Attempt to extract client-propagated priority from the
-      // ServiceContextList of the request.
-      const IOP::ServiceContext *context;
+      const char *priority_model = 0;
+      RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
 
-      if (request_service_context.get_context (IOP::RTCorbaPriority,
-                                               &context) == 1)
+      // NOT_SPECIFIED PriorityModel processing.
+      if (poa.priority_model () ==
+          TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
         {
-          // Extract the target priority
-          TAO_InputCDR cdr (reinterpret_cast
-                            <const char*>
-                             (context->context_data.get_buffer ()),
-                            context->context_data.length ());
-          CORBA::Boolean byte_order;
-          if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            throw ::CORBA::MARSHAL ();
-          cdr.reset_byte_order (static_cast<int> (byte_order));
-
-          if ((cdr >> target_priority) == 0)
-            throw ::CORBA::MARSHAL ();
-
-          // Save the target priority in the response service
-          // context to propagate back to the client as specified
-          // by the RTCORBA specification.
-          reply_service_context.set_context (*context);
+          priority_model = "RTCORBA::NOT_SPECIFIED";
         }
-      else
+
+      // CLIENT_PROPAGATED PriorityModel processing.
+      else if (poa.priority_model () ==
+          TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
         {
-          // Use default priority if none came in the request.
-          // (Request must have come from a non-RT ORB.)
-          target_priority = poa.server_priority ();
-        }
-    }
-  else
-    // SERVER_DECLARED PriorityModel processing.
-    {
-      priority_model = "RTCORBA::SERVER_DECLARED";
+          priority_model = "RTCORBA::CLIENT_PROPAGATED";
 
-      // Use the request associated with the servant.
-      target_priority = servant_priority;
-    }
+          // Attempt to extract client-propagated priority from the
+          // ServiceContextList of the request.
+          const IOP::ServiceContext *context = 0;
 
-  char thread_pool_id[BUFSIZ];
-  if (TAO_debug_level > 0)
-    {
-      if (thread_pool == 0)
-        ACE_OS::strcpy (thread_pool_id,
-                        "default thread pool");
+          if (request_service_context.get_context (IOP::RTCorbaPriority,
+                                                   &context) == 1)
+            {
+              // Extract the target priority
+              TAO_InputCDR cdr (reinterpret_cast
+                                <const char*>
+                                 (context->context_data.get_buffer ()),
+                                context->context_data.length ());
+              CORBA::Boolean byte_order;
+              if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
+                throw ::CORBA::MARSHAL ();
+              cdr.reset_byte_order (static_cast<int> (byte_order));
+
+              if ((cdr >> target_priority) == 0)
+                throw ::CORBA::MARSHAL ();
+
+              // Save the target priority in the response service
+              // context to propagate back to the client as specified
+              // by the RTCORBA specification.
+              reply_service_context.set_context (*context);
+            }
+          else
+            {
+              // Use default priority if none came in the request.
+              // (Request must have come from a non-RT ORB.)
+              target_priority = poa.server_priority ();
+            }
+        }
       else
-        ACE_OS::sprintf (thread_pool_id,
-                         "thread pool %d",
-                         thread_pool->id ());
-    }
-
-  // Target priority is invalid.
-  if (target_priority == TAO_INVALID_PRIORITY)
-    {
-      if (TAO_debug_level > 0)
+        // SERVER_DECLARED PriorityModel processing.
         {
+          priority_model = "RTCORBA::SERVER_DECLARED";
 
-// If we are in a multi-threaded configuration, print out the current
-// thread priority.
-#if defined (ACE_HAS_THREADS)
-
-          if (tph->get_thread_CORBA_and_native_priority (
-                pre_invoke_state.original_CORBA_priority_,
-                pre_invoke_state.original_native_priority_
-               ) == -1)
-            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO);
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t): %s processing using %s ")
-                      ACE_TEXT ("original thread CORBA/native priority %d/%d ")
-                      ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
-                      pre_invoke_state.original_CORBA_priority_,
-                      pre_invoke_state.original_native_priority_));
-
-// If we are in a single-threaded configuration, we cannot get the
-// current thread priority.  Therefore, print out a simpler message.
-#else /* ACE_HAS_THREADS */
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t): %s processing using %s ")
-                      ACE_TEXT ("original thread CORBA/native priority ")
-                      ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id)));
-
-#endif /* ACE_HAS_THREADS */
-
+          // Use the request associated with the servant.
+          target_priority = servant_priority;
         }
-    }
-  else
-    {
-      // Get the current thread's priority.
 
-      if (tph->get_thread_CORBA_and_native_priority (
-            pre_invoke_state.original_CORBA_priority_,
-            pre_invoke_state.original_native_priority_
-           ) == -1)
-        throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                           CORBA::COMPLETED_NO);
-
-      // Priority needs to be changed temporarily changed for the
-      // duration of request.
-      if (target_priority != pre_invoke_state.original_CORBA_priority_)
+      char thread_pool_id[BUFSIZ];
+      if (TAO_debug_level > 0)
         {
-          if (tph->set_thread_CORBA_priority (target_priority) == -1)
-            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO);
-
-          pre_invoke_state.state_ =
-            TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+          if (thread_pool == 0)
+            ACE_OS::strcpy (thread_pool_id,
+                            "default thread pool");
+          else
+            ACE_OS::sprintf (thread_pool_id,
+                             "thread pool %d",
+                             thread_pool->id ());
+        }
 
+      // Target priority is invalid.
+      if (target_priority == TAO_INVALID_PRIORITY)
+        {
           if (TAO_debug_level > 0)
             {
-              CORBA::Short native_priority;
-              tph->get_thread_native_priority (native_priority
-                                              );
+
+    // If we are in a multi-threaded configuration, print out the current
+    // thread priority.
+    #if defined (ACE_HAS_THREADS)
+
+              if (tph->get_thread_CORBA_and_native_priority (
+                    pre_invoke_state.original_CORBA_priority_,
+                    pre_invoke_state.original_native_priority_) == -1)
+                throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                                CORBA::COMPLETED_NO);
 
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("%s processing using %s ")
-                          ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
-                          ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
+                          ACE_TEXT ("(%P|%t): %s processing using %s ")
+                          ACE_TEXT ("original thread CORBA/native priority %d/%d ")
+                          ACE_TEXT ("not changed\n"),
                           ACE_TEXT_CHAR_TO_TCHAR (priority_model),
                           ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
                           pre_invoke_state.original_CORBA_priority_,
-                          pre_invoke_state.original_native_priority_,
-                          target_priority,
-                          native_priority));
+                          pre_invoke_state.original_native_priority_));
+
+    // If we are in a single-threaded configuration, we cannot get the
+    // current thread priority.  Therefore, print out a simpler message.
+    #else /* ACE_HAS_THREADS */
+
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t): %s processing using %s ")
+                          ACE_TEXT ("original thread CORBA/native priority ")
+                          ACE_TEXT ("not changed\n"),
+                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
+                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id)));
+
+    #endif /* ACE_HAS_THREADS */
+
             }
         }
-      // No change in priority required.
       else
         {
-          if (TAO_debug_level > 0)
+          // Get the current thread's priority.
+
+          if (tph->get_thread_CORBA_and_native_priority (
+                pre_invoke_state.original_CORBA_priority_,
+                pre_invoke_state.original_native_priority_) == -1)
+            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                            CORBA::COMPLETED_NO);
+
+          // Priority needs to be changed temporarily changed for the
+          // duration of request.
+          if (target_priority != pre_invoke_state.original_CORBA_priority_)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("%s processing using %s ")
-                          ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
-                          ACE_TEXT ("is the same as the target priority\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
-                          pre_invoke_state.original_CORBA_priority_,
-                          pre_invoke_state.original_native_priority_));
+              if (tph->set_thread_CORBA_priority (target_priority) == -1)
+                throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                                CORBA::COMPLETED_NO);
+
+              pre_invoke_state.state_ =
+                TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+
+              if (TAO_debug_level > 0)
+                {
+                  CORBA::Short native_priority = 0;
+                  tph->get_thread_native_priority (native_priority);
+
+                  ACE_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("%s processing using %s ")
+                              ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
+                              ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
+                              ACE_TEXT_CHAR_TO_TCHAR (priority_model),
+                              ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                              pre_invoke_state.original_CORBA_priority_,
+                              pre_invoke_state.original_native_priority_,
+                              target_priority,
+                              native_priority));
+                }
+            }
+          // No change in priority required.
+          else
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("%s processing using %s ")
+                              ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
+                              ACE_TEXT ("is the same as the target priority\n"),
+                              ACE_TEXT_CHAR_TO_TCHAR (priority_model),
+                              ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                              pre_invoke_state.original_CORBA_priority_,
+                              pre_invoke_state.original_native_priority_));
+                }
             }
         }
     }
 
-  CORBA::Policy_var policy =
-    poa.policies ().get_cached_policy (
-      TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-     );
-
-  CORBA::Boolean set_server_network_priority =
-    tph->set_server_network_priority (req.transport ()->tag (),
-                                      policy.in ()
-                                     );
-
-  TAO_Connection_Handler *connection_handler =
-    req.transport ()->connection_handler ();
+  TAO_Network_Priority_Protocols_Hooks *nph =
+    poa.orb_core ().get_network_priority_protocols_hooks ();
 
-  connection_handler->set_dscp_codepoint (set_server_network_priority);
+  if (nph != 0)
+    {
+      poa.network_priority_hook ()-> set_dscp_codepoint (req, poa);
+    }
+  else if (tph != 0)
+    {
+      CORBA::Policy_var policy =
+        poa.policies ().get_cached_policy (
+          TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+      CORBA::Boolean set_server_network_priority =
+        tph->set_server_network_priority (
+          req.transport ()->tag (), policy.in ());
+      TAO_Connection_Handler *connection_handler =
+        req.transport ()->connection_handler ();
+      connection_handler->set_dscp_codepoint (set_server_network_priority);
+    }
 }
 
 void
@@ -274,8 +281,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
   TAO_Thread_Pool *thread_pool =
     static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
 
-  if (thread_pool == 0 ||
-      thread_pool->with_lanes ())
+  if (thread_pool == 0 || thread_pool->with_lanes ())
     {
       //
       // We don't mess with the priority of threads in lanes or for
@@ -302,20 +308,23 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks ();
 
-  if (tph->get_thread_CORBA_and_native_priority (
-        pre_invoke_state.original_CORBA_priority_,
-        pre_invoke_state.original_native_priority_) == -1)
-    throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
-
-  // Change the priority of the current thread for the duration of
-  // request.
-  if (servant_priority != pre_invoke_state.original_CORBA_priority_)
+  if (tph != 0)
     {
-      if (tph->set_thread_CORBA_priority (servant_priority) == -1)
+      if (tph->get_thread_CORBA_and_native_priority (
+            pre_invoke_state.original_CORBA_priority_,
+            pre_invoke_state.original_native_priority_) == -1)
         throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 
-      pre_invoke_state.state_ =
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+      // Change the priority of the current thread for the duration of
+      // request.
+      if (servant_priority != pre_invoke_state.original_CORBA_priority_)
+        {
+          if (tph->set_thread_CORBA_priority (servant_priority) == -1)
+            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
+
+          pre_invoke_state.state_ =
+            TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+        }
     }
 }
 
@@ -334,16 +343,17 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
         {
           // Reset the priority of the current thread back to its original
           // value.
-          TAO_Protocols_Hooks *tph =
-            poa.orb_core ().get_protocols_hooks ();
+          TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks ();
 
-          if (tph->set_thread_native_priority (
-                 pre_invoke_state.original_native_priority_)
-              == -1)
-            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO);
+          if (tph != 0)
+            {
+              if (tph->set_thread_native_priority (
+                     pre_invoke_state.original_native_priority_) == -1)
+                throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                                CORBA::COMPLETED_NO);
+            }
         }
-      catch ( ::CORBA::Exception& ex)
+      catch (const ::CORBA::Exception& ex)
         {
           // Eat up the exception.
           ex._tao_print_exception (
@@ -361,8 +371,7 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter
-                                            )
+                                            TAO_Object_Adapter *object_adapter)
 {
   TAO_RT_POA *poa = 0;
 
@@ -374,8 +383,7 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                 lock,
                                 thread_lock,
                                 orb_core,
-                                object_adapter
-                               ),
+                                object_adapter),
                     CORBA::NO_MEMORY ());
 
   return poa;
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 42358836865..733042d926c 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -72,8 +72,6 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
     const char * name,
     CORBA::Policy_ptr sched_param,
     CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -103,8 +101,6 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
                                                     CORBA::Policy_ptr sched_param,
                                                     CORBA::Policy_ptr implicit_sched_param
                                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -119,7 +115,6 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
 
 void
 TAO_RTScheduler_Current::end_scheduling_segment (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -137,7 +132,6 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name)
 
 RTScheduling::DistributableThread_ptr
 TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::DistributableThread_var DT;
   int result = this->dt_hash_.find (id,
@@ -159,12 +153,11 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                                 CORBA::Policy_ptr implicit_sched_param,
                                 CORBA::ULong stack_size,
                                 RTCORBA::Priority base_priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw ::CORBA::BAD_INV_ORDER ();
 
   return impl->spawn (start,
                       data,
@@ -178,63 +171,57 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
 
 RTScheduling::Current::IdType *
 TAO_RTScheduler_Current::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw ::CORBA::BAD_INV_ORDER ();
 
   return impl->id ();
 }
 
 CORBA::Policy_ptr
 TAO_RTScheduler_Current::scheduling_parameter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw ::CORBA::BAD_INV_ORDER ();
 
   return impl->scheduling_parameter ();
 }
 
 CORBA::Policy_ptr
 TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw ::CORBA::BAD_INV_ORDER ();
 
   return impl->implicit_scheduling_parameter ();
 }
 
 RTScheduling::Current::NameList *
 TAO_RTScheduler_Current::current_scheduling_segment_names (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+    throw ::CORBA::BAD_INV_ORDER ();
 
   return impl->current_scheduling_segment_names ();
 }
 
 RTCORBA::Priority
 TAO_RTScheduler_Current::the_priority (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->rt_current_->the_priority ();
 }
 
 void
 TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->rt_current_->the_priority(the_priority);
 }
@@ -330,8 +317,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
   const char * name,
   CORBA::Policy_ptr sched_param,
   CORBA::Policy_ptr implicit_sched_param)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   // Check if it is a new Scheduling Segmnet
   if (this->guid_.length () == 0)
@@ -420,8 +405,6 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
                                                       CORBA::Policy_ptr sched_param,
                                                       CORBA::Policy_ptr implicit_sched_param
                                                       )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   // Check if DT has been cancelled
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
@@ -444,7 +427,6 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
 
 void
 TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if DT has been cancelled
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
@@ -494,7 +476,6 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
                                   CORBA::ULong stack_size,
                                   RTCORBA::Priority base_priority
                                   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if DT has been cancelled.
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
@@ -639,7 +620,7 @@ DTTask::svc (void)
       this->current_->end_scheduling_segment (this->name_.in ()
                                             );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Caught exception:");
       return -1;
@@ -650,7 +631,6 @@ DTTask::svc (void)
 
 RTScheduling::Current::IdType *
 TAO_RTScheduler_Current_i::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   RTScheduling::Current::IdType_var guid = this->guid_;
@@ -660,21 +640,18 @@ TAO_RTScheduler_Current_i::id (void)
 
 CORBA::Policy_ptr
 TAO_RTScheduler_Current_i::scheduling_parameter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->sched_param_);
 }
 
 CORBA::Policy_ptr
 TAO_RTScheduler_Current_i::implicit_scheduling_parameter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->implicit_sched_param_);
 }
 
 RTScheduling::Current::NameList *
 TAO_RTScheduler_Current_i::current_scheduling_segment_names (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::NameList* name_list;
   ACE_NEW_RETURN (name_list,
@@ -705,7 +682,6 @@ TAO_RTScheduler_Current_i::name (void)
 
 void
 TAO_RTScheduler_Current_i::cancel_thread (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   size_t guid;
   ACE_OS::memcpy (&guid,
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 0cdc365d86c..8a680b0353d 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -87,34 +87,26 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
 
   void init (TAO_ORB_Core* orb);
 
-  virtual RTCORBA::Priority the_priority (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTCORBA::Priority the_priority (void);
 
-  virtual void the_priority (RTCORBA::Priority the_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void the_priority (RTCORBA::Priority the_priority);
 
   void rt_current (RTCORBA::Current_ptr rt_current);
 
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+     CORBA::Policy_ptr implicit_sched_param);
 
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+     CORBA::Policy_ptr implicit_sched_param);
 
-  virtual void end_scheduling_segment (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void end_scheduling_segment (const char * name);
 
   virtual RTScheduling::DistributableThread_ptr
-    lookup(const RTScheduling::Current::IdType & id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    lookup(const RTScheduling::Current::IdType & id);
 
   // returns a null reference if
   // the distributable thread is
@@ -127,21 +119,16 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
            CORBA::Policy_ptr sched_param,
            CORBA::Policy_ptr implicit_sched_param,
            CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+           RTCORBA::Priority base_priority);
 
-  virtual ::RTScheduling::Current::IdType *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::RTScheduling::Current::IdType *id (void);
 
-  virtual ::CORBA::Policy_ptr scheduling_parameter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::CORBA::Policy_ptr scheduling_parameter (void);
 
-  virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void);
 
   virtual ::RTScheduling::Current::NameList *
-    current_scheduling_segment_names (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    current_scheduling_segment_names (void);
 
   TAO_RTScheduler_Current_i* implementation (void);
 
@@ -254,48 +241,37 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
            CORBA::Policy_ptr sched_param,
            CORBA::Policy_ptr implicit_sched_param,
            CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+           RTCORBA::Priority base_priority);
 
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+     CORBA::Policy_ptr implicit_sched_param);
 
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+     CORBA::Policy_ptr implicit_sched_param);
 
-  virtual void end_scheduling_segment (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void end_scheduling_segment (const char * name);
 
-  virtual RTScheduling::Current::IdType *id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTScheduling::Current::IdType *id (void);
 
 
   void id (RTScheduling::Current::IdType guid);
 
-  virtual CORBA::Policy_ptr scheduling_parameter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr scheduling_parameter (void);
 
-  virtual CORBA::Policy_ptr implicit_scheduling_parameter (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr implicit_scheduling_parameter (void);
 
   void scheduling_parameter (CORBA::Policy_ptr);
 
   void implicit_scheduling_parameter (CORBA::Policy_ptr);
 
   virtual RTScheduling::Current::NameList *
-    current_scheduling_segment_names (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    current_scheduling_segment_names (void);
 
-  void cancel_thread (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void cancel_thread (void);
 
   void cleanup_DT (void);
 
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index db091728591..7d8a6a0dc1f 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -16,14 +16,12 @@ TAO_DistributableThread::~TAO_DistributableThread (void)
 
 void
 TAO_DistributableThread::cancel (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->state_ = RTScheduling::DistributableThread::CANCELLED;
 }
 
 RTScheduling::DistributableThread::DT_State
 TAO_DistributableThread::state (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->state_;
 }
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index 8fc2dca562a..4840d1a9d42 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -19,11 +19,9 @@ class TAO_RTScheduler_Export TAO_DistributableThread:
 
   ~TAO_DistributableThread (void);
 
-  virtual void cancel (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (void);
 
-  virtual RTScheduling::DistributableThread::DT_State state (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RTScheduling::DistributableThread::DT_State state (void);
 
  private:
   RTScheduling::DistributableThread::DT_State state_;
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index b88594c4c84..6bc9295d07f 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -25,7 +25,6 @@ static TAO_RTScheduler_Current_var current_cleanup;
 void
  TAO_RTScheduler_ORB_Initializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
   // Register all of the RT related services.
@@ -127,7 +126,6 @@ void
 
 void
 TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // @@ This is busted.  TAO_ORBInitInfo should do proper reference
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index 09bf03a1c91..47c5ab040f3 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -43,11 +43,9 @@ class TAO_RTScheduler_ORB_Initializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 private:
 
   TAO_RTScheduler_Current* current_;
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 419a30d8468..f30e2dfa964 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -56,7 +56,7 @@ TAO_RTScheduler_Loader::init (int,
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                     );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception (
         "Unexpected exception caught while initializing the RTScheduler:");
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index aabeae14ece..c6a87ee70b6 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -23,8 +23,6 @@ Client_Interceptor::SchedulingInfo = 30;
 
 void
 Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -43,7 +41,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
       // If this is a one way request
       if (!ri->response_expected ())
         {
-
           // Generate GUID.
           RTScheduling::Current::IdType guid;
           guid.length (sizeof(long));
@@ -119,7 +116,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -139,7 +135,6 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
 
 void
 Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -159,19 +154,15 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
 void
 Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Client_Interceptor::receive_exception\n"));
 
-
-  TAO_RTScheduler_Current_i *current = 0;
-
   TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
+  TAO_RTScheduler_Current_i *current =
+    static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
   if (current != 0)
     {
@@ -182,8 +173,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
           return;
         }
 
-      CORBA::Any_var ex =
-        ri->received_exception ();
+      CORBA::Any_var ex = ri->received_exception ();
       CORBA::TypeCode_var type = ex->type ();
 
       if (CORBA::is_nil (type.in ()))
@@ -199,7 +189,6 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
                     "Received Exception %s\n",
                     ACE_TEXT_CHAR_TO_TCHAR (id)));
 
-
       // If the remote host threw a THREAD_CANCELLED
       // exception, make sure to take the appropriate
       // local action.
@@ -221,8 +210,6 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 
 void
 Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -242,14 +229,12 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
 char*
 Client_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  CORBA::string_dup ("RTSchdeuler_Client_Interceptor");
 }
 
 void
 Client_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -264,8 +249,6 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current)
 void
 Server_Interceptor::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -276,8 +259,6 @@ Server_Interceptor::receive_request_service_contexts (
 void
 Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                      )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -288,10 +269,9 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   try
     {
       serv_cxt =
-        ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                        );
+        ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -379,9 +359,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 }
 
 void
-Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -428,10 +406,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 void
-Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
+Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -454,10 +429,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 }
 
 void
-Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
+Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -481,16 +453,13 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 
 char*
 Server_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return  CORBA::string_dup ("RTSchdeuler_Server_Interceptor");
 }
 
 void
 Server_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 194a03cccdc..bc476915dd2 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -26,31 +26,21 @@ public:
 
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   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_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual char* name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char* name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   static const IOP::ServiceId SchedulingInfo;
 
@@ -64,30 +54,19 @@ class TAO_RTScheduler_Export Server_Interceptor :
 public:
   Server_Interceptor (TAO_RTScheduler_Current_ptr current);
 
-  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual char* name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char* name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   static const IOP::ServiceId SchedulingInfo;
 
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index 62af6e4cbde..268222087ca 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -20,7 +20,7 @@ public RTScheduling::ThreadAction,
 
   virtual void do (CORBA::VoidData data
        )
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index dcba0a754f0..707c9ca9c4f 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -79,7 +79,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
             break;
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       result = -1;
     }
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 31191cc3cd2..167e74e8b8a 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -42,7 +42,7 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
           result = orb_core->run (max_wait_time, 1);
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
@@ -66,7 +66,7 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
             return -1;
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index d2893173fbf..aa7e0dfca2c 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -9,7 +9,9 @@
 #include "tao/operation_details.h"
 #include "tao/ORB_Core.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Network_Priority_Protocols_Hooks.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            Remote_Invocation,
@@ -77,9 +79,7 @@ namespace TAO
       CORBA::ULong index = 0;
       IOP::IOR *ior_info = 0;
       int const retval =
-        this->resolver_.stub ()->create_ior_info (ior_info,
-                                                  index
-                                                 );
+        this->resolver_.stub ()->create_ior_info (ior_info, index);
 
       if (retval == -1)
         {
@@ -95,18 +95,14 @@ namespace TAO
           return;
         }
 
-      target_spec.target_specifier (*ior_info,
-                                    index);
+      target_spec.target_specifier (*ior_info, index);
       break;
     }
-
-
   }
 
   void
   Remote_Invocation::write_header (TAO_Target_Specification &spec,
-                                   TAO_OutputCDR &out_stream
-                                   )
+                                   TAO_OutputCDR &out_stream)
   {
     this->resolver_.transport ()->clear_translators (0, &out_stream);
 
@@ -129,8 +125,6 @@ namespace TAO
       {
         throw ::CORBA::MARSHAL ();
       }
-
-    return;
   }
 
   Invocation_Status
@@ -141,14 +135,44 @@ namespace TAO
     TAO_Protocols_Hooks *tph =
       this->resolver_.stub ()->orb_core ()->get_protocols_hooks ();
 
-    CORBA::Boolean set_client_network_priority =
-      tph->set_client_network_priority (this->resolver_.transport ()->tag (),
-                                        this->resolver_.stub ());
+    TAO_Network_Priority_Protocols_Hooks *nph =
+      this->resolver_.stub ()->orb_core ()->
+        get_network_priority_protocols_hooks ();
 
     TAO_Connection_Handler *connection_handler =
       this->resolver_.transport ()->connection_handler ();
 
-    connection_handler->set_dscp_codepoint (set_client_network_priority);
+    if (nph != 0)
+      {
+        // nph = 0, means DiffServ library is not used
+        // nph = 0, means DiffServ library is used, and 
+        // request DSCP and reply DSCP are set.
+        // Note that the application could still be using
+        // RTCORBA, but still setting DIffServ codepoints
+        // using the DiffServ library takes precedence.
+        //
+        CORBA::Long dscp = nph->get_dscp_codepoint (this->resolver_.stub (),
+          this->resolver_.object ());
+        connection_handler->set_dscp_codepoint (dscp);
+      }
+    else if (tph != 0)
+      {
+        // If we execute this code, DiffServ library is not used,
+        // but RTCORBA could be used.
+        // Which means that using the enable_network_priority flag,
+        // the application might want to set DiffServ codepoints.
+        // Check if that is the case.
+        //
+        CORBA::Boolean const set_client_network_priority =
+          tph->set_client_network_priority (
+            this->resolver_.transport ()->tag (),
+            this->resolver_.stub ());
+        connection_handler->set_dscp_codepoint (set_client_network_priority);
+      }
+
+    // Note that if noth nph and tph are 0, then we do not make any
+    // virtual calls any more, because we have removed the default
+    // implementations.
 
     int const retval =
       this->resolver_.transport ()->send_request (
@@ -164,16 +188,11 @@ namespace TAO
           {
             // We sent a message already and we haven't gotten a
             // reply.  Just throw TIMEOUT with *COMPLETED_MAYBE*.
-            ACE_THROW_RETURN (
-                CORBA::TIMEOUT (
-                    CORBA::SystemException::_tao_minor_code (
-                        TAO_TIMEOUT_SEND_MINOR_CODE,
-                        errno
-                        ),
-                    CORBA::COMPLETED_MAYBE
-                    ),
-                TAO_INVOKE_FAILURE
-                );
+            throw ::CORBA::TIMEOUT (
+              CORBA::SystemException::_tao_minor_code (
+                TAO_TIMEOUT_SEND_MINOR_CODE,
+                errno),
+              CORBA::COMPLETED_MAYBE);
           }
 
         if (TAO_debug_level > 2)
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
index a5a71c9116c..ce45b946d6b 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -15,14 +15,13 @@
 #define TAO_REMOTE_INVOCATION_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Invocation_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Invocation_Base.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Operation_Details;
@@ -66,23 +65,19 @@ namespace TAO
   protected:
 
     /// Initialize the @a spec.
-    void init_target_spec (TAO_Target_Specification &spec
-                          );
+    void init_target_spec (TAO_Target_Specification &spec);
 
     /// Write the GIOP header into the stream.
     void write_header (TAO_Target_Specification &spec,
-                       TAO_OutputCDR &out_stream
-                      );
+                       TAO_OutputCDR &out_stream);
 
     /// Marshal the arguments into the stream.
-    void marshal_data (TAO_OutputCDR &cdr
-                      );
+    void marshal_data (TAO_OutputCDR &cdr);
 
     /// Write the message onto the socket
     Invocation_Status send_message (TAO_OutputCDR &cdr,
                                     short message_semantics,
-                                    ACE_Time_Value *max_wait_time
-                                   );
+                                    ACE_Time_Value *max_wait_time);
 
   protected:
     /// Our resolver
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 38593b6d754..e1a48b7f411 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -99,8 +99,7 @@ namespace TAO
 
   if (adapter == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
+      throw ::CORBA::INTF_REPOS ();
     }
 
   return adapter->get_interface_remote (target);
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index e70b0f2f81a..559993dfe33 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -18,13 +18,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "tao/Objref_VarOut_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Objref_VarOut_T.h"
 #include "tao/Pseudo_VarOut_T.h"
 
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index d429a356686..14d2abc13bc 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -24,8 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include "tao/Basic_Types.h"
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 # include "tao/OctetSeqC.h"
@@ -154,13 +154,11 @@ namespace TAO
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
 
-    virtual void deallocate_pi_current (
-        TAO::PICurrent_Impl *picurrent) = 0;
+    virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0;
 
     virtual void execute_command (
         TAO_ServerRequest &server_request,
-        TAO::Upcall_Command &command
-        ) = 0;
+        TAO::Upcall_Command &command) = 0;
   };
 }
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
index e97987173d6..1269b8c41f0 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
-
+#include /**/ "tao/TAO_Export.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 79d1fb39f07..30546a5b5ac 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -55,29 +55,25 @@ TAO_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr,
 TAO::Invocation_Status
 TAO_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    )
+    TAO_Profile * /*profile*/)
 {
-  ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          -1),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_FAILURE);
+  throw ::CORBA::COMM_FAILURE (
+    CORBA::SystemException::_tao_minor_code (
+      TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
+      -1),
+    CORBA::COMPLETED_MAYBE);
 }
 
 TAO::Invocation_Status
 TAO_Service_Callbacks::raise_transient_failure (
     IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    )
+    TAO_Profile * /*profile*/ )
 {
-  ACE_THROW_RETURN (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          -1),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_FAILURE);
+  throw ::CORBA::TRANSIENT (
+    CORBA::SystemException::_tao_minor_code (
+      TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
+      -1),
+    CORBA::COMPLETED_MAYBE);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index c4a865fb9f2..6f94f428b87 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -18,14 +18,14 @@
 #define TAO_SERVICE_CALLBACK_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
 #include "tao/Invocation_Utils.h"
 #include "tao/Object.h"
 #include "tao/Service_Context.h"
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index 3c160e521b0..0f9b90e458a 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -80,8 +80,7 @@ public:
   /// If the replace flag is true, update the specified context.
   /// Return 0 if the component was present and the replace flag
   /// was not set to true.
-  int set_context (const IOP::ServiceContext &context,
-                   CORBA::Boolean replace);
+  int set_context (const IOP::ServiceContext &context, CORBA::Boolean replace);
 
   /// Insert the component into the list, but efficiently stealing the
   /// contents of the octet sequence.
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index d1e1905d8f6..2ba8d73aa99 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -23,7 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include /**/ "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -53,8 +54,7 @@ public:
    * This method cannot throw any exception, but it can return a nil
    * object to indicate an error condition.
    */
-  virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index 977868b541b..c71ad7761e7 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -49,13 +49,9 @@ TAO_COIOP_Acceptor::create_profile (const TAO::ObjectKey & object_key,
   // Check if multiple endpoints should be put in one profile or if
   // they should be spread across multiple profiles.
   if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
+    return this->create_new_profile (object_key, mprofile, priority);
   else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
+    return this->create_shared_profile (object_key, mprofile, priority);
 }
 
 int
@@ -244,8 +240,7 @@ TAO_COIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
+  if (!(cdr.read_octet (major) && cdr.read_octet (minor)))
   {
     if (TAO_debug_level > 0)
       {
@@ -280,7 +275,6 @@ TAO_COIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
   return 1;
 }
 
-
 int
 TAO_COIOP_Acceptor::parse_options (const char *str)
 {
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
index 2cfa182aaa2..b6c8c3a0b13 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -38,7 +38,7 @@ TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (ACE_Thread_Manager *
 
 
 TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag)
+                                                            CORBA::Boolean flag)
   : TAO_COIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core)
 {
@@ -115,7 +115,7 @@ TAO_COIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
 
 int
 TAO_COIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                             const void *)
+                                              const void *)
 {
   // We don't use this upcall from the Reactor.  However, we should
   // override this since the base class returns -1 which will result
@@ -125,7 +125,7 @@ TAO_COIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
 
 int
 TAO_COIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                           ACE_Reactor_Mask)
+                                            ACE_Reactor_Mask)
 {
   // No asserts here since the handler is registered with the Reactor
   // and the handler ownership is given to the Reactor.  When the
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.h b/TAO/tao/Strategies/COIOP_Connection_Handler.h
index f289b67b134..8b3df6ef915 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.h
@@ -32,9 +32,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
 // ****************************************************************
 
 /**
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index d3f2eead383..d986c4e9b24 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -8,6 +8,7 @@
 #include "ace/Connector.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index 39d6804470e..c17426ef1c6 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -5,7 +5,7 @@
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 93c665bf99f..7f3dfd91d76 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -94,9 +94,7 @@ TAO_COIOP_Transport::send (iovec *,
 }
 
 ssize_t
-TAO_COIOP_Transport::recv (char *,
-                          size_t ,
-                          const ACE_Time_Value *)
+TAO_COIOP_Transport::recv (char *, size_t , const ACE_Time_Value *)
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index dcf01927702..d60634a8a0d 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -684,7 +684,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
   // before the object key.
   for (size_t i = 0; i < len; ++i)
     if (options[i] == option_delimiter)
-      option_count++;
+      ++option_count;
 
   // The idea behind the following loop is to split the options into
   // (option, name) pairs.
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index ca8f2f86d1f..7e140d3b5e5 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -130,23 +130,24 @@ TAO_DIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (protocol_properties);
+            }
         }
-      else
+      catch (const ::CORBA::Exception&)
         {
-          tph->server_protocol_properties_at_orb_level (protocol_properties);
+          return -1;
         }
     }
-  catch ( ::CORBA::Exception&)
-    {
-      return -1;
-    }
 
   this->udp_socket_.open (this->local_addr_);
 
@@ -258,27 +259,14 @@ TAO_DIOP_Connection_Handler::release_os_resources (void)
 }
 
 int
-TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+TAO_DIOP_Connection_Handler::set_tos (int tos)
 {
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = (int)(codepoint) << 2;
-    }
-
   if (tos != this->dscp_codepoint_)
     {
-      int result = this->dgram ().set_option (IPPROTO_IP,
-                                              IP_TOS,
-                                              (int *) &tos ,
-                                              (int) sizeof (tos));
+      int const result = this->dgram ().set_option (IPPROTO_IP,
+                                                    IP_TOS,
+                                                    (int *) &tos ,
+                                                    (int) sizeof (tos));
 
       if (TAO_debug_level)
         {
@@ -293,9 +281,36 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
       // On successful setting of TOS field.
       if (result == 0)
         this->dscp_codepoint_ = tos;
-
     }
+  return 0;
+}
 
+int
+TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Long dscp)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+  tos = (int)(dscp) << 2;
+  this->set_tos (tos);
+  return 0;
+}
+
+int
+TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+
+  if (set_network_priority)
+    {
+      TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
+
+      if (tph != 0)
+        {
+          CORBA::Long codepoint = tph->get_dscp_codepoint ();
+
+          tos = (int)(codepoint) << 2;
+          this->set_tos (tos);
+        }
+    }
   return 0;
 }
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index f2b4218bad5..c1e09e75e56 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -33,9 +33,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
 // ****************************************************************
 
 /**
@@ -56,8 +53,7 @@ public:
   TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
-  TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag);
+  TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_DIOP_Connection_Handler (void);
@@ -127,6 +123,7 @@ public:
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+  int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
 protected:
 
@@ -137,6 +134,9 @@ protected:
   virtual int release_os_resources (void);
   //@}
 
+  /// Helper method used by the set_dscp_codepoint () methods
+  int set_tos (int tos);
+
   // DIOP Additions - Begin
   /**
    * @name The DIOP Additions
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index c70dc9ff725..61011bc8bb7 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -9,7 +9,7 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Protocols_Hooks.h"
 #include "ace/OS_NS_strings.h"
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index 8eab0de87a0..31476332b94 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -84,7 +84,6 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
 
 TAO_DIOP_Endpoint::~TAO_DIOP_Endpoint (void)
 {
-
 }
 
 int
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 246a505e5ce..8fc849e1868 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -5,7 +5,7 @@
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index f919184461d..a60ed33ad4b 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -10,6 +10,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 #include "tao/Profile_Transport_Resolver.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            Optimized_Connection_Endpoint_Selector,
@@ -144,19 +145,14 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
       if (r->blocked_connect () ||
          (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
         {
-          const size_t endpoint_count =
-            r->profile ()->endpoint_count ();
+          const size_t endpoint_count = r->profile ()->endpoint_count ();
 
-          TAO_Endpoint *ep =
-            r->profile ()->endpoint ();
+          TAO_Endpoint *ep = r->profile ()->endpoint ();
 
           for (size_t i = 0; i < endpoint_count; ++i)
             {
               TAO_Base_Transport_Property desc (ep);
-              const bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                               );
+              const bool retval = r->try_connect (&desc, max_wait_time);
 
               // Check if the connect has completed.
               if (retval)
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index e8d1a2ec799..aff83dc38e4 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -109,24 +109,24 @@ TAO_SCIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (protocol_properties);
+            }
         }
-      else
+      catch (const ::CORBA::Exception& ex)
         {
-          tph->server_protocol_properties_at_orb_level (protocol_properties);
+          return -1;
         }
     }
-  catch ( ::CORBA::Exception& ex)
-    {
-      return -1;
-    }
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -158,7 +158,6 @@ TAO_SCIOP_Connection_Handler::open (void*)
   if (this->peer ().get_local_addr (local_addr) == -1)
     return -1;
 
-
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT("TAO(%P|%t) - SCIOP_Connection_Handler::open, ")
@@ -359,21 +358,8 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
 }
 
 int
-TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+TAO_SCIOP_Connection_Handler::set_tos (int tos)
 {
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = (int)(codepoint) << 2;
-    }
-
   if (tos != this->dscp_codepoint_)
     {
       int const result = this->peer ().set_option (IPPROTO_IP,
@@ -400,6 +386,35 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri
   return 0;
 }
 
+int
+TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Long dscp)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+  tos = (int)(dscp) << 2;
+  this->set_tos (tos);
+  return 0;
+}
+
+int
+TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+
+  if (set_network_priority)
+    {
+      TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
+
+      if (tph != 0)
+        {
+          CORBA::Long codepoint = tph->get_dscp_codepoint ();
+          tos = (int)(codepoint) << 2;
+          this->set_tos (tos);
+        }
+    }
+
+  return 0;
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 2a43c03057c..a7cf9124ed2 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -42,9 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
         TAO_SCIOP_SVC_HANDLER;
 
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
 // ****************************************************************
 
 /**
@@ -108,6 +105,7 @@ public:
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+  int set_dscp_codepoint (CORBA::Long dscp);
 
 protected:
 
@@ -121,6 +119,9 @@ protected:
    */
   TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
+  /// Helper method needed by the set_dscp_codepoint () methods
+  int set_tos (int tos);
+
   //@{
   /**
    * @name TAO_Connection Handler overloads
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 7c7a41492ad..da977043497 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -6,7 +6,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Protocols_Hooks.h"
 #include "tao/Transport_Cache_Manager.h"
@@ -130,8 +130,7 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   // loop.
   while (tao_endpoint != 0)
     {
-      TAO_SCIOP_Endpoint *sciop_endpoint =
-        this->remote_endpoint (tao_endpoint);
+      TAO_SCIOP_Endpoint *sciop_endpoint = this->remote_endpoint (tao_endpoint);
 
       if (sciop_endpoint != 0)
         {
@@ -169,8 +168,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
   // Get the right synch options
   ACE_Synch_Options synch_options;
 
-  this->active_connect_strategy_->synch_options (timeout,
-                                                 synch_options);
+  this->active_connect_strategy_->synch_options (timeout, synch_options);
 
   // The code used to set the timeout to zero, with the intent of
   // polling the reactor for connection completion. However, the side-effect
@@ -219,8 +217,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
   // Make sure that we always do a remove_reference
   ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
 
-  TAO_Transport *transport =
-    svc_handler->transport ();
+  TAO_Transport *transport = svc_handler->transport ();
 
   if (result == -1)
     {
@@ -340,12 +337,12 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
 TAO_Profile *
 TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile;
+  TAO_Profile *pfile = 0;
   ACE_NEW_RETURN (pfile,
                   TAO_SCIOP_Profile (this->orb_core ()),
                   0);
 
-  int r = pfile->decode (cdr);
+  int const r = pfile->decode (cdr);
   if (r == -1)
     {
       pfile->_decr_refcnt ();
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 9b7d02c3e4a..a4c4cc1b67d 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -25,7 +25,7 @@ ACE_RCSID (Strategies,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
+                                        int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
   , host_ ()
   , port_ (683)  // default port (IANA assigned)
@@ -249,8 +249,7 @@ TAO_SCIOP_Endpoint::object_addr (void) const
 void
 TAO_SCIOP_Endpoint::object_addr_i (void) const
 {
-  if (this->object_addr_.set (this->port_,
-                              this->host_.in ()) == -1)
+  if (this->object_addr_.set (this->port_, this->host_.in ()) == -1)
     {
       // If this call fails, it most likely due a hostname
       // lookup failure caused by a DNS misconfiguration.  If
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 8734e78cdbc..ca3dfb1c365 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -56,8 +56,7 @@ TAO_SCIOP_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_SCIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
+TAO_SCIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 72e9a609a1d..a8655da4f71 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -6,7 +6,7 @@
 #if TAO_HAS_SCIOP == 1
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index f306345bca0..65b0fe7b905 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -332,8 +332,7 @@ TAO_SCIOP_Transport::get_listen_point (
   // Get the local address of the connection
   ACE_INET_Addr local_addr;
 
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
+  if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%P|%t) Could not resolve local ")
@@ -358,15 +357,12 @@ TAO_SCIOP_Transport::get_listen_point (
                         -1);
     }
 
-  for (size_t index = 0;
-       index != count;
-       index++)
+  for (size_t index = 0; index != count; index++)
     {
-      if (local_addr.get_ip_address()
-          == endpoint_addr[index].get_ip_address())
+      if (local_addr.get_ip_address() == endpoint_addr[index].get_ip_address())
         {
           // Get the count of the number of elements
-          CORBA::ULong len = listen_point_list.length ();
+          CORBA::ULong const len = listen_point_list.length ();
 
           // Increase the length by 1
           listen_point_list.length (len + 1);
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index fa502e57458..162f0f88e88 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -59,13 +59,9 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
   if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
+    return this->create_new_profile (object_key, mprofile, priority);
   else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
+    return this->create_shared_profile (object_key, mprofile, priority);
 }
 
 int
@@ -135,9 +131,7 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
     {
       // If <mprofile> doesn't contain SHMIOP_Profile, we need to create
       // one.
-      return create_new_profile (object_key,
-                                 mprofile,
-                                 priority);
+      return create_new_profile (object_key, mprofile, priority);
     }
   else
     {
@@ -208,8 +202,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (port)
     this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port));
 
-  return this->open_i (orb_core,
-                       reactor);
+  return this->open_i (orb_core, reactor);
 }
 
 int
@@ -232,13 +225,11 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
   //    address.
   this->host_ = this->address_.get_host_name ();
 
-  return this->open_i (orb_core,
-                       reactor);
+  return this->open_i (orb_core, reactor);
 }
 
 int
-TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
-                                       ACE_OFF_T size)
+TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, ACE_OFF_T size)
 {
   this->mmap_file_prefix_ = prefix;
   this->mmap_size_ = size;
@@ -247,8 +238,7 @@ TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
 }
 
 int
-TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
-                             ACE_Reactor *reactor)
+TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor)
 {
   this->orb_core_ = orb_core;
 
@@ -322,8 +312,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
       // This will be the actualy host name of the original endpoint.
       ACE_TCHAR tmp_host[MAXHOSTNAMELEN+1];
 
-      if (this->address_.get_host_name (tmp_host,
-                                        sizeof tmp_host) != 0)
+      if (this->address_.get_host_name (tmp_host, sizeof tmp_host) != 0)
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
@@ -368,8 +357,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
+  if (!(cdr.read_octet (major) && cdr.read_octet (minor)))
   {
     if (TAO_debug_level > 0)
       {
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 3b04e2fc151..43d791314ee 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -93,24 +93,24 @@ TAO_SHMIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (protocol_properties);
+            }
         }
-      else
+      catch (const ::CORBA::Exception&)
         {
-          tph->server_protocol_properties_at_orb_level (protocol_properties);
+          return -1;
         }
     }
-  catch ( ::CORBA::Exception&)
-    {
-      return -1;
-    }
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 1ac25106500..6e4e621d82b 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -11,7 +11,7 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Blocked_Connect_Strategy.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 04786b75501..998bb2175bc 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -3,7 +3,7 @@
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index bb99b50d002..6f66f057062 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -138,8 +138,8 @@ TAO_SHMIOP_Transport::recv (char *buf,
 }
 
 int
-TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, 
-                                    ACE_Time_Value *max_wait_time, 
+TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
+                                    ACE_Time_Value *max_wait_time,
                                     int)
 {
   if (TAO_debug_level > 3)
@@ -180,7 +180,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 
   const size_t missing_header_data = this->messaging_object ()->header_length ();
 
-  if (missing_header_data == 0) 
+  if (missing_header_data == 0)
     {
       return -1;
     }
@@ -226,7 +226,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
                                                        mesg_length) == -1)
       return -1;
 
-    if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) 
+    if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED)
       {
         // parse/marshal error happened
         return -1;
@@ -237,7 +237,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
         // we read too much data
         return -1;
       }
-    
+
     if (message_block.space () < qd.missing_data_)
       {
         const size_t message_size = message_block.length ()
@@ -295,7 +295,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
     {
       return -1;
     }
-  
+
   return 0;
 }
 
@@ -362,8 +362,7 @@ int
 TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }
 
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index e44b79d4173..7224a002623 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -104,8 +104,7 @@ public:
                             ACE_Time_Value *max_time_wait = 0);
 
   /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
+  virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor);
 
 private:
   /// The connection service handler used for accessing lower layer
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index a02b6d8f748..b249252d523 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -90,24 +90,24 @@ TAO_UIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-
-  try
+  if (tph != 0)
     {
-      if (client)
+      try
         {
-          tph->client_protocol_properties_at_orb_level (protocol_properties);
+          if (this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE)
+            {
+              tph->client_protocol_properties_at_orb_level (protocol_properties);
+            }
+          else
+            {
+              tph->server_protocol_properties_at_orb_level (protocol_properties);
+            }
         }
-      else
+      catch (const ::CORBA::Exception&)
         {
-          tph->server_protocol_properties_at_orb_level (protocol_properties);
+          return -1;
         }
     }
-  catch ( ::CORBA::Exception& ex)
-    {
-      return -1;
-    }
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -196,14 +196,13 @@ TAO_UIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
   // We don't use this upcall for I/O.  This is only used by the
   // Connector to indicate that the connection timedout.  Therefore,
   // we should call close().
-  int ret = this->close ();
+  int const ret = this->close ();
   this->reset_state (TAO_LF_Event::LFS_TIMEOUT);
   return ret;
 }
 
 int
-TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                           ACE_Reactor_Mask)
+TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 {
   ACE_ASSERT (0);
   return 0;
@@ -240,8 +239,7 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
     this->orb_core ()->lane_resources ().transport_cache ();
 
   // Add the handler to Cache
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
+  return cache.cache_idle_transport (&prop, this->transport ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index 107706a82b6..d1d3358d7b8 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -32,9 +32,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
 // ****************************************************************
 
 /**
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index fd9891fcd6a..9fd67d0804b 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -5,7 +5,7 @@
 #include "tao/Strategies/UIOP_Profile.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/Protocols_Hooks.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 91eefcecd09..0399804ad53 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -63,8 +63,7 @@ TAO_UIOP_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_UIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
+TAO_UIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index c19afd3c666..c33e1b5df65 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -1,19 +1,15 @@
 // -*- C++ -*-
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   UIOP_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   UIOP_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Fred Kuhns <fredk@cs.wustl.edu>Ossama Othman <othman@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UIOP_FACTORY_H
 #define TAO_UIOP_FACTORY_H
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
index d314968e62d..0ab0d04ffd2 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -54,7 +54,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void)
   TAO_Acceptor *acceptor = 0;
 
   // We are Lite factory
-  CORBA::Boolean lite_factory = 1;
+  CORBA::Boolean lite_factory = true;
   ACE_NEW_RETURN (acceptor,
                   TAO_UIOP_Acceptor (lite_factory),
                   0);
@@ -63,8 +63,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */,
-                                      ACE_TCHAR* /* argv */ [])
+TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
@@ -75,7 +74,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_connector (void)
   TAO_Connector *connector = 0;
 
   // We are a lite factory
-  CORBA::Boolean lite_factory = 1;
+  CORBA::Boolean lite_factory = true;
   ACE_NEW_RETURN (connector,
                   TAO_UIOP_Connector (lite_factory),
                   0);
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h
index 2941d5ee45c..f3818176aa6 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   UIOP_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   UIOP_Lite_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Fred Kuhns <fredk@cs.wustl.edu>
+ *  @author Ossama Othman <othman@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UIOP_LITE_FACTORY_H
 #define TAO_UIOP_LITE_FACTORY_H
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 9556bcca35a..8b37bb457d5 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -5,7 +5,7 @@
 #include "tao/Strategies/uiop_endpointsC.h"
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
+#include "tao/SystemException.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index c3cde036f2e..cce1c02c833 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -80,10 +80,8 @@ TAO_UIOP_Transport::send (iovec *iov, int iovcnt,
                           size_t &bytes_transferred,
                           const ACE_Time_Value *max_wait_time)
 {
-  const ssize_t retval =
-    this->connection_handler_->peer ().sendv (iov,
-                                              iovcnt,
-                                              max_wait_time);
+  ssize_t const retval =
+    this->connection_handler_->peer ().sendv (iov, iovcnt, max_wait_time);
 
   if (retval > 0)
     bytes_transferred = retval;
@@ -136,15 +134,10 @@ TAO_UIOP_Transport::send_request (TAO_Stub *stub,
                                   int message_semantics,
                                   ACE_Time_Value *max_wait_time)
 {
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
+  if (this->ws_->sending_request (orb_core, message_semantics) == -1)
     return -1;
 
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-
+  if (this->send_message (stream, stub, message_semantics, max_wait_time) == -1)
     return -1;
 
   this->first_request_sent();
@@ -190,8 +183,7 @@ int
 TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 30543397d63..e1238e2b917 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -98,7 +98,8 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
   // If this factory has already been disabled then
   // print a warning and exit because any options
   // are useless
-  if (this->factory_disabled_) {
+  if (this->factory_disabled_)
+  {
     ACE_DEBUG ((LM_WARNING,
                 ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n")
                 ACE_TEXT ("Advanced Resource Factory is disabled\n")));
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index d8befc55809..b7bf67f65f8 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -36,7 +36,8 @@ public:
  * etc.
  *
  */
-class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory
+class TAO_Strategies_Export TAO_Advanced_Resource_Factory :
+  public TAO_Default_Resource_Factory
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/tao/String_Alloc.cpp b/TAO/tao/String_Alloc.cpp
index 253542123b4..57f211eadc9 100644
--- a/TAO/tao/String_Alloc.cpp
+++ b/TAO/tao/String_Alloc.cpp
@@ -30,9 +30,7 @@ CORBA::string_dup (const char *str)
   if (copy != 0)
     {
       // The memcpy() assumes that the destination is a valid buffer.
-      ACE_OS::memcpy (copy,
-                      str,
-                      len + 1);
+      ACE_OS::memcpy (copy, str, len + 1);
     }
 
   return copy;
@@ -78,8 +76,7 @@ CORBA::wstring_dup (const WChar *const str)
       return 0;
     }
 
-  return ACE_OS::wscpy (retval,
-                        str);
+  return ACE_OS::wscpy (retval, str);
 }
 
 CORBA::WChar*
diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h
new file mode 100644
index 00000000000..a5a26b5a872
--- /dev/null
+++ b/TAO/tao/String_Const_Sequence_Element_T.h
@@ -0,0 +1,81 @@
+#ifndef guard_string_const_sequence_element_hpp
+#define guard_string_const_sequence_element_hpp
+/**
+ * @file
+ *
+ * @brief Implement the type returned by const operator[] in string
+ * sequences.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan and Johnny Willemsen
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename traits>
+class string_const_sequence_element
+{
+public:
+  typedef typename traits::char_type character_type;
+  typedef character_type * value_type;
+  typedef character_type const * const_value_type;
+  typedef typename traits::string_var string_var;
+  typedef typename traits::string_mgr string_mgr;
+
+public:
+  string_const_sequence_element(value_type const & e, CORBA::Boolean release)
+    : element_(&e)
+    , release_(release)
+  {
+  }
+
+  string_const_sequence_element(
+      string_const_sequence_element const & rhs)
+    : element_(rhs.element_)
+    , release_(rhs.release_)
+  {
+  }
+
+  ~string_const_sequence_element()
+  {
+  }
+
+  inline operator const_value_type() const
+  {
+    return *this->element_;
+  }
+
+  inline const character_type *in (void) const
+  {
+    return *this->element_;
+  }
+
+  CORBA::Boolean release() const
+  {
+    return this->release_;
+  }
+
+private:
+  // This function is not implemented
+  string_const_sequence_element();
+  string_const_sequence_element & operator=(string_const_sequence_element const & rhs);
+
+private:
+  const_value_type const * element_;
+  CORBA::Boolean release_;
+};
+
+} // namespace details
+} // namespace CORBA
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_string_const_sequence_element_hpp
diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h
index 9d7a2bec549..ff7f7403fcd 100644
--- a/TAO/tao/String_Sequence_Element_T.h
+++ b/TAO/tao/String_Sequence_Element_T.h
@@ -28,16 +28,16 @@ public:
   typedef character_type * value_type;
   typedef character_type const * const_value_type;
   typedef typename traits::string_var string_var;
+  typedef typename traits::string_out string_out;
   typedef typename traits::string_mgr string_mgr;
 
 private:
-  inline string_sequence_element<traits> & pseudo_copy_swap(
-      string_var & rhs)
+  inline string_sequence_element<traits> & pseudo_copy_swap(string_var & rhs)
   {
     if (release())
-    {
-      traits::release(*element_);
-    }
+      {
+        traits::release(*element_);
+      }
     *element_ = rhs._retn();
     return *this;
   }
@@ -100,6 +100,20 @@ public:
     return *this->element_;
   }
 
+  inline character_type *&inout (void) const {
+    return *this->element_;
+  }
+
+  inline string_out out (void) const {
+    return *this->element_;
+  }
+
+  inline const character_type *_retn (void) {
+    value_type * copy_ = this->element_;
+    *this->element_ = traits::default_initializer();
+    return *copy_;
+  }
+
   void swap(string_sequence_element & rhs)
   {
     std::swap(element_, rhs.element_);
diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h
index 3b55b49a011..ac36fe0e641 100644
--- a/TAO/tao/String_Traits_T.h
+++ b/TAO/tao/String_Traits_T.h
@@ -40,11 +40,21 @@ struct string_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
+  // Allow MSVC++ >= 8 checked iterators to be used.
+  template <typename iter>
+  inline static void copy_range(
+      char_type ** begin, char_type ** end, iter dst)
+  {
+    std::transform(begin, end, dst, &derived::duplicate);
+  }
+# else 
   inline static void copy_range(
       char_type ** begin, char_type ** end, char_type ** dst)
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
+# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       char_type ** begin, char_type ** end)
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 7630447ac0d..29802a00e39 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -24,6 +24,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
+#include "ace/CORBA_macros.h"
 
 
 ACE_RCSID (tao,
@@ -155,9 +156,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
 }
 
 int
-TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
-                           CORBA::ULong &index
-                           )
+TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
   // lock.
@@ -172,9 +171,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
     {
       if (this->forwarded_ior_info_ == 0)
         {
-          this->get_profile_ior_info (*this->forward_profiles_,
-                                      tmp_info
-                                      );
+          this->get_profile_ior_info (*this->forward_profiles_, tmp_info);
 
           this->forwarded_ior_info_ = tmp_info;
         }
@@ -198,9 +195,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
   // Else we look at the base profiles
   if (this->ior_info_ == 0)
     {
-      this->get_profile_ior_info (this->base_profiles_,
-                                  tmp_info
-                                  );
+      this->get_profile_ior_info (this->base_profiles_, tmp_info);
 
       this->ior_info_ = tmp_info;
     }
@@ -210,8 +205,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
        ind < this->base_profiles_.profile_count ();
        ++ind)
     {
-      if (this->base_profiles_.get_profile (ind) ==
-          this->profile_in_use_)
+      if (this->base_profiles_.get_profile (ind) == this->profile_in_use_)
         {
           index = ind;
           ior_info = this->ior_info_;
@@ -244,17 +238,12 @@ TAO_Stub::object_key (void) const
 }
 
 int
-TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
-                                IOP::IOR *&ior_info
-                                )
+TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info)
 {
-
-
   ACE_NEW_THROW_EX (ior_info,
                     IOP::IOR (),
                     CORBA::NO_MEMORY ());
 
-
   // Get the number of elements
   CORBA::ULong const count = profiles.profile_count ();
 
@@ -267,12 +256,10 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
     {
       TAO_Profile *prof = profiles.get_profile (index);
 
-      IOP::TaggedProfile *tp =
-        prof->create_tagged_profile ();
+      IOP::TaggedProfile *tp = prof->create_tagged_profile ();
 
       if (tp == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (),
-                          -1);
+        throw ::CORBA::NO_MEMORY ();
       ior_info->profiles[index] = *tp;
     }
 
@@ -292,8 +279,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated)
         }
       else
         {
-          this->object_proxy_broker_ =
-            the_tao_remote_object_proxy_broker ();
+          this->object_proxy_broker_ = the_tao_remote_object_proxy_broker ();
         }
       this->is_collocated_ = collocated;
     }
@@ -305,8 +291,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated)
 // NOTE that this must NOT go across the network!
 
 CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max
-                )
+TAO_Stub::hash (CORBA::ULong max)
 {
   // we rely on the profile objects that its address info
   return this->base_profiles_.hash (max);
@@ -425,8 +410,7 @@ TAO_Stub::forward_back_one (void)
 // specific reconciliation, etc.
 
 CORBA::Policy_ptr
-TAO_Stub::get_policy (CORBA::PolicyType type
-                      )
+TAO_Stub::get_policy (CORBA::PolicyType type)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -434,24 +418,19 @@ TAO_Stub::get_policy (CORBA::PolicyType type
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result =
-        this->policies_->get_policy (type
-                                    );
+      result = this->policies_->get_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
-      result =
-        this->orb_core_->get_policy_including_current (type
-                                                      );
+      result = this->orb_core_->get_policy_including_current (type);
     }
 
   return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
-                             )
+TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -459,18 +438,13 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result =
-        this->policies_->get_cached_policy (type
-                                           );
-
-
+      result = this->policies_->get_cached_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
       result =
-        this->orb_core_->get_cached_policy_including_current (type
-                                                             );
+        this->orb_core_->get_cached_policy_including_current (type);
     }
 
   return result._retn ();
@@ -478,8 +452,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
 
 TAO_Stub *
 TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                CORBA::SetOverrideType set_add
-                                )
+                                CORBA::SetOverrideType set_add)
 {
   // Notice the use of an explicit constructor....
   auto_ptr<TAO_Policy_Set> policy_manager (
@@ -487,29 +460,21 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                           );
+      policy_manager->set_policy_overrides (policies, set_add);
     }
   else if (this->policies_ == 0)
     {
-      policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE
-                                           );
+      policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE);
     }
   else
     {
-      policy_manager->copy_from (this->policies_
-                                 );
+      policy_manager->copy_from (this->policies_);
 
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                           );
+      policy_manager->set_policy_overrides (policies, set_add);
     }
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
-                                                 this->base_profiles_
-                                                );
+                                                 this->base_profiles_);
 
   stub->policies_ = policy_manager.release ();
 
@@ -520,8 +485,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                )
+TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types)
 {
   if (this->policies_ == 0)
     {
@@ -534,8 +498,7 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
     }
   else
     {
-      return this->policies_->get_policy_overrides (types
-                                                   );
+      return this->policies_->get_policy_overrides (types);
     }
 }
 
@@ -549,13 +512,10 @@ TAO_Stub::transport_queueing_strategy (void)
   bool has_synchronization;
   Messaging::SyncScope scope;
 
-  this->orb_core_->call_sync_scope_hook (this,
-                                         has_synchronization,
-                                         scope);
+  this->orb_core_->call_sync_scope_hook (this, has_synchronization, scope);
 
   if (has_synchronization == true)
-    return this->orb_core_->get_transport_queueing_strategy  (this,
-                                                              scope);
+    return this->orb_core_->get_transport_queueing_strategy  (this, scope);
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
@@ -590,7 +550,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
     }
   else
     {
-        ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                                 guard,
                                 *this->profile_lock_ptr_,
                                 0));
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index d1b4d7cc30d..34e957bdbba 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -14,6 +14,7 @@
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Context.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/PortableInterceptorC.h"
@@ -51,7 +52,6 @@ namespace TAO
 
   Invocation_Status
   Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
 
@@ -65,18 +65,18 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
     // Start the interception point here..
-    s =
-      this->send_request_interception ();
+    s = this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
-#endif /*TAO_HAS_INTERCEPTORS */
 
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to do just this.
     try
       {
+#endif /*TAO_HAS_INTERCEPTORS */
+
         TAO_OutputCDR &cdr = this->resolver_.transport ()->out_stream ();
 
         cdr.message_attributes (this->details_.request_id (),
@@ -84,12 +84,9 @@ namespace TAO
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
                                 max_wait_time);
 
-        this->write_header (tspec,
-                            cdr
-                           );
+        this->write_header (tspec, cdr);
 
-        this->marshal_data (cdr
-                           );
+        this->marshal_data (cdr);
 
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
@@ -104,19 +101,14 @@ namespace TAO
             // we close the connection?
             this->resolver_.transport ()->close_connection ();
 
-            ACE_THROW_RETURN (
-              CORBA::INTERNAL (
-                               0,
-                               CORBA::COMPLETED_NO),
-              s);
+            throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
           }
 
         countdown.update ();
 
         s = this->send_message (cdr,
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
-                                max_wait_time
-                               );
+                                max_wait_time);
 
 #if TAO_HAS_INTERCEPTORS == 1
         // @@NOTE: Too much code repetition.
@@ -125,13 +117,12 @@ namespace TAO
         // before we leave.
         if (s == TAO_INVOKE_RESTART)
           {
-            const Invocation_Status tmp =
-              this->receive_other_interception ();
+            Invocation_Status const tmp = this->receive_other_interception ();
 
             if (tmp != TAO_INVOKE_SUCCESS)
               s = tmp;
           }
-#endif /*TAO_HAS_INTERCEPTORS */
+#endif /* TAO_HAS_INTERCEPTORS */
 
         if (s != TAO_INVOKE_SUCCESS)
           return s;
@@ -161,23 +152,18 @@ namespace TAO
         // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
         // environment.
 
-        s =
-          this->wait_for_reply (max_wait_time,
-                                rd,
-                                dispatch_guard
-                               );
+        s = this->wait_for_reply (max_wait_time, rd, dispatch_guard);
 
 #if TAO_HAS_INTERCEPTORS == 1
         if (s == TAO_INVOKE_RESTART)
           {
-            Invocation_Status const tmp =
-              this->receive_other_interception ();
+            Invocation_Status const tmp = this->receive_other_interception ();
 
             // Push the latest values for the return..
             if (tmp != TAO_INVOKE_SUCCESS)
               s = tmp;
           }
-#endif /*TAO_HAS_INTERCEPTORS */
+#endif /* TAO_HAS_INTERCEPTORS */
 
         if (s != TAO_INVOKE_SUCCESS)
           return s;
@@ -185,9 +171,7 @@ namespace TAO
         // What happens when the above call returns an error through
         // the return value? That would be bogus as per the contract
         // in the interface. The call violated the contract
-
-        s = this->check_reply_status (rd
-                                     );
+        s = this->check_reply_status (rd);
 
         // For some strategies one may want to release the transport
         // back to  cache after receiving the reply.
@@ -206,14 +190,9 @@ namespace TAO
           }
         if (tmp != TAO_INVOKE_SUCCESS)
           s = tmp;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
       }
     catch ( ::CORBA::Exception& ex)
       {
-#if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
           this->handle_any_exception (&ex);
 
@@ -222,11 +201,23 @@ namespace TAO
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
                  || status == PortableInterceptor::USER_EXCEPTION)
-#else
-        ACE_UNUSED_ARG (ex);
-#endif /*TAO_HAS_INTERCEPTORS*/
           throw;
       }
+    catch (...)
+      {
+        // Notify interceptors of non-CORBA exception, and propagate
+        // that exception to the caller.
+
+         PortableInterceptor::ReplyStatus const st =
+           this->handle_all_exception ();
+
+         if (st == PortableInterceptor::LOCATION_FORWARD ||
+             st == PortableInterceptor::TRANSPORT_RETRY)
+           s = TAO_INVOKE_RESTART;
+         else
+           throw;
+      }
+#endif /* TAO_HAS_INTERCEPTORS */
 
     return s;
   }
@@ -235,7 +226,6 @@ namespace TAO
   Synch_Twoway_Invocation::wait_for_reply (ACE_Time_Value *max_wait_time,
                                            TAO_Synch_Reply_Dispatcher &rd,
                                            TAO_Bind_Dispatcher_Guard &bd)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /*
      * Precondition: The call went to the remote
@@ -245,7 +235,7 @@ namespace TAO
      * exception. Success alone is returned through the return value.
      */
 
-    const int reply_error =
+    int const reply_error =
       this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time, rd);
 
     if (TAO_debug_level > 0 && max_wait_time != 0)
@@ -294,12 +284,11 @@ namespace TAO
               {
                 // Just a timeout with completed_maybe, don't close
                 // the connection or  anything
-                ACE_THROW_RETURN (CORBA::TIMEOUT (
-                                    CORBA::SystemException::_tao_minor_code (
-                                      TAO_TIMEOUT_RECV_MINOR_CODE,
-                                      errno),
-                                    CORBA::COMPLETED_MAYBE),
-                                  TAO_INVOKE_FAILURE);
+                throw ::CORBA::TIMEOUT (
+                  CORBA::SystemException::_tao_minor_code (
+                    TAO_TIMEOUT_RECV_MINOR_CODE,
+                    errno),
+                  CORBA::COMPLETED_MAYBE);
               }
           }
         else
@@ -312,8 +301,7 @@ namespace TAO
                 return
                   this->orb_core ()->service_raise_comm_failure (
                     this->details_.request_service_context ().service_info (),
-                    this->resolver_.profile ()
-                   );
+                    this->resolver_.profile ());
 
               }
             catch (const ::CORBA::Exception&)
@@ -328,8 +316,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd
-                                               )
+  Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd)
   {
     /*
      * Precondition: We probably got a reply. <ACE_Thread::self> is
@@ -340,8 +327,7 @@ namespace TAO
      * returning a restart since that is what needed to be done by the
      * callee.
      */
-    TAO_InputCDR &cdr =
-      rd.reply_cdr ();
+    TAO_InputCDR &cdr = rd.reply_cdr ();
 
     // Set the translators
     this->resolver_.transport ()->assign_translators (&cdr, 0);
@@ -355,27 +341,22 @@ namespace TAO
       {
       case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
         {
-          Reply_Guard mon (this,
-                           TAO_INVOKE_FAILURE);
+          Reply_Guard mon (this, TAO_INVOKE_FAILURE);
           if (this->details_.demarshal_args (cdr) == false)
             {
-              ACE_THROW_RETURN (CORBA::MARSHAL (),
-                                TAO_INVOKE_FAILURE);
+              throw ::CORBA::MARSHAL ();
             }
 
           mon.set_status (TAO_INVOKE_SUCCESS);
         }
         break;
       case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-        return this->location_forward (cdr
-                                      );
+        return this->location_forward (cdr);
       case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM:
         {
           // Unmarshal the location forward object and set the
           // variable this->forward_to_.
-          Invocation_Status const s
-            = this->location_forward (cdr
-                                     );
+          Invocation_Status const s = this->location_forward (cdr);
           if (s != TAO_INVOKE_FAILURE)
             {
               // de-marshalling of permanent object reference was successfull
@@ -392,24 +373,20 @@ namespace TAO
                                "TAO (%P|%t) - Synch_Twoway_Invocation::"
                                 "check_reply_status: unexpected LOCATION_FORWARD_PERM reply\n"));
 
-                   ACE_THROW_RETURN (CORBA::INTERNAL (0, CORBA::COMPLETED_NO),
-                                     TAO_INVOKE_FAILURE);
+                   throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
                 }
             }
 
           return s;
         }
       case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-        return this->handle_user_exception (cdr
-                                           );
+        return this->handle_user_exception (cdr);
       case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-        return this->handle_system_exception (cdr
-                                             );
+        return this->handle_system_exception (cdr);
 
       case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE:
         {
-          Reply_Guard mon (this,
-                           TAO_INVOKE_FAILURE);
+          Reply_Guard mon (this, TAO_INVOKE_FAILURE);
           // We have received a message with a request to change the
           // addressing mode. First let us read the mode that the
           // server/agent asks for.
@@ -419,15 +396,12 @@ namespace TAO
             {
               // Could not demarshal the addressing disposition, raise an local
               // CORBA::MARSHAL
-            ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                              CORBA::COMPLETED_MAYBE),
-                              TAO_INVOKE_FAILURE);
+              throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
             }
 
           // Now set this addressing mode in the profile, so that
           // the next invocation need not go through this.
-          this->resolver_.profile ()->addressing_mode (addr_mode
-                                                      );
+          this->resolver_.profile ()->addressing_mode (addr_mode);
 
           mon.set_status (TAO_INVOKE_RESTART);
 
@@ -440,10 +414,8 @@ namespace TAO
 
   Invocation_Status
   Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    Reply_Guard mon (this,
-                     TAO_INVOKE_FAILURE);
+    Reply_Guard mon (this, TAO_INVOKE_FAILURE);
 
     if (TAO_debug_level > 3)
       {
@@ -456,12 +428,11 @@ namespace TAO
 
     if ((inp_stream >> fwd) == 0)
       {
-        ACE_THROW_RETURN (CORBA::MARSHAL (
-            CORBA::SystemException::_tao_minor_code (
-              TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-              errno),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::MARSHAL (
+          CORBA::SystemException::_tao_minor_code (
+            TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
+            errno),
+          CORBA::COMPLETED_NO);
       }
 
     this->forwarded_reference (fwd.in ());
@@ -473,7 +444,6 @@ namespace TAO
 
   Invocation_Status
   Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     Reply_Guard mon (this,
                      TAO_INVOKE_FAILURE);
@@ -490,9 +460,7 @@ namespace TAO
       {
         // Could not demarshal the exception id, raise an local
         // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
       }
 
     CORBA::Exception *exception = this->details_.corba_exception (buf.in ());
@@ -523,7 +491,6 @@ namespace TAO
 
   Invocation_Status
   Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Reply_Guard mon (this, TAO_INVOKE_FAILURE);
 
@@ -538,27 +505,22 @@ namespace TAO
       {
         // Could not demarshal the exception id, raise an local
         // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
       }
 
     CORBA::ULong minor = 0;
     CORBA::ULong completion = 0;
 
-    if ((cdr >> minor) == 0
-        || (cdr >> completion) == 0)
+    if ((cdr >> minor) == 0 || (cdr >> completion) == 0)
       {
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
+        throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
       }
 
     // Special handling for non-fatal system exceptions.
     //
     // Note that we are careful to retain "at most once" semantics.
     if ((ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/TRANSIENT:1.0")   == 0 ||
+                                "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0 ||
          ACE_OS_String::strcmp (type_id.in (),
                                 "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0 ||
          ACE_OS_String::strcmp (type_id.in (),
@@ -577,8 +539,7 @@ namespace TAO
           Invocation_Status const s =
             this->orb_core ()->service_raise_transient_failure (
               this->details_.request_service_context ().service_info (),
-              this->resolver_.profile ()
-             );
+              this->resolver_.profile ());
 
           if (s == TAO_INVOKE_RESTART)
             return s;
@@ -646,11 +607,10 @@ namespace TAO
 
   Invocation_Status
   Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time)
-    ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
 
-    const CORBA::Octet response_flags = this->details_.response_flags ();
+    CORBA::Octet const response_flags = this->details_.response_flags ();
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
@@ -670,15 +630,15 @@ namespace TAO
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
+
+    try
+      {
 #endif /*TAO_HAS_INTERCEPTORS */
 
-    TAO_Transport* transport =
-      this->resolver_.transport ();
+        TAO_Transport* const transport = this->resolver_.transport ();
 
-    TAO_OutputCDR &cdr = transport->out_stream ();
+        TAO_OutputCDR &cdr = transport->out_stream ();
 
-    try
-      {
         cdr.message_attributes (this->details_.request_id (),
                                 this->resolver_.stub (),
                                 TAO_Transport::TAO_ONEWAY_REQUEST,
@@ -690,7 +650,7 @@ namespace TAO
 
         countdown.update ();
 
-        if (transport->is_connected())
+        if (transport->is_connected ())
           {
             // We have a connected transport so we can send the message
             s = this->send_message (cdr,
@@ -709,13 +669,10 @@ namespace TAO
           }
 
 #if TAO_HAS_INTERCEPTORS == 1
-        s =
-          this->receive_other_interception ();
-#endif /*TAO_HAS_INTERCEPTORS */
+        s = this->receive_other_interception ();
       }
     catch ( ::CORBA::Exception& ex)
       {
-#if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
           this->handle_any_exception (&ex);
 
@@ -724,11 +681,23 @@ namespace TAO
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-#else
-        ACE_UNUSED_ARG (ex);
-#endif /*TAO_HAS_INTERCEPTORS*/
           throw;
       }
+    catch (...)
+      {
+        // Notify interceptors of non-CORBA exception, and propagate
+        // that exception to the caller.
+
+         PortableInterceptor::ReplyStatus const st =
+           this->handle_all_exception ();
+
+         if (st == PortableInterceptor::LOCATION_FORWARD ||
+             st == PortableInterceptor::TRANSPORT_RETRY)
+           s = TAO_INVOKE_RESTART;
+         else
+           throw;
+      }
+#endif /* TAO_HAS_INTERCEPTORS */
 
     return s;
   }
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 2d208e01a1e..58aa96774c6 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
@@ -80,9 +80,7 @@ namespace TAO
      * invocation. This method is also nerve centre for the
      * interceptor invocation points.
      */
-    Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time
-                                     )
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time);
 
   protected:
 
@@ -92,20 +90,14 @@ namespace TAO
      * example the DII needs a totally different method of
      * user exception exception handling
      */
-    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr
-                                                     )
-      ACE_THROW_SPEC ((CORBA::Exception));
+    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr);
 
     /// Helper method used to handle location forwarded replies.
-    Invocation_Status location_forward (TAO_InputCDR &cdr
-                                        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    Invocation_Status location_forward (TAO_InputCDR &cdr);
 
     /// Helper method used to handle system exceptions from the remote
     /// objects.
-    Invocation_Status handle_system_exception (TAO_InputCDR &cdr
-                                               )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    Invocation_Status handle_system_exception (TAO_InputCDR &cdr);
 
     /// As the name suggests waits for a reply from the remote ORB.
     /**
@@ -113,9 +105,7 @@ namespace TAO
      */
     Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time,
                                       TAO_Synch_Reply_Dispatcher &rd,
-                                      TAO_Bind_Dispatcher_Guard &bd
-                                      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                      TAO_Bind_Dispatcher_Guard &bd);
 
   private:
 
@@ -124,10 +114,7 @@ namespace TAO
     /**
      * This method returns an exception when there is an error.
      */
-    Invocation_Status check_reply_status (
-        TAO_Synch_Reply_Dispatcher &rd
-       );
-
+    Invocation_Status check_reply_status (TAO_Synch_Reply_Dispatcher &rd);
   };
 
   /**
@@ -167,9 +154,7 @@ namespace TAO
 
     /// Method used by the adapter to kickstart an oneway invocation
     /// to the remote object.
-    Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time
-                                     )
-      ACE_THROW_SPEC ((CORBA::Exception));
+    Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time);
   };
 
   /**
@@ -182,8 +167,7 @@ namespace TAO
   {
   public:
 
-    Reply_Guard (Invocation_Base *s,
-                 Invocation_Status is);
+    Reply_Guard (Invocation_Base *s, Invocation_Status is);
 
     /// The destructor calls Invocation_Base::reply_received with the
     /// right reply status, which is useful for PI's.
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index afa14627a05..85d89087e1d 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -135,15 +135,6 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
     }
   else
     {
-      // No allocator, so use the common heap!
-      if (TAO_debug_level == 4)
-        {
-          // This debug is for testing purposes!
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Synch_Queued_Message::clone\n"
-                      "Using global pool for allocation \n"));
-        }
-
       ACE_NEW_RETURN (qm,
                       TAO_Synch_Queued_Message (mb, this->orb_core_, 0, 0),
                       0);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 9e03e639281..c2a8e88b54b 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -110,8 +110,7 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src)
 }
 
 void
-CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
-                                     ) const
+CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr) const
 {
   if (cdr.write_string (this->_rep_id ())
       && cdr.write_ulong (this->minor ())
@@ -124,8 +123,7 @@ CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void
-CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
-                                     )
+CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr)
 {
   // The string is read by the caller, to determine the exact type of
   // the exception.  We just decode the fields...
@@ -210,8 +208,7 @@ CORBA::SystemException::_tao_duplicate (void) const
 }
 
 CORBA::ULong
-CORBA::SystemException::_tao_minor_code (u_int location,
-                                         int errno_value)
+CORBA::SystemException::_tao_minor_code (u_int location, int errno_value)
 {
   return
     TAO::VMCID
@@ -950,7 +947,7 @@ TAO::create_system_exception (const char *id)
 void \
 CORBA::name ::_raise (void) const \
 { \
-  TAO_RAISE (*this); \
+  throw *this; \
 }
 
 STANDARD_EXCEPTION_LIST
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 7c2c999804d..956843a6628 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -28,7 +28,6 @@
 
 #include "tao/Exception.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_OutputCDR;
@@ -85,6 +84,14 @@ namespace CORBA
   public:
 
     /// Copy constructor.
+    /**
+     * @note This constructor should be protected, but VC7.1 at
+     *       warning level 4 complains about the inaccessible copy
+     *       constructor preventing it from being caught.  However,
+     *       that probably isn't true for most cases since CORBA
+     *       exceptions are typically caught by reference, not by
+     *       copy.
+     */
     SystemException (const SystemException & src);
 
     /// Destructor.
@@ -120,15 +127,12 @@ namespace CORBA
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ) const;
+    virtual void _tao_encode (TAO_OutputCDR &cdr) const;
 
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                             );
+    virtual void _tao_decode (TAO_InputCDR &cdr);
 
     /// Helper to create a minor status value.
-    static CORBA::ULong _tao_minor_code (u_int location,
-                                         int errno_value);
+    static CORBA::ULong _tao_minor_code (u_int location, int errno_value);
 
     /// Helper to translate a platform-specific errno to a TAO errno
     /// value.
@@ -146,8 +150,7 @@ namespace CORBA
     SystemException & operator= (const SystemException &src);
 
     /// Constructor using a repository id.
-    SystemException (CORBA::ULong code,
-                     CORBA::CompletionStatus completed);
+    SystemException (CORBA::ULong code, CORBA::CompletionStatus completed);
 
     /// Constructor using a repository id.
     SystemException (const char *repository_id,
@@ -158,8 +161,7 @@ namespace CORBA
     /// Return the exception description associated with the given OMG
     /// minor code.
     static const char *_tao_get_omg_exception_description (
-      const CORBA::SystemException &exc,
-      CORBA::ULong minor_code);
+      const CORBA::SystemException &exc, CORBA::ULong minor_code);
 
   private:
     /// Minor code.
@@ -167,7 +169,6 @@ namespace CORBA
 
     /// Completion status.
     CORBA::CompletionStatus completed_;
-
   };
 
   // Declarations for all of the CORBA standard exceptions.
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 73c596f02d9..c4ba9ee8920 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -16,7 +16,6 @@
 #include "tao/Adapter_Factory.h"
 #include "tao/Default_Stub_Factory.h"
 #include "tao/Default_Endpoint_Selector_Factory.h"
-#include "tao/Default_Protocols_Hooks.h"
 #include "tao/Default_Thread_Lane_Resources_Manager.h"
 #include "tao/Default_Collocation_Resolver.h"
 #include "tao/Codeset_Manager_Factory_Base.h"
@@ -68,7 +67,7 @@ namespace
    */
   int
   parse_global_args_i (int &argc,
-                       char **argv,
+                       ACE_TCHAR **argv,
                        CORBA::StringSeq &svc_config_argv,
                        bool apply_values);
 
@@ -84,7 +83,7 @@ namespace
    */
   int
   parse_svcconf_args_i (int &argc,
-                       char **argv,
+                       ACE_TCHAR **argv,
                        CORBA::StringSeq &svc_config_argv);
 
   /**
@@ -116,7 +115,7 @@ namespace
    */
   int
   parse_private_args_i (int &argc,
-                        char **argv,
+                        ACE_TCHAR **argv,
                         CORBA::StringSeq & svc_config_argv,
                         bool & skip_service_config_open);
 
@@ -294,15 +293,15 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg,
 
       // Be certain to copy the program name so that service configurator
       // has something to skip!
-      ACE_CString argv0 ("");
+      ACE_CString gargv0 ("");
 
       if (argc > 0 && argv != 0)
         {
-          argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]);
+          gargv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]);
         }
 
       global_svc_config_argv.length (1);
-      global_svc_config_argv[0] = argv0.c_str ();
+      global_svc_config_argv[0] = gargv0.c_str ();
 
       if (parse_global_args_i (argc, argv, global_svc_config_argv, true) == -1)
         {
@@ -337,7 +336,6 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg,
 
       register_additional_services_i (theone);
 
-
       if (TAO_debug_level > 4)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) Default ORB - global ")
@@ -538,7 +536,6 @@ namespace
     pcfg->process_directive (ace_svc_desc_TAO_Default_Stub_Factory);
     pcfg->process_directive (
       ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
-    pcfg->process_directive (ace_svc_desc_TAO_Default_Protocols_Hooks);
     pcfg->process_directive (
       ace_svc_desc_TAO_Default_Thread_Lane_Resources_Manager_Factory);
     pcfg->process_directive (ace_svc_desc_TAO_Default_Collocation_Resolver);
@@ -638,7 +635,7 @@ namespace
 
   int
   parse_svcconf_args_i (int &argc,
-                        char **argv,
+                        ACE_TCHAR **argv,
                         CORBA::StringSeq &svc_config_argv)
   {
     // Extract the Service Configurator ORB options from the argument
@@ -701,7 +698,7 @@ namespace
 
   int
   parse_private_args_i (int &argc,
-                        char **argv,
+                        ACE_TCHAR **argv,
                         CORBA::StringSeq &svc_config_argv,
                         bool & skip_service_config_open)
   {
@@ -761,12 +758,21 @@ namespace
               negotiate_codesets = (ACE_OS::atoi (current_arg));
             arg_shifter.ignore_arg();
           }
-        // Can't interpret this argument.
-        // Move on to the next argument.
+        else if (0 != (current_arg =
+                       arg_shifter.get_the_parameter
+                       (ACE_TEXT ("-ORBDebugLevel"))))
+          {
+            // Allowing different ORBs to change the global debug
+            // level may be unexpected, but since this
+            TAO_debug_level = ACE_OS::atoi (current_arg);
+
+            arg_shifter.consume_arg ();
+          }
         else
           {
-            // Any arguments that don't match are ignored so that
-            // the caller can still use them.
+            // Can't interpret this argument.  Move on to the next
+            // argument.  Any arguments that don't match are ignored
+            // so that the caller can still use them.
             arg_shifter.ignore_arg ();
           }
       }
@@ -776,7 +782,7 @@ namespace
 
   int
   parse_global_args_i (int &argc,
-                       char **argv,
+                       ACE_TCHAR **argv,
                        CORBA::StringSeq &svc_config_argv,
                        bool apply_values)
   {
@@ -807,7 +813,6 @@ namespace
       }
 #endif  /* TAO_DEBUG && !ACE_HAS_WINCE */
 
-
     // Extract the Service Configurator ORB options from the argument
     // vector.
     ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -815,7 +820,6 @@ namespace
 
     while (arg_shifter.is_anything_left ())
       {
-        const ACE_TCHAR *current_arg = 0;
         if (0 == arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDebug")))
           {
             if (apply_values)
@@ -827,17 +831,6 @@ namespace
 
             arg_shifter.consume_arg ();
           }
-        else if (0 != (current_arg =
-                       arg_shifter.get_the_parameter
-                       (ACE_TEXT ("-ORBDebugLevel"))))
-          {
-            if (apply_values)
-              {
-                TAO_debug_level =
-                  ACE_OS::atoi (current_arg);
-              }
-            arg_shifter.consume_arg ();
-          }
         else if (0 == arg_shifter.cur_arg_strncasecmp
                  (ACE_TEXT ("-ORBDaemon")))
           {
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 18666d56946..448e00e270f 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -383,7 +383,7 @@ TAO_ServerRequest::tao_send_reply (void)
 }
 
 void
-TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
+TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
 {
   if (this->response_expected_ && !this->collocated ())
     {
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 8034d920b28..ff0129ade41 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -223,7 +223,7 @@ public:
 
   void tao_send_reply (void);
 
-  void tao_send_reply_exception (CORBA::Exception&);
+  void tao_send_reply_exception (const CORBA::Exception& ex);
 
   /// Set the boolean member to 1.
   void is_dsi (void);
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 9fa29b29fe6..345d30cb3f9 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/TAO_Singleton_Manager.h"
-#include "tao/Exception.h"
 
 #include "ace/Guard_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -12,16 +11,6 @@
 # include "tao/TAO_Singleton_Manager.inl"
 #endif /* ! __ACE_INLINE__ */
 
-#if defined (ACE_MVS)
-#  include /**/ <unexpect.h>
-#else
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#  include /**/ <exception>
-# else
-#  include /**/ <exception.h>
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-#endif /* ACE_MVS */
-
 ACE_RCSID (tao,
            TAO_Singleton_Manager,
            "$Id$")
@@ -62,7 +51,6 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
     , internal_lock_ (0)
 # endif /* ACE_MT_SAFE */
-    , old_unexpected_ (0)
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_NEW (this->internal_lock_,
@@ -264,17 +252,6 @@ TAO_Singleton_Manager::fini (void)
   this->internal_lock_ = 0;
 #endif /* ACE_MT_SAFE */
 
-  // Restore the old unexpected exception handler since TAO will no
-  // longer be handling exceptions.  Allow the application to once
-  // again handle unexpected exceptions.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  (void) std::set_unexpected (this->old_unexpected_);
-# else
-  (void) set_unexpected (this->old_unexpected_);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
   // Indicate that this TAO_Singleton_Manager instance has been shut down.
   this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
@@ -307,24 +284,6 @@ TAO_Singleton_Manager::shutting_down (void)
     : 1;
 }
 
-void
-TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u)
-{
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  this->old_unexpected_ = std::set_unexpected (u);
-# else
-  this->old_unexpected_ = set_unexpected (u);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-}
-
 int
 TAO_Singleton_Manager::at_exit_i (void *object,
                                   ACE_CLEANUP_FUNC cleanup_hook,
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 33b60e6251f..340e0048714 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -30,8 +30,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef void (*TAO_unexpected_handler)(void);
-
 /**
  * @class TAO_Singleton_Manager
  *
@@ -120,15 +118,6 @@ public:
                       ACE_CLEANUP_FUNC cleanup_hook,
                       void *param);
 
-  /// Set a new unexpected exception handler.
-  /**
-   * The old one will be stored for restoration later on.
-   *
-   * @note Calling this method multiple times will cause the stored
-   *       old unexpected exception handler pointer to be lost.
-   */
-  void _set_unexpected (TAO_unexpected_handler u);
-
 protected:
 
   /// Force allocation on the heap.
@@ -169,15 +158,6 @@ private:
   TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_;
 #endif /* ACE_MT_SAFE */
 
-  /// The old unexpected exception handler.
-  /**
-   * A pointer to the old unexpected exception handler is stored so
-   * that it can be restored when TAO is unloaded, for example.
-   * Otherwise, any unexpected exceptions will result in a call to
-   * TAO's unexpected exception handler which may no longer exist if
-   * TAO was unloaded.
-   */
-  TAO_unexpected_handler old_unexpected_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 05cf54ef558..7580d2a3b28 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -46,10 +46,8 @@ TAO_Tagged_Components::set_code_sets (
 void
 TAO_Tagged_Components::set_code_sets (CONV_FRAME::CodeSetComponentInfo &ci)
 {
-  this->set_code_sets_i (this->code_sets_.ForCharData,
-                         ci.ForCharData);
-  this->set_code_sets_i (this->code_sets_.ForWcharData,
-                         ci.ForWcharData);
+  this->set_code_sets_i (this->code_sets_.ForCharData, ci.ForCharData);
+  this->set_code_sets_i (this->code_sets_.ForWcharData, ci.ForWcharData);
   this->code_sets_set_ = 1;
 
   TAO_OutputCDR cdr;
@@ -170,10 +168,8 @@ TAO_Tagged_Components::set_known_component_i (
           return;
         }
 
-      this->set_code_sets_i (this->code_sets_.ForCharData,
-                             ci.ForCharData);
-      this->set_code_sets_i (this->code_sets_.ForWcharData,
-                             ci.ForWcharData);
+      this->set_code_sets_i (this->code_sets_.ForCharData, ci.ForCharData);
+      this->set_code_sets_i (this->code_sets_.ForWcharData, ci.ForWcharData);
       this->code_sets_set_ = 1;
     }
 }
@@ -251,8 +247,7 @@ TAO_Tagged_Components::remove_component (IOP::ComponentId id)
 }
 
 int
-TAO_Tagged_Components::remove_known_component_i (
-    IOP::ComponentId tag)
+TAO_Tagged_Components::remove_known_component_i (IOP::ComponentId tag)
 {
   if (tag == IOP::TAG_ORB_TYPE)
     {
@@ -325,12 +320,11 @@ TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
       return 0;
     }
 
-  CORBA::ULong l = this->components_.length ();
+  CORBA::ULong const l = this->components_.length ();
 
   for (CORBA::ULong i = 0; i != l; ++i)
     {
-      const IOP::TaggedComponent &component =
-        this->components_[i];
+      const IOP::TaggedComponent &component = this->components_[i];
 
       if (this->known_tag (component.tag))
         {
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index 3f1e5e1f37f..3da8417bbc9 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -27,18 +27,14 @@ TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
     this->orb_core_->lane_resources ().acceptor_registry ();
 
   // Get the right acceptor for the tag in the TaggedProfile
-  TAO_Acceptor *acceptor =
-    acceptor_registry.get_acceptor (profile.tag);
+  TAO_Acceptor *acceptor = acceptor_registry.get_acceptor (profile.tag);
 
   if (acceptor)
     {
       // Get the object key
-      int retval =
-        acceptor->object_key (profile,
-                              this->object_key_);
-      if (retval == -1)
+      if (acceptor->object_key (profile, this->object_key_) == -1)
         {
-          return 0;
+          return false;
         }
     }
   else
@@ -49,10 +45,10 @@ TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
                       ACE_TEXT ("(%P|%t)TAO_Tagged_Profile \n")));
         }
 
-      return 0;
+      return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -77,7 +73,7 @@ TAO_Tagged_Profile::unmarshall_target_address (TAO_InputCDR &cdr)
           break;
 
         default:
-          hdr_status = 0;
+          hdr_status = false;
           break;
         }
     }
@@ -124,8 +120,7 @@ CORBA::Boolean
 TAO_Tagged_Profile::unmarshall_iop_profile_i (
     TAO_InputCDR &input)
 {
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
+  CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
   // Extract into the IOP::Tagged profile.
   hdr_status &= input >> this->profile_;
@@ -137,8 +132,7 @@ CORBA::Boolean
 TAO_Tagged_Profile::unmarshall_ref_addr_i (
     TAO_InputCDR &input)
 {
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
+  CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
   /*
    * The GIOP::IORAddressingInfo is defined as follows
@@ -159,8 +153,7 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i (
   // First read the profile index
   CORBA::ULong prof_index =  0;
 
-  hdr_status =
-    hdr_status && input.read_ulong (prof_index);
+  hdr_status = hdr_status && input.read_ulong (prof_index);
 
   // Set the value in TAO_Tagged_Profile
   if (hdr_status)
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index d3044934790..3dad3441c1b 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -122,30 +122,20 @@ TAO_Thread_Lane_Resources::connector_registry (void)
 
           if (connector_registry == 0)
             {
-              ACE_THROW_RETURN (
-                  CORBA::INITIALIZE (
-                      CORBA::SystemException::_tao_minor_code (
-                          TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
-                          0
-                        ),
-                      CORBA::COMPLETED_NO
-                    ),
-                  0
-                );
+              throw ::CORBA::INITIALIZE (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
+                  0),
+                CORBA::COMPLETED_NO);
             }
 
           if (connector_registry->open (&this->orb_core_) != 0)
             {
-              ACE_THROW_RETURN (
-                  CORBA::INITIALIZE (
-                      CORBA::SystemException::_tao_minor_code (
-                          TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
-                          0
-                        ),
-                      CORBA::COMPLETED_NO
-                    ),
-                  0
-                );
+              throw ::CORBA::INITIALIZE (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
+                  0),
+                CORBA::COMPLETED_NO);
             }
 
           // Finally, everything is created and opened successfully:
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index 48955aa1b81..30df4693a83 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -14,16 +14,15 @@
 #define TAO_THREAD_LANE_RESOURCES_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Thread_Mutex.h"
-
 #include /**/ "tao/TAO_Export.h"
-#include "tao/orbconf.h"
 #include "tao/params.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 812108edd14..011a4c9468c 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -14,14 +14,12 @@
 #define TAO_THREAD_LANE_RESOURCES_MANAGER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-
 #include /**/ "tao/TAO_Export.h"
 #include /**/ "tao/Versioned_Namespace.h"
 
diff --git a/TAO/tao/TkResource/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index cbe8fb79681..c598ef76c87 100644
--- a/TAO/tao/TkResource/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -12,7 +12,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   TkResource_Loader::TkResource_Loader (void)
   {
     TkResource_Factory *tmp = 0;
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 985ea018653..ce44d35eb47 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -22,12 +22,14 @@
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/MMAP_Allocator.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Reactor.h"
 #include "ace/os_include/sys/os_uio.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/CORBA_macros.h"
 
 /*
  * Specialization hook to add include files from
@@ -1068,7 +1070,7 @@ TAO_Transport::cleanup_queue_i ()
          this->id ()));
     }
 
-  int byte_count = 0;
+  size_t byte_count = 0;
   int msg_count = 0;
 
   // Cleanup all messages
@@ -1095,7 +1097,7 @@ TAO_Transport::cleanup_queue_i ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ")
-                  ACE_TEXT ("discarded %d messages, %d bytes.\n"),
+                  ACE_TEXT ("discarded %d messages, %u bytes.\n"),
                   this->id (), msg_count, byte_count));
     }
 }
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 94308e15e9d..11a41bb804f 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -247,8 +247,7 @@ class TAO_Export TAO_Transport
 public:
 
   /// Default creator, requires the tag value be supplied.
-  TAO_Transport (CORBA::ULong tag,
-                 TAO_ORB_Core *orb_core);
+  TAO_Transport (CORBA::ULong tag, TAO_ORB_Core *orb_core);
 
   /// Destructor
   virtual ~TAO_Transport (void);
@@ -473,8 +472,7 @@ public:
    * connector side. On the acceptor side the connection handler
    * would take care of the messaging objects.
    */
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor) = 0;
+  virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor) = 0;
 
   /// Extracts the list of listen points from the @a cdr stream. The
   /// list would have the protocol specific details of the
@@ -639,8 +637,6 @@ public:
                             int message_semantics,
                             ACE_Time_Value *max_time_wait) = 0;
 
-
-
   /// This method formats the stream and then sends the message on the
   /// transport.
   /**
@@ -655,7 +651,6 @@ public:
                             int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
                             ACE_Time_Value *max_time_wait = 0) = 0;
 
-
   /// Sent the contents of @a message_block
   /**
    * @param stub The object reference used for this operation, useful
@@ -738,8 +733,7 @@ public:
    *       messages (oneways) that have been sitting for too long on
    *       the queue.
    */
-  int handle_timeout (const ACE_Time_Value &current_time,
-                      const void* act);
+  int handle_timeout (const ACE_Time_Value &current_time, const void* act);
 
   /// Accessor to recv_buffer_size_
   size_t recv_buffer_size (void) const;
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 4215620b9ae..e14dccf18ad 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -42,7 +42,6 @@ namespace TAO
     /// thread.
     const TAO_Transport*
     Current_Impl::transport (void) const
-      ACE_THROW_SPEC ((NoContext))
     {
       Transport_Selection_Guard* topguard =
         Transport_Selection_Guard::current (this->core_, this->tss_slot_id_);
@@ -56,51 +55,42 @@ namespace TAO
     /// Obtains the current transport's stats
     const TAO::Transport::Stats*
     Current_Impl::transport_stats (void) const
-      ACE_THROW_SPEC ((NoContext))
     {
       static const TAO::Transport::Stats dummy;
 
-      const TAO_Transport* t =
-        this->transport ();
+      const TAO_Transport* t = this->transport ();
 
       return (t==0 || t->stats () == 0) ? &dummy : t->stats ();
     }
 
     CORBA::Long Current_Impl::id (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
-      const TAO_Transport* t =
-        this->transport ();
+      const TAO_Transport* t = this->transport ();
 
       return (t==0) ? 0 : t->id ();
     }
 
     CounterT Current_Impl::bytes_sent (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->bytes_sent ();
     }
 
     CounterT Current_Impl::bytes_received (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->bytes_received ();
     }
 
     CounterT Current_Impl::messages_sent (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->messages_sent ();
     }
 
     CounterT Current_Impl::messages_received (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->messages_received ();
     }
 
     TimeBase::TimeT Current_Impl::open_since (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       TimeBase::TimeT msecs = 0;
       transport_stats ()->opened_since ().msec (msecs);
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 9463b35c01c..4fefe078e3f 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -49,23 +49,17 @@ namespace TAO
          * PortableInterceptor::Current interface.
          */
         //@{
-        virtual CORBA::Long id (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual CORBA::Long id (void);
 
-        virtual CounterT bytes_sent (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual CounterT bytes_sent (void);
 
-        virtual CounterT bytes_received (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual CounterT bytes_received (void);
 
-        virtual CounterT messages_sent (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual CounterT messages_sent (void);
 
-        virtual CounterT messages_received (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual CounterT messages_received (void);
 
-        virtual ::TimeBase::TimeT open_since (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual ::TimeBase::TimeT open_since (void);
         //@}
 
       protected:
@@ -75,14 +69,12 @@ namespace TAO
          */
         //@{
         /// A (strategy) method used to obtain the transport ptr
-        const TAO_Transport* transport (void) const
-          ACE_THROW_SPEC ((NoContext));
+        const TAO_Transport* transport (void) const;
 
         /// 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 (void) const
-          ACE_THROW_SPEC ((NoContext));
+        const TAO::Transport::Stats* transport_stats (void) const;
         //@}
 
         /// Destructor is protected to enforce the fact this class is
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index 86e5bddbc26..40b6dbba38f 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -54,8 +54,7 @@ namespace TAO
 
       PortableInterceptor::ORBInitializer_var initializer (tmp);
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       return 0;
     }
@@ -91,9 +90,6 @@ 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,
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
index 339ec752f16..be55fa69b0a 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
@@ -27,9 +27,7 @@ namespace TAO
     template <typename Impl>
     TAO::Transport::Current_ptr
     Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core,
-                                                         size_t tss_slot_id
-                                                         )
-      ACE_THROW_SPEC ((CORBA::SystemException))
+                                                         size_t tss_slot_id)
       {
         // Create the Current
         Current_ptr tmp = 0;
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 7b1ff98c6a2..34487cd14a3 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -36,17 +36,11 @@ namespace TAO
     public:
       Current_ORBInitializer (const ACE_TCHAR* id);
 
-
     protected:
       virtual TAO::Transport::Current_ptr
-      make_current_instance (TAO_ORB_Core* c,
-                             size_t s
-                             )
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      make_current_instance (TAO_ORB_Core* c, size_t s);
     };
-
   }
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index a8a39de3df5..aeae2652ebc 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -24,9 +24,8 @@ namespace TAO
 
 
     void
-    Current_ORBInitializer_Base::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                            )
-      ACE_THROW_SPEC( (CORBA::SystemException) )
+    Current_ORBInitializer_Base::pre_init (
+      PortableInterceptor::ORBInitInfo_ptr info)
     {
       // Narrow to a TAO_ORBInitInfo object to get access to the
       // allocate_tss_slot_id() TAO extension.
@@ -60,9 +59,8 @@ namespace TAO
     }
 
     void
-    Current_ORBInitializer_Base::post_init (PortableInterceptor::ORBInitInfo_ptr
-                                             )
-      ACE_THROW_SPEC( (CORBA::SystemException) )
+    Current_ORBInitializer_Base::post_init (
+      PortableInterceptor::ORBInitInfo_ptr)
     {
       // do nothing
     }
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index cb4ce2fa446..d92da1f47b7 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -42,16 +42,13 @@ namespace TAO
       Current_ORBInitializer_Base (const ACE_TCHAR* id);
       virtual ~Current_ORBInitializer_Base (void);
 
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr);
 
-       virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+       virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
     protected:
         virtual TAO::Transport::Current_ptr
-        make_current_instance (TAO_ORB_Core* core,
-                               size_t tss_slot_id)
-          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+        make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id)
+          = 0;
     protected:
       const ACE_TString id_;
     };
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index d66306b1aac..fa49fcf0104 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -4,6 +4,7 @@
 #include "tao/IIOP_Connection_Handler.h"
 #include "tao/IIOP_Transport.h"
 #include "tao/Transport_Selection_Guard.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
@@ -25,20 +26,19 @@ namespace TAO
 
     TAO_IIOP_Connection_Handler*
     IIOP_Current_Impl::handler (void)
-      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);
+        throw ::CORBA::NO_IMPLEMENT ();
 
       TAO_Connection_Handler *ch = const_cast<TAO_Transport*>(t)->connection_handler ();
       if (ch == 0)
-        ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+        throw ::CORBA::NO_IMPLEMENT ();
 
       return dynamic_cast <TAO_IIOP_Connection_Handler*> (ch);
 #else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
@@ -59,28 +59,25 @@ namespace TAO
 
     CORBA::Long
     IIOP_Current_Impl::id (void)
-      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);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
     ::SSLIOP::Current_ptr
     IIOP_Current_Impl::ssliop_current (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
-        ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+        throw ::CORBA::NO_IMPLEMENT ();
     }
 
 
     CORBA::Long
     IIOP_Current_Impl::remote_port (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -91,13 +88,12 @@ namespace TAO
 
       return a.get_port_number ();
 #else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
     char*
     IIOP_Current_Impl::remote_host (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -108,13 +104,12 @@ namespace TAO
 
       return CORBA::string_dup (a.get_host_addr ());
 #else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
     CORBA::Long
     IIOP_Current_Impl::local_port (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -125,13 +120,12 @@ namespace TAO
 
       return a.get_port_number ();
 #else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
     char*
     IIOP_Current_Impl::local_host (void)
-      ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -142,7 +136,7 @@ namespace TAO
 
       return CORBA::string_dup (a.get_host_addr ());
 #else
-      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+      throw ::CORBA::NO_IMPLEMENT ();
 #endif
     }
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index acb48edcbe2..0495f17b6f4 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -51,23 +51,17 @@ namespace TAO
         IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
 
         //@{
-        virtual ::CORBA::Long id (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual ::CORBA::Long id (void);
 
-        virtual ::SSLIOP::Current_ptr ssliop_current (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual ::SSLIOP::Current_ptr ssliop_current (void);
 
-        virtual ::CORBA::Long remote_port (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual ::CORBA::Long remote_port (void);
 
-        virtual char* remote_host (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual char* remote_host (void);
 
-        virtual ::CORBA::Long local_port (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual ::CORBA::Long local_port (void);
 
-        virtual char* local_host (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        virtual char* local_host (void);
         //@}
 
 
@@ -87,8 +81,7 @@ namespace TAO
         /// 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 (void)
-          ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+        TAO_IIOP_Connection_Handler* handler (void);
 
       private:
 
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index b24b2ef13ea..9a3ccbb50e1 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -83,9 +83,7 @@ TAO_Connector::~TAO_Connector (void)
 }
 
 TAO_Profile *
-TAO_Connector::corbaloc_scan (const char *str,
-                              size_t &len
-                              )
+TAO_Connector::corbaloc_scan (const char *str, size_t &len)
 {
   if (this->check_prefix (str) != 0)
     return 0;
@@ -102,9 +100,7 @@ TAO_Connector::corbaloc_scan (const char *str,
 }
 
 int
-TAO_Connector::make_mprofile (const char *string,
-                              TAO_MProfile &mprofile
-                              )
+TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile)
 {
   // This method utilizes the "Template Method" design pattern to
   // parse the given URL style IOR for the protocol being used
@@ -117,12 +113,11 @@ TAO_Connector::make_mprofile (const char *string,
   // Check for a valid string
   if (!string || !*string)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          0,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Check for the proper prefix in the IOR.  If the proper prefix isn't
@@ -153,7 +148,7 @@ TAO_Connector::make_mprofile (const char *string,
 
   if (ior_index == ACE_CString::npos)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      throw ::CORBA::INV_OBJREF ();
       // No colon ':' in the IOR!
     }
   else
@@ -169,7 +164,7 @@ TAO_Connector::make_mprofile (const char *string,
 
   if (objkey_index == 0 || objkey_index == ACE_CString::npos)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      throw ::CORBA::INV_OBJREF ();
       // Failure: No endpoints specified or no object key specified.
     }
 
@@ -194,12 +189,11 @@ TAO_Connector::make_mprofile (const char *string,
   // MProfile::set(size) returns the number profiles it can hold.
   if (mprofile.set (profile_count) != static_cast<int> (profile_count))
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_MPROFILE_CREATION_ERROR,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
+      throw ::CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_MPROFILE_CREATION_ERROR,
+          0),
+        CORBA::COMPLETED_NO);
       // Error while setting the MProfile size!
     }
 
@@ -256,19 +250,18 @@ TAO_Connector::make_mprofile (const char *string,
             {
               profile->_decr_refcnt ();
 
-              ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                                  CORBA::SystemException::_tao_minor_code (
-                                     TAO_MPROFILE_CREATION_ERROR,
-                                     0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
+              throw ::CORBA::INV_OBJREF (
+                CORBA::SystemException::_tao_minor_code (
+                  TAO_MPROFILE_CREATION_ERROR,
+                  0),
+                CORBA::COMPLETED_NO);
               // Failure presumably only occurs when MProfile is full!
               // This should never happen.
             }
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+          throw ::CORBA::INV_OBJREF ();
           // Unable to seperate endpoints
         }
     }
@@ -294,8 +287,7 @@ TAO_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *,
 TAO_Transport*
 TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
                                  TAO_Transport_Descriptor_Interface *desc,
-                                 ACE_Time_Value *timeout
-                                 )
+                                 ACE_Time_Value *timeout)
 {
   if (this->supports_parallel_connects() == 0)
     {
@@ -357,8 +349,7 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
 TAO_Transport*
 TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                         TAO_Transport_Descriptor_Interface *desc,
-                        ACE_Time_Value *timeout
-                        )
+                        ACE_Time_Value *timeout)
 {
   if (desc == 0 ||
       (this->set_validate_endpoint (desc->endpoint ()) == -1))
@@ -380,9 +371,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
       // Purge connections (if necessary)
       tcm.purge ();
 
-      TAO_Transport* t = this->make_connection (r,
-                                                *desc,
-                                                timeout);
+      TAO_Transport* t = this->make_connection (r, *desc, timeout);
 
       if (t == 0)
         return t;
@@ -404,10 +393,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
           (void) t->purge_entry ();
 
           // Call connect again
-          return this->connect (r,
-                                desc,
-                                timeout
-                               );
+          return this->connect (r, desc, timeout);
         }
 
       return t;
@@ -415,8 +401,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
 
   if (TAO_debug_level > 4)
     {
-      TAO::Connection_Role cr =
-        base_transport->opened_as ();
+      TAO::Connection_Role cr = base_transport->opened_as ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - Transport_Connector::connect, "
@@ -444,9 +429,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
   // handle the connection completion.
 
   TransportCleanupGuard tg(base_transport);
-  if (!this->wait_for_connection_completion (r,
-                                             base_transport,
-                                             timeout))
+  if (!this->wait_for_connection_completion (r, base_transport, timeout))
     {
       tg.awake();
 
@@ -747,8 +730,7 @@ TAO_Connector::check_connection_closure (
   int result = -1;
 
   // Check if the handler has been closed.
-  bool closed =
-    connection_handler->is_closed ();
+  bool closed = connection_handler->is_closed ();
 
   // In case of failures and close() has not be called.
   if (!closed)
@@ -766,7 +748,6 @@ TAO_Connector::check_connection_closure (
       // handler.
       closed = connection_handler->is_closed ();
 
-
       // If closed, there is nothing to do here.  If not closed,
       // it was either opened or is still pending.
       if (!closed)
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 8de3a02fcbb..ca9029f86ab 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -17,14 +17,13 @@
 #define TAO_CONNECTOR_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index 00025783a9d..c2771aa1a10 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -95,12 +95,10 @@ namespace TAO
     try
       {
         CORBA::Policy_var bcp_policy =
-          stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT
-                                  );
+          stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
 
         TAO::BufferingConstraintPolicy_var bcpv =
-          TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in ()
-                                                  );
+          TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in ());
 
         TAO_Buffering_Constraint_Policy* bcp =
           dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcpv.in ());
@@ -110,7 +108,7 @@ namespace TAO
           }
         bcp->get_buffering_constraint (buffering_constraint);
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         return true;
       }
diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp
index 6f29477d5c4..6c09172b7ff 100644
--- a/TAO/tao/Transport_Selection_Guard.cpp
+++ b/TAO/tao/Transport_Selection_Guard.cpp
@@ -61,8 +61,6 @@ namespace TAO
 
   }
 
-
-
   /// Dtor
   Transport_Selection_Guard::~Transport_Selection_Guard (void)
   {
diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h
index 96f3deac271..910f4ae7953 100644
--- a/TAO/tao/Transport_Selection_Guard.h
+++ b/TAO/tao/Transport_Selection_Guard.h
@@ -21,14 +21,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
-
-/* #include "tao/Policy_Current_Impl.h" */
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations
 class TAO_Transport;
+class TAO_ORB_Core;
 
 namespace TAO
 {
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index 398bdc82136..c96562341a2 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -27,9 +27,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
       // Marshaling an incomplete recursive TypeCode placeholder is
       // not allowed.
 
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->tao_marshal (cdr, offset);
@@ -45,9 +43,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal_kind (
       // Marshaling an incomplete recursive TypeCode placeholder is
       // not allowed.
 
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->tao_marshal_kind (cdr);
@@ -66,37 +62,30 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_release (void)
 }
 
 CORBA::Boolean
-TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc
-                                                   ) const
+TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
       // Nothing to compare yet.
 
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return this->the_typecode_->equal (tc
-                                    );
+  return this->the_typecode_->equal (tc);
 }
 
 CORBA::Boolean
-TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc
-                                                        ) const
+TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (
+  CORBA::TypeCode_ptr tc) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
       // Nothing to compare yet.
 
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        false);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return this->the_typecode_->equivalent (tc
-                                         );
+  return this->the_typecode_->equivalent (tc);
 }
 
 CORBA::TypeCode_ptr
@@ -107,18 +96,14 @@ TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i (
     {
       // Nothing to compare yet.
 
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return
-    this->the_typecode_->get_compact_typecode ();
+  return this->the_typecode_->get_compact_typecode ();
 }
 
 char const *
-TAO::TypeCodeFactory::Recursive_TypeCode::id_i (
-  void) const
+TAO::TypeCodeFactory::Recursive_TypeCode::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -126,28 +111,22 @@ TAO::TypeCodeFactory::Recursive_TypeCode::id_i (
 }
 
 char const *
-TAO::TypeCodeFactory::Recursive_TypeCode::name_i (
-  void) const
+TAO::TypeCodeFactory::Recursive_TypeCode::name_i (void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->name ();
 }
 
 CORBA::ULong
-TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (
-  void) const
+TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->member_count ();
@@ -155,51 +134,38 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (
 
 char const *
 TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return this->the_typecode_->member_name (index
-                                      );
+  return this->the_typecode_->member_name (index);
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return this->the_typecode_->member_type (index
-                                          );
+  return this->the_typecode_->member_type (index);
 }
 
 CORBA::Any *
 TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return
-    this->the_typecode_->member_label (index
-                                      );
+  return this->the_typecode_->member_label (index);
 }
 
 CORBA::TypeCode_ptr
@@ -208,13 +174,10 @@ TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i (
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return
-    this->the_typecode_->discriminator_type ();
+  return this->the_typecode_->discriminator_type ();
 }
 
 CORBA::Long
@@ -223,9 +186,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i (
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->default_index ();
@@ -233,47 +194,36 @@ TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i (
 
 CORBA::Visibility
 TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::PRIVATE_MEMBER);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return this->the_typecode_->member_visibility (index
-                                                );
+  return this->the_typecode_->member_visibility (index);
 }
 
 CORBA::ValueModifier
-TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i (
-  void) const
+TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i (void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::VM_NONE);
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
   return this->the_typecode_->type_modifier ();
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
-  void) const
+TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_TYPECODE (0, CORBA::COMPLETED_NO);
     }
 
-  return
-    this->the_typecode_->concrete_base_type ();
+  return this->the_typecode_->concrete_base_type ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index 5b595e66d97..2c4694d012d 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -62,8 +62,7 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
+      virtual bool tao_marshal (TAO_OutputCDR &cdr, CORBA::ULong offset) const;
       virtual void tao_duplicate (void);
       virtual void tao_release (void);
       //@}
@@ -80,31 +79,20 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        void) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
       virtual char const * id_i (void) const;
       virtual char const * name_i (void) const;
       virtual CORBA::ULong member_count_i (void) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        void) const;
+      virtual char const * member_name_i (CORBA::ULong index) const;
+      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
+      virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
       virtual CORBA::Long default_index_i (void) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        void) const;
-
+      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
+      virtual CORBA::ValueModifier type_modifier_i (void) const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
       //@}
 
     private:
@@ -114,7 +102,6 @@ namespace TAO
 
       /// The actual recursive TypeCode.
       CORBA::TypeCode_var the_typecode_;
-
     };
 
   }  // End namespace TypeCodeFactory
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
index 3fa0eeea203..5355e8923d6 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
@@ -18,10 +18,8 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc)
 {
   this->the_typecode_ = CORBA::TypeCode::_duplicate (tc);
 
-
   // @@ Lazy, I know.  :(
-  CORBA::TCKind & mutable_kind =
-    const_cast<CORBA::TCKind &> (this->kind_);
+  CORBA::TCKind & mutable_kind = const_cast<CORBA::TCKind &> (this->kind_);
 
   mutable_kind = tc->kind ();
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 5840ace6337..2453262a6f6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -23,7 +23,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
     const char * id,
     const char * name,
     const CORBA::StructMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -36,15 +35,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
     const char * name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA::UnionMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_union_tc (id,
-                              name,
-                              discriminator_type,
-                              members
-                             );
+  return tcf.create_union_tc (id, name, discriminator_type, members);
 }
 
 CORBA::TypeCode_ptr
@@ -52,14 +46,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
     const char * id,
     const char * name,
     const CORBA::EnumMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_enum_tc (id,
-                             name,
-                             members
-                            );
+  return tcf.create_enum_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -67,14 +57,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr original_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_alias_tc (id,
-                              name,
-                              original_type
-                             );
+  return tcf.create_alias_tc (id, name, original_type);
 }
 
 CORBA::TypeCode_ptr
@@ -82,32 +68,24 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
     const char * id,
     const char * name,
     const CORBA::StructMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_exception_tc (id,
-                                  name,
-                                  members
-                                 );
+  return tcf.create_exception_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_interface_tc (id,
-                                  name
-                                 );
+  return tcf.create_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -116,7 +94,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound)
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -127,7 +104,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
     CORBA::UShort digits,
     CORBA::UShort scale)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -138,7 +114,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -149,7 +124,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -163,15 +137,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_value_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members);
+  return tcf.create_value_tc (id, name, type_modifier, concrete_base, members);
 }
 
 CORBA::TypeCode_ptr
@@ -179,7 +148,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr boxed_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -190,7 +158,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -199,7 +166,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -210,7 +176,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -221,7 +186,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -232,7 +196,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_component_tc (
     const char *id,
     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -243,7 +206,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_home_tc (
     const char *id,
     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -257,16 +219,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_event_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members
-                             );
+  return tcf.create_event_tc (id, name, type_modifier, concrete_base, members);
 }
 
 // --
@@ -279,7 +235,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
   CORBA::ULong /* ncases */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -293,7 +249,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc (
   CORBA::ULong /* nfields */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -309,7 +265,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
   CORBA::TypeCode_ptr /* default_case_type */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -325,7 +281,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
   CORBA::ULong /* nfields */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 // *********************************************************************
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index 961f84e4f09..2f60b63d946 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -45,112 +45,92 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::UnionMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::EnumMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr original_type);
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::ULong bound);
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::ULong bound);
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::UShort scale);
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr element_type);
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr element_type);
 
   virtual CORBA::TypeCode_ptr create_value_tc (
       const char *id,
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ValueMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr boxed_type);
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *id);
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_event_tc (
       const char *id,
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ValueMemberSeq &members);
 
   /**
    * @name TAO-specific TypeCode factory methods.
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index 2562e71c5bc..e451b4c28a2 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 
-// $Id$
-
-// =================================================================
-//
-// = LIBRARY
-//    TAO/tao/TypeCodeFactory
-//
-// = FILENAME
-//    TypeCodeFactory_Loader.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =================================================================
+
+//=============================================================================
+/**
+ *  @file    TypeCodeFactory_Loader.cpp
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
@@ -30,10 +27,7 @@ TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 }
 
 CORBA::Object_ptr
-TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
-                                           int,
-                                           ACE_TCHAR * [])
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * [])
 {
   CORBA::Object_ptr obj;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 9030064bbc6..de8be09f33a 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -41,9 +41,7 @@ public:
   /// of a TypeCodeFactory object.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c996a43c1f2..c85d97f50a5 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -129,7 +129,6 @@ TAO_TypeCodeFactory_i::create_struct_tc (
     const char *id,
     const char *name,
     const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
@@ -143,22 +142,17 @@ TAO_TypeCodeFactory_i::create_union_tc (
     const char *name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA::UnionMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::Boolean const good_disc_type =
@@ -166,9 +160,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
   if (!good_disc_type)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 20,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 20, CORBA::COMPLETED_NO);
     }
 
   CORBA::ULong const len = members.length ();
@@ -211,9 +203,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 }
               else
                 {
-                  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                                      CORBA::COMPLETED_NO),
-                                    tc);
+                  throw ::CORBA::BAD_PARAM (
+                    CORBA::OMGVMCID | 17,
+                    CORBA::COMPLETED_NO);
                 }
             }
           else
@@ -237,9 +229,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
       // Duplicate member name?
       if (trybind_status != 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 17, CORBA::COMPLETED_NO);
         }
 
       CORBA::TypeCode_ptr const tc_holder = member.type.in ();
@@ -251,9 +241,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
       if (!valid_member)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_TYPECODE (
+            CORBA::OMGVMCID | 2,
+            CORBA::COMPLETED_NO);
         }
 
       // Reset the default index, if we have a default case label.
@@ -279,9 +269,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
           if (!equiv)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                  CORBA::COMPLETED_NO),
-                                tc);
+              throw ::CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 19,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -294,9 +284,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
   if (!unique_labels)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 18,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 18, CORBA::COMPLETED_NO);
     }
 
   using namespace TCF::Union;
@@ -354,9 +342,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
             {
               // Should never throw since label kind was
               // verified earlier.
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::TypeCode::_nil ());
+              throw ::CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 19,
+                CORBA::COMPLETED_NO);
             }
         }
       else
@@ -375,6 +363,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                     TAO::Unknown_IDL_Type * const unk =
                       dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+                    if (!unk)
+                      throw CORBA::INTERNAL ();
+
                     // We don't want unk's rd_ptr to move, in case we
                     // are shared by another Any, so we use this to
                     // copy the state, not the buffer.
@@ -407,9 +398,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::ULong,
@@ -428,9 +419,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::Long,
@@ -449,9 +440,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::UShort,
@@ -470,9 +461,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::Short,
@@ -491,9 +482,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::Char,
@@ -512,9 +503,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::Boolean,
@@ -533,9 +524,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::LongLong,
@@ -555,9 +546,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                   {
                     // Should never throw since label kind was
                     // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
+                    throw ::CORBA::BAD_PARAM (
+                      CORBA::OMGVMCID | 19,
+                      CORBA::COMPLETED_NO);
                   }
 
                 typedef TAO::TypeCode::Case_T<CORBA::ULongLong,
@@ -571,9 +562,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
               break;
 #endif  /* !ACE_LACKS_LONGLONG_T */
             default:
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 20,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::TypeCode::_nil ());
+              throw ::CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 20,
+                CORBA::COMPLETED_NO);
             }
         }
 
@@ -596,7 +587,10 @@ TAO_TypeCodeFactory_i::create_union_tc (
       recursive_typecode_type * const rtc =
         dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
 
-      ACE_ASSERT (rtc);
+      if (!rtc)
+        {
+          throw CORBA::INTERNAL ();
+        }
 
       rtc->union_parameters (name,
                              duped_disc_type,
@@ -624,22 +618,17 @@ TAO_TypeCodeFactory_i::create_enum_tc (
     const char *id,
     const char *name,
     const CORBA::EnumMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::ULong const len = members.length ();
@@ -656,9 +645,7 @@ TAO_TypeCodeFactory_i::create_enum_tc (
       // Is there a duplicate member name?
       if (map.trybind (ext_id, int_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 17, CORBA::COMPLETED_NO);
         }
 
       enumerators[index] = members[index];
@@ -684,7 +671,6 @@ TAO_TypeCodeFactory_i::create_alias_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr original_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->alias_value_box_tc_common (id,
                                           name,
@@ -697,7 +683,6 @@ TAO_TypeCodeFactory_i::create_exception_tc (
     const char *id,
     const char *name,
     const CORBA::StructMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
@@ -709,7 +694,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_interface_tc (
     const char *id,
     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -718,7 +702,6 @@ TAO_TypeCodeFactory_i::create_interface_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_string_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->string_wstring_tc_common (bound,
                                          CORBA::tk_string);
@@ -726,7 +709,6 @@ TAO_TypeCodeFactory_i::create_string_tc (CORBA::ULong bound)
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_wstring_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->string_wstring_tc_common (bound,
                                          CORBA::tk_wstring);
@@ -736,7 +718,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_fixed_tc (
     CORBA::UShort digits,
     CORBA::UShort scale)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc;
   ACE_NEW_THROW_EX (tc,
@@ -751,7 +732,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return sequence_array_tc_common (bound,
                                    element_type,
@@ -762,11 +742,8 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return sequence_array_tc_common (length,
-                                   element_type,
-                                   CORBA::tk_array);
+  return sequence_array_tc_common (length, element_type, CORBA::tk_array);
 }
 
 CORBA::TypeCode_ptr
@@ -777,7 +754,6 @@ TAO_TypeCodeFactory_i::create_value_tc (
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_event_tc_common (id,
                                       name,
@@ -794,7 +770,6 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
     const char *name,
     CORBA::TypeCode_ptr boxed_type
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->alias_value_box_tc_common (id,
                                           name,
@@ -808,7 +783,6 @@ TAO_TypeCodeFactory_i::create_native_tc (
     const char *id,
     const char *name
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -818,15 +792,12 @@ TAO_TypeCodeFactory_i::create_native_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_recursive_tc (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   ACE_NEW_THROW_EX (tc,
@@ -841,7 +812,6 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc (
     const char *id,
     const char *name
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -854,7 +824,6 @@ TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *id,
     const char *name
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -867,7 +836,6 @@ TAO_TypeCodeFactory_i::create_component_tc (
     const char *id,
     const char *name
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -876,7 +844,6 @@ TAO_TypeCodeFactory_i::create_component_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_home_tc (const char *id, const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -890,7 +857,6 @@ TAO_TypeCodeFactory_i::create_event_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_event_tc_common (id,
                                       name,
@@ -1032,6 +998,9 @@ TAO_TypeCodeFactory_i::compute_default_label (
                   TAO::Unknown_IDL_Type *unk =
                     dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+                  if (!unk)
+                    throw CORBA::INTERNAL ();
+
                   // We don't want unk's rd_ptr to move, in case
                   // we are shared by another Any, so we use this
                   // to copy the state, not the buffer.
@@ -1164,21 +1133,16 @@ TAO_TypeCodeFactory_i::create_tc_common (
     CORBA::TCKind kind
 
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   // Repo id may not be null for object or native type.
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::TypeCode_ptr tc;
@@ -1199,7 +1163,6 @@ TAO_TypeCodeFactory_i::string_wstring_tc_common (
     CORBA::TCKind kind
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc;
   ACE_NEW_THROW_EX (tc,
@@ -1217,9 +1180,8 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common (
     CORBA::TCKind kind
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   CORBA::Boolean const valid_element =
     this->valid_content_type (element_type
@@ -1227,9 +1189,7 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common (
 
   if (!valid_element)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                             CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   CORBA::TypeCode_var tmp (CORBA::TypeCode::_duplicate (element_type));
@@ -1252,22 +1212,17 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
     CORBA::TCKind kind
 
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::ULong const len = members.length ();
@@ -1293,18 +1248,16 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
       if (!valid_member)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_TYPECODE (
+            CORBA::OMGVMCID | 2,
+            CORBA::COMPLETED_NO);
         }
 
       char const * const member_name = members[index].name;
 
       if (member_name == 0 || !this->valid_name (member_name))
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
         }
 
       ACE_CString ext_id (member_name);
@@ -1313,9 +1266,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       // Is there a duplicate member name?
       if (map.trybind (ext_id, int_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 17, CORBA::COMPLETED_NO);
         }
 
       TAO::TypeCode::Struct_Field<CORBA::String_var,
@@ -1342,7 +1293,10 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       recursive_typecode_type * const rtc =
         dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
 
-      ACE_ASSERT (rtc);
+      if (!rtc)
+        {
+          throw CORBA::INTERNAL ();
+        }
 
       rtc->struct_parameters (name, fields, len);
 
@@ -1367,22 +1321,17 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common (
     CORBA::TypeCode_ptr underlying_type,
     CORBA::TCKind kind
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::Boolean const valid_content =
@@ -1390,9 +1339,7 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common (
 
   if (!valid_content)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                             CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   CORBA::TypeCode_var tmp (CORBA::TypeCode::_duplicate (underlying_type));
@@ -1418,22 +1365,17 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
     CORBA::TCKind kind
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   if (name == 0 || !this->valid_name (name))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 
   if (id == 0 || !this->valid_id (id))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 16, CORBA::COMPLETED_NO);
     }
 
   CORBA::ULong const len = members.length ();
@@ -1457,18 +1399,16 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
 
       if (!valid_member)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_TYPECODE (
+            CORBA::OMGVMCID | 2,
+            CORBA::COMPLETED_NO);
         }
 
       const char * const member_name = members[index].name;
 
       if (member_name == 0 || !this->valid_name (member_name))
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
         }
 
       ACE_CString ext_id (member_name);
@@ -1477,9 +1417,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
       // Is there a duplicate member name?
       if (map.trybind (ext_id, int_id) != 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
+          throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 17, CORBA::COMPLETED_NO);
         }
 
       // Check if recursive.
@@ -1512,7 +1450,10 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
       recursive_typecode_type * const rtc =
         dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
 
-      ACE_ASSERT (rtc);
+      if (!rtc)
+        {
+          throw CORBA::INTERNAL ();
+        }
 
       rtc->valuetype_parameters (name,
                                  type_modifier,
@@ -1572,7 +1513,7 @@ TAO_TypeCodeFactory_i::valid_id (const char *id)
 {
   ACE_CString safety (id,
                       0,
-                      0);
+                      false);
 
   ACE_CString::size_type const pos = safety.find (':');
 
@@ -1736,6 +1677,9 @@ TAO_TypeCodeFactory_i::unique_label_values (
                   TAO::Unknown_IDL_Type *unk =
                     dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
+                  if (!unk)
+                    throw CORBA::INTERNAL ();
+
                   // We don't want unk's rd_ptr to move, in case
                   // we are shared by another Any, so we use this
                   // to copy the state, not the buffer.
@@ -1842,7 +1786,10 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                             TAO::TypeCodeFactory::Recursive_TypeCode *> (
                               member_tc.in ());
 
-                        ACE_ASSERT (rtc);
+                        if (!rtc)
+                          {
+                            throw CORBA::INTERNAL ();
+                          }
 
                         if (CORBA::is_nil (recursive_tc))
                           {
@@ -1867,7 +1814,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                     //    recursive through a member sequence (which
                     //    itself may be contained inside a nested
                     //    struct, union, etc).
-                        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), false);
+                        throw ::CORBA::BAD_TYPECODE ();
                   }
               }
             else
@@ -1911,7 +1858,10 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                   dynamic_cast<TAO::TypeCodeFactory::Recursive_TypeCode *>
                   (content_tc.in ());
 
-                ACE_ASSERT (rtc);
+                if (!rtc)
+                  {
+                    throw CORBA::INTERNAL ();
+                  }
 
                 if (CORBA::is_nil (recursive_tc))
                   {
@@ -1947,7 +1897,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, char const * id)
 {
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode_ptr ();
 
   switch (kind)
     {
@@ -1971,8 +1921,7 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, char const * id)
       break;
 
     default:  // Should never hit this case.
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        tc);
+      throw ::CORBA::INTERNAL ();
     }
 
   return tc;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 2d512cbf276..baa765a63ef 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -64,112 +64,92 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::UnionMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::EnumMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr original_type);
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::ULong bound);
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::ULong bound);
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::UShort scale);
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr element_type);
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr element_type);
 
   virtual CORBA::TypeCode_ptr create_value_tc (
       const char *id,
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ValueMemberSeq &members);
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TypeCode_ptr boxed_type);
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *id);
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char *name);
 
   virtual CORBA::TypeCode_ptr create_event_tc (
       const char *id,
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CORBA::ValueMemberSeq &members);
 
 private:
   /// Finds a legal default label value.
@@ -182,37 +162,32 @@ private:
   CORBA::TypeCode_ptr create_tc_common (
       const char *id,
       const char *name,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   /// Code for strings and wstrings is identical except for TCKind.
   CORBA::TypeCode_ptr string_wstring_tc_common (
       CORBA::ULong bound,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   /// Code for arrays and sequences is identical except for TCKind.
   CORBA::TypeCode_ptr sequence_array_tc_common (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   /// Code for structs and unions is identical except for TCKind.
   CORBA::TypeCode_ptr struct_except_tc_common (
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   /// Code for aliases and boxed valuetypes is identical except for TCKind.
   CORBA::TypeCode_ptr alias_value_box_tc_common (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr underlying_type,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   CORBA::TypeCode_ptr value_event_tc_common (
       const char *id,
@@ -220,8 +195,7 @@ private:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members,
-      CORBA::TCKind kind)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::TCKind kind);
 
   /// If any of these fail, we raise a spec-defined minor code
   /// of BAD_PARAM or BAD_TYPECODE.
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 9c954c7a864..56b4a829f4d 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -20,9 +20,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
+#include "tao/CORBA_methods.h"
 #include "tao/Typecode_typesC.h"
+#include "tao/Pseudo_VarOut_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template<class T> class ACE_Array_Base;
@@ -71,67 +71,50 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const CORBA::StructMemberSeq &members) = 0;
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const CORBA::UnionMemberSeq &members) = 0;
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const CORBA::EnumMemberSeq &members) = 0;
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type)
+      CORBA::TypeCode_ptr original_type) = 0;
 
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const CORBA::StructMemberSeq &members) = 0;
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      const char *name) = 0;
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      CORBA::ULong bound) = 0;
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      CORBA::ULong bound) = 0;
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale
-
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      CORBA::UShort scale) = 0;
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      CORBA::TypeCode_ptr element_type) = 0;
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      CORBA::TypeCode_ptr element_type) = 0;
 
   virtual CORBA::TypeCode_ptr create_value_tc (
       const char *id,
@@ -140,44 +123,44 @@ public:
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char *id)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
       const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
       const char *name)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   virtual CORBA::TypeCode_ptr create_event_tc (
       const char *id,
@@ -185,7 +168,7 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    = 0;
 
   // --
 
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index f109789b930..6aa47d1820d 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -16,9 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template<typename S_var,
          class Insert_Policy>
 CORBA::Boolean
-TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::marshal (
-    TAO_OutputCDR &cdr
-  )
+TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
@@ -29,8 +27,7 @@ template<typename S_var,
          class Insert_Policy>
 void
 TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
   Insert_Policy::any_insert (any, this->x_);
 }
@@ -71,8 +68,7 @@ template<typename S_var,
          class Insert_Policy>
 CORBA::Boolean
 TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::marshal (
-    TAO_OutputCDR &cdr
-  )
+    TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
@@ -81,8 +77,7 @@ template<typename S_var,
          class Insert_Policy>
 CORBA::Boolean
 TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::demarshal (
-    TAO_InputCDR & cdr
-  )
+    TAO_InputCDR & cdr)
 {
   delete [] this->x_;
   return cdr >> this->x_;
@@ -94,13 +89,9 @@ template<typename S_var,
          class Insert_Policy>
 void
 TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
-  Insert_Policy::any_insert (
-      any,
-      this->x_
-    );
+  Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -121,13 +112,9 @@ template<typename S_var,
          class Insert_Policy>
 void
 TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value (
-    CORBA::Any *any
-  ) const
+    CORBA::Any *any) const
 {
-  Insert_Policy::any_insert (
-      any,
-      this->x_
-    );
+  Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index 7b31d6079a1..f9f6d6e35d7 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -10,7 +10,8 @@ ACE_INLINE
 TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::In_UB_String_Argument_T (
   const typename S_var::s_traits::char_type * x)
   : x_ (x)
-{}
+{
+}
 
 template<typename S_var,
          class Insert_Policy>
@@ -28,7 +29,8 @@ TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::In_UB_String_Clonabl
   const typename S_var::s_traits::char_type * x)
   : In_UB_String_Argument_T<S_var,Insert_Policy> (x),
     is_clone_ (false)
-{}
+{
+}
 
 // ==========================================================================
 
@@ -36,8 +38,7 @@ template<typename S_var,
          class Insert_Policy>
 ACE_INLINE
 TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::Inout_UB_String_Argument_T (
-    typename S_var::s_traits::char_type *& x
-  )
+    typename S_var::s_traits::char_type *& x)
   : x_ (x)
 {}
 
@@ -56,8 +57,7 @@ template<typename S_var,
          class Insert_Policy>
 ACE_INLINE
 TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::Out_UB_String_Argument_T (
-    typename S_var::s_traits::string_out & x
-  )
+    typename S_var::s_traits::string_out & x)
   : x_ (x.ptr ())
 {}
 
@@ -76,7 +76,8 @@ template<typename S_var,
          class Insert_Policy>
 ACE_INLINE
 TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T (void)
-{}
+{
+}
 
 template<typename S_var,
          class Insert_Policy>
diff --git a/TAO/tao/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl
index 508fede9408..17418dbae75 100644
--- a/TAO/tao/ULongLongSeq.pidl
+++ b/TAO/tao/ULongLongSeq.pidl
@@ -3,19 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in ULongLongSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -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
- *          ULongLongSeq.pidl
+ *   This file is used to generate the code in ULongLongSeqC.*
  */
 
 #ifndef TAO_CORBA_ULONGLONG_SEQ_IDL
diff --git a/TAO/tao/ULongSeq.pidl b/TAO/tao/ULongSeq.pidl
index 28222f49129..4f08ef8c62a 100644
--- a/TAO/tao/ULongSeq.pidl
+++ b/TAO/tao/ULongSeq.pidl
@@ -5,17 +5,7 @@
 // ================================================================
 /**
  *
- * This file was used to generate the code in ULongSeq*.*
- * The command used to generate code is:
- *
- * tao_idl
- *   -o orig -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"
- *      ULongSeq.pidl
- *
+ * This file is used to generate the code in ULongSeq*.*
  */
 // ================================================================
 
diff --git a/TAO/tao/Unbounded_Array_Sequence_T.h b/TAO/tao/Unbounded_Array_Sequence_T.h
index ddd971ae18b..91fd9c042f4 100644
--- a/TAO/tao/Unbounded_Array_Sequence_T.h
+++ b/TAO/tao/Unbounded_Array_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "tao/Unbounded_Array_Allocation_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "tao/Array_Traits_T.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -130,8 +129,6 @@ namespace TAO
 
   template <typename stream, typename T_array, typename T_slice, typename T_tag>
   bool marshal_sequence(stream & strm, const TAO::unbounded_array_sequence<T_array, T_slice, T_tag> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     typedef TAO_FixedArray_Var_T <T_array, T_slice, T_tag> fixed_array;
     typedef TAO_Array_Forany_T <T_array, T_slice, T_tag> forany;
     typedef TAO::Array_Traits<forany> array_traits;
diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
index badabecacd5..b43ef6764f6 100644
--- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
@@ -13,6 +13,7 @@
 #include "tao/String_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "tao/String_Sequence_Element_T.h"
+#include "tao/String_Const_Sequence_Element_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -30,6 +31,7 @@ public:
   typedef details::unbounded_reference_allocation_traits<value_type,element_traits,true> allocation_traits;
 
   typedef details::string_sequence_element<element_traits> element_type;
+  typedef details::string_const_sequence_element<element_traits> const_element_type;
 
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
@@ -73,8 +75,8 @@ public:
     impl_.length(length);
   }
   /// @copydoc details::generic_sequence::operator[]
-  inline const_value_type operator[](CORBA::ULong i) const {
-    return impl_[i];
+  inline const_element_type operator[](CORBA::ULong i) const {
+    return const_element_type (impl_[i], release());
   }
   /// @copydoc details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
index 37c1b73a251..5a727e79db4 100644
--- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
@@ -13,6 +13,7 @@
 #include "Object_Reference_Traits_T.h"
 #include "Generic_Sequence_T.h"
 #include "Object_Reference_Sequence_Element_T.h"
+#include "Object_Reference_Const_Sequence_Element_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -31,6 +32,7 @@ public:
   typedef details::unbounded_reference_allocation_traits<value_type,element_traits,true> allocation_traits;
 
   typedef details::object_reference_sequence_element<element_traits> element_type;
+  typedef details::object_reference_const_sequence_element<element_traits> const_element_type;
   typedef element_type subscript_type;
   typedef value_type const & const_subscript_type;
 
@@ -50,29 +52,36 @@ public:
     : impl_(maximum, 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) {
     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 element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
+  /// @copydoc details::generic_sequence::get_buffer
   inline value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
+  /// @copydoc details::generic_sequence::replace
   inline void replace(
       CORBA::ULong maximum,
       CORBA::ULong length,
@@ -80,9 +89,11 @@ 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_object_reference_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index cad24629621..239d10b758d 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -24,6 +24,7 @@
 #include "tao/Basic_Types.h"
 #include "ace/Message_Block.h"
 #include "ace/OS_Memory.h"
+#include "ace/checked_iterator.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -151,7 +152,9 @@ public:
             unbounded_value_sequence<CORBA::Octet> tmp(length);
             tmp.length_ = length;
             element_traits::copy_range(
-              buffer_, buffer_ + length, tmp.buffer_);
+              buffer_,
+              buffer_ + length,
+              ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
             swap(tmp);
           }
         return;
@@ -160,7 +163,9 @@ public:
     unbounded_value_sequence<CORBA::Octet> tmp(length);
     tmp.length_ = length;
     element_traits::copy_range(
-        buffer_, buffer_ + length_, tmp.buffer_);
+      buffer_,
+      buffer_ + length_,
+      ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
     element_traits::initialize_range(
         tmp.buffer_ + length_, tmp.buffer_ + length);
     swap(tmp);
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h
index 77bdef93629..ee925f249b9 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/CORBA_String.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index b1799cf088b..1cdb4fc3087 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -9,20 +9,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
-   PortableServer::ServantBase * servant)
-  ACE_THROW_SPEC (())
+   PortableServer::ServantBase * servant) throw ()
 {
 
   try
     {
-      PortableServer::POA_var poa (servant->_default_POA (
-          ));
+      PortableServer::POA_var poa (servant->_default_POA ());
 
-      PortableServer::ObjectId_var id (poa->servant_to_id (servant
-                                                          ));
+      PortableServer::ObjectId_var id (poa->servant_to_id (servant));
 
-      poa->deactivate_object (id.in()
-                             );
+      poa->deactivate_object (id.in());
     }
   catch (...)
     {
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index 68077296726..8922297a7c9 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -39,8 +39,7 @@ namespace TAO
       typedef PortableServer::ServantBase * argument;
 
       // Deactivate an implicitly activated servant
-      void operator() (PortableServer::ServantBase * servant)
-        ACE_THROW_SPEC (());
+      void operator() (PortableServer::ServantBase * servant) throw ();
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index f21bef3f86d..53b9e90a757 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -8,8 +8,7 @@ ACE_RCSID (Utils,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC (())
+TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) throw ()
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index 920ba64d3e5..7227efb0100 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -38,8 +38,7 @@ namespace TAO
       typedef CORBA::ORB_ptr argument;
 
       /// Destroy the ORB
-      void operator() (CORBA::ORB_ptr orb)
-        ACE_THROW_SPEC (());
+      void operator() (CORBA::ORB_ptr orb) throw ();
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index b0796f39060..9b349c66957 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -16,7 +16,6 @@
 #include "tao/PortableServer/IdAssignmentPolicyC.h"
 #include "tao/PortableServer/LifespanPolicyC.h"
 
-#include "tao/Environment.h"
 #include "tao/ORBInitializer_Registry.h"
 
 #include "ace/Log_Msg.h"
@@ -322,7 +321,7 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void)
                               );
         }
     }
-  catch ( ::CORBA::Exception&)
+  catch (const ::CORBA::Exception&)
     {
       // ignore any exceptions..
     }
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index a5acabe07da..c0d4882492f 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,5 +1,4 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "tao/Environment.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Utils/PolicyList_Destroyer.inl"
@@ -11,8 +10,7 @@ ACE_RCSID (Utils,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
-  ACE_THROW_SPEC (())
+TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() throw ()
 {
 
   for (CORBA::ULong i = 0; i != length(); ++i)
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index ef2ef408805..4253b2c7a80 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -37,8 +37,7 @@ namespace TAO
     {
     public:
       PolicyList_Destroyer(CORBA::ULong length_hint);
-      ~PolicyList_Destroyer()
-        ACE_THROW_SPEC (());
+      ~PolicyList_Destroyer() throw ();
     };
 
   } // namespace Utils
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 6d5fe007366..ebc014d499e 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -10,42 +10,31 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
-TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
-                                   char const * id
-                                   )
+TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, char const * id)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references (id
-                                    );
+    orb->resolve_initial_references (id);
 
-  return RIR_Narrow<T>::narrow_object (object.in ()
-                                      );
+  return RIR_Narrow<T>::narrow_object (object.in ());
 }
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
-                                   char const * id
-                                   )
+                                   char const * id)
 {
-  CORBA::Object_var object =
-    info->resolve_initial_references (id
-                                     );
+  CORBA::Object_var object = info->resolve_initial_references (id);
 
-  return RIR_Narrow<T>::narrow_object (object.in ()
-                                      );
+  return RIR_Narrow<T>::narrow_object (object.in ());
 }
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
-TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
-                                          )
+TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object)
 {
-  _var_type narrowed_object = T::_narrow (object
-                                         );
+  _var_type narrowed_object = T::_narrow (object);
 
   if (CORBA::is_nil (narrowed_object.in ()))
   {
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (),
-                      T::_nil ());
+    throw ::CORBA::INV_OBJREF ();
   }
   return narrowed_object._retn ();
 }
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index 8afa8931e41..8e986e6d654 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -45,19 +45,15 @@ namespace TAO
 
       /// Use resolve_initial_references to find an object and then
       /// narrow it.
-      static _ptr_type narrow (CORBA::ORB_ptr orb,
-                               char const * id
-                               );
+      static _ptr_type narrow (CORBA::ORB_ptr orb, char const * id);
 
       /// Use resolve_initial_references to find an object and then
       /// narrow it.
       static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb,
-                               char const * id
-                               );
+                               char const * id);
 
     private:
-      static _ptr_type narrow_object (CORBA::Object_ptr object
-                                      );
+      static _ptr_type narrow_object (CORBA::Object_ptr object);
     };
 
   } // namespace Utils
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index ee6c34f4087..3c5d6362e6e 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -22,8 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -60,8 +59,7 @@ namespace TAO
 
       /// Destructor.  Removes a reference from the underlying object,
       /// possibly destroying it.
-      ~Servant_Var()
-        ACE_THROW_SPEC (());
+      ~Servant_Var() throw ();
 
       /// Assignment operator.  Assumes ownership of @c p.
       Servant_Var<T> & operator=(T * p);
@@ -137,8 +135,7 @@ namespace TAO
       /**
        * Often used to implement strong exception safety.
        */
-      void swap(Servant_Var<T> & rhs)
-        ACE_THROW_SPEC(());
+      void swap(Servant_Var<T> & rhs) throw ();
 
     private:
       T * ptr_;
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index ca6e0e6f9bf..3e903358d7e 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -2,8 +2,7 @@
 //
 // $Id$
 
-#include "tao/Exception.h"
-#include "ace/Swap.h"
+#include <algorithm>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -28,9 +27,9 @@ TAO::Utils::Servant_Var<T>::_duplicate (T * p)
 
 template <class T>
 ACE_INLINE void
-TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) ACE_THROW_SPEC(())
+TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) throw ()
 {
-  ACE_Swap<T*>::swap (this->ptr_, rhs.ptr_);
+  std::swap (this->ptr_, rhs.ptr_);
 }
 
 template <class T>
@@ -74,23 +73,11 @@ TAO::Utils::Servant_Var<T>::operator= (T * p)
 }
 
 template <class T> ACE_INLINE
-TAO::Utils::Servant_Var<T>::~Servant_Var (void)
-  ACE_THROW_SPEC (())
+TAO::Utils::Servant_Var<T>::~Servant_Var (void) throw ()
 {
-  // Unfortunately, there is no throw spec on _remove_ref, so we
-  // can't assume that it will not throw.  If it does, then we are in
-  // trouble.  In any event, we can't let the exception escape our
-  // destructor.
-  try
-    {
-      if (ptr_ != 0)
-        {
-          ptr_->_remove_ref ();
-        }
-    }
-  catch (...)
+  if (ptr_ != 0)
     {
-      // Forget the exception..
+      ptr_->_remove_ref ();
     }
 }
 
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index 29b878a9f17..48e39867815 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -113,7 +113,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       }
     }
   }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
   {
     ex._tao_print_exception (name_);
     result = -1;
diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp
index 4b132799b70..44f0b01c19d 100644
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ b/TAO/tao/Utils/Synch_Refcountable.cpp
@@ -13,8 +13,7 @@ ACE_RCSID (Utils,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock,
-                                                int refcount)
+TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount)
   : ACE_Refcountable (refcount)
   , refcount_lock_ (lock)
 {
diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h
index a16c7a02d89..ae6048d01ef 100644
--- a/TAO/tao/Value_Traits_T.h
+++ b/TAO/tao/Value_Traits_T.h
@@ -38,11 +38,21 @@ struct value_traits
     std::fill(begin, end, value_type ());
   }
 
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
+  // Allow MSVC++ >= 8 checked iterators to be used.
+  template <typename iter>
   inline static void copy_range(
-      value_type * begin, value_type * end, value_type *dst)
+      value_type * begin, value_type * end, iter dst)
   {
     std::copy(begin, end, dst);
   }
+# else
+  inline static void copy_range(
+      value_type * begin, value_type * end, value_type * dst)
+  {
+    std::copy(begin, end, dst);
+  }
+# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 };
 
 } // namespace details
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index 9d64485d221..d0359c951a5 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -179,10 +179,7 @@ CORBA::AbstractBase::_is_a (const char *type_id)
       return this->equivalent_obj_->_is_a (type_id);
     }
 
-  int const 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") == 0);
 }
 
 const char *
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 8ebddcab997..3ce3d5a9438 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -27,7 +27,6 @@
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Object.h"  /* For CORBA::Object_var */
 #include "tao/Pseudo_VarOut_T.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index 7eb73f779ec..5c31e1827aa 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -59,7 +59,7 @@ namespace TAO
              );
 
       }
-    catch ( ::CORBA::Exception&)
+    catch (const ::CORBA::Exception&)
       {
         // Consume and return proxy
         return proxy;
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index dfa55ef1c7f..763d7515a3b 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -12,9 +12,9 @@
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
-#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Valuetype/ValueBase.inl"
@@ -170,9 +170,7 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
   //  new_object->_tao_unmarshal_post ()
 
   CORBA::Boolean const retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (strm,
-                                          new_object,
-                                          0);
+    CORBA::ValueBase::_tao_unmarshal_pre (strm, new_object, 0);
 
   if (!retval)
     {
@@ -324,9 +322,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
                       repo_id));
         }
 
-      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 1,
-                                        CORBA::COMPLETED_MAYBE),
-                                        false);
+      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 1, CORBA::COMPLETED_MAYBE);
     }
 
   valuetype = factory->create_for_unmarshal ();
@@ -689,7 +685,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
   //that has parents.
   if (the_rd_ptr < this->chunk_octets_end_pos_)
     {
-      this->value_nesting_level_ ++;
+      ++this->value_nesting_level_;
       return true;
     }
 
@@ -723,8 +719,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
         }
 
       this->value_nesting_level_ = - tag;
-      this->value_nesting_level_--;
-
+      --this->value_nesting_level_;
 
       this->chunk_octets_end_pos_ = 0;
 
@@ -739,7 +734,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
     {
       // Read the chunk size of another chunk.
       this->chunk_octets_end_pos_ = strm.rd_ptr () + tag;
-      this->value_nesting_level_ ++;
+      ++this->value_nesting_level_;
     }
   else // (tag >= 0x7fffff00)
     {
@@ -1006,8 +1001,7 @@ CORBA::Boolean
 operator>> (TAO_InputCDR &strm,
             CORBA::ValueBase *&_tao_valuetype)
 {
-  return CORBA::ValueBase::_tao_unmarshal (strm,
-                                           _tao_valuetype);
+  return CORBA::ValueBase::_tao_unmarshal (strm, _tao_valuetype);
 }
 
 // =============== Template Specializations =====================
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index b732014f8ca..95f46be0647 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -30,7 +30,6 @@
 #include "tao/Any_Insert_Policy_T.h"
 
 #include "ace/Basic_Types.h"
-#include "ace/CORBA_macros.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index 473780b8790..a03b7be5bc7 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -47,7 +47,7 @@ CORBA::ValueFactoryBase::_add_ref (void)
 void
 CORBA::ValueFactoryBase::_remove_ref (void)
 {
-  const CORBA::ULong new_count = --this->_tao_reference_count_;
+  CORBA::ULong const new_count = --this->_tao_reference_count_;
 
   if (new_count == 0)
     delete this;
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 6bfd4dd0c14..859a011e331 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -23,13 +23,11 @@
 
 #include "tao/Valuetype/Value_VarOut_T.h"
 
-#include "tao/Environment.h"
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
-#include "ace/CORBA_macros.h"
 #include "ace/Atomic_Op.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index f33af298e5e..9100f319cf8 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -69,8 +69,8 @@ TAO_ValueFactory_Map::unbind (const char *repo_id,
   ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
   FACTORY_MAP_MANAGER::ENTRY *prev_entry = 0;
-  int ret = this->map_.find (repo_id,
-                             prev_entry);
+  int ret = this->map_.find (repo_id, prev_entry);
+
   if (ret == 0)    // there was a matching factory
     {
       // set factory to the previous factory,
@@ -94,8 +94,7 @@ TAO_ValueFactory_Map::find (const char *repo_id,
 {
   ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
-  int const ret = this->map_.find (repo_id,
-                                   factory);
+  int const ret = this->map_.find (repo_id, factory);
   if (ret > -1)
     {
       factory->_add_ref ();    // The caller gets one reference as gift.
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 21093cf9ca7..1f987d36639 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -4,6 +4,7 @@
 #include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h"
 
 #include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (ValueType,
            Valuetype_Adapter_Factory_Impl,
@@ -17,7 +18,6 @@ TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void)
 
 TAO_Valuetype_Adapter *
 TAO_Valuetype_Adapter_Factory_Impl::create (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Valuetype_Adapter_Impl *nva = 0;
   ACE_NEW_THROW_EX (nva,
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index 6cac11a715b..15d86b11251 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -45,8 +45,7 @@ public:
 
   virtual TAO_Valuetype_Adapter * create (
 
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h
index f8b5ee460be..c0107c9ebb7 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h
@@ -41,11 +41,21 @@ struct valuetype_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
+  // Allow MSVC++ >= 8 checked iterators to be used.
+  template <typename iter>
+  inline static void copy_range(
+      object_type ** begin, object_type ** end, iter dst)
+  {
+    std::transform(begin, end, dst, &derived::duplicate);
+  }
+#else
   inline static void copy_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
+#endif  /* ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h
index 3e1ab345ee0..e2e859fc57d 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.h
+++ b/TAO/tao/Valuetype_Adapter_Factory.h
@@ -21,7 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/orbconf.h"
+#include "tao/TAO_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -42,10 +43,7 @@ class TAO_Export TAO_Valuetype_Adapter_Factory
 public:
   virtual ~TAO_Valuetype_Adapter_Factory (void);
 
-  virtual TAO_Valuetype_Adapter * create (
-
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  virtual TAO_Valuetype_Adapter * create (void) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 7ad2c7de82b..e4b48067dc8 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -1,9 +1,9 @@
+
 // -*- C++ -*-
 // $Id$
-
-// This is file was automatically generated by $ACE_ROOT/bin/make_release.
+// This is file was automatically generated by \$ACE_ROOT/bin/make_release.
 
 #define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 5 
-#define TAO_BETA_VERSION 6 
-#define TAO_VERSION "1.5.6"
+#define TAO_MINOR_VERSION 5
+#define TAO_BETA_VERSION 7
+#define TAO_VERSION "1.5.7"
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index a8832b4a416..65159a31c69 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -44,16 +44,16 @@ namespace TAO
 
     ~Nested_Upcall_Guard (void)
     {
-      TAO_ORB_Core_TSS_Resources *tss =
-        t_->orb_core ()->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources *tss = t_->orb_core ()->get_tss_resources ();
 
-      tss->upcalls_temporarily_suspended_on_this_thread_ =
-        false;
+      tss->upcalls_temporarily_suspended_on_this_thread_ = false;
 
       if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                    "re-enabling upcalls on thread %t\n"));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
+                      "re-enabling upcalls on thread %t\n"));
+        }
     }
 
   private:
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index f775c66d9c0..45d26369336 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -48,8 +48,7 @@ public:
   virtual ~TAO_Wait_On_Leader_Follower (void);
 
   // = Documented in TAO_Wait_Strategy.
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
+  virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index cf8f249046b..2747d685ec5 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -54,8 +54,7 @@ public:
    * variables because the reply may arrive *before* the user calls
    * wait.
    */
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
+  virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
 
   /// Base class virtual method. Wait till the @c reply_received flag is
   /// true or the time expires.
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index ad6e5150b31..a40a1facb22 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -122,7 +122,7 @@ CORBA::WrongTransaction::_tao_duplicate (void) const
 
 void CORBA::WrongTransaction::_raise (void) const
 {
-  TAO_RAISE (*this);
+  throw *this;
 }
 
 void CORBA::WrongTransaction::_tao_encode (
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 1fdf4a35e91..70c706f9629 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -42,7 +42,6 @@
 
 #include /**/ "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
index bb632ec4c49..6788be4dfa6 100644
--- a/TAO/tao/diffs/Object_Key.diff
+++ b/TAO/tao/diffs/Object_Key.diff
@@ -5,13 +5,15 @@
  #endif /* __BORLANDC__ */
 
 +#include "ace/ACE.h"
++#include "ace/Numeric_Limits.h"
++#include "ace/Truncate.h"
 +#include "ace/OS_NS_string.h"
 +#include "ace/os_include/os_ctype.h"
 +
  // TAO_IDL - Generated from
  // be\be_visitor_arg_traits.cpp:69
 
-@@ -88,6 +92,150 @@
+@@ -88,2 +95,2 @@
  TAO::ObjectKey::~ObjectKey (void)
  {}
 
@@ -30,19 +32,19 @@
 +  // OR, we could just return this space.  The classic time-space tradeoff,
 +  // and for now we'll let time win out, which means that we only do the
 +  // allocation once.
-+  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
++  unsigned int const len = 3 * seq.length (); /* space for zero termination not needed */;
 +  str = CORBA::string_alloc (len);
 +
 +  char *cp = str;
 +
-+  for (u_int i = 0;
++  for (unsigned int i = 0;
 +       cp < (str + len) && i < seq.length();
 +       ++i)
 +    {
-+      u_char bt = seq[i];
++      unsigned char bt = seq[i];
 +      if (is_legal (bt))
 +        {
-+          *cp++ = (char) bt;
++          *cp++ = static_cast<char> (bt);
 +          continue;
 +        }
 +
@@ -54,11 +56,12 @@
 +  *cp = '\0';
 +}
 +
-+int TAO::ObjectKey::is_legal (u_char & c)
++CORBA::Boolean
++TAO::ObjectKey::is_legal (unsigned char c)
 +{
 +  if (isalnum(c))
 +  {
-+    return 1;
++    return true;
 +  }
 +  else
 +  {
@@ -80,18 +83,25 @@
 +      return;
 +    }
 +
-+  u_int length = ACE_OS::strlen (str);
-+  const char *eos = str + length;
-+  const char *cp = str;
++  size_t const str_len = ACE_OS::strlen (str);
++
++  // Ensure sequence length value does not exceed maximum value for
++  // sequence index type (CORBA::ULong).  This is mostly an issue for
++  // 64-bit MS Windows builds.
++  CORBA::ULong const len =
++    ACE_Utils::truncate_cast<CORBA::ULong> (str_len);
++
++  char const * const eos = str + len;
++  char const *       cp  = str;
 +
 +  // Set the length of the sequence to be as long as
 +  // we'll possibly need...we'll reset it to the actual
 +  // length later.
-+  seq.length (length);
++  seq.length (len);
 +
-+  u_int i = 0;
++  CORBA::ULong i = 0;
 +  for (;
-+       cp < eos && i < seq.length ();
++       cp < eos && i < len;
 +       ++i)
 +    {
 +      if (*cp == '%' || *cp == '\\')
@@ -99,8 +109,8 @@
 +          // This is an escaped non-printable,
 +          // so we decode the hex values into
 +          // the sequence's octet
-+          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-+          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
++          seq[i]  = static_cast<CORBA::Octet> (ACE::hex2byte (cp[1]) << 4);
++          seq[i] |= static_cast<CORBA::Octet> (ACE::hex2byte (cp[2]));
 +          cp += 3;
 +        }
 +      else
@@ -162,7 +172,7 @@
  // TAO_IDL - Generated from
 --- orig/Object_KeyC.h	2005-04-08 10:17:40.978604800 +0200
 +++ Object_KeyC.h	2005-04-08 10:17:41.879900800 +0200
-@@ -117,6 +117,25 @@
+@@ -117,4 +117,23 @@
        )
        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
  #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
@@ -177,7 +187,7 @@
 +        TAO::unbounded_value_sequence<CORBA::Octet> &seq,
 +        const char *str
 +      );
-+    static int is_legal (u_char & c);
++    static CORBA::Boolean is_legal (unsigned char c);
 +
 +    /// A special method that gives no regard to how the ORB has
 +    /// configured  the resource factory. This will be used only
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 383fb11b695..de697c78aad 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -22,25 +22,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Exception *
 TAO_Operation_Details::corba_exception (const char *id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != this->ex_count_; ++i)
     {
-      if (ACE_OS::strcmp (id,
-                          this->ex_data_[i].id) != 0)
+      if (ACE_OS::strcmp (id, this->ex_data_[i].id) != 0)
         {
           continue;
         }
 
       // Create an exception object
-      CORBA::Exception *exception =
-        this->ex_data_[i].alloc ();
+      CORBA::Exception *exception = this->ex_data_[i].alloc ();
 
       if (exception == 0)
         {
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (0,
-                                              CORBA::COMPLETED_YES),
-                            0);
+          throw ::CORBA::NO_MEMORY (0, CORBA::COMPLETED_YES);
         }
 
       // Return the exception object that we just created.
@@ -48,9 +43,20 @@ TAO_Operation_Details::corba_exception (const char *id)
     }
 
   // If there are no matches return an unknown exception.
-  ACE_THROW_RETURN (CORBA::UNKNOWN (0,
-                                    CORBA::COMPLETED_YES),
-                    0);
+  throw ::CORBA::UNKNOWN (0, CORBA::COMPLETED_YES);
+}
+
+bool
+TAO_Operation_Details::has_exception (::CORBA::Exception& ex) const
+{
+  for (CORBA::ULong i = 0; i != this->ex_count_; ++i)
+    {
+      if (ACE_OS::strcmp (ex._rep_id (), this->ex_data_[i].id) == 0)
+        {
+          return true;
+        }
+    }
+  return false;
 }
 
 bool
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 38cbc0314be..61ad4d406e4 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -14,17 +14,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "tao/Service_Context.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Service_Context.h"
 #include "tao/TimeBaseC.h"
 #include "tao/target_specification.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations
@@ -106,8 +104,7 @@ public:
   TAO_Service_Context &reply_service_context (void);
   const TAO_Service_Context &reply_service_context (void) const;
 
-  /// Reset the contents of the service context lists that we
-  /// hold.
+  /// Reset the contents of the service context lists that we hold.
   void reset_request_service_info (void);
   void reset_reply_service_info (void);
 
@@ -132,8 +129,10 @@ public:
    * is not found in the list of exceptions specified by the operation
    * this call would raise an UNKNOWN exception.
    */
-  CORBA::Exception *corba_exception (const char *ex)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Exception *corba_exception (const char *ex);
+
+  /// Check whether exception @a ex is in the signature of this operation
+  bool has_exception (::CORBA::Exception& ex) const;
 
   /**
    * @name Helper methods used by the Invocation classes.
@@ -222,7 +221,7 @@ private:
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
   /// The dii request flag.
-  CORBA::Boolean is_dii_request_;  
+  CORBA::Boolean is_dii_request_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl
index 61063aa9a60..3ebb8296e02 100644
--- a/TAO/tao/operation_details.inl
+++ b/TAO/tao/operation_details.inl
@@ -210,7 +210,6 @@ TAO_Operation_Details::ft_retention_id (void) const
 }
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
-
 ACE_INLINE CORBA::Boolean
 TAO_Operation_Details::is_dii_request (void) const
 {
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 7ad3103640d..c4439ba74e9 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -92,6 +92,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16;
 #endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
 
+// The default size of TAO's adapter registry.
+#if !defined (TAO_DEFAULT_ADAPTER_REGISTRY_SIZE)
+const size_t TAO_DEFAULT_ADAPTER_REGISTRY_SIZE = 16;
+#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
+
 // The default size of the reply dispatcher table, ie. if the reply
 // dispatcher strategy needs a table to maintain association between
 // request id's and reply dispatchers
@@ -739,6 +744,12 @@ enum TAO_Cached_Policy_Type
 
   TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP,
 
+  TAO_CACHED_POLICY_SERVER_NETWORK_PRIORITY,
+
+  TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY,
+
+  TAO_CACHED_POLICY_NETWORK_PRIORITY,
+
   TAO_CACHED_POLICY_ENDPOINT,
 
   /// NOTE: The "TAO_CACHED_POLICY_MAX_CACHED" should always be the last.
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 313daa223f6..123e5d8f471 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -55,7 +55,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     default_client.cpp
     Default_Collocation_Resolver.cpp
     Default_Endpoint_Selector_Factory.cpp
-    Default_Protocols_Hooks.cpp
     default_resource.cpp
     default_server.cpp
     Default_Stub_Factory.cpp
@@ -178,6 +177,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Profile_Transport_Resolver.cpp
     Protocol_Factory.cpp
     Protocols_Hooks.cpp
+    Network_Priority_Protocols_Hooks.cpp
     Queued_Message.cpp
     Reactive_Connect_Strategy.cpp
     Reactive_Flushing_Strategy.cpp
@@ -320,7 +320,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Default_Endpoint_Selector_Factory.h
     default_environment.h
     default_ports.h
-    Default_Protocols_Hooks.h
     default_resource.h
     default_server.h
     Default_Stub_Factory.h
@@ -427,6 +426,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Object_Ref_Table.h
     Object_T.h
     Object_Reference_Sequence_Element_T.h
+    Object_Reference_Const_Sequence_Element_T.h
     Objref_VarOut_T.h
     Object_Reference_Traits_Base_T.h
     Object_Reference_Traits_T.h
@@ -469,6 +469,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     Profile_Transport_Resolver.h
     Protocol_Factory.h
     Protocols_Hooks.h
+    Network_Priority_Protocols_Hooks.h
     Pseudo_VarOut_T.h
     Queued_Message.h
     Range_Checking_T.h
@@ -499,6 +500,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     String_Alloc.h
     String_Manager_T.h
     String_Sequence_Element_T.h
+    String_Const_Sequence_Element_T.h
     String_Traits_Base_T.h
     String_Traits_T.h
     Stub_Factory.h
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index 40ae9a4d2a7..a9b82ddc549 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -20,7 +20,7 @@ project(*Server): taoserver, amh, strategies {
 }
 
 project(*Client): taoexe, amh, portableserver, strategies {
-  after += *Server
+  after += *idl
   Source_Files {
     client.cpp
     TestS.cpp
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 71aea07de15..78e9bb736a2 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -11,7 +11,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->string_to_object (ior);
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index eedafb22c35..9e6a52cb0f3 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -15,11 +15,9 @@ public:
   ST_AMH_Servant (CORBA::ORB_ptr orb);
 
   void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    Test::Timestamp send_time);
 
-  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
 protected:
   CORBA::ORB_ptr orb_;
@@ -37,7 +35,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Throw an overload exception
 
@@ -58,7 +55,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 
 void
 ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -164,8 +160,19 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
   try
     {
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =    
+        PortableServer::POA::_narrow (poa_object.in ()); 
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        servant->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         this->orb_->object_to_string (roundtrip.in ());
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index b0995e4103a..d36d1b52fce 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 24246020a1d..153f0064225 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -41,8 +41,7 @@ public:
   ST_AMH_Servant (CORBA::ORB_ptr orb);
 
   void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                    Test::Timestamp send_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    Test::Timestamp send_time);
 
 protected:
   CORBA::ORB_var orb_;
@@ -60,7 +59,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::sleep (1);
   ACE_DEBUG ((LM_DEBUG, "Recieved Timestamp # %d \n", calls_received));
@@ -189,8 +187,19 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
   try
     {
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Roundtrip_var roundtrip =
-        servant->_this ();
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var ior =
         this->orb_->object_to_string (roundtrip.in ());
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index 69265f72525..1752743fd2e 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -21,18 +21,19 @@ project(*Server): taoserver, messaging, ami {
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
-  after += *Server
+  after += *idl
   Source_Files {
     client.cpp
     ami_testS.cpp
     ami_testC.cpp
+    ami_test_i.cpp
   }
   IDL_Files {
   }
 }
 
 project(*Simple Client): messaging, taoexe, portableserver, ami {
-  after += *Server
+  after += *idl
   Source_Files {
     simple_client.cpp
     ami_testS.cpp
diff --git a/TAO/tests/AMI/Makefile.am b/TAO/tests/AMI/Makefile.am
index 3f15bbd9d7d..5c597c51bbe 100644
--- a/TAO/tests/AMI/Makefile.am
+++ b/TAO/tests/AMI/Makefile.am
@@ -107,6 +107,7 @@ client_SOURCES = \
   ami_testC.cpp \
   ami_testS.cpp \
   client.cpp \
+  ami_test_i.cpp \
   ami_test_i.h
 
 client_LDADD = \
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index cc30da0f035..dd18af1af6c 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -19,10 +19,16 @@
 
 ACE_RCSID(AMI, ami_test_i, "$Id$")
 
-AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
+AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
+                        CORBA::Long in_l,
+                        const char * in_str,
+                        bool check_params)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      number_ ((CORBA::Long) 931232),
-     yadda_ ((CORBA::Long) 140474)
+     yadda_ ((CORBA::Long) 140474),
+     in_l_ (in_l),
+     in_str_(CORBA::string_dup(in_str)),
+     check_params_(check_params)
 {
 }
 
@@ -30,8 +36,6 @@ CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
                  const char* in_str)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   A::DidTheRightThing))
 {
   out_l = 931233;
 
@@ -45,17 +49,25 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Throwing Exception: A::DidTheRightThing\n"));
-      ACE_THROW_RETURN (A::DidTheRightThing(), 0);
+      throw A::DidTheRightThing();
+    }
+
+  if (check_params_)
+    {
+      if (in_l_ != in_l || ACE_OS::strcmp(in_str_.in (), in_str) != 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "ERROR: Parameter corruption on in parameters: %d %d %s %s.\n",
+                      in_l_, in_l, in_str_.in (), in_str));
+        }
+      return 0;
     }
 
   return 931234;
 }
 
-
-
 void
 AMI_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -63,7 +75,6 @@ AMI_Test_i::shutdown (void)
 
 CORBA::Long
 AMI_Test_i::yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
@@ -73,7 +84,6 @@ AMI_Test_i::yadda (void)
 
 void
 AMI_Test_i::yadda (CORBA::Long yadda)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(set_)yadda\n"));
@@ -82,7 +92,6 @@ AMI_Test_i::yadda (CORBA::Long yadda)
 
 void
 AMI_Test_i::inout_arg_test (char *&)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No action, this operation is to test code generation for INOUT
   // args in AMI operations.
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 12070d3c5cd..9ff1fe8cfb8 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -26,26 +26,22 @@ class AMI_Test_i : public POA_A::AMI_Test
 {
 public:
   /// ctor
-  AMI_Test_i (CORBA::ORB_ptr orb);
+  AMI_Test_i (CORBA::ORB_ptr orb,
+        CORBA::Long in_l = 0, const char * in_str = 0,
+	      bool check_params = false);
 
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     A::DidTheRightThing));
+                   const char* in_str);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
-  CORBA::Long yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long yadda (void);
 
-  void yadda (CORBA::Long yadda)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void yadda (CORBA::Long yadda);
 
-  void inout_arg_test (char *& str)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void inout_arg_test (char *& str);
 
 private:
   CORBA::ORB_var orb_;
@@ -53,7 +49,13 @@ private:
   CORBA::Long number_;
 
   CORBA::Long yadda_;
-};
 
+  CORBA::Long in_l_;
+
+  CORBA::String_var in_str_;
+
+  bool check_params_;
+};
 
 #endif /* TAO_AMI_TEST_I_H */
+
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index c43a3ade875..5b2f2442b33 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -16,7 +16,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
-#include "ami_testS.h"
+#include "ami_test_i.h"
 
 ACE_RCSID (AMI,
            client,
@@ -27,16 +27,24 @@ int nthreads = 5;
 int niterations = 5;
 int debug = 0;
 int number_of_replies = 0;
+bool collocated = false;
+
+CORBA::Long in_number = 931232;
+const char * in_str = "Let's talk AMI.";
+int parameter_corruption = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
+  ACE_Get_Opt get_opts (argc, argv, "cdk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'c':
+        collocated = true;
+        break;
       case 'd':
         debug = 1;
         break;
@@ -54,6 +62,7 @@ parse_args (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-d "
+                           "-c"
                            "-k <ior> "
                            "-n <nthreads> "
                            "-i <niterations> "
@@ -65,6 +74,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
+
 /**
  * @class Client
  *
@@ -95,12 +105,19 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void) {};
+  Handler (void)
+  {
+  };
 
   void foo (CORBA::Long result,
             CORBA::Long out_l)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
+      if (result == 0)
+        {
+          ACE_ERROR((LM_ERROR, "ERROR: Callback method detected parameter corruption."));
+          parameter_corruption = 1;
+        }
+
       if (debug)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -113,7 +130,6 @@ public:
     };
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
@@ -129,7 +145,6 @@ public:
     };
 
   void get_yadda (CORBA::Long result)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
@@ -137,38 +152,33 @@ public:
     };
 
   void get_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
   void set_yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
     };
-  ~Handler (void) {};
+  ~Handler (void)
+  {
+  };
 
-  void inout_arg_test (
-      const char *
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  void inout_arg_test (const char *)
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 };
@@ -182,16 +192,26 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var object =
-        orb->string_to_object (ior);
+      A::AMI_Test_var server;
 
-      A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in ());
+      if (!collocated)
+        {
+          CORBA::Object_var object =
+          orb->string_to_object (ior);
+
+          server =  A::AMI_Test::_narrow (object.in ());
+        }
+      else
+        {
+          AMI_Test_i * servant =
+            new AMI_Test_i(orb.in(), in_number, in_str, true);
+          server = servant->_this();
+        }
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -243,8 +263,7 @@ main (int argc, char *argv[])
 
       while (number_of_replies > 0)
         {
-          CORBA::Boolean pending =
-            orb->work_pending();
+          CORBA::Boolean pending = orb->work_pending();
 
           if (pending)
             {
@@ -259,13 +278,10 @@ main (int argc, char *argv[])
                       (nthreads*niterations) - number_of_replies));
         }
 
-
       client.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      //client.ami_test_var_->shutdown ();
-
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
                         );
@@ -278,7 +294,7 @@ main (int argc, char *argv[])
       return 1;
     }
 
-  return 0;
+  return parameter_corruption;
 }
 
 // ****************************************************************
@@ -296,13 +312,9 @@ Client::svc (void)
 {
   try
     {
-      CORBA::Long number = 931232;
-
       for (int i = 0; i < this->niterations_; ++i)
         {
-          ami_test_var_->sendc_foo (the_handler_var_.in (),
-                                    number,
-                                    "Let's talk AMI.");
+          ami_test_var_->sendc_foo (the_handler_var_.in (), in_number, in_str);
         }
       if (debug)
         {
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 4797af89617..dda1be7f98b 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -16,10 +16,10 @@ $iterations = '1';
 foreach $i (@ARGV) {
     if ($i eq '-mux') {
         $client_conf = PerlACE::LocalFile ("muxed$PerlACE::svcconf_ext");
-    } 
+    }
     elsif ($i eq '-debug') {
         $debug_level = '1';
-    } 
+    }
     elsif ($i eq '-exclusive') {
         $client_conf = PerlACE::LocalFile ("exclusive$PerlACE::svcconf_ext");
     }
@@ -42,7 +42,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $CL = new PerlACE::Process ("simple_client",
                             "-ORBsvcconf $client_conf "
@@ -62,11 +62,16 @@ $client2 = $CL2->SpawnWaitKill (60);
 
 $server = $SV->WaitKill (10);
 
+$CL3 = new PerlACE::Process ("client",
+                            "-c -ORBdebuglevel $debug_level");
+
+$client3 = $CL3->SpawnWaitKill (60);
+
 unlink $iorfile;
 
-if ($server != 0 || $client != 0 || $client2 != 0) {
+if ($server != 0 || $client != 0 || $client2 != 0 || $client3 != 0) {
     exit 1;
 }
- 
+
 exit 0;
- 
+
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index f829e76a50f..10bf82e95b2 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -78,8 +78,13 @@ main (int argc, char *argv[])
 
       AMI_Test_i ami_test_i (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&ami_test_i);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this ();
+        A::AMI_Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (ami_test_var.in ());
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 2cde2862715..e9611f8b9d6 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -75,7 +75,6 @@ public:
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
         {
@@ -87,7 +86,6 @@ public:
     };
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
@@ -112,7 +110,6 @@ public:
 
 
   void get_yadda (CORBA::Long result)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
@@ -120,21 +117,18 @@ public:
     };
 
   void get_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
   void set_yadda (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
@@ -143,14 +137,12 @@ public:
   void inout_arg_test (
       const char *
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 };
@@ -163,7 +155,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object_var =
         orb->resolve_initial_references ("RootPOA");
@@ -195,8 +187,13 @@ main (int argc, char *argv[])
 
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
+      PortableServer::ObjectId_var id =
+        poa_var->activate_object (&handler);
+
+      CORBA::Object_var object = poa_var->id_to_reference (id.in ());
+
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this ();
+        A::AMI_AMI_TestHandler::_narrow (object.in ());
 
       // Try out sending asynchronous messages without a reply handler
       // registered. Things fail if we get an exception.
@@ -230,8 +227,7 @@ main (int argc, char *argv[])
       // Begin test of attributes
       ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
-      ami_test_var->sendc_set_yadda (the_handler_var.in (),
-                                     4711);
+      ami_test_var->sendc_set_yadda (the_handler_var.in (), 4711);
 
       ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index a85b561d23e..6fe9b1a0db7 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -30,7 +30,6 @@ AMI_Buffering::Nest_Guard::~Nest_Guard (void)
 
 void
 AMI_Buffering::receive_data (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -47,20 +46,17 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload)
 
 void
 AMI_Buffering::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 AMI_Buffering::sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_->flush ();
 }
 
 void
 AMI_Buffering::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->must_shutdown_ = true;
   this->try_shutdown();
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index e5df2680bee..a1717c10a71 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -18,17 +18,13 @@ public:
                  Test::AMI_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sync (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   /// internal implementation of shutdown. This
   void try_shutdown (void);
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 5fb820f88c7..2d383c84e22 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -21,7 +21,7 @@ project(*Server): taoserver, ami {
 }
 
 project(*Client): taoserver, ami {
-  after += *Server
+  after += *idl
   exename = client
   Source_Files {
     Client_Task.cpp
@@ -35,7 +35,7 @@ project(*Client): taoserver, ami {
 }
 
 project(*Admin): taoserver, ami {
-  after += *Client
+  after += *idl
   exename = admin
   Source_Files {
     AMI_Buffering_Admin.cpp
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index cf00721a861..22ed84d2379 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -14,21 +14,18 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 
 CORBA::ULong
 AMI_Buffering_Admin::request_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
 AMI_Buffering_Admin::bytes_received_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
 AMI_Buffering_Admin::request_received (CORBA::ULong payload_length)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
   this->bytes_received_count_ += payload_length;
@@ -36,13 +33,11 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length)
 
 void
 AMI_Buffering_Admin::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 AMI_Buffering_Admin::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 6deca90143b..e09021b0da2 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -17,20 +17,15 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong request_count (void);
 
-  virtual CORBA::ULong bytes_received_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong bytes_received_count (void);
 
-  virtual void request_received (CORBA::ULong payload_length)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index ef5d94d28be..8742d78f98c 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -11,13 +11,11 @@ Reply_Handler::Reply_Handler (void)
 
 void
 Reply_Handler::receive_data (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -31,13 +29,11 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder)
 
 void
 Reply_Handler::sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -51,13 +47,11 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder)
 
 void
 Reply_Handler::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index 34638d1a812..66d27640d7c 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -17,20 +17,14 @@ public:
   Reply_Handler (void);
 
   // = The skeleton methods
-  virtual void receive_data (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void receive_data_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (void);
+  virtual void receive_data_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void sync_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sync (void);
+  virtual void sync_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 2bd2e711252..6e34ed3e5a0 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (AMI_buffering_admin_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::AMI_Buffering_Admin_var AMI_buffering_admin =
-        AMI_buffering_admin_impl->_this ();
+        Test::AMI_Buffering_Admin::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (AMI_buffering_admin.in ());
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index cbe44b66b1f..3b570850204 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -92,20 +92,24 @@ parse_args (int argc, char *argv[])
 
 int
 run_message_count (CORBA::ORB_ptr orb,
+                   PortableServer::POA_ptr root_poa,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 int
 run_timeout (CORBA::ORB_ptr orb,
+             PortableServer::POA_ptr root_poa,
              Test::AMI_Buffering_ptr ami_buffering,
              Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
+                      PortableServer::POA_ptr root_poa,
                       Test::AMI_Buffering_ptr oneway_buffering,
                       Test::AMI_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
+                 PortableServer::POA_ptr root_poa,
                  Test::AMI_Buffering_ptr ami_buffering,
                  Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 
@@ -116,7 +120,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -177,6 +181,7 @@ main (int argc, char *argv[])
                       "Running message count flushing test\n"));
           test_failed =
             run_message_count (orb.in (),
+                               root_poa.in (),
                                ami_buffering.in (),
                                ami_buffering_admin.in ());
         }
@@ -186,6 +191,7 @@ main (int argc, char *argv[])
                       "Running timeout flushing test\n"));
           test_failed =
             run_timeout (orb.in (),
+                         root_poa.in (),
                          ami_buffering.in (),
                          ami_buffering_admin.in ());
         }
@@ -195,6 +201,7 @@ main (int argc, char *argv[])
                       "Running timeout (reactive) flushing test\n"));
           test_failed =
             run_timeout_reactive (orb.in (),
+                                  root_poa.in (),
                                   ami_buffering.in (),
                                   ami_buffering_admin.in ());
         }
@@ -204,6 +211,7 @@ main (int argc, char *argv[])
                       "Running buffer size flushing test\n"));
           test_failed =
             run_buffer_size (orb.in (),
+                             root_poa.in (),
                              ami_buffering.in (),
                              ami_buffering_admin.in ());
         }
@@ -374,6 +382,7 @@ run_liveness_test (CORBA::ORB_ptr orb,
 
 int
 run_message_count (CORBA::ORB_ptr orb,
+                   PortableServer::POA_ptr root_poa,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
@@ -402,8 +411,13 @@ run_message_count (CORBA::ORB_ptr orb,
                   1);
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (reply_handler_impl);
+
+  CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this ();
+    Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ());
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
@@ -479,8 +493,9 @@ run_message_count (CORBA::ORB_ptr orb,
 
 int
 run_timeout (CORBA::ORB_ptr orb,
-              Test::AMI_Buffering_ptr ami_buffering,
-              Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
+             PortableServer::POA_ptr root_poa,
+             Test::AMI_Buffering_ptr ami_buffering,
+             Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -507,8 +522,13 @@ run_timeout (CORBA::ORB_ptr orb,
                   1);
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (reply_handler_impl);
+
+  CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this ();
+    Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ());
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
@@ -585,6 +605,7 @@ run_timeout (CORBA::ORB_ptr orb,
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
+                      PortableServer::POA_ptr root_poa,
                       Test::AMI_Buffering_ptr ami_buffering,
                       Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
@@ -613,8 +634,13 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
                   1);
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (reply_handler_impl);
+
+  CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this ();
+    Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ());
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
@@ -695,6 +721,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
+                 PortableServer::POA_ptr root_poa,
                  Test::AMI_Buffering_ptr ami_buffering,
                  Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
@@ -721,8 +748,13 @@ run_buffer_size (CORBA::ORB_ptr orb,
                   1);
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (reply_handler_impl);
+
+  CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this ();
+    Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ());
 
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index 53e85d2e7ca..000cf980d2b 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -86,8 +86,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (AMI_buffering_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::AMI_Buffering_var AMI_buffering =
-        AMI_buffering_impl->_this ();
+        Test::AMI_Buffering::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (AMI_buffering.in ());
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index ae39f7b15c7..e064d725fd2 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -22,7 +22,7 @@ project(*Server): taoserver, ami {
 }
 
 project(*Client): taoserver, ami {
-  after += *Server
+  after += *idl
   exename = client
   Source_Files {
     timeout_i.cpp
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index d5b81fcd707..e6926258dce 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -105,8 +105,13 @@ main (int argc, char *argv[])
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&timeoutHandler_i);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this ();
+        AMI_TimeoutObjHandler::_narrow (object_act.in ());
 
       // Instantiate client
       TimeoutClient client (orb.in (),
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 56245f32862..db6bc8e17b9 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -78,8 +78,13 @@ main (int argc, char *argv[])
 
       Timeout_i timeout_i (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&timeout_i);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       TimeoutObj_var timeout_var =
-        timeout_i._this ();
+        TimeoutObj::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (timeout_var.in ());
@@ -104,8 +109,13 @@ main (int argc, char *argv[])
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
+      PortableServer::ObjectId_var idu =
+        root_poa->activate_object (&timeoutHandler_i);
+
+      CORBA::Object_var objectu = root_poa->id_to_reference (idu.in ());
+
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this ();
+        AMI_TimeoutObjHandler::_narrow (objectu.in ());
 
       // Instantiate client
       /*
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 85e35ccbf46..3dc5e32e2dc 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -30,7 +30,6 @@ Timeout_i::~Timeout_i ()
 
 void
 Timeout_i::sendTimeToWait (CORBA::Long msec)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG,
   //            "Timeout_i::sendTimeToWait: invoked with msec = %d\n\n",
@@ -48,7 +47,6 @@ Timeout_i::sendTimeToWait (CORBA::Long msec)
 
 void
 Timeout_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   orb_->shutdown ();
   //ACE_DEBUG ((LM_DEBUG,
@@ -72,7 +70,6 @@ TimeoutHandler_i::~TimeoutHandler_i ()
 
 void
 TimeoutHandler_i::sendTimeToWait (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "reply"));
@@ -82,7 +79,6 @@ TimeoutHandler_i::sendTimeToWait (void)
 
 void
 TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   timer_.stop ();
 
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index d82a6c73eee..cde9fbcea71 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -31,11 +31,9 @@ public:
 
   ~Timeout_i ();
 
-  virtual void sendTimeToWait (CORBA::Long msec)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sendTimeToWait (CORBA::Long msec);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
@@ -50,12 +48,10 @@ public:
 
   ~TimeoutHandler_i ();
 
-  virtual void sendTimeToWait (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sendTimeToWait (void);
 
   virtual void sendTimeToWait_excep (
-      ::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ::Messaging::ExceptionHolder * excep_holder);
 
   void reset_reply_counter ();
 
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index d9dca0ceb04..5f52dcbe27b 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -96,9 +96,14 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      passer_i servant;
+      passer_i servant (root_poa.in ());
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       passer_var server =
-        servant._this ();
+        passer::_narrow (object.in ());
 
       CORBA::String_var ior =
               orb->object_to_string (server.in ());
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index b7dbaa3b445..285f5ef5f68 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -11,10 +11,6 @@ ACE_RCSID (Abstract_Interface,
 
 char *
 foo_i::foo_op (const char * inarg)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    BadInput
-  ))
 {
   CORBA::String_var retval = CORBA::string_dup ("bad");
 
@@ -24,8 +20,7 @@ foo_i::foo_op (const char * inarg)
     }
   else
     {
-      ACE_THROW_RETURN (BadInput ("expected \"foo_op\"\n"),
-                        retval._retn ());
+      throw BadInput ("expected \"foo_op\"\n");
     }
 
   return retval._retn ();
@@ -33,10 +28,6 @@ foo_i::foo_op (const char * inarg)
 
 char *
 foo_i::base_op (const char * inarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      BadInput
-    ))
 {
   CORBA::String_var retval = CORBA::string_dup ("bad");
 
@@ -46,31 +37,35 @@ foo_i::base_op (const char * inarg)
     }
   else
     {
-      ACE_THROW_RETURN (BadInput ("expected \"base_op\"\n"),
-                        retval._retn ());
+      throw BadInput ("expected \"base_op\"\n");
     }
 
   return retval._retn ();
 }
 
+passer_i::passer_i (PortableServer::POA_ptr poa)
+ : poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
 void
 passer_i::pass_ops (base_out outarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   foo_i *servant = 0;
   ACE_NEW (servant,
            foo_i);
+
+  PortableServer::ObjectId_var id =
+    this->poa_->activate_object (servant);
+
+  CORBA::Object_var object = this->poa_->id_to_reference (id.in ());
+
   PortableServer::ServantBase_var safety (servant);
-  outarg = servant->_this ();
+  outarg = foo::_narrow (object.in ());
 }
 
 void
 passer_i::pass_state (base_out outarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
 {
   TreeController_var tc;
   ACE_NEW (tc.inout (),
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index f389142c342..28fcc41464c 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -7,30 +7,22 @@
 
 class foo_i : public virtual POA_foo
 {
-  virtual char * foo_op (const char * inarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      BadInput
-    ));
-
-  virtual char * base_op (const char * inarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      BadInput
-    ));
+  virtual char * foo_op (const char * inarg);
+
+  virtual char * base_op (const char * inarg);
 };
 
 class passer_i : public virtual POA_passer
 {
-  virtual void pass_ops (base_out outarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void pass_state (base_out outarg)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+public:
+  passer_i (PortableServer::POA_ptr poa);
+
+  virtual void pass_ops (base_out outarg);
+
+  virtual void pass_state (base_out outarg);
+
+private:
+  PortableServer::POA_var poa_;
 };
 
 #endif /* TAO_TEST_I_H */
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index b023cf9d179..eb2603dd591 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -15,7 +15,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 CORBA::Any *
 Hello::get_any (CORBA::Any const & the_any)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any * retval = 0;
 
@@ -29,7 +28,6 @@ Hello::get_any (CORBA::Any const & the_any)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h
index 07a967ea5e9..64c39d87300 100644
--- a/TAO/tests/Any/Recursive/Hello.h
+++ b/TAO/tests/Any/Recursive/Hello.h
@@ -27,11 +27,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
-  virtual CORBA::Any * get_any (CORBA::Any const & the_any)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 00c51507577..1a24787bc1e 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -27,7 +27,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype, typecodefactory {
   after += *idl
-  after += *Server
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/Any/Recursive/Test.idl b/TAO/tests/Any/Recursive/Test.idl
index a633c1d83b8..a6270377d3c 100644
--- a/TAO/tests/Any/Recursive/Test.idl
+++ b/TAO/tests/Any/Recursive/Test.idl
@@ -3,6 +3,7 @@
 //
 
 #include "tao/OctetSeq.pidl"
+#include "tao/StringSeq.pidl"
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
@@ -32,6 +33,27 @@ module Test
     long i;
   };
 
+  struct NestedRecursiveStruct5;
+  typedef sequence<NestedRecursiveStruct5> NestedRecursiveStructSeq5;
+  struct NestedRecursiveStruct5
+  {
+    long i;
+    union MyUnion5 switch (short)
+    {
+      case 0:
+        struct InnerStruct5
+        {
+          union Intern5 switch (short)
+          {
+            case 0:
+              NestedRecursiveStructSeq5 recursive_structs5;
+          } intbb5;
+        } ins65;
+      default:
+        long i;
+    } in5;
+  };
+
   // --------------------------
 
   union RecursiveUnion;
@@ -49,6 +71,27 @@ module Test
     long i;
   };
 
+  union RecursiveUnion2;
+  typedef sequence<RecursiveUnion2> RecursiveUnionSeq2;
+
+  union RecursiveUnion2 switch (short)
+  {
+  case 0:
+    struct Innerstruct3a
+    {
+      RecursiveUnionSeq2 recursive_unions;
+    } insb;
+  case 1:
+    short a;
+  case 2:
+    struct Innerstruct3b
+    {
+      RecursiveUnionSeq2 recursive_unions_second;
+    } insa;
+  default:
+    long i;
+  };
+
   union RecursiveUnionNoDefault;
   typedef sequence<RecursiveUnionNoDefault> RecursiveUnionSeqNoDefault;
 
@@ -133,6 +176,47 @@ module Test
     OctetSeq octet_seq_val;
   };
 
+  enum ValueSort3 {
+    DOUBLE_TYPE,
+    SYMBOL_TYPE,
+    SYMBOL_SEQ_TYPE
+  };
+
+  typedef sequence<string> StringSeq;
+
+  struct Symbol3;
+  typedef sequence<Symbol3> SymbolSeq3;
+
+  struct Symbol3 {
+    StringSeq scope;
+    string name;
+    SymbolSeq3 args;
+  };
+
+  union NonRecursiveUnionWithStringStruct3 switch (ValueSort3) {
+  case DOUBLE_TYPE:
+    double double_val;
+  case SYMBOL_TYPE:
+    Symbol3 symbol_val;
+  case SYMBOL_SEQ_TYPE:
+    SymbolSeq3 symbol_seq_val;
+  };
+
+  // --------------------------
+
+  enum ValueSort2 {
+    SYMBOL_TYPE2
+  };
+
+  struct Symbol2 {
+    string name;
+  };
+
+  union NonRecursiveUnionWithStringStruct switch (ValueSort2) {
+  case SYMBOL_TYPE2:
+    Symbol2 symbol_val;
+  };
+
   /// Simple test interface.
   interface Hello
   {
@@ -143,4 +227,29 @@ module Test
     oneway void shutdown ();
   };
 
+  valuetype Recursive2;
+  typedef sequence<Recursive2> Recursive2Seq2;
+
+  valuetype Recursive2
+  {
+    public struct Innerstruct3a
+    {
+      Recursive2Seq2 recursive_unions;
+    } insa;
+    public short a;
+    public struct Innerstruct3b
+    {
+      Recursive2Seq2 recursive_second;
+    } insb;
+  };
+
+  valuetype Recursive3;
+  typedef sequence<Recursive3> RecursiveSeq3;
+
+  valuetype Recursive3
+  {
+    public RecursiveSeq3 seq1;
+    public short a;
+    public RecursiveSeq3 seq2;
+  };
 };
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index a9e1e860ca3..d7f12e98ece 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -182,10 +182,16 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */,
   CORBA::Any the_any;
   the_any <<= foo;
 
-  ::perform_invocation<Test::NestedRecursiveStruct> (hello,
-                                               the_any);
+  ::perform_invocation<Test::NestedRecursiveStruct> (hello, the_any);
+
+  Test::NestedRecursiveStruct5 foo5;
+
+  the_any <<= foo5;
+
+  ::perform_invocation<Test::NestedRecursiveStruct5> (hello, the_any);
 }
 
+
 void
 recursive_union_test (CORBA::ORB_ptr /* orb */,
                       Test::Hello_ptr hello)
@@ -193,25 +199,41 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   ACE_DEBUG ((LM_INFO,
               "Executing recursive union test\n"));
 
-  Test::RecursiveUnion foo;
+  CORBA::Any the_any;
+
   Test::EnumUnion foo_enum;
   static CORBA::Long const test_long = 238901;
-  CORBA::Any the_any;
 
   // First simple case, just an union with an enum as discriminator
   foo_enum.i (test_long);
   the_any <<= foo_enum;
 
-  ::perform_invocation<Test::EnumUnion> (hello,
-                                         the_any);
+  ::perform_invocation<Test::EnumUnion> (hello, the_any);
 
   // Non-recursive member case.
+  Test::RecursiveUnion foo;
   foo.i (test_long);
 
   the_any <<= foo;
 
-  ::perform_invocation<Test::RecursiveUnion> (hello,
-                                              the_any);
+  ::perform_invocation<Test::RecursiveUnion> (hello, the_any);
+
+  Test::RecursiveUnion2 foo2;
+  foo2.i (test_long);
+
+  the_any <<= foo2;
+
+  ::perform_invocation<Test::RecursiveUnion2> (hello,
+                                               the_any);
+
+  // new variant
+  Test::NonRecursiveUnionWithStringStruct3 val3;
+  Test::Symbol3 sym;
+  val3.double_val (5.0);
+  the_any <<= val3;
+
+  ::perform_invocation<Test::NonRecursiveUnionWithStringStruct3> (hello,
+                                                                  the_any);
 
   // Recursive member case.
   Test::RecursiveUnionSeq seq;
@@ -260,6 +282,13 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
 
   ::perform_invocation<Test::NonRecursiveUnionWithEnum> (hello,
                                                          the_any);
+
+  // Non-recursive member case with recursive struct .
+
+  Test::NonRecursiveUnionWithStringStruct val2;
+  the_any <<= val2;
+
+  ::perform_invocation<Test::NonRecursiveUnionWithStringStruct> (hello, the_any);
 }
 
 
@@ -417,7 +446,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -443,9 +472,9 @@ main (int argc, char *argv[])
         {
           recursive_struct_test
           , nested_recursive_struct_test
-          , recursive_union_test
           , indirectly_recursive_valuetype_test
           , directly_recursive_valuetype_test
+          , recursive_union_test
 #if TAO_HAS_MINIMUM_CORBA == 0
           , recursive_struct_typecodefactory_test
           , recursive_union_typecodefactory_test
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index 8c998950dd3..edfe2b98049 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index bb389945946..976c59d6fe7 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -11,10 +11,10 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    test_i.cpp
-    server.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -24,10 +24,10 @@ project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoi
   exename = client
   after += *idl
   Source_Files {
-    test_i.cpp
-    client.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index a6523c6733c..4fe18d7c1b9 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -109,8 +109,13 @@ main (int argc, char *argv[])
 
       Callback_i callback_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&callback_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Callback_var callback =
-        callback_impl._this ();
+        Callback::_narrow (object_act.in ());
 
       // Send the calback object to the server
       server->callback_object (callback.in ());
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 0b8c678b717..e28c2a925b3 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index dedcddd24ec..a5679c92250 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
 Callback_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (0);
@@ -23,7 +22,6 @@ Callback_i::shutdown (void)
 
 void
 Callback_i::callback_method ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -35,7 +33,6 @@ Callback_i::callback_method ( /**/)
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 void
 Simple_Server_i::callback_object (Callback_ptr callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
   this->callback_ = Callback::_duplicate (callback);
@@ -87,7 +83,6 @@ Simple_Server_i::call_client (void)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 33333f74968..cc4725dc141 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -31,12 +31,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Safe way to shutdown
 
-  void callback_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_method (void);
   // The callback method
 
 private:
@@ -58,14 +56,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Boolean do_callback);
 
-  void callback_object (Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_object (Callback_ptr callback);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   int call_client (void);
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
index a76649bfc17..2617f55d5a4 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
+++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
@@ -11,10 +11,10 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    test_i.cpp
-    server.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -23,10 +23,10 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi
 project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    test_i.cpp
-    client.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 86d6a8a89bb..7b35adecdd1 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -114,8 +114,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (callback_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Callback_var callback =
-        callback_impl->_this ();
+        Callback::_narrow (object_act.in ());
 
       // Send the calback object to the server
       server->callback_object (callback.in ());
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index 8a882d8bc9c..ea7a3d129b6 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index b79b40c2520..8c5391e8782 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
 Callback_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (0);
@@ -23,7 +22,6 @@ Callback_i::shutdown (void)
 
 void
 Callback_i::callback_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -62,7 +60,6 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &,
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -88,7 +85,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback)
 void
 Simple_Server_i::callback_object (Callback_ptr callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
   this->callback_ = Callback::_duplicate (callback);
@@ -97,7 +93,6 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
index 040bb9a9f53..6e8ca0fa859 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
@@ -32,12 +32,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Safe way to shutdown
 
-  void callback_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_method (void);
   // The callback method
 
 private:
@@ -58,14 +56,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Boolean do_callback);
 
-  void callback_object (Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_object (Callback_ptr callback);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *act = 0);
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index 7d7848bccd9..47e95ecec1e 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -11,10 +11,10 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    test_i.cpp
-    server.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -23,10 +23,10 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi
 project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    test_i.cpp
-    client.cpp
     testC.cpp
     testS.cpp
+    test_i.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 7825c600db7..e07eaeec63f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -114,8 +114,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (callback_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Callback_var callback =
-        callback_impl->_this ();
+        Callback::_narrow (object_act.in ());
 
       // Send the calback object to the server
       server->callback_object (callback.in ());
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 8a882d8bc9c..ea7a3d129b6 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 2b3eb2fd280..038cf606fbd 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -14,7 +14,6 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
 Callback_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (0);
@@ -22,7 +21,6 @@ Callback_i::shutdown (void)
 
 void
 Callback_i::callback_method ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -33,7 +31,6 @@ Callback_i::callback_method ( /**/)
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -63,7 +60,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback)
 void
 Simple_Server_i::callback_object (Callback_ptr callback
  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
   this->callback_ = Callback::_duplicate (callback);
@@ -72,7 +68,6 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index 8456a5240eb..41c91c52b59 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -31,12 +31,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
   // Safe way to shutdown
 
-  void callback_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_method (void);
   // The callback method
 
 private:
@@ -57,14 +55,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Boolean do_callback);
 
-  void callback_object (Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void callback_object (Callback_ptr callback);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index 106dd5900d8..54e3268e74e 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, messaging, ami {
 project(*Client): taoserver, messaging, ami {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     ami_testC.cpp
     ami_testS.cpp
diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp
index bfaecaaf55f..064960d0458 100644
--- a/TAO/tests/Big_AMI/ami_test_i.cpp
+++ b/TAO/tests/Big_AMI/ami_test_i.cpp
@@ -29,7 +29,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
                  const char* in_str,
                  const A::Payload &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   out_l = 931233;
 
@@ -44,7 +43,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 void
 AMI_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h
index ab16cfdf41f..5bc0b26b3d8 100644
--- a/TAO/tests/Big_AMI/ami_test_i.h
+++ b/TAO/tests/Big_AMI/ami_test_i.h
@@ -32,11 +32,9 @@ public:
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
                    const char* in_str,
-                   const A::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   const A::Payload &the_payload);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 6c1c78a3e4a..55b703839e0 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -85,7 +85,6 @@ public:
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ++reply_count_;
       if (debug)
@@ -98,7 +97,6 @@ public:
     };
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ++reply_count_;
 
@@ -128,7 +126,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object_var =
         orb->resolve_initial_references ("RootPOA");
@@ -160,8 +158,13 @@ main (int argc, char *argv[])
 
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
+      PortableServer::ObjectId_var id =
+        poa_var->activate_object (&handler);
+
+      CORBA::Object_var object = poa_var->id_to_reference (id.in ());
+
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this ();
+        A::AMI_AMI_TestHandler::_narrow (object.in ());
 
       CORBA::Long l = 931247;
       A::Payload payload (payload_size);
diff --git a/TAO/tests/Big_AMI/run_test.pl b/TAO/tests/Big_AMI/run_test.pl
index e47a3bc549e..90c93b94d93 100755
--- a/TAO/tests/Big_AMI/run_test.pl
+++ b/TAO/tests/Big_AMI/run_test.pl
@@ -15,7 +15,7 @@ $payload = '256000';
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '1';
-    } 
+    }
 }
 
 $iorfile = PerlACE::LocalFile ("server.ior");
@@ -31,11 +31,11 @@ else {
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -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;
-} 
+}
 
 $CL = new PerlACE::Process ("client", " -k file://$iorfile -i $iterations -x -b $payload");
 
@@ -47,6 +47,6 @@ unlink $iorfile;
 if ($server != 0 || $client != 0) {
     exit 1;
 }
- 
+
 exit 0;
- 
+
diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp
index f829e76a50f..10bf82e95b2 100644
--- a/TAO/tests/Big_AMI/server.cpp
+++ b/TAO/tests/Big_AMI/server.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -78,8 +78,13 @@ main (int argc, char *argv[])
 
       AMI_Test_i ami_test_i (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&ami_test_i);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this ();
+        A::AMI_Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (ami_test_var.in ());
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index 6ce9fa45d76..72be50111c2 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Coordinator.cpp
     Session_Control.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -23,14 +23,13 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Peer.cpp
     Session.cpp
     Session_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 1cad2f4c83d..fcfcb5239d2 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -66,7 +66,6 @@ Coordinator::shutdown_all_peers (void)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
     return;
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 76bd88d5fa8..1f1c19bf448 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -31,8 +31,7 @@ public:
   void shutdown_all_peers (void);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected Destructor, call _remove_ref() instead
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index d6d4077ac20..77c338bdb63 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -21,7 +21,6 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl = 0;
   ACE_NEW_THROW_EX (session_impl,
@@ -38,7 +37,6 @@ Peer::create_session (Test::Session_Control_ptr control,
 
 void
 Peer::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 8f2d18e8445..c1c2777cbc4 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -24,10 +24,8 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                            CORBA::ULong peer_count);
+  virtual void shutdown (void);
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index dd7003cb964..1abeb5c48e1 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -114,9 +114,6 @@ Session::validate_connections (void)
 
 void
 Session::start (const Test::Session_List &other_sessions)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Already_Running,
-                   Test::No_Peers))
 {
   if (other_sessions.length () == 0)
     throw Test::No_Peers ();
@@ -170,13 +167,12 @@ Session::start (const Test::Session_List &other_sessions)
 }
 
 void
-Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException))
+Session::ping (void)
 {
 }
 
 void
 Session::receive_payload (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
     {
@@ -188,7 +184,7 @@ Session::receive_payload (const Test::Payload &the_payload)
 
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-    this->expected_messages_--;
+    --this->expected_messages_;
 
 #if 0
     int verbose = 0;
@@ -218,7 +214,6 @@ Session::receive_payload (const Test::Payload &the_payload)
 
 void
 Session::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
@@ -242,7 +237,6 @@ Session::more_work (void) const
 
 void
 Session::terminate (CORBA::Boolean success)
-  ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   try
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 8dc4dcaafab..d34af92249d 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -35,25 +35,18 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Already_Running,
-                     Test::No_Peers));
+  virtual void start (const Test::Session_List &other_sessions);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void receive_payload (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success)
-    ACE_THROW_SPEC (());
+  void terminate (CORBA::Boolean success);
 
   /// Return 1 if all the work in this session has been completed
   int more_work (void) const;
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index fdd01686c9d..9c298313d19 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -42,7 +42,6 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->session_count_ == 0)
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 3e12b1df5e1..2da60584c36 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -26,8 +26,7 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void session_finished (CORBA::Boolean success);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index ff908dc6fc9..a03963bfa21 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -79,8 +79,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (peer_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Peer_var peer =
-        peer_impl->_this ();
+        Test::Peer::_narrow (object.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 55a4cbdef12..3cdf32eb9f3 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -89,8 +89,13 @@ main (int argc, char *argv[])
                       Coordinator (peer_count),
                       1);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (coordinator_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this ();
+        Test::Coordinator::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (coordinator.in ());
@@ -131,8 +136,13 @@ main (int argc, char *argv[])
                       Session_Control (peer_count),
                       1);
 
+      PortableServer::ObjectId_var idu =
+        root_poa->activate_object (session_control_impl);
+
+      CORBA::Object_var objectu = root_poa->id_to_reference (idu.in ());
+
       Test::Session_Control_var session_control =
-        session_control_impl->_this ();
+        Test::Session_Control::_narrow (objectu.in ());
 
       Test::Session_List session_list;
       coordinator_impl->create_session_list (session_control.in (),
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 04f7a0f74ee..7a5abeac4be 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -15,7 +15,6 @@ Big_Reply_i::~Big_Reply_i (void)
 
 Test::Octet_Seq *
 Big_Reply_i::get_big_reply ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Test::Octet_Seq_var reply_mesg =
     new Test::Octet_Seq (this->length_);
@@ -27,13 +26,11 @@ Big_Reply_i::get_big_reply ( /**/)
 
 void
 Big_Reply_i::ping ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Big_Reply_i::shutdown ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index 7edf4deb0c8..ce1173b3856 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -32,14 +32,11 @@ public:
   virtual ~Big_Reply_i (void);
 
   // = The skeleton methods
-  virtual Test::Octet_Seq *get_big_reply (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Octet_Seq *get_big_reply (void);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Our local ORB ptr
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 65b17586ae0..ce0d1c7d472 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Big_Reply/run_test.pl b/TAO/tests/Big_Reply/run_test.pl
index c2d53ef293e..44d65f0674f 100755
--- a/TAO/tests/Big_Reply/run_test.pl
+++ b/TAO/tests/Big_Reply/run_test.pl
@@ -15,13 +15,13 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index e441dc3110e..af18a8004ba 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -76,8 +76,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (big_reply_gen);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Big_Reply_var big_reply =
-        big_reply_gen->_this ();
+        Test::Big_Reply::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (big_reply.in ());
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 1e41a5c9274..2e96131b1a6 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index 917276b28f4..5fd90304dbc 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -13,7 +13,6 @@ Payload_Receiver::Payload_Receiver ()
 
 void
 Payload_Receiver::more_data (const Test::Payload& payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (payload.length() > 0)
   {
@@ -23,7 +22,6 @@ Payload_Receiver::more_data (const Test::Payload& payload)
 
 void
 Payload_Receiver::sync_none_more_data (const Test::Payload& payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (payload.length() > 0)
   {
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index 1aa87ca3735..b401d89d9a8 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -19,11 +19,9 @@ public:
   Payload_Receiver ();
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void more_data (const Test::Payload &payload);
 
-  virtual void sync_none_more_data (const Test::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sync_none_more_data (const Test::Payload &payload);
 
   int count(bool sync_none = false) const;
 
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index 5f9e816cf70..7c22991fd6a 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
   try
   {
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_init (argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index e52c688cbde..e00dc7ef073 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -75,8 +75,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (payload_receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this ();
+        Test::Payload_Receiver::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (payload_receiver.in ());
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index 6ce9fa45d76..72be50111c2 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Coordinator.cpp
     Session_Control.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -23,14 +23,13 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Peer.cpp
     Session.cpp
     Session_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 1cad2f4c83d..fcfcb5239d2 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -66,7 +66,6 @@ Coordinator::shutdown_all_peers (void)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
     return;
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 8aa64f5ceca..9d8ae0fbd92 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -30,8 +30,7 @@ public:
   void shutdown_all_peers (void);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index d6d4077ac20..77c338bdb63 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -21,7 +21,6 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl = 0;
   ACE_NEW_THROW_EX (session_impl,
@@ -38,7 +37,6 @@ Peer::create_session (Test::Session_Control_ptr control,
 
 void
 Peer::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index 8f2d18e8445..c1c2777cbc4 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -24,10 +24,8 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                            CORBA::ULong peer_count);
+  virtual void shutdown (void);
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 82d81a0accb..9a176764603 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -90,9 +90,6 @@ Session::svc (void)
 
 void
 Session::start (const Test::Session_List &other_sessions)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Already_Running,
-                   Test::No_Peers))
 {
   if (other_sessions.length () == 0)
     throw Test::No_Peers ();
@@ -147,7 +144,6 @@ Session::start (const Test::Session_List &other_sessions)
 
 Test::Payload *
 Session::echo_payload (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
     {
@@ -193,7 +189,6 @@ Session::echo_payload (const Test::Payload &the_payload)
 
 void
 Session::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
@@ -217,7 +212,6 @@ Session::more_work (void) const
 
 void
 Session::validate_connections (void)
-  ACE_THROW_SPEC (())
 {
   const CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -240,7 +234,6 @@ Session::validate_connections (void)
 
 void
 Session::terminate (CORBA::Boolean success)
-  ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   try
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index db3d8aed838..becf16912e8 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -32,16 +32,11 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Already_Running,
-                     Test::No_Peers));
+  virtual void start (const Test::Session_List &other_sessions);
 
-  virtual Test::Payload* echo_payload (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Payload* echo_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
@@ -50,15 +45,13 @@ protected:
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success)
-    ACE_THROW_SPEC (());
+  void terminate (CORBA::Boolean success);
 
   /// Return 1 if all the work in this session has been completed
   int more_work (void) const;
 
   /// Validate all the connections
-  void validate_connections (void)
-    ACE_THROW_SPEC (());
+  void validate_connections (void);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index daedcf24ace..98d2eaaa728 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -42,7 +42,6 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->session_count_ == 0)
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 3e12b1df5e1..2da60584c36 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -26,8 +26,7 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void session_finished (CORBA::Boolean success);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index ff908dc6fc9..a03963bfa21 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -79,8 +79,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (peer_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Peer_var peer =
-        peer_impl->_this ();
+        Test::Peer::_narrow (object.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index e2f3fea8702..0f3b099efaa 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -89,8 +89,13 @@ main (int argc, char *argv[])
                       Coordinator (peer_count),
                       1);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (coordinator_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this ();
+        Test::Coordinator::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (coordinator.in ());
@@ -131,8 +136,12 @@ main (int argc, char *argv[])
                       Session_Control (peer_count),
                       1);
 
+      id = root_poa->activate_object (session_control_impl);
+
+      object = root_poa->id_to_reference (id.in ());
+
       Test::Session_Control_var session_control =
-        session_control_impl->_this ();
+        Test::Session_Control::_narrow (object.in ());
 
       Test::Session_List session_list;
       coordinator_impl->create_session_list (session_control.in (),
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index cfd9e6876eb..c6e032fb953 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -14,7 +14,6 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
 void
 Blocking_Sync_None::slow_operation (const Test::Payload &,
                                     CORBA::ULong sleep_microseconds)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value sleep_time (0, sleep_microseconds);
   ACE_OS::sleep (sleep_time);
@@ -22,7 +21,6 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 
 void
 Blocking_Sync_None::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 293f76eedb3..9a6f109ae8a 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -18,11 +18,9 @@ public:
 
   // = The skeleton methods
   virtual void slow_operation (const Test::Payload &the_payload,
-                               CORBA::ULong sleep_microseconds)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                               CORBA::ULong sleep_microseconds);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 9bdc2b936c5..655e5e0f012 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 422a95b6410..3d002c564f6 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index 8003b059ee1..adca8860d1a 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (blocking_sync_none_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Blocking_Sync_None_var blocking_sync_none =
-        blocking_sync_none_impl->_this ();
+        Test::Blocking_Sync_None::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (blocking_sync_none.in ());
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..8679ec7077d 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
@@ -23,7 +23,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Echo.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
index 4be8b6bf261..7a300a5db2e 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -13,7 +13,6 @@ Echo::Echo(CORBA::ORB_ptr orb,
 
 void
 Echo::echo_payload (Test::Payload &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
                      ace_mon,
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
index 7a15abb76a1..55aed2b36df 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
@@ -18,8 +18,7 @@ public:
   Echo (CORBA::ORB_ptr orb,
         int abort_counter);
 
-  virtual void echo_payload (Test::Payload & data)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_payload (Test::Payload & data);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index 15363bf0055..dc26aa8804e 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -12,7 +12,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 
 void
 Echo_Caller::start_task(Test::Echo_ptr client)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Task task (client,
                     32768);
@@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 
 void
 Echo_Caller::shutdown(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
index e1982629dc8..eac4bf0c266 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
@@ -15,11 +15,9 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller (CORBA::ORB_ptr orb);
 
-  virtual void start_task (Test::Echo_ptr client)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void start_task (Test::Echo_ptr client);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index d3f030ae01e..430babe0519 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -104,8 +104,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        impl->_this ();
+        Test::Echo::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index f915f225b94..211cbf1b3f7 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -76,8 +76,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Echo_Caller_var server =
-        impl->_this ();
+        Test::Echo_Caller::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
index 33bc4b81e31..a3e88a6accd 100644
--- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
+++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
@@ -11,12 +11,12 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, messaging {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     ORB_Task.cpp
     Server_i.cpp
     Server_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -25,11 +25,11 @@ project(*Server): taoserver, messaging {
 project(*Client): taoexe, messaging {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Echo.cpp
     ORB_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp
index 17b6386b824..17ffaf51fbf 100644
--- a/TAO/tests/Bug_1020_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Regression/Echo.cpp
@@ -17,7 +17,6 @@ Echo::Echo(CORBA::ORB_ptr orb)
 
 Test::Payload *
 Echo::echo_payload(Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_Time_Value tick(0, 10000);
   orb_->run(tick);
diff --git a/TAO/tests/Bug_1020_Regression/Echo.h b/TAO/tests/Bug_1020_Regression/Echo.h
index 33bac647e08..3674cb8474a 100644
--- a/TAO/tests/Bug_1020_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Regression/Echo.h
@@ -15,8 +15,7 @@ class Echo : public POA_Test::Echo
 public:
   Echo(CORBA::ORB_ptr orb);
 
-  virtual Test::Payload * echo_payload (Test::Payload const & data)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual Test::Payload * echo_payload (Test::Payload const & data);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
index 1719e29eaf2..ef35acd35b9 100644
--- a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
+++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
@@ -17,7 +17,6 @@ Echo_Callback::Echo_Callback()
 void
 Echo_Callback::echo_payload(Test::Payload const &
                             TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   static int n = 0;
   n++;
@@ -31,6 +30,5 @@ Echo_Callback::echo_payload(Test::Payload const &
 void
 Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder *
                                   TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.h b/TAO/tests/Bug_1020_Regression/Echo_Callback.h
index b70effe7c0c..f0b85c24751 100644
--- a/TAO/tests/Bug_1020_Regression/Echo_Callback.h
+++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.h
@@ -15,10 +15,8 @@ class Echo_Callback : public POA_Test::AMI_EchoHandler
 public:
   Echo_Callback();
 
-  virtual void echo_payload (Test::Payload const & ami_return_val)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_payload (Test::Payload const & ami_return_val);
+  virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder);
 };
 
 #endif /* Echo__h_ */
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp
index 5cc24c66548..b8d26e2843a 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp
@@ -11,7 +11,6 @@ Server::Server(CORBA::ORB_ptr orb)
 
 void
 Server::start_task(Test::Echo_ptr client)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Task * task =
     new Server_Task(client);
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.h b/TAO/tests/Bug_1020_Regression/Server_i.h
index b2f1e875701..66175e62db1 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.h
+++ b/TAO/tests/Bug_1020_Regression/Server_i.h
@@ -16,8 +16,7 @@ class Server : public POA_Test::Server
 public:
   Server(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void start_task(Test::Echo_ptr client);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 7e94826a604..8da503b7384 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -86,8 +86,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        impl->_this ();
+        Test::Echo::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index 2fac24acb2d..65de2d1780e 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -66,8 +66,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Server_var server =
-        impl->_this ();
+        Test::Server::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index 3fbc4fdaa62..419ad646a44 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -16,9 +16,6 @@ BlobServerImpl::test(
             BlobType1& blob1,
             BlobType2& blob2
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ))
 {
     blob1.length(10);
     for(int i = 0; i < 10; i++)
@@ -35,7 +32,6 @@ BlobServerImpl::test(
 
 void
 BlobServerImpl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index 54eeb3bfdd8..01e568a32c5 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -19,12 +19,8 @@ public:
     virtual void test(
         BlobType1& blob1,
         BlobType2& blob2
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
index 86c800e8fef..2847b187410 100644
--- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
+++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 project(*Client): taoserver {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     testC.cpp
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index 57ecb1553c5..1615bc0b0d8 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
     try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp
index 97c8d6bc4c3..88f0d31df3a 100644
--- a/TAO/tests/Bug_1254_Regression/server.cpp
+++ b/TAO/tests/Bug_1254_Regression/server.cpp
@@ -39,7 +39,7 @@ int main(int argc, char** argv)
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ int main(int argc, char** argv)
                       1);
       PortableServer::ServantBase_var owner_transfer(blob_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (blob_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       BlobServer_var blob =
-        blob_impl->_this ();
+        BlobServer::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (blob.in ());
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index 1a4a34003bc..766e26c6e94 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1269_Regression/Echo.cpp b/TAO/tests/Bug_1269_Regression/Echo.cpp
index 32009b9c996..d64dae69dce 100644
--- a/TAO/tests/Bug_1269_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo.cpp
@@ -20,7 +20,6 @@ Echo::Echo(CORBA::ORB_ptr orb,
 
 void
 Echo::echo_payload(Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
 
diff --git a/TAO/tests/Bug_1269_Regression/Echo.h b/TAO/tests/Bug_1269_Regression/Echo.h
index 676c856d3b1..74f2e13f2f3 100644
--- a/TAO/tests/Bug_1269_Regression/Echo.h
+++ b/TAO/tests/Bug_1269_Regression/Echo.h
@@ -16,8 +16,7 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_payload (Test::Payload const & data);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
index a9fcb25f53c..1bc987dda57 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -19,7 +19,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 
 void
 Echo_Caller::start_task(Test::Echo_ptr client)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Timer * task =
     new Server_Timer(client, orb_->orb_core()->reactor());
@@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 
 void
 Echo_Caller::shutdown(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
index 3a62bc0d88e..6994e7c65af 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
@@ -15,11 +15,9 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void shutdown(void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 4a5dff34ca6..7e8f800cbaa 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -21,7 +21,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -76,8 +76,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        impl->_this ();
+        Test::Echo::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 05e28d3be64..24b8d253dca 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -54,8 +54,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_Caller_var server =
-        impl->_this ();
+        Test::Echo_Caller::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index 3061618345f..464c13d9d5f 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -16,7 +16,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index a594a344e69..fadcb8f6726 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -11,11 +11,11 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, messaging {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Echo_Caller.cpp
     Server_Timer.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -23,12 +23,11 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
-    Echo.cpp
-    client.cpp
     TestC.cpp
     TestS.cpp
+    Echo.cpp
+    client.cpp
   }
   IDL_Files {
   }
@@ -36,11 +35,10 @@ project(*Client): taoclient, messaging {
 
 project(*Shutdown): taoexe, messaging {
   after += *idl
-  after += *Client
   Source_Files {
-    shutdown.cpp
     TestC.cpp
     TestS.cpp
+    shutdown.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp
index b41ec6256ab..d9c971f82e3 100644
--- a/TAO/tests/Bug_1270_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo.cpp
@@ -20,7 +20,6 @@ Echo::Echo(CORBA::ORB_ptr orb,
 
 void
 Echo::echo_payload(Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
 
diff --git a/TAO/tests/Bug_1270_Regression/Echo.h b/TAO/tests/Bug_1270_Regression/Echo.h
index 5e835b6396a..d27ad1508a7 100644
--- a/TAO/tests/Bug_1270_Regression/Echo.h
+++ b/TAO/tests/Bug_1270_Regression/Echo.h
@@ -18,8 +18,7 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_payload (Test::Payload const & data);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
index bf42f0b83d5..e49c9c4c970 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -19,7 +19,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 
 void
 Echo_Caller::start_task(Test::Echo_ptr client)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Timer * task =
     new Server_Timer(client, orb_->orb_core()->reactor());
@@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 
 void
 Echo_Caller::shutdown(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
index e2a476e4052..f0fb687d956 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
@@ -16,11 +16,9 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void shutdown(void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 9518e5f17e4..a33276e7667 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -22,7 +22,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -77,8 +77,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        impl->_this ();
+        Test::Echo::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index dfd8ef60c30..f6ef264dbd8 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -54,8 +54,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_Caller_var server =
-        impl->_this ();
+        Test::Echo_Caller::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 8b8eb38a93e..60a7a999df2 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -16,7 +16,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index 803bdf58c37..d4952cef96b 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp
index fee6cd16303..ff714f3bbd6 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp
@@ -15,7 +15,6 @@ Test_i::~Test_i()
 
 void
 Test_i::test_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Noop
 }
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index e87b72d2120..7c5d11c210e 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -18,8 +18,7 @@ public:
    ~Test_i (void);
 
    /// A method
-   void test_method(void)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+   void test_method(void);
 
 };
 
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp
index 043271d2a70..dbe10b0d5d4 100644
--- a/TAO/tests/Bug_1330_Regression/client.cpp
+++ b/TAO/tests/Bug_1330_Regression/client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1330_Regression/run_test.pl b/TAO/tests/Bug_1330_Regression/run_test.pl
index 78e88ee7c55..01b85778216 100755
--- a/TAO/tests/Bug_1330_Regression/run_test.pl
+++ b/TAO/tests/Bug_1330_Regression/run_test.pl
@@ -25,7 +25,7 @@ $SERVER->Arguments("-ORBEndpoint iiop://localhost:$port");
 $SERVER->Spawn();
 
 # We don't need the IOR file but we can wait on the file
-if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1)
+if (PerlACE::waitforfile_timed ($server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
 {
    print STDERR "ERROR: cannot find $server_ior_file\n";
    $SERVER->Kill();
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index ff3a70b57ca..48c1971a923 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -62,11 +62,12 @@ main (int argc, char *argv[])
 
       Test_i server_impl;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
 
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
 
-      root_poa->activate_object (   &server_impl);
-
-      CORBA::Object_var server = server_impl._this ();
+      CORBA::Object_var server = CORBA::Object::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index 3e3ececcc65..466c1faab7c 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -11,12 +11,12 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, messaging {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Server_Thread_Pool.cpp
     Echo_Caller.cpp
     ORB_Task.cpp
     server.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -24,13 +24,12 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Echo.cpp
     ORB_Task.cpp
     client.cpp
-    TestC.cpp
-    TestS.cpp
   }
   IDL_Files {
   }
@@ -38,11 +37,10 @@ project(*Client): taoclient, messaging {
 
 project(*Shutdown): taoexe, messaging {
   after += *idl
-  after += *Client
   Source_Files {
-    shutdown.cpp
     TestC.cpp
     TestS.cpp
+    shutdown.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index bc304e7b283..b5a151a1852 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -21,7 +21,6 @@ Echo::Echo(CORBA::ORB_ptr orb,
 
 void
 Echo::echo_payload(Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
 
@@ -36,9 +35,6 @@ Echo::echo_payload(Test::Payload const &)
 void
 Echo::echo_payload_out (
                         Test::Payload_out data)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
 {
   int j = ACE_OS::rand() % 40000;
   data = new Test::Payload(j);
diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h
index 3a37b02023d..59e08d6b754 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.h
+++ b/TAO/tests/Bug_1361_Regression/Echo.h
@@ -19,15 +19,11 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_payload (Test::Payload const & data);
 
   virtual void echo_payload_out (
         Test::Payload_out data
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
index 4e20b1ece10..1ae9fbefd7b 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -21,14 +21,12 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool)
 
 void
 Echo_Caller::start_task(Test::Echo_ptr client)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   pool_->put(Test::Echo::_duplicate(client));
 }
 
 void
 Echo_Caller::shutdown(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
index c0551d40b4d..787e37196f7 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
@@ -18,11 +18,9 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool_);
 
-  virtual void start_task(Test::Echo_ptr client)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void shutdown(void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 4c60feb2a30..86774aa5880 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -109,8 +109,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        impl->_this ();
+        Test::Echo::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 12b14a07905..4de46baba8e 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -21,7 +21,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
         impl = tmp;
       }
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl.in ());
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Echo_Caller_var server =
-        impl->_this ();
+        Test::Echo_Caller::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 26161ebfb6f..80aef05e9e5 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -29,7 +29,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
new file mode 100644
index 00000000000..7e6a55f76da
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
@@ -0,0 +1,41 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    callee.idl
+    simple.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, iortable, iormanip {
+  after += *idl
+  Source_Files {
+    simple_i.cpp
+    SimpleServer.cpp
+  }
+  Source_Files {
+    calleeC.cpp
+    simpleC.cpp
+    simpleS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, portableserver, iormanip {
+  after += *idl
+  Source_Files {
+    SimpleClient.cpp
+    Callee_i.cpp
+  }
+  Source_Files {
+    calleeC.cpp
+    calleeS.cpp
+    simpleC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.cpp b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
new file mode 100644
index 00000000000..4391097bafd
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
@@ -0,0 +1,8 @@
+// $Id$
+
+#include "Callee_i.h"
+
+void Callee_i::callback (const char * message)
+{
+  ACE_DEBUG ((LM_DEBUG, "Callee_i::callback: message is %s", message));
+}
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.h b/TAO/tests/Bug_1383_Regression/Callee_i.h
new file mode 100644
index 00000000000..30fa0cfd1ac
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.h
@@ -0,0 +1,12 @@
+// $Id$
+
+#ifndef CALLEE_I_H
+#define CALLEE_I_H
+
+#include "calleeS.h"
+
+class Callee_i : public POA_Callee {
+  void callback (const char * message);
+};
+
+#endif
diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
new file mode 100644
index 00000000000..8208c7a5ae9
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
@@ -0,0 +1,122 @@
+// $Id$
+
+#include "tao/corba.h"
+#include "ace/OS_NS_unistd.h"
+#include "simpleC.h"
+#include "Callee_i.h"
+#include "tao/IORManipulation/IORManip_Loader.h"
+
+CORBA::ORB_var orb;
+
+ACE_THR_FUNC_RETURN RunFunc(void *)
+{
+  ACE_DEBUG ((LM_DEBUG, "running the orb\n"));
+	orb->run();
+  ACE_DEBUG ((LM_DEBUG, "done running orb\n"));
+	return 0;
+}
+
+int main(int argc, char * argv[])
+{
+	// initialize the ORB
+	orb = CORBA::ORB_init(argc, argv);
+
+	// Get the "RootPOA"
+  CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
+  PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in ());
+
+	// activate its managers so it can handle incoming requests
+	poa->the_POAManager()->activate();
+
+	// get a thread going to handle incoming requests
+	ACE_Thread::spawn(RunFunc);
+
+	// we could also use the corbaloc syntax to get a reference to the
+	// object. This will cause the orb to talk directly to the other
+	// orb with no name service or common file involved.
+  obj = orb->string_to_object("corbaloc::localhost:9999/Simple");
+
+  if (CORBA::is_nil(obj.in ())) {
+    ACE_ERROR ((LM_ERROR, "could not get reference\n"));
+		return 1;
+	}
+
+	// narrow the reference to the particular type we wish to deal with
+  Simple_var simple = Simple::_narrow(obj.in ());
+  if (CORBA::is_nil(simple.in ())) {
+    ACE_ERROR ((LM_ERROR, "could not get reference\n"));
+		return 1;
+	}
+
+	// create an object reference that has a bogus value for the first
+	// profile
+	obj = orb->resolve_initial_references("IORManipulation");
+	TAO_IOP::TAO_IOR_Manipulation_var iorm =
+		TAO_IOP::TAO_IOR_Manipulation::_narrow(obj.in());
+
+	// Status: The following scenarios appear to work:
+	// - first profile invalid host name, second profile valid.
+	// - first profile invalid ip number, second profiel valid.
+	// - first profiel invalid port number, second profile valid.
+	//
+	// The following causes a core dump of the server:
+	// - first and second invalid
+	//
+	// Note that he iormanip is being used since it is not practical
+	// to have a test case that depends on a VPN being present.
+	//
+  CORBA::Object_var name1 =
+        orb->string_to_object ("corbaloc:iiop:10.0.2.3:6060/xyz");
+  CORBA::Object_var name2 =
+		orb->string_to_object ("corbaloc:iiop:daisnot:7070/xyz");
+  CORBA::String_var name1_ior = orb->object_to_string(name1.in());
+  CORBA::String_var name2_ior = orb->object_to_string(name2.in());
+
+    // create a callback object
+    Callee_i * callee_i = new Callee_i;
+    // get the CORBA reference
+    PortableServer::ObjectId_var id =
+      poa->activate_object (callee_i);
+
+    CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+
+    Callee_var callee = Callee::_narrow (object_act.in ());
+
+  if (CORBA::is_nil(callee.in ())) {
+    ACE_ERROR ((LM_ERROR, "could not get callback object\n"));
+    return 1;
+	} else {
+    CORBA::String_var str = orb->object_to_string(callee.in ());
+    FILE *output_file= ACE_OS::fopen ("ior", "w");
+    if (output_file == 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Cannot open output file for writing IOR: ior\n"),
+                          1);
+    ACE_OS::fprintf (output_file, "%s", str.in ());
+    ACE_OS::fclose (output_file);
+	}
+
+	// create a reference with two profiles with the first on being
+	// bogus. If things work as they should the callback should be
+	// succesful with the ORB trying the second profile.
+	TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
+	iors.length (2);
+	iors [0] = name1;
+	iors [1] = name2;
+
+  CORBA::Object_var merged = iorm->merge_iors(iors);
+	Callee_var doubleCallee = Callee::_unchecked_narrow(merged.in());
+
+  ACE_DEBUG ((LM_DEBUG, "Profile count is %d\n",
+              iorm->get_profile_count(merged.in())));
+
+  simple->registerCallee(doubleCallee.in ());
+
+  ACE_OS::sleep(120);
+
+  ACE_DEBUG ((LM_DEBUG, "done slpeeing\n"));
+
+  orb->shutdown(1);
+
+	return 0;
+}
diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
new file mode 100644
index 00000000000..db025f79365
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
@@ -0,0 +1,77 @@
+// $Id$
+
+#include "tao/corba.h"
+#include "tao/IORTable/IORTable.h"
+#include "simple_i.h"
+
+void advertise(CORBA::ORB_ptr orb, CORBA::Object_ptr obj)
+{
+  // advertise our object in the IORTable so that it can be
+	// accessed by a client using the "cobaloc" syntax
+  CORBA::String_var str = orb->object_to_string(obj);
+  CORBA::Object_var tmp = orb->resolve_initial_references("IORTable");
+  IORTable::Table_var iorTable = IORTable::Table::_narrow(tmp.in ());
+  if (CORBA::is_nil(iorTable.in ())) {
+    ACE_ERROR ((LM_ERROR, "could not get the IORTable, will not register\n"));
+	} else {
+		iorTable->rebind("Simple", str.in());
+    ACE_DEBUG ((LM_DEBUG, "regisered\n"));
+	}
+	// we could also advertise the object reference to a naming and/or
+	// trading service
+}
+
+int main(int argc, char * argv[])
+{
+  try
+    {
+      // Initialize the orb.
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+
+      // Get the "RootPOA"
+      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in ());
+
+      // activate its managers so it can handle incoming requests
+      poa->the_POAManager()->activate();
+
+      // Create a CORBA object that can be called by a client. Note that
+      // this does not create the CORBA object. It creates the object
+      // that does the real work behind the CORBA object.
+      Simple_i * simple = new Simple_i(orb.in ());
+
+      // This call creates the CORBA object and returns a reference to
+      // it. It uses the "RootPOA" for dispatching its calls. There are
+      // a number of ways this can be done different. Refer to "Advanced
+      // CORBA Programming with C++" chapter 11 for more information.
+      PortableServer::ObjectId_var id =
+        poa->activate_object (simple);
+
+      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+
+      Simple_var simpleRef = Simple::_narrow (object_act.in ());
+
+      advertise(orb.in(), simpleRef.in());
+
+      // give the ORB control for only 30 seconds
+      ACE_DEBUG ((LM_DEBUG, "run orb\n"));
+      for (int i = 0; i < 1000; ++i) {
+        ACE_Time_Value runTime(3);
+        orb->run(runTime);
+        for (int i = 0; i < 10000000; ++i) {}
+
+      }
+      ACE_DEBUG ((LM_DEBUG, "done running\n"));
+
+      poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Bug_1383_Regression/callee.idl b/TAO/tests/Bug_1383_Regression/callee.idl
new file mode 100644
index 00000000000..6deb754024b
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/callee.idl
@@ -0,0 +1,5 @@
+// $Id$
+
+interface Callee {
+	void callback(in string message);
+};
diff --git a/TAO/tests/Bug_1383_Regression/simple.idl b/TAO/tests/Bug_1383_Regression/simple.idl
new file mode 100644
index 00000000000..2f5c19487a1
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/simple.idl
@@ -0,0 +1,12 @@
+// $Id$
+
+#ifndef SIMPLE_IDL
+#define SIMPLE_IDL
+
+#include "callee.idl"
+
+interface Simple {
+	void registerCallee(in Callee value);
+};
+
+#endif
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.cpp b/TAO/tests/Bug_1383_Regression/simple_i.cpp
new file mode 100644
index 00000000000..fb3b868ca90
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/simple_i.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+#include "simple_i.h"
+#include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
+
+Simple_i::Simple_i(CORBA::ORB_ptr orb)
+	: m_orb(orb->_duplicate(orb))
+{
+}
+
+void Simple_i::registerCallee(Callee_ptr value)
+{
+  ACE_DEBUG ((LM_DEBUG, "registerCallee invoked\n"));
+	// retain a reference so we can callback later
+	m_callee = value->_duplicate(value);
+
+	// register a callback with the reactor so we can invoke the
+	// callback method
+  m_orb->orb_core()->reactor()->schedule_timer(this, 0, ACE_Time_Value(5));
+}
+
+int Simple_i::handle_timeout(
+  const ACE_Time_Value &,
+  const void *
+	)
+{
+  ACE_DEBUG ((LM_DEBUG, "timer expired\n"));
+	m_callee->callback("got timeout");
+	return 0;
+}
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.h b/TAO/tests/Bug_1383_Regression/simple_i.h
new file mode 100644
index 00000000000..d03790b4684
--- /dev/null
+++ b/TAO/tests/Bug_1383_Regression/simple_i.h
@@ -0,0 +1,24 @@
+// $Id$
+
+#ifndef SIMPLE_I_H
+#define SIMPLE_I_H
+
+#include "tao/corba.h"
+#include "ace/Event_Handler.h"
+
+#include "simpleS.h"
+#include "calleeC.h"
+
+class Simple_i : public POA_Simple, ACE_Event_Handler {
+public:
+	Simple_i(CORBA::ORB_ptr orb);
+  void registerCallee(Callee_ptr value);
+	int handle_timeout(const ACE_Time_Value & currentTime, const void * data);
+
+private:
+
+	CORBA::ORB_ptr m_orb;
+	Callee_var     m_callee;
+};
+
+#endif
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index 7fecacc059b..5dc0408c587 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, messaging  {
 
 project(*Client): taoclient, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index 311fba07133..142e4e6e2c5 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -15,7 +15,6 @@ Sender_i::~Sender_i (void)
 
 void
 Sender_i::active_objects (CORBA::ULong no_threads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
 }
@@ -23,7 +22,6 @@ Sender_i::active_objects (CORBA::ULong no_threads)
 
 void
 Sender_i::send_ready_message (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received a call ...\n"));
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h
index 08a78a7e74d..d600e7a32e0 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.h
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.h
@@ -32,11 +32,9 @@ public:
   virtual ~Sender_i (void);
 
   // = The skeleton methods
-  virtual void active_objects (CORBA::ULong ao)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void active_objects (CORBA::ULong ao);
 
-  virtual void send_ready_message (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_ready_message (void);
 
   CORBA::ULong get_number_received (void) const;
 
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index 13ba1f5adea..2fac30da5e8 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index 8aa0a4c762b..4e19b224566 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/server.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -69,8 +69,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (sender_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Sender_var sender =
-        sender_impl->_this ();
+        Test::Sender::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (sender.in ());
diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
index aa7e626cec2..21caa76af8d 100644
--- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
+++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, amh, ami, iortable, portableserver {
 project(*Client): taoserver, amh, ami {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Reply_Handler.cpp
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index 6575cb0bdca..c08ad59c653 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -19,7 +19,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 CORBA::ULong
 Hello::next_prime (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 7d7fe72e65a..0230d9b4da6 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -17,8 +17,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong next_prime (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong next_prime (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index cac4a472529..a7a6aaa7236 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -8,7 +8,6 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
 
 void
 Reply_Handler::next_prime (CORBA::ULong)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
@@ -16,7 +15,6 @@ Reply_Handler::next_prime (CORBA::ULong)
 void
 Reply_Handler::next_prime_excep (
     ::Messaging::ExceptionHolder *ex)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   try
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index 4b59d67cef0..3c9c25afd9b 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -14,11 +14,9 @@ public:
   Reply_Handler (CORBA::ORB_ptr o);
 
 
-  void next_prime (CORBA::ULong ami_return_val)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void next_prime (CORBA::ULong ami_return_val);
 
-  void next_prime_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void next_prime_excep (::Messaging::ExceptionHolder * excep_holder);
 
 private:
 
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index c0ffd0e54c3..75edfd038f6 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index fdfbb50b1de..552fb90e01a 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
index 15cb99367e1..a1d2b35a529 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, pi_server, interceptors {
 project(*Client): taoserver, pi, interceptors {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     test_i.cpp
     testC.cpp
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index b9afd9b4960..9c1054f4ec9 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -15,7 +15,6 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
         // No Op
 }
@@ -23,7 +22,6 @@ Client_ORBInitializer::pre_init (
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index b9584834a8c..88403f8c7bb 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -53,7 +53,8 @@ Client_Task::svc (void)
                       "Remote thread ID was %i\n",
                       remote_thread_id));
 
-          CORBA::Long mythread_id = (CORBA::Long)ACE_Thread::self();
+          CORBA::Long mythread_id =
+            static_cast<CORBA::Long> ((size_t)ACE_Thread::self ());
           if (mythread_id != remote_thread_id)
             {
               ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index 132b2dd7568..5c484b8b253 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -15,7 +15,6 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
         // No Op
 }
@@ -23,7 +22,6 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (this->server_interceptor_,
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index ee240056609..b6bbbd44b78 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -33,11 +33,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index c31aeb51c00..1e7e7bf0e44 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -56,8 +56,13 @@ Server_Task::svc (void)
                       0);
       PortableServer::ServantBase_var owner_transfer (server_impl);
 
-      Bug1495_Regression::
-        Bug1495_var bug1495 = server_impl->_this();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Bug1495_Regression::Bug1495_var bug1495 =
+        Bug1495_Regression::Bug1495::_narrow (object.in ());
 
       CORBA::String_var ior = sorb_->object_to_string (bug1495.in ());
 
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index 926acd7cc13..d3c8aee2c01 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -25,21 +25,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -47,8 +44,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
     ACE_UNUSED_ARG (ri);
 // No Op
@@ -57,7 +52,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_UNUSED_ARG (ri);
     // No Op
@@ -66,8 +60,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
  ACE_UNUSED_ARG (ri);
 // no op
@@ -76,8 +68,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
     // No op
      ACE_UNUSED_ARG (ri);
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 705bce07974..8e8ec520789 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -31,30 +31,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 7767288eba5..d3709f062d7 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -30,7 +30,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 void
 Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location)
-                                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward_location))
     throw CORBA::INV_OBJREF (
@@ -43,22 +42,18 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -89,8 +84,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -98,7 +91,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     // No op
      ACE_UNUSED_ARG (ri);
@@ -107,8 +99,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
     // No Op
      ACE_UNUSED_ARG (ri);
@@ -117,8 +107,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
 
   // This will throw an exception if a location forward has not
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index dfcbae7b2c2..dd1814cd281 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -33,35 +33,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  void forward_reference (CORBA::Object_ptr forward_location)
-                          ACE_THROW_SPEC ((CORBA::SystemException));
+  void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   bool forward_location_done() const;
 private:
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index 64f9a568282..60227c6d081 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -29,19 +29,13 @@ void
 Bug1495_i::get_thread_id (
     CORBA::Long_out thread_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
-    thread_id = (CORBA::Long)ACE_Thread::self();
+    thread_id = static_cast<CORBA::Long> ((size_t)ACE_Thread::self ());
 }
 
 void
 Bug1495_i::shutdown (
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
     ACE_DEBUG ((LM_INFO,
                 "Shutting down orb %i\n",
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index 146a65f5c07..709ef8be74d 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -50,12 +50,10 @@ public:
     virtual ~Bug1495_i (void);
 
     virtual
-    void get_thread_id (CORBA::Long_out thread_id)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    void get_thread_id (CORBA::Long_out thread_id);
 
     virtual
-    void shutdown (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    void shutdown (void);
 private:
     CORBA::ORB_ptr orb_;
 
diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp
index 55daf8fcfc4..00399f096ea 100644
--- a/TAO/tests/Bug_1535_Regression/Test.cpp
+++ b/TAO/tests/Bug_1535_Regression/Test.cpp
@@ -12,7 +12,6 @@ Hello::Hello (PortableServer::POA_ptr poa) :
 
 void
 Hello::print_hello_world (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h
index 42bccb4ce91..df13c104c11 100644
--- a/TAO/tests/Bug_1535_Regression/Test.h
+++ b/TAO/tests/Bug_1535_Regression/Test.h
@@ -16,8 +16,7 @@ public:
   Hello (PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void print_hello_world (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void print_hello_world (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
index 676093874cc..22cdec6aa4c 100644
--- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
+++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, ami, iortable {
 project(*Client): taoserver, ami {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Reply_Handler.cpp
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index bf29d0f14e3..7dc579f2fbc 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -16,7 +16,6 @@ Hello::Hello(
 
 void
 Hello::short_sleep (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long count = atomic_counter_--;
 
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 9378352de1e..01fa3c62a42 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -16,8 +16,7 @@ public:
   /// Constructor
   Hello(CORBA::ORB_ptr orb, bool simulate_crashes);
 
-  virtual void short_sleep (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void short_sleep (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index aa2959f4104..88e34505a96 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -16,7 +16,6 @@ Reply_Handler::Reply_Handler (
 
 void
 Reply_Handler::short_sleep (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   check_counter();
 
@@ -29,7 +28,6 @@ Reply_Handler::short_sleep (void)
 void
 Reply_Handler::short_sleep_excep (
     ::Messaging::ExceptionHolder *ex)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   check_counter();
 
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 7ff901d9d20..4617c5ea5c5 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -17,11 +17,9 @@ public:
       Test::Hello_ptr hello,
       CORBA::ORB_ptr orb);
 
-  void short_sleep (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void short_sleep (void);
 
-  void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder);
 
 private:
   void check_counter(void);
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index cc005b58bb3..9cd6422805c 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index 21a50c21162..fd71f6b2ee7 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -77,8 +77,13 @@ main (int argc, char *argv[])
       TAO::Utils::Servant_Var<Hello> hello_impl(
           new Hello(orb.in(), simulate_crashes));
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl.in ());
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index 579c46280fa..aad2d3ed710 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, amh {
 
 project(*Client): taoserver, amh {
   after += *idl
-  after += *Server
   exename = client
   Source_Files {
     client.cpp
diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index d1a8e9ecdf1..8ed04d4a659 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index f14b9ce628d..6585a86fec2 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -28,17 +28,13 @@ public:
   Simple_C (CORBA::ORB_ptr orb);
 
   void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
   void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
   void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh);
   void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Baz::AMH_CResponseHandler_ptr _tao_rh);
 
 protected:
   CORBA::ORB_ptr orb_;
@@ -56,7 +52,6 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 void
 Simple_C::op1(
     Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op1();
 }
@@ -64,7 +59,6 @@ Simple_C::op1(
 void
 Simple_C::op2(
     Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op2();
 }
@@ -72,7 +66,6 @@ Simple_C::op2(
 void
 Simple_C::op3(
     Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op3();
 }
@@ -80,7 +73,6 @@ Simple_C::op3(
 void
 Simple_C::op4(
     Baz::AMH_CResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op4();
 }
@@ -121,7 +113,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -143,8 +135,13 @@ main (int argc, char *argv[])
       TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
           new Simple_C(orb.in()));
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (simple_c_impl.in ());
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Baz::C_var simple_c =
-        simple_c_impl->_this ();
+        Baz::C::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (simple_c.in ());
diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
index 19a373b79c9..3dc626dd384 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp
index fee6cd16303..ff714f3bbd6 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp
@@ -15,7 +15,6 @@ Test_i::~Test_i()
 
 void
 Test_i::test_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Noop
 }
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h
index 369ae33b782..94bf9373017 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.h
+++ b/TAO/tests/Bug_1627_Regression/Test_i.h
@@ -18,8 +18,7 @@ public:
    ~Test_i (void);
 
    /// A method
-   void test_method(void)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+   void test_method(void);
 };
 
 #endif /* ! BUG_1330_REGRESSION_TEST_I_H */
diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp
index 043271d2a70..dbe10b0d5d4 100644
--- a/TAO/tests/Bug_1627_Regression/client.cpp
+++ b/TAO/tests/Bug_1627_Regression/client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1627_Regression/run_test.pl b/TAO/tests/Bug_1627_Regression/run_test.pl
index 99aa9f856da..e34b10f5fa7 100755
--- a/TAO/tests/Bug_1627_Regression/run_test.pl
+++ b/TAO/tests/Bug_1627_Regression/run_test.pl
@@ -28,7 +28,7 @@ $ENV {'TAO_ORBENDPOINT'} = "iiop://localhost:$port";
 $SERVER->Spawn();
 
 # We don't need the IOR file but we can wait on the file
-if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1)
+if (PerlACE::waitforfile_timed ($server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
 {
    print STDERR "ERROR: cannot find $server_ior_file\n";
    $SERVER->Kill();
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index ff3a70b57ca..e8166ed5279 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -62,11 +62,10 @@ main (int argc, char *argv[])
 
       Test_i server_impl;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
 
-
-      root_poa->activate_object (   &server_impl);
-
-      CORBA::Object_var server = server_impl._this ();
+      CORBA::Object_var server = root_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index 137bf0bd9bb..78ff7a3d27b 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index a7ebd6af44a..1fe63298c85 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, amh {
 project(*Client): taoserver, amh {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp
index 59b8bdb5210..280ce776192 100644
--- a/TAO/tests/Bug_1670_Regression/client.cpp
+++ b/TAO/tests/Bug_1670_Regression/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp
index fe192420c7f..d7484aaa227 100644
--- a/TAO/tests/Bug_1670_Regression/server.cpp
+++ b/TAO/tests/Bug_1670_Regression/server.cpp
@@ -28,17 +28,13 @@ public:
   Simple_C (CORBA::ORB_ptr orb);
 
   void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
   void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh);
   void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh);
   void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Baz::AMH_CResponseHandler_ptr _tao_rh);
 
 protected:
   CORBA::ORB_ptr orb_;
@@ -56,7 +52,6 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 void
 Simple_C::op1(
     Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op1(1);
 }
@@ -64,7 +59,6 @@ Simple_C::op1(
 void
 Simple_C::op2(
     Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op2(2);
 }
@@ -72,7 +66,6 @@ Simple_C::op2(
 void
 Simple_C::op3(
     Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op3(3);
 }
@@ -80,7 +73,6 @@ Simple_C::op3(
 void
 Simple_C::op4(
     Baz::AMH_CResponseHandler_ptr _tao_rh)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op4(4);
 }
@@ -121,7 +113,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -143,8 +135,13 @@ main (int argc, char *argv[])
       TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
           new Simple_C(orb.in()));
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (simple_c_impl.in ());
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Baz::C_var simple_c =
-        simple_c_impl->_this ();
+        Baz::C::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (simple_c.in ());
diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
index a2357ad295c..e2fbcdc3d00 100644
--- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
+++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index 6e120fe9bbd..07dfbcf6ac6 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -13,7 +13,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 #if 0
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
@@ -23,9 +22,6 @@ Hello::get_string (void)
 Hello::get_stringList (
 	//
 	)
-	ACE_THROW_SPEC ((
-	::CORBA::SystemException
-	))
 {
 	Test::StringList * seq;
     ACE_NEW_RETURN (seq,
@@ -47,9 +43,6 @@ Hello::get_stringList2 (
         ::CORBA::Boolean initialize,
         ::Test::StringList_out osl
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ))
 {
     // CORBA::String_var the_string = osl->length();
     // ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Entering get_stringList2(%.4d)\n", osl));
@@ -72,9 +65,6 @@ void
 Hello::mod_stringList (
         ::Test::StringList & iosl
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ))
 {
     // osl->length(10);
     for (CORBA::ULong i = 0; i<iosl.length(); i++)
@@ -89,7 +79,6 @@ Hello::mod_stringList (
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h
index dc3314a876c..6c20db104e5 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.h
+++ b/TAO/tests/Bug_1676_Regression/Hello.h
@@ -18,28 +18,18 @@ public:
 
   // = The skeleton methods
 	virtual ::Test::StringList * get_stringList (
-		)
-		ACE_THROW_SPEC ((
-		::CORBA::SystemException
-		));
+		);
 
     virtual void get_stringList2 (
         ::CORBA::Boolean initialize,
         ::Test::StringList_out osl
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
     virtual void mod_stringList (
         ::Test::StringList & iosl
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 86cba9c8498..5b778002e7a 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
       hello->get_stringList2(true, seq2.out());
 
       for (CORBA::ULong i = 0; i<seq2->length(); i++) {
-        CORBA::String_var the_string = seq2.in()[i];
+        CORBA::String_var the_string = seq2.in()[i].in();
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
       }
@@ -119,14 +119,14 @@ void get_stringList2(Test::Hello_var hello)
       hello->get_stringList2(false, seq2.out());
 
       for (CORBA::ULong i = 0; i<seq2->length(); i++) {
-        CORBA::String_var the_string = seq2.in()[i];
+        CORBA::String_var the_string = seq2.in()[i].in ();
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 	  }
     }
   catch (const CORBA::BAD_PARAM& )
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - caught expected exception BAD_PARAM\n"));
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp
index 8c998950dd3..edfe2b98049 100644
--- a/TAO/tests/Bug_1676_Regression/server.cpp
+++ b/TAO/tests/Bug_1676_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
index 7bb66c7b450..43315056a45 100644
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
@@ -21,7 +21,6 @@ project(*Server): taoserver, iortable, ami {
 
 project(*Client): taoclient, ami {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     AMIC.cpp
diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp
index b34fc2fa70c..efdb735b6db 100644
--- a/TAO/tests/Bug_1869_Regression/client.cpp
+++ b/TAO/tests/Bug_1869_Regression/client.cpp
@@ -17,9 +17,6 @@ class AdderCallback
     virtual void add (
         CORBA::Long ami_return_val
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
       {
         ACE_DEBUG ((LM_DEBUG, "Return value: %d\n", ami_return_val));
       }
@@ -27,9 +24,6 @@ class AdderCallback
     virtual void add_excep (
         ::Messaging::ExceptionHolder *
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
       {
         ACE_DEBUG ((LM_DEBUG, "Caught exception in _excep\n"));
       }
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
index 6b741d07984..40bb68174be 100644
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ b/TAO/tests/Bug_1869_Regression/server.cpp
@@ -16,9 +16,7 @@ public:
       CORBA::Long a,
       CORBA::Long b
     )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) {
+    {
       return a + b;
     }
 };
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 327da7c9a13..0219846bc87 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -49,7 +49,12 @@ Client_Task::svc (void)
 
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
-      Test::Hello_var hello_servant = hello_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello_servant = Test::Hello::_narrow (object.in ());
       poa_manager->activate ();
 
       ACE_DEBUG((LM_DEBUG,"Client (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index ff95b9d3da6..d0471dc8914 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -15,7 +15,6 @@ EventNode::EventNode (CORBA::ORB_ptr orb,
 }
 
 void EventNode::registerHello ( ::Test::Hello_ptr h )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) EventNode: registerHello will call get_string...\n"));
@@ -48,13 +47,15 @@ void EventNode::registerHello ( ::Test::Hello_ptr h )
         }
     }
 
-  CORBA::String_var str = h->get_string( (::CORBA::Long) ACE_Thread::self() );
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - EventNode: string returned <%s>\n", str.in ()));
+  CORBA::String_var str =
+    h->get_string (static_cast<CORBA::Long> ((size_t)ACE_Thread::self ()));
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) - EventNode: string returned <%s>\n",
+              str.in ()));
 }
 
 void
 EventNode::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index 328da040c9e..e39deb0e464 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -20,11 +20,9 @@ public:
              ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual void registerHello ( ::Test::Hello_ptr h)
-    ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void registerHello ( ::Test::Hello_ptr h);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index ffc76400566..0a5cfa924b5 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -16,7 +16,6 @@ ACE_RCSID(Hello, Hello, "$Id$")
 
 char *
 Hello::get_string (::CORBA::Long caller_threadid)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -25,7 +24,7 @@ Hello::get_string (::CORBA::Long caller_threadid)
   ACE_Thread_ID this_ID;
   this_ID.id(this->thr_id_);
 
-  if ((::CORBA::Long)ACE_Thread::self () != caller_threadid) // this means a remote call was made
+  if (static_cast<CORBA::Long> ((size_t)ACE_Thread::self ()) != caller_threadid) // this means a remote call was made
     {
       if (this->orb_->orb_core ()->optimize_collocation_objects () &&
           this->orb_->orb_core ()->use_global_collocation ())
@@ -58,7 +57,6 @@ Hello::get_string (::CORBA::Long caller_threadid)
 
 void
 Hello::shutdown (void)
-  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
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 6ea9baac96d..e5606bf00b1 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -20,11 +20,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string ( ::CORBA::Long caller_threadid )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string ( ::CORBA::Long caller_threadid );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index 7c7706dedfe..b0d07718ed2 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -45,7 +45,12 @@ Server_Task::svc (void)
 
      EventNode *evnode_impl = new EventNode(this->sorb_.in(),ACE_Thread::self());
      PortableServer::ServantBase_var owner_transfer(evnode_impl);
-     Test::EventNode_var evNode = evnode_impl->_this();
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (evnode_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+     Test::EventNode_var evNode = Test::EventNode::_narrow (object.in ());
 
      ACE_DEBUG((LM_DEBUG,"Server (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
                          sorb_->orb_core()->optimize_collocation_objects(),
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index 77c9aba64aa..1c4929b1e18 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -14,8 +14,9 @@ namespace Test
 class Hello_impl: virtual public POA_Test::Hello
 {
 public:
-  void say_hello() ACE_THROW_SPEC ((CORBA::SystemException)) { };
-
+  void say_hello()
+  {
+  };
 };
 }
 
@@ -27,13 +28,22 @@ int main(int argc, char* argv[])
   try
     {
       // Initialize the ORB
-      orb =
-        CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       // create Hello object
       Test::Hello_impl hello_i;
 
-      Test::Hello_var hello = hello_i._this ();
+      // Get the root POA
+      CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ());
+
+      PortableServer::ObjectId_var id =
+        rootPOA->activate_object (&hello_i);
+
+      CORBA::Object_var object = rootPOA->id_to_reference (id.in ());
+
+      Test::Hello_var hello = Test::Hello::_narrow (object.in ());
 
       // give our object a friendly name
       CORBA::Object_var iorTableObj =
@@ -48,11 +58,6 @@ int main(int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ior_string.in ()));
 
-      // Get the root POA
-      CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA");
-
-      PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ());
-
       // Activate the POA manager
       PortableServer::POAManager_var poaManager = rootPOA->the_POAManager ();
 
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index fed64e9b29a..9a3a20707ae 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index f3325503619..af995563a79 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -47,7 +47,7 @@ int main (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index 03628e958c6..ec48f1e0ace 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 8efe0fe94f0..ee0a7d02adc 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -15,7 +15,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
                        CORBA::Long msecs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
 
@@ -28,7 +27,6 @@ Simple_Server_i::echo (CORBA::Long x,
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h
index 8a135bdd767..8c102e3a1b7 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.h
+++ b/TAO/tests/Bug_2174_Regression/test_i.h
@@ -32,10 +32,8 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Long msecs);
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index d4c612baee2..41d5b8dfa81 100644
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, strategies {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index d9a502753b9..ee93d6507bb 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 78833d61a97..76d00d09df0 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -22,11 +22,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 5f794550945..157975a01c5 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index 72abe515c04..bbcde579a8a 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
index 874a0bb77df..efde33e3d93 100644
--- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
+++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, strategies {
 
 project(*Client): taoserver, strategies {
   after += *idl
-  after += *Server
   exename = client
   Source_Files {
     Hello.cpp
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index 78f86cba94b..e776306b641 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n"));
   return CORBA::string_dup ("Hello there!");
@@ -20,14 +19,12 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 void
 Hello::request_callback (Test::Hello_ptr call_me)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Making call back !!!\n"));
   try
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index 177070074eb..59e72ed2695 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -17,14 +17,11 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual void request_callback (Test::Hello_ptr call_me)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_callback (Test::Hello_ptr call_me);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index 2b227d1e91d..3d163843a6d 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_Regression/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 37675e91a42..9631352c99f 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc
index dbcd24841bb..d9d85d6c1b8 100644
--- a/TAO/tests/Bug_2188_Regression/broken.mpc
+++ b/TAO/tests/Bug_2188_Regression/broken.mpc
@@ -11,9 +11,9 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
-    broken_i.cpp
     brokenC.cpp
     brokenS.cpp
+    broken_i.cpp
     server.cpp
   }
   IDL_Files {
@@ -22,7 +22,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     brokenC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index 24a80a371e6..c23ce9d86ba 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp
@@ -43,14 +43,12 @@ ServerAdmin_i::~ServerAdmin_i (void)
 
 ArrayTest_ptr
 ServerAdmin_i::target(void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ArrayTest::_duplicate(target_.in());
 }
 
 void
 ServerAdmin_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   char ** argv = 0;
@@ -101,9 +99,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::LongArray p2,
     ::LongArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ::LongArray_copy(p3,p2);
   return LongArray_dup(p1);
@@ -114,9 +109,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::StringArray p2,
     ::StringArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ::StringArray_copy(p3,p2);
@@ -128,9 +120,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::ShortArray p2,
     ::ShortArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ::ShortArray_copy(p3,p2);
   return ShortArray_dup(p1);
@@ -142,9 +131,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::UShortArray p2,
     ::UShortArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ::UShortArray_copy(p3,p2);
@@ -156,9 +142,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::CharArray p2,
     ::CharArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ::CharArray_copy(p3,p2);
@@ -171,9 +154,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::OctetArray p2,
     ::OctetArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ::OctetArray_copy(p3,p2);
@@ -185,9 +165,6 @@ ArrayTest_i::~ArrayTest_i (void)
     ::DoubleArray p2,
     ::DoubleArray_out p3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ::DoubleArray_copy(p3,p2);
@@ -197,9 +174,6 @@ ArrayTest_i::~ArrayTest_i (void)
 ::LongArray_slice * ArrayTest_i::a_longArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return LongArray_dup(longArray_);
@@ -208,9 +182,6 @@ ArrayTest_i::~ArrayTest_i (void)
 void ArrayTest_i::a_longArray (
     const ::LongArray a_longArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   LongArray_copy(longArray_,a_longArray);
@@ -219,9 +190,6 @@ void ArrayTest_i::a_longArray (
 ::ULongArray_slice * ArrayTest_i::a_ulongArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return ULongArray_dup(ulongArray_);
@@ -230,9 +198,6 @@ void ArrayTest_i::a_longArray (
 void ArrayTest_i::a_ulongArray (
     const ::ULongArray a_ulongArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ULongArray_copy (ulongArray_,a_ulongArray);
@@ -241,9 +206,6 @@ void ArrayTest_i::a_ulongArray (
 ::StringArray_slice * ArrayTest_i::a_stringArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return StringArray_dup (stringArray_);
@@ -252,9 +214,6 @@ void ArrayTest_i::a_ulongArray (
 void ArrayTest_i::a_stringArray (
     const ::StringArray a_stringArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   StringArray_copy (stringArray_,a_stringArray);
@@ -263,9 +222,6 @@ void ArrayTest_i::a_stringArray (
 ::ShortArray_slice * ArrayTest_i::a_shortArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return ShortArray_dup (shortArray_);
@@ -274,9 +230,6 @@ void ArrayTest_i::a_stringArray (
 void ArrayTest_i::a_shortArray (
     const ::ShortArray a_shortArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   ShortArray_copy (shortArray_,a_shortArray);
@@ -285,9 +238,6 @@ void ArrayTest_i::a_shortArray (
 ::UShortArray_slice * ArrayTest_i::a_ushortArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return UShortArray_dup (ushortArray_);
@@ -296,9 +246,6 @@ void ArrayTest_i::a_shortArray (
 void ArrayTest_i::a_ushortArray (
     const ::UShortArray a_ushortArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   UShortArray_copy (ushortArray_,a_ushortArray);
@@ -307,9 +254,6 @@ void ArrayTest_i::a_ushortArray (
 CORBA::Char ArrayTest_i::a_char (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return char_;
@@ -318,9 +262,6 @@ CORBA::Char ArrayTest_i::a_char (
 void ArrayTest_i::a_char (
     ::CORBA::Char a_char
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   char_ = a_char;
@@ -329,9 +270,6 @@ void ArrayTest_i::a_char (
 ::CharArray_slice * ArrayTest_i::a_charArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CharArray_dup (charArray_);
 }
@@ -339,9 +277,6 @@ void ArrayTest_i::a_char (
 void ArrayTest_i::a_charArray (
     const ::CharArray a_charArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   CharArray_copy (charArray_,a_charArray);
@@ -350,9 +285,6 @@ void ArrayTest_i::a_charArray (
 ::OctetArray_slice * ArrayTest_i::a_octetArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return OctetArray_dup (octetArray_);
@@ -361,9 +293,6 @@ void ArrayTest_i::a_charArray (
 void ArrayTest_i::a_octetArray (
     const ::OctetArray a_octetArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   OctetArray_copy (octetArray_,a_octetArray);
@@ -372,9 +301,6 @@ void ArrayTest_i::a_octetArray (
 ::DoubleArray_slice * ArrayTest_i::a_doubleArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return DoubleArray_dup (doubleArray_);
@@ -383,9 +309,6 @@ void ArrayTest_i::a_octetArray (
 void ArrayTest_i::a_doubleArray (
     const ::DoubleArray a_doubleArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   DoubleArray_copy (doubleArray_,a_doubleArray);
@@ -394,9 +317,6 @@ void ArrayTest_i::a_doubleArray (
 ::FloatArray_slice * ArrayTest_i::a_floatArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return FloatArray_dup (floatArray_);
@@ -405,9 +325,6 @@ void ArrayTest_i::a_doubleArray (
 void ArrayTest_i::a_floatArray (
     const ::FloatArray a_floatArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   FloatArray_copy (floatArray_,a_floatArray);
@@ -416,9 +333,6 @@ void ArrayTest_i::a_floatArray (
 ::BucketArray_slice * ArrayTest_i::a_bucketArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return BucketArray_dup (bucketArray_);
@@ -427,9 +341,6 @@ void ArrayTest_i::a_floatArray (
 void ArrayTest_i::a_bucketArray (
     const ::BucketArray a_bucketArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   BucketArray_copy (bucketArray_,a_bucketArray);
@@ -438,9 +349,6 @@ void ArrayTest_i::a_bucketArray (
 ::AccountArray_slice * ArrayTest_i::a_accountArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return AccountArray_dup (accountArray_);
@@ -449,9 +357,6 @@ void ArrayTest_i::a_bucketArray (
 void ArrayTest_i::a_accountArray (
     const ::AccountArray a_accountArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   AccountArray_copy (accountArray_,a_accountArray);
@@ -460,9 +365,6 @@ void ArrayTest_i::a_accountArray (
 ::BooleanArray_slice * ArrayTest_i::a_booleanArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return BooleanArray_dup (booleanArray_);
@@ -471,9 +373,6 @@ void ArrayTest_i::a_accountArray (
 void ArrayTest_i::a_booleanArray (
     const ::BooleanArray a_booleanArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   BooleanArray_copy (booleanArray_,a_booleanArray);
@@ -482,9 +381,6 @@ void ArrayTest_i::a_booleanArray (
 ::LongArrayArray_slice * ArrayTest_i::a_longArrayArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return LongArrayArray_dup (longArrayArray_);
@@ -493,9 +389,6 @@ void ArrayTest_i::a_booleanArray (
 void ArrayTest_i::a_longArrayArray (
     const ::LongArrayArray a_longArrayArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   LongArrayArray_copy (longArrayArray_,a_longArrayArray);
@@ -504,9 +397,6 @@ void ArrayTest_i::a_longArrayArray (
 ::MyEnumArray_slice * ArrayTest_i::a_myEnumArray (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   return MyEnumArray_dup (enumArray_);
@@ -515,9 +405,6 @@ void ArrayTest_i::a_longArrayArray (
 void ArrayTest_i::a_myEnumArray (
     const ::MyEnumArray a_myEnumArray
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   // Add your implementation here
   MyEnumArray_copy (enumArray_,a_myEnumArray);
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index 4868bd08e72..4bcf79943b1 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -42,11 +42,9 @@ class ServerAdmin_i : public virtual POA_ServerAdmin
 public:
   ServerAdmin_i (ArrayTest_ptr target);
   virtual ~ServerAdmin_i (void);
-  ArrayTest_ptr target(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  ArrayTest_ptr target(void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 private:
   ArrayTest_var target_;
 
@@ -83,310 +81,199 @@ public:
       const ::LongArray p1,
       ::LongArray p2,
       ::LongArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::StringArray_slice * stringArrayOp (
       const ::StringArray p1,
       ::StringArray p2,
       ::StringArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::ShortArray_slice * shortArrayOp (
       const ::ShortArray p1,
       ::ShortArray p2,
       ::ShortArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::UShortArray_slice * ushortArrayOp (
       const ::UShortArray p1,
       ::UShortArray p2,
       ::UShortArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::CharArray_slice * charArrayOp (
       const ::CharArray p1,
       ::CharArray p2,
       ::CharArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::OctetArray_slice * octetArrayOp (
       const ::OctetArray p1,
       ::OctetArray p2,
       ::OctetArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::DoubleArray_slice * doubleArrayOp (
       const ::DoubleArray p1,
       ::DoubleArray p2,
       ::DoubleArray_out p3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::LongArray_slice * a_longArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_longArray (
       const ::LongArray a_longArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::ULongArray_slice * a_ulongArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_ulongArray (
       const ::ULongArray a_ulongArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::StringArray_slice * a_stringArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_stringArray (
       const ::StringArray a_stringArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::ShortArray_slice * a_shortArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_shortArray (
       const ::ShortArray a_shortArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::UShortArray_slice * a_ushortArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_ushortArray (
       const ::UShortArray a_ushortArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   CORBA::Char a_char (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_char (
       ::CORBA::Char a_char
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::CharArray_slice * a_charArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_charArray (
       const ::CharArray a_charArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::OctetArray_slice * a_octetArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_octetArray (
       const ::OctetArray a_octetArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::DoubleArray_slice * a_doubleArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_doubleArray (
       const ::DoubleArray a_doubleArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::FloatArray_slice * a_floatArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_floatArray (
       const ::FloatArray a_floatArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::BucketArray_slice * a_bucketArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_bucketArray (
       const ::BucketArray a_bucketArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::AccountArray_slice * a_accountArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_accountArray (
       const ::AccountArray a_accountArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::BooleanArray_slice * a_booleanArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_booleanArray (
       const ::BooleanArray a_booleanArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::LongArrayArray_slice * a_longArrayArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_longArrayArray (
       const ::LongArrayArray a_longArrayArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   ::MyEnumArray_slice * a_myEnumArray (
 
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void a_myEnumArray (
       const ::MyEnumArray a_myEnumArray
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 };
 
 
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 694317d73bd..d7c5d8c6ddc 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
 
   try
     {
-      orb = CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 542278071fe..4eba57f9c90 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -66,8 +66,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(target_servant);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (target_servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       ArrayTest_var atobj =
-        target_servant->_this ();
+        ArrayTest::_narrow (object.in ());
 
       ServerAdmin_i *servant;
       ACE_NEW_RETURN (servant, ServerAdmin_i(atobj.in()),1);
@@ -75,8 +80,9 @@ main (int argc, char *argv[])
       // safely releases previous reference and takes ownership of this one.
       owner_transfer = servant;
 
-      ServerAdmin_var saobj =
-        servant->_this ();
+      id = root_poa->activate_object (servant);
+      object = root_poa->id_to_reference (id.in ());
+      ServerAdmin_var saobj = ServerAdmin::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (saobj.in ());
diff --git a/TAO/tests/Bug_2234_Regression/run_test.pl b/TAO/tests/Bug_2234_Regression/run_test.pl
index 58608c03ef6..c3cd6960c5d 100755
--- a/TAO/tests/Bug_2234_Regression/run_test.pl
+++ b/TAO/tests/Bug_2234_Regression/run_test.pl
@@ -31,7 +31,7 @@ if ($sv != 0) {
    exit 1;
 }
 # We can wait on the IOR file
-if (PerlACE::waitforfile_timed( $server_ior_file, 10 ) == -1)
+if (PerlACE::waitforfile_timed( $server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
 {
    print STDERR "ERROR: cannot find $server_ior_file\n";
    $SERVER->Kill();
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index fd550b9b327..84f5caad219 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -42,18 +42,17 @@ public:
     CORBA::Long_out b,
     CORBA::Long &c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException ) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestLong\n") );
     if (static_cast<CORBA::Long>( 1 ) != a)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 3 ) != c)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     b= static_cast<CORBA::Long>(  a << 1 );
@@ -69,38 +68,37 @@ public:
     CORBA::String_out b,
     char *&c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestString\n") );
     if (0 == a)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a ))
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c ))
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     b= CORBA::string_dup( "0" ); // Create a one character output buffer
@@ -116,7 +114,6 @@ public:
     Test::MyNonVarStruct_out b,
     Test::MyNonVarStruct &c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     Test::MyNonVarStruct
       newret;
@@ -125,12 +122,12 @@ public:
     if (static_cast<CORBA::Long>( 1 ) != a.val)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 3 ) != c.val)
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     newret.val= static_cast<CORBA::Long>( 7 );
@@ -154,38 +151,37 @@ public:
     Test::MyVarStruct_out b,
     Test::MyVarStruct &c
  )
-    ACE_THROW_SPEC(( CORBA::SystemException ))
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") );
     if (0 == a.val.in())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a.val.in() ))
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a.val.in())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c.val.in())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c.val.in() ))
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c.val.in())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0);
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     char ca[2]= {0};
@@ -218,7 +214,6 @@ public:
     Test::MyNonVarUnion_out b,
     Test::MyNonVarUnion &c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     Test::MyNonVarUnion
       newret;
@@ -227,22 +222,22 @@ public:
     if (static_cast<CORBA::Short>( 1 ) != a._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 1 ) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Short>( 1 ) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 3 ) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), newret );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     Test::MyNonVarUnion *newval_p;
@@ -266,28 +261,27 @@ public:
     Test::MyVarUnion_out b,
     Test::MyVarUnion &c
  )
-    ACE_THROW_SPEC (( CORBA::SystemException ))
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") );
     if (static_cast<CORBA::Short>( 1 ) != a._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 1 ) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Short>( 1 ) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 3 ) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     Test::MyVarUnion *newval_p;
@@ -316,28 +310,27 @@ public:
     Test::MySeqOfLong_out b,
     Test::MySeqOfLong &c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestSeqOfLong\n") );
     if (1u != a.length())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 1 ) != a[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1u != c.length())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (static_cast<CORBA::Long>( 3 ) != c[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     Test::MySeqOfLong *newval_p;
@@ -367,7 +360,6 @@ public:
     CORBA::Any_out b,
     CORBA::Any &c
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestAny\n") );
     CORBA::Long aL;
@@ -377,26 +369,26 @@ public:
       if (static_cast<CORBA::Long>( 1 ) != aL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
-        ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+        throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
       }
     }
     else
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect any type for parameter a\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (c >>= cL)
     {
       if (static_cast<CORBA::Long>( 3 ) != cL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
-        ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+        throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
       }
     }
     else
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect any type for parameter c\n") );
-      ACE_THROW_RETURN( CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO), 0 );
+      throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
     CORBA::Any *newval_p;
@@ -421,7 +413,6 @@ public:
 
   void ShutdownServer(
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in ShutdownServer\n") );
     orb->shutdown(0);
@@ -435,24 +426,19 @@ class AnInterceptor : public PortableInterceptor::ServerRequestInterceptor
 {
 public:
   char *name( )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     return const_cast<char *>("");
   }
 
   void destroy( )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
   }
 
   void receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
  )
-    ACE_THROW_SPEC( (CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest) )
   {
   }
-
   // Note this helper only deals with the types inserted into
   // the any that we defined for this test.
   static void display_any( const CORBA::Any &arg )
@@ -598,8 +584,6 @@ public:
   void receive_request(
     PortableInterceptor::ServerRequestInfo_ptr ri
  )
-    ACE_THROW_SPEC( (CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest) )
   {
     ACE_DEBUG( (LM_INFO, "AnInterceptor::receive_request\n") );
     Dynamic::ParameterList
@@ -615,7 +599,6 @@ public:
   void send_reply(
     PortableInterceptor::ServerRequestInfo_ptr ri
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, "AnInterceptor::send_reply\n") );
     Dynamic::ParameterList
@@ -631,16 +614,11 @@ public:
   void send_exception(
     PortableInterceptor::ServerRequestInfo_ptr
   )
-    ACE_THROW_SPEC( (CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest) )
   {
   }
-
   void send_other(
     PortableInterceptor::ServerRequestInfo_ptr
  )
-    ACE_THROW_SPEC( (CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest) )
   {
   }
 };
@@ -656,14 +634,12 @@ public:
   void pre_init(
     PortableInterceptor::ORBInitInfo_ptr
  )
-    ACE_THROW_SPEC( (CORBA::SystemException) )
   {
   }
 
   void post_init(
      PortableInterceptor::ORBInitInfo_ptr info
  )
-     ACE_THROW_SPEC( (CORBA::SystemException) )
    {
      info->add_server_request_interceptor( interceptor_ );
    }
diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
index e2d0b8a08cc..960c4f67ad2 100644
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, iortable {
 project(*Client): taoserver, iortable {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     TestC.cpp
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
index 2ceb5662238..26e65b4f03d 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
@@ -13,7 +13,6 @@ MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb)
 }
 CORBA::Boolean
 MyInterfaceImpl::myMethod (const char* mystring)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return mystring == my_string;
 }
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
index 4f460c9d3f3..bdfc6ce9f6d 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
@@ -13,8 +13,7 @@ class MyInterfaceImpl
   static const char* my_string;
 
   // = The skeleton methods
-  virtual CORBA::Boolean myMethod (const char* stringParam)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean myMethod (const char* stringParam);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp
index 1f81988cb77..e59d06f3184 100644
--- a/TAO/tests/Bug_2289_Regression/client.cpp
+++ b/TAO/tests/Bug_2289_Regression/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,8 +74,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       MyInterface_var test_ref =
-        test_impl->_this ();
+        MyInterface::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test_ref.in ());
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index c79e9ed5cc3..d4f54cc1c1c 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -77,8 +77,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       MyInterface_var test_ref =
-        test_impl->_this ();
+        MyInterface::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test_ref.in ());
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 935fd16ade1..6b5b25a1451 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -32,8 +32,7 @@ class ST_AMH_Servant
       	ST_AMH_Servant (CORBA::ORB_ptr orb);
 
      	void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                        Test::Timestamp send_time)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+                        Test::Timestamp send_time);
 
     protected:
       	CORBA::ORB_ptr orb_;
@@ -124,7 +123,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                              Test::Timestamp send_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   	printf("Recieved Timestamp # %d \n", calls_received);
   	ACE_OS::sleep(1);
@@ -204,7 +202,18 @@ void ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
   try
     {
-      Test::Roundtrip_var roundtrip = servant->_this();
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in ());
 
       CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ());
 
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
index 9fdbd894b7d..ccb8a89d9e4 100644
--- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
+++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, codeset {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
index ee5dcf4c2a3..65ef14806b2 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2328_Regression/Hello.cpp
@@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (const char * A, const char * B, const char * C)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Received: <%s>, <%s>, <%s>\n", A, B, C));
   return CORBA::string_dup ("Hello there!");
@@ -20,7 +19,6 @@ Hello::get_string (const char * A, const char * B, const char * C)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index f93bc8ae434..883a1a610d7 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (const char * A, const char * B, const char * C)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (const char * A, const char * B, const char * C);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
index 23ee6799cbd..9ac10a2809d 100644
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ b/TAO/tests/Bug_2328_Regression/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
index 24e55dfc3b7..0bbe22b1aa4 100644
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ b/TAO/tests/Bug_2328_Regression/server.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
index c01afd5aedd..28055823491 100644
--- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
+++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
@@ -21,7 +21,6 @@ project(*server): taoserver {
 
 project(*client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     fooC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index c4fd6e66f28..9eaf0475477 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -12,11 +12,9 @@ public:
    : orb_ (CORBA::ORB::_duplicate (orb)) {
   }
 
-  void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown ();
 
-  void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy ();
 
 private:
   CORBA::ORB_var orb_;
@@ -24,14 +22,12 @@ private:
 
 void
 foo_i::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 void
 foo_i::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool expected_exception_raised = false;
 
@@ -82,7 +78,12 @@ main (int argc, char** argv)
                       1);
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
-      foo_var server = server_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      foo_var server = foo::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
index e2bd6d206cd..5d7caaa5af8 100644
--- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
+++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
@@ -12,10 +12,10 @@ project(*idl): taoidldefaults, anytypecode {
 project(*Server): taoserver, messaging, threads {
   after += *idl
   Source_Files {
-    publisher_impl.cpp
-    publisherS.cpp
     publisherC.cpp
+    publisherS.cpp
     subscriberC.cpp
+    publisher_impl.cpp
     server.cpp
   }
   IDL_Files {
@@ -26,10 +26,10 @@ project(*Client): taoserver, threads {
   exename = client
   after += *idl
   Source_Files {
-    subscriber_impl.cpp
-    subscriberS.cpp
     subscriberC.cpp
+    subscriberS.cpp
     publisherC.cpp
+    subscriber_impl.cpp
     client.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index dbd4bb9cb20..785386807d6 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
 {
 	try
     {
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
 
 		if (CORBA::is_nil (poa_object.in ()))
@@ -30,9 +30,14 @@ main (int argc, char *argv[])
         root_poa->the_POAManager();
 
 		Subscriber_impl subscriber(orb.in ());
-		Subscriber_var subscriber_var = subscriber._this();
+		PortableServer::ObjectId_var id =
+		  root_poa->activate_object (&subscriber);
 
-		CORBA::Object_var object = orb->string_to_object("file://ior.out");
+		CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+		Subscriber_var subscriber_var = Subscriber::_narrow (object.in ());
+
+		object = orb->string_to_object("file://ior.out");
 		Publisher_var publisher = Publisher::_narrow(object.in());
 
 		publisher->subscribe(subscriber_var.in());
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index 9bdb1e53f3c..ff00c029f9d 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -135,18 +135,12 @@ Publisher_impl::~Publisher_impl()
 
 void subscribe (
                 ::Subscriber_ptr subscriber
-                )
-  ACE_THROW_SPEC ((
-                   ::CORBA::SystemException
-                   ));
+                );
 
 void
 Publisher_impl::subscribe(
                           ::Subscriber_ptr subscriber
                           )
-  ACE_THROW_SPEC ((
-                   ::CORBA::SystemException
-                   ))
 {
   worker->addSubscriber(subscriber);
 }
@@ -154,9 +148,6 @@ Publisher_impl::subscribe(
 void
 Publisher_impl::shutdown (
                           )
-  ACE_THROW_SPEC ((
-                   ::CORBA::SystemException
-                   ))
 {
   this->orb_->shutdown (0);
   worker->terminate();
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h
index a33a436ded5..ec64ca450f6 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.h
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h
@@ -14,16 +14,10 @@ class Publisher_impl : public POA_Publisher
 
     virtual void subscribe (
       ::Subscriber_ptr subscriber
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
+    );
 
   virtual void shutdown (
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
+    );
 
 	private:
 		CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 668321e182a..98dab84b52f 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
 {
 	try
     {
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
 
 		if (CORBA::is_nil (poa_object.in ()))
@@ -31,7 +31,12 @@ main (int argc, char *argv[])
         root_poa->the_POAManager();
 
 		Publisher_impl publisher(orb.in ());
-		Publisher_var publisher_var = publisher._this();
+		PortableServer::ObjectId_var id =
+		  root_poa->activate_object (&publisher);
+
+		CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+		Publisher_var publisher_var = Publisher::_narrow (object.in ());
 
 		CORBA::String_var ior = orb->object_to_string(publisher_var.in());
 		ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in()));
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
index e6e6c49453a..07b5da4e9a2 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
@@ -17,9 +17,6 @@ void
 Subscriber_impl::onData (
       ::CORBA::Double
     )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
 {
 	++count;
 	if (count > 100)
@@ -29,9 +26,6 @@ Subscriber_impl::onData (
 ::CORBA::Boolean
 Subscriber_impl::isAlive (
     )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
 {
 	return true;
 }
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
index 99e9d1b7c71..f7d159d1294 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
@@ -13,15 +13,9 @@ class Subscriber_impl : public POA_Subscriber
 
     virtual void onData (
         ::CORBA::Double value
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
     virtual ::CORBA::Boolean isAlive (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
 		void shutdown();
 	private:
diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
index 71c3f8a21bb..fcc7a879916 100644
--- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
+++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
@@ -31,7 +31,6 @@ project(*Server) : taoserver, messaging {
 project(*Client) : taoclient, messaging {
   exename   = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
index 5f7ad67d59d..9f81ba41932 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
@@ -9,14 +9,12 @@ ChildServant::ChildServant(CORBA::ORB_ptr orb)
 
 void
 ChildServant::childMethod ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // No-op
 }
 
 void
 ChildServant::parentMethod ()
-ACE_THROW_SPEC((CORBA::SystemException))
 {
    // Just throw an exception
    throw CORBA::INTERNAL ();
@@ -24,7 +22,6 @@ ACE_THROW_SPEC((CORBA::SystemException))
 
 void
 ChildServant::shutdown ()
-ACE_THROW_SPEC((CORBA::SystemException))
 {
    this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.h b/TAO/tests/Bug_2429_Regression/ChildServant.h
index 55d601d3cc0..cb342276e15 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.h
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.h
@@ -10,12 +10,9 @@ class ChildServant
 {
  public:
    ChildServant (CORBA::ORB_ptr orb);
-   virtual void parentMethod ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-   virtual void childMethod ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-   virtual void shutdown ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
+   virtual void parentMethod ();
+   virtual void childMethod ();
+   virtual void shutdown ();
 
  private:
    CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 90a229f1e45..274db49b547 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -16,14 +16,12 @@ class Reply_Handler
 
    virtual void
    childMethod (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
    virtual void
    childMethod_excep (Messaging::ExceptionHolder *
                          excep_holder)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       try
         {
@@ -37,7 +35,6 @@ class Reply_Handler
 
    virtual void
    parentMethod (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "client: parentMethod reply %d @ %T\n",
@@ -47,7 +44,6 @@ class Reply_Handler
 
    virtual void
    parentMethod_excep (Messaging::ExceptionHolder * excep_holder)
-   ACE_THROW_SPEC ((CORBA::SystemException))
    {
       try
         {
@@ -111,7 +107,7 @@ main(int argc, char *argv[])
   try
     {
       // Initialize the ORB.
-      orb = CORBA::ORB_init(argc, argv, 0);
+      orb = CORBA::ORB_init(argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = client_parse_args(argc, argv);
@@ -139,8 +135,13 @@ main(int argc, char *argv[])
 
       Reply_Handler reply_handler_servant;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&reply_handler_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       AMI_ChildHandler_var reply_handler_object =
-         reply_handler_servant._this ();
+        AMI_ChildHandler::_narrow (object_act.in ());
 
       // Invoke the AMI parentMethod
       child->sendc_parentMethod (reply_handler_object.in ());
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index 5658bcbaed4..e0087a26393 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_Regression/server.cpp
@@ -55,8 +55,13 @@ main (int argc, char *argv[])
 
       ChildServant servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Child_var server =
-        servant._this ();
+        Child::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
index 1214006b391..a4f043c20bb 100644
--- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
+++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 1c58c0f1449..bec9007b319 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -84,7 +84,12 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
-      Simple_Server_var server = server_impl._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Simple_Server_var server = Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior = orb->object_to_string (server.in ());
 
diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp
index bfccb378f26..4a23db96ac0 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2494_Regression/test_i.cpp
@@ -12,7 +12,6 @@ ACE_RCSID(Bug_2494_Regression, test_i, "$Id$")
 
 char *
 Simple_Server_i::test_method (const char *x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
@@ -23,7 +22,6 @@ Simple_Server_i::test_method (const char *x)
 
 void
 Simple_Server_i::shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2494_Regression/test_i.h b/TAO/tests/Bug_2494_Regression/test_i.h
index cd8971dc7a6..8eb1d8efcf6 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.h
+++ b/TAO/tests/Bug_2494_Regression/test_i.h
@@ -18,11 +18,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  char *test_method (const char *x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char *test_method (const char *x);
 
-  void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
index 538d116a20e..427b134b358 100644
--- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
+++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
@@ -25,7 +25,6 @@ project(*Server): messaging, taoserver, ami {
 
 project(*Client): messaging, taoexe, portableserver, ami {
   after += *idl
-  after += *Server
   Source_Files {
     test_i.cpp
     common.cpp
diff --git a/TAO/tests/Bug_2503_Regression/common.cpp b/TAO/tests/Bug_2503_Regression/common.cpp
index e534ce75e59..e39b801da7b 100644
--- a/TAO/tests/Bug_2503_Regression/common.cpp
+++ b/TAO/tests/Bug_2503_Regression/common.cpp
@@ -7,7 +7,7 @@ CORBA::ORB_ptr
 initialize_orb_and_poa(int & argc, char * argv[])
 {
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var poa_object =
     orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp
index c610f1d4768..4b441bf2a80 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2503_Regression/test_i.cpp
@@ -5,7 +5,7 @@
 #include "tao/Utils/Servant_Var.h"
 
 test_i::
-test_i(CORBA::ORB_ptr orb) 
+test_i(CORBA::ORB_ptr orb)
 {
  this->orb_ = CORBA::ORB::_duplicate (orb);
 }
@@ -24,7 +24,18 @@ create_and_activate_server()
   TAO::Utils::Servant_Var<test_i> impl(
       new test_i (this->orb_.in ()));
 
-  Test_var ref = impl->_this();
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (impl.in ());
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+  Test_var ref = Test::_narrow (object.in ());
 
   return this->orb_->object_to_string(ref.in());
 }
diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index 432759ef282..913aaf221a1 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -5,6 +5,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 const char *ior_output_file = "server.ior";
 
@@ -65,7 +66,13 @@ int main (int argc, char* argv[])
     Quoter_Stock_Factory_i stock_factory_i;
 
     // Activate it to obtain the object reference
-    Quoter::Stock_Factory_var stock_factory = stock_factory_i._this ();
+    PortableServer::ObjectId_var id =
+      root_poa->activate_object (&stock_factory_i);
+
+    CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+    Quoter::Stock_Factory_var stock_factory =
+      Quoter::Stock_Factory::_narrow (object_act.in ());
 
     // Put the object reference as an IOR string
     CORBA::String_var ior = orb->object_to_string (stock_factory.in ());
diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
index 209f14c1f17..8b35bf371a2 100644
--- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
+++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, strategies {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp
index 3bb0a772b76..df5dc90d3d9 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2593_Regression/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp
index 9f58a01ac0f..c0179ea8b59 100644
--- a/TAO/tests/Bug_2593_Regression/client.cpp
+++ b/TAO/tests/Bug_2593_Regression/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp
index d54cee175d5..fa9dc9c9b9b 100644
--- a/TAO/tests/Bug_2593_Regression/server.cpp
+++ b/TAO/tests/Bug_2593_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
index 02e2ddc1120..2e4131f6280 100644
--- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
+++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index 1891607cda1..f95f30bdc85 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -15,9 +15,6 @@ Hello::op (
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct
       )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ))
 {
   Test::Fls a = {5, 1.0};
   fstruct = a;
@@ -26,7 +23,6 @@ Hello::op (
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index 3d09966e3fc..ffee7b8e0f8 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -19,13 +19,9 @@ public:
     virtual void op (
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index 00ffc6268de..bc61f4e4d56 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index 8c998950dd3..edfe2b98049 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index 70c29c92ddc..15de800ac23 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -32,7 +32,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 void
 Hello::set_callback (Test::CallBack_ptr cb)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n"));
   this->callback_ = Test::CallBack::_duplicate(cb);
@@ -41,7 +40,6 @@ Hello::set_callback (Test::CallBack_ptr cb)
 
 void
 Hello::method (CORBA::Short count)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (++this->count_ > 10)
     {
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index 960867daf74..7171680d945 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void method (CORBA::Short count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void method (CORBA::Short count);
 
-  virtual void set_callback (Test::CallBack_ptr cb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_callback (Test::CallBack_ptr cb);
 
 
 private:
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 1def4e63883..3b196a85a87 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -28,7 +28,6 @@ class Callback_i : public POA_Test::CallBack
 {
 public:
   void method2(void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n"));
   }
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index baa8221e271..1ee92fba8d4 100644
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ b/TAO/tests/Bug_2654_Regression/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Thread_Manager.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
 ACE_RCSID (Hello,
@@ -43,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj =
         orb->resolve_initial_references("RootPOA");
@@ -121,6 +122,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
+      // Wait for threads that may have been started by the Hello
+      // implementation.
+      ACE_Thread_Manager::instance()->wait();
+
       root_poa->destroy (1, 1);
 
       orb->destroy ();
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index 2bab685d7f8..bd003cf51ab 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object_var =
         orb->resolve_initial_references ("RootPOA");
@@ -76,8 +76,13 @@ main (int argc, char *argv[])
       ChildHandler child_handler;
       NonRelatedChildHandler non_related_child_handler;
 
+      PortableServer::ObjectId_var id =
+        poa_var->activate_object (&child_handler);
+
+      CORBA::Object_var object = poa_var->id_to_reference (id.in ());
+
       ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var =
-        child_handler._this ();
+        ChildModule::AMI_ChildInterfaceHandler::_narrow (object.in ());
 
       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)
@@ -89,8 +94,12 @@ main (int argc, char *argv[])
         }
 
       // This handler has no relationship with the above in IDL.
+      id = poa_var->activate_object (&non_related_child_handler);
+
+      object = poa_var->id_to_reference (id.in ());
+
       AMI_ChildInterfaceHandler_var the_non_related_child_handler_var =
-        non_related_child_handler._this ();
+        AMI_ChildInterfaceHandler::_narrow (object.in ());
 
       // Check that both handler objects narrow successfully to their parent
       // handler types...
diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc
index 621b224312e..bd207aa6449 100644
--- a/TAO/tests/Bug_2683_Regression/IORTable.mpc
+++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index 6f3192ee729..fe081bc045c 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -95,7 +95,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(servant);
 
-      Test::IORTable_Shutdown_Race_var target = servant->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::IORTable_Shutdown_Race_var target =
+        Test::IORTable_Shutdown_Race::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (target.in ());
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index 28843cc512f..4b4cdfae441 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -11,14 +11,12 @@ test_i::test_i (ORB_Killer *k)
 
 void
 test_i::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown \n"));
   this->killer_->activate ();
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 8bdf00fe6d6..9cbd85b3468 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -29,11 +29,9 @@ public:
   test_i (ORB_Killer *k);
 
   // = The skeleton methods
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
index c326d7de11f..6f1ead8ecd2 100644
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ b/TAO/tests/Bug_2702_Regression/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
new file mode 100644
index 00000000000..8336a76d8bf
--- /dev/null
+++ b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Client): taoclient {
+
+  Source_Files {
+    client.cpp
+  }
+}
diff --git a/TAO/tests/Bug_2792_Regression/client.cpp b/TAO/tests/Bug_2792_Regression/client.cpp
new file mode 100644
index 00000000000..64df0c1a965
--- /dev/null
+++ b/TAO/tests/Bug_2792_Regression/client.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+#include "tao/ORB_Core.h"
+#include "tao/StringSeqC.h"
+
+ACE_RCSID(Bug_2792_Regression,
+          client,
+          "$Id$")
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      CORBA::StringSeq foo;
+      foo.length (1);
+      foo[0] = "Hello World";
+      const CORBA::StringSeq & bar = foo;
+      ACE_DEBUG ((LM_DEBUG, "String: %s\n", bar[0].in ()));
+      CORBA::String_var mystring = bar[0].in ();
+    }
+  catch (const CORBA::Exception &ex)
+    {
+      ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n"
+      , ex._name(), ex._rep_id ()));
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Bug_2792_Regression/run_test.pl b/TAO/tests/Bug_2792_Regression/run_test.pl
new file mode 100755
index 00000000000..92b78a0b270
--- /dev/null
+++ b/TAO/tests/Bug_2792_Regression/run_test.pl
@@ -0,0 +1,22 @@
+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;
+
+$CL = new PerlACE::Process ("client", "");
+
+$client = $CL->SpawnWaitKill (150);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
new file mode 100644
index 00000000000..8336a76d8bf
--- /dev/null
+++ b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Client): taoclient {
+
+  Source_Files {
+    client.cpp
+  }
+}
diff --git a/TAO/tests/Bug_2795_Regression/client.cpp b/TAO/tests/Bug_2795_Regression/client.cpp
new file mode 100644
index 00000000000..2a7fe98c7f5
--- /dev/null
+++ b/TAO/tests/Bug_2795_Regression/client.cpp
@@ -0,0 +1,57 @@
+// $Id$
+
+#include "tao/ORB_Core.h"
+#include "tao/StringSeqC.h"
+
+ACE_RCSID(Bug_2795_Regression,
+          client,
+          "$Id$")
+
+void
+StringOutTest (CORBA::String_out so)
+{
+  CORBA::String_var sv;
+  sv = "StringOutTest";
+  so = sv._retn ();
+}
+
+void
+StringInoutTest (char *& so)
+{
+  CORBA::string_free (so);
+  so = CORBA::string_dup ("StringInoutTest");
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      CORBA::StringSeq ts;
+      ts.length (1);
+      ts[0] = CORBA::string_dup ("Hello World");
+
+      StringOutTest (ts[0].out());
+      ACE_ASSERT (ACE_OS::strcmp (ts[0].in(), "StringOutTest") == 0);
+
+      StringInoutTest (ts[0].inout());
+      ACE_ASSERT (ACE_OS::strcmp (ts[0].in(), "StringInoutTest") == 0);
+
+      CORBA::String_var sv = ts[0]._retn ();
+      ACE_ASSERT (ACE_OS::strcmp (ts[0].in(), "") == 0);
+
+      ts[0] = CORBA::string_dup ("Hello Again");
+    }
+  catch (const CORBA::Exception &ex)
+    {
+      ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n"
+      , ex._name(), ex._rep_id ()));
+      return 1;
+    }
+
+  return 0;
+
+  return 0;
+}
diff --git a/TAO/tests/Bug_2795_Regression/run_test.pl b/TAO/tests/Bug_2795_Regression/run_test.pl
new file mode 100755
index 00000000000..92b78a0b270
--- /dev/null
+++ b/TAO/tests/Bug_2795_Regression/run_test.pl
@@ -0,0 +1,22 @@
+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;
+
+$CL = new PerlACE::Process ("client", "");
+
+$client = $CL->SpawnWaitKill (150);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
new file mode 100644
index 00000000000..bddd65f8a15
--- /dev/null
+++ b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Server): taoserver {
+  Source_Files {
+    server.cpp
+  }
+}
+
diff --git a/TAO/tests/Bug_2809_Regression/run_test.pl b/TAO/tests/Bug_2809_Regression/run_test.pl
new file mode 100755
index 00000000000..df7ee0e2a80
--- /dev/null
+++ b/TAO/tests/Bug_2809_Regression/run_test.pl
@@ -0,0 +1,29 @@
+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';
+    }
+}
+
+$SV = new PerlACE::Process ("server", "");
+
+$server = $SV->SpawnWaitKill (30);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
+
+exit $status;
diff --git a/TAO/tests/Bug_2809_Regression/server.cpp b/TAO/tests/Bug_2809_Regression/server.cpp
new file mode 100644
index 00000000000..a59a39ad740
--- /dev/null
+++ b/TAO/tests/Bug_2809_Regression/server.cpp
@@ -0,0 +1,45 @@
+// $Id$
+
+#include "tao/corba.h"
+
+int main(int argc, char* argv[])
+{
+  if (TAO_debug_level != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Error, wrong debug level, should be 0\n"), 1);
+    }
+
+  ACE_DEBUG ((LM_INFO, "TAO_debug_level before first ORB_init: %d\n",
+    TAO_debug_level));
+
+  CORBA::ORB_var orb1_ = CORBA::ORB_init(argc, argv, "ServerORB1");
+
+  if (TAO_debug_level != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Error, wrong debug level, should be 0\n"), 1);
+    }
+
+  ACE_DEBUG ((LM_INFO, "TAO_debug_level after first ORB_init: %d\n",
+    TAO_debug_level));
+
+  const char* my_argv[3];
+  my_argv[0] = argv[0];
+  my_argv[1] = "-ORBDebugLevel";
+  my_argv[2] = "10";
+  int my_argc = 3;
+
+  CORBA::ORB_var orb2_ = CORBA::ORB_init(my_argc,
+                                         const_cast<char**> (my_argv),
+                                         "ServerORB2");
+
+  ACE_DEBUG ((LM_INFO, "TAO_debug_level after second ORB_init: %d\n",
+    TAO_debug_level));
+
+  if (TAO_debug_level != 10)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Error, wrong debug level, should be 10\n"), 1);
+    }
+
+  return 0;
+}
+
diff --git a/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
new file mode 100644
index 00000000000..7343f17d4f5
--- /dev/null
+++ b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project(*) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = server
+  Source_Files {
+    bug_2826_regression.cpp
+  }
+}
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
new file mode 100644
index 00000000000..71742bbd4eb
--- /dev/null
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -0,0 +1,168 @@
+// $Id$
+
+#include "tao/ORB_Core.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "fooS.h"
+
+ACE_RCSID (Bug_2826_Regression,
+           bug_2826_regression,
+           "$Id$")
+namespace
+{
+class Foo_i : public virtual POA_foo
+{
+public:
+  virtual void check ()
+  {
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) checking \n"));
+  }
+};
+
+int vc_check(foo_ptr ff, bool active=true)
+{
+  try
+  {
+    CORBA::PolicyList_var policies;
+    CORBA::Boolean rv=ff->_validate_connection (policies.out());
+    if (!rv)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) got false from _validate_connection\n"),
+                          1);
+    }
+  }
+  catch (const CORBA::INV_POLICY&)
+  {
+    if (!active)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) unexpect inlaid policies\n"),
+                              2);
+  }
+  catch (const CORBA::OBJECT_NOT_EXIST&)
+  {
+    if (active)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) unexpect object not exists\n"),
+                              3);
+  }
+  catch (const CORBA::Exception&)
+  {
+    ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) unexpect exception\n"),
+                          4);
+  }
+  return 0;
+}
+}
+
+int main (int argc, char *argv[])
+{
+  CORBA::ORB_var orb;
+  try
+  {
+    orb= CORBA::ORB_init (argc, argv, 0);
+
+    CORBA::Object_var root_poa_o =
+      orb->resolve_initial_references ("RootPOA");
+
+    PortableServer::POA_var rootPOA =
+      PortableServer::POA::_narrow (root_poa_o.in ());
+
+    if (CORBA::is_nil (rootPOA.in ()))
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+        " (%P|%t) Panic: nil RootPOA\n"), 1);
+      }
+
+    PortableServer::POAManager_var poaMgr = rootPOA->the_POAManager ();
+
+    poaMgr->activate ();
+
+    CORBA::PolicyList policies;
+    policies.length (3);
+    policies[0] = rootPOA->create_id_assignment_policy (
+      PortableServer::SYSTEM_ID);
+    policies[1] = rootPOA->create_implicit_activation_policy (
+      PortableServer::NO_IMPLICIT_ACTIVATION);
+    policies[2] = rootPOA->create_lifespan_policy (
+      PortableServer::TRANSIENT);
+
+    PortableServer::POA_var fooPoa = rootPOA->create_POA (
+      "FOO_POA", poaMgr.in (), policies );
+
+    for (CORBA::ULong i = 0; i < policies.length (); ++i)
+    {
+      policies[i]->destroy ();
+    }
+
+    Foo_i servant;
+    PortableServer::ObjectId_var oid = fooPoa->activate_object( &servant );
+
+    CORBA::Object_var obj = fooPoa->id_to_reference (oid.in ());
+
+    foo_var client = foo::_narrow (obj.in());
+
+    client->check();
+
+    if (vc_check(client.in()))
+    {
+      orb->destroy();
+      return 1;
+    }
+
+    fooPoa->deactivate_object (oid.in () );  //servant is gone
+
+    if (vc_check(client.in(), false))  //exception expected
+    {
+      orb->destroy();
+      return 2;
+    }
+  }
+  catch(...)
+  {
+    return 3;
+  }
+  return 0;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TAO/tests/Bug_2826_Regression/foo.idl b/TAO/tests/Bug_2826_Regression/foo.idl
new file mode 100644
index 00000000000..7ad6dd968c5
--- /dev/null
+++ b/TAO/tests/Bug_2826_Regression/foo.idl
@@ -0,0 +1,6 @@
+// $Id$
+
+interface foo
+{
+    void check();
+};
diff --git a/TAO/tests/Bug_2826_Regression/run_test.pl b/TAO/tests/Bug_2826_Regression/run_test.pl
new file mode 100755
index 00000000000..198df68c1dd
--- /dev/null
+++ b/TAO/tests/Bug_2826_Regression/run_test.pl
@@ -0,0 +1,31 @@
+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()) {
+    $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+    $SV = new PerlACE::Process ("server");
+}
+
+$SV->Spawn ();
+
+$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/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index dfbae63cc44..5f0acd3c5a5 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -187,7 +187,8 @@ main (int argc, char *argv[])
       ACE_hrtime_t usecs = tv.sec ();
       usecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       usecs += tv.usec ();
-      double average = ACE_HRTIME_CONVERSION(usecs) / repeat;
+      double average =
+        static_cast<double> (ACE_HRTIME_CONVERSION(usecs)) / repeat;
 
       if (!quiet)
         ACE_OS::printf ("AVE: %d %f\n",
diff --git a/TAO/tests/COIOP/COIOP_Simple_Test.cpp b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
new file mode 100644
index 00000000000..e3c1cecba77
--- /dev/null
+++ b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
@@ -0,0 +1,96 @@
+//$Id$
+#include "ace/Get_Opt.h"
+#include "Hello.h"
+#include "tao/Strategies/advanced_resource.h"
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Before creating ORB\n"));
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      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 ();
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in (),
+                             0),
+                      1);
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activating servant\n"));
+
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello =
+        Test::Hello::_narrow (object.in ());
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activating POA Manager\n"));
+
+      poa_manager->activate ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activated POA Manager\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Doing direct call\n"));
+
+      CORBA::String_var the_string_d =
+        hello->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+        the_string_d.in ()));
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Object to string\n"));
+
+     CORBA::String_var ior =
+       orb->object_to_string (hello.in ());
+
+      CORBA::Object_var tmp =
+        orb->string_to_object (ior.in ());
+
+      Test::Hello_var hello_ref =
+        Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello_ref.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior.in ()),
+                             1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Going to call method\n"));
+
+      CORBA::String_var the_string =
+        hello_ref->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+        the_string.in ()));
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception&)
+    {
+      // Ignore exceptions..
+    }
+  return 0;
+}
diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp
index 9c9413a1b62..a658fe75ebf 100644
--- a/TAO/tests/COIOP/COIOP_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Test.cpp
@@ -5,6 +5,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 #include "ace/Manual_Event.h"
+#include "tao/Strategies/advanced_resource.h"
 
 const char *output = "test.ior";
 const char *input = "file://test.ior";
diff --git a/TAO/tests/COIOP/COIOP_Tests.mpc b/TAO/tests/COIOP/COIOP_Tests.mpc
index e1f228fad83..0e20ade2b85 100644
--- a/TAO/tests/COIOP/COIOP_Tests.mpc
+++ b/TAO/tests/COIOP/COIOP_Tests.mpc
@@ -1,6 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project(COIOP_Tests): taoserver, strategies {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(COIOP_Test): taoserver, strategies {
   exename = COIOP_Test
+  after += *idl
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+    COIOP_Test.cpp
+    Client_Task.cpp
+    Server_Task.cpp
+    Hello.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(COIOP_Simple_Test): taoserver, strategies {
+  exename = COIOP_Simple_Test
+  after += *idl
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+    COIOP_Simple_Test.cpp
+    Hello.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index d7339a7eb0b..9cfd6c265c9 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -17,7 +17,6 @@ ACE_RCSID(Hello, Hello, "$Id$")
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -60,7 +59,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  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
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 63b4ec180be..556409e5d00 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -20,11 +20,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index 2eb03ea7e1f..e1ff038addc 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -42,7 +42,7 @@ Server_Task::svc (void)
      PortableServer::POAManager_var poa_manager =
        root_poa->the_POAManager ();
 
-     Hello *hello_impl;
+     Hello *hello_impl = 0;
      ACE_NEW_RETURN (hello_impl,
                      Hello (this->sorb_.in (),
                             ACE_Thread::self ()),
@@ -50,8 +50,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
diff --git a/TAO/tests/COIOP/run_test.pl b/TAO/tests/COIOP/run_test.pl
index 98605585458..4619fc0f26f 100755
--- a/TAO/tests/COIOP/run_test.pl
+++ b/TAO/tests/COIOP/run_test.pl
@@ -70,7 +70,7 @@ if ($sv != 0) {
 unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation no");
 $sv = $SV->SpawnWaitKill (60);
 
 if ($sv != 0) {
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
new file mode 100644
index 00000000000..85905a99a88
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id$
+
+project: taoserver {
+}
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
new file mode 100644
index 00000000000..bd54904034f
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
@@ -0,0 +1,10 @@
+//
+// $Id$
+//
+#include "Hello.h"
+
+ACE_RCSID(Hello, Hello, "$Id$")
+
+Hello::Hello (void)
+{
+}
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
new file mode 100644
index 00000000000..b9a328eeb34
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
@@ -0,0 +1,21 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello (void);
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Test.idl b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl
new file mode 100644
index 00000000000..57ce97b7e5c
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl
@@ -0,0 +1,12 @@
+//
+// $Id$
+//
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+  };
+};
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl b/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl
new file mode 100755
index 00000000000..7e700a141e8
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl
@@ -0,0 +1,34 @@
+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()) {
+    $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+    $SV = new PerlACE::Process ("server");
+}
+    
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
+
+$server = $SV->WaitKill (10);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
new file mode 100644
index 00000000000..524ff30f63f
--- /dev/null
+++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
@@ -0,0 +1,55 @@
+// $Id$
+
+#include "Hello.h"
+#include "ace/OS_NS_stdio.h"
+
+ACE_RCSID (Hello,
+           server,
+           "$Id$")
+
+int
+main (int argc, char *argv[])
+{
+  int status = 1;
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      Test::Hello_var hello = hello_impl->_this ();
+
+      ACE_ERROR ((LM_ERROR,
+                  "ERROR: Implicit activation should have "
+                  "thrown an exception with CORBA e compact.\n"));
+
+      root_poa->destroy (1, 1);
+      orb->destroy ();
+    }
+  catch (const CORBA::INV_POLICY&)
+    {
+      ACE_DEBUG ((LM_DEBUG, "This test passes.\n"));
+      status = 0;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+    }
+
+  return status;
+}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index 8ad2666efe5..2cddb374de7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -37,7 +37,7 @@ AppHelper::create_poa(const char*                    name,
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to create child POA: %s.\n", name));
-      ACE_THROW_RETURN (TestAppException(), PortableServer::POA::_nil ());
+      throw TestAppException();
     }
 
   return child_poa._retn();
@@ -59,7 +59,7 @@ AppHelper::activate_servant(PortableServer::POA_ptr poa,
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to convert servant_to_ref.\n"));
-      ACE_THROW_RETURN (TestAppException(), CORBA::Object::_nil ());
+      throw TestAppException();
     }
 
   return obj._retn();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 70d58382e05..b94f5605d23 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -25,7 +25,7 @@ struct RefHelper
       {
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     T_var t_obj = T::_narrow(obj.in());
@@ -34,7 +34,7 @@ struct RefHelper
       {
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to narrow obj ref to T interface.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     return t_obj._retn();
@@ -51,7 +51,7 @@ struct RefHelper
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to resolve initial ref for '%s'.\n",
                    name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     T_var t_obj = T::_narrow(obj.in());
@@ -62,7 +62,7 @@ struct RefHelper
         ACE_ERROR((LM_ERROR,
                    "(%P|%t) Failed to narrow resolved initial ref '%s'.\n",
                    name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
+        throw TestAppException();
       }
 
     return t_obj._retn();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index 1c0399091fd..a7ca8835ecc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -19,7 +19,6 @@ Foo_A_i::~Foo_A_i()
 
 void
 Foo_A_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0] ++;
 }
@@ -27,7 +26,6 @@ Foo_A_i::op1(void)
 
 void
 Foo_A_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[1].push_back (value);
   this->op_count_[1] ++;
@@ -36,7 +34,6 @@ Foo_A_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_A_i::op3(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[2].push_back (value);
   this->op_count_[2] ++;
@@ -46,7 +43,6 @@ Foo_A_i::op3(CORBA::Long value)
 
 void
 Foo_A_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[3].push_back (value);
   this->op_count_[3] ++;
@@ -55,7 +51,6 @@ Foo_A_i::op4(CORBA::Long value)
 
 void
 Foo_A_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -64,7 +59,6 @@ Foo_A_i::op5(void)
 
 void
 Foo_A_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index b55ee063666..16a53f60ddf 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -14,23 +14,17 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
     Foo_A_i();
     virtual ~Foo_A_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(CORBA::Long value);
 
-    virtual void op4(CORBA::Long value)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
     void gather_stats (Foo_A_Statistics& stats) ;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index d48f56fc505..31b0d120dae 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -14,7 +14,6 @@ Callback_i::~Callback_i ()
 
 void
 Callback_i::test_method(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->num_callbacks_ ++;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index 86afee9b4f7..cb9b851c68e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -16,8 +16,7 @@ class CSD_TP_Foo_B_Export Callback_i
 
     virtual ~Callback_i();
 
-    virtual void test_method(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_method(void);
 
     void gather_stats(Foo_B_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 0870febeb3c..730d8f2e922 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -23,7 +23,6 @@ Foo_B_i::~Foo_B_i()
 
 void
 Foo_B_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0] ++;
 }
@@ -31,7 +30,6 @@ Foo_B_i::op1(void)
 
 void
 Foo_B_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[1] ++;
   this->in_long_[1].push_back (value);
@@ -40,7 +38,6 @@ Foo_B_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_B_i::op3(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[2] ++;
   this->in_long_[2].push_back (value);
@@ -50,7 +47,6 @@ Foo_B_i::op3(CORBA::Long value)
 
 void
 Foo_B_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[3] ++;
   this->in_long_[3].push_back (value);
@@ -59,7 +55,6 @@ Foo_B_i::op4(CORBA::Long value)
 
 void
 Foo_B_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -69,7 +64,6 @@ Foo_B_i::op5(void)
 CORBA::Boolean
 Foo_B_i::op6(const TimeOfDay& t,
              char*& message)
-                        ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[5] ++;
   char buf [20];
@@ -83,8 +77,6 @@ Foo_B_i::op6(const TimeOfDay& t,
 
 void
 Foo_B_i::op7(Callback_ptr cb)
-  ACE_THROW_SPEC((CORBA::SystemException,
-                  FooException))
 {
   this->op_count_[6] ++;
 
@@ -104,7 +96,6 @@ Foo_B_i::op7(Callback_ptr cb)
 
 void
 Foo_B_i::test_unbounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[7] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ")
@@ -116,7 +107,6 @@ Foo_B_i::test_unbounded_string_arg(const char* message)
 
 void
 Foo_B_i::test_bounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[8] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ")
@@ -128,7 +118,6 @@ Foo_B_i::test_bounded_string_arg(const char* message)
 
 void
 Foo_B_i::test_fixed_array_arg(const Fixed_Array message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[9] ++;
 
@@ -155,7 +144,6 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message)
 
 void
 Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[10] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ")
@@ -167,7 +155,6 @@ Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message)
 
 void
 Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[11] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_var_size_arg ")
@@ -179,7 +166,6 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message)
 
 void
 Foo_B_i::test_fixed_size_arg(const TimeOfDay& t)
-                           ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(t);
 
@@ -192,7 +178,6 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t)
 
 void
 Foo_B_i::test_var_array_arg(const Var_Array messages)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[13] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
@@ -236,7 +221,6 @@ Foo_B_i::test_var_array_arg(const Var_Array messages)
 void
 Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
                                 CORBA::Long client_id)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[14] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ")
@@ -255,7 +239,6 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
 
 void
 Foo_B_i::test_objref_arg(Callback_ptr cb)
-                            ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(cb);
   this->op_count_[15] ++;
@@ -266,7 +249,6 @@ Foo_B_i::test_objref_arg(Callback_ptr cb)
 
 void
 Foo_B_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 56d8109ed78..1a0367a27e7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -14,59 +14,41 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
     Foo_B_i();
     virtual ~Foo_B_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(CORBA::Long value)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(CORBA::Long value);
 
-    virtual void op4(CORBA::Long value)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
     virtual CORBA::Boolean op6(const TimeOfDay& t,
-                               char*& message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+                               char*& message);
 
-    virtual void op7(Callback_ptr cb)
-                                    ACE_THROW_SPEC((CORBA::SystemException,
-                                                    FooException));
+    virtual void op7(Callback_ptr cb);
 
-    virtual void test_unbounded_string_arg(const char* message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_unbounded_string_arg(const char* message);
 
-    virtual void test_bounded_string_arg(const char* message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_bounded_string_arg(const char* message);
 
-    virtual void test_fixed_array_arg(const Fixed_Array message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_fixed_array_arg(const Fixed_Array message);
 
-    virtual void test_var_array_arg(const Var_Array messages)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_var_array_arg(const Var_Array messages);
 
-    virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message);
 
-    virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message);
 
-    virtual void test_fixed_size_arg(const TimeOfDay& t)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_fixed_size_arg(const TimeOfDay& t);
 
     virtual void test_special_basic_arg(CORBA::Boolean value,
-                                        CORBA::Long client_id)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+                                        CORBA::Long client_id);
 
-    virtual void test_objref_arg(Callback_ptr cb)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void test_objref_arg(Callback_ptr cb);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
     void gather_stats (Foo_B_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 7c65455a471..7e009e52230 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -44,7 +44,7 @@ Foo_C_cust_op3::result(void)
 {
   if (this->cancelled_)
     {
-      ACE_THROW_RETURN (CancelledException(), -1);
+      throw CancelledException();
     }
 
   return this->result_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index b15bee24580..d9e11bfad32 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -20,7 +20,6 @@ Foo_C_i::~Foo_C_i()
 
 void
 Foo_C_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_[0];
 }
@@ -28,7 +27,6 @@ Foo_C_i::op1(void)
 
 void
 Foo_C_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[1].push_back (value);
   ++this->count_[1];
@@ -37,7 +35,6 @@ Foo_C_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_C_i::op3(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[2].push_back (value);
   ++this->count_[2];
@@ -47,7 +44,6 @@ Foo_C_i::op3(CORBA::Long value)
 
 void
 Foo_C_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[3].push_back (value);
   ++this->count_[3];
@@ -56,7 +52,6 @@ Foo_C_i::op4(CORBA::Long value)
 
 void
 Foo_C_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_[4];
   throw FooException();
@@ -65,7 +60,6 @@ Foo_C_i::op5(void)
 
 void
 Foo_C_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index d804d58ba00..6262bce85dd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -14,24 +14,17 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
     Foo_C_i();
     virtual ~Foo_C_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(CORBA::Long value)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(CORBA::Long value);
 
-    virtual void op4(CORBA::Long value)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-                                  ACE_THROW_SPEC((CORBA::SystemException,
-                                                  FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
     void cust_op1(void);
     void cust_op2(long value);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index 3bb0a772b76..df5dc90d3d9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index 9f58a01ac0f..c0179ea8b59 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 02ce72b434d..4b6969dfb8e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 9e3a806413a..899a542fef2 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 309a24676b8..e574f52ba2f 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -15,7 +15,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
     {
@@ -28,7 +27,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 375b3e676ff..5269afe6e34 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index 1ffed9e75a4..30c53df4407 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp
index 60c5e152398..f233dd2b229 100644
--- a/TAO/tests/CallbackTest/Callback.cpp
+++ b/TAO/tests/CallbackTest/Callback.cpp
@@ -12,7 +12,6 @@ Callback::Callback (CORBA::ORB_ptr orb)
 
 CORBA::Boolean
 Callback::are_you_there (CORBA::String_out answer)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - we are here!\n"));
@@ -24,7 +23,6 @@ Callback::are_you_there (CORBA::String_out answer)
 
 void
 Callback::test_oneway (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - test_oneway!\n"));
@@ -32,7 +30,6 @@ Callback::test_oneway (void)
 
 void
 Callback::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - shutdown!\n"));
diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h
index cc0e453bcc1..98b92c1bb72 100644
--- a/TAO/tests/CallbackTest/Callback.h
+++ b/TAO/tests/CallbackTest/Callback.h
@@ -17,14 +17,11 @@ public:
   Callback (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (CORBA::String_out answer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean are_you_there (CORBA::String_out answer);
 
-  virtual void test_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_oneway (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 private:
   /// Use an ORB reference to shutdown the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 186510c1f55..2bd74f5ef3a 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, portableserver, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Callback.cpp
     client.cpp
diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp
index f1d7494b043..c8563ef6ad7 100644
--- a/TAO/tests/CallbackTest/Service.cpp
+++ b/TAO/tests/CallbackTest/Service.cpp
@@ -23,7 +23,6 @@ Service::dump_results (void)
 
 void
 Service::run_test (Test::Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int exceptions =
     this->call_are_you_there (callback);
@@ -56,7 +55,6 @@ Service::run_test (Test::Callback_ptr callback)
 
 int
 Service::call_are_you_there (Test::Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
   const int iterations = 10;
@@ -82,7 +80,6 @@ Service::call_are_you_there (Test::Callback_ptr callback)
 
 int
 Service::call_test_oneway (Test::Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
   const int iterations = 10;
diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h
index a3b5f905c89..b0fe219d517 100644
--- a/TAO/tests/CallbackTest/Service.h
+++ b/TAO/tests/CallbackTest/Service.h
@@ -23,23 +23,20 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void run_test (Test::Callback_ptr callback);
 
 private:
   /// Call the are_you_there callback multiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_are_you_there (Test::Callback_ptr callback);
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_test_oneway (Test::Callback_ptr callback);
 
 private:
   /// Count the number of tests executed
diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index 35f36497bd8..3ca4ceb70e8 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -104,8 +104,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (callback_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Callback_var callback =
-        callback_impl->_this ();
+        Test::Callback::_narrow (object.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 4017a6a9d42..f58148f9669 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -91,8 +91,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (service_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Service_var service =
-        service_impl->_this ();
+        Test::Service::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (service.in ());
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index 87611da09ef..b261a907e44 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -11,29 +11,24 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     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 {
   }
 }
@@ -43,12 +38,10 @@ project(*Child): taoserver {
   after += *idl
   after += *Client
   Source_Files {
-    Process.cpp
-    child.cpp
-  }
-  Source_Files {
     TestC.cpp
     TestS.cpp
+    Process.cpp
+    child.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 9985fcfdfe0..8b6d7257784 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -13,14 +13,12 @@ Process::Process (CORBA::ORB_ptr orb)
 
 CORBA::Long
 Process::get_process_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ACE_OS::getpid ();
 }
 
 void
 Process::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index 66e56de62de..dab625cabb5 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -17,11 +17,9 @@ public:
   Process (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long get_process_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get_process_id (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index e4ab9cf4544..ff13de5c6c5 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -21,7 +21,6 @@ Process_Factory::shutdown_received (void)
 
 Test::Process_ptr
 Process_Factory::create_new_process (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
 {
   Startup_Callback *startup_callback_impl;
   ACE_NEW_THROW_EX (startup_callback_impl,
@@ -30,8 +29,19 @@ Process_Factory::create_new_process (void)
 
   PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
 
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (startup_callback_impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
   Test::Startup_Callback_var startup_callback =
-    startup_callback_impl->_this ();
+    Test::Startup_Callback::_narrow (object.in ());
 
   CORBA::String_var ior =
     this->orb_->object_to_string (startup_callback.in ());
@@ -57,7 +67,7 @@ Process_Factory::create_new_process (void)
                   "(%P|%t) Process_Factory::create_new_process, "
                   " spawn call failed (%d)\n",
                   errno));
-      ACE_THROW_RETURN (Test::Spawn_Failed (), Test::Process::_nil ());
+      throw Test::Spawn_Failed ();
     }
 
   int process_has_started = 0;
@@ -89,7 +99,7 @@ Process_Factory::create_new_process (void)
                   "(%P|%t) Process_Factory::create_new_process, "
                   " timeout while waiting for child\n"));
       (void) child_process.terminate ();
-      ACE_THROW_RETURN (Test::Spawn_Failed (), Test::Process::_nil ());
+      throw Test::Spawn_Failed ();
     }
 
   return the_process._retn ();
@@ -97,13 +107,11 @@ Process_Factory::create_new_process (void)
 
 void
 Process_Factory::noop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Process_Factory::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown_received_ = 1;
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index 2aee99b70cf..2131b6a37cf 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -20,14 +20,11 @@ public:
   int shutdown_received (void);
 
   // = The skeleton methods
-  virtual Test::Process_ptr create_new_process (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed));
+  virtual Test::Process_ptr create_new_process (void);
 
-  virtual void noop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void noop (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index ea0b6043c97..341c89ead6e 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -23,7 +23,6 @@ Startup_Callback::process_has_started (Test::Process_out the_process)
 
 void
 Startup_Callback::started (Test::Process_ptr process)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->process_ = Test::Process::_duplicate (process);
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index e8207cc846e..9278b235cc2 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -24,8 +24,7 @@ public:
   int process_has_started (Test::Process_out the_process);
 
   // = The skeleton methods
-  virtual void started (Test::Process_ptr the_process)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void started (Test::Process_ptr the_process);
 
 private:
   /// Synchronize changes to the internal data
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index ac9d588886b..100b0b6ad4d 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -11,7 +11,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (argc < 2)
         {
@@ -55,8 +55,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(process_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (process_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Process_var process =
-        process_impl->_this ();
+        Test::Process::_narrow (object_act.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index b4f3cf3468b..05934f0336b 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index d8f43ee9cc9..8c978062415 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(process_factory_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (process_factory_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Process_Factory_var process =
-        process_factory_impl->_this ();
+        Test::Process_Factory::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (process.in ());
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 6dac99613f4..41daa57f1be 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -10,7 +10,6 @@ project(*idl): taoidldefaults {
 
 project(*client) : taoclient, anytypecode {
   after += *idl
-  after += *server
 
   Source_Files {
     client.cpp
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 00d26a6b55a..b405e62d53b 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -39,7 +39,6 @@ public:
   char * op1 (const char * name,
               const CORBA::Any & inany,
               CORBA::Any_out outany)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Server: bare string: %s\n", name));
@@ -59,13 +58,11 @@ public:
   };
 
   ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::wstring_dup (s1);
   };
 
   void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->orb_->shutdown (0);
   };
@@ -116,7 +113,12 @@ int main(int argc, char *argv[])
                       -1);
 
       // Create CORBA object for servant and REGISTER with POA
-      simple_var server = my_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (my_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      simple_var server = simple::_narrow (object_act.in ());
 
       // Get the IOR for our object
       CORBA::String_var ior = orb->object_to_string (server.in ());
diff --git a/TAO/tests/Codec/run_test.pl b/TAO/tests/Codec/run_test.pl
index e38457ac605..35f1fec05f4 100755
--- a/TAO/tests/Codec/run_test.pl
+++ b/TAO/tests/Codec/run_test.pl
@@ -17,7 +17,7 @@ else {
     $T = new PerlACE::Process ("client");
 }
 
-$test = $T->SpawnWaitKill (15);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: Codec test returned $test\n";
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 0a9a1a942a7..b34b119a72d 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -31,7 +31,7 @@ int
 Collocation_Test::init (int argc, char *argv[])
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   int result = this->parse_args (argc, argv);
   if (result != 0)
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 1aed52ccf2f..0200835d0a8 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -14,9 +14,6 @@ Top_i::~Top_i ()
 
 char *
 Top_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a point.");
 }
@@ -33,18 +30,12 @@ Left_i::~Left_i ()
 
 char *
 Left_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
 Left_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("black");
 }
@@ -61,18 +52,12 @@ Right_i::~Right_i ()
 
 char *
 Right_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
 Right_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("red");
   //
@@ -80,9 +65,6 @@ Right_i::color (void)
 
 CORBA::Long
 Right_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 0;
 }
@@ -99,36 +81,24 @@ Buttom_i::~Buttom_i ()
 
 char *
 Buttom_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
 Buttom_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
 Buttom_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 100;
 }
 
 char *
 Buttom_i::name (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index e57cf1a6468..d8801332823 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,8 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 };
 
@@ -29,12 +28,10 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 };
 
@@ -45,16 +42,13 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 };
 
@@ -65,20 +59,16 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/Collocation/run_test.pl b/TAO/tests/Collocation/run_test.pl
index 4257cc453e8..cf072cd7bd3 100755
--- a/TAO/tests/Collocation/run_test.pl
+++ b/TAO/tests/Collocation/run_test.pl
@@ -20,7 +20,7 @@ else {
 }
 
 
-$server = $SV->SpawnWaitKill (60);
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: Collocation returned $server \n";
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index 3af6cb1216a..d6b4e4a5dad 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -42,7 +42,7 @@ class B_i : public virtual POA_C
 {
 public:
   virtual A_ptr
-  makeA () ACE_THROW_SPEC ((CORBA::SystemException))
+  makeA ()
   {
     PortableServer::ServantBase_var servant = new A_i;
     g_pPoa->activate_object (servant.in());
@@ -65,7 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_Thread_Manager threads;
 
       // Normal corba init
-      g_pOrb = CORBA::ORB_init (argc, argv, "");
+      g_pOrb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var pPoaObj =
         g_pOrb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index c21e466fec7..7c69b11474e 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -20,15 +20,13 @@ class SimpleNamingService_i : public virtual POA_SimpleNamingService
 {
 public:
 
-  virtual void
-  bind (CORBA::Object_ptr obj) ACE_THROW_SPEC ((CORBA::SystemException))
+  virtual void bind (CORBA::Object_ptr obj)
   {
     obj_ = CORBA::Object::_duplicate (obj);
   }
 
 
-  virtual CORBA::Object_ptr
-  resolve () ACE_THROW_SPEC ((CORBA::SystemException))
+  virtual CORBA::Object_ptr resolve ()
   {
     return CORBA::Object::_duplicate (obj_.in ());
   }
@@ -44,7 +42,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var pPoaObj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
index a88f7def836..c272d6a800f 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -65,9 +65,18 @@ Client_Task::test_user_exception_not_expected (
     {
       hello_ptr->user_exception_not_expected ();
     }
-  catch (const CORBA::UNKNOWN& )
+  catch (const CORBA::UNKNOWN& ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught unknown exception as expected\n"));
+      if ((ex.minor() & 0xFFFU) == 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught unknown exception as expected\n"));
+        }
+      else
+        {
+          ex._tao_print_exception (
+            "Unexpected exception caught in user_exception_not_expected:");
+          throw;
+        }
       // ignore
     }
   catch (const CORBA::Exception& ex)
@@ -83,11 +92,9 @@ Client_Task::svc (void)
 {
   try
     {
-      CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_);
+      CORBA::Object_var tmp = this->corb_->string_to_object (input_);
 
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in ());
+      Test::Hello_var hello = Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -97,8 +104,7 @@ Client_Task::svc (void)
                              1);
         }
 
-      CORBA::String_var the_string =
-        hello->get_string ();
+      CORBA::String_var the_string = hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
 		  the_string.in ()));
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index 4d91591ca64..2362176f053 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -16,21 +16,18 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
 
 void
 Hello::system_exception_test (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::INTERNAL ();
 }
 
 void
 Hello::user_exception_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
   throw ::Test::Hello::A ();
 }
 
 void
 Hello::user_exception_not_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
   this->throw_internal_b ();
 }
@@ -43,7 +40,6 @@ Hello::throw_internal_b (void)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -86,7 +82,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index bb4f2265ec4..3fef01855b0 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -25,20 +25,15 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void system_exception_test (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void system_exception_test (void);
 
-  virtual void user_exception_expected (void)
-      ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
+  virtual void user_exception_expected (void);
 
-  virtual void user_exception_not_expected (void)
-      ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
+  virtual void user_exception_not_expected (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   void throw_internal_b (void);
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index c6e578fa422..ed01435ce1d 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -42,7 +42,7 @@ Server_Task::svc (void)
      PortableServer::POAManager_var poa_manager =
        root_poa->the_POAManager ();
 
-     Hello *hello_impl;
+     Hello *hello_impl = 0;
      ACE_NEW_RETURN (hello_impl,
                      Hello (this->sorb_.in (),
                             ACE_Thread::self ()),
@@ -50,8 +50,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
diff --git a/TAO/tests/Collocation_Exception_Test/run_test.pl b/TAO/tests/Collocation_Exception_Test/run_test.pl
index 8267ef42988..c4f74025e5d 100755
--- a/TAO/tests/Collocation_Exception_Test/run_test.pl
+++ b/TAO/tests/Collocation_Exception_Test/run_test.pl
@@ -21,7 +21,7 @@ else {
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Exception_Test\n";
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index 8eb26a89ec3..6a3b92b19eb 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -16,7 +16,6 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
 
 void
 Hello::onewayTest (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) onewayTest() Upcall in process ..\n"));
@@ -26,7 +25,6 @@ Hello::onewayTest (void)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -69,7 +67,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index 6ac1109f422..8bc4edf7d76 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -25,14 +25,11 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void onewayTest (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void onewayTest (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index c6e578fa422..fbbedfd2aa8 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -50,8 +50,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
diff --git a/TAO/tests/Collocation_Oneway_Tests/run_test.pl b/TAO/tests/Collocation_Oneway_Tests/run_test.pl
index 61a15200523..8a9bdcfa325 100755
--- a/TAO/tests/Collocation_Oneway_Tests/run_test.pl
+++ b/TAO/tests/Collocation_Oneway_Tests/run_test.pl
@@ -21,7 +21,7 @@ else {
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -m none ");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
@@ -31,7 +31,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -m transport");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
@@ -41,7 +41,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -m server");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
@@ -51,7 +51,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -m target");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocation_Oneway_Test\n";
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 94fcf1589b7..e029b7e08e7 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -18,8 +18,7 @@ public:
 
   void set_other (test_ptr test);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -54,7 +53,6 @@ test_i::set_other (test_ptr test)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->other_.in () != test::_nil ())
     {
@@ -176,8 +174,13 @@ main (int argc, char *argv[])
       child_poa->activate_object_with_id (base_oid.in (),
                                           base_servant);
 
+      PortableServer::ObjectId_var id_act =
+        root_poa->activate_object (base_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id_act.in ());
+
       test_var base_test =
-        base_servant->_this ();
+        test::_narrow (object_act.in ());
 
       test_i *first_servant =
         new test_i (orb.in (),
@@ -191,8 +194,13 @@ main (int argc, char *argv[])
       child_poa->activate_object_with_id (first_oid.in (),
                                           first_servant);
 
+      PortableServer::ObjectId_var id_actu =
+        root_poa->activate_object (first_servant);
+
+      object_act = root_poa->id_to_reference (id_actu.in ());
+
       test_var first_test =
-        first_servant->_this ();
+        test::_narrow (object_act.in ());
 
       base_servant->set_other (first_test.in ());
 
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index fb956dded83..aee38a6676c 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -16,7 +16,6 @@ ACE_RCSID(Hello, Hello, "$Id$")
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -59,7 +58,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  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
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 63b4ec180be..556409e5d00 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -20,11 +20,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 47c69723633..577e4bcc897 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -50,8 +50,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
diff --git a/TAO/tests/Collocation_Tests/run_test.pl b/TAO/tests/Collocation_Tests/run_test.pl
index 2361b7d21ed..addbc1cb9cb 100755
--- a/TAO/tests/Collocation_Tests/run_test.pl
+++ b/TAO/tests/Collocation_Tests/run_test.pl
@@ -21,7 +21,7 @@ else {
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -31,7 +31,7 @@ unlink $iorfile;
 
 print STDERR "======== Running with per-orb \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -41,7 +41,7 @@ unlink $iorfile;
 
 print STDERR "======== Running with no collocation \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation no");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -51,7 +51,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in default mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n ");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -61,7 +61,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in per-orb mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -70,8 +70,8 @@ if ($sv != 0) {
 unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (60);
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation no");
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp
index 5a80b3d0b2d..ee708063a95 100644
--- a/TAO/tests/Compression/server.cpp
+++ b/TAO/tests/Compression/server.cpp
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var compression_manager =
         orb->resolve_initial_references("CompressionManager");
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 9e3a806413a..899a542fef2 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp
index 924779e1619..eabcfbe8db7 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.cpp
+++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp
@@ -13,14 +13,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 1d974b34168..43e51f6f2fe 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index 4f8227d7664..e774ea9c9a6 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index 92d78104359..3f008044d8d 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var tmp =
         orb->string_to_object (ior);
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index c0bd6da0fde..5a45cca020f 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, taoserver {
 
 project(*Client): strategies, taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 1762358939a..c2bc36d4571 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl
index 92930236d81..5dafb7577ef 100755
--- a/TAO/tests/Connection_Purging/run_test.pl
+++ b/TAO/tests/Connection_Purging/run_test.pl
@@ -49,7 +49,7 @@ for($i = 0; $i < $server_count; $i++) {
   $SV[$i] = new PerlACE::Process ("server", "$endpoint -o $iorfile.$i");
   $SV[$i]->Spawn ();
 
-  if (PerlACE::waitforfile_timed ("$iorfile.$i", 10) == -1) {
+  if (PerlACE::waitforfile_timed ("$iorfile.$i", $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile.$i>\n";
     $SV[$i]->Kill (); $SV[$i]->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 2c3fffcf73a..5638984749d 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -63,8 +63,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var test =
-        test_impl->_this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp
index de59e99593c..7d4cee20e12 100644
--- a/TAO/tests/Connection_Purging/test_i.cpp
+++ b/TAO/tests/Connection_Purging/test_i.cpp
@@ -5,7 +5,6 @@
 
 void
 test_i::send_stuff (const char* string)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
 }
diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index bebd408b2d0..4b12aa9e33c 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.h
@@ -13,8 +13,7 @@ class test_i
 {
 public:
   // = The skeleton methods
-  virtual void send_stuff (const char* string)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_stuff (const char* string);
 
 private:
 };
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 8f22c8a14c6..13886b7539c 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index ce52c6776dc..278271d77ca 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index ea9818cc706..8b7f4f4119a 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -11,6 +11,5 @@ Oneway_Receiver::Oneway_Receiver (void)
 
 void
 Oneway_Receiver::receive_oneway (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index 167206a943b..141636d9361 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -17,8 +17,7 @@ public:
   Oneway_Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_oneway (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index dc438124b4f..bf78ab1a7e2 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -62,7 +62,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Crash_On_Write/run_test.pl b/TAO/tests/Crash_On_Write/run_test.pl
index 9c81ed556ca..2918af4c494 100755
--- a/TAO/tests/Crash_On_Write/run_test.pl
+++ b/TAO/tests/Crash_On_Write/run_test.pl
@@ -24,7 +24,7 @@ if (PerlACE::waitforfile_timed ($iorfile,
     exit 1;
 } 
 
-$client = $CL->SpawnWaitKill (60);
+$client = $CL->SpawnWaitKill (180);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
@@ -35,7 +35,7 @@ if ($client != 0) {
 # but a status of -1 would be a serious error.
 $server = $SV->WaitKill (60);
 
-if ($server == -10) {
+if ($server == -1) {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
 }
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 09818cff227..5192c92a3db 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (oneway_receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this ();
+        Test::Oneway_Receiver::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (oneway_receiver.in ());
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index 5d96a31ec01..80580ae7033 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -11,14 +11,12 @@ Crashed_Callback::Crashed_Callback (void)
 
 CORBA::Boolean
 Crashed_Callback::are_you_there (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
 Crashed_Callback::crash_now_please (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application \n"));
@@ -35,6 +33,5 @@ Crashed_Callback::crash_now_please (void)
 
 void
 Crashed_Callback::test_oneway (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index 3efa13bd774..e8a17b21832 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -17,14 +17,11 @@ public:
   Crashed_Callback (void);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean are_you_there (void);
 
-  virtual void crash_now_please (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void crash_now_please (void);
 
-  virtual void test_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_oneway (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index fb46b04e3df..f628c6296ee 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, portableserver, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index d6a33d93d7a..04fb261c1b2 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -22,7 +22,6 @@ Service::dump_results (void)
 
 void
 Service::run_test (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int pre_crash_exceptions =
     this->call_are_you_there (callback);
@@ -65,7 +64,6 @@ Service::run_test (Test::Crashed_Callback_ptr callback)
 
 int
 Service::call_are_you_there (Test::Crashed_Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
   const int iterations = 50;
@@ -87,7 +85,6 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback)
 
 int
 Service::call_test_oneway (Test::Crashed_Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
   const int iterations = 50;
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index b0cdc9b35ec..99d430525f1 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -23,23 +23,20 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void run_test (Test::Crashed_Callback_ptr callback);
 
 private:
   /// Call the are_you_there callback multiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_are_you_there (Test::Crashed_Callback_ptr callback);
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_test_oneway (Test::Crashed_Callback_ptr callback);
 
 private:
   /// Count the number of tests executed
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 09c597bf30a..8d99edeca1b 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -104,8 +104,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(crashed_callback_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (crashed_callback_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Crashed_Callback_var crashed_callback =
-        crashed_callback_impl->_this ();
+        Test::Crashed_Callback::_narrow (object.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 074adc013f5..ba57e86edae 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -91,8 +91,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (service_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Service_var service =
-        service_impl->_this ();
+        Test::Service::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (service.in ());
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index a6144215762..b021e38bb47 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -36,9 +36,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void)
 void Test_Simple_Test_i::test_method (
     ::CORBA::ULong & error_count
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   error_count --;
 }
@@ -55,9 +52,6 @@ void
 Hello::test_basic_arg (
     ::CORBA::Long basic
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (basic != TEST_BASIC_VALUE)
     ERROR_COUNT ("Hello::test_basic_arg")
@@ -65,7 +59,6 @@ Hello::test_basic_arg (
 
 void
 Hello::test_unbounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ")
@@ -80,7 +73,6 @@ Hello::test_unbounded_string_arg(const char* message)
 
 void
 Hello::test_bounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ")
@@ -95,7 +87,6 @@ Hello::test_bounded_string_arg(const char* message)
 
 void
 Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
@@ -111,7 +102,6 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
 
 void
 Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_var_size_arg ")
@@ -123,7 +113,6 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
 
 void
 Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ")
@@ -135,7 +124,6 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
 
 void
 Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
-                           ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_size_arg ")
@@ -151,7 +139,6 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
 
 void
 Hello::test_var_array_arg(const Test::Var_Array messages)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
   {
@@ -166,7 +153,6 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
 
 void
 Hello::test_special_basic_arg(CORBA::Char value)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ")
@@ -179,9 +165,6 @@ Hello::test_special_basic_arg(CORBA::Char value)
 void Hello::test_objref_arg (
     ::Test::Simple_Test_ptr test
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n")));
@@ -205,9 +188,6 @@ void Hello::test_objref_arg (
 void Hello::test_object_arg (
     ::CORBA::Object_ptr o
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
@@ -227,9 +207,6 @@ void Hello::test_args_1 (
     ::CORBA::Char arg2,
     ::Test::Simple_Test_ptr arg3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
@@ -255,9 +232,6 @@ void Hello::test_args_2 (
     const ::Test::Fixed_Array arg2,
     const ::Test::TimeOfDay & arg3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
@@ -282,9 +256,6 @@ void Hello::test_args_3 (
     const ::Test::Unbounded_Var_Size_Arg & arg3,
     const ::Test::Var_Array arg4
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
@@ -303,7 +274,6 @@ void Hello::test_args_3 (
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -346,9 +316,6 @@ Hello::test_unbounded_string (
     char *& s2,
     CORBA::String_out s3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -361,7 +328,6 @@ Hello::test_unbounded_string (
 
 void
 Hello::shutdown (void)
-  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
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 8564949a0ff..70d46f4813a 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -23,10 +23,7 @@ public:
   virtual
   void test_method (
       ::CORBA::ULong & error_count
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 };
 
 /// Implement the Test::Hello interface
@@ -42,110 +39,71 @@ public:
   virtual
   void test_basic_arg (
       ::CORBA::Long basic
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_unbounded_string_arg (
       const char * message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_bounded_string_arg (
       const char * message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_fixed_array_arg (
       const ::Test::Fixed_Array message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_var_array_arg (
       const ::Test::Var_Array messages
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_bounded_var_size_arg (
       const ::Test::Bounded_Var_Size_Arg & message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_unbounded_var_size_arg (
       const ::Test::Unbounded_Var_Size_Arg & message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_fixed_size_arg (
       const ::Test::TimeOfDay & t
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_special_basic_arg (
       ::CORBA::Char value
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_objref_arg (
       ::Test::Simple_Test_ptr test
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_object_arg (
       ::CORBA::Object_ptr o
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
       ::Test::Simple_Test_ptr arg3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
       const ::Test::TimeOfDay & arg3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_3 (
@@ -153,26 +111,18 @@ public:
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
       const ::Test::Var_Array arg4
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
   virtual
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
       CORBA::String_out s3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 22a22d3b099..f7bc2ceb483 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -53,8 +53,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
@@ -78,8 +83,12 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer_simple(simple_impl);
 
+     id = root_poa->activate_object (simple_impl);
+
+     object = root_poa->id_to_reference (id.in ());
+
      Test::Simple_Test_var simple_test =
-       simple_impl->_this ();
+       Test::Simple_Test::_narrow (object.in ());
 
      CORBA::String_var simple_test_ior =
        this->sorb_->object_to_string (simple_test.in ());
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index d4e2a521bfe..0c21c44f5b5 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -36,9 +36,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void)
 void Test_Simple_Test_i::test_method (
     ::CORBA::ULong & error_count
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   error_count --;
 }
@@ -56,9 +53,6 @@ Hello::test_basic_arg (
     ::CORBA::Long basic,
     ::CORBA::Long_out x
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (basic != TEST_BASIC_VALUE)
     ERROR_COUNT ("Hello::test_basic_arg")
@@ -68,7 +62,6 @@ Hello::test_basic_arg (
 
 void
 Hello::test_unbounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ")
@@ -83,7 +76,6 @@ Hello::test_unbounded_string_arg(const char* message)
 
 void
 Hello::test_bounded_string_arg(const char* message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ")
@@ -98,7 +90,6 @@ Hello::test_bounded_string_arg(const char* message)
 
 void
 Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
-                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
@@ -114,7 +105,6 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
 
 void
 Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_var_size_arg ")
@@ -126,7 +116,6 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
 
 void
 Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ")
@@ -138,7 +127,6 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
 
 void
 Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
-                           ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_size_arg ")
@@ -154,7 +142,6 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
 
 void
 Hello::test_var_array_arg(const Test::Var_Array messages)
-                          ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
   {
@@ -169,7 +156,6 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
 
 void
 Hello::test_special_basic_arg(CORBA::Char value)
-                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ")
@@ -182,9 +168,6 @@ Hello::test_special_basic_arg(CORBA::Char value)
 void Hello::test_objref_arg (
     ::Test::Simple_Test_ptr test
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n")));
@@ -208,9 +191,6 @@ void Hello::test_objref_arg (
 void Hello::test_object_arg (
     ::CORBA::Object_ptr o
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
@@ -230,9 +210,6 @@ void Hello::test_args_1 (
     ::CORBA::Char arg2,
     ::Test::Simple_Test_ptr arg3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
@@ -258,9 +235,6 @@ void Hello::test_args_2 (
     const ::Test::Fixed_Array arg2,
     const ::Test::TimeOfDay & arg3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
@@ -285,9 +259,6 @@ void Hello::test_args_3 (
     const ::Test::Unbounded_Var_Size_Arg & arg3,
     const ::Test::Var_Array arg4
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
@@ -306,7 +277,6 @@ void Hello::test_args_3 (
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -349,9 +319,6 @@ Hello::test_unbounded_string (
     char *& s2,
     CORBA::String_out s3
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -364,7 +331,6 @@ Hello::test_unbounded_string (
 
 void
 Hello::shutdown (void)
-  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
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index f97f94609c9..210748f7469 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -23,10 +23,7 @@ public:
   virtual
   void test_method (
       ::CORBA::ULong & error_count
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 };
 
 /// Implement the Test::Hello interface
@@ -43,110 +40,71 @@ public:
   void test_basic_arg (
       ::CORBA::Long basic,
       ::CORBA::Long_out x
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_unbounded_string_arg (
       const char * message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_bounded_string_arg (
       const char * message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_fixed_array_arg (
       const ::Test::Fixed_Array message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_var_array_arg (
       const ::Test::Var_Array messages
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_bounded_var_size_arg (
       const ::Test::Bounded_Var_Size_Arg & message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_unbounded_var_size_arg (
       const ::Test::Unbounded_Var_Size_Arg & message
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_fixed_size_arg (
       const ::Test::TimeOfDay & t
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_special_basic_arg (
       ::CORBA::Char value
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_objref_arg (
       ::Test::Simple_Test_ptr test
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_object_arg (
       ::CORBA::Object_ptr o
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
       ::Test::Simple_Test_ptr arg3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
       const ::Test::TimeOfDay & arg3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
   virtual
   void test_args_3 (
@@ -154,26 +112,18 @@ public:
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
       const ::Test::Var_Array arg4
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
   virtual
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
       CORBA::String_out s3
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index 2a252386ff0..f2f6b63c906 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -51,8 +51,13 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+     PortableServer::ObjectId_var id =
+       root_poa->activate_object (hello_impl);
+
+     CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
      Test::Hello_var hello =
-       hello_impl->_this ();
+       Test::Hello::_narrow (object.in ());
 
      CORBA::String_var ior =
        this->sorb_->object_to_string (hello.in ());
@@ -76,8 +81,12 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer_simple(simple_impl);
 
+     id = root_poa->activate_object (simple_impl);
+
+     object = root_poa->id_to_reference (id.in ());
+
      Test::Simple_Test_var simple_test =
-       simple_impl->_this ();
+       Test::Simple_Test::_narrow (object.in ());
 
      CORBA::String_var simple_test_ior =
        this->sorb_->object_to_string (simple_test.in ());
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 9a1dbb1f1f8..938eb9de2d3 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -112,7 +112,10 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
       if (::parse_args (new_argc, new_argv.get_buffer ()) != 0)
         return -1;
 
-      CORBA::Object_var obj = this->servant_._this ();
+      PortableServer::ObjectId_var id =
+        this->poa_->activate_object (&servant_);
+
+      CORBA::Object_var obj = this->poa_->id_to_reference (id.in ());
 
       CORBA::String_var ior =
         this->orb_->object_to_string (obj.in ());
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index 43deb11f19d..9a3414ab41e 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -13,7 +13,6 @@ Test_i::Test_i (void)
 
 void
 Test_i::invoke_me ( /* */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Test method invoked.\n"));
@@ -21,7 +20,6 @@ Test_i::invoke_me ( /* */)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index f22788d8dfc..f7c893bd903 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -34,12 +34,10 @@ public:
 
   /// Simple two-way operation used to excercise the ORB transport
   /// internals.
-  virtual void invoke_me (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke_me (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   /// Set the ORB to be shutdown by the shutdown() method in this
   /// class.
diff --git a/TAO/tests/DSI_AMH/DSI_AMH.mpc b/TAO/tests/DSI_AMH/DSI_AMH.mpc
new file mode 100644
index 00000000000..a0bd170872b
--- /dev/null
+++ b/TAO/tests/DSI_AMH/DSI_AMH.mpc
@@ -0,0 +1,22 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Server): taoserver, dynamicinterface, avoids_minimum_corba,avoids_corba_e_compact, avoids_corba_e_micro {
+  IDL_Files {
+  }
+  Source_Files {
+    Roundtrip.cpp
+      server.cpp
+  }
+}
+
+project(*Client): taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  Source_Files {
+    TestC.cpp
+    client.cpp
+  }
+  verbatim(gnuace, macros) {
+    REALCLEAN_FILES += TestS.cpp
+    }
+}
+
diff --git a/TAO/tests/DSI_AMH/README b/TAO/tests/DSI_AMH/README
new file mode 100644
index 00000000000..28fca90fe3f
--- /dev/null
+++ b/TAO/tests/DSI_AMH/README
@@ -0,0 +1,2 @@
+This is a simple test of the DSI+AMH feature in TAO.
+To run it, just execute the script run_test.pl.
diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp
new file mode 100644
index 00000000000..eb911101006
--- /dev/null
+++ b/TAO/tests/DSI_AMH/Roundtrip.cpp
@@ -0,0 +1,158 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/SystemExceptionA.h"
+#include "tao/DynamicInterface/Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+void
+Roundtrip::invoke (CORBA::ServerRequest_ptr request,
+                   TAO_AMH_DSI_Response_Handler_ptr rh)
+{
+  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
+    {
+      this->orb_->shutdown (0);
+
+      return;
+    }
+
+  else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
+    {
+      CORBA::NVList_ptr list;
+      this->orb_->create_list (0, list);
+
+      CORBA::Any type_id;
+      type_id._tao_set_typecode (CORBA::_tc_string);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN);
+
+      request->arguments (list);
+
+      CORBA::NamedValue_ptr nv = list->item (0);
+
+      const char *arg;
+      *(nv->value ()) >>= arg;
+
+      CORBA::Boolean type_matches = false;
+      if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0
+          || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0
+          || ACE_OS::strcmp (arg, "") == 0)
+        type_matches = true;
+
+      CORBA::Any result_any;
+      result_any <<= CORBA::Any::from_boolean (type_matches);
+
+      // AMH way of replying
+      CORBA::NamedValue_ptr result = 0;
+      this->orb_->create_named_value (result);
+      *(result->value()) = result_any;
+      rh->invoke_reply (list, result);
+      return;
+    }
+
+  else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
+    {
+      CORBA::NVList_ptr list;
+      this->orb_->create_list (0, list);
+
+      CORBA::Any send_time;
+      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
+
+      request->arguments (list);
+
+      CORBA::NamedValue_ptr nv = list->item (0);
+
+      // AMH way of replying
+      rh->invoke_reply (list, nv);
+
+      return;
+    }
+
+  CORBA::Any bad_operation;
+  CORBA::BAD_OPERATION exception;
+  bad_operation <<= exception;
+  request->set_exception (bad_operation);
+}
+
+CORBA::RepositoryId
+Roundtrip::_primary_interface (const PortableServer::ObjectId &,
+                               PortableServer::POA_ptr)
+{
+  return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
+}
+
+void
+Roundtrip::_dispatch (TAO_ServerRequest &request,
+                         void * //context
+                     )
+{
+  // No need to do any of this if the client isn't waiting.
+  if (request.response_expected ())
+    {
+      if (!CORBA::is_nil (request.forward_location ()))
+        {
+          request.init_reply ();
+          request.tao_send_reply ();
+
+          // No need to invoke in this case.
+          return;
+        }
+      else if (request.sync_with_server ())
+        {
+          // The last line before the call to this function
+          // was an ACE_CHECK_RETURN, so if we're here, we
+          // know there is no exception so far, and that's all
+          // a SYNC_WITH_SERVER client request cares about.
+          request.send_no_exception_reply ();
+        }
+    }
+
+  // Create DSI request object.
+  CORBA::ServerRequest *dsi_request = 0;
+  ACE_NEW (dsi_request,
+           CORBA::ServerRequest (request));
+
+  try
+    {
+      TAO_AMH_DSI_Response_Handler_ptr rh_ptr = 0;
+      ACE_NEW (rh_ptr, TAO_AMH_DSI_Response_Handler(request));
+
+      TAO_AMH_DSI_Response_Handler_var rh = rh_ptr;
+
+      // init the handler
+      TAO_ORB_Core *orbcore = request.orb()->orb_core ();
+      TAO_AMH_BUFFER_ALLOCATOR* amh_allocator =
+          orbcore->lane_resources().amh_response_handler_allocator();
+      rh->init (request, amh_allocator);
+      // Delegate to user.
+      this->invoke (dsi_request,
+                    rh.in());
+    }
+  catch (const CORBA::Exception& ex)
+
+    {
+      // Only if the client is waiting.
+      if (request.response_expected () && !request.sync_with_server ())
+        {
+          request.tao_send_reply_exception (ex);
+        }
+    }
+
+  CORBA::release (dsi_request);
+}
+
+void
+Roundtrip::invoke (CORBA::ServerRequest_ptr request)
+{
+  ACE_UNUSED_ARG (request);
+  throw CORBA::NO_IMPLEMENT();
+}
diff --git a/TAO/tests/DSI_AMH/Roundtrip.h b/TAO/tests/DSI_AMH/Roundtrip.h
new file mode 100644
index 00000000000..01296676961
--- /dev/null
+++ b/TAO/tests/DSI_AMH/Roundtrip.h
@@ -0,0 +1,53 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include /**/ "ace/pre.h"
+
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
+
+#include "tao/ORB.h"
+
+#if defined (_MSC_VER)
+# pragma warning(push)
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual PortableServer::DynamicImplementation
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The DSI methods
+
+  virtual void _dispatch (TAO_ServerRequest &request,
+                          void *context);
+  // Turns around and calls invoke, but using AMH style handler
+
+  void invoke (CORBA::ServerRequest_ptr request);
+
+  virtual void invoke (CORBA::ServerRequest_ptr request,
+                       TAO_AMH_DSI_Response_Handler_ptr rh);
+  virtual CORBA::RepositoryId _primary_interface (
+      const PortableServer::ObjectId &oid,
+      PortableServer::POA_ptr poa);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/tests/DSI_AMH/Test.idl b/TAO/tests/DSI_AMH/Test.idl
new file mode 100644
index 00000000000..fb38537f0b7
--- /dev/null
+++ b/TAO/tests/DSI_AMH/Test.idl
@@ -0,0 +1,18 @@
+//
+// $Id$
+//
+
+/// A simple module to avoid namespace pollution
+module Test
+{
+  typedef unsigned long long Timestamp;
+
+  interface Roundtrip
+  {
+    /// The operation simply returns its argument. 
+    Timestamp test_method (in Timestamp send_time);
+
+    /// Shutdown the ORB
+    oneway void shutdown ();
+  };
+};
diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp
new file mode 100644
index 00000000000..299c257ed14
--- /dev/null
+++ b/TAO/tests/DSI_AMH/client.cpp
@@ -0,0 +1,99 @@
+// $Id$
+
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "tao/debug.h"
+
+const char *ior = "file://test.ior";
+int niterations = 100;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior);
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in ());
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      for (int i = 0; i < niterations; ++i)
+        {
+          ACE_hrtime_t start = ACE_OS::gethrtime ();
+          ACE_hrtime_t retval =  roundtrip->test_method (start);
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "test return value: %Q\n", retval));
+        }
+
+
+      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown ();
+        }
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DSI_AMH/run_test.pl b/TAO/tests/DSI_AMH/run_test.pl
new file mode 100755
index 00000000000..88f212b8dfb
--- /dev/null
+++ b/TAO/tests/DSI_AMH/run_test.pl
@@ -0,0 +1,54 @@
+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 ("test.ior");
+
+print STDERR "================ DSI+AMH test\n";
+
+unlink $iorfile;
+
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::Process ("server",
+                              "-o test.ior");
+}
+else {
+  $SV = new PerlACE::Process ("server",
+                              "-o $iorfile");
+}
+
+$CL = new PerlACE::Process ("client",
+                            "-k file://$iorfile "
+                            . " -i 25" );
+
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill ();
+    exit 1;
+}
+
+$client = $CL->SpawnWaitKill (300);
+$server = $SV->WaitKill (10);
+
+unlink $iorfile;
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp
new file mode 100644
index 00000000000..4f5e41dc839
--- /dev/null
+++ b/TAO/tests/DSI_AMH/server.cpp
@@ -0,0 +1,102 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+
+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[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      PortableServer::ObjectId_var oid =
+        root_poa->activate_object (roundtrip_impl);
+
+      CORBA::Object_var roundtrip =
+        root_poa->id_to_reference (oid.in ());
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in ());
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((
+            LM_ERROR,
+            "Cannot open output file for writing IOR: %s",
+            ior_output_file),
+            1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
new file mode 100644
index 00000000000..391233412d6
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
@@ -0,0 +1,48 @@
+// -*- 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
+  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
+  after += *Server
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
+  after += *idl
+  after += *Client
+  Source_Files {
+    test_dsi.cpp
+    gateway.cpp
+    My_DII_Reply_Handler.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
new file mode 100644
index 00000000000..038efd7fe6c
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
@@ -0,0 +1,61 @@
+//$Id$
+
+#include "My_DII_Reply_Handler.h"
+#include "ace/Log_Msg.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any.h"
+
+My_DII_Reply_Handler::My_DII_Reply_Handler(
+    TAO_AMH_DSI_Response_Handler_ptr rph,
+    CORBA::ORB_var orb)
+ : response_handler_ (rph),
+  orb_ (orb)
+{
+}
+
+My_DII_Reply_Handler::~My_DII_Reply_Handler()
+{
+}
+
+void
+My_DII_Reply_Handler::handle_response(TAO_InputCDR &incoming)
+{
+  CORBA::NVList_ptr list;
+
+  try
+  {
+    this->orb_->create_list (0, list);
+
+    bool lazy_evaluation = true;
+    list->_tao_incoming_cdr (incoming,
+                             CORBA::ARG_OUT | CORBA::ARG_INOUT,
+                             lazy_evaluation);
+  }
+  catch (CORBA::SystemException &ex)
+  {
+    TAO_AMH_DSI_Exception_Holder h (ex._tao_duplicate());
+    response_handler_->invoke_excep(&h);
+  }
+  catch (...)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "ERROR: Unknown Exception\n"));
+    TAO_AMH_DSI_Exception_Holder h (new CORBA::UNKNOWN());
+    response_handler_->invoke_excep(&h);
+  }
+
+    if (!CORBA::is_nil (this->response_handler_))
+    this->response_handler_->invoke_reply (list,
+                                           0 // result
+                                          );
+}
+
+void
+My_DII_Reply_Handler::handle_excep (TAO_InputCDR &incoming,
+                                    CORBA::ULong reply_status)
+{
+  ACE_DEBUG((LM_DEBUG, "calling My_DII_Reply_Handler::handle_excep()\n"));
+  this->response_handler_->gateway_exception_reply (reply_status, incoming);
+
+}
+
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
new file mode 100644
index 00000000000..d1d99285184
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
@@ -0,0 +1,25 @@
+//$Id$
+
+#include "tao/Messaging/MessagingS.h"
+#include "tao/DynamicInterface/DII_Reply_Handler.h"
+#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
+class My_DII_Reply_Handler : public virtual TAO_DII_Reply_Handler,
+                             public virtual Messaging::ReplyHandler
+{
+  //    Used to handle replies from the server and to complete the
+  //    call back to the client.
+  //
+public:
+  My_DII_Reply_Handler (TAO_AMH_DSI_Response_Handler_ptr rph,
+                        CORBA::ORB_var orb);
+  virtual ~My_DII_Reply_Handler (void);
+
+  // Callback method for deferred synchronous requests.
+  virtual void handle_response (TAO_InputCDR &incoming);
+  virtual void handle_excep (TAO_InputCDR &incoming,
+                             CORBA::ULong reply_status);
+
+private:
+  TAO_AMH_DSI_Response_Handler * response_handler_;
+  CORBA::ORB_var orb_;
+};
diff --git a/TAO/tests/DSI_AMI_Gateway/README b/TAO/tests/DSI_AMI_Gateway/README
new file mode 100644
index 00000000000..93f3c77df24
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/README
@@ -0,0 +1 @@
+a simple test to experience the whole AMI+DII+AMH+DSI feature. 
diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
new file mode 100644
index 00000000000..1440fbf6b7b
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -0,0 +1,189 @@
+// $Id$
+
+#include "testC.h"
+#include "tao/debug.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+ACE_RCSID(DSI_Gateway, client, "$Id$")
+
+const char *ior = "file://gateway.ior";
+int niterations = 5;
+int do_shutdown = 0;
+int test_user_exception = 0;
+int test_system_exception = 0;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "xusk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'x':
+        do_shutdown = 1;
+        break;
+
+      case 'u':
+        test_user_exception = 1;
+        break;
+
+      case 's':
+        test_system_exception = 1;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-x "
+                           "-u "
+                           "-s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        {
+          return 1;
+        }
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior);
+
+      Simple_Server_var server =
+        Simple_Server::_narrow (object.in ());
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      Structure the_in_structure;
+      the_in_structure.seq.length (10);
+
+      if (test_user_exception == 1)
+        {
+          server->raise_user_exception ();
+        }
+      else if (test_system_exception == 1)
+        {
+          server->raise_system_exception ();
+        }
+      else
+        {
+          for (int i = 0; i != niterations; ++i)
+            {
+              CORBA::Long const tv = i + 100;
+              server->test_val(tv);
+              CORBA::Long const rtv = server->test_val ();
+
+              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;
+
+             CORBA::Long const r =
+                server->test_method (i,
+                                     the_in_structure,
+                                     the_out_structure.out (),
+                                     name.inout ());
+
+              if (TAO_debug_level > 0)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              "DSI_Simpler_Server ====\n"
+                              "    x = %d\n"
+                              "    i = %d\n"
+                              "    length = %d\n"
+                              "    name = <%s>\n",
+                              r,
+                              the_out_structure->i,
+                              the_out_structure->seq.length (),
+                              name.in ()));
+                }
+
+              if (r != i)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                              "(%P|%t) ERROR: unexpected result = %d for %d",
+                              r, i));
+                }
+            }
+        }
+
+      if (do_shutdown)
+        {
+          server->shutdown ();
+        }
+    }
+  catch (const test_exception& ex)
+    {
+      ex._tao_print_exception ("Client: exception caught - ");
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "error code: %d\n"
+                  "error info: %s\n"
+                  "status: %s\n",
+                  ex.error_code,
+                  ex.error_message.in (),
+                  ex.status_message.in ()));
+
+      return 0;
+    }
+  catch (const CORBA::NO_PERMISSION& ex)
+    {
+      ex._tao_print_exception ("Client: exception caught - ");
+
+      return 0;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Client: exception caught - ");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/gateway.cpp b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
new file mode 100644
index 00000000000..e1796d69d19
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
@@ -0,0 +1,133 @@
+// $Id$
+
+#include "test_dsi.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+ACE_RCSID(DSI_Gateway, server, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 5;
+int do_shutdown = 0;
+const char *ior_output_file = "gateway.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "xk:i:o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'x':
+        do_shutdown = 1;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'o':
+              ior_output_file = get_opts.opt_arg ();
+              break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-x "
+                           "-k <ior> "
+                           "-i <niterations> "
+                                             "-o <iorfile> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) Unable to initialize the POA.\n"),
+                            1);
+        }
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      poa_manager->activate ();
+
+      if (parse_args (argc, argv) != 0)
+        {
+          return 1;
+        }
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior);
+
+      DSI_Simple_Server server_impl (orb.in (),
+                                     object.in (),
+                                     root_poa.in ());
+      PortableServer::ObjectId_var oid =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var server =
+        root_poa->id_to_reference (oid.in ());
+
+      CORBA::String_var ior =
+              orb->object_to_string (server.in ());
+
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
+
+      // If the ior_output_file exists, output the ior to it
+      if (ior_output_file != 0)
+              {
+                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+
+                if (output_file == 0)
+            {
+                    ACE_ERROR_RETURN (
+                        (LM_ERROR,
+                        "Cannot open output file for writing IOR: %s",
+                        ior_output_file),
+                        1);
+            }
+
+                ACE_OS::fprintf (output_file, "%s", ior.in ());
+                ACE_OS::fclose (output_file);
+              }
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Gateway: exception caught - ");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl
new file mode 100755
index 00000000000..d8ab49c6440
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl
@@ -0,0 +1,73 @@
+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;
+
+$svfile = PerlACE::LocalFile ("server.ior");
+$gwfile = PerlACE::LocalFile ("gateway.ior");
+
+unlink $svfile;
+unlink $gwfile;
+
+$status = 0;
+
+$SV = new PerlACE::Process ("server", "-o $svfile");
+$GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
+$CL = new PerlACE::Process ("client", "-k file://$gwfile -u");
+
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($svfile, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$svfile>\n";
+    $SV->Kill ();
+    exit 1;
+}
+
+$GW->Spawn ();
+
+if (PerlACE::waitforfile_timed ($gwfile, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$gwfile>\n";
+    $SV->Kill ();
+    $GW->Kill (); 
+    exit 1;
+}
+
+$client = $CL->SpawnWaitKill (60);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$CL = new PerlACE::Process ("client", "-k file://$gwfile -s");
+
+$client = $CL->SpawnWaitKill (60);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$server = $SV->Kill ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+$gateway = $GW->Kill ();
+
+if ($gateway != 0) {
+    print STDERR "ERROR: gateway returned $gateway\n";
+    $status = 1;
+}
+
+unlink $svfile;
+unlink $gwfile;
+
+exit $status;
diff --git a/TAO/tests/DSI_AMI_Gateway/run_test.pl b/TAO/tests/DSI_AMI_Gateway/run_test.pl
new file mode 100755
index 00000000000..4af61a63e44
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/run_test.pl
@@ -0,0 +1,69 @@
+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;
+
+$svfile = PerlACE::LocalFile ("server.ior");
+$gwfile = PerlACE::LocalFile ("gateway.ior");
+
+unlink $svfile;
+unlink $gwfile;
+
+$status = 0;
+
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $svfile");
+}
+$GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
+$CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100");
+
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: cannot find file <$svfile>\n";
+    $SV->Kill ();
+    exit 1;
+}
+
+$GW->Spawn ();
+
+if (PerlACE::waitforfile_timed ($gwfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: cannot find file <$gwfile>\n";
+    $SV->Kill ();
+    $GW->Kill (); 
+    exit 1;
+}
+
+$client = $CL->SpawnWaitKill (60);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$server = $SV->WaitKill (5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+$gateway = $GW->WaitKill (5);
+
+if ($gateway != 0) {
+    print STDERR "ERROR: gateway returned $gateway\n";
+    $status = 1;
+}
+
+unlink $svfile;
+unlink $gwfile;
+
+exit $status;
diff --git a/TAO/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp
new file mode 100644
index 00000000000..2e1dda6c91d
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/server.cpp
@@ -0,0 +1,117 @@
+// $Id$
+
+#include "test_i.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+ACE_RCSID(DSI_Gateway, server, "$Id$")
+
+const char *ior_output_file = "server.ior";
+
+int nthreads = 4;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) Unable to initialize the POA.\n"),
+                            1);
+        }
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        {
+          return 1;
+        }
+
+      Simple_Server_i server_impl (orb.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Simple_Server_var server =
+        Simple_Server::_narrow (object.in ());
+
+      CORBA::String_var ior =
+              orb->object_to_string (server.in ());
+
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
+
+      // If the ior_output_file exists, output the ior to it
+      if (ior_output_file != 0)
+              {
+                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+
+                if (output_file == 0)
+            {
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                       "Cannot open output file for writing IOR: %s",
+                                       ior_output_file),
+                                      1);
+            }
+
+                ACE_OS::fprintf (output_file, "%s", ior.in ());
+                ACE_OS::fclose (output_file);
+              }
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Server: exception caught - ");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/test.idl b/TAO/tests/DSI_AMI_Gateway/test.idl
new file mode 100644
index 00000000000..29cdc6f4d15
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test.idl
@@ -0,0 +1,34 @@
+//
+// $Id$
+//
+
+typedef sequence<long> DSI_LongSeq;
+
+struct Structure
+{
+  short i;
+  sequence<long> seq;
+};
+
+exception test_exception
+{
+  short error_code;
+  string error_message;
+  string status_message;
+};
+
+interface Simple_Server
+{
+  attribute long test_val;
+
+  long test_method (in long x,
+                    in Structure the_in_structure,
+                    out Structure the_out_structure,
+                    inout string name);
+
+  void raise_user_exception () raises (test_exception);
+
+  void raise_system_exception ();
+
+  oneway void shutdown ();
+};
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
new file mode 100644
index 00000000000..6a3d137bb03
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -0,0 +1,147 @@
+// $Id$
+
+#include "test_dsi.h"
+#include "tao/DynamicInterface/Request.h"
+#include "tao/DynamicInterface/Unknown_User_Exception.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "My_DII_Reply_Handler.h"
+
+#if !defined(__ACE_INLINE__)
+#include "test_dsi.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(DSI_AMI_Gateway, test_dsi, "$Id$")
+
+void
+DSI_Simple_Server::_dispatch (TAO_ServerRequest &request,
+                         void * //context
+                     )
+{
+  // No need to do any of this if the client isn't waiting.
+  if (request.response_expected ())
+    {
+      if (!CORBA::is_nil (request.forward_location ()))
+        {
+          request.init_reply ();
+          request.tao_send_reply ();
+
+          // No need to invoke in this case.
+          return;
+        }
+      else if (request.sync_with_server ())
+        {
+          // The last line before the call to this function
+          // was an ACE_CHECK_RETURN, so if we're here, we
+          // know there is no exception so far, and that's all
+          // a SYNC_WITH_SERVER client request cares about.
+          request.send_no_exception_reply ();
+        }
+    }
+
+  // Create DSI request object.
+  CORBA::ServerRequest *dsi_request = 0;
+  ACE_NEW (dsi_request,
+           CORBA::ServerRequest (request));
+
+  try
+    {
+      TAO_AMH_DSI_Response_Handler_ptr rh_ptr = 0;
+      ACE_NEW (rh_ptr, TAO_AMH_DSI_Response_Handler(request));
+
+      TAO_AMH_DSI_Response_Handler_var rh = rh_ptr;
+
+      // init the handler
+      TAO_AMH_BUFFER_ALLOCATOR* amh_allocator =
+              request.orb()->orb_core ()->lane_resources().amh_response_handler_allocator();
+      rh->init (request, amh_allocator);
+      // Delegate to user.
+      this->invoke (dsi_request,
+                    rh.in());
+    }
+  catch (const CORBA::Exception& ex)
+
+    {
+      // Only if the client is waiting.
+      if (request.response_expected () && !request.sync_with_server ())
+        {
+          request.tao_send_reply_exception (ex);
+        }
+    }
+
+  CORBA::release (dsi_request);
+}
+
+void
+DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr)
+{
+}
+
+void
+DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
+                           TAO_AMH_DSI_Response_Handler * rph)
+{
+  CORBA::NVList_ptr list;
+  this->orb_->create_list (0, list);
+
+  request->arguments (list);
+
+  CORBA::Request_var target_request;
+
+  this->target_->_create_request (0, // ctx
+                                  request->operation (),
+                                  list,
+                                  0, // result
+                                  0, // exception_list,
+                                  0, // context_list,
+                                  target_request.inout (),
+                                  0);
+
+  target_request->_tao_lazy_evaluation (1);
+
+  // Outgoing request must have the same byte order as the incoming one.
+  target_request->_tao_byte_order (request->_tao_incoming_byte_order ());
+
+  try
+    {
+      // Updates the byte order state, if necessary.
+      My_DII_Reply_Handler * rh_ptr = 0;
+      ACE_NEW (rh_ptr, My_DII_Reply_Handler (rph, this->orb_));
+
+      target_request->sendc (rh_ptr);
+      CORBA::release (rh_ptr);
+    }
+  catch (const CORBA::UNKNOWN&)
+    {
+      // Outgoing reply must have the same byte order as the incoming one.
+      request->_tao_reply_byte_order (target_request->_tao_byte_order ());
+
+      request->gateway_exception_reply (
+          target_request->raw_user_exception ());
+
+      return;
+    }
+
+  // Outgoing reply must have the same byte order as the incoming one.
+  request->_tao_reply_byte_order (target_request->_tao_byte_order ());
+
+  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
+    {
+      this->orb_->shutdown (0);
+    }
+}
+
+CORBA::RepositoryId
+DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
+                                       PortableServer::POA_ptr)
+{
+  return CORBA::string_dup ("IDL:Simple_Server:1.0");
+}
+
+PortableServer::POA_ptr
+DSI_Simple_Server::_default_POA (void)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
new file mode 100644
index 00000000000..46a0b4aa99d
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
@@ -0,0 +1,74 @@
+// $Id$
+
+// ===================================================
+//
+// = LIBRARY
+//   TAO/tests/DSI_Gateway
+//
+// = FILENAME
+//   test_i.h
+//
+// = AUTHOR
+//   Carlos O'Ryan
+//
+// ===================================================
+
+#ifndef TAO_DSI_GATEWAY_TEST_DSI_H
+#define TAO_DSI_GATEWAY_TEST_DSI_H
+
+#include "tao/DynamicInterface/Server_Request.h"
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/ORB.h"
+
+class DSI_Simple_Server : public TAO_DynamicImplementation
+{
+  // = TITLE
+  //   DSI Simpler Server implementation
+  //
+  // = DESCRIPTION
+  //   Implements the DSI/DII gateway.
+  //
+public:
+  DSI_Simple_Server (CORBA::ORB_ptr orb,
+                     CORBA::Object_ptr target,
+                     PortableServer::POA_ptr poa);
+  // ctor
+
+  virtual void _dispatch (TAO_ServerRequest &request,
+                          void *context);
+  // Turns around and calls invoke, but using AMH style handler
+  // = The DynamicImplementation methods.
+  //
+
+  // we need this because it is a pure virtual method in
+  // its parent class
+  virtual void invoke (CORBA::ServerRequest_ptr request);
+  virtual void invoke (CORBA::ServerRequest_ptr request,
+                       TAO_AMH_DSI_Response_Handler_ptr rh);
+
+  virtual CORBA::RepositoryId _primary_interface (
+      const PortableServer::ObjectId &oid,
+      PortableServer::POA_ptr poa
+    );
+
+  virtual PortableServer::POA_ptr _default_POA (
+    );
+
+private:
+  CORBA::ORB_var orb_;
+  // The ORB
+
+  CORBA::Object_var target_;
+  // Target object, forward requests to it...
+
+  PortableServer::POA_var poa_;
+  // The POA
+};
+
+#if defined(__ACE_INLINE__)
+#include "test_dsi.inl"
+#endif /* __ACE_INLINE__ */
+
+#endif /* TAO_DSI_GATEWAY_TEST_I_H */
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.inl b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
new file mode 100644
index 00000000000..16ff803a4a9
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
@@ -0,0 +1,12 @@
+// $Id$
+
+ACE_INLINE
+DSI_Simple_Server::DSI_Simple_Server (
+    CORBA::ORB_ptr orb,
+    CORBA::Object_ptr target,
+    PortableServer::POA_ptr poa)
+  :  orb_ (CORBA::ORB::_duplicate (orb)),
+     target_ (CORBA::Object::_duplicate (target)),
+     poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
new file mode 100644
index 00000000000..550fc830999
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
@@ -0,0 +1,74 @@
+// $Id$
+
+#include "test_i.h"
+#include "tao/debug.h"
+
+#if !defined(__ACE_INLINE__)
+#include "test_i.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(DSI_Gateway, test_i, "$Id$")
+
+CORBA::Long
+Simple_Server_i::test_method (CORBA::Long x,
+                              const Structure& the_in_structure,
+                              Structure_out the_out_structure,
+                              char *&name)
+{
+  Structure *tmp = 0;
+  ACE_NEW_RETURN (tmp, Structure (the_in_structure), -1);
+  the_out_structure = tmp;
+
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Simpler_Server_i ====\n"
+                  "    x = %d\n"
+                  "    i = %d\n"
+                  "    length = %d\n"
+                  "    name = <%s>\n",
+                  x,
+                  the_in_structure.i,
+                  the_in_structure.seq.length (),
+                  name));
+    }
+
+  return x;
+}
+
+void
+Simple_Server_i::raise_user_exception (void)
+{
+  throw test_exception (33, "reactor meltdown", "kaput");
+}
+
+void
+Simple_Server_i::raise_system_exception (void)
+{
+  throw CORBA::NO_PERMISSION ();
+}
+
+void
+Simple_Server_i::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
+
+CORBA::Long
+Simple_Server_i::test_val (void)
+{
+  return vlong_;
+}
+
+void
+Simple_Server_i::test_val (CORBA::Long tv)
+{
+  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_AMI_Gateway/test_i.h b/TAO/tests/DSI_AMI_Gateway/test_i.h
new file mode 100644
index 00000000000..89e1c70d9f6
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.h
@@ -0,0 +1,59 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//   TAO/tests/DSI_Gateway
+//
+// = FILENAME
+//   test_i.h
+//
+// = AUTHOR
+//   Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef TAO_DSI_GATEWAY_TEST_I_H
+#define TAO_DSI_GATEWAY_TEST_I_H
+
+#include "testS.h"
+
+class Simple_Server_i : public POA_Simple_Server
+{
+  // = TITLE
+  //   Simpler Server implementation
+  //
+  // = DESCRIPTION
+  //   Implements the Simple_Server interface in test.idl
+  //
+public:
+  Simple_Server_i (CORBA::ORB_ptr orb);
+  // ctor
+
+  // = The Simple_Server methods.
+  CORBA::Long test_method (CORBA::Long x,
+                           const Structure& the_in_structure,
+                           Structure_out the_out_structure,
+                           char *&name);
+
+   CORBA::Long test_val (void);
+
+   void test_val (CORBA::Long test_val);
+
+  void raise_user_exception (void);
+
+  void raise_system_exception (void);
+
+  void shutdown (void);
+
+private:
+  // The ORB
+  CORBA::ORB_var orb_;
+  CORBA::Long  vlong_;
+};
+
+#if defined(__ACE_INLINE__)
+#include "test_i.inl"
+#endif /* __ACE_INLINE__ */
+
+#endif /* TAO_DSI_GATEWAY_TEST_I_H */
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.inl b/TAO/tests/DSI_AMI_Gateway/test_i.inl
new file mode 100644
index 00000000000..bd51e3a42bd
--- /dev/null
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.inl
@@ -0,0 +1,8 @@
+// $Id$
+
+ACE_INLINE
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb)),
+     vlong_ (0)
+{
+}
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index 7703b170041..241810bc49d 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging, avoids_minimum_corba, avoids_corba_e_com
 
 project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
@@ -37,7 +36,6 @@ project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_com
 
 project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
   after += *idl
-  after += *Client
   Source_Files {
     test_dsi.cpp
     gateway.cpp
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index c0d5e122d0e..1440fbf6b7b 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 0da6e8dda4d..2a46e2da708 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl
index 33654bcadf1..4af61a63e44 100755
--- a/TAO/tests/DSI_Gateway/run_test.pl
+++ b/TAO/tests/DSI_Gateway/run_test.pl
@@ -27,7 +27,7 @@ $CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($svfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$svfile>\n";
     $SV->Kill ();
     exit 1;
@@ -35,7 +35,7 @@ if (PerlACE::waitforfile_timed ($svfile, 10) == -1) {
 
 $GW->Spawn ();
 
-if (PerlACE::waitforfile_timed ($gwfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($gwfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$gwfile>\n";
     $SV->Kill ();
     $GW->Kill (); 
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 3ee312a38ce..2e1dda6c91d 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -71,8 +71,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
               orb->object_to_string (server.in ());
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 662e7bc2b09..39c6e6ded6e 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -12,7 +12,6 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
 
 void
 DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::NVList_ptr list;
   this->orb_->create_list (0, list);
@@ -40,10 +39,8 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
       // Updates the byte order state, if necessary.
       target_request->invoke ();
     }
-  catch (const CORBA::UNKNOWN& ex)
+  catch (const CORBA::UNKNOWN&)
     {
-      ACE_UNUSED_ARG (ex);
-
       // Outgoing reply must have the same byte order as the incoming one.
       request->_tao_reply_byte_order (target_request->_tao_byte_order ());
 
@@ -64,7 +61,6 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
 CORBA::RepositoryId
 DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr)
-    ACE_THROW_SPEC (())
 {
   return CORBA::string_dup ("IDL:Simple_Server:1.0");
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index cd81121075c..5c5ea947a47 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -36,14 +36,12 @@ public:
   // ctor
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke (CORBA::ServerRequest_ptr request);
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-    )
-      ACE_THROW_SPEC (());
+    );
 
   virtual PortableServer::POA_ptr _default_POA (
     );
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index c9eeeefa7e4..550fc830999 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -14,7 +14,6 @@ Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
                               Structure_out the_out_structure,
                               char *&name)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Structure *tmp = 0;
   ACE_NEW_RETURN (tmp, Structure (the_in_structure), -1);
@@ -39,36 +38,30 @@ Simple_Server_i::test_method (CORBA::Long x,
 
 void
 Simple_Server_i::raise_user_exception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     test_exception))
 {
   throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
 Simple_Server_i::raise_system_exception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 CORBA::Long
 Simple_Server_i::test_val (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return vlong_;
 }
 
 void
 Simple_Server_i::test_val (CORBA::Long tv)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     {
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 9ec76830813..89e1c70d9f6 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -34,24 +34,17 @@ public:
   CORBA::Long test_method (CORBA::Long x,
                            const Structure& the_in_structure,
                            Structure_out the_out_structure,
-                           char *&name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           char *&name);
 
-   CORBA::Long test_val (void)
-     ACE_THROW_SPEC (( CORBA::SystemException));
+   CORBA::Long test_val (void);
 
-   void test_val (CORBA::Long test_val)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+   void test_val (CORBA::Long test_val);
 
-  void raise_user_exception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     test_exception));
+  void raise_user_exception (void);
 
-  void raise_system_exception (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void raise_system_exception (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   // The ORB
diff --git a/TAO/tests/DiffServ/README b/TAO/tests/DiffServ/README
new file mode 100644
index 00000000000..fbbbf2ae943
--- /dev/null
+++ b/TAO/tests/DiffServ/README
@@ -0,0 +1,10 @@
+$Id$
+
+This is a unit test for setting DiffServ Codepoint both in the
+requests sent and the replies received.
+
+To run (on Unix): 
+-----------------
+
+$ ./server -ORBdebuglevel 1 -p 20000
+$ ./client -ORBdebuglevel 1 -n 10 -k file://simple_servant.ior
diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp
new file mode 100644
index 00000000000..a6d9c9f8ca3
--- /dev/null
+++ b/TAO/tests/DiffServ/client.cpp
@@ -0,0 +1,164 @@
+// $Id$
+
+#include "testC.h"
+#include "ace/Get_Opt.h"
+#include "tao/Policy_Manager.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+
+static const char *ior = "file://simple_servant.ior";
+static int iterations = 1;
+
+#define IPDSFIELD_DSCP_DEFAULT  0x00
+#define IPDSFIELD_DSCP_CS1      0x08
+#define IPDSFIELD_DSCP_CS2      0x10
+#define IPDSFIELD_DSCP_CS3      0x18
+#define IPDSFIELD_DSCP_CS4      0x20
+#define IPDSFIELD_DSCP_CS5      0x28
+#define IPDSFIELD_DSCP_CS6      0x30
+#define IPDSFIELD_DSCP_CS7      0x38
+#define IPDSFIELD_DSCP_AF11     0x0A
+#define IPDSFIELD_DSCP_AF12     0x0C
+#define IPDSFIELD_DSCP_AF13     0x0E
+#define IPDSFIELD_DSCP_AF21     0x12
+#define IPDSFIELD_DSCP_AF22     0x14
+#define IPDSFIELD_DSCP_AF23     0x16
+#define IPDSFIELD_DSCP_AF31     0x1A
+#define IPDSFIELD_DSCP_AF32     0x1C
+#define IPDSFIELD_DSCP_AF33     0x1E
+#define IPDSFIELD_DSCP_AF41     0x22
+#define IPDSFIELD_DSCP_AF42     0x24
+#define IPDSFIELD_DSCP_AF43     0x26
+#define IPDSFIELD_ECT_MASK      0x02
+#define IPDSFIELD_CE_MASK       0x01
+#define IPDSFIELD_DSCP_EF       0x2E
+
+static int const dscp[] =
+{
+  IPDSFIELD_DSCP_DEFAULT ,
+  IPDSFIELD_DSCP_CS1     ,
+  IPDSFIELD_DSCP_CS2     ,
+  IPDSFIELD_DSCP_CS3     ,
+  IPDSFIELD_DSCP_CS4     ,
+  IPDSFIELD_DSCP_CS5     ,
+  IPDSFIELD_DSCP_CS6     ,
+  IPDSFIELD_DSCP_CS7     ,
+  IPDSFIELD_DSCP_AF11    ,
+  IPDSFIELD_DSCP_AF12    ,
+  IPDSFIELD_DSCP_AF13    ,
+  IPDSFIELD_DSCP_AF21    ,
+  IPDSFIELD_DSCP_AF22    ,
+  IPDSFIELD_DSCP_AF23    ,
+  IPDSFIELD_DSCP_AF31    ,
+  IPDSFIELD_DSCP_AF32    ,
+  IPDSFIELD_DSCP_AF33    ,
+  IPDSFIELD_DSCP_AF41    ,
+  IPDSFIELD_DSCP_AF42    ,
+  IPDSFIELD_DSCP_AF43    ,
+  IPDSFIELD_DSCP_EF
+};
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:x:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+        // number of itarations
+      case 'n':
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s\n"
+                           "\t-k <ior> [default is %s]\n"
+                           "\t-n <number of invocations> [defaults to %d]\n"
+                           "\n",
+                           argv [0],
+                           ior,
+                           iterations),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "");
+
+      if (parse_args (argc, argv) != 0)
+        return -1;
+
+      // Initialize and obtain reference to the Test object.
+      CORBA::Object_var client_object =
+        orb->string_to_object (ior);
+
+      Test_var server =
+        Test::_narrow (client_object.in ());
+
+      TAO::DiffservCodepoint request_dscp;
+      TAO::DiffservCodepoint reply_dscp;
+      int request_array_slot = 12;
+      int reply_array_slot = 13;
+      long request_dscp_codepoint = dscp[request_array_slot];
+      long reply_dscp_codepoint = dscp[reply_array_slot];
+      request_dscp = request_dscp_codepoint;
+      reply_dscp = reply_dscp_codepoint;
+
+      CORBA::PolicyList policy_list;
+      policy_list.length (1);
+
+      CORBA::Policy_var client_network_policy =
+        orb->_create_policy (TAO::CLIENT_NETWORK_PRIORITY_TYPE);
+
+      TAO::NetworkPriorityPolicy_var nw_priority =
+        TAO::NetworkPriorityPolicy::_narrow (client_network_policy.in ());
+
+      nw_priority->request_diffserv_codepoint (
+           request_dscp);
+
+      nw_priority->reply_diffserv_codepoint (
+           reply_dscp);
+
+      nw_priority->network_priority_model (
+        TAO::CLIENT_PROPAGATED_NETWORK_PRIORITY);
+
+      policy_list[0] = TAO::NetworkPriorityPolicy::_duplicate (nw_priority.in ());
+
+      CORBA::Object_var over_ridden_object = server->_set_policy_overrides (
+         policy_list, CORBA::SET_OVERRIDE);
+
+      policy_list[0]->destroy ();
+
+      server = Test::_narrow (over_ridden_object.in ());
+
+      // Make several invocation,
+      for (int i = 0; i < iterations; ++i)
+        {
+          server->test_method ();
+        }
+
+      server->shutdown ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DiffServ/diffserv.mpc b/TAO/tests/DiffServ/diffserv.mpc
new file mode 100644
index 00000000000..c0bcd397153
--- /dev/null
+++ b/TAO/tests/DiffServ/diffserv.mpc
@@ -0,0 +1,34 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*client) : taoexe, portableserver, diffservpolicy, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
+  source_files {
+    client.cpp
+  }
+  source_files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*server) : taoexe, portableserver, diffservpolicy, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *client
+  source_files {
+    server.cpp
+  }
+  source_files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/TAO/tests/DiffServ/run_test.pl b/TAO/tests/DiffServ/run_test.pl
new file mode 100755
index 00000000000..4cc87edc15e
--- /dev/null
+++ b/TAO/tests/DiffServ/run_test.pl
@@ -0,0 +1,54 @@
+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 ("simple_servant.ior");
+unlink $iorfile;
+
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-ORBDebuglevel 1 -p 20000");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-ORBdebuglevel 1 -p 20000");
+}
+$CL = new PerlACE::Process ("client", " -ORBdebuglevel 1 -n 10 -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/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
new file mode 100644
index 00000000000..ef64f958cc4
--- /dev/null
+++ b/TAO/tests/DiffServ/server.cpp
@@ -0,0 +1,196 @@
+// $Id$
+
+#include "testS.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "tao/debug.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
+#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
+#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
+
+#define IPDSFIELD_DSCP_DEFAULT  0x00
+#define IPDSFIELD_DSCP_CS1      0x08
+#define IPDSFIELD_DSCP_CS2      0x10
+#define IPDSFIELD_DSCP_CS3      0x18
+#define IPDSFIELD_DSCP_CS4      0x20
+#define IPDSFIELD_DSCP_CS5      0x28
+#define IPDSFIELD_DSCP_CS6      0x30
+#define IPDSFIELD_DSCP_CS7      0x38
+#define IPDSFIELD_DSCP_AF11     0x0A
+#define IPDSFIELD_DSCP_AF12     0x0C
+#define IPDSFIELD_DSCP_AF13     0x0E
+#define IPDSFIELD_DSCP_AF21     0x12
+#define IPDSFIELD_DSCP_AF22     0x14
+#define IPDSFIELD_DSCP_AF23     0x16
+#define IPDSFIELD_DSCP_AF31     0x1A
+#define IPDSFIELD_DSCP_AF32     0x1C
+#define IPDSFIELD_DSCP_AF33     0x1E
+#define IPDSFIELD_DSCP_AF41     0x22
+#define IPDSFIELD_DSCP_AF42     0x24
+#define IPDSFIELD_DSCP_AF43     0x26
+#define IPDSFIELD_ECT_MASK      0x02
+#define IPDSFIELD_CE_MASK       0x01
+#define IPDSFIELD_DSCP_EF       0x2E
+
+static int const dscp[] =
+{
+  IPDSFIELD_DSCP_DEFAULT ,
+  IPDSFIELD_DSCP_CS1     ,
+  IPDSFIELD_DSCP_CS2     ,
+  IPDSFIELD_DSCP_CS3     ,
+  IPDSFIELD_DSCP_CS4     ,
+  IPDSFIELD_DSCP_CS5     ,
+  IPDSFIELD_DSCP_CS6     ,
+  IPDSFIELD_DSCP_CS7     ,
+  IPDSFIELD_DSCP_AF11    ,
+  IPDSFIELD_DSCP_AF12    ,
+  IPDSFIELD_DSCP_AF13    ,
+  IPDSFIELD_DSCP_AF21    ,
+  IPDSFIELD_DSCP_AF22    ,
+  IPDSFIELD_DSCP_AF23    ,
+  IPDSFIELD_DSCP_AF31    ,
+  IPDSFIELD_DSCP_AF32    ,
+  IPDSFIELD_DSCP_AF33    ,
+  IPDSFIELD_DSCP_AF41    ,
+  IPDSFIELD_DSCP_AF42    ,
+  IPDSFIELD_DSCP_AF43    ,
+  IPDSFIELD_DSCP_EF
+};
+
+
+class Test_i : public POA_Test
+{
+public:
+  Test_i (CORBA::ORB_ptr orb);
+
+  void test_method (void);
+
+  void shutdown (void);
+
+private:
+  CORBA::ORB_var orb_;
+};
+
+Test_i::Test_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+void
+Test_i::test_method (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Test_i::test_method\n"));
+}
+
+void
+Test_i::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
+
+static const char *simple_servant_ior_file = "simple_servant.ior";
+
+void
+create_object (PortableServer::POA_ptr poa,
+               CORBA::ORB_ptr orb,
+               Test_i *servant,
+               const char *filename)
+{
+  // Register with poa.
+  PortableServer::ObjectId_var id =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object =
+    poa->id_to_reference (id.in ());
+
+  CORBA::String_var ior =
+    orb->object_to_string (object.in ());
+
+  ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
+
+  FILE *output_file= ACE_OS::fopen (filename, "w");
+  ACE_OS::fprintf (output_file, "%s", ior.in ());
+  ACE_OS::fclose (output_file);
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::Object_var object;
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "");
+
+      // RootPOA.
+      object =
+        orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      TAO::DiffservCodepoint request_dscp;
+      TAO::DiffservCodepoint reply_dscp;
+      int request_array_slot = 3;
+      int reply_array_slot = 2;
+      long request_dscp_codepoint = dscp[request_array_slot];
+      long reply_dscp_codepoint = dscp[reply_array_slot];
+      request_dscp = request_dscp_codepoint;
+      reply_dscp = reply_dscp_codepoint;
+
+      TAO::NetworkPriorityModel npm = TAO::CLIENT_PROPAGATED_NETWORK_PRIORITY;
+
+      CORBA::PolicyList policy_list;
+      policy_list.length (1);
+
+      CORBA::Policy_var npp =
+        orb->_create_policy (TAO::NETWORK_PRIORITY_TYPE);
+
+      TAO::NetworkPriorityPolicy_var nw_priority =
+        TAO::NetworkPriorityPolicy::_narrow (npp.in ());
+
+      nw_priority->network_priority_model (npm);
+
+      nw_priority->request_diffserv_codepoint (request_dscp);
+
+      nw_priority->reply_diffserv_codepoint (reply_dscp);
+
+      policy_list[0] = TAO::NetworkPriorityPolicy::_duplicate (nw_priority.in ());
+
+      PortableServer::POA_var child_poa =
+        root_poa->create_POA ("Child_POA",
+                              poa_manager.in (),
+                              policy_list);
+
+      policy_list[0]->destroy ();
+
+      // Servant.
+      Test_i servant (orb.in ());
+
+      // Create the first object in Root POA
+      create_object (child_poa.in (),
+                     orb.in (),
+                     &servant,
+                     simple_servant_ior_file);
+
+      // Activate POA manager.
+      poa_manager->activate ();
+
+      // Start ORB event loop.
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Unexpected exception caught:");
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DiffServ/test.idl b/TAO/tests/DiffServ/test.idl
new file mode 100644
index 00000000000..3ed4d3d20ea
--- /dev/null
+++ b/TAO/tests/DiffServ/test.idl
@@ -0,0 +1,9 @@
+//
+// $Id$
+//
+
+interface Test
+{
+  void test_method ();
+  oneway void shutdown ();
+};
diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl
index b1b5a2d88aa..06eab10a14b 100755
--- a/TAO/tests/DynAny_Test/run_test.pl
+++ b/TAO/tests/DynAny_Test/run_test.pl
@@ -21,8 +21,8 @@ sub run_test
     else {
         $BT = new PerlACE::Process ("basic_test", "-t $type");
     }
-    my $basictest = $BT->SpawnWaitKill (10);
-    
+    my $basictest = $BT->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+
     if ($basictest != 0) {
         print STDERR "ERROR: basic test for ($type) returned $basictest\n";
         $status = 1;
diff --git a/TAO/tests/DynUnion_Test/DynUnionTest.cpp b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
new file mode 100644
index 00000000000..6d13995b006
--- /dev/null
+++ b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
@@ -0,0 +1,167 @@
+// $Id$
+
+#include "dynanyC.h"
+#include "tao/DynamicAny/DynamicAny.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+
+// Creates DynUnion using typecodes generated through IDL compiler.
+int runStatic(CORBA::ORB_ptr orb)
+{
+  try
+    {
+        CORBA::Object_var obj =
+          orb->resolve_initial_references("DynAnyFactory");
+
+        DynamicAny::DynAnyFactory_var dfact =
+          DynamicAny::DynAnyFactory::_narrow(obj.in ());
+
+        if (CORBA::is_nil (dfact.in ()))
+          {
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Nil dynamic any factory after narrow\n"),
+                              -1);
+          }
+
+        DynamicAny::DynAny_var dany =
+           dfact->create_dyn_any_from_type_code(DynAnyTest::_tc_EventData);
+
+        DynamicAny::DynUnion_var dunion =
+          DynamicAny::DynUnion::_narrow(dany.in ());
+
+        DynamicAny::DynAny_var disc = dunion->get_discriminator();
+
+        DynamicAny::DynEnum_var denum =
+          DynamicAny::DynEnum::_narrow(disc.in ());
+
+        if (CORBA::is_nil (denum.in ()))
+          {
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Nil dynamic enum after narrow\n"),
+                              -1);
+          }
+
+        ACE_DEBUG ((LM_DEBUG, "Static Test Passed\n"));
+    }
+  catch (const CORBA::Exception & ex)
+    {
+      ex._tao_print_exception ("runStatic");
+      return -1;
+    }
+
+  return 0;
+}
+
+// Creates DynUnion from typecode created programmatically
+
+int runDynamic(CORBA::ORB_ptr orb)
+{
+  try
+    {
+        // Create typecode for EventKind.
+
+        CORBA::EnumMemberSeq eseq;
+
+        eseq.length(2);
+
+        eseq[0] = CORBA::string_dup("ALARM_EVENT");
+        eseq[1] = CORBA::string_dup("LOG_EVENT");
+
+        CORBA::TypeCode_var eventKindTc;
+
+        eventKindTc = orb->create_enum_tc("IDL:DynAnyTest/EventKind:1.0",
+                                          "EventKind",
+                                          eseq);
+
+        // Create typecode for EventData. EventKind tc is used.
+
+        CORBA::Any label;
+        CORBA::UnionMemberSeq useq;
+
+        useq.length(2);
+
+        label <<= DynAnyTest::ALARM_EVENT;
+        useq[0].name = CORBA::string_dup("ev_data");
+        useq[0].label = label;
+        useq[0].type = CORBA::TypeCode::_duplicate(CORBA::_tc_any);
+        useq[0].type_def = CORBA::IDLType::_nil ();
+
+        label <<= DynAnyTest::LOG_EVENT;
+        useq[1].name = CORBA::string_dup("ev_desc");
+        useq[1].label = label;
+        useq[1].type = CORBA::TypeCode::_duplicate(CORBA::_tc_string);
+        useq[1].type_def = CORBA::IDLType::_nil ();
+
+        CORBA::TypeCode_var eventDataTc;
+
+        eventDataTc = orb->create_union_tc("IDL:DynAnyTest/EventData:1.0",
+                                           "EventData",
+                                           eventKindTc.in (),
+                                           useq);
+
+        // Now create DynUnion
+
+        CORBA::Object_var obj = orb->resolve_initial_references("DynAnyFactory");
+
+        DynamicAny::DynAnyFactory_var dfact =
+                    DynamicAny::DynAnyFactory::_narrow(obj.in ());
+
+        if (CORBA::is_nil (dfact.in ()))
+          {
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Nil dynamic any factory after narrow\n"),
+                              -1);
+          }
+
+        DynamicAny::DynAny_var dany =
+                    dfact->create_dyn_any_from_type_code(eventDataTc.in ());
+
+        DynamicAny::DynUnion_var dunion =
+          DynamicAny::DynUnion::_narrow(dany.in ());
+
+        DynamicAny::DynAny_var disc = dunion->get_discriminator();
+
+        DynamicAny::DynEnum_var denum =
+          DynamicAny::DynEnum::_narrow(disc.in ());
+
+        // This fails. The type of discriminator is ulong
+        if (CORBA::is_nil (denum.in ()))
+          {
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Nil dynamic enum after narrow\n"),
+                              -1);
+          }
+
+        ACE_DEBUG ((LM_DEBUG, "Dynamic Test Passed\n"));
+
+        denum->destroy();
+        dunion->destroy();
+    }
+  catch (const CORBA::Exception & ex)
+    {
+      ex._tao_print_exception ("Dynamic Test Failed with exception");
+    }
+  return 0;
+}
+
+int main(int argc, char * argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+
+      if (runStatic(orb.in()) != 0)
+        return -1;
+
+      if (runDynamic(orb.in()) != 0)
+        return -1;
+  }
+  catch (const CORBA::Exception & ex)
+    {
+      ex._tao_print_exception ("Tests failed with exception");
+      return 1;
+    }
+
+  return 0;
+}
+
diff --git a/TAO/tests/DynUnion_Test/dynany.idl b/TAO/tests/DynUnion_Test/dynany.idl
new file mode 100644
index 00000000000..bd245a5fcf0
--- /dev/null
+++ b/TAO/tests/DynUnion_Test/dynany.idl
@@ -0,0 +1,11 @@
+// $Id$
+
+module DynAnyTest {
+
+    enum EventKind {ALARM_EVENT, LOG_EVENT};
+
+    union EventData switch (EventKind) {
+        case ALARM_EVENT:        any        ev_data;
+        case LOG_EVENT:          string     ev_desc;
+    };
+};
diff --git a/TAO/tests/DynUnion_Test/dynunion_test.mpc b/TAO/tests/DynUnion_Test/dynunion_test.mpc
new file mode 100644
index 00000000000..dd8a66703b9
--- /dev/null
+++ b/TAO/tests/DynUnion_Test/dynunion_test.mpc
@@ -0,0 +1,18 @@
+// $Id$
+
+project(*IDL): dynamicany {
+  IDL_Files {
+    dynany.idl
+  }
+  custom_only = 1
+}
+
+
+project(dynuniontest): dynamicany, typecodefactory {
+  exename = dynuniontest
+  after += *IDL
+  Source_Files {
+    DynUnionTest.cpp
+    dynanyC.cpp
+  }
+}
diff --git a/TAO/tests/DynUnion_Test/run_test.pl b/TAO/tests/DynUnion_Test/run_test.pl
new file mode 100755
index 00000000000..2cec503b7fb
--- /dev/null
+++ b/TAO/tests/DynUnion_Test/run_test.pl
@@ -0,0 +1,30 @@
+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 "Dyn Union\n\n";
+
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("dynuniontest");
+}
+else {
+    $SV = new PerlACE::Process ("dynuniontest");
+}
+
+
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
+
+if ($server != 0) {
+    print STDERR "ERROR: Dyn Union returned $server \n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 3c94b1f5d10..6dd9084f5ad 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Explicit_Event_Loop/run_test.pl b/TAO/tests/Explicit_Event_Loop/run_test.pl
index 36115d54074..3b87353aa98 100755
--- a/TAO/tests/Explicit_Event_Loop/run_test.pl
+++ b/TAO/tests/Explicit_Event_Loop/run_test.pl
@@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", "file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -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 (60);
 
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index c9501977326..1deb79a4052 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -60,7 +60,6 @@ parse_args (int argc, char *argv[])
 TimeOfDay
 Time_impl::
 get_gmt ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_t time_now = time (0);
   struct tm *time_p = gmtime (&time_now);
@@ -114,7 +113,12 @@ main (int argc, char *argv[])
       Time_impl time_servant;
 
       // Write its stringified reference to stdout.
-      Time_var tm = time_servant._this ();
+      PortableServer::ObjectId_var id =
+        poa->activate_object (&time_servant);
+
+      CORBA::Object_var object = poa->id_to_reference (id.in ());
+
+      Time_var tm = Time::_narrow (object.in ());
 
       CORBA::String_var str = orb->object_to_string (tm.in ());
 
diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h
index 4bf7d7c1b1f..63a80d2c89f 100644
--- a/TAO/tests/Explicit_Event_Loop/server.h
+++ b/TAO/tests/Explicit_Event_Loop/server.h
@@ -26,8 +26,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeOfDay get_gmt (void);
 };
 
 #endif /* server_HH_ */
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index c4a63433eb6..fc0b34451e7 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -22,28 +22,24 @@ Counter_Servant::~Counter_Servant (void)
 
 void
 Counter_Servant::increment (/**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->count_;
 }
 
 CORBA::Long
 Counter_Servant::get_count (/**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->count_;
 }
 
 void
 Counter_Servant::reset (/**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->count_ = 0;
 }
 
 void
 Counter_Servant::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->policy_tester_->shutdown ();
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index 29e6e3e7334..8703a2d95a9 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -35,17 +35,13 @@ public:
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void increment (void);
 
-  virtual CORBA::Long get_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get_count (void);
 
-  virtual void reset (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 protected:
   CORBA::Long count_;
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 343ee82c6ce..780cb0f5cb8 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -27,7 +27,6 @@ project(*Server): strategies, rt_server {
 project(*Client): strategies, rt_server {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     Policy_Tester.cpp
     Policy_Verifier.cpp
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 2670017a27f..1b858b7697c 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -48,7 +48,7 @@ Policy_Tester::init (int argc,
 {
   // ORB Initialization.
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 422f0f198ae..1afab480fa9 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -22,7 +22,7 @@ Policy_Verifier::init (int argc,
                        char *argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_init (argc, argv);
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 52fc9ed1247..855c12a76c4 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -57,7 +57,7 @@ int main (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       Fl_Window window (300, 100);
 
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index e7ccab895fc..f9924be0828 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -77,8 +77,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in (), &sw);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index ce5c85fec29..467b010daa7 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -15,21 +15,18 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
 
 void
 Simple_Server_i::set_x_angle (CORBA::Long x)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->set_x_angle (x);
 }
 
 void
 Simple_Server_i::set_y_angle (CORBA::Long y)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->set_y_angle (y);
 }
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index 27f2249229f..f4f97040b86 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -62,12 +62,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void set_x_angle (CORBA::Long x)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-  void set_y_angle (CORBA::Long y)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (void)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+  void set_x_angle (CORBA::Long x);
+  void set_y_angle (CORBA::Long y);
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 8c2ae1263cc..2009ee746b0 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
 
   Source_Files {
     test_i.cpp
@@ -42,7 +41,6 @@ project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c
 
 project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Middle
 
   Source_Files {
     test_i.cpp
@@ -73,7 +71,6 @@ project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_com
 
 project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Ping
 
   Source_Files {
     ping_i.cpp
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 30fc41d02de..21d8c75676f 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -71,7 +71,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -108,8 +108,13 @@ main (int argc, char *argv[])
 
       Callback_i callback_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&callback_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Callback_var callback =
-        callback_impl._this ();
+        Callback::_narrow (object_act.in ());
 
       for (int i = 0; i != niterations; ++i)
         {
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index fd50f9f9af2..061761b2b50 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -95,8 +95,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(middle_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (middle_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var middle =
-        middle_impl->_this ();
+        Simple_Server::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (middle.in ());
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index 86045e54539..258ae146ddb 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -82,8 +82,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       PingObject_var server =
-        server_impl->_this ();
+        PingObject::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index a952dec9087..44c4ff825aa 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -10,27 +10,23 @@ ACE_RCSID(Faults, test_i, "$Id$")
 
 void
 PingObject_i::ping (PingObject_ptr callback)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   callback->pong ();
 }
 
 void
 PingObject_i::pong (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 PingObject_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
 PingObject_i::_default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 00bdba4fee1..79ec976b05c 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -34,15 +34,11 @@ public:
   // ctor
 
   // = The PingObject interface methods
-  void ping (PingObject_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void pong (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void ping (PingObject_ptr callback);
+  void pong (void);
+  void shutdown (void);
+
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index da2e90bc26f..2103c39c8fc 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -161,8 +161,13 @@ main (int argc, char *argv[])
       PingObject_i callback_impl (orb.in (),
                             persistent_poa.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&callback_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       PingObject_var callback =
-        callback_impl._this ();
+        PingObject::_narrow (object_act.in ());
 
 
       // If the ior_output_file exists, output the ior to it
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index aea56f47bf8..7f3da2383f6 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -71,8 +71,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var server_owner_transfer(server_impl);
 
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl->_this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index bf03c9cbc8f..b8f5d176105 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -12,7 +12,6 @@ ACE_RCSID(Failure, test_i, "$Id$")
 
 void
 Callback_i::shutdown (CORBA::Boolean is_clean)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
     {
@@ -39,7 +38,6 @@ CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback,
                               CORBA::Boolean is_clean,
                               Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
@@ -54,7 +52,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 
 void
 Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
     {
@@ -73,7 +70,6 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -84,7 +80,6 @@ CORBA::Long
 Middle_i::test_method (CORBA::Boolean do_callback,
                        CORBA::Boolean is_clean,
                        Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int i = 0;
   for (; i != 10; ++i)
@@ -110,14 +105,12 @@ Middle_i::test_method (CORBA::Boolean do_callback,
 
 void
 Middle_i::shutdown_now (CORBA::Boolean is_clean)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->server_->shutdown_now (is_clean);
 }
 
 void
 Middle_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index fd8310c07f4..651fc6a33cd 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -32,8 +32,7 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Boolean is_clean)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (CORBA::Boolean is_clean);
   // The callback method
 
 private:
@@ -56,14 +55,11 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           Callback_ptr callback);
 
-  void shutdown_now (CORBA::Boolean is_clean)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -86,14 +82,11 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           Callback_ptr callback);
 
-  void shutdown_now (CORBA::Boolean is_clean)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 194e99a4b04..3651047c5eb 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -11,12 +11,10 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
   Source_Files {
-    File_i.cpp
-    server.cpp
-  }
-  Source_Files {
     FileC.cpp
     FileS.cpp
+    File_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -24,12 +22,9 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
-  Source_Files {
-    client.cpp
-  }
   Source_Files {
     FileC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 3622604315c..39a720c31ee 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -44,8 +44,6 @@ FileImpl::System::_default_POA (void)
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   // Do an ACE_OS::open
   ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
@@ -54,7 +52,7 @@ FileImpl::System::open (const char *file_name,
 
   if (file_descriptor == ACE_INVALID_HANDLE)
     {
-      ACE_THROW_RETURN (File::IOError (), 0);
+      throw File::IOError ();
     }
 
   char file_descriptor_buffer[BUFSIZ];
@@ -151,8 +149,6 @@ FileImpl::Descriptor::fd (void)
 
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -164,13 +160,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
   if (len > 0)
     return len;
 
-  ACE_THROW_RETURN (File::IOError (), 0);
+  throw File::IOError ();
 }
 
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -184,14 +178,12 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes)
                                              1);
 
   File::Descriptor::DataBuffer::freebuf (buffer);
-  ACE_THROW_RETURN (File::IOError (), 0);
+  throw File::IOError ();
 }
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd ();
 
@@ -199,14 +191,13 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
                                                     offset,
                                                     whence);
   if (result == -1)
-    ACE_THROW_RETURN (File::IOError (), 0);
+    throw File::IOError ();
 
   return (CORBA::ULong) result;
 }
 
 void
 FileImpl::Descriptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index 1a6ba088622..3b4858c1c18 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -37,24 +37,16 @@ public:
     PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-    // Reads num_bytes from the file and returns it
-                       File::IOError));
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes);
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+                                CORBA::Long whence);
     // seek to the offset in file from whence
 
-    virtual void destroy (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (void);
     // closes the file corresponding to the requested ObjectID
 
   private:
@@ -81,9 +73,7 @@ public:
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       File::IOError));
+                               CORBA::Long flags);
     // Opens a file ,creates a Descriptor reference with the
     // ACE_HANDLE and returns that reference
 
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index cfb213a7855..4a40ea6b316 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -154,7 +154,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      orb = CORBA::ORB_init (argc, argv, 0);
+      orb = CORBA::ORB_init (argc, argv);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 6099a4ca342..cf5db4c23bc 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index 869c1d241c4..ee705f01845 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index 14aa76231d8..cb556184762 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index f1133b13c4e..e99b92be337 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -61,8 +61,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index f133527feaf..120c6f7b96b 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -10,7 +10,6 @@ ACE_RCSID(Forwarding, test_i, "$Id$")
 
 CORBA::Boolean
 Simple_Server_i::test_is_a (const char * /* type */)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type));
   return 0;
@@ -18,7 +17,6 @@ Simple_Server_i::test_is_a (const char * /* type */)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index 36ea3f16ad1..60670e13d54 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean test_is_a (const char * type)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index 857550b9eef..7af2ed8b0ad 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index a3f70b42eb9..81ee459c199 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -13,8 +13,6 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 
 void
 Payload_Receiver::more_data (const Test::Payload &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Payload_Receiver::Invalid_Payload))
 {
   ++this->count_;
 
@@ -31,7 +29,6 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 void
 Payload_Receiver::shutdown (void)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index 3ea7ab3acaa..41b4af2ac29 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -20,12 +20,9 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Payload_Receiver::Invalid_Payload));
+  virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   int get_count (void) const;
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 7205e3bf539..13e8f506ff6 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (payload_receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this ();
+        Test::Payload_Receiver::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (payload_receiver.in ());
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index da443e12eab..1da64d18952 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -13,8 +13,6 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 
 void
 Payload_Receiver::more_data (const Test::Payload &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Payload_Receiver::Invalid_Payload))
 {
   ++this->count_;
 
@@ -31,7 +29,6 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 void
 Payload_Receiver::shutdown (void)
-   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index e48ab5b2b05..24717072a73 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -20,12 +20,9 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Payload_Receiver::Invalid_Payload));
+  virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
   int get_count (void) const;
 
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 6a56a1ab3c1..bfbe740949f 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index bbebd287918..60a67b14c88 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -11,9 +11,9 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
-    server.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    server.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index 8484dce2280..ea6126a7599 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -40,8 +40,13 @@ namespace Test
                         1);
         PortableServer::ServantBase_var owner_transfer (test_impl);
 
+        PortableServer::ObjectId_var id =
+          root_poa->activate_object (test_impl);
+
+        CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
         Hang_var test =
-          test_impl->_this ();
+          Hang::_narrow (object.in ());
 
         CORBA::String_var ior =
           orb->object_to_string (test.in ());
diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h
index 706fc513fee..2008a85d139 100644
--- a/TAO/tests/Hang_Shutdown/test_i.h
+++ b/TAO/tests/Hang_Shutdown/test_i.h
@@ -18,7 +18,6 @@ namespace Test
     // = The skeleton methods
     virtual void send_stuff (const char* str,
                              CORBA::Boolean flag)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) - [%C]\n", str));
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index 3bb0a772b76..df5dc90d3d9 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index 066f4725953..533fb3def3b 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 9f58a01ac0f..7b5d3ae87d6 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -38,17 +38,14 @@ main (int argc, char *argv[])
 {
   try
     {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior);
+      CORBA::Object_var tmp = orb->string_to_object(ior);
 
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in ());
+      Test::Hello_var hello = Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -58,8 +55,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      CORBA::String_var the_string =
-        hello->get_string ();
+      CORBA::String_var the_string = hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index d54cee175d5..442317e303f 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -55,23 +55,25 @@ main (int argc, char *argv[])
                            " (%P|%t) Panic: nil RootPOA\n"),
                           1);
 
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager ();
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      Hello *hello_impl;
+      Hello *hello_impl = 0;
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in ()),
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
-      Test::Hello_var hello =
-        hello_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
 
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in ());
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello = Test::Hello::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index 19e8544dde1..ee4dac0e4d1 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -14,23 +14,23 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 
 Test::HelloWorld_ptr
 Hello::get_helloworld (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   HelloWorld *hello_world;
   ACE_NEW_THROW_EX (hello_world,
           HelloWorld,
 		    CORBA::NO_MEMORY ());
 
-  PortableServer::ObjectId_var oid =
-    poa_->activate_object (hello_world);
+  PortableServer::ObjectId_var id =
+    this->poa_->activate_object (hello_world);
 
-  Test::HelloWorld_var hw = hello_world->_this ();
+  CORBA::Object_var object = this->poa_->id_to_reference (id.in ());
+
+  Test::HelloWorld_var hw = Test::HelloWorld::_narrow (object.in ());
   return hw._retn ();
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index c7fe9919faf..39153a73819 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -19,11 +19,9 @@ public:
   /// Constructor
   Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
-  virtual Test::HelloWorld_ptr get_helloworld (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::HelloWorld_ptr get_helloworld (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index d22d23a1041..11b1b561a3a 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -13,11 +13,11 @@ project(ICMG_Any_Bug_Hello_IDL): taoidldefaults {
 project(ICMG_Any_Bug_Hello_Server): taoserver {
   after += ICMG_Any_Bug_Hello_IDL
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     Hello.cpp
     HelloWorld.cpp
     server.cpp
-    TestS.cpp
-    TestC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index 2c5653bbfdb..a3811dfb3d9 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -14,7 +14,6 @@ HelloWorld::HelloWorld (void)
 
 char *
 HelloWorld::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO Any Implementation Works!");
 }
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index 85c9da63242..ec68e481c8b 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
@@ -18,8 +18,7 @@ public:
   HelloWorld (void);
   /// Constructor
 
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 };
 
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 5f1077eee9d..087a330e12d 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index 9804e48bca5..41afe2146e6 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
 		      1);
       PortableServer::ServantBase_var owner_transfer (hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index c9edfb66edc..a9ad679f56c 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -34,13 +34,13 @@ project(*Main): taoserver, messaging {
   IDL_Files {
     idlflags += -GC -GH -Gd -GA -GT
     anonymous.idl
+    valuetype.idl
     constants.idl
     generic_object.idl
     keywords.idl
     pragma.idl
     repo_id_mod.idl
     typedef.idl
-    valuetype.idl
     array_only.idl
     typecode.idl
   }
diff --git a/TAO/tests/IDL_Test/constants.idl b/TAO/tests/IDL_Test/constants.idl
index 4d95752d59e..732baa4eb26 100644
--- a/TAO/tests/IDL_Test/constants.idl
+++ b/TAO/tests/IDL_Test/constants.idl
@@ -66,6 +66,14 @@ const double take = 2e3;
 const double dip = 1.797693134862315E+308;
 const double trouble = 2.2250738585072014E-308;
 
+// const values created through mathematic operations
+const long neg = -8;
+const long sub1 = 0x10 - 0x01;
+const long sub2 = 0x10 + (-0x01);
+const unsigned long add1 = 16 + 1;
+const unsigned long mul1 = 0x80 * 0x70;
+const unsigned long div1 = 99 / 12;
+
 // The original Sun code for bitwise operators was broken.
 
 const unsigned short stuff = ~0;
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 52b623edf02..c0fd63e717a 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -106,7 +106,9 @@ main (int argc , char *argv[])
       CORBA::Object_var obj;
 
       hello_i h;
-      obj = h._this ();
+      PortableServer::ObjectId_var id = root_poa->activate_object (&h);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = hello::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/hello:1.0"))
@@ -117,7 +119,9 @@ main (int argc , char *argv[])
         }
 
       goodbye_i g;
-      obj = g._this ();
+      id = root_poa->activate_object (&g);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = goodbye::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/goodbye:1.0"))
@@ -128,7 +132,9 @@ main (int argc , char *argv[])
         }
 
       sayonara_i s;
-      obj = s._this ();
+      id = root_poa->activate_object (&s);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = salutation::sayonara::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:hammer.com/salutation/sayonara:1.0"))
@@ -139,7 +145,9 @@ main (int argc , char *argv[])
         }
 
       ciao_i c;
-      obj = c._this ();
+      id = root_poa->activate_object (&c);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = ciao::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/ciao:1.0"))
@@ -150,7 +158,9 @@ main (int argc , char *argv[])
         }
 
       aloha_i a;
-      obj = a._this ();
+      id = root_poa->activate_object (&a);
+      obj = root_poa->id_to_reference (id.in ());
+      obj = aloha::_narrow (obj.in ());
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/aloha:1.0"))
diff --git a/TAO/tests/IDL_Test/sequence.idl b/TAO/tests/IDL_Test/sequence.idl
index 9c3b32da80e..3e5b9415ed9 100644
--- a/TAO/tests/IDL_Test/sequence.idl
+++ b/TAO/tests/IDL_Test/sequence.idl
@@ -21,6 +21,21 @@
 
 #include "tao/OctetSeq.pidl"
 
+struct myfoostruct;
+typedef sequence<myfoostruct> myfoostructseq;
+
+struct myfoostruct
+{
+  string str_mem;
+  myfoostructseq rec_mem;
+};
+
+exception nasty
+{
+  string id;
+  myfoostruct rec_info;
+};
+
 // This will produce a link error if a handcraft we have added to
 // tao/OctetSeqC.h is ever removed.
 typedef sequence<CORBA::OctetSeq> OctetSeqSeq;
diff --git a/TAO/tests/IDL_Test/typedef.idl b/TAO/tests/IDL_Test/typedef.idl
index 95efd07bc91..27248fc3374 100644
--- a/TAO/tests/IDL_Test/typedef.idl
+++ b/TAO/tests/IDL_Test/typedef.idl
@@ -9,7 +9,7 @@
 //    typedef.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.
@@ -23,8 +23,8 @@
 // Must keep unaliasing until all levels of typedef
 // are removed.
 
-// This is also a test of arrays of arrays. Once 
-// upon a time, the generated CDR operators of such 
+// This is also a test of arrays of arrays. Once
+// upon a time, the generated CDR operators of such
 // animals wouldn't compile on all platforms.
 
 typedef char TAO_A5[5];
@@ -45,21 +45,21 @@ typedef TAO_V5 TAO_Z5[5];
 
 // Need to make sure that the arg traits specializations for each
 // typedef has a unique #ifndef guard.
-module TestModule 
+module TestModule
 {
- 	typedef string<32> typedef_1;	
-	typedef string<32> typedef_2;
+   typedef string<32> typedef_1;
+  typedef string<32> typedef_2;
 
-	interface TestInterface 
-	{		
-		void set_typedef_1 (in TestModule::typedef_1 typ1);
+  interface TestInterface
+  {
+    void set_typedef_1 (in TestModule::typedef_1 typ1);
     void set_typedef_2 (in TestModule::typedef_2 typ2);
-  };	
+  };
 };
 
 // Caught failure of arg traits generation for the 2nd typedef.
 module bug_2124
-{   
+{
    typedef string<10> MyString;
    typedef MyString OtherString;
 
@@ -114,5 +114,12 @@ module First
   typedef string<32> FirstString;
 };
 
+// The anonymous base type is shared by these typedefs, but it
+// must be destroyed only once.
+module CommaList
+{
+  typedef sequence<double> Dubble, Dubbel, Toil, Trouble;
+};
+
 
 
diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl
index 30064ac3360..fcf6b53c2b6 100644
--- a/TAO/tests/IDL_Test/union.idl
+++ b/TAO/tests/IDL_Test/union.idl
@@ -9,7 +9,7 @@
 //    union.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.
@@ -38,9 +38,9 @@ union Data switch (DataType)
 
 // Explicit default case
 
-module Necessary 
+module Necessary
 {
-  // It is important to have a module, in which 
+  // It is important to have a module, in which
   // the following union is declared.
 
   typedef long Result;
@@ -52,25 +52,50 @@ module Necessary
     };
 
   union WhichResult switch (Kind )
-    {   
+    {
       case e_Result: Result  m_Result;
       default: long m_Unused;
     };
 };
 
+// Union with negative cases
+// At the moment, the SunCC preprocessor separates the negative
+// sign from the number.  This causes problems for the scanner/lexer
+// used by tao_idl.
+#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x580)
+union foo switch (short)
+{
+  case -3:
+  case  4:
+  case -1: string foo_str_member;
+  default: long   foo_iface_member;
+  case  0: long   foo_iface_member2;
+};
+#endif /* !__SUNPRO_CC || __SUNPRO_CC > 0x580 */
+
 // Make sure that CORBA_Any::to_* is used everywhere.
 module UnionDiscTest
-  {
-   	union BooleanUnion switch (boolean) 
-      {
-      	case TRUE: string value;
-   		};
+{
+  union BooleanUnion switch (boolean)
+    {
+      case TRUE: string value;
+    };
 
-    union CharUnion switch (char)
-      {
-        case 'a': string value;
-      };
-	};
+  union CharUnion switch (char)
+    {
+      case 'a': string value;
+    };
+};
+
+// AnyUnion
+enum AnyUnionEnum {
+  ANYUNIONENUM2
+};
+
+union MyAnyUnion switch (AnyUnionEnum) {
+  case ANYUNIONENUM2:
+    any my_any;
+};
 
 
 // Nested unions
@@ -94,7 +119,7 @@ enum disc_outer
 };
 
 union inner1 switch (disc1)
-{ 
+{
   case one: short s;
   case two: long l;
 };
@@ -111,64 +136,64 @@ union outer switch (disc_outer)
   case out2: inner2 second;
 };
 
-module UnionTest3 
+module UnionTest3
 {
-   enum ValChoice 
+   enum ValChoice
      {
-    	 intVal,
-    	 realVal
-   	 };
+       intVal,
+       realVal
+     };
 
-   union ValType switch(ValChoice) 
+   union ValType switch(ValChoice)
      {
        case intVal: long integerValue;
        case realVal: double realValue;
-   	 };
+     };
 
-   struct UpType 
+   struct UpType
      {
        ValType high;
        ValType low;
-   	 };
+     };
 
-   struct DownType 
+   struct DownType
      {
        ValType high;
        ValType low;
-   	 };
+     };
 
-   enum IndChoice 
+   enum IndChoice
      {
        up_Level,
        down_Level
-   	 };
+     };
 
-   union IndType switch(IndChoice) 
+   union IndType switch(IndChoice)
      {
        case up_Level: UpType up;
        case down_Level: DownType down;
-   	 };
+     };
 };
 
 // Make sure inner union is generated in header file with
 // proper scoping (or lack thereof) in its name, depending
 // on the platform.
-enum XType 
-{ 
-  X_A 
+enum XType
+{
+  X_A
 };
 
-enum ZType 
-{ 
-  Z_A 
+enum ZType
+{
+  Z_A
 };
 
-union X switch (XType) 
+union X switch (XType)
 {
   case X_A:
-    struct Y 
+    struct Y
       {
-        union Z switch (ZType) 
+        union Z switch (ZType)
         {
           case Z_A: long a;
         } u;
@@ -213,24 +238,24 @@ struct Element
   } Value;
 };
 
-// A fix to the IDL compiler's typecoce generation created
+// A fix to the IDL compiler's typecode generation created
 // a problem with unions that have more than one member,
 // where any member except the last is itself a scoped type.
 // This is the simplest example that will reproduce the problem,
 // if it ever reappears.
-enum TestOneEnum 
-{ 
-  TALL, 
+enum TestOneEnum
+{
+  TALL,
   SCHORT
 };
 
-enum TestTwoEnum 
-{ 
-  LIGHT, 
+enum TestTwoEnum
+{
+  LIGHT,
   DARK
 };
 
-union TestUnion switch (short) 
+union TestUnion switch (short)
 {
   case 1: TestOneEnum oneEnum;
   case 2: TestTwoEnum twoEnum;
@@ -248,23 +273,23 @@ union decl_heavy_union switch (short)
       ONE,
       TWO
     } m_which;
-  case 2: 
-    enum en 
+  case 2:
+    enum en
     {
-      a, 
-      b, 
+      a,
+      b,
       c
     } m_en_arr[10];
-  case 3: 
-    struct st 
+  case 3:
+    struct st
     {
-      long a; 
+      long a;
       char b;
     } m_st_arr[10];
-  case 4: 
-    union un switch (long) 
+  case 4:
+    union un switch (long)
     {
-      case 1: long a; 
+      case 1: long a;
       case 2: char b;
     } m_un_arr[10];
 };
diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl
index a31a8eb7938..7a53a52193c 100644
--- a/TAO/tests/IDL_Test/valuetype.idl
+++ b/TAO/tests/IDL_Test/valuetype.idl
@@ -33,6 +33,15 @@ valuetype MyValueType
   factory make_one ();
 };
 
+enum ValueSort2 {
+  SYMBOL_TYPE2
+};
+
+union MyValueTypeUnion switch (ValueSort2) {
+  case SYMBOL_TYPE2:
+    MyValueType symbol_val;
+};
+
 // The original bug was caused by the default factory visitor
 // constructing a temporary arg of this field type. When the
 // arg was then destroyed, it called its base destroyer
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index e9694858821..fc4222d3e30 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -14,6 +14,5 @@ bogus::~bogus()
 
 void
 bogus::noop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index dceebf65eb0..65a72f2be16 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -15,8 +15,7 @@ public:
   bogus ();
   virtual ~bogus ();
 
-  virtual void noop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void noop (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index afeda84afa9..0f71b782372 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -16,7 +16,7 @@ main (int argc, char *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -28,7 +28,12 @@ main (int argc, char *argv[])
 
       bogus* bogus_impl = new bogus();
       PortableServer::ServantBase_var owner_transfer(bogus_impl);
-      Test::bogus_var b = bogus_impl->_this();
+      PortableServer::ObjectId_var id =
+        rp->activate_object (bogus_impl);
+
+      CORBA::Object_var object = rp->id_to_reference (id.in ());
+
+      Test::bogus_var b = Test::bogus::_narrow (object.in ());
       CORBA::String_var ior =
         orb->object_to_string (b.in());
 
diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp
index 3bb0a772b76..df5dc90d3d9 100644
--- a/TAO/tests/IPV6/Hello.cpp
+++ b/TAO/tests/IPV6/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 02e2ddc1120..2e4131f6280 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index 436ff516b0b..ef4e8501a8c 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index 8c998950dd3..edfe2b98049 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index a702a184f19..0a6decbfecd 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -25,7 +25,6 @@ INS_i::orb (CORBA::ORB_ptr o)
 
 char *
 INS_i::test_ins (void)
-ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Inside Operation\n"));
diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h
index 28bfc384429..6f24fbc2094 100644
--- a/TAO/tests/InterOp-Naming/INS_i.h
+++ b/TAO/tests/InterOp-Naming/INS_i.h
@@ -33,8 +33,7 @@ public:
   ~INS_i (void);
   // Destructor.
 
-  char * test_ins (void)
-  ACE_THROW_SPEC (( CORBA::SystemException ));
+  char * test_ins (void);
   // test the INS.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 47fba039d91..515a689a52b 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -27,7 +27,6 @@ project(*Server): taoserver, utils, iortable, avoids_corba_e_micro {
 project(*Client): taoclient, anytypecode {
   exename = INS_test_client
   after += *idl
-  after += *Server
   Source_Files {
     INS_test_client.cpp
   }
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index d9ff8a0f0df..53c406090c3 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, strategies {
 
 project(*Client): taoclient, strategies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl
index 17e87c6a4b2..7143445dee6 100755
--- a/TAO/tests/Leader_Followers/run_test.pl
+++ b/TAO/tests/Leader_Followers/run_test.pl
@@ -30,7 +30,7 @@ sub run_client ($)
     $CL->Arguments ("-k file://$iorfile " . $args);
 
     my $client = $CL->SpawnWaitKill (200);
-    
+
     if ($client != 0) {
         $time = localtime;
         print STDERR "ERROR: client returned $client at $time\n";
@@ -123,9 +123,9 @@ if ($single == 1) {
 
     $SV->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
+        $SV->Kill ();
         exit 1;
     }
 
@@ -143,16 +143,16 @@ if ($single == 1) {
 
 if ($multi == 1) {
     unlink $iorfile;
-    
+
     print STDERR "\n\n*** Thread-Pool server ***\n\n\n";
 
     $SV->Arguments ("-o $sv_iorfile -e 5 $tpool_reactor_directive");
 
     $SV->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
+        $SV->Kill ();
         exit 1;
     }
 
@@ -163,7 +163,7 @@ if ($multi == 1) {
     if ($server != 0) {
         $time = localtime;
         print STDERR "ERROR: server returned $server at $time\n";
-        $SV->Kill (); 
+        $SV->Kill ();
     }
 
     unlink $iorfile;
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index dd25883f9b4..c456cc56dba 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -100,8 +100,13 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var server =
-        servant._this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index b2794eac59e..1a8c3d88221 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -12,14 +12,12 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
 
 CORBA::ULong
 test_i::method (CORBA::ULong work)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server: Working for %d milli seconds @ %T\n",
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index bee80a1826a..74db1115a2b 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -25,11 +25,9 @@ public:
   // ctor.
 
   // = The test interface methods.
-  CORBA::ULong method (CORBA::ULong work)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ULong method (CORBA::ULong work);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/LongDouble/Global.cpp b/TAO/tests/LongDouble/Global.cpp
new file mode 100644
index 00000000000..19c6d96d6d1
--- /dev/null
+++ b/TAO/tests/LongDouble/Global.cpp
@@ -0,0 +1,11 @@
+//
+// $Id$
+//
+#include "Global.h"
+
+long double
+Global::get_long_double (void)
+{
+  return 11777888333.111111109;
+}
+
diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h
new file mode 100644
index 00000000000..a55696312b0
--- /dev/null
+++ b/TAO/tests/LongDouble/Global.h
@@ -0,0 +1,12 @@
+// $Id$
+#ifndef TAO_TEST_GLOBAL_H
+#define TAO_TEST_GLOBAL_H
+
+class Global
+{
+public:
+  static long double get_long_double (void);
+};
+
+#endif /* TAO_TEST_GLOBAL_H */
+
diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp
new file mode 100644
index 00000000000..1980e729449
--- /dev/null
+++ b/TAO/tests/LongDouble/LongDoubleTest.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "LongDoubleTest.h"
+#include "Global.h"
+
+ACE_RCSID (LongDoubleTest, LongDoubleTest, "$Id$")
+
+LongDoubleTest::LongDoubleTest (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+CORBA::LongDouble
+LongDoubleTest::get_long_double ()
+{
+  CORBA::LongDouble ld;
+  ACE_CDR_LONG_DOUBLE_ASSIGNMENT (ld, Global::get_long_double ());
+  return ld;
+}
+
+void
+LongDoubleTest::shutdown ()
+{
+  this->orb_->shutdown (0);
+}
diff --git a/TAO/tests/LongDouble/LongDoubleTest.h b/TAO/tests/LongDouble/LongDoubleTest.h
new file mode 100644
index 00000000000..76b0674dd75
--- /dev/null
+++ b/TAO/tests/LongDouble/LongDoubleTest.h
@@ -0,0 +1,31 @@
+//
+// $Id$
+//
+
+#ifndef LONGDOUBLETEST_H
+#define LONGDOUBLETEST_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::LongDoubleTest interface
+class LongDoubleTest
+  : public virtual POA_Test::LongDoubleTest
+{
+public:
+  /// Constructor
+  LongDoubleTest (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual CORBA::LongDouble get_long_double ();
+
+  virtual void shutdown ();
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* LONGDOUBLETEST_H */
diff --git a/TAO/tests/LongDouble/LongDoubleTest.mpc b/TAO/tests/LongDouble/LongDoubleTest.mpc
new file mode 100644
index 00000000000..6a0e1879a52
--- /dev/null
+++ b/TAO/tests/LongDouble/LongDoubleTest.mpc
@@ -0,0 +1,38 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  custom_only = 1
+}
+
+
+project(*Server): taoexe, portableserver {
+  exename = server
+  after  += *idl
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TestS.cpp
+    TestC.cpp
+    Global.cpp
+    LongDoubleTest.cpp
+    server.cpp
+  }
+}
+
+project(*Client): taoexe {
+  exename = client
+  after  += *idl
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TestC.cpp
+    Global.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/tests/LongDouble/Test.idl b/TAO/tests/LongDouble/Test.idl
new file mode 100644
index 00000000000..3a46b019b12
--- /dev/null
+++ b/TAO/tests/LongDouble/Test.idl
@@ -0,0 +1,20 @@
+//
+// $Id$
+//
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface LongDoubleTest
+  {
+    /// Return a long double
+    long double get_long_double ();
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
new file mode 100644
index 00000000000..408501970fa
--- /dev/null
+++ b/TAO/tests/LongDouble/client.cpp
@@ -0,0 +1,93 @@
+// $Id$
+
+#include "TestC.h"
+#include "Global.h"
+#include "ace/Get_Opt.h"
+#include "ace/streams.h"
+
+
+ACE_RCSID (LongDoubleTest, client, "$Id$")
+
+const char *ior = "file://server.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[])
+{
+  int status = 0;
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "");
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp =
+        orb->string_to_object (ior);
+
+      Test::LongDoubleTest_var longDoubleTest =
+        Test::LongDoubleTest::_narrow (tmp.in ());
+
+      if (CORBA::is_nil (longDoubleTest.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::LongDoubleTest reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      CORBA::LongDouble ld =
+        longDoubleTest->get_long_double ();
+
+      if (ld == Global::get_long_double ())
+        {
+          cout << "Received: " << ld << endl;
+        }
+      else
+        {
+          ACE_ERROR ((LM_DEBUG,
+                      "Client did not receive "
+                      "expected CORBA::LongDouble\n"));
+          cerr << "Received: " << ld << " instead of "
+               << Global::get_long_double () << endl;
+          status = 1;
+        }
+
+      longDoubleTest->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      status = 1;
+    }
+
+  return status;
+}
diff --git a/TAO/tests/LongDouble/run_test.pl b/TAO/tests/LongDouble/run_test.pl
new file mode 100755
index 00000000000..e5b965587d3
--- /dev/null
+++ b/TAO/tests/LongDouble/run_test.pl
@@ -0,0 +1,61 @@
+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 (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;
+
+exit $status;
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
new file mode 100644
index 00000000000..95cfd9a41ab
--- /dev/null
+++ b/TAO/tests/LongDouble/server.cpp
@@ -0,0 +1,106 @@
+// $Id$
+
+#include "LongDoubleTest.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+ACE_RCSID (LongDoubleTest,
+           server,
+           "$Id$")
+
+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 sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "");
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      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 ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      LongDoubleTest *longDoubleTest_impl;
+      ACE_NEW_RETURN (longDoubleTest_impl,
+                      LongDoubleTest (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer (longDoubleTest_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (longDoubleTest_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::LongDoubleTest_var longDoubleTest =
+        Test::LongDoubleTest::_narrow (object.in ());
+
+      CORBA::String_var ior =
+        orb->object_to_string (longDoubleTest.in ());
+
+      // 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 ();
+
+      orb->run ();
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 8d21bac2f63..97bac4aba5b 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -11,7 +11,6 @@ ACE_RCSID (LongUpcalls,
 
 static void
 validate_connection (Test::Controller_ptr controller)
-  ACE_THROW_SPEC (())
 {
   try
     {
@@ -36,7 +35,6 @@ void
 AMI_Manager::start_workers (CORBA::Short worker_count,
                             CORBA::Long milliseconds,
                             Test::Controller_ptr controller)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
@@ -54,7 +52,6 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 
 void
 AMI_Manager::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -89,8 +86,19 @@ Worker::svc (void)
                                             &pending_requests),
                         -1);
 
+        CORBA::Object_var poa_object =
+          this->orb_->resolve_initial_references("RootPOA");
+
+        PortableServer::POA_var root_poa =
+          PortableServer::POA::_narrow (poa_object.in ());
+
+        PortableServer::ObjectId_var id =
+          root_poa->activate_object (handler_impl);
+
+        CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
         PortableServer::ServantBase_var auto_destroy (handler_impl);
-        handler = handler_impl->_this ();
+        handler = Test::AMI_ControllerHandler::_narrow (object.in ());
       }
 
       validate_connection(this->controller_.in());
@@ -134,7 +142,6 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 
 void
 Controller_Handler::worker_started (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
@@ -143,7 +150,6 @@ Controller_Handler::worker_started (void)
 void
 Controller_Handler::worker_started_excep
     (::Messaging::ExceptionHolder* h)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -158,7 +164,6 @@ Controller_Handler::worker_started_excep
 
 void
 Controller_Handler::worker_finished (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
@@ -167,7 +172,6 @@ Controller_Handler::worker_finished (void)
 void
 Controller_Handler::worker_finished_excep
     (::Messaging::ExceptionHolder *h)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 271f1d5b4c3..604ae849cf7 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -16,10 +16,8 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              Test::Controller_ptr controller);
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -60,14 +58,10 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_started_excep (::Messaging::ExceptionHolder*)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished_excep (::Messaging::ExceptionHolder*)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void worker_started (void);
+  virtual void worker_started_excep (::Messaging::ExceptionHolder*);
+  virtual void worker_finished (void);
+  virtual void worker_finished_excep (::Messaging::ExceptionHolder*);
 
 private:
   TAO_SYNCH_MUTEX *mutex_;
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 69aebe53e9e..cb65f340fcb 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -25,7 +25,6 @@ Controller::dump_results ()
 
 void
 Controller::worker_started (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->start_count_++;
@@ -35,7 +34,6 @@ Controller::worker_started (void)
 
 void
 Controller::worker_finished (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->finish_count_++;
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index ac3238e99db..21e23995b76 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -16,10 +16,8 @@ public:
   // Print out the results and any errors
 
   // = The skeleton methods
-  virtual void worker_started (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void worker_started (void);
+  virtual void worker_finished (void);
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 050e6e72952..cb18bd3ee52 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, messaging, ami {
 
 project(*Client): messaging, taoexe, portableserver, ami {
   after += *idl
-  after += *Server
   Source_Files {
     Controller.cpp
     blocking_client.cpp
@@ -41,7 +40,6 @@ project(*Client): messaging, taoexe, portableserver, ami {
 project(*AMI_Server): taoserver, messaging, ami {
   exename = ami_server
   after += *idl
-  after += *Client
   Source_Files {
     AMI_Manager.cpp
     ami_server.cpp
@@ -56,7 +54,6 @@ project(*AMI_Server): taoserver, messaging, ami {
 
 project(*AMI_Client): messaging, taoexe, portableserver, ami {
   after += *idl
-  after += *AMI_Server
   Source_Files {
     Controller.cpp
     Manager_Handler.cpp
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 429713aa205..d6fcbbea8cb 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -11,7 +11,6 @@ ACE_RCSID (LongUpcalls,
 
 static void
 validate_connection (Test::Controller_ptr controller)
-  ACE_THROW_SPEC (())
 {
   try
     {
@@ -36,7 +35,6 @@ void
 Manager::start_workers (CORBA::Short worker_count,
                         CORBA::Long milliseconds,
                         Test::Controller_ptr controller)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
@@ -53,7 +51,6 @@ Manager::start_workers (CORBA::Short worker_count,
 
 void
 Manager::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 313c0be7b06..23d94be0ed7 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -18,10 +18,8 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              Test::Controller_ptr controller);
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index 49964f970a9..a38e2edbc36 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -15,7 +15,6 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 
 void
 Manager_Handler::start_workers (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -31,7 +30,6 @@ Manager_Handler::start_workers (void)
 
 void
 Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 9899fa0b440..687d936fa38 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -17,10 +17,8 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start_workers (void);
+  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder);
 
 private:
   Test::Manager_var manager_;
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 73bddabb7ae..30095cce6fe 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references("RootPOA");
@@ -60,8 +60,13 @@ main (int argc, char *argv[])
 
       Controller controller_impl;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&controller_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Controller_var controller =
-        controller_impl._this ();
+        Test::Controller::_narrow (object_act.in ());
 
       object = orb->string_to_object (ior);
 
@@ -75,8 +80,13 @@ main (int argc, char *argv[])
 
       Manager_Handler handler_impl (manager.in (),
                                     controller.in ());
+
+      id = root_poa->activate_object (&handler_impl);
+
+      object_act = root_poa->id_to_reference (id.in ());
+
       Test::AMI_ManagerHandler_var handler =
-        handler_impl._this ();
+        Test::AMI_ManagerHandler::_narrow (object_act.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 5217b89ccf7..9342b91a8ae 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
 
       AMI_Manager manager_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&manager_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Manager_var manager =
-        manager_impl._this ();
+        Test::Manager::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (manager.in ());
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index 1321790d3fd..b6dacb85770 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references("RootPOA");
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
 
       Controller controller_impl;
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&controller_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Controller_var controller =
-        controller_impl._this ();
+        Test::Controller::_narrow (object_act.in ());
 
       object = orb->string_to_object (ior);
 
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 80e6b304e2e..4077f843241 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
 
       Manager manager_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&manager_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Manager_var manager =
-        manager_impl._this ();
+        Test::Manager::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (manager.in ());
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 6f0f5e0df59..7beef1c3cfa 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iormanip {
 
 project(*Client): taoclient, iormanip {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 10cd0cb76f8..78a19985a67 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index d9183ecd421..3cf31dd35fd 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index 76f835f9cf5..6c4ccf90aef 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -18,7 +18,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 CORBA::Long
 Simple_Server_i::remote_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant \n"));
@@ -29,7 +28,6 @@ Simple_Server_i::remote_call (void)
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index 28eb022126c..07f971408ac 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -34,11 +34,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long remote_call (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index 57409e95046..b8f58d81ffd 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging, iormanip {
 
 project(*Client): taoclient, messaging, iormanip {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index f32e9f89571..ea0aa878f16 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 5da4cc7726c..04c040ca422 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index 39960fc15f9..2ac070dd5c3 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -25,7 +25,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 CORBA::ULongLong
 Simple_Server_i::remote_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant \n"));
@@ -36,7 +35,6 @@ Simple_Server_i::remote_call (void)
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h
index 733094afd73..cb4554e8655 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.h
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h
@@ -34,11 +34,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::ULongLong remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ULongLong remote_call (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index a8cd11740a7..5625f1183bf 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
@@ -39,7 +38,6 @@ project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_c
 project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iormanip {
   exename = manager
   after += *idl
-  after += *Client
   Source_Files {
     Servant_Locator.cpp
     Manager.cpp
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index 80edf3be437..275d0c7f0a4 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -44,8 +44,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr /* poa_ptr */,
                             const char * /*operation*/,
                             PortableServer::ServantLocator::Cookie & /* cookie */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
 
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
@@ -54,7 +52,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
               "The OID is <%s> \n", s.in ()));
   if (ACE_OS::strstr (s.in (), "Simple_Server") == 0)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 
   // Combined IOR stuff
@@ -67,9 +65,9 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
   ACE_DEBUG ((LM_DEBUG,
               "About to throw exception.. \n"));
 
-  ACE_THROW_RETURN (PortableServer::ForwardRequest (
-                                                    CORBA::Object::_duplicate (server.in ())),
-                    0);
+  throw PortableServer::ForwardRequest (
+    CORBA::Object::_duplicate (
+      server.in ()));
 
 }
 
@@ -79,7 +77,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &,
                              const char *,
                              PortableServer::ServantLocator::Cookie ,
                              PortableServer::Servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
index 8c717896577..112a61c7432 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
@@ -39,9 +39,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                             PortableServer::ServantLocator::Cookie &the_cookie);
   // This method is invoked by a POA whenever it receives a request
   // for MyFoo object that is not currently active.
 
@@ -49,8 +47,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           PortableServer::Servant the_servant);
   // This method is invoked whenever a MyFooServant completes a
   // request.
 
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index ce340c6b243..9327c7d1629 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return -1;
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index ef8ad0578e3..c88f453fd53 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 1ef2fd374ec..e994bbf6c62 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -16,7 +16,6 @@ Simple_Server_i::Simple_Server_i (void)
 
 void
 Simple_Server_i::remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant \n"));
@@ -25,7 +24,6 @@ Simple_Server_i::remote_call (void)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h
index 5568f94a471..69525a827ec 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.h
+++ b/TAO/tests/MProfile_Forwarding/test_i.h
@@ -34,11 +34,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void remote_call (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index 3be330a230d..b8e19c0c9a0 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -16,7 +16,6 @@ Receiver_i::Receiver_i (void)
 
 void
 Receiver_i::receive_payload (const Receiver::Payload &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->message_count_++;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index ee0795c0a6c..398955cca27 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -23,8 +23,7 @@ public:
   CORBA::Long get_event_count (void);
 
   // = The skeleton methods
-  virtual void receive_payload (const Receiver::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_payload (const Receiver::Payload &payload);
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 712a2edfaf3..ba0c78d6c1a 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -30,16 +30,13 @@ Sender_i::Sender_i (int no_clients,
 
 CORBA::Long
 Sender_i::receiver_object (Receiver_ptr recv)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Sender::Table_Full))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
                     ace_mon,
                     this->mutex_,-1);
 
   if (this->no_clients_ == this->last_index_)
-    ACE_THROW_RETURN (Sender::Table_Full (),
-                      -1);
+    throw Sender::Table_Full ();
 
   this->receivers_[this->last_index_] =
     Receiver::_duplicate (recv);
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 06176105b41..419e333f0b4 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -24,9 +24,7 @@ public:
             ACE_Manual_Event &event);
 
   // = The skeleton methods
-  virtual CORBA::Long receiver_object (Receiver *recv)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Sender::Table_Full));
+  virtual CORBA::Long receiver_object (Receiver *recv);
 
   /// Public method defined locally
   void send_message (void);
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index f4a30f91d21..607b7fc95c2 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -112,8 +112,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer (receiver);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (receiver);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Receiver_var receiver_obj =
-        receiver->_this ();
+        Receiver::_narrow (object_act.in ());
 
       // Send the calback object to the server
       sender->receiver_object (receiver_obj.in ());
@@ -141,7 +146,7 @@ main (int argc, char *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Catched exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
 
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 78067bed264..7c9245b4a68 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 4c7c0e8f0a7..b221f62ce4b 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index 0f9fcb8e0a2..c6b05842c49 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 30ce55d8ec4..1511e12ca82 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -137,7 +137,7 @@ Client::svc (void)
           CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
           char* argv[1] = { argv0.inout () };
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "");
+            CORBA::ORB_init (argc, argv);
 
           CORBA::Object_var object =
             orb->string_to_object (this->ior_);
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index 75e9d17ff21..a20fe374114 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -35,14 +35,14 @@ if (PerlACE::is_vxworks_test()) {
 else {
     $SV = new PerlACE::Process ("server", "-ORBsvcconf $server_conf -ORBdebuglevel $debug_level -o $iorfile");
 }
-$CL = new PerlACE::Process ($client_process, 
+$CL = new PerlACE::Process ($client_process,
                             "-ORBdebuglevel $debug_level "
                             . "-k file://$iorfile "
                             . "-n $threads -i 1000 -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 099f923d977..7cdec34d1c9 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -60,8 +60,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 8b6b5696d99..ed136fa4fa4 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -10,13 +10,11 @@ ACE_RCSID(MT_Client, test_i, "$Id$")
 
 void
 Simple_Server_i::test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 79dd079bf2d..e38a1d70ad0 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index aa28b25107f..bbcbfa8e1b6 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index 1c4a6ccf3cd..ebbecd5f4c7 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 70402cf712c..909e398c68d 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -87,8 +87,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index 8bb3e551ecb..80aa987cc4a 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -12,7 +12,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
@@ -23,7 +22,6 @@ Simple_Server_i::test_method (CORBA::Long x)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index 8934973a678..d1113ac50d7 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index dbf0552a387..93f6126de90 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -25,7 +25,6 @@ project(*Server): messaging, taoserver {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     client.cpp
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index e3a26cfb38c..4af378547bc 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -13,7 +13,6 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
 
 void
 Sleep_Service::go_to_sleep (CORBA::ULong microseconds)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong  secs = microseconds / 1000000;
   CORBA::ULong usecs = microseconds % 1000000;
@@ -24,7 +23,6 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds)
 
 void
 Sleep_Service::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index c1bdd5a5d2d..9a360fa9420 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -17,11 +17,9 @@ public:
   Sleep_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void go_to_sleep (CORBA::ULong microseconds)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void go_to_sleep (CORBA::ULong microseconds);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index 2ec81c8b442..8cb04d4d478 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index b1483d778f4..f7a47c804b0 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (sleep_service_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Sleep_Service_var process =
-        sleep_service_impl->_this ();
+        Test::Sleep_Service::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (process.in ());
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index fff5e12d1e2..830ac51f4ba 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -18,7 +18,7 @@ project(*Server): taoserver {
     server.cpp
   }
   Source_Files {
-     MultipleC.cpp    
+     MultipleC.cpp
      MultipleS.cpp
   }
   IDL_Files {
@@ -27,7 +27,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
 
   Source_Files {
     Multiple_Impl.cpp
@@ -35,7 +34,7 @@ project(*Client): taoexe, portableserver {
     client.cpp
   }
   Source_Files {
-     MultipleC.cpp    
+     MultipleC.cpp
      MultipleS.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index f24fa6be53b..06ba1e71ca6 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -21,35 +21,30 @@ Bottom_Impl::~Bottom_Impl (void)
 
 char *
 Bottom_Impl::top_quote ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
 Bottom_Impl::left_quote ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
 Bottom_Impl::right_quote ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
 Bottom_Impl::bottom_quote ( )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
 Bottom_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -71,7 +66,6 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
 
 char *
 Delegated_Bottom_Impl::top_quote (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
@@ -83,7 +77,6 @@ Delegated_Bottom_Impl::top_quote (void)
 
 char *
 Delegated_Bottom_Impl::left_quote (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
@@ -95,7 +88,6 @@ Delegated_Bottom_Impl::left_quote (void)
 
 char *
 Delegated_Bottom_Impl::right_quote (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
@@ -107,7 +99,6 @@ Delegated_Bottom_Impl::right_quote (void)
 
 char *
 Delegated_Bottom_Impl::bottom_quote (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
@@ -119,7 +110,6 @@ Delegated_Bottom_Impl::bottom_quote (void)
 
 void
 Delegated_Bottom_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index e72455225d6..97b507ea1b2 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -40,30 +40,15 @@ public:
   virtual ~Bottom_Impl (void);
 
   // IDL Interface Methods
-  virtual char * top_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual char * left_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual char * right_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual char * bottom_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual char * top_quote (void);
+
+  virtual char * left_quote (void);
+
+  virtual char * right_quote (void);
+
+  virtual char * bottom_quote (void);
+
+  virtual void shutdown (void);
 private:
   CORBA::ORB_var orb_;
 
@@ -89,27 +74,12 @@ public:
   virtual ~Delegated_Bottom_Impl (void);
 
   // IDL Interface Methods.
-  virtual char * top_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-  virtual char * left_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-  virtual char * right_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-  virtual char * bottom_quote (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual char * top_quote (void);
+  virtual char * left_quote (void);
+  virtual char * right_quote (void);
+  virtual char * bottom_quote (void);
+
+  virtual void shutdown (void);
 
 private:
   Multiple::Bottom_var delegate_;
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 01275412a9e..cb292790c4c 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -28,12 +28,19 @@ int main (int argc, char *argv[])
 
       // Create the delegated servant and intialize it
       // with the "real" servant.
-      Delegated_Bottom_Impl delegated_servant(servant._this (),
-                                              orb.in ());
+      PortableServer::ObjectId_var id = poa->activate_object (&servant);
+      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+      Delegated_Bottom_Impl delegated_servant(
+                              Multiple::Bottom::_narrow (object_act.in ()),
+                              orb.in ());
 
       // Create the CORBA Object that is incarnated by the
       // delegated servant.
-      Multiple::Bottom_var bottom = delegated_servant._this ();
+      id = poa->activate_object (&delegated_servant);
+      object_act = poa->id_to_reference (id.in ());
+
+      Multiple::Bottom_var bottom =
+        Multiple::Bottom::_narrow (object_act.in ());
 
       // Now we stringfy the object reference.
       CORBA::String_var ior =
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 7a02f54b12f..c57114e6146 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, utils, avoids_corba_e_micro {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index 69449348a84..f8a3e188bfe 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -10,22 +10,18 @@ public:
   Multiple_Inheritance_i (void);
 
   virtual char* method1 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method1");
     }
   virtual char* method2 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method2");
     }
   virtual char* method3 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method3");
     }
   virtual char* method4 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method4");
     }
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 793dd8553d0..ccac4641b28 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index e9487cd1460..9d77574a6c6 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -21,9 +21,9 @@ $CL = new PerlACE::Process ("client", "-f $iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }
 
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index 95c18b6becb..fa5851d93de 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 31b4cc6aa38..81102d228ce 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 8cf28f45059..0ac500a4cc4 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -151,8 +151,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl->_this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index fb3f743d84d..7090526b738 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -13,7 +13,6 @@ ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp"
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
@@ -24,7 +23,6 @@ Simple_Server_i::test_method (CORBA::Long x)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We dont shutdown the ORB. We allow the server to go away as it
   // wants.
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
index 8934973a678..d1113ac50d7 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index f920367a5b4..ed8d0a0daee 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     client.cpp
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index 051bbb2e124..b746df4426e 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -25,7 +25,6 @@ Receiver::dump_results ()
 
 void
 Receiver::receive_data (const Test::Payload &payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->message_count_++;
@@ -34,7 +33,6 @@ Receiver::receive_data (const Test::Payload &payload)
 
 CORBA::Long
 Receiver::get_event_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
@@ -42,7 +40,6 @@ Receiver::get_event_count (void)
 
 void
 Receiver::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 8117eab65f2..87abf4b5082 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -28,13 +28,10 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_event_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (const Test::Payload &payload);
+  virtual CORBA::Long get_event_count (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   ACE_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e436d187fa6..8d25e670955 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index 7b2cdfe889a..b10aa4b7bbb 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Receiver_var receiver =
-        receiver_impl->_this ();
+        Test::Receiver::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (receiver.in ());
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 98f1c7fa090..2bf43f81b15 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, anytypecode {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index d5d40422f9a..3fd4dc66909 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl
index b5d574f8003..374f7c96aee 100755
--- a/TAO/tests/Native_Exceptions/run_test.pl
+++ b/TAO/tests/Native_Exceptions/run_test.pl
@@ -16,15 +16,15 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -i 1000");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }
 
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index dbcbc127f0c..3d86811190e 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -56,8 +56,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index 7712b291889..62e6003f6ea 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -10,26 +10,18 @@ ACE_RCSID(Native_Exceptions, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return x;
 }
 
 CORBA::Long
-Simple_Server_i::test_raise (CORBA::Long x)
-  ACE_THROW_SPEC ((Simple_Server::Failure))
+Simple_Server_i::test_raise (CORBA::Long)
 {
-  ACE_UNUSED_ARG (x);
   throw Simple_Server::Failure ();
-
-# if defined (WIN32) || defined (__HP_aCC)
-  return x;
-#endif /*WIN32 & HP */
 }
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Native_Exceptions/test_i.h b/TAO/tests/Native_Exceptions/test_i.h
index a90cc1d877a..5bbb20d51b1 100644
--- a/TAO/tests/Native_Exceptions/test_i.h
+++ b/TAO/tests/Native_Exceptions/test_i.h
@@ -31,13 +31,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x)
-      ACE_THROW_SPEC((CORBA::SystemException));
+  CORBA::Long test_method (CORBA::Long x);
 
-  CORBA::Long test_raise (CORBA::Long x)
-    ACE_THROW_SPEC ((Simple_Server::Failure));
+  CORBA::Long test_raise (CORBA::Long x);
 
-  void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index 475f8634d6e..c017c639d69 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -39,7 +39,6 @@ MT_Object_i::~MT_Object_i (void)
 CORBA::Long
 MT_Object_i::yadda (CORBA::Long hop_count,
                        MT_Object_ptr partner)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if 0
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 99ac8b12d2b..bfddb076334 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -36,8 +36,7 @@ public:
   // Destructor.
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
-                             MT_Object_ptr partner)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                             MT_Object_ptr partner);
 
 };
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 9a6d581df91..6e8aa3aee3a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -260,10 +260,18 @@ MT_Server::run_ORB_briefly (void)
                       "(%P|%t) MT_Server::run: "
                       "going to call distant MT Object\n"));
 
+          PortableServer::POA_var root_poa =
+            this->orb_manager_ptr_->root_poa ();
+
           for (unsigned int i = 0; i < this->iterations_; i++)
             {
+              PortableServer::ObjectId_var id =
+                root_poa->activate_object (&mT_Object_i_);
+
+              CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
               MT_Object_var tmp =
-                this->mT_Object_i_._this ();
+                MT_Object::_narrow (object_act.in ());
 
               this->mT_Object_var_->yadda (0,
                                            tmp.in ());
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index 06a89698d66..fa21574183c 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -11,12 +11,10 @@ project(*Nested_Upcall_Idl): taoidldefaults {
 project(*Nested_Upcall_Server): taoexe, portableserver {
   after += *Nested_Upcall_Idl
   Source_Files {
-    server_i.cpp
-    server.cpp
-  }
-  Source_Files {
     testC.cpp
     testS.cpp
+    server_i.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -26,12 +24,10 @@ 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
+    client_i.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 63b9bdd4b8e..90152bf511b 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -141,7 +141,12 @@ main (int argc,
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&client_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      client_var client_object = client::_narrow (object_act.in ());
 
       Client_Task client_tasks (client_object.in (),
                                 server.in ());
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index e439f6a4461..7525ef2160c 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -11,7 +11,6 @@ client_i::client_i (int quiet,
 
 void
 client_i::ping (CORBA::UShort time_to_live)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index e58d414344e..b0d308f04b8 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -9,8 +9,7 @@ public:
             server_ptr s);
   // Constructor.
 
-  void ping (CORBA::UShort time_to_live)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void ping (CORBA::UShort time_to_live);
 
 private:
   int quiet_;
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 7c16c359b2a..cecdab57937 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -137,7 +137,12 @@ main (int argc,
       server_i server_servant (quiet,
                                orb.in ());
 
-      server_var server_object = server_servant._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      server_var server_object = server::_narrow (object_act.in ());
 
       CORBA::String_var ior = orb->object_to_string (server_object.in ());
 
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 1a93ac4f244..6e8e09d9f89 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -12,7 +12,6 @@ server_i::server_i (int quiet,
 void
 server_i::start (client_ptr c,
                  CORBA::UShort time_to_live)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
   this->ping (time_to_live);
@@ -22,7 +21,6 @@ server_i::start (client_ptr c,
 
 void
 server_i::ping (CORBA::UShort time_to_live)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
     ACE_DEBUG ((LM_DEBUG,
@@ -39,7 +37,6 @@ server_i::ping (CORBA::UShort time_to_live)
 
 void
 server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index ce84f3493c8..adc1cf9dd25 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -8,15 +8,12 @@ public:
   server_i (int quiet,
             CORBA::ORB_ptr orb);
 
-  void ping (CORBA::UShort time_to_live)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void ping (CORBA::UShort time_to_live);
 
   void start (client_ptr c,
-              CORBA::UShort time_to_live)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              CORBA::UShort time_to_live);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   int quiet_;
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 40ac866ae9a..756ad7811fd 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -150,7 +150,12 @@ main (int argc,
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&client_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      client_var client_object = client::_narrow (object_act.in ());
 
       Client_Task client_tasks (client_object.in (),
                                 server.in ());
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 27fac829ee9..c2ecfcc8498 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -37,7 +37,6 @@ Initiator_i::~Initiator_i (void)
 
 void
 Initiator_i::foo_object_B (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index fcbdd219d2d..2d9e9fa1cac 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -35,8 +35,7 @@ public:
   virtual ~Initiator_i (void);
   // Destructor.
 
-  virtual void foo_object_B (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void foo_object_B (void);
 
 private:
   Object_A_var object_A_var_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index f36dd401fbf..66764ee0b3c 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -38,7 +38,6 @@ Object_A_i::~Object_A_i (void)
 
 void
 Object_A_i::foo (Initiator_ptr theInitiator_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -56,7 +55,6 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr)
 
 void
 Object_A_i::finish (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->finish_two_way_call_ = 1;
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index af7844e99a3..567412b6d83 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -34,11 +34,9 @@ public:
   virtual ~Object_A_i (void);
   // Destructor.
 
-  virtual void foo (Initiator_ptr theInitiator_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void foo (Initiator_ptr theInitiator_ptr);
 
-  virtual void finish (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void finish (void);
 
   unsigned long finish_two_way_call_;
 };
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 1d66255420b..3428fd18159 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -37,7 +37,6 @@ Object_B_i::~Object_B_i (void)
 
 void
 Object_B_i::foo (Object_A_ptr theObject_A_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 35c9f311e19..2eed4c74f4b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -34,8 +34,7 @@ public:
   virtual ~Object_B_i (void);
   // Destructor.
 
-  virtual void foo(Object_A_ptr theObject_A_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void foo(Object_A_ptr theObject_A_ptr);
 };
 
 #endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 412b73befa7..33a1e326958 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -227,8 +227,7 @@ Initiator_Server::run (void)
                   "Initiator_Server::run: Trying to invoke "
                   "foo on Object A\n"));
 
-      Initiator_var initiator =
-        this->initiator_i_ptr_->_this();
+      Initiator_var initiator = this->initiator_i_ptr_->_this ();
 
       this->object_A_var_->foo (initiator.in ());
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 73c8c902fc0..8e8d38cc1b6 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, taoexe, portableserver {
 
 project(*Client): strategies, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl
index bf69766f18d..387f0349890 100755
--- a/TAO/tests/Nested_Event_Loop/run_test.pl
+++ b/TAO/tests/Nested_Event_Loop/run_test.pl
@@ -23,7 +23,7 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 04113692445..2b58d545409 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
 
       server_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       server_var server_object =
-        servant._this ();
+        server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server_object.in ());
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 32603e98df8..77d95d9c499 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -14,7 +14,6 @@ void
 server_i::loop (client_ptr remote_partner,
                 CORBA::ULong event_loop_depth,
                 CORBA::ULong event_loop_iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server_i::loop: event_loop_depth = %2.2d; event_loop_iterations = %2.2d\n",
@@ -37,7 +36,6 @@ server_i::loop (client_ptr remote_partner,
 void
 server_i::run_no_ops (client_ptr remote_partner,
                       CORBA::ULong iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   while (iterations != 0)
     {
@@ -77,7 +75,6 @@ void
 server_i::no_op (client_ptr remote_partner,
                  const act &act_for_iterations,
                  const act &act_for_flag)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong *pointer_to_iterations = 0;
 
@@ -104,7 +101,6 @@ server_i::no_op (client_ptr remote_partner,
 
 void
 server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -117,7 +113,6 @@ client_i::client_i (server_ptr remote_partner)
 void
 client_i::loop (CORBA::ULong event_loop_depth,
                 CORBA::ULong event_loop_iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::loop: event_loop_depth = %2.2d; event_loop_iterations = %2.2d\n",
@@ -143,7 +138,6 @@ client_i::loop (CORBA::ULong event_loop_depth,
 void
 client_i::oneway_no_op (const act &act_for_iterations,
                         const act &act_for_flag)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   try
@@ -157,13 +151,12 @@ client_i::oneway_no_op (const act &act_for_iterations,
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception caught in client_i::no_op:");
+      ex._tao_print_exception ("Exception caught in client_i::oneway_no_op:");
     }
 }
 
 void
 client_i::twoway_no_op (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::twoway_no_op\n"));
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index e7f8420ad0b..5fbbbb14bf1 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -9,20 +9,16 @@ public:
 
   void loop (client_ptr remote_partner,
              CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+             CORBA::ULong event_loop_iterations);
 
   void run_no_ops (client_ptr remote_partner,
-                   CORBA::ULong iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   CORBA::ULong iterations);
 
   void no_op (client_ptr remote_partner,
               const act &act_for_iterations,
-              const act &act_for_flag)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              const act &act_for_flag);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -34,15 +30,12 @@ public:
   client_i (server_ptr remote_partner);
 
   void loop (CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+             CORBA::ULong event_loop_iterations);
 
   void oneway_no_op (const act &act_for_iterations,
-                     const act &act_for_flag)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     const act &act_for_flag);
 
-  void twoway_no_op (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void twoway_no_op (void);
 
 private:
   server_var remote_partner_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index acb1210811c..7cb44068e63 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -31,13 +31,11 @@ void
 Client_Peer::callme(Test::Peer_ptr callback,
                     CORBA::ULong max_depth,
                     Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Received call, depth = %d\n", max_depth));
   if (max_depth > 0)
   {
-    Test::Peer_var me =
-      this->_this();
+    Test::Peer_var me = this->_this ();
 
     Test::Payload return_data;
 
@@ -47,7 +45,6 @@ Client_Peer::callme(Test::Peer_ptr callback,
 
 void
 Client_Peer::crash(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   Crasher * crasher = new Crasher;
 
@@ -58,7 +55,6 @@ Client_Peer::crash(void)
 
 void
 Client_Peer::noop(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
index 9f80723f8a1..6d51a8910e6 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
@@ -19,12 +19,9 @@ public:
 
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
-              Test::Payload const &)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  void crash(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  void noop(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+              Test::Payload const &);
+  void crash(void);
+  void noop(void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index a07b5d528e7..0327652d82d 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, messaging {
 project(*Scavenger): taoserver, messaging {
   exename = scavenger
   after += *idl
-  after += *Server
   Source_Files {
     scavenger.cpp
   }
@@ -45,7 +44,6 @@ project(*Scavenger): taoserver, messaging {
 project(*Client): taoserver, messaging {
   exename = client
   after += *idl
-  after += *Scavenger
   Source_Files {
     Clock_Ticks.cpp
     Client_Peer.cpp
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
index 36c6ad2d83b..294c3acfa60 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -24,7 +24,6 @@ void
 Server_Peer::callme(Test::Peer_ptr callback,
                     CORBA::ULong max_depth,
                     Test::Payload const &)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   int r = ACE_OS::rand_r(this->seed_) % 50;
 
@@ -49,8 +48,7 @@ Server_Peer::callme(Test::Peer_ptr callback,
   }
   else if (max_depth > 0)
   {
-    Test::Peer_var me =
-      this->_this();
+    Test::Peer_var me = this->_this ();
 
     Test::Payload extra_data(this->payload_size_);
     extra_data.length(this->payload_size_);
@@ -62,13 +60,11 @@ Server_Peer::callme(Test::Peer_ptr callback,
 
 void
 Server_Peer::crash(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Server_Peer::noop(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
index a165d5372b5..0840e86c995 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
@@ -21,12 +21,9 @@ public:
 
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
-              Test::Payload const & extra_data)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  void crash(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  void noop(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+              Test::Payload const & extra_data);
+  void crash(void);
+  void noop(void);
 
 private:
   ACE_RANDR_TYPE seed_;
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 5af5dd41596..7bbefc3538e 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -35,7 +35,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -83,8 +83,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Peer_var local_peer =
-        impl->_this ();
+        Test::Peer::_narrow (object_act.in ());
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior);
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index b029f32878e..80f36fe1c3f 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -29,7 +29,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("PolicyCurrent");
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index df638162a03..a937ed21856 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -91,8 +91,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test::Peer_var peer =
-        impl->_this ();
+        Test::Peer::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (peer.in ());
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..bbcbfa8e1b6 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
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index f40dfd3392b..06fe9865d4e 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index 099f923d977..7cdec34d1c9 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -60,8 +60,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index 1bc53fd3329..12636da24aa 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -11,13 +11,11 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 
 void
 Simple_Server_i::test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index b411d5499b9..8a27179f677 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -18,11 +18,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index e273412e2d5..20d38507d16 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -13,7 +13,6 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 CORBA::Any*
 Test_impl::get_something (
     CORBA::Boolean need_vb)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_ptr ret_val_ptr = 0;
   ACE_NEW_RETURN (ret_val_ptr, CORBA::Any, 0);
@@ -48,7 +47,6 @@ Test_impl::get_something (
 
 OBV_AnyTest::VB *
 Test_impl::get_vb()
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULong magic = 3145;
 
@@ -61,7 +59,6 @@ Test_impl::get_vb()
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index 610d83162a1..44540f31ac8 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -32,14 +32,11 @@ public:
   // ctor
 
   virtual CORBA::Any * get_something (
-      CORBA::Boolean need_vb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Boolean need_vb);
 
-  virtual OBV_AnyTest::VB * get_vb (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual OBV_AnyTest::VB * get_vb (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index f930c31a9d5..62c4c16ad8f 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -11,12 +11,10 @@ project(*idl): taoidldefaults, valuetype {
 project(*Server): taoexe, portableserver, valuetype {
   after += *idl
   Source_Files {
-    AnyS_impl.cpp
-    server.cpp
-  }
-  Source_Files {
     AnyC.cpp
     AnyS.cpp
+    AnyS_impl.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -24,12 +22,9 @@ project(*Server): taoexe, portableserver, valuetype {
 
 project(*Client): taoexe, valuetype {
   after += *idl
-  after += *Server
-  Source_Files {
-    client.cpp
-  }
   Source_Files {
     AnyC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 52cfb6f4f75..7bd3242eea3 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index 1fb435a3eb9..7c4ecab09c8 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -66,8 +66,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       OBV_AnyTest::Test_var test =
-        test_impl->_this ();
+        OBV_AnyTest::Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 0487ad694e6..35b9b4b64bb 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -81,7 +81,12 @@ Server_Task::svc (void)
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test_var test = Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         this->sorb_->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index 780ba158671..206465a0e52 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -28,7 +28,6 @@ reflect_node (BaseNode* bn)
 
 TreeController *
 Test_impl::reflect (TreeController * tc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (tc != 0)
   {
@@ -40,7 +39,6 @@ Test_impl::reflect (TreeController * tc)
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
index 662273c97f9..56bfb18a128 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
@@ -34,11 +34,9 @@ public:
   // ctor
 
   virtual TreeController * reflect (
-      TreeController * tc)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      TreeController * tc);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index f2fc37618ad..7bd2c91de8d 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -6,9 +6,6 @@ ACE_RCSID (Factory,
 
 OBV_FactoryTest::Value2*
 Value2_init_impl::create_default (CORBA::ULong id)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -28,9 +25,6 @@ Value2_init_impl::create (
     CORBA::ULong id,
     const OBV_FactoryTest::BaseValue::BV_Data & data
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index a42c6089ee9..5c5c593c623 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -42,18 +42,12 @@ public:
 
   virtual OBV_FactoryTest::Value2* create_default (
       CORBA::ULong id
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   virtual OBV_FactoryTest::Value2* create (
       CORBA::ULong id,
       const OBV_FactoryTest::BaseValue::BV_Data & data
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
 public:
 
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 597f190ba66..57551f9d9ef 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -13,7 +13,6 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 
 OBV_FactoryTest::BaseValue *
 Test_impl::get_base_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -25,7 +24,6 @@ Test_impl::get_base_value (void)
 
 OBV_FactoryTest::Value1 *
 Test_impl::get_value1 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value1* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -37,7 +35,6 @@ Test_impl::get_value1 (void)
 
 OBV_FactoryTest::Value2 *
 Test_impl::get_value2 (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -49,7 +46,6 @@ Test_impl::get_value2 (void)
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 271bcdd2788..24dfdf771d3 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,17 +31,13 @@ public:
   Test_impl (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual OBV_FactoryTest::BaseValue * get_base_value (void);
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual OBV_FactoryTest::Value1 * get_value1 (void);
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual OBV_FactoryTest::Value2 * get_value2 (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index b12ca4f383f..9e3d394d840 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     FactoryC_impl.cpp
     client.cpp
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index d33f1f43d70..cceefe42598 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -71,7 +71,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 231bc724184..1a04f156a47 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -66,8 +66,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       OBV_FactoryTest::Test_var test =
-        test_impl->_this ();
+        OBV_FactoryTest::Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index 5068a915e27..e59ee7d2022 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 8282676a725..c55d885f0a4 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -31,7 +31,6 @@ reflect_node (BaseNode* bn)
 
 TreeController *
 Test_impl::reflect (TreeController * tc)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (tc != 0)
   {
@@ -43,7 +42,6 @@ Test_impl::reflect (TreeController * tc)
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index bd5a1eb6726..9092f1576e4 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -32,11 +32,9 @@ public:
   // ctor
 
   virtual TreeController * reflect (
-      TreeController * tc)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      TreeController * tc);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index 62fdb78b03a..e9748ef5461 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index 87c4e70ceb0..cdefd70720a 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
@@ -105,7 +105,12 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test_var test = Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc
index 661a72fb220..0e9f2963d62 100644
--- a/TAO/tests/OBV/Simple/OBV_Simple.mpc
+++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc
@@ -13,11 +13,11 @@ project(*server): taoserver, utils, valuetype {
   exename = server
   after += *IDL
   Source_Files {
+    OBVS.cpp
+    OBVC.cpp
     Server_i.cpp
     OBV_impl.cpp
     server.cpp
-    OBVS.cpp
-    OBVC.cpp
   }
   IDL_Files {
   }
@@ -27,11 +27,11 @@ project(*client): taoserver, utils, valuetype {
   exename = client
   after += *IDL
   Source_Files {
+    OBVS.cpp
+    OBVC.cpp
     Client_i.cpp
     OBV_impl.cpp
     client.cpp
-    OBVS.cpp
-    OBVC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index 4313a82209a..b3bd19a1cf1 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -43,7 +43,6 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 void
 Checkpoint_i::put_event (Event *event)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Let us see what event has arrived
   event->do_print ();
@@ -55,7 +54,6 @@ Checkpoint_i::put_event (Event *event)
 
 void
 Checkpoint_i::shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n%s\n",
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
index 8eec39d2bef..0d249a51b72 100644
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ b/TAO/tests/OBV/Simple/Server_i.h
@@ -37,14 +37,10 @@ public:
 
   virtual void put_event (
         Event * e
-  )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 
   virtual void shutdown (
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
+    );
 
   void orb (CORBA::ORB_ptr o);
   // Set the ORB pointer.
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index a0f58373504..af9ec632601 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -26,7 +26,6 @@ vt_graph_impl::vt_graph_impl (int num_nodes)
 
 // Get the number of nodes in the vt_graph.
 CORBA::Long vt_graph_impl::size (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return nodes_ ().length ();
 }
@@ -34,7 +33,6 @@ CORBA::Long vt_graph_impl::size (void)
 // Add a node to the graph with no edges.
 void
 vt_graph_impl::add_node (const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Supports_Test::Node * new_node = 0;
   ACE_NEW (new_node, node_impl (name));
@@ -45,7 +43,6 @@ vt_graph_impl::add_node (const char * name)
 // Print out information about each node.
 void
 vt_graph_impl::print (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
 	      "Printing graph data... \n"));
@@ -62,7 +59,6 @@ vt_graph_impl::print (void)
 
 Supports_Test::vt_graph *
 vt_graph_init_impl::create (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -92,8 +88,6 @@ test_impl::~test_impl (void)
 void
 test_impl::pass_obj_graph_in (
   Supports_Test::graph * graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
   ACE_ASSERT (graph_param->size () == 3);
   graph_param->add_node ("NEW1");
@@ -103,8 +97,6 @@ test_impl::pass_obj_graph_in (
 void
 test_impl::pass_vt_graph_in (
   Supports_Test::vt_graph * vt_graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
   ACE_ASSERT (vt_graph_param->size () == 3);
   vt_graph_param->add_node ("NEW1");
@@ -114,8 +106,6 @@ test_impl::pass_vt_graph_in (
 void
 test_impl::pass_obj_graph_out (
   Supports_Test::graph_out graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
   vt_graph_impl * the_vt_graph = 0;
   ACE_NEW (the_vt_graph, vt_graph_impl (4));
@@ -129,8 +119,6 @@ test_impl::pass_obj_graph_out (
 void
 test_impl::pass_vt_graph_out (
     Supports_Test::vt_graph_out vt_graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
 
   vt_graph_impl * the_vt_graph = 0;
@@ -146,8 +134,6 @@ test_impl::pass_vt_graph_out (
 void
 test_impl::pass_obj_graph_inout (
     Supports_Test::graph * &graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
 
   ACE_ASSERT (graph_param->size () == 6);
@@ -158,8 +144,6 @@ test_impl::pass_obj_graph_inout (
 void
 test_impl::pass_vt_graph_inout (
     Supports_Test::vt_graph * &vt_graph_param)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException))
 {
 
   ACE_ASSERT (vt_graph_param->size () == 6);
@@ -169,13 +153,12 @@ test_impl::pass_vt_graph_inout (
 }
 
 void
-test_impl::start (void) ACE_THROW_SPEC ((CORBA::SystemException))
+test_impl::start (void)
 {
 }
 
 void
 test_impl::finish (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->_remove_ref ();
 }
@@ -199,7 +182,6 @@ node_impl::node_impl (const char * name)
 // Add an edge from this node to neighbor.
 void
 node_impl::add_edge (Supports_Test::Node * neighbor)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   degree_ (degree_ () + 1);
   neighbors_ ().length (neighbors_ ().length () + 1);
@@ -211,7 +193,6 @@ node_impl::add_edge (Supports_Test::Node * neighbor)
 // Remove the edge from this node to neighbor.
 void
 node_impl::remove_edge (Supports_Test::Node * neighbor)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (unsigned int i = 0; i < neighbors_ ().length (); i++)
     if (neighbors_ ()[i] == neighbor)
@@ -224,14 +205,12 @@ node_impl::remove_edge (Supports_Test::Node * neighbor)
 
 void
 node_impl::change_weight (CORBA::Long new_weight)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   weight_ (new_weight);
 }
 
 void
 node_impl::print (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   cout << "  Name: " << name_ () << endl;
   cout << "    Weight: " << weight_ () << endl;
@@ -245,7 +224,6 @@ node_impl::print (void)
 
 Supports_Test::Node *
 node_init_impl::create (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index d3b0be1649b..976f570a3eb 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -22,17 +22,13 @@ public:
 
   node_impl (const char * name);
 
-  virtual void add_edge (Supports_Test::Node * neighbor)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_edge (Supports_Test::Node * neighbor);
 
-  virtual void remove_edge (Supports_Test::Node * neighbor)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void remove_edge (Supports_Test::Node * neighbor);
 
-  void change_weight (CORBA::Long new_weight)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void change_weight (CORBA::Long new_weight);
 
-  void print (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void print (void);
 
 };
 
@@ -41,11 +37,9 @@ class node_init_impl : public Supports_Test::Node_init
 
  public:
 
-  virtual Supports_Test::Node * create (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Supports_Test::Node * create (void);
 
   virtual CORBA::ValueBase * create_for_unmarshal (void);
-
 };
 
 
@@ -61,15 +55,11 @@ class vt_graph_impl :
 
   vt_graph_impl (int num_nodes);
 
-  virtual CORBA::Long size (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void add_node (const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long size (void);
 
-  virtual void print (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_node (const char * name);
 
+  virtual void print (void);
 };
 
 class vt_graph_init_impl :
@@ -78,8 +68,7 @@ class vt_graph_init_impl :
 
  public:
 
-  virtual Supports_Test::vt_graph * create (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Supports_Test::vt_graph * create (void);
 
   virtual CORBA::ValueBase * create_for_unmarshal (void);
 
@@ -95,29 +84,21 @@ class test_impl :
 
   virtual ~test_impl (void);
 
-  virtual void pass_obj_graph_in (Supports_Test::graph * graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_obj_graph_in (Supports_Test::graph * graph_param);
 
-  virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param);
 
-  virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param);
 
-  virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param);
 
-  virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param);
 
-  virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param);
 
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
-  virtual void finish (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void finish (void);
 
  private:
 
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 3f970fba886..7342eaaf0a5 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index c2e58aade67..10ffff3d806 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -11,7 +11,7 @@ main (int argc, char * argv[])
 	try
 	{
 
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
 		CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA");
 
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 27e71e69ea6..075cfc0f63c 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index 8d7bc50a35d..c054a76d96c 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -37,8 +37,13 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var server =
-        servant._this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
               orb->object_to_string (server.in ());
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index c43b35e717f..734c078f6c8 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 CORBA::Any *
 test_i::get_value (CORBA::Long offset)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_ptr retval_ptr = 0;
   ACE_NEW_THROW_EX (retval_ptr,
@@ -72,7 +71,6 @@ test_i::get_value (CORBA::Long offset)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h
index d8cbb71f070..b51b8e7e1ab 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.h
+++ b/TAO/tests/OBV/TC_Alignment/test_i.h
@@ -39,11 +39,9 @@ class test_i :public virtual POA_test
 public:
   test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Any *get_value (CORBA::Long offset)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Any *get_value (CORBA::Long offset);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index 9d26a4b386b..a72132366a8 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -27,7 +27,6 @@ project(*Server): taoexe, portableserver, valuetype {
 
 project(*Client): taoexe, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index 0c39a541611..cd1b9c88096 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -17,9 +17,6 @@ Test_impl::op1 (
     ::OBV_TruncatableTest::BaseValue_out ov,
     char *& desc
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
@@ -45,9 +42,6 @@ Test_impl::op2 (
     ::OBV_TruncatableTest::TValue1_out ov,
     char *& desc
   )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
@@ -73,9 +67,6 @@ Test_impl::op3 (
   ::OBV_TruncatableTest::TValue4_out ov,
   char *& desc
 )
-ACE_THROW_SPEC ((
-  ::CORBA::SystemException
-))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
@@ -110,9 +101,6 @@ Test_impl::op4 (
   ::OBV_TruncatableTest::TValue1 * iv4,
   char *& desc
   )
-ACE_THROW_SPEC ((
-  ::CORBA::SystemException
-  ))
 {
   if (TAO_debug_level > 0)
   {
@@ -160,9 +148,6 @@ Test_impl::op5 (const CORBA::Any& val,
                 ::OBV_TruncatableTest::TValue1_out ov,
                 char *& desc
  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
 {
   ov = new ::OBV_OBV_TruncatableTest::TValue1();
   ::OBV_TruncatableTest::TValue1 *iv = 0;
@@ -195,7 +180,6 @@ Test_impl::op5 (const CORBA::Any& val,
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 14e2c7bfeee..4c8c6d46218 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -36,30 +36,21 @@ public:
         ::OBV_TruncatableTest::BaseValue * iv,
         ::OBV_TruncatableTest::BaseValue_out ov,
         char *& desc
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   virtual void op2 (
         ::OBV_TruncatableTest::TValue1 * iv,
         const char * id,
         ::OBV_TruncatableTest::TValue1_out ov,
         char *& desc
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   virtual void op3 (
         const char * id,
         ::OBV_TruncatableTest::TValue4 * iv,
         ::OBV_TruncatableTest::TValue4_out ov,
         char *& desc
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+      );
 
   virtual ::OBV_TruncatableTest::BaseValue * op4 (
       const char * id,
@@ -69,22 +60,15 @@ public:
       ::OBV_TruncatableTest::TValue4 * iv3,
       ::OBV_TruncatableTest::TValue1 * iv4,
       char *& desc
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
+    );
 
   virtual void op5 (const CORBA::Any& val,
                     const char * id,
                     ::OBV_TruncatableTest::TValue1_out ov,
                     char *& desc
- )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
+ );
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 372e751b0e2..6770fc5e73e 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index 9109575558e..6dc002a6ff3 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       OBV_TruncatableTest::Test_var test =
-        test_impl->_this ();
+        OBV_TruncatableTest::Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index ca91b357be5..6ef251b7b85 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -32,7 +32,6 @@ void rotate_string(char *s)
 
 VBlong *
 Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
                   VBlong (p2->_value()*5),
@@ -52,7 +51,6 @@ vb_basic::M_VBlong *
 Test_impl::basic_op2 (vb_basic::M_VBlong * p1,
                       vb_basic::M_VBlong *& p2,
                       vb_basic::M_VBlong_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
                   vb_basic::M_VBlong (p2->_value()*5),
@@ -71,7 +69,6 @@ Test_impl::basic_op2 (vb_basic::M_VBlong * p1,
 ::CORBA::Long
 Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2,
                       ::CORBA::Long_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p2 * 5;
 
@@ -85,7 +82,6 @@ VBstring *
 Test_impl::string_op1 (::VBstring * p1,
                        ::VBstring *& p2,
                        ::VBstring_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   rotate_string (p2->_boxed_inout ());
 
@@ -107,7 +103,6 @@ char *
 Test_impl::string_op2 (const char * p1,
                        char *& p2,
                        CORBA::String_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   rotate_string (p2);
 
@@ -127,7 +122,6 @@ Test_impl::string_op2 (const char * p1,
 Test_impl::seq_op1 (::VBseqlong * p1,
                     ::VBseqlong *& p2,
                     ::VBseqlong_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
                   VBseqlong(*p2),
@@ -155,7 +149,6 @@ void
 Test_impl::seq_op2 (const ::TDseqlong & p1,
                     ::TDseqlong & p2,
                     ::TDseqlong_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (p3,
            TDseqlong(p1));
@@ -175,7 +168,6 @@ Test_impl::seq_op2 (const ::TDseqlong & p1,
 Test_impl::struct_op1 (::VBfixed_struct1 * p1,
                        ::VBfixed_struct1 *& p2,
                        ::VBfixed_struct1_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
                   VBfixed_struct1 (p2->_value()),
@@ -202,7 +194,6 @@ void
 Test_impl::struct_op2 (const ::Fixed_Struct1 & p1,
                        ::Fixed_Struct1 & p2,
                        ::Fixed_Struct1_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p1;
 
@@ -215,7 +206,6 @@ Test_impl::struct_op2 (const ::Fixed_Struct1 & p1,
 Test_impl::struct_op3 (::VBvariable_struct1 * p1,
                        ::VBvariable_struct1 *& p2,
                        ::VBvariable_struct1_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // transform p2 values
   p2->l (p2->l() * 3);
@@ -238,7 +228,6 @@ void
 Test_impl::struct_op4 (const ::Variable_Struct1 & p1,
                        ::Variable_Struct1 & p2,
                        ::Variable_Struct1_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (p3,
            Variable_Struct1());
@@ -254,7 +243,6 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1,
 Test_impl::array_op1 (::VBlongarray * p1,
                       ::VBlongarray *& p2,
                       ::VBlongarray_out p3)
-                  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
 
@@ -279,7 +267,6 @@ void
 Test_impl::array_op2 (const ::LongArray p1,
                       ::LongArray p2,
                       ::LongArray_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
 
@@ -300,7 +287,6 @@ Test_impl::array_op2 (const ::LongArray p1,
 Test_impl::array_op3 (::VBstringarray * p1,
                       ::VBstringarray *& p2,
                       ::VBstringarray_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
 
@@ -327,7 +313,6 @@ void
 Test_impl::array_op4 (const ::StringArray p1,
                       ::StringArray p2,
                       ::StringArray_out p3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
 
@@ -355,7 +340,6 @@ Test_impl::array_op4 (const ::StringArray p1,
 Test_impl::union_op1 (::VBfixed_union1 * p1,
                       ::VBfixed_union1 *& p2,
                       ::VBfixed_union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long longValue;
   CORBA::Short shortValue;
@@ -400,7 +384,6 @@ void
 Test_impl::union_op2 (const ::Fixed_Union1 & p1,
                       ::Fixed_Union1 & p2,
                       ::Fixed_Union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p1;
 
@@ -420,7 +403,6 @@ Test_impl::union_op2 (const ::Fixed_Union1 & p1,
 Test_impl::union_op3 (::VBvariable_union1 * p1,
                       ::VBvariable_union1 *& p2,
                       ::VBvariable_union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long longValue;
   CORBA::String_var stringValue;
@@ -468,7 +450,6 @@ void
 Test_impl::union_op4 (const ::Variable_Union1 & p1,
                       ::Variable_Union1 & p2,
                       ::Variable_Union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringValue;
 
@@ -503,7 +484,6 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1,
 
 void
 Test_impl::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h
index ec82e9947b7..179177176be 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.h
+++ b/TAO/tests/OBV/ValueBox/Test_impl.h
@@ -29,106 +29,86 @@ public:
   virtual VBlong * basic_op1 (
                        VBlong * p1,
                        VBlong *& p2,
-                       VBlong_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       VBlong_out p3);
 
   virtual vb_basic::M_VBlong * basic_op2(vb_basic::M_VBlong * p1,
                                          vb_basic::M_VBlong *& p2,
-                                         vb_basic::M_VBlong_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         vb_basic::M_VBlong_out p3);
 
   virtual ::CORBA::Long basic_op3 (
                                    ::CORBA::Long p1,
                                    ::CORBA::Long& p2,
-                                   ::CORBA::Long_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   ::CORBA::Long_out p3);
 
   virtual VBstring * string_op1 (::VBstring * p1,
                                  ::VBstring *& p2,
-                                 ::VBstring_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 ::VBstring_out p3);
 
   virtual char * string_op2 (const char * p1,
                              char *& p2,
-                             CORBA::String_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                             CORBA::String_out p3);
 
   virtual ::VBseqlong * seq_op1 (::VBseqlong * p1,
                                  ::VBseqlong *& p2,
-                                 ::VBseqlong_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 ::VBseqlong_out p3);
 
   virtual void seq_op2 (const ::TDseqlong & p1,
                         ::TDseqlong & p2,
-                        ::TDseqlong_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        ::TDseqlong_out p3);
 
   virtual ::VBfixed_struct1 * struct_op1 (
                                           ::VBfixed_struct1 * p1,
                                           ::VBfixed_struct1 *& p2,
-                                          ::VBfixed_struct1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          ::VBfixed_struct1_out p3);
 
   virtual void struct_op2 (const ::Fixed_Struct1 & p1,
                            ::Fixed_Struct1 & p2,
-                           ::Fixed_Struct1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           ::Fixed_Struct1_out p3);
 
   virtual ::VBvariable_struct1 * struct_op3 (::VBvariable_struct1 * p1,
                                              ::VBvariable_struct1 *& p2,
-                                             ::VBvariable_struct1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             ::VBvariable_struct1_out p3);
 
 
   virtual void struct_op4 (const ::Variable_Struct1 & p1,
                            ::Variable_Struct1 & p2,
-                           ::Variable_Struct1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           ::Variable_Struct1_out p3);
 
   virtual ::VBlongarray * array_op1 (::VBlongarray * p1,
                                      ::VBlongarray *& p2,
-                                     ::VBlongarray_out p3)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                                     ::VBlongarray_out p3);
 
 
   virtual void array_op2 (const ::LongArray p1,
                           ::LongArray p2,
-                          ::LongArray_out p3)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+                          ::LongArray_out p3);
 
   virtual ::VBstringarray * array_op3 (::VBstringarray * p1,
                                        ::VBstringarray *& p2,
-                                       ::VBstringarray_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       ::VBstringarray_out p3);
 
   virtual void array_op4 (const ::StringArray p1,
                           ::StringArray p2,
-                          ::StringArray_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          ::StringArray_out p3);
 
   virtual ::VBfixed_union1 * union_op1 (::VBfixed_union1 * p1,
                                         ::VBfixed_union1 *& p2,
-                                        ::VBfixed_union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        ::VBfixed_union1_out p3);
 
   virtual void union_op2 (const ::Fixed_Union1 & p1,
                           ::Fixed_Union1 & p2,
-                          ::Fixed_Union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          ::Fixed_Union1_out p3);
 
   virtual ::VBvariable_union1 * union_op3 (::VBvariable_union1 * p1,
                                            ::VBvariable_union1 *& p2,
-                                           ::VBvariable_union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           ::VBvariable_union1_out p3);
 
   virtual void union_op4 (const ::Variable_Union1 & p1,
                           ::Variable_Union1 & p2,
-                          ::Variable_Union1_out p3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          ::Variable_Union1_out p3);
 
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index fef0f2885fe..b9698901d3d 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1427,7 +1427,7 @@ main (int argc, char *argv[])
 
   try
     {
-      orb = CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 48ae95f73b4..1c67935ce6b 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -69,7 +69,12 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test_var test = Test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index f776106f692..27a4e43e502 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -33,7 +33,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index 750c68132fe..2b90056d917 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -83,7 +83,7 @@ int DllOrb::init (int argc, char *argv[])
       }
 
     // Initialize the ORB
-    mv_orb = CORBA::ORB_init(argc, argv, 0);
+    mv_orb = CORBA::ORB_init(argc, argv);
     if (CORBA::is_nil(mv_orb.in()))
       return -1;
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 69430847582..3721c755bf0 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/ORB_Local_Config/run_tests_all.pl b/TAO/tests/ORB_Local_Config/run_tests_all.pl
index 1cd3ae6a50c..36d60053c2d 100755
--- a/TAO/tests/ORB_Local_Config/run_tests_all.pl
+++ b/TAO/tests/ORB_Local_Config/run_tests_all.pl
@@ -31,7 +31,7 @@ sub test($)
     chdir ($executable);
     my $t1 = new PerlACE::Process ("Test", ($arguments ? $arguments : ""));
     print STDERR "\nTest $executable is running ...\n";
-    my $status = $t1->SpawnWaitKill (10);
+    my $status = $t1->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
     chdir ("..");
     if ($status != 0) {
         print STDERR "\nERROR: Test $executable failed, status=$status\n";
diff --git a/TAO/tests/ORB_destroy/run_test.pl b/TAO/tests/ORB_destroy/run_test.pl
index e1849d14abb..8434e081af1 100755
--- a/TAO/tests/ORB_destroy/run_test.pl
+++ b/TAO/tests/ORB_destroy/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("ORB_destroy");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
index 5be30781a60..bcca46eeec7 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.cpp
+++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp
@@ -33,9 +33,6 @@ simple_i::~simple_i (void)
 
 void simple_i::test (
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
   {
     //Add your implementation here
   }
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
index 581c88f8aa0..2136a1d1135 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.h
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -39,10 +39,7 @@ public:
   virtual ~simple_i (void);
 
 virtual void test (
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 };
 
diff --git a/TAO/tests/ORB_init/run_test.pl b/TAO/tests/ORB_init/run_test.pl
index 658e4197806..f9b2781b422 100755
--- a/TAO/tests/ORB_init/run_test.pl
+++ b/TAO/tests/ORB_init/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("ORB_init");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 69b521e5e28..09d6d131320 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -14,7 +14,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -35,8 +35,13 @@ main (int argc, char *argv[])
                       Foo_Bar (orb.in ()),
                       1);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (foobar_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Foo_var foo =
-        foobar_impl->_this ();
+        Test::Foo::_narrow (object.in ());
 
       poa_manager->activate ();
 
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 3287952f4e2..0aee1dc29e7 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -16,14 +16,12 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
 
 char *
 ORT_test_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ORT_IORInterceptor");
 }
 
 void
 ORT_test_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (this->establish_count_ > 0
               && this->components_establish_count_ > 0
@@ -33,7 +31,6 @@ ORT_test_IORInterceptor::destroy (void)
 void
 ORT_test_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr /* info */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->establish_count_;
 
@@ -45,7 +42,6 @@ ORT_test_IORInterceptor::establish_components (
 void
 ORT_test_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->components_establish_count_;
 
@@ -78,7 +74,6 @@ void
 ORT_test_IORInterceptor::adapter_manager_state_changed (
     const char * id,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "The AdapterManager [id=%s] state has changed.\n", id));
@@ -88,6 +83,5 @@ void
 ORT_test_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 40a7a2968f3..995cc77a3e6 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -47,31 +47,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-     ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 7d0dc6b4a6f..3477dd25651 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -13,14 +13,12 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
 
 CORBA::Boolean
 ORT_test_i::request_server (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
 ORT_test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h
index 582438e8795..55aef41d1a9 100644
--- a/TAO/tests/ORT/ORT_test_i.h
+++ b/TAO/tests/ORT/ORT_test_i.h
@@ -26,11 +26,9 @@ public:
 
   ORT_test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Boolean request_server (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean request_server (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index 13c12219c2b..054801c2c7e 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -14,14 +14,12 @@ ACE_RCSID (ORT,
 void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Object_var obj =
diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h
index 6f5d85861ab..016a56fba86 100644
--- a/TAO/tests/ORT/ServerORBInitializer.h
+++ b/TAO/tests/ORT/ServerORBInitializer.h
@@ -51,13 +51,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 6e4b4eee5ac..6f502932c60 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -20,30 +20,24 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 
 char *
 ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
 ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // If no response is expected, then we're invoking the oneway
   // shutdown operation.  Don't bother displaying output a second
@@ -120,22 +114,17 @@ ServerRequestInterceptor::receive_request (
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index afa56c964ca..2c512632061 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -65,35 +65,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 953d57e77f3..d2b65e64926 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -13,7 +13,6 @@ CORBA::Object_ptr
 Loader::create_object (CORBA::ORB_ptr orb,
                        int,
                        char * [])
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -32,6 +31,9 @@ Loader::create_object (CORBA::ORB_ptr orb,
       ACE_NEW_RETURN (test, Test_i (poa.in ()),
                       CORBA::Object::_nil ());
 
+      PortableServer::ObjectId_var id =
+        poa->activate_object (test);
+
       PortableServer::ServantBase_var tmp = test;
       obj = test->_this ();
 
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 47c39d4e32c..0e7329ad627 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -32,8 +32,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [])
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           char *argv []);
   // Create a new instance
 };
 
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 7271b79e988..f0f147c9f96 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -15,14 +15,12 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 
 CORBA::Long
 Test_i::instance_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
 Test_i::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
@@ -33,7 +31,6 @@ Test_i::destroy (void)
 
 PortableServer::POA_ptr
 Test_i::_default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index c1d920b2c7b..e9a7edf00bb 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -30,14 +30,11 @@ public:
   Test_i (PortableServer::POA_ptr poa);
   // ctor
 
-  CORBA::Long instance_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long instance_count (void);
 
-  void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy (void);
 
-  PortableServer::POA_ptr _default_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index 5584458efcb..f0803cc6e7f 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -33,6 +33,13 @@ main (int, char *[])
               Test_var test =
                 Test::_narrow (object.in ());
 
+              if (CORBA::is_nil (test.in ()))
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     "Nil object reference.\n"),
+                                    1);
+                }
+
               CORBA::Long count =
                 test->instance_count ();
 
diff --git a/TAO/tests/Object_Loader/run_test.pl b/TAO/tests/Object_Loader/run_test.pl
index a64f5db6b2c..e31aab99870 100755
--- a/TAO/tests/Object_Loader/run_test.pl
+++ b/TAO/tests/Object_Loader/run_test.pl
@@ -10,11 +10,7 @@ use English;
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-if ($OSNAME eq "MSWin32") {
-   $ENV{'PATH'} .= ';'.$PerlACE::Process::ExeSubDir;
-} else {
-   $ENV{'PATH'} .= ':'.$PerlACE::Process::ExeSubDir;
-}
+PerlACE::add_lib_path ($PerlACE::Process::ExeSubDir);
 
 $T = new PerlACE::Process ("driver");
 
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index dbd009c2f59..a7309ca3f19 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 8b618bb40f1..599ae7518dd 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -13,14 +13,11 @@ public:
                  CORBA::ORB_ptr orb);
 
   void CreateExtra (CORBA::ULong length,
-                    ServerSequence_out seq)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    ServerSequence_out seq);
 
-  void DeleteExtra (const ServerSequence &seq)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void DeleteExtra (const ServerSequence &seq);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   /// Our root POA
@@ -42,7 +39,6 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa,
 void
 ServerServant::CreateExtra (CORBA::ULong len,
                             ServerSequence_out seq)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Create extra called with "
@@ -77,7 +73,6 @@ ServerServant::CreateExtra (CORBA::ULong len,
 
 void
 ServerServant::DeleteExtra (const ServerSequence &seq)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Deleting sequences \n"));
@@ -106,7 +101,6 @@ ServerServant::DeleteExtra (const ServerSequence &seq)
 
 void
 ServerServant::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -180,8 +174,13 @@ main (int argc, char *argv [])
 
       PortableServer::ServantBase_var owner_transfer(servant);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Server_var server =
-        servant->_this ();
+        Server::_narrow (object.in ());
 
       // Announce the server
       CORBA::String_var obj_ref =
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index ddad93f5747..dd82699300d 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -12,10 +12,10 @@ project(*Server): taoserver {
   avoids += ace_for_tao
   after += *idl
   Source_Files {
+    testC.cpp
+    testS.cpp
     test_i.cpp
     server.cpp
-    testS.cpp
-    testC.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index 757322add9c..dad4436d34b 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index ab4f42042bb..1a1d85a134d 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -26,9 +26,9 @@ print STDERR "\n\n==== Octet sequence passing test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }
 
diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl
index 39a654a6b1d..adab544a7b4 100755
--- a/TAO/tests/OctetSeq/run_test1.pl
+++ b/TAO/tests/OctetSeq/run_test1.pl
@@ -26,7 +26,7 @@ print STDERR "\n\n==== Octet sequence passing test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl
index 2cdd88b1f34..9ec6aceedc0 100755
--- a/TAO/tests/OctetSeq/run_test2.pl
+++ b/TAO/tests/OctetSeq/run_test2.pl
@@ -26,7 +26,7 @@ print STDERR "\n\n==== Octet sequence passing test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 81cae9d601b..26bec5a3f65 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
         Database_i server_impl (orb.in (),
                                 128); // @@ TODO
 
+        PortableServer::ObjectId_var id =
+          root_poa->activate_object (&server_impl);
+
+        CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
         Test::Database_var server =
-          server_impl._this ();
+          Test::Database::_narrow (object.in ());
 
         CORBA::String_var ior =
           orb->object_to_string (server.in ());
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index c7ba1fd796d..19d94f713d0 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -19,7 +19,6 @@ Database_i::set (Test::Index i,
                  const Test::OctetSeq& seq,
                  CORBA::Double verification_token,
                  CORBA::Double_out returned_token)
-    ACE_THROW_SPEC ((Test::OutOfRange))
 {
   if (i >= this->max_range_)
     throw Test::OutOfRange (0, this->max_range_);
@@ -45,10 +44,9 @@ Database_i::set (Test::Index i,
 
 Test::OctetSeq*
 Database_i::get (Test::Index i)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
-    ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0);
+    throw Test::OutOfRange (0, this->max_range_);
 
   Test::OctetSeq* copy;
   ACE_NEW_THROW_EX (copy,
@@ -59,10 +57,9 @@ Database_i::get (Test::Index i)
 
 CORBA::ULong
 Database_i::get_crc (Test::Index i)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
-    ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0);
+    throw Test::OutOfRange (0, this->max_range_);
 
   return ACE::crc32 (this->elements_[i].get_buffer (),
                      this->elements_[i].length ());
@@ -70,7 +67,6 @@ Database_i::get_crc (Test::Index i)
 
 void
 Database_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index 4d7b846d38d..1269850b911 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -35,17 +35,13 @@ public:
   void set (Test::Index i,
             const Test::OctetSeq& seq,
             CORBA::Double verification_token,
-            CORBA::Double_out returned_token)
-    ACE_THROW_SPEC ((Test::OutOfRange));
+            CORBA::Double_out returned_token);
 
-  Test::OctetSeq* get (Test::Index i)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
+  Test::OctetSeq* get (Test::Index i);
 
-  CORBA::ULong get_crc (Test::Index i)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
+  CORBA::ULong get_crc (Test::Index i);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index bfd8274359a..a2a4d8ae380 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -16,14 +16,12 @@ Hello::get_string (
         const char * inputa,
         ::CORBA::Long ,
         const char * )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (inputa);
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 2cd11fd1b71..9f8734f5684 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -21,11 +21,9 @@ public:
     ::CORBA::Long valuea,
     const char * inputa,
     ::CORBA::Long valueb,
-    const char * inputb)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    const char * inputb);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
index 066f4725953..533fb3def3b 100644
--- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
+++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp
index c48b9ee41fb..52dc811c103 100644
--- a/TAO/tests/Ondemand_Write/client.cpp
+++ b/TAO/tests/Ondemand_Write/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp
index 8c998950dd3..edfe2b98049 100644
--- a/TAO/tests/Ondemand_Write/server.cpp
+++ b/TAO/tests/Ondemand_Write/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 16db8fe73e2..698098675db 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -14,27 +14,23 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
 
 void
 Oneway_Buffering::receive_data (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_->request_received (the_payload.length ());
 }
 
 void
 Oneway_Buffering::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Oneway_Buffering::sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_->flush ();
 }
 
 void
 Oneway_Buffering::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index 9b32c9e4d58..b201e475f14 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -18,17 +18,13 @@ public:
                     Test::Oneway_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sync (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index b2577e7317c..12baf67903d 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -13,7 +13,7 @@ project(*Server): messaging, taoexe, portableserver {
   Source_Files {
     Oneway_Buffering.cpp
     server.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
     TestS.cpp
@@ -25,11 +25,10 @@ project(*Server): messaging, taoexe, portableserver {
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
   after += *idl
-  after += *Server
 
   Source_Files {
     client.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
   }
@@ -39,11 +38,10 @@ project(*Client): messaging, taoexe, portableserver {
 
 project(*Admin): messaging, taoexe, portableserver {
   after += *idl
-  after += *Client
   Source_Files {
     Oneway_Buffering_Admin.cpp
     admin.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
     TestS.cpp
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 1525b0f0905..9f4733ac4e3 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -14,21 +14,18 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
 
 CORBA::ULong
 Oneway_Buffering_Admin::request_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
 Oneway_Buffering_Admin::bytes_received_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
 Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
   this->bytes_received_count_ += payload_length;
@@ -36,13 +33,11 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
 
 void
 Oneway_Buffering_Admin::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Oneway_Buffering_Admin::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index 02272fd53bf..738b6d1f597 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -17,20 +17,15 @@ public:
   Oneway_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong request_count (void);
 
-  virtual CORBA::ULong bytes_received_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong bytes_received_count (void);
 
-  virtual void request_received (CORBA::ULong payload_length)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 830ab7969b6..0111f9cc430 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (oneway_buffering_admin_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        oneway_buffering_admin_impl->_this ();
+        Test::Oneway_Buffering_Admin::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (oneway_buffering_admin.in ());
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 4ad22187b4c..45b51ed0151 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index bd0c5a289e5..cd3fa337886 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -86,8 +86,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (oneway_buffering_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Oneway_Buffering_var oneway_buffering =
-        oneway_buffering_impl->_this ();
+        Test::Oneway_Buffering::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (oneway_buffering.in ());
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index c84c0745c28..0df5c20605d 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -43,13 +43,11 @@ public:
   }
 
   virtual void test (CORBA::Long id)
-    ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     testShared (id);
   }
 
   virtual CORBA::Long test2 (CORBA::Long id)
-    ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     if (id == -2)
       {
@@ -227,9 +225,9 @@ namespace {
             abort_after = ACE_OS::atoi (args.get_current ());
             args.consume_arg ();
           }
-        else 
+        else
           {
-            cerr << "Error: Unknown argument \"" 
+            cerr << "Error: Unknown argument \""
                  << args.get_current () << "\"" << endl;
             print_usage ();
             return false;
@@ -254,7 +252,7 @@ namespace {
     pols[0] = root->create_id_assignment_policy (PortableServer::USER_ID);
     pols[1] = root->create_lifespan_policy (PortableServer::PERSISTENT);
     POAManager_var man = root->the_POAManager ();
-    POA_var poa = root->create_POA ("X", man.in (), pols); 
+    POA_var poa = root->create_POA ("X", man.in (), pols);
     return poa._retn ();
   }
 
@@ -309,7 +307,7 @@ int main (int ac, char *av[])
 
       return 0;
 
-    } 
+    }
   catch (CORBA::Exception &ex)
     {
       ex._tao_print_exception ("server:");
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index 2ff1d62ad2d..7563dc9d021 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -5,8 +5,8 @@ project (*client) : taoexe, messaging, portableserver, strategies {
   exename = client
   after = *server
   source_files {
-    client.cpp
     TestC.cpp
+    client.cpp
   }
   header_files {
     TestC.h
@@ -17,9 +17,9 @@ project (*client) : taoexe, messaging, portableserver, strategies {
 
 project (*server) : taoserver, messaging, strategies {
   source_files {
-    server.cpp
-    TestS.cpp
     TestC.cpp
+    TestS.cpp
+    server.cpp
   }
   header_files {
     TestS.h
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 2f2b3a6e1c7..08a9bf7fa30 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index d9d5b1c20a6..4ece8c08df7 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -20,7 +20,6 @@ Receiver_i::~Receiver_i (void)
 
 CORBA::Long
 Receiver_i::receive_call (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)  Doing a ping... \n"));
@@ -32,7 +31,6 @@ Receiver_i::receive_call (void)
 
 CORBA::Long
 Receiver_i::get_call_count ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->iteration_;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index cbd618db0a4..2878f61b637 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
@@ -33,12 +33,10 @@ public:
   virtual ~Receiver_i (void);
 
   // = The skeleton methods
-  virtual CORBA::Long receive_call (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long receive_call (void);
 
   /// Retun the number of calls that every thread would make...
-  virtual CORBA::Long get_call_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get_call_count (void);
 
 private:
   /// Our Orb...
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 9e4cf2f22e3..ae50a6b64eb 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -17,7 +17,6 @@ Sender_i::~Sender_i (void)
 void
 Sender_i::active_objects (CORBA::Short no_threads
  /* */ )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
 }
@@ -25,7 +24,6 @@ Sender_i::active_objects (CORBA::Short no_threads
 
 void
 Sender_i::send_ready_message (Test::Receiver_ptr receiver)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received a call ...\n"));
@@ -44,7 +42,6 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver)
 
 void
 Sender_i::ping ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 57ea386f763..8bb227053e8 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -33,14 +33,11 @@ public:
   virtual ~Sender_i (void);
 
   // = The skeleton methods
-  virtual void active_objects (CORBA::Short ao)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void active_objects (CORBA::Short ao);
 
-  virtual void send_ready_message (Test::Receiver_ptr receiver)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_ready_message (Test::Receiver_ptr receiver);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
 private:
   /// Our local ORB ptr
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index a1a34fda8af..6222cdd906f 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -83,8 +83,13 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Receiver_var receiver =
-        receiver_impl->_this ();
+        Test::Receiver::_narrow (object.in ());
 
       // Activate poa manager
       poa_manager->activate ();
diff --git a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl
index b4bf53c5ac0..789c7cc2f50 100755
--- a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl
+++ b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl
@@ -15,14 +15,14 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 $CL1 = new PerlACE::Process ("client", " -k file://$iorfile");
 
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl b/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl
index c74fd628f5c..65f736b29c5 100755
--- a/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl
+++ b/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl
@@ -17,7 +17,7 @@ $CL1 = new PerlACE::Process ("client", "-ORBSvcConf svcconf -k file://$iorfile")
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 0856678ad4a..62ae3d6eb7a 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (sender_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Sender_var sender =
-        sender_impl->_this ();
+        Test::Sender::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (sender.in ());
diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp
index 1725984fb2a..959e2f97c50 100644
--- a/TAO/tests/Optimized_Connection/oc_client.cpp
+++ b/TAO/tests/Optimized_Connection/oc_client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
new file mode 100644
index 00000000000..cb7932e188b
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
@@ -0,0 +1,39 @@
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
+  Source_Files {
+    test_i.cpp
+    Server_ORBInitializer.cpp
+    Server_Request_Interceptor.cpp
+    ServantLocator.cpp
+    server.cpp
+  }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, pi {
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/POA/Bug_1592_Regression/README b/TAO/tests/POA/Bug_1592_Regression/README
new file mode 100644
index 00000000000..d707901a31e
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/README
@@ -0,0 +1,9 @@
+# $Id$
+
+This test verifies that server side interceptor flow is correct when a
+PortableServer::ServantLocator is in use.
+
+Test output should be similar to the following:
+
+==== Running PortableInterceptor / ServantLocator test
+
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
new file mode 100644
index 00000000000..58e7a244d4c
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -0,0 +1,88 @@
+#include "ServantLocator.h"
+
+
+ACE_RCSID (ServantLocator,
+           ServantLocator,
+           "$Id$")
+
+
+#include "test_i.h"
+
+
+extern CORBA::Boolean receive_request_service_contexts_called;
+extern CORBA::Boolean ending_interception_point_called;
+
+ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
+  : error_status_ (false),
+    orb_ (CORBA::ORB::_duplicate (orb)),
+    servant_ ()
+{
+}
+
+ServantLocator::~ServantLocator (void)
+{
+}
+
+PortableServer::Servant
+ServantLocator::preinvoke (
+    const PortableServer::ObjectId & /* oid */,
+    PortableServer::POA_ptr /* adapter */,
+    const char * operation,
+    PortableServer::ServantLocator::Cookie & /* the_cookie */)
+{
+  if (ACE_OS::strcmp (operation, "shutdown") != 0)
+    {
+      if (receive_request_service_contexts_called == 0)
+        {
+          error_status_ = true;
+          ACE_ERROR ((LM_ERROR,
+                      "PortableInterceptor::ServerRequestInterceptor:: "
+                      "receive_request_service_contexts() not called\n"
+                      "prior to "
+                      "PortableServer::ServantLocator::preinvoke().\n"));
+
+          throw CORBA::INTERNAL ();
+        }
+
+      if (this->servant_.in () == 0)
+        {
+          test_i * servant;
+
+          ACE_NEW_THROW_EX (servant,
+                            test_i (this->orb_.in ()),
+                            CORBA::NO_MEMORY ());
+
+          this->servant_ = servant;
+        }
+    }
+
+  return this->servant_.in ();
+}
+
+
+void
+ServantLocator::postinvoke (
+    const PortableServer::ObjectId & /* oid */,
+    PortableServer::POA_ptr /* adapter */,
+    const char * operation,
+    PortableServer::ServantLocator::Cookie /* the_cookie */,
+    PortableServer::Servant /* the_servant */)
+{
+  if (ACE_OS::strcmp (operation, "shutdown") != 0)
+    {
+      // Ending interception points should be called after postinvoke().
+      if (::ending_interception_point_called != 0)
+        {
+          error_status_ = true;
+          ACE_ERROR ((LM_ERROR,
+                      "ERROR: PortableInterceptor::ServerRequestInterceptor"
+                      "\n"
+                      "ERROR: ending interception point incorrectly "
+                      "called prior to\n"
+                      "ERROR: "
+                      "PortableServer::ServantLocator::postinvoke().\n"));
+
+          throw CORBA::INTERNAL ();
+        }
+    }
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
new file mode 100644
index 00000000000..3ff37066256
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
@@ -0,0 +1,85 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file ServantLocator.h
+ *
+ * $Id$
+ *
+ * Implementation header for the PortableServer::ServantLocator for
+ * the PortableInterceptor / ServantLocator test.
+ *
+ * @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#ifndef SERVANT_LOCATOR_H
+#define SERVANT_LOCATOR_H
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/LocalObject.h"
+#include "tao/ORB.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+/**
+ * @class ServantLocator
+ *
+ * @brief Test PortableServer::ServantLocator.
+ *
+ * PortableServer::ServantLocator used for this test.
+ */
+class ServantLocator
+  : public virtual PortableServer::ServantLocator,
+    public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor.
+  ServantLocator (CORBA::ORB_ptr orb);
+
+  virtual PortableServer::Servant preinvoke (
+      const PortableServer::ObjectId & oid,
+      PortableServer::POA_ptr adapter,
+      const char * operation,
+      PortableServer::ServantLocator::Cookie & the_cookie);
+
+  virtual void postinvoke (
+      const PortableServer::ObjectId & oid,
+      PortableServer::POA_ptr adapter,
+      const char * operation,
+      PortableServer::ServantLocator::Cookie the_cookie,
+      PortableServer::Servant the_servant);
+
+  bool error_status_;
+protected:
+
+  /// Destructor.
+  ~ServantLocator (void);
+
+private:
+
+  /// Pseudo-reference to the ORB.
+  CORBA::ORB_var orb_;
+
+  /// Pointer to the test servant.
+  PortableServer::ServantBase_var servant_;
+
+};
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif  /* SERVANT_LOCATOR_H */
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
new file mode 100644
index 00000000000..0c22259babf
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -0,0 +1,39 @@
+#include "Server_ORBInitializer.h"
+
+ACE_RCSID (ServantLocator,
+           Server_ORBInitializer,
+           "$Id$")
+
+#include "tao/ORB_Constants.h"
+#include "Server_Request_Interceptor.h"
+
+Server_ORBInitializer::Server_ORBInitializer (void)
+{
+}
+
+void
+Server_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr)
+{
+}
+
+void
+Server_ORBInitializer::post_init (
+    PortableInterceptor::ORBInitInfo_ptr info)
+{
+  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));
+
+  PortableInterceptor::ServerRequestInterceptor_var safe_interceptor =
+    interceptor;
+
+  // Install the server request interceptor.
+  info->add_server_request_interceptor (interceptor);
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
new file mode 100644
index 00000000000..fce0e29d4a3
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file Server_ORBInitializer.h
+ *
+ * $Id$
+ *
+ * Implementation header for the PortableInterceptor/ServantLocator
+ * test server side ORB initializer.
+ *
+ * @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_SERVER_ORB_INITIALIZER_H
+#define TAO_SERVER_ORB_INITIALIZER_H
+
+#include "tao/PI/PI.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+/// 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);
+
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+};
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif /* TAO_SERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
new file mode 100644
index 00000000000..a235fec3cee
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -0,0 +1,116 @@
+#include "Server_Request_Interceptor.h"
+
+
+ACE_RCSID (ServantLocator,
+           Server_Request_Interceptor,
+           "$Id$")
+
+
+CORBA::Boolean receive_request_service_contexts_called = 0;
+CORBA::Boolean receive_request_called = 0;
+CORBA::Boolean ending_interception_point_called = 0;
+
+
+Server_Request_Interceptor::Server_Request_Interceptor (void)
+{
+}
+
+Server_Request_Interceptor::~Server_Request_Interceptor (void)
+{
+}
+
+char *
+Server_Request_Interceptor::name (void)
+{
+  return CORBA::string_dup ("");  // Anonymous
+}
+
+void
+Server_Request_Interceptor::destroy (void)
+{
+}
+
+void
+Server_Request_Interceptor::receive_request_service_contexts (
+    PortableInterceptor::ServerRequestInfo_ptr ri)
+{
+  CORBA::String_var op = ri->operation ();
+
+  if (ACE_OS::strcmp (op.in (), "shutdown") != 0)
+    {
+      if (::receive_request_service_contexts_called != 0)
+        {
+          throw CORBA::INTERNAL ();
+        }
+
+      ::receive_request_service_contexts_called = 1;
+    }
+}
+
+void
+Server_Request_Interceptor::receive_request (
+    PortableInterceptor::ServerRequestInfo_ptr ri)
+{
+  CORBA::String_var op = ri->operation ();
+
+  if (ACE_OS::strcmp (op.in (), "shutdown") != 0)
+    {
+      if (::receive_request_called != 0)
+        {
+          throw CORBA::INTERNAL ();
+        }
+
+      ::receive_request_called = 1;
+    }
+}
+
+void
+Server_Request_Interceptor::send_reply (
+    PortableInterceptor::ServerRequestInfo_ptr ri)
+{
+  CORBA::String_var op = ri->operation ();
+
+  if (ACE_OS::strcmp (op.in (), "shutdown") != 0)
+    {
+      if (::ending_interception_point_called != 0)
+        {
+          throw CORBA::INTERNAL ();
+        }
+
+      ::ending_interception_point_called = 1;
+    }
+}
+
+void
+Server_Request_Interceptor::send_exception (
+    PortableInterceptor::ServerRequestInfo_ptr ri)
+{
+  CORBA::String_var op = ri->operation ();
+
+  if (ACE_OS::strcmp (op.in (), "shutdown") != 0)
+    {
+      if (::ending_interception_point_called != 0)
+        {
+          throw CORBA::INTERNAL ();
+        }
+
+      ::ending_interception_point_called = 1;
+    }
+}
+
+void
+Server_Request_Interceptor::send_other (
+    PortableInterceptor::ServerRequestInfo_ptr ri)
+{
+  CORBA::String_var op = ri->operation ();
+
+  if (ACE_OS::strcmp (op.in (), "shutdown") != 0)
+    {
+      if (::ending_interception_point_called != 0)
+        {
+          throw CORBA::INTERNAL ();
+        }
+
+      ::ending_interception_point_called = 1;
+    }
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
new file mode 100644
index 00000000000..01860e44c06
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
@@ -0,0 +1,92 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file Server_Request_Interceptor.h
+ *
+ * $Id$
+ *
+ * Implementation header for the server request interceptor for the
+ * PortableInterceptor / ServantLocator test.
+ *
+ * @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#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 "tao/PI_Server/PI_Server.h"
+#include "tao/LocalObject.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+/**
+ * @class Server_Request_Interceptor
+ *
+ * @brief Simple concrete server request interceptor.
+ *
+ * This server request interceptor merely sets global flags when
+ * specific interception points are called.  Those flags are checked
+ * at various points in the test.
+ */
+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 (void);
+
+  virtual void destroy (void);
+
+  virtual void receive_request_service_contexts (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void receive_request (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_reply (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_exception (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_other (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+  //@}
+
+protected:
+
+  /// Destructor.
+  ~Server_Request_Interceptor (void);
+
+};
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp
new file mode 100644
index 00000000000..76e7f34222f
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/client.cpp
@@ -0,0 +1,77 @@
+#include "ace/Get_Opt.h"
+
+#include "testC.h"
+
+
+ACE_RCSID (ServantLocator,
+           client,
+           "$Id$")
+
+
+const char * ior = 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;
+
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Usage:  %s "
+                           "-k IOR\n",
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int status = 0;
+
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            "Client ORB");
+
+      if (::parse_args (argc, argv) != 0)
+        return -1;
+
+      // Start out with the first IOR.  Interaction with the second
+      // IOR occurs during the various interceptions executed during
+      // this test.
+      CORBA::Object_var object = orb->string_to_object (ior);
+
+      test_var server = test::_narrow (object.in ());
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      server->op ();
+
+      server->shutdown ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return status;
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/run_test.pl b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
new file mode 100755
index 00000000000..e52ba7d5243
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
@@ -0,0 +1,48 @@
+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;
+
+$file = PerlACE::LocalFile ("test.ior");
+
+unlink $file;
+
+$SV = new PerlACE::Process ("server", "-o $file");
+$CL = new PerlACE::Process ("client", "-k file://$file");
+
+$status = 0;
+
+print STDERR "\n\n==== Running PortableInterceptor / ServantLocator test\n";
+
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: cannot find file <$file>\n";
+    $SV->Kill ();
+    exit 1;
+}
+
+$client = $CL->SpawnWaitKill (60);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$server = $SV->WaitKill (5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+unlink $file;
+
+exit $status;
diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp
new file mode 100644
index 00000000000..aa073c2d452
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/server.cpp
@@ -0,0 +1,144 @@
+// -*- C++ -*-
+
+#include "ace/Get_Opt.h"
+#include "test_i.h"
+#include "ServantLocator.h"
+#include "Server_ORBInitializer.h"
+#include "tao/ORBInitializer_Registry.h"
+
+ACE_RCSID (ServantLocator,
+           server,
+           "$Id$")
+
+const char * ior_file = 0;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_file = get_opts.opt_arg ();
+        break;
+
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Usage:  %s "
+                           "-o IOR\n",
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      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 ());
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "Server ORB");
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      // Create a child POA configured to use a ServantLocator.
+      CORBA::PolicyList policies (2);
+
+      policies.length (2);
+      policies[0] =
+        root_poa->create_request_processing_policy (
+          PortableServer::USE_SERVANT_MANAGER);
+
+      policies[1] =
+        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN);
+
+      PortableServer::POA_var child_poa =
+        root_poa->create_POA ("child",
+                              poa_manager.in (),
+                              policies);
+
+      ServantLocator* sl = 0;
+      ACE_NEW_THROW_EX (sl,
+                        ServantLocator (orb.in ()),
+                        CORBA::NO_MEMORY ());
+
+      PortableServer::ServantLocator_var servant_locator = sl;
+
+      child_poa->set_servant_manager (servant_locator.in ());
+
+      poa_manager->activate ();
+
+      CORBA::Object_var obj =
+        child_poa->create_reference ("IDL:test:1.0");
+
+      CORBA::String_var ior = orb->object_to_string (obj.in ());
+
+      if (::parse_args (argc, argv) != 0)
+        return -1;
+
+      // Write IOR to a file.
+      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:\n%s\n",
+                           ior_file,
+                           ior.in ()),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      // Run the ORB event loop.
+      orb->run ();
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+
+      if (sl->error_status_ == false)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "PortableInterceptor / ServantLocator test passed.\n"));
+      }
+      else
+      {
+        ACE_ERROR ((LM_ERROR,
+                    "PortableInterceptor / ServantLocator test failed.\n"));
+        return 1;
+      }
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/test.idl b/TAO/tests/POA/Bug_1592_Regression/test.idl
new file mode 100644
index 00000000000..57b9f37c17f
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/test.idl
@@ -0,0 +1,35 @@
+// -*- IDL -*-
+
+//=============================================================================
+/**
+ * @file test.idl
+ *
+ * $Id$
+ *
+ * Simple IDL file to test  PortableInterceptor / ServantLocator
+ * support.
+ *
+ * @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#ifndef TEST_IDL
+#define TEST_IDL
+
+/**
+ * @interface test
+ *
+ * @brief PortableInterceptor/ServantLocator test interface.
+ *
+ * Simple interface that provides an operation to invoke.
+ */
+interface test
+{
+  /// Dummy operation.
+  void op ();
+
+  /// Shutdown the server.
+  oneway void shutdown ();
+};
+
+#endif  /* TEST_IDL */
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
new file mode 100644
index 00000000000..470979302c0
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -0,0 +1,40 @@
+#include "test_i.h"
+
+
+ACE_RCSID (ServantLocator,
+           test_i,
+           "$Id$")
+
+
+extern CORBA::Boolean receive_request_called;
+
+test_i::test_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+test_i::~test_i (void)
+{
+}
+
+void
+test_i::op (void)
+{
+  // PortableInterceptor::ServerRequestInterceptor::receive_request()
+  // should have been invoked.
+  if (::receive_request_called == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "PortableInterceptor::ServerRequestInterceptor::"
+                  "receive_request() not called \n"
+                  "prior to target operation execution.\n"));
+
+      throw CORBA::INTERNAL ();
+    }
+}
+
+void
+test_i::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.h b/TAO/tests/POA/Bug_1592_Regression/test_i.h
new file mode 100644
index 00000000000..7e6c896933f
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.h
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file test_i.h
+ *
+ * $Id$
+ *
+ * Implementation header for the "test" IDL interface for the
+ * "PortableInterceptor / ServantLocator" test.
+ *
+ * @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#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.
+ */
+class test_i
+  : public virtual POA_test
+{
+public:
+
+  /// Constructor.
+  test_i (CORBA::ORB_ptr orb);
+
+  virtual void op (void);
+
+  /// Shutdown the ORB.
+  virtual void shutdown (void);
+
+protected:
+
+  /// Destructor.
+  ~test_i (void);
+
+private:
+
+  /// Pseudo-reference to the ORB.
+  CORBA::ORB_var orb_;
+
+};
+
+#endif  /* TEST_I_H */
diff --git a/TAO/tests/POA/Bug_2511_Regression/run_test.pl b/TAO/tests/POA/Bug_2511_Regression/run_test.pl
index 7b9d78497d9..4e4aff8ae31 100755
--- a/TAO/tests/POA/Bug_2511_Regression/run_test.pl
+++ b/TAO/tests/POA/Bug_2511_Regression/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("server");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index 715b1b85a73..6b199cbf575 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -32,14 +32,11 @@ public:
 
   test_i (PortableServer::POA_ptr poa);
 
-  void normal (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (void);
 
-  void exceptional (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void exceptional (void);
 
-  void notexisting (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void notexisting (void);
 
   PortableServer::POA_var poa_;
 };
@@ -51,21 +48,18 @@ test_i::test_i (PortableServer::POA_ptr poa)
 
 void
 test_i::normal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
 }
 
 void
 test_i::exceptional (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
 }
 
 void
 test_i::notexisting (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
 }
@@ -80,16 +74,13 @@ public:
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr,
                                        const char *,
-                                       PortableServer::ServantLocator::Cookie &)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                       PortableServer::ServantLocator::Cookie &);
 
   void postinvoke (const PortableServer::ObjectId &,
                    PortableServer::POA_ptr,
                    const char *,
                    PortableServer::ServantLocator::Cookie,
-                   PortableServer::Servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   PortableServer::Servant);
 
   test_i servant_;
 };
@@ -104,8 +95,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr,
                             const char *op,
                             PortableServer::ServantLocator::Cookie &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   CORBA::String_var name =
     PortableServer::ObjectId_to_string (oid);
@@ -137,7 +126,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
                              const char *op,
                              PortableServer::ServantLocator::Cookie,
                              PortableServer::Servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++postCount;
   CORBA::String_var name =
@@ -253,5 +241,5 @@ main (int argc, char **argv)
       retval = -1;
     }
 
-  return retval;
+  return errorCount;
 }
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index a81a636773a..2018bc00f13 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -29,21 +29,16 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object;
 
-      object =
-        orb->resolve_initial_references ("POACurrent");
+      object = orb->resolve_initial_references ("POACurrent");
 
       PortableServer::Current_var current =
         PortableServer::Current::_narrow (object.in ());
 
-      object =
-        orb->resolve_initial_references ("RootPOA");
+      object = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ());
diff --git a/TAO/tests/POA/Current/run_test.pl b/TAO/tests/POA/Current/run_test.pl
index 81b478cb5fd..dc12dcfa3b6 100755
--- a/TAO/tests/POA/Current/run_test.pl
+++ b/TAO/tests/POA/Current/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Current");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp
index 399e615c228..f6380be5ae2 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.cpp
+++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp
@@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index 436fdfcd77f..b81881e71cb 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -17,8 +17,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/POA/Deactivate_Object/run_test.pl b/TAO/tests/POA/Deactivate_Object/run_test.pl
index f8a701a6491..2b56e9924db 100755
--- a/TAO/tests/POA/Deactivate_Object/run_test.pl
+++ b/TAO/tests/POA/Deactivate_Object/run_test.pl
@@ -17,7 +17,7 @@ else {
     $SV = new PerlACE::Process ("server");
 }
 
-$server = $SV->SpawnWaitKill (60);
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index 9999f8b1483..9f33c3b6f10 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -13,7 +13,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index 73fdfe91d84..9d5c7997022 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -142,9 +142,7 @@ main (int argc, char **argv)
   try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var object =
diff --git a/TAO/tests/POA/Default_Servant/run_test.pl b/TAO/tests/POA/Default_Servant/run_test.pl
index f5a1a703f22..2da8def4506 100755
--- a/TAO/tests/POA/Default_Servant/run_test.pl
+++ b/TAO/tests/POA/Default_Servant/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Default_Servant");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index a3db1635f9c..37d0a5378af 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, av
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
index 3bb0a772b76..df5dc90d3d9 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.cpp
+++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp
@@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index 2d0cf940897..7581d3ca796 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
 
   try
     {
-      orb = CORBA::ORB_init (argc, argv, "");
+      orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index fdb86bda753..f4fc6dd47c1 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -25,7 +25,6 @@ class test_i : public POA_test
 {
 public:
   void method ( /**/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
@@ -40,7 +39,6 @@ class test_i_with_reference_counting :
 {
 public:
   void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
@@ -54,23 +52,18 @@ class Servant_Activator : public PortableServer::ServantActivator
 {
 public:
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                     PortableServer::POA_ptr poa);
 
   void etherealize (const PortableServer::ObjectId &oid,
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Boolean remaining_activations);
 };
 
 PortableServer::Servant
 Servant_Activator::incarnate (const PortableServer::ObjectId &id,
                               PortableServer::POA_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   CORBA::String_var object_name =
     PortableServer::ObjectId_to_string (id);
@@ -93,7 +86,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
                                 PortableServer::Servant servant,
                                 CORBA::Boolean,
                                 CORBA::Boolean)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_name =
     PortableServer::ObjectId_to_string (id);
diff --git a/TAO/tests/POA/Etherealization/run_test.pl b/TAO/tests/POA/Etherealization/run_test.pl
index 5682c390c28..aa329404f43 100755
--- a/TAO/tests/POA/Etherealization/run_test.pl
+++ b/TAO/tests/POA/Etherealization/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Etherealization");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 1bdba102e50..2dbf1e8d086 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -24,8 +24,7 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate_self (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -42,7 +41,6 @@ test_i::_default_POA ( /**/)
 
 void
 test_i::deactivate_self (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->poa_->deactivate_object (this->id_);
 
@@ -139,8 +137,10 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   servant.id_ = id;
 
+  CORBA::Object_var object = poa->id_to_reference (id);
+
   test_var test =
-    servant._this ();
+    test::_narrow (object.in ());
 
   test->deactivate_self ();
 
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..413f8d26750 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,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoserver, avoids_corba_e_micro {
+  exename = Excessive_Object_Deactivations
 }
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl b/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl
index c9ae4f2e2f6..fa72c4d38c6 100755
--- a/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Excessive_Object_Deactivations");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 1a2065754ef..336816f9d29 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -492,7 +492,7 @@ main (int argc, char **argv)
 
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
diff --git a/TAO/tests/POA/Identity/run_test.pl b/TAO/tests/POA/Identity/run_test.pl
index 2bc6cf92dbf..33a70a08412 100755
--- a/TAO/tests/POA/Identity/run_test.pl
+++ b/TAO/tests/POA/Identity/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Identity", "-ORBobjrefstyle url");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 1962a84a629..c60a1aa60ec 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -30,8 +30,7 @@ public:
 
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
   PortableServer::POA_var poa_;
 };
@@ -43,7 +42,6 @@ test_i::test_i (PortableServer::POA_ptr poa)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -90,16 +88,13 @@ public:
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr,
                                        const char *,
-                                       PortableServer::ServantLocator::Cookie &)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                       PortableServer::ServantLocator::Cookie &);
 
   void postinvoke (const PortableServer::ObjectId &,
                    PortableServer::POA_ptr,
                    const char *,
                    PortableServer::ServantLocator::Cookie,
-                   PortableServer::Servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   PortableServer::Servant);
 
   test_i servant_;
 };
@@ -114,8 +109,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr,
                             const char *,
                             PortableServer::ServantLocator::Cookie &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   CORBA::String_var name =
     PortableServer::ObjectId_to_string (oid);
@@ -148,7 +141,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
                              const char *,
                              PortableServer::ServantLocator::Cookie,
                              PortableServer::Servant)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var name =
     PortableServer::ObjectId_to_string (oid);
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..4f833a99773 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = MT_Servant_Locator
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/run_test.pl b/TAO/tests/POA/MT_Servant_Locator/run_test.pl
index f079a6c84e0..b3247c78c51 100755
--- a/TAO/tests/POA/MT_Servant_Locator/run_test.pl
+++ b/TAO/tests/POA/MT_Servant_Locator/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("MT_Servant_Locator");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 4e484a4119f..531e9b29c1f 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -31,8 +31,7 @@ public:
 
   ~test_i (void);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
   PortableServer::POA_var poa_;
 
@@ -55,7 +54,6 @@ test_i::~test_i (void)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -119,16 +117,13 @@ public:
   Servant_Activator (PortableServer::POA_ptr poa);
 
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+                                     PortableServer::POA_ptr poa);
 
   void etherealize (const PortableServer::ObjectId &oid,
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Boolean remaining_activations);
 
   PortableServer::POA_var poa_;
 
@@ -144,8 +139,6 @@ Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa)
 PortableServer::Servant
 Servant_Activator::incarnate (const PortableServer::ObjectId &,
                               PortableServer::POA_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   test_i *servant =
     new test_i (this->poa_.in ());
@@ -198,7 +191,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &,
                                 PortableServer::Servant servant,
                                 CORBA::Boolean,
                                 CORBA::Boolean)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   servant->_remove_ref ();
 }
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl b/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl
index 2240ead06a4..7c520af7540 100755
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Nested_Non_Servant_Upcalls");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
index 0b3e26cab35..e55c079001f 100755
--- a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
+++ b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Non_Servant_Upcalls");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 98a931f25e0..aafac254c93 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -56,8 +56,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate_self (void);
 
 private:
   ACE_Auto_Event &event_;
@@ -70,7 +69,6 @@ test_i::test_i (ACE_Auto_Event &event)
 
 void
 test_i::deactivate_self (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -233,9 +231,18 @@ main (int argc, char **argv)
       ACE_Auto_Event event2;
       test_i servant2 (event2);
 
-      test_var test_object1 = servant1._this ();
+      PortableServer::ObjectId_var id_act =
+        root_poa->activate_object (&servant1);
 
-      test_var test_object2 = servant2._this ();
+      CORBA::Object_var object_act = root_poa->id_to_reference (id_act.in ());
+
+      test_var test_object1 = test::_narrow (object_act.in ());
+
+      id_act = root_poa->activate_object (&servant2);
+
+      object_act = root_poa->id_to_reference (id_act.in ());
+
+      test_var test_object2 = test::_narrow (object_act.in ());
 
       PortableServer::ObjectId_var id1 =
         root_poa->reference_to_id (test_object1.in ());
diff --git a/TAO/tests/POA/Object_Reactivation/run_test.pl b/TAO/tests/POA/Object_Reactivation/run_test.pl
index eb0a88a4d08..fdb0ad78c82 100755
--- a/TAO/tests/POA/Object_Reactivation/run_test.pl
+++ b/TAO/tests/POA/Object_Reactivation/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Object_Reactivation");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/POAManagerFactory/run_test.pl b/TAO/tests/POA/POAManagerFactory/run_test.pl
index 2b5a382229d..01aaf21ebfe 100755
--- a/TAO/tests/POA/POAManagerFactory/run_test.pl
+++ b/TAO/tests/POA/POAManagerFactory/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("POAManagerFactory");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index 899d8fae6ee..501e0aa3bfd 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -22,13 +22,11 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy_poa (void);
 };
 
 void
 test_i::destroy_poa (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -65,7 +63,12 @@ main (int argc, char **argv)
 
       test_i servant;
 
-      test_var test_object = servant._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      test_var test_object = test::_narrow (object_act.in ());
 
       test_object->destroy_poa ();
     }
diff --git a/TAO/tests/POA/POA_Destruction/run_test.pl b/TAO/tests/POA/POA_Destruction/run_test.pl
index 5cd3b463cf8..d639c308e48 100755
--- a/TAO/tests/POA/POA_Destruction/run_test.pl
+++ b/TAO/tests/POA/POA_Destruction/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("POA_Destruction");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index da50f0ec27f..015c644c121 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -11,11 +11,9 @@ project(POA_IDL*): taoidldefaults {
 project(POA_server*): taoserver, avoids_corba_e_micro {
   after += POA_IDL*
   Source_Files {
-    server.cpp
-  }
-  Source_Files {
     testC.cpp
     testS.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -26,10 +24,8 @@ project(POA_client*): taoserver {
   after += POA_IDL*
   after += POA_server*
   Source_Files {
-    client.cpp
-  }
-  Source_Files {
     testC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/POA/Persistent_ID/run_test.pl b/TAO/tests/POA/Persistent_ID/run_test.pl
index 2b0927ddfe9..fad92db6d08 100755
--- a/TAO/tests/POA/Persistent_ID/run_test.pl
+++ b/TAO/tests/POA/Persistent_ID/run_test.pl
@@ -23,7 +23,7 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 4a947ab13cc..49190449ec2 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -31,17 +31,13 @@ public:
   test_i (CORBA::ORB_ptr orb_ptr,
           PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
-  test_ptr create_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  test_ptr create_POA (void);
 
-  void destroy_POA (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy_POA (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -61,7 +57,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("POACurrent");
@@ -82,7 +77,6 @@ test_i::method (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -95,7 +89,6 @@ test_i::_default_POA (void)
 
 test_ptr
 test_i::create_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::PolicyList policies (2);
   policies.length (2);
@@ -140,15 +133,19 @@ test_i::create_POA (void)
                                                  servant);
     }
 
+  PortableServer::ObjectId_var id =
+    this->poa_->activate_object (servant);
+
+  CORBA::Object_var object = this->poa_->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   return test._retn ();
 }
 
 void
 test_i::destroy_POA (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->child_poa_->destroy (1, 0);
 }
@@ -236,8 +233,13 @@ main (int argc, char **argv)
       test_i servant (orb.in (),
                       root_poa.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var test =
-        servant._this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/POA/Policies/run_test.pl b/TAO/tests/POA/Policies/run_test.pl
index 03c90ceff0b..b4265bc7563 100755
--- a/TAO/tests/POA/Policies/run_test.pl
+++ b/TAO/tests/POA/Policies/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Policies");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/Reference_Counting/run_test.pl b/TAO/tests/POA/Reference_Counting/run_test.pl
index f8a701a6491..2b56e9924db 100755
--- a/TAO/tests/POA/Reference_Counting/run_test.pl
+++ b/TAO/tests/POA/Reference_Counting/run_test.pl
@@ -17,7 +17,7 @@ else {
     $SV = new PerlACE::Process ("server");
 }
 
-$server = $SV->SpawnWaitKill (60);
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index 6f4b1e859ce..8c0d26b8abc 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -22,9 +22,6 @@ public:
 
   virtual void moo (
     )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
   {
   }
 };
@@ -41,7 +38,7 @@ main (int argc, char * argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index 7626b224f3c..d3ec07ddcb5 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -28,8 +28,7 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -46,7 +45,6 @@ test_i::test_i (PortableServer::POA_ptr poa)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Entering Worker::svc from %t and sleeping....\n"));
@@ -63,7 +61,12 @@ test_i::method (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Calling self from %t\n"));
 
-      test_var self = this->_this ();
+      PortableServer::ObjectId_var id =
+        this->poa_->activate_object (this);
+
+      CORBA::Object_var object = this->poa_->id_to_reference (id.in ());
+
+      test_var self = test::_narrow (object.in ());
 
       self->method ();
     }
@@ -156,9 +159,18 @@ main (int argc, char **argv)
       test_i servant1 (child_poa.in ());
       test_i servant2 (child_poa.in ());
 
-      test_var object1 = servant1._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant1);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      test_var object1 = test::_narrow (object_act.in ());
+
+      id = root_poa->activate_object (&servant2);
+
+      object_act = root_poa->id_to_reference (id.in ());
 
-      test_var object2 = servant2._this ();
+      test_var object2 = test::_narrow (object_act.in ());
 
       Worker worker1 (object1.in ());
       Worker worker2 (object2.in ());
diff --git a/TAO/tests/POA/Single_Threaded_POA/run_test.pl b/TAO/tests/POA/Single_Threaded_POA/run_test.pl
index 1c248f88fe6..f5815f07915 100755
--- a/TAO/tests/POA/Single_Threaded_POA/run_test.pl
+++ b/TAO/tests/POA/Single_Threaded_POA/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("Single_Threaded_POA");
 }
 
-$client = $T->SpawnWaitKill (60);
+$client = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
   print STDERR "ERROR: test returned $client\n";
diff --git a/TAO/tests/POA/wait_for_completion/run_test.pl b/TAO/tests/POA/wait_for_completion/run_test.pl
index 4bbabc6fbfc..8b5cd957c73 100755
--- a/TAO/tests/POA/wait_for_completion/run_test.pl
+++ b/TAO/tests/POA/wait_for_completion/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("wait_for_completion");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index b640b83b7c6..10279067e6c 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -21,8 +21,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void destroy_poa (void);
 
   void test_poa (PortableServer::POA_ptr poa);
 
@@ -37,7 +36,6 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 
 void
 test_i::destroy_poa (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
@@ -90,7 +88,12 @@ main (int argc,
                   "second ORB");
 
       test_i servant;
-      test_var test_object = servant._this ();
+      PortableServer::ObjectId_var id =
+        first_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = first_poa->id_to_reference (id.in ());
+
+      test_var test_object = test::_narrow (object_act.in ());
 
       int expected_exception_raised = 0;
 
diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
index c81746d1e47..6b71b6b4c45 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
index b446a7fbe94..0a5be851783 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
@@ -10,14 +10,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 244529328a9..516e746b2f9 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -19,11 +19,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
index f9d6b9e3c81..8835493c31a 100644
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
index bd186cfbd33..aae9f2a6bfc 100644
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -68,8 +68,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
 
       CORBA::String_var ior =
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 26a4dfa50d7..868b62e939c 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -12,9 +12,9 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after  += *idl
   Source_Files {
-    param_test_i.cpp
     param_testS.cpp
     param_testC.cpp
+    param_test_i.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index e295371820b..493e73dfa7c 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -192,7 +192,7 @@ Options::read_ior (char *filename)
                        "Unable to open %s for writing: %p\n",
                        filename),
                       -1);
-  ACE_Read_Buffer ior_buffer (f_handle);
+  ACE_Read_Buffer ior_buffer (f_handle, true);
   this->ior_ = ior_buffer.read ();
 
   if (this->ior_.in () == 0)
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 3ab158d6599..0b6ca851cd5 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -41,7 +41,6 @@ Coffee_i::~Coffee_i (void)
 // get attribute
 Coffee::Desc *
 Coffee_i::description ( /*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
   desc->name = CORBA::string_dup (this->name_.in ());
@@ -52,7 +51,6 @@ Coffee_i::description ( /*env*/)
 void
 Coffee_i::description (const Coffee::Desc &description
  /*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (description.name);
 }
@@ -80,7 +78,6 @@ CORBA::Short
 Param_Test_i::test_short (CORBA::Short s1,
                           CORBA::Short &s2,
                           CORBA::Short_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = (CORBA::Short) (s1 * 2);
   s3 = (CORBA::Short) (s1 * 3);
@@ -98,7 +95,6 @@ CORBA::ULongLong
 Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
                               CORBA::ULongLong &s2,
                               CORBA::ULongLong_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
   s3 = s1 * 3;
@@ -112,7 +108,6 @@ char *
 Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -130,7 +125,6 @@ char *
 Param_Test_i::test_bounded_string (const char *s1,
                                    char *&s2,
                                    CORBA::String_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -148,7 +142,6 @@ CORBA::WChar *
 Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
                                       CORBA::WChar *&ws2,
                                       CORBA::WString_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
   ws3 = CORBA::wstring_dup (ws1);
@@ -170,7 +163,6 @@ CORBA::WChar *
 Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
                                     CORBA::WChar *&ws2,
                                     CORBA::WString_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
   ws3 = CORBA::wstring_dup (ws1);
@@ -190,7 +182,6 @@ Param_Test::Fixed_Struct
 Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
                                  Param_Test::Fixed_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1;
   s3 = s1;
@@ -203,7 +194,6 @@ CORBA::LongSeq *
 Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1,
                                   CORBA::LongSeq & s2,
                                   CORBA::LongSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::LongSeq
     *ret = new CORBA::LongSeq,
@@ -220,7 +210,6 @@ CORBA::ShortSeq *
 Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1,
                                    CORBA::ShortSeq & s2,
                                    CORBA::ShortSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ShortSeq
     *ret = new CORBA::ShortSeq,
@@ -237,7 +226,6 @@ Param_Test::Bounded_Short_Seq *
 Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1,
                                            Param_Test::Bounded_Short_Seq & s2,
                                            Param_Test::Bounded_Short_Seq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Short_Seq
     *ret = new Param_Test::Bounded_Short_Seq,
@@ -254,7 +242,6 @@ Param_Test::Bounded_Long_Seq *
 Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1,
                                           Param_Test::Bounded_Long_Seq & s2,
                                           Param_Test::Bounded_Long_Seq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Long_Seq
     *ret = new Param_Test::Bounded_Long_Seq,
@@ -271,7 +258,6 @@ CORBA::StringSeq *
 Param_Test_i::test_strseq (const CORBA::StringSeq &s1,
                            CORBA::StringSeq &s2,
                            CORBA::StringSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -306,7 +292,6 @@ Param_Test::Bounded_StrSeq *
 Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
                                    Param_Test::Bounded_StrSeq & s2,
                                    Param_Test::Bounded_StrSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -326,7 +311,6 @@ CORBA::WStringSeq *
 Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1,
                             CORBA::WStringSeq &ws2,
                             CORBA::WStringSeq_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -346,7 +330,6 @@ Param_Test::Bounded_WStrSeq *
 Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
                                     Param_Test::Bounded_WStrSeq & ws2,
                                     Param_Test::Bounded_WStrSeq_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -367,7 +350,6 @@ Param_Test::StructSeq *
 Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
                                     Param_Test::StructSeq &s2,
                                     Param_Test::StructSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -389,7 +371,6 @@ Param_Test::Bounded_StructSeq *
 Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1,
                                             Param_Test::Bounded_StructSeq & s2,
                                             Param_Test::Bounded_StructSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_StructSeq
     *ret = new Param_Test::Bounded_StructSeq,
@@ -407,7 +388,6 @@ Param_Test::PathSpec *
 Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
                                               Param_Test::PathSpec & s2,
                                               Param_Test::PathSpec_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::PathSpec
     *ret = new Param_Test::PathSpec,
@@ -439,7 +419,6 @@ Param_Test::ArraySeq *
 Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
                                    Param_Test::ArraySeq &s2,
                                    Param_Test::ArraySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -461,7 +440,6 @@ Param_Test::Bounded_ArraySeq *
 Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1,
                                            Param_Test::Bounded_ArraySeq & s2,
                                            Param_Test::Bounded_ArraySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_ArraySeq
     *ret = new Param_Test::Bounded_ArraySeq,
@@ -478,7 +456,6 @@ Param_Test::Coffee_Mix *
 Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
                               Param_Test::Coffee_Mix & s2,
                               Param_Test::Coffee_Mix_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Coffee_Mix
     *ret = new Param_Test::Coffee_Mix,
@@ -520,7 +497,6 @@ Param_Test::Bounded_Coffee_Mix *
 Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
                                       Param_Test::Bounded_Coffee_Mix & s2,
                                       Param_Test::Bounded_Coffee_Mix_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Coffee_Mix
     *ret = new Param_Test::Bounded_Coffee_Mix,
@@ -562,7 +538,6 @@ CORBA::AnySeq *
 Param_Test_i::test_anyseq (const CORBA::AnySeq &s1,
                            CORBA::AnySeq &s2,
                            CORBA::AnySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -585,7 +560,6 @@ Param_Test::Var_Struct *
 Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
                                Param_Test::Var_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -606,7 +580,6 @@ Param_Test::Nested_Struct *
 Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
                                   Param_Test::Nested_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -627,7 +600,6 @@ Param_Test::Recursive_Struct *
 Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
                                      Param_Test::Recursive_Struct &s2,
                                      Param_Test::Recursive_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" structs into all the inout, out and return sequences.
 
@@ -647,7 +619,6 @@ Param_Test::Objref_Struct *
 Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
                                   Param_Test::Objref_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -666,7 +637,6 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 // make a Coffee object
 Coffee_ptr
 Param_Test_i::make_coffee (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->obj_._this ();
 }
@@ -676,7 +646,6 @@ Coffee_ptr
 Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
                            Coffee_out o3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee_ptr ret = Coffee::_nil ();
 
@@ -721,7 +690,6 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
                              CORBA::TypeCode_out t3
 /*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we simply assign t1 to the others
   CORBA::TypeCode_ptr retval = CORBA::TypeCode::_duplicate (t1);
@@ -735,7 +703,6 @@ CORBA::Any *
 Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
                         CORBA::Any_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any *ret;
   CORBA::Short short_in;
@@ -900,7 +867,6 @@ Param_Test::Fixed_Array_slice *
 Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
                                 Param_Test::Fixed_Array_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Fixed_Array_slice *ret;
 
@@ -915,7 +881,6 @@ Param_Test::Var_Array_slice *
 Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
                               Param_Test::Var_Array_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Var_Array_slice *ret;
 
@@ -929,8 +894,6 @@ CORBA::ULong
 Param_Test_i::test_exception (CORBA::ULong s1,
                               CORBA::ULong& s2,
                               CORBA::ULong_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Param_Test::Ooops))
 {
   CORBA::ULong d = s1 % 4;
 
@@ -944,13 +907,13 @@ Param_Test_i::test_exception (CORBA::ULong s1,
   // Throw a known user exception type to test the user exception.
   else if (d == 1)
     {
-      ACE_THROW_RETURN (Param_Test::Ooops (" % 4 == 1", d), 0);
+      throw Param_Test::Ooops (" % 4 == 1", d);
     }
   // Throw a CORBA::SystemException type CORBA::NO_MEMORY to test
   // the system exception.
   else if (d == 2)
     {
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+      throw CORBA::NO_MEMORY ();
     }
 
   // This will avoid the compiler
@@ -966,7 +929,6 @@ Param_Test::Big_Union*
 Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
                               Param_Test::Big_Union& u2,
                               Param_Test::Big_Union_out u3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
   u2 = u1;
@@ -978,7 +940,6 @@ Param_Test::Small_Union
 Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
                                 Param_Test::Small_Union& u2,
                                 Param_Test::Small_Union_out u3)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u2 = u1;
   u3 = u1;
@@ -989,7 +950,6 @@ Param_Test::Recursive_Union*
 Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
                                     Param_Test::Recursive_Union& ru2,
                                     Param_Test::Recursive_Union_out ru3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1));
   ru2 = ru1;
@@ -1001,7 +961,6 @@ CORBA::Any*
 Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
                                 CORBA::Any_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
   a2 = a1;
@@ -1013,7 +972,6 @@ Param_Test::Multdim_Array_slice *
 Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
                                   Param_Test::Multdim_Array_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Multdim_Array_slice *ret;
 
@@ -1025,7 +983,6 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 
 void
 Param_Test_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 500fa3ad36f..321df2bb9b3 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,12 +31,10 @@ public:
 
   // =methods for the attribute
 
-  virtual Coffee::Desc * description (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Coffee::Desc * description (void);
   // get attribute
 
-  virtual void description (const Coffee::Desc &description)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void description (const Coffee::Desc &description);
   // set attribute
 
 private:
@@ -61,236 +59,195 @@ public:
 
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
-                                   CORBA::Short_out s3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Short_out s3);
   // test for shorts
 
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
-                                           CORBA::ULongLong_out s3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                           CORBA::ULongLong_out s3);
   // test for unsigned long long
 
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
-                                       CORBA::String_out s3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CORBA::String_out s3);
   // test for unbounded strings
 
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
-                                     CORBA::String_out s3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                     CORBA::String_out s3);
   // test for bounded strings
 
   virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1,
                                                 CORBA::WChar *&ws2,
-                                                CORBA::WString_out ws3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                                CORBA::WString_out ws3);
   // test for unbounded wstrings
 
   virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
                                               CORBA::WChar *&ws2,
-                                              CORBA::WString_out ws3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::WString_out ws3);
   // test for bounded wstrings
 
   virtual Param_Test::Fixed_Struct
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
-                     Param_Test::Fixed_Struct_out s3)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     Param_Test::Fixed_Struct_out s3);
   // test for fixed structures
 
   // = Start of sequences tests...
   virtual CORBA::LongSeq * test_long_sequence (
       const CORBA::LongSeq & s1,
       CORBA::LongSeq & s2,
-      CORBA::LongSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::LongSeq_out s3);
   virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
       const Param_Test::Bounded_Long_Seq & s1,
       Param_Test::Bounded_Long_Seq & s2,
-      Param_Test::Bounded_Long_Seq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_Long_Seq_out s3);
   virtual CORBA::ShortSeq * test_short_sequence (
       const CORBA::ShortSeq & s1,
       CORBA::ShortSeq & s2,
-      CORBA::ShortSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::ShortSeq_out s3);
   virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence (
           const Param_Test::Bounded_Short_Seq & s1,
       Param_Test::Bounded_Short_Seq & s2,
-      Param_Test::Bounded_Short_Seq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_Short_Seq_out s3);
   virtual CORBA::StringSeq * test_strseq (
       const CORBA::StringSeq & s1,
       CORBA::StringSeq & s2,
-      CORBA::StringSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::StringSeq_out s3);
   virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
       const Param_Test::Bounded_StrSeq & s1,
       Param_Test::Bounded_StrSeq & s2,
-      Param_Test::Bounded_StrSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_StrSeq_out s3);
   virtual CORBA::WStringSeq * test_wstrseq (
       const CORBA::WStringSeq & ws1,
       CORBA::WStringSeq & ws2,
-      CORBA::WStringSeq_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::WStringSeq_out ws3);
   virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq (
       const Param_Test::Bounded_WStrSeq & ws1,
       Param_Test::Bounded_WStrSeq & ws2,
-      Param_Test::Bounded_WStrSeq_out ws3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_WStrSeq_out ws3);
   virtual Param_Test::StructSeq * test_struct_sequence (
       const Param_Test::StructSeq & s1,
       Param_Test::StructSeq & s2,
-      Param_Test::StructSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::StructSeq_out s3);
   virtual Param_Test::PathSpec * test_unbounded_struct_sequence (
       const Param_Test::PathSpec & s1,
       Param_Test::PathSpec & s2,
-      Param_Test::PathSpec_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::PathSpec_out s3);
   virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
       const Param_Test::Bounded_StructSeq & s1,
       Param_Test::Bounded_StructSeq & s2,
-      Param_Test::Bounded_StructSeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_StructSeq_out s3);
   virtual Param_Test::ArraySeq * test_array_sequence (
       const Param_Test::ArraySeq & s1,
       Param_Test::ArraySeq & s2,
-      Param_Test::ArraySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::ArraySeq_out s3);
   virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence (
       const Param_Test::Bounded_ArraySeq & s1,
       Param_Test::Bounded_ArraySeq & s2,
-      Param_Test::Bounded_ArraySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_ArraySeq_out s3);
   virtual Param_Test::Coffee_Mix * test_coffe_mix (
       const Param_Test::Coffee_Mix & s1,
       Param_Test::Coffee_Mix & s2,
-      Param_Test::Coffee_Mix_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Coffee_Mix_out s3);
   virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
       const Param_Test::Bounded_Coffee_Mix & s1,
       Param_Test::Bounded_Coffee_Mix & s2,
-      Param_Test::Bounded_Coffee_Mix_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      Param_Test::Bounded_Coffee_Mix_out s3);
   virtual CORBA::AnySeq * test_anyseq (
           const CORBA::AnySeq & s1,
           CORBA::AnySeq & s2,
-          CORBA::AnySeq_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+          CORBA::AnySeq_out s3);
   // = End of sequences tests....
 
   virtual Param_Test::Var_Struct *
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
-                   Param_Test::Var_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   Param_Test::Var_Struct_out s3);
   // test for variable structs
 
   virtual Param_Test::Nested_Struct *
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
-                      Param_Test::Nested_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      Param_Test::Nested_Struct_out s3);
   // test for nested structs
 
   virtual Param_Test::Recursive_Struct *
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
-                           Param_Test::Recursive_Struct_out rs3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           Param_Test::Recursive_Struct_out rs3);
   // test for recursive structs
 
   virtual Param_Test::Objref_Struct *
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
-                      Param_Test::Objref_Struct_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      Param_Test::Objref_Struct_out s3);
 
   virtual Coffee_ptr
-  make_coffee (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  make_coffee (void);
   // make a coffee object
 
   virtual Coffee_ptr
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
-               Coffee_out o3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               Coffee_out o3);
   // test for object references
 
   virtual CORBA::TypeCode_ptr
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
-                 CORBA::TypeCode_out o3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                 CORBA::TypeCode_out o3);
   // test for typecodes
 
   virtual CORBA::Any *
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
-            CORBA::Any_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+            CORBA::Any_out a3);
   // test for Anys
 
   virtual Param_Test::Fixed_Array_slice *
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
-                    Param_Test::Fixed_Array_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    Param_Test::Fixed_Array_out a3);
   // test for fixed size arrays
 
   virtual Param_Test::Var_Array_slice *
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
-                  Param_Test::Var_Array_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                  Param_Test::Var_Array_out a3);
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
-                                       CORBA::ULong_out s3)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Param_Test::Ooops));
+                                       CORBA::ULong_out s3);
 
   virtual Param_Test::Big_Union*
     test_big_union (const Param_Test::Big_Union& u1,
                     Param_Test::Big_Union& u2,
-                    Param_Test::Big_Union_out u3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    Param_Test::Big_Union_out u3);
 
   virtual Param_Test::Small_Union
     test_small_union (const Param_Test::Small_Union& u1,
                       Param_Test::Small_Union& u2,
-                      Param_Test::Small_Union_out u3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      Param_Test::Small_Union_out u3);
 
   virtual Param_Test::Recursive_Union*
     test_recursive_union (const Param_Test::Recursive_Union& ru1,
                           Param_Test::Recursive_Union& ru2,
-                          Param_Test::Recursive_Union_out ru3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          Param_Test::Recursive_Union_out ru3);
 
   virtual CORBA::Any*
     test_complex_any (const CORBA::Any &a1,
                       CORBA::Any &a2,
-                      CORBA::Any_out a3)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Any_out a3);
 
   // Test for multi dimensional arrays
   virtual Param_Test::Multdim_Array_slice *
   test_multdim_array (const Param_Test::Multdim_Array,
                       Param_Test::Multdim_Array ,
-                      Param_Test::Multdim_Array_out)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      Param_Test::Multdim_Array_out);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 
 private:
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 5da4699f054..93dca972349 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -77,36 +77,36 @@ foreach $type (@types) {
     print STDERR "==== Testing $type === wait....\n";
 
     $server = $SV->Spawn ();
-    
+
     if ($server != 0) {
         print STDERR "ERROR: server returned $server\n";
         $status = 1;
     }
     else
     {
-        if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+        if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
             print STDERR "ERROR: cannot find file <$iorfile>\n";
-            $SV->Kill (); 
+            $SV->Kill ();
             exit 1;
         }
 
         $CL->Arguments ("$debug -f $iorfile  -i $invocation -t $type -n $num -x");
 
         $client = $CL->SpawnWaitKill (60);
-        
+
         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;
 
     print STDERR "==== Test for $type finished ===\n";
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 2154ce2ba29..e1ced15d5d8 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
index 0a472efebf6..e4bde8fc6d5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
@@ -31,21 +31,18 @@ Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Echo_Client_Interceptor");
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ERROR((LM_ERROR,
              "ERROR, unexpected interception point called send_poll()\n"));
@@ -55,8 +52,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext sc;
   sc.context_id = ::service_id;
@@ -88,7 +83,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var rc =
@@ -109,8 +103,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var rc =
@@ -131,8 +123,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   Echo_Client_Request_Interceptor::exception_count++;
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
index 2faafc7f5c5..c5b3adb42bf 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
@@ -25,30 +25,20 @@ public:
   static unsigned long other_count;
   static unsigned long exception_count;
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 };
 
 #endif /* Client_Interceptor__h_ */
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
index f06678f33a8..9e3115b5d4e 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
@@ -18,14 +18,12 @@ Client_ORBInitializer::Client_ORBInitializer ()
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_var interceptor(
       new Echo_Client_Request_Interceptor);
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
index c0425f701fa..97fca542091 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
@@ -20,11 +20,9 @@ class Client_ORBInitializer
 public:
   Client_ORBInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
index 89e5f53ca1a..2f644181f4d 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
@@ -16,14 +16,12 @@ Echo::Echo(CORBA::ORB_ptr orb)
 
 char *
 Echo::echo_operation(char const * the_input)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   return CORBA::string_dup(the_input);
 }
 
 void
 Echo::shutdown(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h
index 3fce554f5bd..9109ade0624 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h
@@ -17,10 +17,8 @@ class Echo
 public:
   Echo(CORBA::ORB_ptr orb);
 
-  virtual char * echo_operation(char const * the_input)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual char * echo_operation(char const * the_input);
+  virtual void shutdown(void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index 026b56bd3dc..61f218c4c0c 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -20,26 +20,22 @@ Echo_Handler::Echo_Handler(void)
 
 void
 Echo_Handler::echo_operation (char const *)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->replies_;
 }
 
 void
 Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
 Echo_Handler::shutdown (void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
 Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
index e95865e1e9a..dab5df292dc 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -17,14 +17,10 @@ class Echo_Handler
 public:
   Echo_Handler(void);
 
-  virtual void echo_operation(char const * retval)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void echo_operation_excep(::Messaging::ExceptionHolder * h)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown(void)
-    ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown_excep(::Messaging::ExceptionHolder * h)
-    ACE_THROW_SPEC((CORBA::SystemException));
+  virtual void echo_operation(char const * retval);
+  virtual void echo_operation_excep(::Messaging::ExceptionHolder * h);
+  virtual void shutdown(void);
+  virtual void shutdown_excep(::Messaging::ExceptionHolder * h);
 
   CORBA::ULong replies (void) const;
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
index 2e1954944aa..b6358d7d003 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -12,15 +12,13 @@ project(*Client) : taoserver, ami, pi, interceptors {
   exename = client
   after += *idl
   source_files {
+    TestC.cpp
+    TestS.cpp
     client.cpp
     Client_Interceptor.cpp
     Client_ORBInitializer.cpp
     Echo_Handler.cpp
   }
-  source_files {
-    TestC.cpp
-    TestS.cpp
-  }
   IDL_Files {
   }
 }
@@ -30,15 +28,13 @@ project(*server) : taoserver, ami, pi_server, interceptors {
   after += *idl
   after += *Client
   source_files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     Server_Interceptor.cpp
     Server_ORBInitializer.cpp
     Echo.cpp
   }
-  source_files {
-    TestC.cpp
-    TestS.cpp
-  }
   IDL_Files {
   }
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
index 1d2ff768d21..1d56f937708 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
@@ -23,22 +23,18 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Echo_Server_Interceptor");
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation =
     ri->operation ();
@@ -63,30 +59,23 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
index 6d770bb6290..14bceffeff3 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
@@ -20,31 +20,20 @@ class Echo_Server_Request_Interceptor
 public:
   Echo_Server_Request_Interceptor ();
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 };
 
 #endif /* Server_Interceptor__h_ */
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
index f2d80031d8e..4fc70427165 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
@@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_var interceptor(
       new Echo_Server_Request_Interceptor);
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index e65fe5085ce..0fce0838184 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -20,11 +20,9 @@ class Server_ORBInitializer
 public:
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 450801a6190..4ad17b6ff66 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index 220549ac69a..1806edc7ff5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -77,8 +77,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(echo_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (echo_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Echo_var echo =
-        echo_impl->_this ();
+        Test::Echo::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (echo.in ());
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
index 375ecea5930..329a7bf2abd 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
@@ -9,8 +9,8 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, pi_server {
   after += *idl
   Source_Files {
-    StateTransferS.cpp
     StateTransferC.cpp
+    StateTransferS.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
index 0493f6e38a8..a8d26f91726 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index 6c5f5825295..98da1770179 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -162,7 +162,12 @@ main (int argc, char *argv[])
   StateTransferImpl* impl = new StateTransferImpl (orb.in ());
   ServantBase_var impl_var (impl);
 
-  StateTransfer_var ref (impl->_this ());
+  PortableServer::ObjectId_var id_act =
+    root_poa->activate_object (impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+
+  StateTransfer_var ref = StateTransfer::_narrow (object.in ());
   String_var ior (orb->object_to_string (ref.in ()));
 
   poa_manager->activate ();
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
index b71142646b0..f74e6b4385e 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot double copy test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 729804b2872..d0072b2869e 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -289,7 +289,12 @@ main (int argc, char *argv[])
   InvokeMeImpl* impl = new InvokeMeImpl (orb.in ());
   ServantBase_var impl_var (impl);
 
-  InvokeMe_var ref (impl->_this ());
+  PortableServer::ObjectId_var id_act =
+    root_poa->activate_object (impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+
+  InvokeMe_var ref = InvokeMe::_narrow (object.in ());
   String_var ior (orb->object_to_string (ref.in ()));
 
   poa_manager->activate ();
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
index 375ecea5930..329a7bf2abd 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
@@ -9,8 +9,8 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver, pi_server {
   after += *idl
   Source_Files {
-    StateTransferS.cpp
     StateTransferC.cpp
+    StateTransferS.cpp
     server.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
index 0493f6e38a8..a8d26f91726 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 780cad1d12a..9b2116de073 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -205,7 +205,12 @@ main (int argc, char *argv[])
   StateTransferImpl* impl = new StateTransferImpl (orb.in ());
   ServantBase_var impl_var (impl);
 
-  StateTransfer_var ref (impl->_this ());
+  PortableServer::ObjectId_var id_act =
+    root_poa->activate_object (impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+
+  StateTransfer_var ref = StateTransfer::_narrow (object.in ());
   String_var ior (orb->object_to_string (ref.in ()));
 
   poa_manager->activate ();
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index b982a6ee210..d6c1ed13d55 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -17,14 +17,12 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   PortableInterceptor::ClientRequestInterceptor_ptr tmp =
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index 1a0b10ba5cb..11348d09d9d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (int interceptor_type);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   int interceptor_type_;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 0604ee09b21..8c21f40315e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     client_interceptors.cpp
     marker.cpp
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index 3b021b51eb8..47a9da3516c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -19,14 +19,12 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   PortableInterceptor::ServerRequestInterceptor_ptr tmp =
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 1907dcab0db..ec9035abf99 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Server_ORBInitializer (int interceptor_type);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   int interceptor_type_;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 440d3a26d00..87ddbdc29c1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 93ed136976e..dc2eefb25f2 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -25,21 +25,18 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor ()
 
 char *
 Vault_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -47,8 +44,6 @@ Vault_Client_Request_Interceptor::send_poll (
 void
 Vault_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -89,7 +84,6 @@ Vault_Client_Request_Interceptor::send_request (
 void
 Vault_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -106,8 +100,6 @@ Vault_Client_Request_Interceptor::receive_reply (
 void
 Vault_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -115,8 +107,6 @@ Vault_Client_Request_Interceptor::receive_other (
 void
 Vault_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Any_var any = ri->received_exception ();
@@ -149,21 +139,18 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep
 
 char *
 Vault_Client_Request_Context_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Client_Request_Context_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Context_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -171,8 +158,6 @@ Vault_Client_Request_Context_Interceptor::send_poll (
 void
 Vault_Client_Request_Context_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   // MAke the context to send the context to the target
@@ -197,8 +182,6 @@ Vault_Client_Request_Context_Interceptor::send_request (
 void
 Vault_Client_Request_Context_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -206,7 +189,6 @@ Vault_Client_Request_Context_Interceptor::receive_other (
 void
 Vault_Client_Request_Context_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -214,8 +196,6 @@ Vault_Client_Request_Context_Interceptor::receive_reply (
 void
 Vault_Client_Request_Context_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Any_var any = ri->received_exception ();
@@ -248,21 +228,18 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep
 
 char *
 Vault_Client_Request_Dynamic_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -270,8 +247,6 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll (
 void
 Vault_Client_Request_Dynamic_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -304,7 +279,6 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -331,8 +305,6 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -340,8 +312,6 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other (
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Any_var any = ri->received_exception ();
@@ -374,21 +344,18 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor ()
 
 char *
 Vault_Client_Request_NOOP_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -396,8 +363,6 @@ Vault_Client_Request_NOOP_Interceptor::send_poll (
 void
 Vault_Client_Request_NOOP_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
 }
@@ -405,8 +370,6 @@ Vault_Client_Request_NOOP_Interceptor::send_request (
 void
 Vault_Client_Request_NOOP_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -414,7 +377,6 @@ Vault_Client_Request_NOOP_Interceptor::receive_other (
 void
 Vault_Client_Request_NOOP_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -422,8 +384,6 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply (
 void
 Vault_Client_Request_NOOP_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Any_var any = ri->received_exception ();
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index bdc6760fe89..22a2a4626db 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -31,30 +31,20 @@ public:
   virtual ~Vault_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
@@ -71,30 +61,20 @@ public:
   virtual ~Vault_Client_Request_Context_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
@@ -111,30 +91,20 @@ public:
   virtual ~Vault_Client_Request_Dynamic_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
@@ -151,30 +121,20 @@ public:
   virtual ~Vault_Client_Request_NOOP_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
index 3db12f46a72..b4153cfdbbf 100755
--- a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
@@ -20,9 +20,9 @@ print STDERR "\n\n==== Running interceptor Benchmark test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index 22878410b94..7acf0d97e27 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index 8cc0f504334..9464721742f 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -25,22 +25,18 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor ()
 
 char *
 Vault_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -48,8 +44,6 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Vault_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -84,7 +78,6 @@ Vault_Server_Request_Interceptor::receive_request (
 void
 Vault_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -101,8 +94,6 @@ Vault_Server_Request_Interceptor::send_reply (
 void
 Vault_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -110,8 +101,6 @@ Vault_Server_Request_Interceptor::send_exception (
 void
 Vault_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -130,22 +119,18 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep
 
 char *
 Vault_Server_Request_Context_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Server_Request_Context_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -153,8 +138,6 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_Context_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   IOP::ServiceId id = request_ctx_id;
@@ -170,7 +153,6 @@ Vault_Server_Request_Context_Interceptor::receive_request (
 void
 Vault_Server_Request_Context_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -178,16 +160,12 @@ Vault_Server_Request_Context_Interceptor::send_reply (
 void
 Vault_Server_Request_Context_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Vault_Server_Request_Context_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -205,22 +183,18 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep
 
 char *
 Vault_Server_Request_Dynamic_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Server_Request_Dynamic_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -253,8 +227,6 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -262,7 +234,6 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_Dynamic_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -287,16 +258,12 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
 void
 Vault_Server_Request_Dynamic_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -314,30 +281,24 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor ()
 
 char *
 Vault_Server_Request_NOOP_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -345,7 +306,6 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_NOOP_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -353,16 +313,12 @@ Vault_Server_Request_NOOP_Interceptor::send_reply (
 void
 Vault_Server_Request_NOOP_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index 3d8481368d5..0ce1704f5b7 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -31,32 +31,21 @@ public:
   ~Vault_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
@@ -73,32 +62,21 @@ public:
   ~Vault_Server_Request_Context_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
@@ -115,32 +93,21 @@ public:
   ~Vault_Server_Request_Dynamic_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
@@ -157,32 +124,21 @@ public:
   ~Vault_Server_Request_NOOP_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index bc2945f2fed..c4b676c7d06 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -14,15 +14,12 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Secure_Vault_i::ready (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
 Secure_Vault_i::authenticate (const char * user)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Invalid))
 {
   if (ACE_OS::strcmp (user, "root") != 0)
     throw Test_Interceptors::Invalid ();
@@ -32,14 +29,12 @@ Secure_Vault_i::authenticate (const char * user)
 CORBA::Long
 Secure_Vault_i::update_records (CORBA::Long,
                 const Test_Interceptors::Secure_Vault::Record &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return 1;
 }
 
 void
 Secure_Vault_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index 9516f9babe1..f6e15213c34 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -27,20 +27,15 @@ public:
   Secure_Vault_i (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual CORBA::Short ready (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short ready (void);
 
-  virtual void authenticate (const char * user)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Invalid));
+  virtual void authenticate (const char * user);
   // Passwd sent in the service context list
 
   virtual CORBA::Long update_records (CORBA::Long id,
-                                      const Test_Interceptors::Secure_Vault::Record & val)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                      const Test_Interceptors::Secure_Vault::Record & val);
 
-  virtual void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index e631e5a425a..395e526a9f0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 81394e0fdbd..2a0776226f0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index 379d2a83186..b39d4b07273 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -16,14 +16,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (this->server_interceptor_,
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index 6db28e5db35..f9994a93d7a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -32,11 +32,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 94337f645e1..201fa69579d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 44121112bd8..f553d202517 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -30,21 +30,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -52,8 +49,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
@@ -178,7 +173,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -244,8 +238,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
@@ -288,8 +280,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 705bce07974..8e8ec520789 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -31,30 +31,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index 20870c8b227..eeaa08ec50f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index f6e6374bcb4..5085db8c163 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -34,7 +34,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 void
 Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location)
-                                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward_location))
     throw CORBA::INV_OBJREF (
@@ -47,22 +46,18 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -125,8 +120,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -134,7 +127,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -181,8 +173,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -229,8 +219,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 064060a82ed..9e06f9fda85 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -33,35 +33,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  void forward_reference (CORBA::Object_ptr forward_location)
-                          ACE_THROW_SPEC ((CORBA::SystemException));
+  void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 925f856c0b5..0d201962ba4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
 Visual_i::nothing (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +33,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +40,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
index cda32b963d9..e1130b91bfb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
@@ -28,21 +28,15 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
-  void nothing (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void nothing (void);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index f34df67521f..ea422a7f284 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -16,7 +16,6 @@ Client_ORBInitializer::Client_ORBInitializer (void) :
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   pre_init_called = true;
 
@@ -26,7 +25,6 @@ Client_ORBInitializer::pre_init (
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   post_init_called = true;
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 7a957b49449..73d1a7ed2f2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   bool pre_init_called;
   bool post_init_called;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index 2a78a1a66ec..8c921e36401 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer_var2.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
     }
   catch (const CORBA::NO_MEMORY&)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
index a9f35114c58..914334569bd 100755
--- a/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running bug 2088 test\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
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..3063d6f4817 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
@@ -26,7 +26,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index 488e02da7a1..405d64c01a2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::SlotId slot_id = info->allocate_slot_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index b3b7e6c0aff..7820c79abef 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -17,14 +17,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // allocate a slot
   slotId = info->allocate_slot_id ();
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index 6db28e5db35..f9994a93d7a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -32,11 +32,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index e1677d80510..a5f0db0817b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
         PortableInterceptor::register_orb_initializer (initializer.in ());
 
         CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
         if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index 1eeb8900fbf..146f0606559 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -25,21 +25,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -47,8 +44,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation =
     ri->operation ();
@@ -75,7 +70,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var operation =
     ri->operation ();
@@ -89,8 +83,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
@@ -102,8 +94,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 422b2b85d2b..a9345f46f15 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -31,30 +31,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index d591eae147a..ba970ef032f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
       // Now create an ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index 3fab15a987f..cea1f8c5ee5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -21,22 +21,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -94,8 +90,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -103,7 +97,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -111,8 +104,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -120,8 +111,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index a557c28d97e..3e9c58d9b5f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -31,32 +31,21 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 66cf0bea079..840b4b04ffa 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -17,7 +17,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 
@@ -58,7 +57,6 @@ Visual_i::normal (CORBA::Long arg)
 
 void
 Visual_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
index 335729c2d2c..bb17fef8a4b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
@@ -28,10 +28,8 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
+  void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
index 40b23b8c661..80338bf5bde 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
@@ -10,14 +10,12 @@
 void
 Echo_Collocated_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Collocated_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
     info->orb_id ();
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index 4865ea54fbe..b8eed4343a0 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -29,11 +29,9 @@ class Echo_Collocated_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 6a3f8ba9884..9916316c78f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -27,14 +27,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -42,7 +40,6 @@ void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -50,8 +47,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
@@ -90,8 +85,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
@@ -108,7 +101,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   client_interceptor_check_++;
 
@@ -160,8 +152,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
@@ -191,30 +181,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
@@ -254,7 +238,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++server_interceptor_check_;
 
@@ -304,8 +287,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
@@ -332,8 +313,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 2655dcf2fde..4456ffed47e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -33,36 +33,24 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
+      );
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong client_interceptor_check_;
@@ -81,38 +69,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        );
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
index 1f521f276eb..2a580aaddb6 100755
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
@@ -24,7 +24,7 @@ print STDERR "\n\n==== Running interceptor collocated Dynamic test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index b95b285602e..85cddd874d7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -13,7 +13,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
@@ -21,7 +20,6 @@ Visual_i::normal (CORBA::Long)
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
                      CORBA::Long two)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
   return (one + two);
@@ -29,7 +27,6 @@ Visual_i::calculate (CORBA::Long one,
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +34,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +41,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index 841d3ef41df..2ccfe475b5f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -27,22 +27,17 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         CORBA::Long two);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index be0762f3add..104386eca6c 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -11,14 +11,12 @@ Collocated_ORBInitializer::Collocated_ORBInitializer (void)
 void
 Collocated_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Collocated_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 94f2002627f..7a6ab89c320 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -28,11 +28,9 @@ public:
   /// Constructor
   Collocated_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index a660fab5984..ccb493f659e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -26,21 +26,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -48,8 +45,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -110,7 +105,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -181,8 +175,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_other\n",
@@ -192,8 +184,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
@@ -270,22 +260,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
@@ -333,8 +319,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -342,7 +326,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -389,8 +372,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -437,8 +418,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 1f7697c2b2c..6a6dab8b53f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -30,30 +30,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
@@ -77,32 +67,21 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index 1698c9deb89..a1a35158494 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
 Visual_i::nothing (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //  ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test_Interceptors::Silly))
 {
  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +33,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +40,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //  this->_remove_ref ();
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n"));
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
index 3462b7381bc..1f2972e09bf 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
@@ -26,21 +26,15 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
-  void nothing (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void nothing (void);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 8ac0bdf1e27..2235181a86d 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -13,14 +13,12 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$")
 void
 Echo_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index ed54836594f..13f6cbe80f2 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -31,11 +31,9 @@ class Echo_Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index 6644b46f786..b701542cab6 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -13,14 +13,12 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$")
 void
 Echo_Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 260321c8c22..57f92f71138 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -31,11 +31,9 @@ class Echo_Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 05a373172fb..8ea24af1d2a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -28,7 +28,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     client_interceptor.cpp
     Echo_Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index c0358e99f27..d0d61b6ca92 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -103,7 +103,7 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 75d06c89160..c2e812592fd 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -25,14 +25,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -40,7 +38,6 @@ void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -48,8 +45,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -99,8 +94,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -114,7 +107,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -217,8 +209,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 4c46a2ca34e..98513716bc6 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -28,39 +28,25 @@ public:
   Echo_Client_Request_Interceptor (void);
   // ctor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_poll (
         PortableInterceptor::ClientRequestInfo_ptr
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        ));
+      );
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
+      );
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
 protected:
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
index 72dbbde1fe4..d9dffab2446 100755
--- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor Dynamic test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index b8cbed4702f..0eb7f2af5ff 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 07796958db9..370f3365f30 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -25,30 +25,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -84,7 +78,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -133,8 +126,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -160,8 +151,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index c6965925c02..30727c56541 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -27,39 +27,24 @@ public:
   Echo_Server_Request_Interceptor (void);
   // cotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        );
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        );
 
 protected:
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index d13cfebd6c9..b0f36f70bc2 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -15,7 +15,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 void
 Visual_i::normal (CORBA::Long arg,
                   CORBA::String_out msg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
   msg = CORBA::string_dup ("DO_NOT_INSULT_MY_INTELLIGENCE");
@@ -24,7 +23,6 @@ Visual_i::normal (CORBA::Long arg,
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
                      CORBA::Long two)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
   return (one + two);
@@ -32,7 +30,6 @@ Visual_i::calculate (CORBA::Long one,
 
 Test_Interceptors::Visual::VarLenStruct *
 Visual_i::the_structure (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Test_Interceptors::Visual::VarLenStruct * s;
 
@@ -50,7 +47,6 @@ Visual_i::the_structure (void)
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -58,7 +54,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -66,7 +61,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
index 6999c24bd2b..fb6ffb675a8 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
@@ -22,24 +22,18 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
 
   virtual CORBA::Long calculate (CORBA::Long one,
-                                 CORBA::Long two)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CORBA::Long two);
 
   void normal (CORBA::Long arg,
-               CORBA::String_out msg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               CORBA::String_out msg);
 
-  virtual Test_Interceptors::Visual::VarLenStruct * the_structure ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test_Interceptors::Visual::VarLenStruct * the_structure ();
 
-  virtual void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly));
+  virtual void user (void);
 
-  virtual void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void system (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 3502e13a75d..e09717bbe6a 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -17,14 +17,12 @@ ACE_RCSID (ForwardRequest,
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id = info->orb_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index 4ed3c09f374..de46c5ee758 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -42,11 +42,9 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index c652aac506f..7d20dc97510 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -21,22 +21,18 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 
 char *
 Client_Request_Interceptor::name ()
-  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 ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++this->request_count_;
 
@@ -79,30 +75,24 @@ Client_Request_Interceptor::send_request (
 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))
 {
 }
 
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean response_expected =
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 5473606c20a..099f360b0a4 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -65,34 +65,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 4c941060cd3..d4237b06ce8 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -27,8 +27,7 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
 
 project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
   after += *idl
-  after += *Server
-  
+
   Source_Files {
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index fefe4eb0c3d..f6503aca183 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   // Install the server request interceptor.
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 289899370ec..c1cd4bd7166 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -48,11 +48,9 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 6f113992989..214087641e5 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -25,7 +25,6 @@ void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
   CORBA::Object_ptr obj2)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
     throw CORBA::INV_OBJREF (
@@ -40,14 +39,12 @@ Server_Request_Interceptor::forward_references (
 
 char *
 Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
 Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
@@ -56,8 +53,6 @@ Server_Request_Interceptor::destroy (void)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   this->request_count_++;
 
@@ -91,8 +86,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
     ri->response_expected ();
@@ -128,23 +121,18 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
     ri->response_expected ();
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 299f1a5bc62..cd53fad237d 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -65,8 +65,7 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Object_ptr obj2);
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -78,35 +77,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
index d8e2b3730eb..08237e0c82e 100755
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
@@ -20,7 +20,7 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test1.ior -o test2.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $file1 -o $file2");    
+    $SV = new PerlACE::Process ("server", "-o $file1 -o $file2");
 }
 $CL = new PerlACE::Process ("client", "-k file://$file1 -k file://$file2");
 
@@ -30,13 +30,13 @@ print STDERR "\n\n==== Running PortableInterceptor::ForwardRequest test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file2>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index 283aae38b3c..b25a7d02ce9 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -19,14 +19,12 @@ test_i::~test_i (void)
 
 CORBA::Short
 test_i::number (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index 8b1d8091b62..a642c43f546 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -37,12 +37,10 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short number (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index afe0aa159a9..a463219700c 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -18,22 +18,18 @@ FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor (
 
 char *
 FOO_ClientRequestInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_ClientRequestInterceptor");
 }
 
 void
 FOO_ClientRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Verify that the tagged component that was supposed to be embedded
   // into the IOR by the FOO_IORInterceptor is actually in the IOR
@@ -88,29 +84,23 @@ FOO_ClientRequestInterceptor::send_request (
 void
 FOO_ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 8af1cbf2dcb..a8e4f93dbfd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -60,34 +60,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index 733cbfe45b3..0200be0375c 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -13,14 +13,12 @@ void
 FOO_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
     info->codec_factory ();
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index 4b69449d50b..fe42e85e5d2 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -54,13 +54,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index f776640a8e6..57fd9b42094 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -15,21 +15,18 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
 
 char *
 FOO_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
 FOO_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // According to the Portable Interceptors specification,
   // IORInterceptor::establish_components() must not throw an
@@ -101,7 +98,6 @@ FOO_IORInterceptor::establish_components (
 void
 FOO_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct a dummy tagged component.
   IOP::TaggedComponent component;
@@ -160,7 +156,6 @@ void
 FOO_IORInterceptor::adapter_manager_state_changed (
     const char *,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -168,6 +163,5 @@ void
 FOO_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 2072514f20b..6a699c40792 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -59,35 +59,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index b1c050af679..95d3c5babce 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -14,14 +14,12 @@ void
 FOO_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
     info->codec_factory ();
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 3904a3b239d..ce563c445fa 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -54,13 +54,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 260a73794bd..cd6f166d8e8 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, iorinterceptor, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     FOO_Client_ORBInitializer.cpp
     FOO_ClientRequestInterceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
index 88d843a1a96..6500f127a9a 100755
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running IORInterceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 1856b7702c3..058e6335a3d 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index d21f3a0833f..2b0aa7217b5 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -34,8 +34,7 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index 3809deb700b..2e52e0adeb6 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (bool & destroy_called)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   ACE_NEW_THROW_EX (interceptor,
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index d4f62cd34eb..7aed2e7790a 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -46,11 +46,9 @@ public:
   /// Constructor.
   Server_ORBInitializer (bool & destroy_called);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index 431b7adbf59..a78dc678b9b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -22,14 +22,12 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 
 char *
 Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
 Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_called_ = true;
 }
@@ -37,8 +35,6 @@ Server_Request_Interceptor::destroy (void)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Interceptor::destroy() should not have been called yet.
   ACE_ASSERT (this->destroy_called_ == false);
@@ -47,8 +43,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 
 {
   // Interceptor::destroy() should not have been called yet.
@@ -58,7 +52,6 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Interceptor::destroy() should not have been called yet.
   ACE_ASSERT (this->destroy_called_ == false);
@@ -67,8 +60,6 @@ Server_Request_Interceptor::send_reply (
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Interceptor::destroy() should not have been called yet.
   ACE_ASSERT (this->destroy_called_ == false);
@@ -77,8 +68,6 @@ Server_Request_Interceptor::send_exception (
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Interceptor::destroy() should not have been called yet.
   ACE_ASSERT (this->destroy_called_ == false);
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index df187106cb7..45b443ba47e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -60,35 +60,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
index 4c2bce37aaa..b91680b765b 100755
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
@@ -18,7 +18,7 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $file");    
+    $SV = new PerlACE::Process ("server", "-o $file");
 }
 $CL = new PerlACE::Process ("client", "-k file://$file");
 
@@ -28,7 +28,7 @@ print STDERR "\n\n==== Running PortableInterceptor ORB::shutdown() test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 8c92a58148a..6b1ff730487 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -80,8 +80,13 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       CORBA::Object_var obj =
-        servant._this ();
+        CORBA::Object::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (obj.in ());
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index b1d46d1d3d7..ea019951879 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -17,14 +17,12 @@ test_i::~test_i (void)
 
 void
 test_i::hello (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Hello!\n"));
 }
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Shutting down ORB.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
index f05d76ad2e1..d7a25506928 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
@@ -36,12 +36,10 @@ public:
   ~test_i (void);
 
   /// Say hello.
-  virtual void hello (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void hello (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index dbccc32eb01..f07af1f187a 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -19,14 +19,12 @@ void
 ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("PICurrent");
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index 2dd48ca5938..249d15eacdd 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -61,13 +61,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index 822b84bd545..69042d4326f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -21,22 +21,18 @@ ClientRequestInterceptor::ClientRequestInterceptor (
 
 char *
 ClientRequestInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ClientRequestInterceptor");
 }
 
 void
 ClientRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -111,29 +107,23 @@ ClientRequestInterceptor::send_request (
 void
 ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index dbae0fbfff3..60bb14ec5d1 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -60,34 +60,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 2dc2ce44b33..0dd2ae70fc0 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -18,22 +18,18 @@ ClientRequestInterceptor2::ClientRequestInterceptor2 (
 
 char *
 ClientRequestInterceptor2::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ClientRequestInterceptor2");
 }
 
 void
 ClientRequestInterceptor2::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -86,29 +82,23 @@ ClientRequestInterceptor2::send_request (
 void
 ClientRequestInterceptor2::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ClientRequestInterceptor2::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index f33802ab240..1789695af4b 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -56,34 +56,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index c638d946a1a..b2eda2bb410 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -27,7 +27,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     ClientORBInitializer.cpp
     ClientRequestInterceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index f5a3bb414e6..0de620070ef 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -16,14 +16,12 @@ void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("PICurrent");
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index 0f58ff3827b..f4ebd2a58c3 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -62,13 +62,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index f4c58199740..0c5ac6f0ffc 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -21,22 +21,18 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 
 char *
 ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
 ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -75,8 +71,6 @@ ServerRequestInterceptor::receive_request_service_contexts (
 void
 ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   try
     {
@@ -124,7 +118,6 @@ ServerRequestInterceptor::receive_request (
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -210,15 +203,11 @@ ServerRequestInterceptor::send_reply (
 void
 ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index b328d594e77..f40512200c3 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -59,35 +59,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
index 64932b1e51d..1f767aa5fe2 100755
--- a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
@@ -30,7 +30,7 @@ sub DoTest
   unlink $file;
   $SV->Spawn ();
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill (); 
       return 1;
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index 334832663a7..0414b720388 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -21,7 +21,6 @@ test_i::~test_i (void)
 
 void
 test_i::invoke_me (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked.\n"));
@@ -43,8 +42,7 @@ test_i::invoke_me (void)
 
   // By this point all of step 1 has occurred.  Step 2 will now
   // occur.
-  PICurrentTest::test_var my_ref =
-    this->_this ();
+  PICurrentTest::test_var my_ref = this->_this ();
 
   // ----------------------------------------------------
 
@@ -129,7 +127,6 @@ test_i::invoke_me (void)
 
 void
 test_i::invoke_you (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Nothing to be tested here.  This method is here just so that we
   // have a different method
@@ -137,7 +134,6 @@ test_i::invoke_you (void)
 
 void
 test_i::invoke_we (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Insert some data into the TSC PICurrent object.
   const char str[] = "We drink milk!";
@@ -170,7 +166,6 @@ test_i::invoke_we (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index 02c15fffba3..16183113c81 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -41,22 +41,18 @@ public:
   ~test_i (void);
 
   /// Main servant test method.
-  virtual void invoke_me (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke_me (void);
 
   /// 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 invoke_you (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke_you (void);
 
   /// Test just a set slot
-  virtual void invoke_we (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void invoke_we (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index 8d6ecaa29de..37e62f127da 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -19,14 +19,12 @@ IORInterceptor::~IORInterceptor (void)
 
 char *
 IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("");
 }
 
 void
 IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (this->success_);
 }
@@ -34,7 +32,6 @@ IORInterceptor::destroy (void)
 void
 IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 7699f7b0d33..eeede279715 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -58,17 +58,14 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index f8838b1e9f4..6351d93f35a 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -2,6 +2,7 @@
 
 #include "Policy.h"
 
+#include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (PolicyFactory,
@@ -20,21 +21,18 @@ Policy::~Policy (void)
 
 CORBA::ULong
 Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::PolicyType
 Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test::POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
 Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p;
   ACE_NEW_THROW_EX (p,
@@ -46,6 +44,5 @@ Policy::copy (void)
 
 void
 Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
index 2843358dcbd..fdebe1daa6f 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
@@ -36,17 +36,13 @@ public:
   Policy (CORBA::ULong val);
 
   /// Test method defined in test IDL.
-  virtual CORBA::ULong value (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong value (void);
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 protected:
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 6164f1d6270..4e90c443045 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -11,19 +11,15 @@ ACE_RCSID (PolicyFactory,
 CORBA::Policy_ptr
 PolicyFactory::create_policy (CORBA::PolicyType type,
                               const CORBA::Any & value)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
   // Sanity check since this condition should be caught earlier by the
   // TAO_PolicyFactory_Registry.
   if (type != Test::POLICY_TYPE)
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                        CORBA::Policy::_nil ());
+      throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
 
   CORBA::ULong val;
   if (!(value >>= val))
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      CORBA::Policy::_nil ());
+    throw CORBA::INTERNAL ();
 
   Policy * p = 0;
   ACE_NEW_THROW_EX (p,
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index 0b6943c92e1..f18411deb62 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -54,9 +54,7 @@ public:
 
   /// Construct a Test::Policy object as a test.
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           const CORBA::Any & value);
 
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index e454a4f0ccf..c0ec2c8b751 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -19,14 +19,12 @@ void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::PolicyFactory_ptr p;
   ACE_NEW_THROW_EX (p,
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index 960e020d009..e9d65e82a56 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -54,13 +54,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
index c82b4816ef0..601d939e2f1 100755
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
@@ -22,7 +22,7 @@ print STDERR "\n\n==== Running PolicyFactory test\n";
 
 $SV->Spawn ();
 
-$server = $SV->WaitKill (30);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
index ff60616bcad..0eb892fe7f8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
@@ -19,14 +19,12 @@ Echo_Collocated_ORBInitializer::Echo_Collocated_ORBInitializer (
 void
 Echo_Collocated_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Collocated_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
     info->orb_id ();
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 20ccaf9ce43..0280f393533 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -35,11 +35,9 @@ public:
     (PortableInterceptor::ProcessingMode server_proc_mode,
      PortableInterceptor::ProcessingMode client_proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 90b479eda64..3525ebbcd07 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -29,14 +29,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -44,7 +42,6 @@ void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -52,8 +49,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op =
     ri->operation ();
@@ -91,8 +86,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -111,7 +104,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -164,8 +156,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -200,30 +190,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -268,7 +252,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -323,8 +306,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var op = ri->operation ();
@@ -356,8 +337,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index 26521b44c3c..ab7fc5e820a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -32,36 +32,24 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
+      );
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong client_interceptor_check_;
@@ -80,38 +68,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        );
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
index f735449a7cc..94350489e4c 100755
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
@@ -102,7 +102,7 @@ for ($testid = 1; $testid <= 9; ++$testid)
 
   $SV->Spawn ();
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill ();
       exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 10d6a5c709b..547a8c5366c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -13,7 +13,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
@@ -21,7 +20,6 @@ Visual_i::normal (CORBA::Long)
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
                      CORBA::Long two)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
   return (one + two);
@@ -29,7 +27,6 @@ Visual_i::calculate (CORBA::Long one,
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +34,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +41,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index 841d3ef41df..2ccfe475b5f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -27,22 +27,17 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         CORBA::Long two);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
index 97154274ed7..6aca7e80aac 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
@@ -17,14 +17,12 @@ Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (
 void
 Echo_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index ad6ce6e6549..55004810ad0 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -35,11 +35,9 @@ public:
   Echo_Client_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
index be6737a8e45..dc9f9092a96 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
@@ -17,14 +17,12 @@ Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (
 void
 Echo_Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
     info->orb_id ();
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index c0e4e83fda7..190fb9f8dd4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -34,11 +34,9 @@ public:
   Echo_Server_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 14b1bef3587..a0ce7f47f0d 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -26,14 +26,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -41,7 +39,6 @@ void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -49,8 +46,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
@@ -84,8 +79,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
@@ -100,7 +93,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   client_interceptor_check_++;
 
@@ -148,8 +140,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index 1f4d73fbdd2..d1b6b22f9f3 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -31,36 +31,24 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
+      );
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong client_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
index b75e3b99bb6..973e4aaa9e7 100755
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
@@ -105,7 +105,7 @@ for ($testid = 1; $testid <= 9; ++$testid)
       exit 1;
   }
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill ();
       exit 1;
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 4ad894b3f41..d7266e7638d 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
@@ -26,30 +26,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
@@ -89,7 +83,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++server_interceptor_check_;
 
@@ -139,8 +132,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -174,8 +165,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 51b6ba53736..eef328e94dc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -31,38 +31,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
+        );
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index 9b5c7b32e41..af6f50de15c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -12,7 +12,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
@@ -20,7 +19,6 @@ Visual_i::normal (CORBA::Long)
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
                      CORBA::Long two)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
   return (one + two);
@@ -28,7 +26,6 @@ Visual_i::calculate (CORBA::Long one,
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -36,7 +33,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -44,7 +40,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index 841d3ef41df..2ccfe475b5f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -27,22 +27,17 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         CORBA::Long two);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
index 4c9307fbfcb..09f9419c5d2 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
@@ -20,7 +20,6 @@ Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) :
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++pre_init_called;
 
@@ -37,7 +36,6 @@ Client_ORBInitializer::pre_init (
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++post_init_called;
 }
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
index 677200a461a..0dd990c22d3 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (Client_ORBInitializer *second);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   int pre_init_called;
   int post_init_called;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 20cda8787f3..8829cc5cb9d 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer_var1.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::ORB_var orb2 =
         CORBA::ORB_init (argc, argv, "SecondORB");
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
index 13e1a0fec8c..721bc165e84 100755
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Recursive ORBInitializer test ====\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index 4cc398ba54a..f42b8ca4578 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -16,14 +16,12 @@ ACE_RCSID (Redirection,
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id = info->orb_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index 4b0c0c76dba..ef4db0dd418 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -30,11 +30,9 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 5ab71be7307..1f18a6c90ac 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -20,22 +20,18 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 
 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_;
 }
@@ -43,22 +39,18 @@ Client_Request_Interceptor::send_request (
 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 ()))
   {
@@ -78,7 +70,5 @@ Client_Request_Interceptor::receive_exception (
 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
index fc6786cc224..a7ff5181b50 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -44,34 +44,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 6484f63d591..da369749751 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -18,14 +18,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   ACE_NEW_THROW_EX (interceptor,
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index 4c9e39a2d38..dccc2ebc7b7 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -36,11 +36,9 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 78622ae0627..3123772c7cb 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -20,22 +20,18 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 
 char *
 Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
 Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   this->request_count_++;
 }
@@ -43,15 +39,12 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1);
 }
@@ -59,15 +52,11 @@ Server_Request_Interceptor::send_reply (
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr)
-  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
index 2bb20759f75..52a5d2e5e39 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -42,35 +42,24 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
index 024921a57cd..87f26315099 100755
--- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
@@ -27,13 +27,13 @@ print STDERR "\n\n==== Running PortableInterceptor::Redirection test\n";
 $SV1->Spawn ();
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file1>\n";
     $SV1->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file2>\n";
     $SV2->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 4fc9c966cd7..b335e156a30 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -86,8 +86,13 @@ main (int argc, char *argv[])
       ACE_NEW_RETURN (test_impl, test_i (number, orb.in ()), 1);
       PortableServer::ServantBase_var owner_transfer (test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       RedirectionTest::test_var test =
-        test_impl->_this ();
+        RedirectionTest::test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index e5a76646be9..189b2447c94 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -19,14 +19,12 @@ test_i::~test_i (void)
 
 CORBA::Short
 test_i::number (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 6a733639a65..066079a89c6 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -26,12 +26,10 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short number (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
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 b9fc8aa89e3..1e3d3682b0c 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -19,7 +19,6 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr orbinitinfo)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   POA_TestModule::test* test = 0;
   ACE_NEW (test,
@@ -94,7 +93,6 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index d9c602a0dec..e01a6522b16 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -32,11 +32,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl b/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
index 6484616e7f6..70a7b4b8656 100755
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Register_Initial_References test ====\n";
 
-$server = $SV->SpawnWaitKill (30);
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index 29f8f3a3424..fbf9c48da3e 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -110,7 +110,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       retval = test_orb (orb.in ());
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 047efb616ff..7409c0021dc 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -14,14 +14,12 @@ ACE_RCSID (Request_Interceptor_Flow,
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Create and register the test request interceptors.
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index affe429a3c5..e2d4ca3e84f 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -45,11 +45,9 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index c9404a9a380..81ac1416066 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -19,8 +19,6 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name)
 void
 Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean client_side =
     this->client_side_test (ri);
@@ -75,7 +73,6 @@ Client_Request_Interceptor::send_request (
 void
 Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
@@ -94,7 +91,6 @@ Client_Request_Interceptor::send_poll (
 void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
@@ -150,8 +146,6 @@ Client_Request_Interceptor::receive_reply (
 void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
@@ -229,8 +223,6 @@ Client_Request_Interceptor::receive_exception (
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index e9ca7b9d507..053753ee635 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -60,27 +60,19 @@ public:
    */
   //@{
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
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..f9487f30468 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
@@ -28,7 +28,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index 5c715ff03e3..23821477ad5 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -15,14 +15,12 @@ Request_Interceptor::Request_Interceptor (const char *name)
 
 char *
 Request_Interceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
 Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::ULong s_count =
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index 6f41abec934..4e7e687a4b3 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -58,11 +58,9 @@ public:
    */
   //@{
   /// Return the name of this Requestinterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index d9f79479560..fdaedb584cc 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -12,14 +12,12 @@ ACE_RCSID (Request_Interceptor_Flow,
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Create and register the test request interceptors.
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index f8819bb9bc3..7c3444f0d04 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -45,11 +45,9 @@ class Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 44952a79f1d..df570c750a7 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -22,8 +22,6 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
@@ -67,8 +65,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
@@ -85,7 +81,6 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean server_side =
@@ -141,8 +136,6 @@ Server_Request_Interceptor::send_reply (
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
@@ -220,8 +213,6 @@ Server_Request_Interceptor::send_exception (
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index ac5b56bff1e..66d1ff9443d 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -60,28 +60,19 @@ public:
    */
   //@{
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 private:
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..98f96a2bb44 100755
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running Request_Interceptor_Flow test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index d8d4fd6b79a..75b41080f27 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -79,7 +79,12 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
-      CORBA::Object_var obj = servant._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      CORBA::Object_var obj = CORBA::Object::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (obj.in ());
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 2a9f74f7eca..6eddcc6653c 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -13,9 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::client_test (Test::TestScenario scenario)
-  ACE_THROW_SPEC ((Test::X,
-                   Test::UnknownScenario,
-                   CORBA::SystemException))
 {
   switch (scenario)
     {
@@ -35,9 +32,6 @@ test_i::client_test (Test::TestScenario scenario)
 void
 test_i::server_test (Test::TestScenario scenario,
                      CORBA::ULongSeq_out myseq)
-  ACE_THROW_SPEC ((Test::X,
-                   Test::UnknownScenario,
-                   CORBA::SystemException))
 {
   myseq = new CORBA::ULongSeq;
 
@@ -58,7 +52,6 @@ test_i::server_test (Test::TestScenario scenario,
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index ad5b2be3b75..a1fd0e22782 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -33,21 +33,14 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// The client-side test operation.
-  virtual void client_test (Test::TestScenario scenario)
-    ACE_THROW_SPEC ((Test::X,
-                     Test::UnknownScenario,
-                     CORBA::SystemException));
+  virtual void client_test (Test::TestScenario scenario);
 
   /// The server-side test operation.
   virtual void server_test (Test::TestScenario scenario,
-                            CORBA::ULongSeq_out myseq)
-    ACE_THROW_SPEC ((Test::X,
-                     Test::UnknownScenario,
-                     CORBA::SystemException));
+                            CORBA::ULongSeq_out myseq);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index 81394e0fdbd..2a0776226f0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
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..395e526a9f0 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
@@ -25,7 +25,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *Server
+  after += *idl
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index 98962f028bc..03a51a1c2e0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index b43bcf07b7d..fdd057149c4 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index f8c76885c57..dbb602e2733 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index e6318e00110..fb01ff29c4c 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -27,21 +27,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -49,8 +46,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -114,7 +109,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -180,8 +174,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_other\n",
@@ -191,8 +183,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index af32be9e149..e2a65a1f048 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -31,30 +31,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index 6b1af478aef..cd2707435f4 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index ef37b2b4ab4..9e927668033 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -25,22 +25,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -91,8 +87,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -100,7 +94,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -150,8 +143,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -203,8 +194,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index cc14ce6591b..18cad2930d6 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -31,32 +31,21 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 925f856c0b5..0d201962ba4 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
 Visual_i::nothing (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +33,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +40,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index cda32b963d9..e1130b91bfb 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -28,21 +28,15 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
-  void nothing (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void nothing (void);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Slot/run_test.pl b/TAO/tests/Portable_Interceptors/Slot/run_test.pl
index 6a114e0b6cd..d36d2cb27e2 100755
--- a/TAO/tests/Portable_Interceptors/Slot/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Slot/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Slot test ====\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: driver returned $client\n";
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 061af3a31b4..0e647960cb1 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       Client client (orb.in (), app);
 
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 28fef907bfc..99bd2ba6579 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -80,8 +80,13 @@ main (int argc, char *argv[])
       // Instantiate the LCD_Display implementation class
       LCD_Display_imp display_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&display_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       LCD_Display_var server =
-        display_impl._this ();
+        LCD_Display::_narrow (object.in ());
 
       // Create the LCD after the QVbox is created.
       QVBox box;
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 1f58c4db4ae..750d6167c1e 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -14,7 +14,6 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 
 void
 LCD_Display_imp::shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "The ORB has been shutdown, Close the windows to exit \n"));
@@ -24,7 +23,6 @@ LCD_Display_imp::shutdown (void)
 
 void
 LCD_Display_imp::send_val (CORBA::Long val)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "The value from server is <%d> \n", val));
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 1305ce328e4..f1d517adfa8 100644
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -36,11 +36,9 @@ public:
 
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
-  void send_val (CORBA::Long val)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void send_val (CORBA::Long val);
 
  signals:
   void set_value (int val);
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl
index 94ff362d8f5..4d487e023ab 100755
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl
@@ -9,7 +9,7 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 my($T)      = new PerlACE::Process ("test");
-my($test)   = $T->SpawnWaitKill (20);
+my($test)   = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 my($status) = 0;
 
 if ($test != 0) {
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index b0b7fbf765a..4c00f78eff3 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server {
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 69c5979a187..db7cba9a3b4 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -14,11 +14,9 @@ public:
           RTCORBA::PriorityBands &bands);
 
   void test_method (CORBA::Boolean client_propagated,
-                    CORBA::Short priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Short priority);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -43,7 +41,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb,
 void
 Test_i::test_method (CORBA::Boolean client_propagated,
                      CORBA::Short client_priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the upcall thread's priority.
   CORBA::Short server_priority =
@@ -108,7 +105,6 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index 5c4740ebcc8..86416ddadde 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 083f7252710..42e9f95661a 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -11,16 +11,16 @@ project(*idl): taoidldefaults {
 project(*Server): rt_server {
   after += *idl
   Source_Files {
-    server.cpp
-    testS.cpp
     testC.cpp
+    testS.cpp
+    server.cpp
   }
   IDL_Files {
   }
 }
 
 project(*Client): rt_client, interceptors {
-  after += *Server
+  after += *idl
   Source_Files {
     testC.cpp
     interceptors.cpp
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 87af90bca4c..2c365f6af65 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index 5b6980c223a..725288bf2f1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -21,21 +21,18 @@ Client_Request_Interceptor::~Client_Request_Interceptor (void)
 
 char *
 Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -43,8 +40,6 @@ Client_Request_Interceptor::send_poll (
 void
 Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -52,7 +47,6 @@ Client_Request_Interceptor::send_request (
 void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   try
@@ -76,16 +70,12 @@ Client_Request_Interceptor::receive_reply (
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 83872792775..e8fea450a25 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -32,30 +32,20 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
index 6364fd79116..921020eea73 100755
--- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
@@ -26,26 +26,26 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) 
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1)
 {
     $server = $SV->TimedWait (1);
-    if ($server == 2) 
+    if ($server == 2)
     {
         # Mark as no longer running to avoid errors on exit.
         $SV->{RUNNING} = 0;
         exit $status;
-    } 
-    else 
+    }
+    else
     {
         print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
+        $SV->Kill ();
         exit 1;
     }
 }
- 
+
 $client = $CL->SpawnWaitKill (60);
 
-if ($client != 0) 
+if ($client != 0)
 {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
@@ -53,7 +53,7 @@ if ($client != 0)
 
 $server = $SV->WaitKill (60);
 
-if ($server != 0) 
+if ($server != 0)
 {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 9c134b8a815..0ebfe985c70 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -18,11 +18,9 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Short priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (CORBA::Short priority);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -36,7 +34,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
@@ -67,7 +64,6 @@ Test_i::test_method (CORBA::Short priority)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -234,7 +230,7 @@ main (int argc, char *argv[])
       // parse arguments and get all the references (ORB,
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 768b49acf2f..2a58e30e83f 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server {
 
 project(*Client): strategies, rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 1043ff145e0..bfadacc151e 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 28137e09aa0..b5e012a90cd 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -16,11 +16,9 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -34,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method ( /**/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked on the sever\n"));
@@ -42,7 +39,6 @@ Test_i::test_method ( /**/)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down \n"));
@@ -152,7 +148,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index efbdd6407a8..813b5429d2d 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -35,11 +35,9 @@ public:
           PortableServer::POA_ptr poa,
           Tests &tests);
 
-  void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (void);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -208,7 +206,6 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority)
 
 void
 test_i::start (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n"));
@@ -288,7 +285,6 @@ test_i::thread_info (const char *method_name)
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->thread_info ("test_i::method");
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index c2eafe73c8d..263c41e2701 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -166,7 +166,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 076f959d777..29999455f8a 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -15,11 +15,9 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -32,7 +30,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test_i::test_method\n"));
@@ -40,7 +37,6 @@ Test_i::test_method (void)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -105,7 +101,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
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..c08dbc630cd 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
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index 9570ad96270..bfe535ecc1e 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 384c3944762..555caae988f 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -136,8 +136,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   PortableServer::ServantBase_var safe_servant (servant);
   ACE_UNUSED_ARG (safe_servant);
 
+  PortableServer::ObjectId_var id =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   int result =
     write_ior_to_file (orb,
@@ -198,8 +203,13 @@ Task::svc (void)
       test_i servant (this->orb_.in (),
                       root_poa.in (),
                       nap_time);
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       test_var test =
-        servant._this ();
+        test::_narrow (object_act.in ());
 
       int result =
         write_ior_to_file (this->orb_.in (),
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 231ed2d2f02..3fec3b5fbf6 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -21,7 +21,6 @@ CORBA::Long
 test_i::method (CORBA::Long client_id,
                 CORBA::Long iteration,
                 CORBA::Long_out thread_count)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -62,7 +61,6 @@ test_i::_default_POA (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index dbceb65c9ab..f6fa6a9fbee 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -22,12 +22,10 @@ public:
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
                       CORBA::Long iteration,
-                      CORBA::Long_out thread_count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Long_out thread_count);
 
   /// Shutdown the server.
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   /// Our POA.
   PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 9cd33a6af63..9f222f50a1e 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 1ef938988dd..52b68e9e603 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index eb3ba8daff6..c7d15760b70 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -17,11 +17,9 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -35,7 +33,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (/* */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server: test_method invoked.\n"));
@@ -43,7 +40,6 @@ Test_i::test_method (/* */)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -134,7 +130,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 1aa4e9117dd..dad4a066bc3 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index c48b57143ca..e551c2583a5 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -15,11 +15,9 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -38,7 +36,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
@@ -46,7 +43,6 @@ test_i::method (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -230,8 +226,13 @@ Task::svc (void)
 
       PortableServer::ServantBase_var safe_servant (servant);
 
+      PortableServer::ObjectId_var id =
+        poa->activate_object (servant);
+
+      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+
       test_var test =
-        servant->_this ();
+        test::_narrow (object_act.in ());
 
       write_iors_to_file (test.in (),
                           this->orb_.in (),
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..7fe1672ae73 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
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index 44c955037cf..63fe5a5fb7d 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -284,7 +284,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index d54be8f5548..f13ac81e89c 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -18,11 +18,9 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -36,14 +34,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method ( /* */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -199,7 +195,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 1aa4e9117dd..dad4a066bc3 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index e11d09b1640..3802b89a475 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -13,11 +13,9 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -36,7 +34,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
@@ -44,7 +41,6 @@ test_i::method (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 4ac469e8021..5040de044de 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 6030be5d764..b5207a64b70 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -16,14 +16,11 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short method (void);
 
-  void prioritized_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void prioritized_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -48,7 +45,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 CORBA::Short
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
@@ -58,7 +54,6 @@ test_i::method (void)
 
 void
 test_i::prioritized_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent");
@@ -80,7 +75,6 @@ test_i::prioritized_method (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -273,8 +267,13 @@ server::test_root_poa (void)
 
   PortableServer::ServantBase_var safe_servant (servant);
 
+  PortableServer::ObjectId_var id =
+    this->root_poa_->activate_object (servant);
+
+  CORBA::Object_var object_act = this->root_poa_->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object_act.in ());
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
@@ -304,8 +303,13 @@ server::test_child_poa (void)
 
   PortableServer::ServantBase_var safe_servant (servant);
 
+  PortableServer::ObjectId_var id =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object_act = poa->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object_act.in ());
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
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..c08dbc630cd 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
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index e2417379d80..67a07eb73d7 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -170,7 +170,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index bdb6107a94c..12d4e9b56a7 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -137,8 +137,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   PortableServer::ServantBase_var safe_servant (servant);
   ACE_UNUSED_ARG (safe_servant);
 
+  PortableServer::ObjectId_var id =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   int const result =
     write_ior_to_file (orb,
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index 3399bf97feb..c3af66871f5 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -43,7 +43,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 void
 test_i::method (CORBA::ULong work,
                 const char * iteration)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -102,7 +101,6 @@ test_i::_default_POA (void)
 
 void
 test_i::initialize (CORBA::ULong total_iterations)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->total_iterations_ = total_iterations;
 }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
index 986f17c75e4..a863fbd111e 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
@@ -22,13 +22,11 @@ public:
           RTCORBA::Priority high_priority);
 
   /// Initialize the server.
-  void initialize (CORBA::ULong total_iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void initialize (CORBA::ULong total_iterations);
 
   /// Test method.
   void method (CORBA::ULong work,
-               const char *iteration)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               const char *iteration);
 
   /// Our POA.
   PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 21db1ec8e87..6b2f5be9e36 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index 23d1e298db5..a651beb4718 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 2ad7c3ce16a..ed3ee580a26 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -16,11 +16,9 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -34,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (/* */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server: test_method invoked.\n"));
@@ -42,7 +39,6 @@ Test_i::test_method (/* */)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -139,7 +135,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
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..45c49c24cf6 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -21,7 +21,6 @@ project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba, a
 
 project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index abd328de089..996e7b77a8e 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -30,11 +30,9 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void method (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -53,7 +51,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -78,7 +75,6 @@ test_i::method (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -193,8 +189,13 @@ vanilla_poa (CORBA::ORB_ptr orb,
 
   PortableServer::ServantBase_var safe_servant (servant);
 
+  PortableServer::ObjectId_var id_act =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object = poa->id_to_reference (id_act.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   write_iors_to_file (test.in (),
                       orb);
@@ -272,8 +273,13 @@ rt_poa (CORBA::ORB_ptr orb,
 
   PortableServer::ServantBase_var safe_servant (servant);
 
+  PortableServer::ObjectId_var id_act =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object = poa->id_to_reference (id_act.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   write_iors_to_file (test.in (),
                       orb);
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index bf326a9dfb3..d4be7a51006 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -465,7 +465,7 @@ main (int argc, char *argv[])
   try
     {
       // ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index b0b7fbf765a..4c00f78eff3 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server {
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 1e52bba6f1f..1c9e7b0ce44 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index e62e6c8c8be..82d5e912a39 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -52,16 +52,16 @@ print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) 
+if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1)
 {
     $server = $SV->TimedWait (1);
-    if ($server == 2) 
+    if ($server == 2)
     {
         # Mark as no longer running to avoid errors on exit.
         $SV->{RUNNING} = 0;
         exit $status;
-    } 
-    else 
+    }
+    else
     {
         print STDERR "ERROR: cannot find file <$iorfile2>\n";
         $SV->Kill ();
@@ -71,7 +71,7 @@ if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1)
 
 $client = $CL->SpawnWaitKill (60);
 
-if ($client != 0) 
+if ($client != 0)
 {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
@@ -79,7 +79,7 @@ if ($client != 0)
 
 $server = $SV->WaitKill (60);
 
-if ($server != 0) 
+if ($server != 0)
 {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index c6322ced276..c818a81b734 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -17,11 +17,9 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (CORBA::Short priority)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (CORBA::Short priority);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -35,7 +33,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
@@ -66,7 +63,6 @@ Test_i::test_method (CORBA::Short priority)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -302,7 +298,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 276def8a366..2d81c7c0606 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index e70b49ff04d..2231c996369 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
     {
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 1a154a92130..48a479d4d03 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -18,8 +18,7 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -33,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received request to shut down the ORB\n"));
@@ -229,7 +227,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index b5e0ed23f6d..c08dbc630cd 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index a53a2b0a4da..d66cfdf2006 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index dcf82a74e24..816ea22446e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -137,8 +137,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   PortableServer::ServantBase_var safe_servant (servant);
   ACE_UNUSED_ARG (safe_servant);
 
+  PortableServer::ObjectId_var id =
+    poa->activate_object (servant);
+
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   int result =
     write_ior_to_file (orb,
@@ -199,8 +204,13 @@ Task::svc (void)
       test_i servant (this->orb_.in (),
                       root_poa.in (),
                       nap_time);
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       test_var test =
-        servant._this ();
+        test::_narrow (object_act.in ());
 
       int result =
         write_ior_to_file (this->orb_.in (),
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index 4a7e623ef80..2bf77daed60 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -20,7 +20,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
 CORBA::Long
 test_i::method (CORBA::Long client_id,
                 CORBA::Long iteration)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -56,7 +55,6 @@ test_i::_default_POA (void)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index 1bcbf6173cd..a7a7861ada4 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -21,12 +21,10 @@ public:
 
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
-                      CORBA::Long iteration)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Long iteration);
 
   /// Shutdown the server.
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   /// Our POA.
   PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index d84ab87c1e1..4e0cbf8a9ae 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -20,8 +20,7 @@ public RTScheduling::ThreadAction
  public:
   Test_Thread_Action (void);
 
-  virtual void _cxx_do (CORBA::VoidData data)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void _cxx_do (CORBA::VoidData data);
 };
 
 #endif /*Thread_Action_H*/
@@ -33,7 +32,6 @@ Test_Thread_Action::Test_Thread_Action (void)
 
 void
 Test_Thread_Action::_cxx_do (CORBA::VoidData data)
-     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   Data* tmp = (Data*) data;
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index b6bf436b6fd..375217055ca 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -19,27 +19,23 @@ TAO_Scheduler::~TAO_Scheduler (void)
 
 CORBA::PolicyList*
 TAO_Scheduler::scheduling_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
 TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
 TAO_Scheduler::poa_policies (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 char *
 TAO_Scheduler::scheduling_discipline_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -47,7 +43,6 @@ TAO_Scheduler::scheduling_discipline_name (void)
 RTScheduling::ResourceManager_ptr
 TAO_Scheduler::create_resource_manager (const char *,
                                         CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -56,7 +51,6 @@ void
 TAO_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
                                          CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -65,8 +59,6 @@ TAO_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                                              const char *,
                                              CORBA::Policy_ptr,
                                              CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 }
 
@@ -75,8 +67,6 @@ TAO_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
                                                 const char *,
                                                 CORBA::Policy_ptr,
                                                 CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 }
 
@@ -85,15 +75,12 @@ TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &,
                                           const char *,
                                           CORBA::Policy_ptr,
                                           CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 }
 
 void
 TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
                                        const char *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -101,15 +88,12 @@ void
 TAO_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                               const char *,
                                               CORBA::Policy_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
 TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext* srv_con = new IOP::ServiceContext;
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
@@ -127,8 +111,6 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out /*sched_param*/,
                                 CORBA::Policy_out /*implicit_sched_param*/)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext_var serv_cxt;
 
@@ -165,53 +147,40 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 
 void
 TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Scheduler::cancel (const RTScheduling::Current::IdType &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index 27bb8751f52..a3e06044221 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -15,97 +15,66 @@ public RTScheduling::Scheduler,
 
   ~TAO_Scheduler (void);
 
-  virtual CORBA::PolicyList * scheduling_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * scheduling_policies (void);
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyList * poa_policies (void);
 
-  virtual char * scheduling_discipline_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * scheduling_discipline_name (void);
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                     CORBA::Policy_ptr scheduling_parameter);
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Policy_ptr scheduling_parameter);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                             CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                                CORBA::Policy_ptr implicit_sched_param);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
+                                          CORBA::Policy_ptr implicit_sched_param);
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       const char * name);
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                              CORBA::Policy_ptr outer_sched_param);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   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_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                CORBA::Policy_out implicit_sched_param);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cancel (const RTScheduling::Current::IdType & guid);
  private:
   RTScheduling::Current_var current_;
 };
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 63e7ef77111..8b23bb0292a 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -25,7 +25,6 @@ project(*Server): rtscheduling_server {
 
 project(*Client) : rtscheduling_client {
   after += *idl
-  after += *Server
   Source_Files {
     ../Scheduler.cpp
     test_client.cpp
@@ -36,5 +35,5 @@ project(*Client) : rtscheduling_client {
   IDL_Files {
   }
 
-  exename = Scheduler_Interceptor_Client 
+  exename = Scheduler_Interceptor_Client
 }
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 85301c079f7..79544c0dce9 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -20,7 +20,6 @@ public:
   }
 
   virtual void one_way (const char * message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
 		"One-Way Message = %s\n",
@@ -28,7 +27,6 @@ public:
   }
 
   virtual char * two_way (const char * message)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
 		"Two-Way Message = %s\n",
@@ -43,7 +41,6 @@ public:
   }
 
   virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     orb_->shutdown ();
   }
diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h
index c0331b431bf..36965973ece 100644
--- a/TAO/tests/RTScheduling/VoidData/test.h
+++ b/TAO/tests/RTScheduling/VoidData/test.h
@@ -6,7 +6,6 @@ class test_impl :public test
 {
  public:
   virtual void bar (CORBA::VoidData something)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 
   {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index a674abae643..a2e99ade4fc 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -13,14 +13,12 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 
 void
 Oneway_Receiver::raise_no_permission (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
 Oneway_Receiver::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -32,7 +30,6 @@ Oneway_Receiver::destroy (void)
 
 Test::Shutdown_Helper_ptr
 Oneway_Receiver::get_shutdown_helper (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Shutdown_Helper *shutdown_helper;
   ACE_NEW_THROW_EX (shutdown_helper,
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index 0f7cadff68f..2b4a9a6518a 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -17,14 +17,11 @@ public:
   Oneway_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void raise_no_permission (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void raise_no_permission (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index ddd2850b59d..6442a2c5b15 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -29,7 +29,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index fe72789790a..d7168f8a5a5 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -12,7 +12,6 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 
 void
 Shutdown_Helper::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 935bd5d96aa..44fb581fce5 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -17,8 +17,7 @@ public:
   Shutdown_Helper (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 7fa211ab60d..f0608773dfd 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Reliable_Oneways/run_sync_none.pl b/TAO/tests/Reliable_Oneways/run_sync_none.pl
index 9e0643a9fb6..a1981c2bde6 100755
--- a/TAO/tests/Reliable_Oneways/run_sync_none.pl
+++ b/TAO/tests/Reliable_Oneways/run_sync_none.pl
@@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile -n");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (60);
 
diff --git a/TAO/tests/Reliable_Oneways/run_sync_with_server.pl b/TAO/tests/Reliable_Oneways/run_sync_with_server.pl
index 89a19200aa3..92ab22161b9 100755
--- a/TAO/tests/Reliable_Oneways/run_sync_with_server.pl
+++ b/TAO/tests/Reliable_Oneways/run_sync_with_server.pl
@@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile -s");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (200);
 
diff --git a/TAO/tests/Reliable_Oneways/run_sync_with_target.pl b/TAO/tests/Reliable_Oneways/run_sync_with_target.pl
index 641f343a35f..4950e3f2d44 100755
--- a/TAO/tests/Reliable_Oneways/run_sync_with_target.pl
+++ b/TAO/tests/Reliable_Oneways/run_sync_with_target.pl
@@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile -r");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (200);
 
diff --git a/TAO/tests/Reliable_Oneways/run_sync_with_transport.pl b/TAO/tests/Reliable_Oneways/run_sync_with_transport.pl
index 9400c6644fb..df057ba2368 100755
--- a/TAO/tests/Reliable_Oneways/run_sync_with_transport.pl
+++ b/TAO/tests/Reliable_Oneways/run_sync_with_transport.pl
@@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile -t");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (200);
 
diff --git a/TAO/tests/Reliable_Oneways/run_test.pl b/TAO/tests/Reliable_Oneways/run_test.pl
index 939e1a27814..1d4b8a8d9a4 100755
--- a/TAO/tests/Reliable_Oneways/run_test.pl
+++ b/TAO/tests/Reliable_Oneways/run_test.pl
@@ -23,7 +23,7 @@ foreach $i ("-n", "-t", "-s", "-r") {
 
   $SV->Spawn ();
 
-  if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+  if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index b435475d19b..3bc0fe20fe1 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -65,8 +65,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (oneway_receiver_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this ();
+        Test::Oneway_Receiver::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (oneway_receiver.in ());
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..846879acb58 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
@@ -15,6 +15,7 @@
 #include "mock_reference.hpp"
 
 #include "tao/Unbounded_Value_Sequence_T.h"
+#include "tao/Unbounded_Octet_Sequence_T.h"
 #include "tao/Unbounded_Object_Reference_Sequence_T.h"
 #include "tao/Unbounded_Basic_String_Sequence_T.h"
 #include "tao/Unbounded_Sequence_CDR_T.h"
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
index 2ca4fe3f756..2002a8e631a 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -12,7 +12,6 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb)
 
 char *
 One_Impl::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -24,7 +23,6 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb)
 
 char *
 Two_Impl::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -37,7 +35,6 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb)
 
 char *
 Three_Impl::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Three_Impl there!");
 }
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index c514c184b73..23c41190da1 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -16,8 +16,7 @@ public:
   One_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
@@ -33,8 +32,7 @@ public:
   Two_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
@@ -50,8 +48,7 @@ public:
   Three_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Servant_To_Reference_Test/run_test.pl b/TAO/tests/Servant_To_Reference_Test/run_test.pl
index 5fe5e66fd2c..bb271d0789a 100755
--- a/TAO/tests/Servant_To_Reference_Test/run_test.pl
+++ b/TAO/tests/Servant_To_Reference_Test/run_test.pl
@@ -16,12 +16,13 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 
 $SV->Spawn ();
 
-$server = $SV->WaitKill (120);
+## Slower hardware can require much more time to complete.
+$server = $SV->WaitKill (90);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 6285c8e221f..1dd1f8f000e 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index ccd43fa8b3a..0062f6026ca 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index ac237e4501d..ab05f3a1171 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -5,7 +5,6 @@
 
 void
 test_i::send_stuff (const char* string)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
 }
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index 7bb9a6d777e..e3ac4b3cc1c 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.h
@@ -13,8 +13,7 @@ class test_i
 {
 public:
   // = The skeleton methods
-  virtual void send_stuff (const char* string)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_stuff (const char* string);
 
 private:
 };
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index 80d03ad751b..8046a6f25bf 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -7,7 +7,7 @@
 
 const char *host = "localhost";
 static int port = 10008;
-const int iter = 80;
+const int iter = 55;
 int purged_handles = 0;
 
 int
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 009e401c408..3cc5badc07f 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -59,8 +59,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var test =
-        test_impl->_this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (test.in ());
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index b2392e6dea6..e6c157058ea 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -12,13 +12,11 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 
 void
 Ping_Service::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Ping_Service::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index cf83b5bc6d9..06ebbe49590 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -17,11 +17,9 @@ public:
   Ping_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 53fb1e76d71..464133475b6 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index 2c75dd5197f..a0434811577 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Server_Leaks/run_test.pl b/TAO/tests/Server_Leaks/run_test.pl
index d5146bbf956..e4c777d0b66 100755
--- a/TAO/tests/Server_Leaks/run_test.pl
+++ b/TAO/tests/Server_Leaks/run_test.pl
@@ -34,7 +34,7 @@ else {
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index 1e4701d7cdb..c82291b31e3 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -64,8 +64,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(ping_service_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (ping_service_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Ping_Service_var ping_service =
-        ping_service_impl->_this ();
+        Test::Ping_Service::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (ping_service.in ());
diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp
index 379c52e6aa5..1769811f1c8 100644
--- a/TAO/tests/Server_Port_Zero/Hello.cpp
+++ b/TAO/tests/Server_Port_Zero/Hello.cpp
@@ -14,14 +14,12 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 6131e1a3c88..f87205c3011 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -17,11 +17,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 8745f87ed5f..9e1c21bb333 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -67,8 +67,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Hello_var hello =
-        hello_impl->_this ();
+        Test::Hello::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (hello.in ());
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 574cb13c894..f685a64e73e 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index fe5f4460bcb..8746e3d7178 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -58,8 +58,13 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var server =
-        servant._this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index edf2618af87..0d1ad577560 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 void
 test_i::method (CORBA::ULong request_number,
                 const test::data &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("server: Iteration %d @ %T\n"),
@@ -28,7 +27,6 @@ test_i::method (CORBA::ULong request_number,
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown... "));
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index e55503154a7..a6de2d05838 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -29,11 +29,9 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               const test::data &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               const test::data &);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   /// The ORB.
diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
index 99fe5efed3b..920c81e7db3 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
+++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 4caca817ffd..b6accb28b45 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -28,7 +28,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::box_prices (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->price_ == 0)
     {
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index df80c6814f4..2ba06e0df97 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -16,8 +16,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Short box_prices(void);
   // "Smartify" the method call!
 
  private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 183d5451e8f..126fc241449 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -29,14 +29,11 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short box_prices  (void);
 
-  CORBA::Long tickets  (CORBA::Short number)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long tickets  (CORBA::Short number);
 
-  void shutdown  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown  (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -50,21 +47,18 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i::box_prices (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125;
 }
 
 CORBA::Long
 Test_i::tickets (CORBA::Short number)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125 * number;
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -122,8 +116,13 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test_var Test_object =
-        servant._this ();
+        Test::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ());
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 27abe97ce77..6de51e5a705 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -25,7 +25,7 @@ int
 Collocation_Test::init (int argc, char *argv[])
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   int result = this->parse_args (argc, argv);
   if (result != 0)
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index 1aed52ccf2f..0200835d0a8 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -14,9 +14,6 @@ Top_i::~Top_i ()
 
 char *
 Top_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a point.");
 }
@@ -33,18 +30,12 @@ Left_i::~Left_i ()
 
 char *
 Left_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
 Left_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("black");
 }
@@ -61,18 +52,12 @@ Right_i::~Right_i ()
 
 char *
 Right_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
 Right_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("red");
   //
@@ -80,9 +65,6 @@ Right_i::color (void)
 
 CORBA::Long
 Right_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 0;
 }
@@ -99,36 +81,24 @@ Buttom_i::~Buttom_i ()
 
 char *
 Buttom_i::shape (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
 Buttom_i::color (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
 Buttom_i::width (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return 100;
 }
 
 char *
 Buttom_i::name (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 6200a2ec1d3..9896ece35c6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -17,8 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char* shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char* shape (void);
   // Return the shape of this object (interface.)
 };
 
@@ -29,12 +28,10 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 };
 
@@ -45,16 +42,13 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 };
 
@@ -65,20 +59,16 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * shape (void);
   // Return the shape of this object (interface.)
 
-  virtual char * color (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * color (void);
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long width (void);
   // Return the width of the stuff.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index e7124f4340f..65bb3c88526 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -30,9 +30,6 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
 
 char *
 Smart_Diamond_Top_Proxy::shape ()
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is "));
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 1ad82aba624..6e4d005d9e5 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -25,10 +25,7 @@ class MY_Stub_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo
   Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy);
 
   virtual char * shape ()
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+;
   // Smartify the method call!
 
   // Dont need to add any extra functionality into shutdown()
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..d9f66a381ff 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
+++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 0e5e1502cbb..245458f38a4 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -8,8 +8,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index e8207d93640..289adfea298 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -7,9 +7,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  virtual CORBA::Short method (CORBA::Short boo);
   // "Smartify" the method call!
 
   // Don't need to add any extra functionality into <shutdown>, hence
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index a517bd7deeb..4d54b7d9204 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -29,12 +29,9 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  CORBA::Short method  (CORBA::Short boo);
 
-  void shutdown  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown  (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -48,21 +45,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Test_i::method () invoked\n")));
   if (boo == 5)
-    ACE_THROW_RETURN (Test::Oops ("Invalid boo\n"),
-                      -1);
+    throw Test::Oops ("Invalid boo\n");
 
   return 0;
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
@@ -120,8 +113,13 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test_var Test_object =
-        servant._this ();
+        Test::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ());
diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
index 99fe5efed3b..920c81e7db3 100644
--- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
+++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index fe230c1a052..b71652cae3a 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -29,8 +29,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index 73515c2109e..ba291b7d2b4 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -17,9 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  virtual CORBA::Short method (CORBA::Short boo);
   // "Smartify" the method call!
 
   // Don't need to add any extra functionality into <shutdown>, hence
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 66f7a13e3d0..149739da9ee 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -29,12 +29,9 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  CORBA::Short method  (CORBA::Short boo);
 
-  void shutdown  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown  (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -48,21 +45,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Test_i::method () invoked\n")));
   if (boo == 5)
-    ACE_THROW_RETURN (Test::Oops ("Invalid boo\n"),
-                      -1);
+    throw Test::Oops ("Invalid boo\n");
 
   return 0;
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -120,8 +113,13 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test_var Test_object =
-        servant._this ();
+        Test::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ());
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index bc4e7c42743..2529b667c8d 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     Smart_Proxy_Impl.cpp
     client.cpp
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index bb3bf989309..36e3158ea0f 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -46,8 +46,6 @@ Smart_Test_Proxy::convert_to_ior (bool,
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index f31fe5eecff..ed7537777ce 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -23,9 +23,7 @@ public:
   virtual char* convert_to_ior (bool use_omg_ior_format,
                                 const char* ior_prefix) const;
 
-  virtual CORBA::Short method (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  virtual CORBA::Short method (CORBA::Short boo);
   // "Smartify" the method call!
 
   static const ACE_CString& fake_ior (void);
diff --git a/TAO/tests/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
index 9feea5cd714..c672d6d72fd 100644
--- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc
+++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, anytypecode, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     Smart_Proxy_Impl.cpp
     client.cpp
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 85bb22271ad..70db5fdd604 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -9,11 +9,9 @@ class Test_i: public virtual POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void hello (CORBA::Long howmany)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void hello (CORBA::Long howmany);
 
-  void shutdown  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown  (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -26,14 +24,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::hello (CORBA::Long howmany)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "hello called with : %i \n", howmany));
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index f1a83fa6b95..68448d85eba 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -29,12 +29,9 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Oops));
+  CORBA::Short method  (CORBA::Short boo);
 
-  void shutdown  (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown  (void);
 
 private:
   CORBA::ORB_var orb_;
@@ -48,21 +45,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Test_i::method () invoked\n")));
   if (boo == 5)
-    ACE_THROW_RETURN (Test::Oops ("Invalid boo\n"),
-                      -1);
+    throw Test::Oops ("Invalid boo\n");
 
   return 0;
 }
 
 void
 Test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -120,8 +113,13 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Test_var Test_object =
-        servant._this ();
+        Test::_narrow (object_act.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ());
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index 1cbbf0bc8ea..f9e47df0972 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -35,7 +35,6 @@ Sender::is_done (void) const
 CORBA::Boolean
 Sender::get_data (CORBA::ULong size,
                   Test::Payload_out payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
                     ace_mon,
@@ -53,7 +52,6 @@ Sender::get_data (CORBA::ULong size,
 
 CORBA::Long
 Sender::get_event_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
                     ace_mon,
@@ -65,14 +63,12 @@ Sender::get_event_count (void)
 
 void
 Sender::ping (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
 Sender::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->is_done_ == false)
     {
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index 3acc8583883..8e66804cd41 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -27,17 +27,13 @@ public:
 
   // = The skeleton methods
   virtual CORBA::Boolean get_data (CORBA::ULong size,
-                                   Test::Payload_out payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   Test::Payload_out payload);
 
-  virtual CORBA::Long get_event_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long get_event_count (void);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   ACE_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index 960ceb8a921..e9da8b404fa 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index b072572d38c..b9c1df0563d 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index dacec2af3a7..48b7f6c363a 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -66,8 +66,13 @@ main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (sender_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Test::Sender_var sender =
-        sender_impl->_this ();
+        Test::Sender::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (sender.in ());
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 86d4366c856..761fbd75754 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, messaging, taoserver {
 
 project(*Client): strategies, messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index d10616be198..8a2b7e467f1 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 5f462b25f03..f80e008049c 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -60,8 +60,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index aa869165adf..fc61c63ee2d 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -11,7 +11,6 @@ ACE_RCSID(tests, simple_test_i, "$Id$")
 
 CORBA::Boolean
 Simple_Server_i::print_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -21,7 +20,6 @@ Simple_Server_i::print_status (void)
 
 void
 Simple_Server_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h
index bb4e73a24e3..c2680214a24 100644
--- a/TAO/tests/Strategies/simple_test_i.h
+++ b/TAO/tests/Strategies/simple_test_i.h
@@ -31,11 +31,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean print_status (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Boolean print_status (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 7dbf0e839ef..2d77d46c332 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -24,7 +24,6 @@ project(*Server): messaging, taoexe, portableserver {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 040327785a9..35ef40177d5 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -58,8 +58,13 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&servant);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       test_var server =
-        servant._this ();
+        test::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index cc2786bbc7f..a28d4fc0aee 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -17,7 +17,6 @@ test_i::method (CORBA::ULong request_number,
                 CORBA::Long start_time,
                 const test::data &,
                 CORBA::ULong work)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value start (0);
   start.msec (start_time);
@@ -35,14 +34,12 @@ test_i::method (CORBA::ULong request_number,
 
 void
 test_i::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "server: got flush request\n"));
 }
 
 void
 test_i::shutdown (CORBA::Long start_time)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value start (0);
   start.msec (start_time);
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index a08938cf539..6a8e13412fe 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -32,14 +32,11 @@ public:
   void method (CORBA::ULong request_number,
                CORBA::Long start_time,
                const test::data &,
-               CORBA::ULong work)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               CORBA::ULong work);
 
-  void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void flush (void);
 
-  void shutdown (CORBA::Long start_time)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (CORBA::Long start_time);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index e42705f179e..0c95ddf25e6 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -11,9 +11,9 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
-    test_i.cpp
-    testS.cpp
     testC.cpp
+    testS.cpp
+    test_i.cpp
     server.cpp
   }
   IDL_Files {
@@ -21,7 +21,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
+  after += *idl
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 841ac2318f2..92b82e00f48 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -90,7 +90,7 @@ int main (int argc, char* argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index ee46faa451c..92196824db9 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -62,8 +62,13 @@ main (int argc, char *argv[])
 
       Simple_Server_i server_impl (orb.in ());
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Simple_Server_var server =
-        server_impl._this ();
+        Simple_Server::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index c4da7f0887c..e75b0e611ce 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -18,7 +18,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
                        CORBA::Long msecs)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
 
@@ -39,7 +38,6 @@ Simple_Server_i::echo (CORBA::Long x,
 
 void
 Simple_Server_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 8a135bdd767..8c102e3a1b7 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -32,10 +32,8 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Long msecs);
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index d2b11d0485c..b0cdb5507ea 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -23,14 +23,12 @@ Current_Test_Impl::~Current_Test_Impl (void)
 
 ::CORBA::Long
 Current_Test_Impl::self_test (void)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
 Current_Test_Impl::test_transport_current (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -72,7 +70,6 @@ Current_Test_Impl::test_transport_current (void)
 
 void
 Current_Test_Impl::invoked_by_client (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -92,7 +89,6 @@ Current_Test_Impl::invoked_by_client (void)
 
 void
 Current_Test_Impl::invoked_by_client_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -128,7 +124,6 @@ Current_Test_Impl::invoked_by_client_i (void)
 
 void
 Current_Test_Impl::invoked_during_upcall (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -140,7 +135,6 @@ Current_Test_Impl::invoked_during_upcall (void)
 
 void
 Current_Test_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index 244c46764e4..a11a01d1f00 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -10,12 +10,10 @@ int server_main (int argc,
                  Test::Server_Request_Interceptor *cri);
 
 int
-test_transport_current (CORBA::ORB_ptr orb)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
+test_transport_current (CORBA::ORB_ptr orb);
 
 int
-ACE_TMAIN (int argc,
-           ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Test::Server_Request_Interceptor* cri = 0;
   ACE_NEW_RETURN (cri,
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index abaa7635727..1bc137d006e 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "tao/TransportCurrent/Transport_Current.h"
+#include "tao/SystemException.h"
 
 using namespace TAO;
 
@@ -10,8 +11,6 @@ using namespace TAO;
 
 int
 test_transport_current (Transport::Current_ptr tc)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
 {
   CORBA::Long id = tc->id ();
 
@@ -36,8 +35,6 @@ test_transport_current (Transport::Current_ptr tc)
 
 int
 test_transport_current (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
 {
   // Get the Current object.
   CORBA::Object_var tcobject =
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index 65be75cb715..d713a30dfe3 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -20,8 +20,7 @@ ACE_RCSID (PICurrent,
 // Prototype
 
 int
-test_transport_current (CORBA::ORB_ptr)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
+test_transport_current (CORBA::ORB_ptr);
 
 using namespace TAO;
 
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index bb9e52f8542..c113ed14627 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -25,14 +25,12 @@ Current_Test_Impl::~Current_Test_Impl (void)
 
 ::CORBA::Long
 Current_Test_Impl::self_test (void)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
 Current_Test_Impl::test_transport_current (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -69,7 +67,6 @@ Current_Test_Impl::test_transport_current (void)
 
 void
 Current_Test_Impl::invoked_by_client (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level >= 1) {
     ACE_DEBUG ((LM_DEBUG,
@@ -106,7 +103,6 @@ Current_Test_Impl::invoked_by_client (void)
 
 void
 Current_Test_Impl::invoked_during_upcall (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -117,7 +113,6 @@ Current_Test_Impl::invoked_during_upcall (void)
 
 void
 Current_Test_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 2764b8c6131..59b05e674ae 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -13,11 +13,11 @@ project(*Server): taoserver, tc_iiop, pi_server {
   }
 
   Source_Files {
+    IIOP_Tester.cpp
     server.cpp
     Current_Test_Impl.cpp
     IIOP_Server_Request_Interceptor.cpp
     IIOP_Server_Main.cpp
-    IIOP_Tester.cpp
   }
 
   IDL_Files {
@@ -36,8 +36,8 @@ project(*Client): taoclient, tc_iiop, dynamicinterface {
   }
 
   Source_Files {
-    client.cpp
     IIOP_Tester.cpp
+    client.cpp
   }
 
   IDL_Files {
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index 64dceb697d2..c4ed3e82c24 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -10,8 +10,7 @@ int server_main (int argc,
                  Test::Server_Request_Interceptor *cri);
 
 int
-test_transport_current (CORBA::ORB_ptr orb)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
+test_transport_current (CORBA::ORB_ptr orb);
 
 int
 ACE_TMAIN (int argc,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 27819ca3900..4c8074d7910 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -27,7 +27,6 @@ namespace Test {
 
   char *
   IIOP_Server_Request_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("II SRI");
   }
@@ -35,7 +34,6 @@ namespace Test {
   ///
   TAO::Transport::IIOP::Current_ptr
   IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
 
@@ -54,7 +52,6 @@ namespace Test {
   /// as index in an array, where we store the endpoint
   void
   IIOP_Server_Request_Interceptor::push_request_info (size_t requestID)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
 
@@ -169,7 +166,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
     CORBA::String_var op (ri->operation());
@@ -208,7 +204,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
 
@@ -228,8 +223,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
@@ -251,7 +244,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
       {
@@ -273,8 +265,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
@@ -297,8 +287,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index d87ec6b1f5d..76f300cf32c 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -55,50 +55,38 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * name (void);
 
     /// incomming interception point
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
 
     /// outgoing interception point
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// outgoing interception point
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// outgoing interception point
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
 
   protected:
 
     /// process incomming requests context
     void inbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// process outgoing requests context
     void outbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// saves the incomming request info
-    void push_request_info (size_t requestID)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void push_request_info (size_t requestID);
 
     /// 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_THROW_SPEC ((CORBA::SystemException));
+    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid);
 
   private:
 
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
index 6544b23169b..ba3162f9b58 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "tao/TransportCurrent/IIOP_Transport_Current.h"
+#include "tao/SystemException.h"
 
 #if defined (TAO_AS_STATIC_LIBS)
 #include "tao/TransportCurrent/IIOP_Current_Loader.h"
@@ -14,7 +15,6 @@ 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;
 
 
@@ -23,14 +23,11 @@ using namespace TAO;
 
 int
 test_transport_current (CORBA::ORB_ptr orb)
-  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"));
 
-
   if (TAO_debug_level >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n")));
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index c125e60d0b9..0cffd542bcc 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -20,8 +20,7 @@ ACE_RCSID (IIOP,
 // Prototype
 
 int
-test_transport_current (CORBA::ORB_ptr)  ACE_THROW_SPEC ((CORBA::SystemException,
-                                                            CORBA::UserException));
+test_transport_current (CORBA::ORB_ptr);
 
 using namespace TAO;
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index 40112cc0b5a..c2bf2000119 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -27,14 +27,12 @@ namespace Test
 
   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
index 8e7477ba8fe..7c5eb831aab 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -36,11 +36,9 @@ namespace Test
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
     virtual ~Client_ORBInitializer (void);
 
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+    virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+    virtual void post_init(PortableInterceptor::ORBInitInfo*);
 
   private:
     PortableInterceptor::ClientRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index f62ed6e1df1..5a84ba9b191 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -30,14 +30,12 @@ namespace Test
 
   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"),
@@ -61,13 +59,11 @@ namespace Test
 
   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");
@@ -106,28 +102,24 @@ namespace Test
 
   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
index 8b9d16adcc9..6e9d34ae9b9 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -68,25 +68,20 @@ namespace Test
      */
     //@{
     /// Return the name of this ClientRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
+    virtual char * name (void);
 
-    virtual void destroy (void) throw (CORBA::SystemException);
+    virtual void destroy (void);
 
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
     //@}
 
     // Number of interceptions
@@ -95,8 +90,7 @@ namespace Test
   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);
+    void test_transport_current (const ACE_TCHAR* amethod);
 
   private:
     ///The ID of the ORB this interceptor is registered with.
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index f8dfc3f3ef3..7dcd126ac2f 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -37,19 +37,18 @@ public:
   ~Current_Test_Impl (void);
 
   /// Main servant test method.
-  virtual void invoked_by_client (void) throw (CORBA::SystemException);
+  virtual void invoked_by_client (void);
 
   /// 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);
+  virtual void invoked_during_upcall (void);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void) throw (CORBA::SystemException);
+  virtual void shutdown (void);
 
   // A self-test for coherency
-  virtual ::CORBA::Long self_test (void) throw (CORBA::SystemException);
+  virtual ::CORBA::Long self_test (void);
 
 public:
   /// Reports if unexpected errors have been encountered for the
@@ -57,11 +56,10 @@ public:
   bool is_successful (void) const;
 
 private:
-  void test_transport_current (void) throw (CORBA::SystemException);
+  void test_transport_current (void);
 
   /// Main servant test method.
-  void invoked_by_client_i (void)
-    throw (CORBA::SystemException, TAO::Transport::NoContext);
+  void invoked_by_client_i (void);
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index 72cc1b34782..8e866e97052 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -27,14 +27,12 @@ namespace Test
 
   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
index f4a0c96fb07..e9d517c30bd 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -35,11 +35,9 @@ namespace Test
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
     virtual ~Server_ORBInitializer (void);
 
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+    virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+    virtual void post_init(PortableInterceptor::ORBInitInfo*);
 
   private:
     PortableInterceptor::ServerRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 1f05e06e8ac..c0e7d2c218a 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -25,7 +25,6 @@ namespace Test
 
   void
   Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    throw (CORBA::SystemException)
   {
     CORBA::String_var name (this->name ());
     ACE_DEBUG ((LM_DEBUG,
@@ -71,48 +70,41 @@ namespace Test
 
   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");
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index f489156c2ae..5498b253198 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -57,8 +57,7 @@ namespace Test
     /// Destructor.
     virtual ~Server_Request_Interceptor (void);
 
-    virtual void test_transport_current (const char* amethod)
-      throw (CORBA::SystemException);
+    virtual void test_transport_current (const char* amethod);
 
     /// Coherency test
     virtual bool self_test (void);
@@ -73,24 +72,19 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
+    virtual char * name (void);
 
-    virtual void destroy (void) throw (CORBA::SystemException);
+    virtual void destroy (void);
 
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
 
   protected:
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index 83b7b630015..ffe3470c864 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -19,7 +19,6 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 
 void
 First_i::oneway_method (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
 
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 9c0b161be6a..618fcf042be 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -22,8 +22,7 @@ public:
   First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done);
 
   /// Interface methods..
-  void oneway_method (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void oneway_method (void);
 
 private:
 
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index 3f134825124..107826a2312 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -19,7 +19,6 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 //factory method to create first object
 Two_Objects_Test::First_ptr
 Object_Factory_i::create_first (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   First_i *first_impl;
 
@@ -28,8 +27,19 @@ Object_Factory_i::create_first (void)
                     First_i (orb_.in(), two_way_done_ ),
                     CORBA::NO_MEMORY() );
 
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =    
+    PortableServer::POA::_narrow (poa_object.in ()); 
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (first_impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
   Two_Objects_Test::First_var first =
-    first_impl->_this ( );
+    Two_Objects_Test::First::_narrow (object.in ());
 
   return first._retn();
 }
@@ -37,7 +47,6 @@ Object_Factory_i::create_first (void)
 //factory method to create second object
 Two_Objects_Test::Second_ptr
 Object_Factory_i::create_second (void)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Second_i *second_impl;
 
@@ -46,8 +55,19 @@ Object_Factory_i::create_second (void)
                               length_, two_way_done_),
                     CORBA::NO_MEMORY ());
 
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =    
+    PortableServer::POA::_narrow (poa_object.in ()); 
+
+  PortableServer::ObjectId_var id =
+    root_poa->activate_object (second_impl);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
   Two_Objects_Test::Second_var second =
-    second_impl->_this ();
+    Two_Objects_Test::Second::_narrow (object.in ());
 
   return second._retn();
 }
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index f9d09a6c974..6599e00f80f 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -21,11 +21,9 @@ public:
   Object_Factory_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len);
 
-  Two_Objects_Test::First_ptr create_first (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  Two_Objects_Test::First_ptr create_first (void);
 
-  Two_Objects_Test::Second_ptr create_second (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  Two_Objects_Test::Second_ptr create_second (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index 828e9b67d22..f7814901d3d 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -24,7 +24,6 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
 
 Two_Objects_Test::Octet_Seq *
 Second_i::twoway_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg;
 
@@ -56,7 +55,6 @@ Second_i::twoway_method (void)
 
 void
 Second_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n"));
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index be08514e3e9..214b9be1ece 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -21,11 +21,9 @@ public:
              CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
   Two_Objects_Test::Octet_Seq *
-    twoway_method (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    twoway_method (void);
 
-  void shutdown (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 5df5e080f97..6739a263ca4 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -11,28 +11,23 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
+    Two_ObjectsC.cpp
+    Two_ObjectsS.cpp
     worker.cpp
     First_i.cpp
     Second_i.cpp
     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
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index 7591fa100b9..acc17c83f94 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Parse the arguments
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 903166e80ad..34fdb2a1686 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       // Get initial reference to the Root POA
       CORBA::Object_var poa_object =
@@ -96,8 +96,13 @@ main (int argc, char *argv[])
 
       // _this method registers the object withe the POA and returns
       // an object reference
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (factory_impl);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
       Two_Objects_Test::Object_Factory_var factory =
-        factory_impl->_this ();
+        Two_Objects_Test::Object_Factory::_narrow (object_act.in ());
 
       // Convert the object reference to a string so that it can
       // be saved in a file and used by clinet programs later
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index cea17607721..b023ceec937 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index 882a15f1834..de731d5cc49 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -39,7 +39,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -60,7 +60,12 @@ main (int argc, char *argv[])
 
       TestImpl test_impl (orb.in ());
 
-      SimpleStrings_var server = test_impl._this ();
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&test_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      SimpleStrings_var server = SimpleStrings::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp
index 11f65c2a3be..3e6e52cb7aa 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.cpp
+++ b/TAO/tests/Typedef_String_Array/testImpl.cpp
@@ -28,7 +28,6 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 
 void
 TestImpl::get_strings (ArrayOfString_out strings)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (strings, ArrayOfString);
 
diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h
index be1e7cb1c69..acbd61ef1cc 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.h
+++ b/TAO/tests/Typedef_String_Array/testImpl.h
@@ -7,8 +7,7 @@ class TestImpl: public POA_SimpleStrings
 public:
   TestImpl(CORBA::ORB_ptr orb);
 
-  virtual void get_strings (ArrayOfString_out strings)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void get_strings (ArrayOfString_out strings);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index c01bab7197e..fbd82f97a5f 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -24,7 +24,6 @@ project(*server): taoserver {
 
 project(*client): taoclient, anytypecode {
   after += *idl
-  after += *server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index 875eebbdd8f..f07c72a056d 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -11,11 +11,9 @@ project(*idl): taoidldefaults {
 project(*Server): taoserver {
   after += *idl
   Source_Files {
-    server.cpp
-  }
-  Source_Files {
     testC.cpp
     testS.cpp
+    server.cpp
   }
   IDL_Files {
   }
@@ -23,12 +21,9 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
-  Source_Files {
-    client.cpp
-  }
   Source_Files {
     testC.cpp
+    client.cpp
   }
   IDL_Files {
   }
diff --git a/TAO/tests/UNKNOWN_Exception/run_test.pl b/TAO/tests/UNKNOWN_Exception/run_test.pl
index 097ce952f2c..21bc0592dc2 100755
--- a/TAO/tests/UNKNOWN_Exception/run_test.pl
+++ b/TAO/tests/UNKNOWN_Exception/run_test.pl
@@ -17,13 +17,13 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -x 1");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 30833dba14c..fb61a039766 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -23,14 +23,11 @@ public:
 
   test_i (CORBA::ORB_ptr orb);
 
-  void normal_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal_method (void);
 
-  void unknown_exception_in_method (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void unknown_exception_in_method (void);
 
-  void unknown_exception_during_deactivation (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void unknown_exception_during_deactivation (void);
 
   void _add_ref (void);
   void _remove_ref (void);
@@ -48,7 +45,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::normal_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::normal_method() called\n"));
@@ -56,7 +52,6 @@ test_i::normal_method (void)
 
 void
 test_i::unknown_exception_in_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_in_method() called\n"));
@@ -69,7 +64,6 @@ test_i::unknown_exception_in_method (void)
 
 void
 test_i::unknown_exception_during_deactivation (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_during_deactivation() called\n"));
@@ -116,11 +110,9 @@ public:
 
   test_factory_i (CORBA::ORB_ptr orb);
 
-  test_ptr create_test (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  test_ptr create_test (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
   CORBA::ORB_var orb_;
 };
@@ -132,7 +124,6 @@ test_factory_i::test_factory_i (CORBA::ORB_ptr orb)
 
 test_ptr
 test_factory_i::create_test (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   test_i *servant =
     new test_i (this->orb_.in ());
@@ -140,15 +131,25 @@ test_factory_i::create_test (void)
   PortableServer::ServantBase_var safe_servant (servant);
   ACE_UNUSED_ARG (safe_servant);
 
+  CORBA::Object_var poa_object =
+    this->orb_->resolve_initial_references("RootPOA");
+
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
+
+  PortableServer::ObjectId_var id_act =
+    root_poa->activate_object (servant);
+
+  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+
   test_var test =
-    servant->_this ();
+    test::_narrow (object.in ());
 
   return test._retn ();
 }
 
 void
 test_factory_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "factory_i::shutdown() called\n"));
@@ -189,9 +190,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "");
+        CORBA::ORB_init (argc,argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -212,8 +211,13 @@ main (int argc, char *argv[])
         PortableServer::ServantBase_var safe_servant (servant);
         ACE_UNUSED_ARG (safe_servant);
 
+        PortableServer::ObjectId_var id_act =
+          root_poa->activate_object (servant);
+
+        CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+
         test_factory_var test_factory =
-          servant->_this ();
+          test_factory::_narrow (object.in ());
 
         CORBA::String_var ior =
           orb->object_to_string (test_factory.in ());
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index ad52d1c0d40..90804389553 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       Client client (orb.in ());
 
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index bc6fa6e49a5..c421d2d5f88 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
@@ -90,8 +90,13 @@ main (int argc, char *argv[])
 
       Stopwatch_imp server_impl (orb.in (), &timer);
 
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
       Stopwatch_var server =
-        server_impl._this ();
+        Stopwatch::_narrow (object.in ());
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 60e7c2775e1..3523135d7e3 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -12,21 +12,18 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 
 void
 Stopwatch_imp::start (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->start ();
 }
 
 void
 Stopwatch_imp::stop (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->stop ();
 }
 
 void
 Stopwatch_imp::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index ba92631590d..539a82b16e0 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -33,14 +33,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (void);
 
-  void stop (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void stop (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index da693a78d17..757d6743fd1 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -85,7 +85,7 @@ catiiop (char* string)
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
+      throw CORBA::DATA_CONVERSION ();
     }
 
   CORBA::String_var hostname = CORBA::string_alloc (1 + cp - string);
@@ -102,7 +102,7 @@ catiiop (char* string)
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
+      throw CORBA::DATA_CONVERSION ();
     }
 
   port_number = (short) ACE_OS::atoi ((char *) string);
@@ -354,7 +354,7 @@ catpoop (char* string)
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
+      throw CORBA::DATA_CONVERSION ();
     }
 
   // Read the hostname.